[zypp-commit] r5466 - /branches/work/updater-kde-refactoring/updater-kde/updater/

Author: tgoettlicher Date: Wed May 2 16:50:33 2007 New Revision: 5466 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5466&view=rev Log: Enhancements in plugin configuration Modified: 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/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/ConfigWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp?rev=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp Wed May 2 16:50:33 2007 @@ -25,29 +25,12 @@ #include #include #include -#include #include #include #include #include #include "ConfigWidget.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); - } -} ; - ConfigWidget::ConfigWidget(QWidget* parent, const char* name) : ConfigWidgetUI(parent, name) @@ -57,29 +40,29 @@ setName("ConfigWidget"); } - addBackendPlugins(); +//kapp->installKDEPropertyMap(); +//QSqlPropertyMap *map = QSqlPropertyMap::defaultMap(); +//map->insert("KComboBox", "currentText"); + } void ConfigWidget::addBackendPlugins() { + // search for available backend plugins and add them to the combobox 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()); + kcfg_BackendPlugin->insertItem(service->name()); } - - } - ConfigWidget::~ConfigWidget() { } Modified: 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=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h Wed May 2 16:50:33 2007 @@ -25,9 +25,6 @@ #include "ConfigWidgetUI.h" -class KSCD; -class SpecialComboBox; - class ConfigWidget : public ConfigWidgetUI { Q_OBJECT @@ -36,9 +33,6 @@ ConfigWidget(QWidget* parent = 0, const char* name = 0); ~ConfigWidget(); - // protected: -// SpecialComboBox* kcfg_BackendPlugin; - private: void addBackendPlugins(); }; Modified: 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=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h Wed May 2 16:50:33 2007 @@ -19,7 +19,7 @@ class QSpacerItem; class QSpinBox; class QCheckBox; -class KComboBox; +class QComboBox; class ConfigWidgetUI : public QWidget { @@ -31,7 +31,7 @@ QSpinBox* kcfg_Interval; QCheckBox* kcfg_Autostart; - KComboBox* kcfg_backendPlugin; + QComboBox* kcfg_BackendPlugin; protected: QVBoxLayout* ConfigWidgetUILayout; Modified: 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=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui Wed May 2 16:50:33 2007 @@ -45,9 +45,9 @@ </property> </widget> - <widget class="KComboBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="QComboBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>kcfg_backendPlugin</cstring> + <cstring>kcfg_BackendPlugin</cstring> </property> <property name="whatsThis" stdset="0"> <string>Backend for connection to package database</string> 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=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp Wed May 2 16:50:33 2007 @@ -315,31 +315,21 @@ void MainWindow::configButtonClicked() { - kdDebug() << "MainWindow::configButtonClicked" << endl; + static ConfigWidget* confWidget = 0; - static ConfigWidget* confWidget = 0; + if (KConfigDialog::showDialog("settings")) + return; - if (KConfigDialog::showDialog("settings")) { -// updateConfigDialog(confWidget); - return; - } + configDialog = new KConfigDialog(this, "settings", UpdaterSettings::self() ); + configDialog->setHelp(QString::null); - configDialog = new KConfigDialog(this, "settings", UpdaterSettings::self() ); - configDialog->setHelp(QString::null); + confWidget = new ConfigWidget(0, "settings"); + configDialog->addPage(confWidget, i18n("openSUSEupdater"), "openSUSEupdater", i18n("Settings")); - confWidget = new ConfigWidget(0, "settings"); - - configDialog->addPage(confWidget, i18n("openSUSEupdater"), "openSUSEupdater", i18n("Settings")); - - //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" ); - -// dialog->addPage( confWdg, i18n("General"), "general" ); + KConfigDialog* dialog = new KConfigDialog( this, "updater-settings", UpdaterSettings::self() ); - connect( configDialog, SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); - - configDialog->show(); + connect( configDialog, SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); + 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/updater-kde/updater/UpdaterApplication.cpp?rev=5466&r1=5465&r2=5466&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp Wed May 2 16:50:33 2007 @@ -36,7 +36,13 @@ { loadPlugins(); - QString backend = UpdaterSettings::self()->backendPlugin(); +// QString backend = UpdaterSettings::self()->backendPlugin(); +// QString backend = UpdaterSettings::self()->backendPlugin(); + + kdDebug() << "BACKEND:" << endl; + kdDebug() << UpdaterSettings::self()->backendPlugin() << endl;; + kdDebug() << "BACKEND" << endl; + // 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/updater-kde/updater/opensuseupdater_settings.kcfg?rev=5466&r1=5465&r2=5466&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 Wed May 2 16:50:33 2007 @@ -11,7 +11,7 @@ <label>Automatically start the applet on login</label> <default>true</default> </entry> - <entry name="backendPlugin" 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org