Author: tgoettlicher Date: Wed May 9 14:57:44 2007 New Revision: 5522 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5522&view=rev Log: Rewrite of ConfigWidget with synchronized Combobox and LineInput because we wanted to get rid of SqlPropertyMap. Added: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop Modified: branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt 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/dummy/CMakeLists.txt branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy.desktop branches/work/updater-kde-refactoring/updater-kde/updater/opensuseupdater_settings.kcfg branches/work/updater-kde-refactoring/updater-kde/updater/zypp/opensuseupdater_zypp.desktop 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=5522&r1=5521&r2=5522&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/CMakeLists.txt Wed May 9 14:57:44 2007 @@ -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 ) 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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -19,7 +19,6 @@ * */ -#include #include #include #include @@ -29,9 +28,11 @@ #include #include #include - #include +#include +#include +#include "opensuseupdater_settings.h" #include "ConfigWidget.h" @@ -44,35 +45,41 @@ setName("ConfigWidget"); } - // following lines enable storing backend plugin name - // otherwise we would store the combobox itemnumber in config file which is worthless - kapp->installKDEPropertyMap(); - QSqlPropertyMap *map = QSqlPropertyMap::defaultMap(); - map->insert("QComboBox", "currentText"); - - addBackendPlugins(); + (new QVBoxLayout(BackendFrame))->setAutoAdd(true); + comboBackendPlugin = new QComboBox(BackendFrame, "BackendPlugin"); + kcfg_BackendPlugin = new QLineEdit(BackendFrame, "kcfg_BackendPlugin"); +// kcfg_BackendPlugin->hide(); - (new QVBoxLayout(BackendFrame))->setAutoAdd(true); -// kcfg_BackendPlugin2 = new KPluginSelector(BackendFrame, "kcfg_BackendPlugin2"); -// kcfg_BackendPlugin2 = new KPluginSelector(BackendFrame, "kcfg_BackendPlugin2"); - box = new QPushButton ( BackendFrame , "BOX"); + addBackendPlugins(); + connect( comboBackendPlugin, SIGNAL(activated(int)), this, SLOT( slotPluginComboChanged(int) ) ); } void ConfigWidget::addBackendPlugins() { - // search for available backend plugins and add them to the combobox + + // search for all available backend plugins and add them to the combobox + + QString backend = UpdaterSettings::self()->backendPlugin(); 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->comment()); + comboBackendPlugin->insertItem(service->comment()); + + pluginMap[comboBackendPlugin->count()-1] = service->name() ; + + if ( service->name() == backend ) + comboBackendPlugin->setCurrentItem(comboBackendPlugin->count()-1); } + UpdaterSettings::self()->setBackendPlugin(pluginMap[comboBackendPlugin->currentItem()]); + UpdaterSettings::self()->writeConfig(); + } @@ -80,4 +87,11 @@ { } + +void ConfigWidget::slotPluginComboChanged(int index) +{ + kcfg_BackendPlugin->setText(pluginMap[index]); +} + + #include "ConfigWidget.moc" 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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -21,9 +21,10 @@ #define CONFIGWIDGET_H #include "ConfigWidgetUI.h" +//#include "AdvancedComboBox.h" +#include "qcombobox.h" - -class KPluginSelector; +typedef QMap PluginMap; class ConfigWidget : public ConfigWidgetUI { @@ -36,9 +37,13 @@ private: void addBackendPlugins(); - KPluginSelector* kcfg_BackendPlugin2; +// AdvancedComboBox* comboBackendPlugin; + QComboBox* comboBackendPlugin; + QLineEdit* kcfg_BackendPlugin; + PluginMap pluginMap; - QPushButton* box; + private slots: + void slotPluginComboChanged(int index); }; 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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -21,6 +21,7 @@ class QCheckBox; class QComboBox; class QFrame; +class KPluginSelector; class ConfigWidgetUI : public QWidget { @@ -32,7 +33,6 @@ QSpinBox* kcfg_Interval; QCheckBox* kcfg_Autostart; - QComboBox* kcfg_BackendPlugin; QFrame* BackendFrame; protected: 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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -45,31 +45,21 @@ </property> </widget> - <widget class="QComboBox" row="0" column="0" rowspan="1" colspan="3"> - <property name="name"> - <cstring>kcfg_BackendPlugin</cstring> - </property> - <property name="whatsThis" stdset="0"> - <string>Backend for connection to package database</string> - </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> - + <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> + </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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -58,7 +58,7 @@ if (plugin && errCode == 0 ) { _updater = plugin; - kdDebug() << "Backend plugin \"" << service->comment() << "\" loaded." << endl; + kdDebug() << "Backend plugin \"" << service->name() << "\" loaded." << endl; return true; } else @@ -97,7 +97,13 @@ void UpdaterApplication::slotConfigChanged() { + + kdDebug() << "CONFIG CHANGED" << endl; + kdDebug() << "Unable to connect new plugin. " << endl; + kdDebug() << "Restart Application to use new plugin " << endl; + + return; if ( _updater ) { @@ -133,30 +139,16 @@ { KService::Ptr service = *iter; - kdDebug() << "Found backend plugin \"" << service->comment() << "\"" << endl; - if (service->comment() == backend) + kdDebug() << "Found backend plugin \"" << service->name() << "\"" << endl; + if (service->name() == backend) { - kdDebug() << "Trying to load backend plugin \"" << service->comment() << "\"." << endl; + kdDebug() << "Trying to load backend plugin \"" << service->name() << "\"." << endl; loadPlugin(service); pluginFound = true; } } if (!pluginFound) { - // Our configuration data contains no available backend plugin - // therefor we preselect the fist available backend plugin - // because kcfg would overwrite this item with invalid data - // at the config dialog - - - iter = offers.begin(); - if (iter != offers.end()) - { - KService::Ptr service = *iter; - UpdaterSettings::setBackendPlugin(service->comment()); - } - UpdaterSettings::writeConfig(); - emit(pluginError(i18n("Backend plugin is not properly configured.\nPlease use the configuration dialog to choose the correct one."))); } } Modified: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/CMakeLists.txt?rev=5522&r1=5521&r2=5522&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/CMakeLists.txt (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/CMakeLists.txt Wed May 9 14:57:44 2007 @@ -15,4 +15,6 @@ ########### install files ############### INSTALL_FILES( /share/services FILES opensuseupdater_dummy.desktop ) +INSTALL_FILES( /share/services FILES opensuseupdater_dummy2.desktop ) +INSTALL_FILES( /share/services FILES opensuseupdater_dummy3.desktop ) Modified: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy.desktop URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy.desktop?rev=5522&r1=5521&r2=5522&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy.desktop (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy.desktop Wed May 9 14:57:44 2007 @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Dummy backend -Comment=Dummy backend for openSUSE updater +Name=dummy_backend +Comment=Dummy Backend ServiceTypes=openSUSEUpdater/Backend Type=Service X-KDE-Library=opensuseupdater_dummy Added: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop?rev=5522&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop Wed May 9 14:57:44 2007 @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=dummy_backend2 +Comment=Dummy Backend2 +ServiceTypes=openSUSEUpdater/Backend +Type=Service +X-KDE-Library=opensuseupdater_dummy Added: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop?rev=5522&view=auto ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop (added) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop Wed May 9 14:57:44 2007 @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=dummy_backend3 +Comment=Dummy Backend3 +ServiceTypes=openSUSEUpdater/Backend +Type=Service +X-KDE-Library=opensuseupdater_dummy 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=5522&r1=5521&r2=5522&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 9 14:57:44 2007 @@ -14,8 +14,5 @@ <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> Modified: branches/work/updater-kde-refactoring/updater-kde/updater/zypp/opensuseupdater_zypp.desktop URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/zypp/opensuseupdater_zypp.desktop?rev=5522&r1=5521&r2=5522&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/zypp/opensuseupdater_zypp.desktop (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/zypp/opensuseupdater_zypp.desktop Wed May 9 14:57:44 2007 @@ -1,6 +1,6 @@ [Desktop Entry] -Name=ZYpp backend -Comment=ZYpp backend for openSUSE updater +Name=zypp_backend +Comment=ZYpp Backend ServiceTypes=openSUSEUpdater/Backend Type=Service X-KDE-Library=opensuseupdater_zypp -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org