Author: tgoettlicher Date: Fri Apr 27 16:40:05 2007 New Revision: 5458 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5458&view=rev Log: Added first draft of a config dialog for plugin selection. (It is dirty code which needs clean-up.) Added: branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui Modified: branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.ui Modified: branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt Fri Apr 27 16:40:05 2007 @@ -8,9 +8,9 @@ kde3_add_kcfg_files(settings_SRCS opensuseupdater_settings.kcfgc) SET(opensuseupdater_LIB_SRCS -Updater.cpp Updater.h osupdaterpopup.cpp TrayIcon.cpp UpdateListItem.cpp HeaderWidget.cpp ${settings_SRCS} +Updater.cpp Updater.h osupdaterpopup.cpp TrayIcon.cpp UpdateListItem.cpp HeaderWidget.cpp configWidget.cpp configWidget.h configWidgetUI.h configWidgetUI.ui ${settings_SRCS} ) -kde3_add_ui_files( opensuseupdater_LIB_SRCS updatersettingswidget_base.ui ) +kde3_add_ui_files( opensuseupdater_LIB_SRCS updatersettingswidget_base.ui configWidgetUI.ui ) KDE3_AUTOMOC(${opensuseupdater_LIB_SRCS}) ADD_LIBRARY(opensuseupdater SHARED ${opensuseupdater_LIB_SRCS}) SET_TARGET_PROPERTIES(opensuseupdater PROPERTIES VERSION 4.2.0 SOVERSION 4 ) @@ -20,7 +20,7 @@ ########### next target ############### -SET(opensuseupdater_SRCS main.cpp UpdaterApplication.cpp MainWindow.cpp ) +SET(opensuseupdater_SRCS main.cpp UpdaterApplication.cpp MainWindow.cpp configWidget.h configWidgetUI.h configWidgetUI.ui ) KDE3_AUTOMOC(${opensuseupdater_SRCS}) KDE3_ADD_EXECUTABLE(opensuseupdater-kde ${opensuseupdater_SRCS}) TARGET_LINK_LIBRARIES(opensuseupdater-kde opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui kio ) Modified: branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp Fri Apr 27 16:40:05 2007 @@ -48,6 +48,9 @@ #include "UpdateListItem.h" #include "TrayIcon.h" +#include "configWidget.h" + + MainWindow::MainWindow( const UpdaterCapabilities &caps, QWidget *parent) @@ -312,6 +315,29 @@ void MainWindow::configButtonClicked() { + + static configWidget* confWidget = 0; + + if (KConfigDialog::showDialog("settings")) { +// updateConfigDialog(confWidget); + return; + } + +// configDialog = new KConfigDialog(this, "settings", Prefs::self()); + configDialog = new KConfigDialog(this, "settings", UpdaterSettings::self() ); + + configDialog->setHelp(QString::null); + + confWidget = new configWidget(0, "Kscd"); + + // kscd config page + configDialog->addPage(confWidget, i18n("CD Player"), "kscd", i18n("Settings & Behavior")); + + + /// ENDE + return; + + //An instance of your dialog could be already created and could be cached, //in which case you want to display the cached dialog instead of creating //another one Modified: branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h Fri Apr 27 16:40:05 2007 @@ -23,6 +23,8 @@ #include #include #include "UpdaterCapabilities.h" +#include + class TrayIcon; class KTextEdit; @@ -247,6 +249,9 @@ QWidget *centralWidget; + KConfigDialog *configDialog; + + }; #endif Modified: branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp Fri Apr 27 16:40:05 2007 @@ -36,7 +36,7 @@ { loadPlugins(); - int backend = UpdaterSettings::self()->backend(); + QString backend = UpdaterSettings::self()->backend(); // if ( backend == UpdaterSettings::EnumBackend::zmd ) // { Added: branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp?rev=5458&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp Fri Apr 27 16:40:05 2007 @@ -0,0 +1,120 @@ +/* + * configWidget - the config dialog page for KSCD settings + * + * $Id: + * + * Copyright (c) 2002 Aaron J. Seigo + * Copyright (c) 2004 Alexander Kern + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include +#include +#include +#include +#include +#include +#include +/* +#include +extern "C" { + // We don't have libWorkMan installed already, so get everything + // from within our own directory +#include "libwm/include/wm_config.h" +} +*/ + +#include "configWidget.h" +//#include "kscd.h" +//#include "prefs.h" + +class SpecialComboBox : public KComboBox +{ +public: + SpecialComboBox(QWidget* parent, const char* name) + : KComboBox(parent, name) + {} + + // QComboBox::setCurrentText replaces the current text if + // the list doesn't contain text, while + // KComboBox::setCurrentItem doesn't + void setCurrentText(const QString& text) + { + setCurrentItem(text); + } +} ; + +/* + * Constructs a configWidget which is a child of 'parent', with the + * name 'name' and widget flags set to 'f'. + * + * The dialog will by default be modeless, unless you set 'modal' to + * TRUE to construct a modal dialog. + */ +configWidget::configWidget(QWidget* parent, const char* name) + : configWidgetUI(parent, name) + +{ + if (!name) + { + setName("configWidget"); + } +/* + kcfg_cdDevice->comboBox()->setEditable(true); + kcfg_cdDevice->comboBox()->insertItem(DEFAULT_CD_DEVICE); + getMediaDevices(); +*/ + + (new QVBoxLayout(audioSystemFrame))->setAutoAdd(true); + kcfg_AudioSystem = new SpecialComboBox(audioSystemFrame, "kcfg_AudioSystem"); +/* textLabel4->setBuddy(kcfg_AudioSystem); +#if defined(BUILD_CDDA) + kcfg_DigitalPlayback_toggled(Prefs::digitalPlayback()); + + // fill ComboBox audioBackend +// kcfg_AudioSystem->insertStringList(mPlayer->audioSystems()); +#else + kcfg_DigitalPlayback_toggled(false); + + kcfg_DigitalPlayback->setChecked(false); + kcfg_DigitalPlayback->hide(); +#endif + kcfg_SelectEncoding_toggled(Prefs::selectEncoding()); + +*/ + + kcfg_AudioSystem->insertStringList(QStringList("plugin")); +} + +configWidget::~configWidget() +{ +} + +void configWidget::kcfg_DigitalPlayback_toggled(bool toggle) +{ +} + +void configWidget::getMediaDevices() +{ +} + + +void configWidget::kcfg_SelectEncoding_toggled(bool toggle) +{ +} + +#include "configWidget.moc" Added: branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h?rev=5458&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h Fri Apr 27 16:40:05 2007 @@ -0,0 +1,50 @@ +/* + * configWidget - the config dialog page for KSCD settings + * + * Copyright (c) 2002 Aaron J. Seigo + * Copyright (c) 2004 Alexander Kern + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef CONFIGWIDGET_H +#define CONFIGWIDGET_H + +#include "configWidgetUI.h" + +class KSCD; +class SpecialComboBox; + +class configWidget : public configWidgetUI +{ + Q_OBJECT + + public: + configWidget(QWidget* parent = 0, const char* name = 0); + ~configWidget(); + + protected: + KSCD* mPlayer; + SpecialComboBox* kcfg_AudioSystem; + + public slots: + virtual void kcfg_DigitalPlayback_toggled(bool); + virtual void kcfg_SelectEncoding_toggled(bool); + private: + void getMediaDevices(); +}; + +#endif // CONFIGWIDGET_H Added: branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h?rev=5458&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h Fri Apr 27 16:40:05 2007 @@ -0,0 +1,85 @@ +/**************************************************************************** +** Form interface generated from reading ui file './configWidgetUI.ui' +** +** Created: Fr Apr 27 15:30:17 2007 +** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.7 edited Aug 31 2005 $) +** +** WARNING! All changes made in this file will be lost! +****************************************************************************/ + +#ifndef CONFIGWIDGETUI_H +#define CONFIGWIDGETUI_H + +#include +#include + +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QSpacerItem; +class QGroupBox; +class QLabel; +class KColorButton; +class QCheckBox; +class KFontRequester; +class QButtonGroup; +class KIntNumInput; +class KURLComboRequester; +class KURLRequester; +class QFrame; +class QComboBox; + +class configWidgetUI : public QWidget +{ + Q_OBJECT + +public: + configWidgetUI( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~configWidgetUI(); + + QGroupBox* groupBox1; + QLabel* textLabel2; + KColorButton* kcfg_BackColor; + QCheckBox* kcfg_Docking; + QCheckBox* kcfg_TrackAnnouncement; + QLabel* textLabel1; + KColorButton* kcfg_ledColor; + KFontRequester* kcfg_ledFont; + QLabel* textLabel1_2; + QButtonGroup* buttonGroup1; + KIntNumInput* kcfg_SkipDelta; + QLabel* textLabel3; + QCheckBox* kcfg_Autoplay; + QCheckBox* kcfg_EjectOnFinish; + QCheckBox* kcfg_StopExit; + QGroupBox* groupBox3; + KURLComboRequester* kcfg_cdDevice; + QLabel* textLabel5; + QCheckBox* kcfg_DigitalPlayback; + QLabel* textLabel4; + KURLRequester* kcfg_AudioDevice; + QFrame* audioSystemFrame; + QGroupBox* groupBox9; + QCheckBox* kcfg_SelectEncoding; + QComboBox* kcfg_SelectedEncoding; + +public slots: + virtual void kcfg_DigitalPlayback_toggled( bool ); + virtual void kcfg_SelectEncoding_toggled(bool); + +protected: + QVBoxLayout* configWidgetUILayout; + QSpacerItem* spacer3; + QGridLayout* groupBox1Layout; + QSpacerItem* spacer1; + QGridLayout* buttonGroup1Layout; + QSpacerItem* spacer2; + QGridLayout* groupBox3Layout; + QHBoxLayout* groupBox9Layout; + +protected slots: + virtual void languageChange(); + +}; + +#endif // CONFIGWIDGETUI_H Added: branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui?rev=5458&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui Fri Apr 27 16:40:05 2007 @@ -0,0 +1,462 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>configWidgetUI</class> +<widget class="QWidget"> + <property name="name"> + <cstring>configWidgetUI</cstring> + </property> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>539</width> + <height>605</height> + </rect> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QGroupBox"> + <property name="name"> + <cstring>groupBox1</cstring> + </property> + <property name="title"> + <string>Interface</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="2" column="0"> + <property name="name"> + <cstring>textLabel2</cstring> + </property> + <property name="text"> + <string>&Background color:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_BackColor</cstring> + </property> + </widget> + <widget class="KColorButton" row="2" column="1"> + <property name="name"> + <cstring>kcfg_BackColor</cstring> + </property> + <property name="text"> + <string></string> + </property> + <property name="whatsThis" stdset="0"> + <string>The background color that will be used for the LCD display.</string> + </property> + </widget> + <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_Docking</cstring> + </property> + <property name="text"> + <string>Show icon in &system tray</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected an icon will appear in the system tray. Note that KsCD will <i>not</i> quit when the window is closed if a system tray icon is displayed. You may quit KsCD by clicking the Quit button or right-clicking on the system tray icon and selecting the appropriate entry.</string> + </property> + </widget> + <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_TrackAnnouncement</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show &track announcement</string> + </property> + </widget> + <spacer row="1" column="2" rowspan="2" colspan="1"> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>292</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="QLabel" row="1" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>&LCD color:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_ledColor</cstring> + </property> + </widget> + <widget class="KColorButton" row="1" column="1"> + <property name="name"> + <cstring>kcfg_ledColor</cstring> + </property> + <property name="text"> + <string></string> + </property> + <property name="whatsThis" stdset="0"> + <string>The foreground color that will be used in the LCD display.</string> + </property> + </widget> + <widget class="KFontRequester" row="0" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_ledFont</cstring> + </property> + <property name="font"> + <font> + <bold>1</bold> + </font> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel1_2</cstring> + </property> + <property name="text"> + <string>LCD &font:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_ledFont</cstring> + </property> + </widget> + </grid> + </widget> + <widget class="QButtonGroup"> + <property name="name"> + <cstring>buttonGroup1</cstring> + </property> + <property name="title"> + <string>Play Options</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="KIntNumInput" row="0" column="1"> + <property name="name"> + <cstring>kcfg_SkipDelta</cstring> + </property> + <property name="minValue"> + <number>1</number> + </property> + <property name="maxValue"> + <number>1000</number> + </property> + <property name="suffix"> + <string> seconds</string> + </property> + <property name="specialValueText"> + <string>1 second</string> + </property> + <property name="whatsThis" stdset="0"> + <string>This option controls the number of seconds KsCD will skip when the skip forwards or backwards buttons are pressed.</string> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel3</cstring> + </property> + <property name="text"> + <string>Skip &interval:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_SkipDelta</cstring> + </property> + </widget> + <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_Autoplay</cstring> + </property> + <property name="text"> + <string>Auto&play when CD inserted</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected the CD will start playing automatically upon being inserted into the CD-ROM.</string> + </property> + </widget> + <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_EjectOnFinish</cstring> + </property> + <property name="text"> + <string>&Eject CD when finished playing</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected the CD will automatically eject when it is finished.</string> + </property> + </widget> + <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_StopExit</cstring> + </property> + <property name="text"> + <string>Stop playing CD on e&xit</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected the CD will automatically stop playing when quitting KsCD.</string> + </property> + </widget> + <spacer row="0" column="2" rowspan="4" colspan="1"> + <property name="name"> + <cstring>spacer2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>171</width> + <height>81</height> + </size> + </property> + </spacer> + </grid> + </widget> + <widget class="QGroupBox"> + <property name="name"> + <cstring>groupBox3</cstring> + </property> + <property name="title"> + <string>CD-ROM &Device</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="KURLComboRequester" row="0" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_cdDevice</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string>The CD-ROM device to use when playing CDs. This will typically look something like "/dev/cdrom". To have KsCD autodetect your CD-ROM, leave this field empty.</string> + </property> + </widget> + <widget class="QLabel" row="3" column="0"> + <property name="name"> + <cstring>textLabel5</cstring> + </property> + <property name="text"> + <string>Select audio de&vice:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_AudioDevice</cstring> + </property> + </widget> + <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_DigitalPlayback</cstring> + </property> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>&Use direct digital playback</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected KsCD will attempt to play the CD using direct digital playback. This option is useful if the CD-ROM is not connected directly to the sound output on the computer. Note that digital playback consumes more system resources than the normal method of playback.</string> + </property> + </widget> + <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>textLabel4</cstring> + </property> + <property name="text"> + <string>Select &audio backend:</string> + </property> + <property name="indent"> + <number>0</number> + </property> + </widget> + <widget class="KURLRequester" row="3" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_AudioDevice</cstring> + </property> + </widget> + <widget class="QFrame" row="2" column="2"> + <property name="name"> + <cstring>audioSystemFrame</cstring> + </property> + <property name="frameShape"> + <enum>NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>Plain</enum> + </property> + </widget> + </grid> + </widget> + <widget class="QGroupBox"> + <property name="name"> + <cstring>groupBox9</cstring> + </property> + <property name="title"> + <string> Music Information Services </string> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_SelectEncoding</cstring> + </property> + <property name="text"> + <string>Allow en&coding selection:</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When this option is selected, you have the ability to select encoding for the results of a CDDB request. The standard describes CDDB results as being strictly Latin1. This is not true, as non-English speaking users often use other 8-bit encodings.</string> + </property> + </widget> + <widget class="QComboBox"> + <item> + <property name="text"> + <string>AUTO</string> + </property> + </item> + <item> + <property name="text"> + <string>UTF-8</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1250</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1251</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1252</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1253</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1254</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1255</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1256</string> + </property> + </item> + <item> + <property name="text"> + <string>CP1257</string> + </property> + </item> + <property name="name"> + <cstring>kcfg_SelectedEncoding</cstring> + </property> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </hbox> + </widget> + <spacer> + <property name="name"> + <cstring>spacer3</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>45</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<connections> + <connection> + <sender>kcfg_DigitalPlayback</sender> + <signal>toggled(bool)</signal> + <receiver>configWidgetUI</receiver> + <slot>kcfg_DigitalPlayback_toggled(bool)</slot> + </connection> + <connection> + <sender>kcfg_Docking</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_TrackAnnouncement</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_SelectEncoding</sender> + <signal>toggled(bool)</signal> + <receiver>configWidgetUI</receiver> + <slot>kcfg_SelectEncoding_toggled(bool)</slot> + </connection> +</connections> +<tabstops> + <tabstop>kcfg_ledColor</tabstop> + <tabstop>kcfg_BackColor</tabstop> + <tabstop>kcfg_Docking</tabstop> + <tabstop>kcfg_TrackAnnouncement</tabstop> + <tabstop>kcfg_SkipDelta</tabstop> + <tabstop>kcfg_Autoplay</tabstop> + <tabstop>kcfg_EjectOnFinish</tabstop> + <tabstop>kcfg_StopExit</tabstop> + <tabstop>kcfg_cdDevice</tabstop> + <tabstop>kcfg_DigitalPlayback</tabstop> + <tabstop>kcfg_AudioDevice</tabstop> +</tabstops> +<slots> + <slot>kcfg_DigitalPlayback_toggled( bool )</slot> + <slot>kcfg_SelectEncoding_toggled(bool)</slot> +</slots> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>kcolorbutton.h</includehint> + <includehint>kfontrequester.h</includehint> + <includehint>knuminput.h</includehint> + <includehint>kurlrequester.h</includehint> + <includehint>kcombobox.h</includehint> + <includehint>kpushbutton.h</includehint> + <includehint>klineedit.h</includehint> +</includehints> +</UI> Modified: branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg Fri Apr 27 16:40:05 2007 @@ -11,13 +11,8 @@ <label>Automatically start the applet on login</label> <default>true</default> </entry> - <entry name="Backend" type="Enum"> - <label>Update engine backend</label> - <choices> - <choice name="zypp"/> - <choice name="zmd"/> - </choices> - <default>zypp</default> - </entry> + <entry name="Backend" type="String"> + <label>The backend for connecting to package database.</label> + </entry> </group> -</kcfg> \ No newline at end of file +</kcfg> Modified: branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.ui URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.ui?rev=5458&r1=5457&r2=5458&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.ui (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.ui Fri Apr 27 16:40:05 2007 @@ -44,53 +44,106 @@ <string>Alt+T</string> </property> </widget> - <widget class="QButtonGroup"> + + <widget class="QGroupBox" row="0" column="0"> <property name="name"> - <cstring>kcfg_Backend</cstring> + <cstring>GroupBox3</cstring> </property> <property name="title"> - <string>Get Updates Via</string> + <string>Backend Selection</string> </property> - <vbox> + <property name="toolTip" stdset="0"> + <string></string> + </property> + <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="QPushButton" row="0" column="3"> <property name="name"> - <cstring>radioButton2</cstring> + <cstring>_configure</cstring> </property> <property name="text"> - <string>Default</string> + <string>Configure Backend...</string> + </property> + <property name="toolTip" stdset="0"> + <string>Configure backend options</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Configure bakend. Choose your update backend.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="QComboBox" row="0" column="2"> <property name="name"> - <cstring>radioButton1</cstring> + <cstring>_mixer</cstring> + </property> + <property name="toolTip" stdset="0"> + <string>Select backend</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Backend selector. Choose the plugin for your update system.</string> + </property> + </widget> + <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>textLabel1_2</cstring> </property> <property name="text"> - <string>Novell ZENWorks</string> + <string>Select backend:</string> + </property> + </widget> + <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <property name="name"> + <cstring>_author</cstring> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="toolTip" stdset="0"> + <string>Shows backend author</string> + </property> + <property name="whatsThis" stdset="0"> + <string></string> </property> </widget> - </vbox> + <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3"> + <property name="name"> + <cstring>_description</cstring> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="toolTip" stdset="0"> + <string>Shows backend description</string> + </property> + <property name="whatsThis" stdset="0"> + <string></string> + </property> + </widget> + <widget class="QLabel" row="1" column="0"> + <property name="name"> + <cstring>textLabel18</cstring> + </property> + <property name="text"> + <string>Author:</string> + </property> + </widget> + <widget class="QLabel" row="2" column="0"> + <property name="name"> + <cstring>textLabel17</cstring> + </property> + <property name="text"> + <string>Description:</string> + </property> + </widget> + + </grid> </widget> - <spacer> - <property name="name"> - <cstring>spacer1</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + </vbox> </widget> + + + <layoutdefaults spacing="6" margin="11"/> </UI> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org