Author: tgoettlicher Date: Mon May 7 17:37:26 2007 New Revision: 5511 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5511&view=rev Log: backup 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/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=5511&r1=5510&r2=5511&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp Mon May 7 17:37:26 2007 @@ -19,6 +19,7 @@ * */ +#include #include #include #include @@ -26,10 +27,13 @@ #include #include #include -#include "ConfigWidget.h" #include #include +#include + +#include "ConfigWidget.h" + ConfigWidget::ConfigWidget(QWidget* parent, const char* name) : ConfigWidgetUI(parent, name) @@ -47,6 +51,15 @@ map->insert("QComboBox", "currentText"); addBackendPlugins(); + + + (new QVBoxLayout(BackendFrame))->setAutoAdd(true); +// kcfg_BackendPlugin2 = new KPluginSelector(BackendFrame, "kcfg_BackendPlugin2"); +// kcfg_BackendPlugin2 = new KPluginSelector(BackendFrame, "kcfg_BackendPlugin2"); + box = new QPushButton ( BackendFrame , "BOX"); + + + } void ConfigWidget::addBackendPlugins() @@ -58,7 +71,7 @@ for(iter = offers.begin(); iter != offers.end(); ++iter ) { KService::Ptr service = *iter; - kcfg_BackendPlugin->insertItem(service->name()); + kcfg_BackendPlugin->insertItem(service->comment()); } } 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=5511&r1=5510&r2=5511&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.h Mon May 7 17:37:26 2007 @@ -22,6 +22,9 @@ #include "ConfigWidgetUI.h" + +class KPluginSelector; + class ConfigWidget : public ConfigWidgetUI { Q_OBJECT @@ -32,6 +35,11 @@ private: void addBackendPlugins(); + + KPluginSelector* kcfg_BackendPlugin2; + + QPushButton* box; + }; #endif // CONFIGWIDGET_H 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=5511&r1=5510&r2=5511&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.h Mon May 7 17:37:26 2007 @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'ConfigWidgetUI.ui' ** -** Created: Mi Mai 2 15:05:21 2007 +** Created: Mo Mai 7 16:40:48 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! @@ -12,7 +12,6 @@ #include #include -#include "ConfigWidget.h" class QVBoxLayout; class QHBoxLayout; @@ -21,6 +20,7 @@ class QSpinBox; class QCheckBox; class QComboBox; +class QFrame; class ConfigWidgetUI : public QWidget { @@ -33,6 +33,7 @@ QSpinBox* kcfg_Interval; QCheckBox* kcfg_Autostart; QComboBox* kcfg_BackendPlugin; + QFrame* BackendFrame; 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=5511&r1=5510&r2=5511&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidgetUI.ui Mon May 7 17:37:26 2007 @@ -54,6 +54,20 @@ </property> </widget> + <widget class="QFrame" row="2" column="2"> + <property name="name"> + <cstring>BackendFrame</cstring> + </property> + <property name="frameShape"> + <enum>NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>Plain</enum> + </property> + </widget> + + + </vbox> </widget> 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=5511&r1=5510&r2=5511&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp Mon May 7 17:37:26 2007 @@ -37,13 +37,10 @@ , _main(0L), _updater(0L) { - _main = new MainWindow(UpdaterCapabilities()); connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(slotAppletError(const QString &))); connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(configButtonClicked())); - - // connect(_main, SIGNAL(signalConfigChanged()), this, SLOT(slotConfigChanged())); - + connect(_main, SIGNAL(signalConfigChanged()), this, SLOT(slotConfigChanged())); selectPlugin(); setMainWidget(_main); @@ -61,7 +58,7 @@ if (plugin && errCode == 0 ) { _updater = plugin; - kdDebug() << "Backend plugin \"" << service->name() << "\" loaded." << endl; + kdDebug() << "Backend plugin \"" << service->comment() << "\" loaded." << endl; return true; } else @@ -102,6 +99,20 @@ kdDebug() << "CONFIG CHANGED" << endl; + if ( _updater ) + { + _updater->shutdown(); + delete _updater; + } + + disconnect(_updater,0, _main,0); + disconnect(_main,0, _updater,0); + + selectPlugin(); + + if (_updater != NULL ) + setupUpdater(_updater); + } @@ -122,10 +133,10 @@ { KService::Ptr service = *iter; - kdDebug() << "Found backend plugin \"" << service->name() << "\"" << endl; - if (service->name() == backend) + kdDebug() << "Found backend plugin \"" << service->comment() << "\"" << endl; + if (service->comment() == backend) { - kdDebug() << "Trying to load backend plugin \"" << service->name() << "\"." << endl; + kdDebug() << "Trying to load backend plugin \"" << service->comment() << "\"." << endl; loadPlugin(service); pluginFound = true; } @@ -142,7 +153,7 @@ if (iter != offers.end()) { KService::Ptr service = *iter; - UpdaterSettings::setBackendPlugin(service->name()); + UpdaterSettings::setBackendPlugin(service->comment()); } UpdaterSettings::writeConfig(); 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=5511&r1=5510&r2=5511&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 Mon May 7 17:37:26 2007 @@ -14,5 +14,8 @@ <entry name="BackendPlugin" type="String"> <label>The backend for connecting to package database.</label> </entry> + <entry name="BackendPlugin2" type="String"> + <label>The backend for connecting to package database.</label> + </entry> </group> </kcfg> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org