![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package opensuse-updater checked in at Tue Oct 24 14:38:05 CEST 2006. -------- --- KDE/opensuse-updater/opensuse-updater.changes 2006-10-23 18:31:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/opensuse-updater/opensuse-updater.changes 2006-10-24 14:22:50.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 24 14:22:23 CEST 2006 - dmacvicar@suse.de + +- fixed tarball submission + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-updater.spec ++++++ --- /var/tmp/diff_new_pack.9NHMc1/_old 2006-10-24 14:37:53.000000000 +0200 +++ /var/tmp/diff_new_pack.9NHMc1/_new 2006-10-24 14:37:53.000000000 +0200 @@ -15,7 +15,7 @@ Group: System/Management Summary: KDE updater applet for OpenSUSE Version: 0.3 -Release: 8 +Release: 10 URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: opensuseupdater-%{version}.tar.bz2 @@ -68,6 +68,8 @@ /opt/kde3/share/services/* %changelog -n opensuse-updater +* Tue Oct 24 2006 - dmacvicar@suse.de +- fixed tarball submission * Mon Oct 23 2006 - dmacvicar@suse.de - string fixes - Use KConfigXT and KConfigDialog instead of ++++++ opensuseupdater-0.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/Makefile.in new/opensuseupdater-0.3/Makefile.in --- old/opensuseupdater-0.3/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -960,7 +960,7 @@ #>+ 2 -KDE_DIST=stamp-h.in subdirs Makefile.in opensuse-updater.spec.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile Makefile.am configure acinclude.m4 +KDE_DIST=stamp-h.in subdirs Makefile.in opensuse-updater.spec.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile Makefile.am configure acinclude.m4 subdirs.cvs.sh.7080 #>+ 2 docs-am: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/doc/en/Makefile.in new/opensuseupdater-0.3/doc/en/Makefile.in --- old/opensuseupdater-0.3/doc/en/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/doc/en/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -494,7 +494,7 @@ #>+ 2 -KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2 +KDE_DIST=Makefile.in index.docbook Makefile.am #>+ 24 index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook Binary files old/opensuseupdater-0.3/doc/en/index.cache.bz2 and new/opensuseupdater-0.3/doc/en/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/kzmdauthutil/Makefile.in new/opensuseupdater-0.3/kzmdauthutil/Makefile.in --- old/opensuseupdater-0.3/kzmdauthutil/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/kzmdauthutil/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -626,7 +626,7 @@ #>+ 2 -KDE_DIST=Makefile.in Makefile.am kzmdauthutil +KDE_DIST=Makefile.in Makefile.am #>+ 2 docs-am: Binary files old/opensuseupdater-0.3/kzmdauthutil/kzmdauthutil and new/opensuseupdater-0.3/kzmdauthutil/kzmdauthutil differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/subdirs.cvs.sh.7080 new/opensuseupdater-0.3/subdirs.cvs.sh.7080 --- old/opensuseupdater-0.3/subdirs.cvs.sh.7080 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/subdirs.cvs.sh.7080 2006-10-23 15:42:30.000000000 +0200 @@ -0,0 +1,7 @@ +doc +images +kxmlrpcclient +kzmdauthutil +po +udshttp +updater diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/udshttp/test/Makefile.in new/opensuseupdater-0.3/udshttp/test/Makefile.in --- old/opensuseupdater-0.3/udshttp/test/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/udshttp/test/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -672,7 +672,7 @@ -rm -f udstest.moc.cpp #>+ 2 -KDE_DIST=Makefile.in udstest Makefile.am +KDE_DIST=Makefile.in Makefile.am #>+ 2 docs-am: Binary files old/opensuseupdater-0.3/udshttp/test/udstest and new/opensuseupdater-0.3/udshttp/test/udstest differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/GeneralConfigWindow.cpp new/opensuseupdater-0.3/updater/GeneralConfigWindow.cpp --- old/opensuseupdater-0.3/updater/GeneralConfigWindow.cpp 2006-10-12 11:34:35.000000000 +0200 +++ new/opensuseupdater-0.3/updater/GeneralConfigWindow.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,139 +0,0 @@ -/* - Copyright (C) 2006 Narayan Newton <narayannewton@gmail.com> - - 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 of the License, 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <klocale.h> -#include <kconfig.h> -#include <kapp.h> -#include <kpushbutton.h> - -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qradiobutton.h> - -#include "HeaderWidget.h" -#include "GeneralConfigWindow.h" -#include "Constants.h" - -enum { GCONFIG_ZMD = 0, GCONFIG_ZYPP }; - -GeneralConfigWindow::GeneralConfigWindow() : QWidget(NULL, NULL, Qt::WDestructiveClose) { - - config = KGlobal::config(); - config->setGroup("General"); - initGUI(); - readConfig(); -} - -void GeneralConfigWindow::initGUI() { - - mainLayout = new QVBoxLayout(this); - header = new HeaderWidget(this); - intervalSpin = new QSpinBox(this); - backendGroup = new QVButtonGroup(i18n("Get updates via:"), this); - cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - okButton = new KPushButton(KStdGuiItem::ok(), this); - autostartButton = new QCheckBox(i18n("Automatically start updater on login"), this); - - header->setDescription(i18n("<b>Configure The Updater:</b><br> Below you can select the updater you would like to use and when we should check for updates<br><u>After switching backends, this applet must be restarted</u>")); - mainLayout->addWidget(header, false, 0); - - intervalSpin->setPrefix(i18n("Check For Updates Every ")); - intervalSpin->setSuffix(i18n(" Minutes")); - intervalSpin->setMinValue(0); - mainLayout->addWidget(intervalSpin, false, 0); - - mainLayout->addWidget(autostartButton, false, 0); - - QRadioButton *zmdButton = new QRadioButton(i18n("Novell ZenWorks"), backendGroup); - QRadioButton *zyppButton = new QRadioButton(i18n("Default"), backendGroup); -// QRadioButton *zyppButton = new QRadioButton(i18n("ZYPP Updater"), backendGroup); - backendGroup->setRadioButtonExclusive(true); - mainLayout->addWidget(backendGroup, false, 0); - - buttonLayout = new QHBoxLayout(mainLayout); - buttonLayout->addWidget(okButton, false, Qt::AlignLeft); - buttonLayout->addWidget(cancelButton, false, Qt::AlignRight); - - connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); - connect(okButton, SIGNAL(clicked()), this, SLOT(okButtonClicked())); - - mainLayout->setSpacing(10); - mainLayout->setMargin(10); - setCaption(i18n("Configuration")); -} - -void GeneralConfigWindow::readConfig() { - - intervalSpin->setValue((config->readEntry("Interval").toInt())); - if (intervalSpin->value() <= 0) - intervalSpin->setValue(15); - - QString backend = config->readEntry("Backend"); - - if ( backend == "zmd" ) - { - backendGroup->setButton(GCONFIG_ZMD); - } - if ( backend == "zypp" ) - { - backendGroup->setButton(GCONFIG_ZYPP); - } - else - { - backendGroup->setButton(GCONFIG_ZYPP); - } - - switch(config->readEntry("Autostart") == "true") { - - case true: - autostartButton->setChecked(true); - break; - case false: - autostartButton->setChecked(false); - break; - default: - autostartButton->setChecked(false); - break; - } -} - -void GeneralConfigWindow::okButtonClicked() { - - config->setGroup("General"); - - switch (backendGroup->selectedId()) { - case GCONFIG_ZMD: - config->writeEntry("Backend", "zmd"); - break; - case GCONFIG_ZYPP: - config->writeEntry("Backend", "zypp"); - break; - default: - config->writeEntry("Backend", "zypp"); - break; - } - - config->writeEntry("Interval", intervalSpin->value()); - config->writeEntry("Autostart", autostartButton->isChecked()); - emit(configChanged()); - close(); -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/GeneralConfigWindow.h new/opensuseupdater-0.3/updater/GeneralConfigWindow.h --- old/opensuseupdater-0.3/updater/GeneralConfigWindow.h 2006-10-02 11:09:14.000000000 +0200 +++ new/opensuseupdater-0.3/updater/GeneralConfigWindow.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -/* - Copyright (C) 2006 Narayan Newton <narayannewton@gmail.com> - - 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 of the License, 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _GENERAL_CONFIG_WINDOW_H_ -#define _GENERAL_CONFIG_WINDOW_H_ - -#include <qwidget.h> - -class HeaderWidget; -class KConfig; -class QCheckBox; -class KPushButton; -class QSpinBox; -class QVButtonGroup; -class QHBoxLayout; -class QVBoxLayout; - -/** - @file - - Defines our global configuration window - - @author Narayan Newton <narayannewton@gmail.com> -**/ - -/** - Global Configuration Window - - @author Narayan Newton <narayannewton@gmail.com> -**/ -class GeneralConfigWindow : public QWidget { - - Q_OBJECT - - public: - - GeneralConfigWindow(); - - signals: - - void configChanged(); - - private slots: - - void okButtonClicked(); - - private: - - void initGUI(); - void readConfig(); - - HeaderWidget *header; - QVBoxLayout *mainLayout; - QHBoxLayout *buttonLayout; - QVButtonGroup *backendGroup; - QSpinBox *intervalSpin; - KPushButton *cancelButton; - KPushButton *okButton; - QCheckBox *autostartButton; - KConfig *config; -}; - - -#endif - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/MainWindow.cpp new/opensuseupdater-0.3/updater/MainWindow.cpp --- old/opensuseupdater-0.3/updater/MainWindow.cpp 2006-10-19 15:52:44.000000000 +0200 +++ new/opensuseupdater-0.3/updater/MainWindow.cpp 2006-10-23 18:12:15.000000000 +0200 @@ -37,7 +37,9 @@ #include "Constants.h" #include "HeaderWidget.h" #include "MainWindow.h" -#include "GeneralConfigWindow.h" +#include "kconfigdialog.h" +#include "updatersettingswidget_base.h" +#include "opensuseupdater_settings.h" #include "Updater.h" #include "UpdateListItem.h" #include "TrayIcon.h" @@ -55,7 +57,7 @@ connect(applet, SIGNAL(quitSelected()), this, SLOT(slotExit())); timer = new QTimer(this); - readConfig(); + slotConfigChanged(); connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdates())); //timerInterval is read in by readConfig timer->start(timerInterval,false); @@ -74,16 +76,10 @@ **************************************************************/ // Read in the config, just the interval really as we cannot deal with the updater itself -void MainWindow::readConfig() +void MainWindow::slotConfigChanged() { - KConfig *config = KGlobal::config(); int interval; - - config->setGroup("General"); - if ((interval = config->readEntry("Interval").toInt()) <= 0) { - interval = 15; // set a reasonable default - } - interval = interval * 60 * 1000; // convert to ms + interval = UpdaterSettings::self()->interval() * 60 * 1000; // convert to ms timerInterval = interval; timer->changeInterval(timerInterval); } @@ -96,7 +92,7 @@ header = new HeaderWidget(this); updateList = new QListView(this); packageDescription = new KTextEdit(this); - configureButton = new KPushButton(i18n("Add/Remove Servers"), this); + configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), this); cancelButton = new KPushButton(KStdGuiItem::cancel(), this); installButton = new KPushButton(i18n("Install"), this); @@ -144,7 +140,7 @@ connect(clearSelectionButton, SIGNAL(clicked()), this, SLOT(clearButtonClicked())); } - header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br> <u>Select those you would like and press install.</u>")); + header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>")); updateList->addColumn(i18n("Name"), 300); updateList->setColumnWidthMode(COLUMN_NAME, QListView::Manual); @@ -176,10 +172,11 @@ return; } -void MainWindow::initMenu() { +void MainWindow::initMenu() +{ KPopupMenu *menu = applet->contextMenu(); - menu->insertItem(i18n("Configure Applet"), this, SLOT(configButtonClicked()),0,-1,1); - menu->insertItem(i18n("Add/Remove Servers"), this, SLOT(serverButtonClicked()),0,-1,1); + menu->insertItem(i18n("Configure Applet..."), this, SLOT(configButtonClicked()),0,-1,1); + menu->insertItem(i18n("Add/Remove Update Sources..."), this, SLOT(serverButtonClicked()),0,-1,1); } /* @@ -284,10 +281,35 @@ emit(configureUpdater()); } -void MainWindow::configButtonClicked() { - GeneralConfigWindow *win = new GeneralConfigWindow(); //deletes itself - connect(win, SIGNAL(configChanged()), this, SLOT(readConfig())); - win->show(); +void MainWindow::configButtonClicked() +{ + //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" ); + + 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()) ); + + dialog->show(); +} + +void MainWindow::slotLoadConfig() +{ + +} + +void MainWindow::slotSaveConfig() +{ + } void MainWindow::installButtonClicked() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/MainWindow.h new/opensuseupdater-0.3/updater/MainWindow.h --- old/opensuseupdater-0.3/updater/MainWindow.h 2006-10-19 15:40:08.000000000 +0200 +++ new/opensuseupdater-0.3/updater/MainWindow.h 2006-10-23 18:11:43.000000000 +0200 @@ -140,9 +140,20 @@ void checkUpdates(); /** + react to value changes + */ + void slotConfigChanged(); + + /** Reads in the config file */ - void readConfig(); + void slotLoadConfig(); + + /** + Saves in the config file + */ + void slotSaveConfig(); + /** Hides and deletes the "Select All" and "Clear Selection" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/Makefile.am new/opensuseupdater-0.3/updater/Makefile.am --- old/opensuseupdater-0.3/updater/Makefile.am 2006-10-16 14:54:31.000000000 +0200 +++ new/opensuseupdater-0.3/updater/Makefile.am 2006-10-23 18:26:12.000000000 +0200 @@ -16,10 +16,12 @@ opensuseupdater_LDADD = $(LIB_KFILE) $(top_builddir)/kxmlrpcclient/libkxmlrpcclient.la -lkxmlrpcclient $(top_builddir)/updater/zmd/libopensuseupdater_zmd.la $(top_builddir)/updater/zypp/libopensuseupdater_zypp.la # which sources should be compiled for kzmdupdater -opensuseupdater_SOURCES = main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp GeneralConfigWindow.cpp UpdateListItem.cpp TrayIcon.cpp +opensuseupdater_SOURCES = main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp UpdateListItem.cpp TrayIcon.cpp opensuseupdater_settings.kcfgc updatersettingswidget_base.ui + +kde_kcfg_DATA = opensuseupdater_settings.kcfg # these are the headers for your project that won't be installed -noinst_HEADERS = MainWindow.h HeaderWidget.h Updater.h UpdaterApplication.h UpdaterCapabilities.h GeneralConfigWindow.h UpdateListItem.h TrayIcon.h +noinst_HEADERS = MainWindow.h HeaderWidget.h Updater.h UpdaterApplication.h UpdaterCapabilities.h UpdateListItem.h TrayIcon.h # let automoc handle all of the meta source files (moc) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/Makefile.in new/opensuseupdater-0.3/updater/Makefile.in --- old/opensuseupdater-0.3/updater/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/updater/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -52,21 +52,20 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(kde_kcfgdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_opensuseupdater_OBJECTS = main.$(OBJEXT) MainWindow.$(OBJEXT) \ HeaderWidget.$(OBJEXT) UpdaterApplication.$(OBJEXT) \ - GeneralConfigWindow.$(OBJEXT) UpdateListItem.$(OBJEXT) \ - TrayIcon.$(OBJEXT) + UpdateListItem.$(OBJEXT) TrayIcon.$(OBJEXT) #>- opensuseupdater_OBJECTS = $(am_opensuseupdater_OBJECTS) -#>+ 8 +#>+ 7 opensuseupdater_final_OBJECTS = opensuseupdater.all_cpp.o opensuseupdater_nofinal_OBJECTS = main.$(OBJEXT) MainWindow.$(OBJEXT) \ HeaderWidget.$(OBJEXT) UpdaterApplication.$(OBJEXT) \ - GeneralConfigWindow.$(OBJEXT) UpdateListItem.$(OBJEXT) \ - TrayIcon.$(OBJEXT)\ -Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o GeneralConfigWindow.moc.o TrayIcon.moc.o + UpdateListItem.$(OBJEXT) TrayIcon.$(OBJEXT) updatersettingswidget_base.$(OBJEXT) opensuseupdater_settings.$(OBJEXT)\ +Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o TrayIcon.moc.o @KDE_USE_FINAL_FALSE@opensuseupdater_OBJECTS = $(opensuseupdater_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@opensuseupdater_OBJECTS = $(opensuseupdater_final_OBJECTS) am__DEPENDENCIES_1 = @@ -117,7 +116,8 @@ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; desktopDATA_INSTALL = $(INSTALL_DATA) -DATA = $(desktop_DATA) +kde_kcfgDATA_INSTALL = $(INSTALL_DATA) +DATA = $(desktop_DATA) $(kde_kcfg_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -389,10 +389,13 @@ opensuseupdater_LDADD = $(LIB_KFILE) $(top_builddir)/kxmlrpcclient/libkxmlrpcclient.la -lkxmlrpcclient $(top_builddir)/updater/zmd/libopensuseupdater_zmd.la $(top_builddir)/updater/zypp/libopensuseupdater_zypp.la # which sources should be compiled for kzmdupdater -opensuseupdater_SOURCES = main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp GeneralConfigWindow.cpp UpdateListItem.cpp TrayIcon.cpp +#>- opensuseupdater_SOURCES = main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp UpdateListItem.cpp TrayIcon.cpp opensuseupdater_settings.kcfgc updatersettingswidget_base.ui +#>+ 1 +opensuseupdater_SOURCES=main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp UpdateListItem.cpp TrayIcon.cpp updatersettingswidget_base.cpp opensuseupdater_settings.cpp +kde_kcfg_DATA = opensuseupdater_settings.kcfg # these are the headers for your project that won't be installed -noinst_HEADERS = MainWindow.h HeaderWidget.h Updater.h UpdaterApplication.h UpdaterCapabilities.h GeneralConfigWindow.h UpdateListItem.h TrayIcon.h +noinst_HEADERS = MainWindow.h HeaderWidget.h Updater.h UpdaterApplication.h UpdaterCapabilities.h UpdateListItem.h TrayIcon.h # let automoc handle all of the meta source files (moc) #>- METASOURCES = AUTO @@ -487,7 +490,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GeneralConfigWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HeaderWidget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MainWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrayIcon.Po@am__quote@ @@ -542,6 +544,23 @@ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ done +install-kde_kcfgDATA: $(kde_kcfg_DATA) + @$(NORMAL_INSTALL) + test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)" + @list='$(kde_kcfg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \ + $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \ + done + +uninstall-kde_kcfgDATA: + @$(NORMAL_UNINSTALL) + @list='$(kde_kcfg_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \ + rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \ + done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -723,7 +742,7 @@ all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(kde_kcfgdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -756,7 +775,7 @@ #>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am #>+ 1 -clean-am: clean-metasources clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-metasources clean-ui clean-kcfg clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -774,9 +793,11 @@ info-am: -#>- install-data-am: install-data-local install-desktopDATA -#>+ 1 -install-data-am: install-kde-icons install-data-local install-desktopDATA +#>- install-data-am: install-data-local install-desktopDATA \ +#>- install-kde_kcfgDATA +#>+ 2 +install-data-am: install-kde-icons install-data-local install-desktopDATA \ + install-kde_kcfgDATA install-exec-am: install-binPROGRAMS @@ -805,10 +826,10 @@ ps-am: #>- uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ -#>- uninstall-info-am uninstall-local +#>- uninstall-info-am uninstall-kde_kcfgDATA uninstall-local #>+ 2 uninstall-am: uninstall-kde-icons uninstall-binPROGRAMS uninstall-desktopDATA \ - uninstall-info-am uninstall-local + uninstall-info-am uninstall-kde_kcfgDATA uninstall-local uninstall-info: uninstall-info-recursive @@ -820,14 +841,14 @@ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-local \ install-desktopDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + install-info-am install-kde_kcfgDATA install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-desktopDATA uninstall-info-am \ - uninstall-local + uninstall-kde_kcfgDATA uninstall-local messages: rc.cpp @@ -959,13 +980,6 @@ mocs: HeaderWidget.moc.cpp #>+ 3 -GeneralConfigWindow.moc.cpp: $(srcdir)/GeneralConfigWindow.h - $(MOC) $(srcdir)/GeneralConfigWindow.h -o GeneralConfigWindow.moc.cpp - -#>+ 2 -mocs: GeneralConfigWindow.moc.cpp - -#>+ 3 TrayIcon.moc.cpp: $(srcdir)/TrayIcon.h $(MOC) $(srcdir)/TrayIcon.h -o TrayIcon.moc.cpp @@ -974,10 +988,20 @@ #>+ 3 clean-metasources: - -rm -f Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp GeneralConfigWindow.moc.cpp TrayIcon.moc.cpp + -rm -f Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp TrayIcon.moc.cpp #>+ 2 -KDE_DIST=opensusestart.desktop hi64-app-opensuse-updater.png opensuseupdater.desktop Makefile.in log hi16-app-opensuse-updater.png hi48-app-opensuse-updater.png opensuseupdater hi128-app-opensuse-updater.png Makefile.am hi32-app-opensuse-updater.png Constants.h +KDE_DIST=hi64-app-opensuse-updater.png opensuseupdater.desktop updatersettingswidget_base.ui hi16-app-opensuse-updater.png hi128-app-opensuse-updater.png Constants.h opensusestart.desktop updatersettingswidget_base.h Makefile.in opensuseupdater_settings.kcfgc opensuseupdater_settings.kcfg log opensuseupdater_settings.h hi48-app-opensuse-updater.png opensuseupdater Makefile.am hi32-app-opensuse-updater.png + +#>+ 4 +clean-ui: + -rm -f \ + updatersettingswidget_base.cpp updatersettingswidget_base.h updatersettingswidget_base.moc + +#>+ 4 +clean-kcfg: + -rm -f \ + opensuseupdater_settings.cpp opensuseupdater_settings.h #>+ 2 docs-am: @@ -1041,11 +1065,11 @@ #>+ 11 -opensuseupdater.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/MainWindow.cpp $(srcdir)/HeaderWidget.cpp $(srcdir)/UpdaterApplication.cpp $(srcdir)/GeneralConfigWindow.cpp $(srcdir)/UpdateListItem.cpp $(srcdir)/TrayIcon.cpp Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp GeneralConfigWindow.moc.cpp TrayIcon.moc.cpp +opensuseupdater.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/MainWindow.cpp $(srcdir)/HeaderWidget.cpp $(srcdir)/UpdaterApplication.cpp $(srcdir)/UpdateListItem.cpp $(srcdir)/TrayIcon.cpp $(srcdir)/updatersettingswidget_base.cpp $(srcdir)/opensuseupdater_settings.cpp Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp TrayIcon.moc.cpp updatersettingswidget_base.moc @echo 'creating opensuseupdater.all_cpp.cpp ...'; \ rm -f opensuseupdater.all_cpp.files opensuseupdater.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> opensuseupdater.all_cpp.final; \ - for file in main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp GeneralConfigWindow.cpp UpdateListItem.cpp TrayIcon.cpp Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp GeneralConfigWindow.moc.cpp TrayIcon.moc.cpp ; do \ + for file in main.cpp MainWindow.cpp HeaderWidget.cpp UpdaterApplication.cpp UpdateListItem.cpp TrayIcon.cpp updatersettingswidget_base.cpp opensuseupdater_settings.cpp Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp TrayIcon.moc.cpp ; do \ echo "#include \"$$file\"" >> opensuseupdater.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> opensuseupdater.all_cpp.final; \ done; \ @@ -1076,6 +1100,34 @@ kde-rpo-clean: -rm -f *.rpo -#>+ 3 +#>+ 9 nmcheck: +$(srcdir)/TrayIcon.cpp: updatersettingswidget_base.h opensuseupdater_settings.h nmcheck-am: nmcheck +$(srcdir)/main.cpp: updatersettingswidget_base.h opensuseupdater_settings.h +$(srcdir)/HeaderWidget.cpp: updatersettingswidget_base.h opensuseupdater_settings.h +$(srcdir)/MainWindow.cpp: updatersettingswidget_base.h opensuseupdater_settings.h +$(srcdir)/UpdateListItem.cpp: updatersettingswidget_base.h opensuseupdater_settings.h +$(srcdir)/UpdaterApplication.cpp: updatersettingswidget_base.h opensuseupdater_settings.h + +#>+ 21 +opensuseupdater_settings.cpp: opensuseupdater_settings.h +opensuseupdater_settings.h: $(srcdir)/opensuseupdater_settings.kcfg $(srcdir)/opensuseupdater_settings.kcfgc $(KCFG_DEPENDENCIES) + $(KCONFIG_COMPILER) $(srcdir)/opensuseupdater_settings.kcfg $(srcdir)/opensuseupdater_settings.kcfgc; ret=$$?; \ + if test "$$ret" != 0; then rm -f opensuseupdater_settings.h ; exit $$ret ; fi + + +updatersettingswidget_base.cpp: $(srcdir)/updatersettingswidget_base.ui updatersettingswidget_base.h updatersettingswidget_base.moc + rm -f updatersettingswidget_base.cpp + echo '#include <kdialog.h>' > updatersettingswidget_base.cpp + echo '#include <klocale.h>' >> updatersettingswidget_base.cpp + $(UIC) -tr ${UIC_TR} -i updatersettingswidget_base.h $(srcdir)/updatersettingswidget_base.ui > updatersettingswidget_base.cpp.temp ; ret=$$?; \ + $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" updatersettingswidget_base.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_updatersettingswidget_base,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> updatersettingswidget_base.cpp ;\ + rm -f updatersettingswidget_base.cpp.temp ;\ + if test "$$ret" = 0; then echo '#include "updatersettingswidget_base.moc"' >> updatersettingswidget_base.cpp; else rm -f updatersettingswidget_base.cpp ; exit $$ret ; fi + +updatersettingswidget_base.h: $(srcdir)/updatersettingswidget_base.ui + rm -rf updatersettingswidget_base.h; + $(UIC) $(srcdir)/updatersettingswidget_base.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> updatersettingswidget_base.h ; +updatersettingswidget_base.moc: updatersettingswidget_base.h + $(MOC) updatersettingswidget_base.h -o updatersettingswidget_base.moc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/UpdaterApplication.cpp new/opensuseupdater-0.3/updater/UpdaterApplication.cpp --- old/opensuseupdater-0.3/updater/UpdaterApplication.cpp 2006-10-19 15:39:59.000000000 +0200 +++ new/opensuseupdater-0.3/updater/UpdaterApplication.cpp 2006-10-23 18:01:28.000000000 +0200 @@ -22,6 +22,7 @@ #include <kdebug.h> #include "UpdaterApplication.h" +#include "opensuseupdater_settings.h" #include "Updater.h" #include "MainWindow.h" @@ -34,18 +35,15 @@ UpdaterApplication::UpdaterApplication() : KUniqueApplication(true,true,false) { - KConfig *config = KGlobal::config(); - config->setGroup("General"); - - QString backend = config->readEntry("Backend" ); + UpdaterSettings::EnumBackend::type backend; - if ( backend == "zmd" ) + if ( backend == UpdaterSettings::EnumBackend::zmd ) { kdDebug() << "Using ZMD backend..." << endl; updater = new ZmdUpdater(); } - else if ( backend == "zypp" ) + else if ( backend == UpdaterSettings::EnumBackend::zypp ) { kdDebug() << "Using ZYPP backend..." << endl; updater = new ZYppUpdater(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater new/opensuseupdater-0.3/updater/opensuseupdater --- old/opensuseupdater-0.3/updater/opensuseupdater 2006-10-19 16:52:04.000000000 +0200 +++ new/opensuseupdater-0.3/updater/opensuseupdater 2006-10-23 18:17:30.000000000 +0200 @@ -18,7 +18,7 @@ # if CDPATH is set. if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi -relink_command="(cd /space/sources/opensuse-updater/trunk/opensuse-updater/updater; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/icecream/bin:/suse/dmacvicar/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/work/src/bin:/work/src/bin/tools\"; export PATH; g++ -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer- arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -o \$progdir/\$file main.o MainWindow.o HeaderWidget.o UpdaterApplication.o GeneralConfigWindow.o UpdateListItem.o TrayIcon.o Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o GeneralConfigWindow.moc.o TrayIcon.moc.o -L/opt/kde3/lib -L/usr/lib/qt3/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/lib/ -L/usr/X11R6/lib/ ../kxmlrpcclient/.libs/libkxmlrpcclient.so /opt/kde3/lib/libkxmlrpcclient.so ../updater/zmd/.libs/libopensuseupdater_zmd.so /space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs/libkxmlrpcclient.so ../updater/zypp/.libs/libopensuseupdater_zypp.so /opt/kde3/lib/libkio.so /opt/kde3/lib/libkdeui.so /opt/kde3/lib/libkdesu.so /opt/kde3/lib/libkwalletclient.so /opt/kde3/lib/libkdecore.so /opt/kde3/lib/libDCOP.so -lresolv -lutil /usr/lib/libart_lgpl_2.so /usr/lib/libidn.so /opt/kde3/lib/libkdefx.so /usr/lib/qt3/lib/libqt-mt.so /usr/lib/li bXrandr.so /usr/lib/libXcursor.so /usr/lib/libXfixes.so /usr/lib/libXinerama.so /usr/lib/libXft.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so /usr/lib/libexpat.so /usr/lib/libpng12.so -lm /usr/lib/libXext.so /usr/lib/libSM.so /usr/lib/libICE.so /usr/lib/libXrender.so -lpthread /usr/lib/libX11.so /usr/lib/libXau.so /usr/lib/libXdmcp.so -ldl -lz /usr/lib/libfam.so -lrpcsvc -lacl -lattr -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zmd/.libs -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zypp/.libs -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/usr/lib)" +relink_command="(cd /space/sources/opensuse-updater/trunk/opensuse-updater/updater; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/icecream/bin:/suse/dmacvicar/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/work/src/bin:/work/src/bin/tools\"; export PATH; g++ -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer- arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -o \$progdir/\$file main.o MainWindow.o HeaderWidget.o UpdaterApplication.o GeneralConfigWindow.o UpdateListItem.o TrayIcon.o updatersettingswidget_base.o opensuseupdater_settings.o Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o GeneralConfigWindow.moc.o TrayIcon.moc.o -L/opt/kde3/lib -L/usr/lib/qt3/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/lib/ -L/usr/X11R6/lib/ ../kxmlrpcclient/.libs/libkxmlrpcclient.so /opt/kde3/lib/libkxmlrpcclient.so ../updater/zmd/.libs/libopensuseupdater_zmd.so /space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs/libkxmlrpcclient.so ../updater/zypp/.libs/libopensuseupdater_zypp.so /opt/kde3/lib/libkio.so /opt/kde3/lib/libkdeui.so /opt/kde3/lib/libkdesu.so /opt/kde3/lib/libkwalletclient.so /opt/kde3/lib/libkdecore.so /opt/kde3/lib/libDCOP.so -lresolv -lutil /usr/lib/libart_lgpl_2.so /usr/lib/libidn.so /opt/kde3/ lib/libkdefx.so /usr/lib/qt3/lib/libqt-mt.so /usr/lib/libXrandr.so /usr/lib/libXcursor.so /usr/lib/libXfixes.so /usr/lib/libXinerama.so /usr/lib/libXft.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so /usr/lib/libexpat.so /usr/lib/libpng12.so -lm /usr/lib/libXext.so /usr/lib/libSM.so /usr/lib/libICE.so /usr/lib/libXrender.so -lpthread /usr/lib/libX11.so /usr/lib/libXau.so /usr/lib/libXdmcp.so -ldl -lz /usr/lib/libfam.so -lrpcsvc -lacl -lattr -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zmd/.libs -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zypp/.libs -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/usr/lib)" # This environment variable determines our operation mode. if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp new/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp --- old/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp 2006-10-23 17:53:35.000000000 +0200 @@ -0,0 +1,54 @@ +// This file is generated by kconfig_compiler from opensuseupdater_settings.kcfg. +// All changes you do to this file will be lost. + +#include "opensuseupdater_settings.h" + +#include <kstaticdeleter.h> + +UpdaterSettings *UpdaterSettings::mSelf = 0; +static KStaticDeleter<UpdaterSettings> staticUpdaterSettingsDeleter; + +UpdaterSettings *UpdaterSettings::self() +{ + if ( !mSelf ) { + staticUpdaterSettingsDeleter.setObject( mSelf, new UpdaterSettings() ); + mSelf->readConfig(); + } + + return mSelf; +} + +UpdaterSettings::UpdaterSettings( ) + : KConfigSkeleton( QString::fromLatin1( "opensuseupdaterrc" ) ) +{ + mSelf = this; + setCurrentGroup( QString::fromLatin1( "General" ) ); + + KConfigSkeleton::ItemInt *itemInterval; + itemInterval = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Interval" ), mInterval, 1440 ); + addItem( itemInterval, QString::fromLatin1( "Interval" ) ); + KConfigSkeleton::ItemBool *itemAutostart; + itemAutostart = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Autostart" ), mAutostart, true ); + addItem( itemAutostart, QString::fromLatin1( "Autostart" ) ); + QValueList<KConfigSkeleton::ItemEnum::Choice> valuesBackend; + { + KConfigSkeleton::ItemEnum::Choice choice; + choice.name = QString::fromLatin1( "zypp" ); + valuesBackend.append( choice ); + } + { + KConfigSkeleton::ItemEnum::Choice choice; + choice.name = QString::fromLatin1( "zmd" ); + valuesBackend.append( choice ); + } + KConfigSkeleton::ItemEnum *itemBackend; + itemBackend = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "Backend" ), mBackend, valuesBackend, EnumBackend::zypp ); + addItem( itemBackend, QString::fromLatin1( "Backend" ) ); +} + +UpdaterSettings::~UpdaterSettings() +{ + if ( mSelf == this ) + staticUpdaterSettingsDeleter.setObject( mSelf, 0, false ); +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.h new/opensuseupdater-0.3/updater/opensuseupdater_settings.h --- old/opensuseupdater-0.3/updater/opensuseupdater_settings.h 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/opensuseupdater_settings.h 2006-10-23 17:53:35.000000000 +0200 @@ -0,0 +1,97 @@ +// This file is generated by kconfig_compiler from opensuseupdater_settings.kcfg. +// All changes you do to this file will be lost. +#ifndef UPDATERSETTINGS_H +#define UPDATERSETTINGS_H + +#include <kconfigskeleton.h> +#include <kdebug.h> + +class UpdaterSettings : public KConfigSkeleton +{ + public: + class EnumBackend + { + public: + enum type { zypp, zmd, COUNT }; + }; + + static UpdaterSettings *self(); + ~UpdaterSettings(); + + /** + Set How often to check for updates. + */ + static + void setInterval( int v ) + { + if (!self()->isImmutable( QString::fromLatin1( "Interval" ) )) + self()->mInterval = v; + } + + /** + Get How often to check for updates. + */ + static + int interval() + { + return self()->mInterval; + } + + /** + Set Automatically start the applet on login + */ + static + void setAutostart( bool v ) + { + if (!self()->isImmutable( QString::fromLatin1( "Autostart" ) )) + self()->mAutostart = v; + } + + /** + Get Automatically start the applet on login + */ + static + bool autostart() + { + return self()->mAutostart; + } + + /** + Set Width of the main window. + */ + static + void setBackend( int v ) + { + if (!self()->isImmutable( QString::fromLatin1( "Backend" ) )) + self()->mBackend = v; + } + + /** + Get Width of the main window. + */ + static + int backend() + { + return self()->mBackend; + } + + static + void writeConfig() + { + static_cast<KConfigSkeleton*>(self())->writeConfig(); + } + protected: + UpdaterSettings(); + static UpdaterSettings *mSelf; + + + // General + int mInterval; + bool mAutostart; + int mBackend; + + private: +}; + +#endif + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg new/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg --- old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg 2006-10-23 17:53:02.000000000 +0200 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> +<kcfg> + <kcfgfile name="opensuseupdaterrc"/> + <group name="General"> + <entry name="Interval" type="Int"> + <label>How often to check for updates.</label> + <default>1440</default> + </entry> + <entry name="Autostart" type="Bool"> + <label>Automatically start the applet on login</label> + <default>true</default> + </entry> + <entry name="Backend" type="Enum"> + <label>Width of the main window.</label> + <choices> + <choice name="zypp"/> + <choice name="zmd"/> + </choices> + <default>zypp</default> + </entry> + </group> +</kcfg> \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfgc new/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfgc --- old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfgc 2006-10-23 16:49:47.000000000 +0200 @@ -0,0 +1,4 @@ +File=opensuseupdater_settings.kcfg +ClassName=UpdaterSettings +Singleton=true +Mutators=true \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp new/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp --- old/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp 2006-10-23 18:17:24.000000000 +0200 @@ -0,0 +1,85 @@ +#include <kdialog.h> +#include <klocale.h> +/**************************************************************************** +** Form implementation generated from reading ui file './updatersettingswidget_base.ui' +** +** Created: Mon Oct 23 18:17:23 2006 +** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $) +** +** WARNING! All changes made in this file will be lost! +****************************************************************************/ + +#include "updatersettingswidget_base.h" + +#include <qvariant.h> +#include <qpushbutton.h> +#include <qspinbox.h> +#include <qcheckbox.h> +#include <qbuttongroup.h> +#include <qradiobutton.h> +#include <qlayout.h> +#include <qtooltip.h> +#include <qwhatsthis.h> + +/* + * Constructs a UpdaterSettingsWidget_Base as a child of 'parent', with the + * name 'name' and widget flags set to 'f'. + */ +UpdaterSettingsWidget_Base::UpdaterSettingsWidget_Base( QWidget* parent, const char* name, WFlags fl ) + : QWidget( parent, name, fl ) +{ + if ( !name ) + setName( "UpdaterSettingsWidget_Base" ); + UpdaterSettingsWidget_BaseLayout = new QVBoxLayout( this, 11, 6, "UpdaterSettingsWidget_BaseLayout"); + + kcfg_Interval = new QSpinBox( this, "kcfg_Interval" ); + UpdaterSettingsWidget_BaseLayout->addWidget( kcfg_Interval ); + + kcfg_Autostart = new QCheckBox( this, "kcfg_Autostart" ); + UpdaterSettingsWidget_BaseLayout->addWidget( kcfg_Autostart ); + + kcfg_Backend = new QButtonGroup( this, "kcfg_Backend" ); + kcfg_Backend->setColumnLayout(0, Qt::Vertical ); + kcfg_Backend->layout()->setSpacing( 6 ); + kcfg_Backend->layout()->setMargin( 11 ); + kcfg_BackendLayout = new QVBoxLayout( kcfg_Backend->layout() ); + kcfg_BackendLayout->setAlignment( Qt::AlignTop ); + + radioButton2 = new QRadioButton( kcfg_Backend, "radioButton2" ); + kcfg_BackendLayout->addWidget( radioButton2 ); + + radioButton1 = new QRadioButton( kcfg_Backend, "radioButton1" ); + kcfg_BackendLayout->addWidget( radioButton1 ); + UpdaterSettingsWidget_BaseLayout->addWidget( kcfg_Backend ); + spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + UpdaterSettingsWidget_BaseLayout->addItem( spacer1 ); + languageChange(); + resize( QSize(600, 166).expandedTo(minimumSizeHint()) ); + clearWState( WState_Polished ); +} + +/* + * Destroys the object and frees any allocated resources + */ +UpdaterSettingsWidget_Base::~UpdaterSettingsWidget_Base() +{ + // no need to delete child widgets, Qt does it all for us +} + +/* + * Sets the strings of the subwidgets using the current + * language. + */ +void UpdaterSettingsWidget_Base::languageChange() +{ + setCaption( tr2i18n( "Form1" ) ); + kcfg_Interval->setPrefix( tr2i18n( "Check For Updates Every " ) ); + kcfg_Interval->setSuffix( tr2i18n( " Minutes" ) ); + kcfg_Autostart->setText( tr2i18n( "Automa&tically start updater on login" ) ); + kcfg_Autostart->setAccel( QKeySequence( tr2i18n( "Alt+T" ) ) ); + kcfg_Backend->setTitle( tr2i18n( "Get Updates Via" ) ); + radioButton2->setText( tr2i18n( "Default" ) ); + radioButton1->setText( tr2i18n( "Novell ZENWorks" ) ); +} + +#include "updatersettingswidget_base.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.h new/opensuseupdater-0.3/updater/updatersettingswidget_base.h --- old/opensuseupdater-0.3/updater/updatersettingswidget_base.h 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/updatersettingswidget_base.h 2006-10-23 18:17:23.000000000 +0200 @@ -0,0 +1,49 @@ +/**************************************************************************** +** Form interface generated from reading ui file './updatersettingswidget_base.ui' +** +** Created: Mon Oct 23 18:17:23 2006 +** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $) +** +** WARNING! All changes made in this file will be lost! +****************************************************************************/ + +#ifndef UPDATERSETTINGSWIDGET_BASE_H +#define UPDATERSETTINGSWIDGET_BASE_H + +#include <qvariant.h> +#include <qwidget.h> + +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QSpacerItem; +class QSpinBox; +class QCheckBox; +class QButtonGroup; +class QRadioButton; + +class UpdaterSettingsWidget_Base : public QWidget +{ + Q_OBJECT + +public: + UpdaterSettingsWidget_Base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~UpdaterSettingsWidget_Base(); + + QSpinBox* kcfg_Interval; + QCheckBox* kcfg_Autostart; + QButtonGroup* kcfg_Backend; + QRadioButton* radioButton2; + QRadioButton* radioButton1; + +protected: + QVBoxLayout* UpdaterSettingsWidget_BaseLayout; + QSpacerItem* spacer1; + QVBoxLayout* kcfg_BackendLayout; + +protected slots: + virtual void languageChange(); + +}; + +#endif // UPDATERSETTINGSWIDGET_BASE_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.ui new/opensuseupdater-0.3/updater/updatersettingswidget_base.ui --- old/opensuseupdater-0.3/updater/updatersettingswidget_base.ui 1970-01-01 01:00:00.000000000 +0100 +++ new/opensuseupdater-0.3/updater/updatersettingswidget_base.ui 2006-10-23 18:16:56.000000000 +0200 @@ -0,0 +1,93 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>UpdaterSettingsWidget_Base</class> +<widget class="QWidget"> + <property name="name"> + <cstring>UpdaterSettingsWidget_Base</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <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="QSpinBox"> + <property name="name"> + <cstring>kcfg_Interval</cstring> + </property> + <property name="prefix"> + <string>Check For Updates Every </string> + </property> + <property name="suffix"> + <string> Minutes</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_Autostart</cstring> + </property> + <property name="text"> + <string>Automa&tically start updater on login</string> + </property> + <property name="accel"> + <string>Alt+T</string> + </property> + </widget> + <widget class="QButtonGroup"> + <property name="name"> + <cstring>kcfg_Backend</cstring> + </property> + <property name="title"> + <string>Get Updates Via</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QRadioButton"> + <property name="name"> + <cstring>radioButton2</cstring> + </property> + <property name="text"> + <string>Default</string> + </property> + </widget> + <widget class="QRadioButton"> + <property name="name"> + <cstring>radioButton1</cstring> + </property> + <property name="text"> + <string>Novell ZENWorks</string> + </property> + </widget> + </vbox> + </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> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zmd/Makefile.in new/opensuseupdater-0.3/updater/zmd/Makefile.in --- old/opensuseupdater-0.3/updater/zmd/Makefile.in 2006-10-19 16:55:22.000000000 +0200 +++ new/opensuseupdater-0.3/updater/zmd/Makefile.in 2006-10-24 14:13:50.000000000 +0200 @@ -851,7 +851,7 @@ -rm -f ZmdEditServers.moc.cpp ZmdDependencyDialog.moc.cpp ZmdInstallWindow.moc.cpp ZmdConfigWindow.moc.cpp ZmdRugParser.moc.cpp ZmdProgressDialog.moc.cpp ZmdUpdater.moc.cpp ZmdUpdaterCore.moc.cpp ZmdAdvancedConfig.moc.cpp ZmdServerDialog.moc.cpp #>+ 2 -KDE_DIST=Makefile.in ZmdUpdaterCoreUtils.h kzmd-auth-user.sh ZmdUpdateListItem.h Makefile.am +KDE_DIST=kzmd-auth-user.sh ZmdUpdateListItem.h Makefile.in ZmdUpdaterCoreUtils.h Makefile.am #>+ 2 docs-am: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp --- old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp 2006-10-19 16:51:20.000000000 +0200 +++ new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp 2006-10-23 14:44:38.000000000 +0200 @@ -120,9 +120,9 @@ { kdDebug() << "Houston, we have a problem." << endl; if ( _buffer.isEmpty() && !_stderr_buffer.isEmpty() ) - updateAppletError( i18n("helper program returned:\n") + _stderr_buffer ); + updateAppletError( i18n("helper program returned:\n%1").arg(_stderr_buffer) ); else - updateAppletError( i18n("helper program returned:\n") + _buffer ); + updateAppletError(i18n("helper program returned:\n%1").arg(_buffer) ); // clear the buffer _stderr_buffer.truncate(0); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org