Zypp Commits

Download

zypp-commit@lists.opensuse.org

May 2007

8 participants
191 discussions

[zypp-commit] r5465 - /branches/work/updater-kde-refactoring/updater-kde/updater/
by tgoettlicher＠svn.opensuse.org 02 May '07

02 May '07

Author: tgoettlicher Date: Wed May 2 15:10:39 2007 New Revision: 5465 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5465&view=rev Log: Code clean-up. Configuration dialog is working now. Added: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp - copied, changed from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h - copied, changed from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h - copied, changed from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui - copied, changed from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui Removed: 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 branches/work/updater-kde-refactoring/updater-kde/updater/updatersettingswidget_base.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/UpdaterApplication.cpp branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg Modified: branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt Wed May 2 15:10:39 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 configWidget.cpp configWidget.h configWidgetUI.h configWidgetUI.ui ${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 configWidgetUI.ui ) +kde3_add_ui_files( opensuseupdater_LIB_SRCS 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 configWidget.h configWidgetUI.h configWidgetUI.ui ) +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 ) Copied: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp (from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp) URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp Wed May 2 15:10:39 2007 @@ -1,5 +1,5 @@ /* - * configWidget - the config dialog page for KSCD settings + * ConfigWidget - the config dialog page for KSCD settings * * $Id: * @@ -29,18 +29,8 @@ #include <qcheckbox.h> #include <kcombobox.h> #include <qlayout.h> -/* -#include <config.h> -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" +#include <kparts/componentfactory.h> +#include "ConfigWidget.h" class SpecialComboBox : public KComboBox { @@ -58,63 +48,40 @@ } } ; -/* - * 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) +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()); + if (!name) + { + setName("ConfigWidget"); + } -*/ - kcfg_AudioSystem->insertStringList(QStringList("plugin")); -} + addBackendPlugins(); -configWidget::~configWidget() -{ -} -void configWidget::kcfg_DigitalPlayback_toggled(bool toggle) -{ } -void configWidget::getMediaDevices() +void ConfigWidget::addBackendPlugins() { + + KTrader::OfferList offers = KTrader::self()->query("openSUSEUpdater/Backend"); + + KTrader::OfferList::ConstIterator iter; + for(iter = offers.begin(); iter != offers.end(); ++iter ) + { + KService::Ptr service = *iter; + kcfg_backendPlugin->insertItem(service->name()); + } + + } - -void configWidget::kcfg_SelectEncoding_toggled(bool toggle) + + +ConfigWidget::~ConfigWidget() { } -#include "configWidget.moc" +#include "ConfigWidget.moc" Copied: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h (from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h) URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidget.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h Wed May 2 15:10:39 2007 @@ -1,5 +1,5 @@ /* - * configWidget - the config dialog page for KSCD settings + * ConfigWidget - the config dialog page for KSCD settings * * Copyright (c) 2002 Aaron J. Seigo <aseigo(a)kde.org> * Copyright (c) 2004 Alexander Kern <alex.kern(a)gmx.de> @@ -23,28 +23,24 @@ #ifndef CONFIGWIDGET_H #define CONFIGWIDGET_H -#include "configWidgetUI.h" +#include "ConfigWidgetUI.h" class KSCD; class SpecialComboBox; -class configWidget : public configWidgetUI +class ConfigWidget : public ConfigWidgetUI { Q_OBJECT public: - configWidget(QWidget* parent = 0, const char* name = 0); - ~configWidget(); + 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(); + // protected: +// SpecialComboBox* kcfg_BackendPlugin; + + private: + void addBackendPlugins(); }; #endif // CONFIGWIDGET_H Copied: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h (from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h) URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h Wed May 2 15:10:39 2007 @@ -1,7 +1,7 @@ /**************************************************************************** -** Form interface generated from reading ui file './configWidgetUI.ui' +** Form interface generated from reading ui file 'ConfigWidgetUI.ui' ** -** Created: Fr Apr 27 15:30:17 2007 +** Created: Mi Mai 2 15:05:21 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! @@ -17,65 +17,24 @@ class QHBoxLayout; class QGridLayout; class QSpacerItem; -class QGroupBox; -class QLabel; -class KColorButton; +class QSpinBox; class QCheckBox; -class KFontRequester; -class QButtonGroup; -class KIntNumInput; -class KURLComboRequester; -class KURLRequester; -class QFrame; -class QComboBox; +class KComboBox; -class configWidgetUI : public QWidget +class ConfigWidgetUI : public QWidget { Q_OBJECT public: - configWidgetUI( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~configWidgetUI(); + 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); + QSpinBox* kcfg_Interval; + QCheckBox* kcfg_Autostart; + KComboBox* kcfg_backendPlugin; protected: - QVBoxLayout* configWidgetUILayout; - QSpacerItem* spacer3; - QGridLayout* groupBox1Layout; - QSpacerItem* spacer1; - QGridLayout* buttonGroup1Layout; - QSpacerItem* spacer2; - QGridLayout* groupBox3Layout; - QHBoxLayout* groupBox9Layout; + QVBoxLayout* ConfigWidgetUILayout; protected slots: virtual void languageChange(); Copied: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui (from r5458, branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui) URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/configWidgetUI.ui (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui Wed May 2 15:10:39 2007 @@ -1,462 +1,63 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>configWidgetUI</class> +<class>ConfigWidgetUI</class> <widget class="QWidget"> <property name="name"> - <cstring>configWidgetUI</cstring> - </property> - <property name="enabled"> - <bool>true</bool> + <cstring>ConfigWidgetUI</cstring> </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>539</width> - <height>605</height> + <width>600</width> + <height>166</height> </rect> </property> + <property name="caption"> + <string>Form1</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="QSpinBox"> <property name="name"> - <cstring>groupBox1</cstring> + <cstring>kcfg_Interval</cstring> </property> - <property name="title"> - <string>Interface</string> + <property name="prefix"> + <string>Check For Updates Every </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 name="suffix"> + <string> Hours</string> </property> - <property name="title"> - <string>Play Options</string> + <property name="minValue"> + <number>1</number> </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"> + <widget class="QCheckBox"> <property name="name"> - <cstring>groupBox3</cstring> - </property> - <property name="title"> - <string>CD-ROM &Device</string> + <cstring>kcfg_Autostart</cstring> </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 name="text"> + <string>Automa&tically start updater on login</string> </property> - <property name="title"> - <string> Music Information Services </string> + <property name="accel"> + <string>Alt+T</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> + + <widget class="KComboBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>spacer3</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> + <cstring>kcfg_backendPlugin</cstring> </property> - <property name="sizeType"> - <enum>Expanding</enum> + <property name="whatsThis" stdset="0"> + <string>Backend for connection to package database</string> </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>45</height> - </size> - </property> - </spacer> + </widget> + </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/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp Wed May 2 15:10:39 2007 @@ -48,7 +48,7 @@ #include "UpdateListItem.h" #include "TrayIcon.h" -#include "configWidget.h" +#include "ConfigWidget.h" @@ -315,46 +315,31 @@ void MainWindow::configButtonClicked() { + kdDebug() << "MainWindow::configButtonClicked" << endl; - static configWidget* confWidget = 0; + 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")); - + confWidget = new ConfigWidget(0, "settings"); - /// ENDE - return; + configDialog->addPage(confWidget, i18n("openSUSEupdater"), "openSUSEupdater", i18n("Settings")); - - //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 - if ( KConfigDialog::showDialog( "updater-settings" ) ) - return; - //KConfigDialog didn't find an instance of this dialog, so lets create it : KConfigDialog* dialog = new KConfigDialog( this, "updater-settings", UpdaterSettings::self() ); - UpdaterSettingsWidget_Base* confWdg = new UpdaterSettingsWidget_Base( 0L, "General" ); +// UpdaterSettingsWidget_Base* confWdg = new UpdaterSettingsWidget_Base( 0L, "General" ); - dialog->addPage( confWdg, i18n("General"), "general" ); +// dialog->addPage( confWdg, i18n("General"), "general" ); - //User edited the configuration - update your local copies of the - //configuration data - connect( dialog, SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); + connect( configDialog, SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); - dialog->show(); + configDialog->show(); } void MainWindow::slotLoadConfig() Modified: branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp Wed May 2 15:10:39 2007 @@ -36,7 +36,7 @@ { loadPlugins(); - QString backend = UpdaterSettings::self()->backend(); + QString backend = UpdaterSettings::self()->backendPlugin(); // if ( backend == UpdaterSettings::EnumBackend::zmd ) // { Modified: branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/… ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg Wed May 2 15:10:39 2007 @@ -11,7 +11,7 @@ <label>Automatically start the applet on login</label> <default>true</default> </entry> - <entry name="Backend" type="String"> + <entry name="backendPlugin" type="String"> <label>The backend for connecting to package database.</label> </entry> </group> -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

Jump to page: