[zypp-commit] r8094 - in /branches/tmp/tgoettlicher/updater-kde_qt4porting: ./ updater/

Author: tgoettlicher Date: Mon Dec 10 16:44:08 2007 New Revision: 8094 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8094&view=rev Log: backup Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/VERSION.cmake branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/VERSION.cmake?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/VERSION.cmake (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/VERSION.cmake Mon Dec 10 16:44:08 2007 @@ -1,3 +1,5 @@ SET(VERSION_MAJOR "0") -SET(VERSION_MINOR "6") -SET(VERSION_PATCH "1") +SET(VERSION_MINOR "7") +SET(VERSION_PATCH "0") + +# don't forget to change Constants.h too Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt Mon Dec 10 16:44:08 2007 @@ -17,17 +17,21 @@ SET(opensuseupdater_LIB_SRCS Updater.cpp Updater.h - simpleview.cpp - simpleview.h +# simpleview.cpp +# simpleview.h TrayIcon.cpp UpdateListItem.cpp HeaderWidget.cpp - ConfigWidget.cpp - ConfigWidget.h +# ConfigWidget.cpp +# ConfigWidget.h ConfigWidgetUI.h ConfigWidgetUI.ui - MainWindow.cpp #port - MainWindow.h #port +# MainWindow.cpp #port +# MainWindow.h #port +#progresspopup.h #port +#progresspopup.cpp #port + + ${settings_SRCS}) @@ -51,8 +55,8 @@ UpdaterApplication.cpp MainWindow.cpp MainWindow.h #port - ConfigWidget.h - ConfigWidget.cpp +# ConfigWidget.h +# ConfigWidget.cpp ConfigWidgetUI.h ConfigWidgetUI.ui ) Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp Mon Dec 10 16:44:08 2007 @@ -40,22 +40,22 @@ ConfigWidget::ConfigWidget(QWidget* parent, const char* name) - : ConfigWidgetUI(parent, name) -{ +//port : ConfigWidgetUI(parent, name) +{ if (!name) { - setName("ConfigWidget"); +//port setName("ConfigWidget"); } Q3VBoxLayout *layout = new Q3VBoxLayout(BackendFrame); comboBackendPlugin = new QComboBox(BackendFrame, "BackendPlugin"); - kcfg_BackendPlugin = new QLineEdit(BackendFrame, "kcfg_BackendPlugin"); +//port kcfg_BackendPlugin = new QLineEdit(BackendFrame, "kcfg_BackendPlugin"); layout->add(comboBackendPlugin); - kcfg_BackendPlugin->hide(); +//port kcfg_BackendPlugin->hide(); addBackendPlugins(); - connect( comboBackendPlugin, SIGNAL(activated(int)), this, SLOT( slotPluginComboChanged(int) ) ); +//port connect( comboBackendPlugin, SIGNAL(activated(int)), this, SLOT( slotPluginComboChanged(int) ) ); } @@ -96,7 +96,7 @@ void ConfigWidget::slotPluginComboChanged(int index) { kDebug() << "combo changed" << endl; - kcfg_BackendPlugin->setText(pluginMap[index]); +//port kcfg_BackendPlugin->setText(pluginMap[index]); } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.h?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.h Mon Dec 10 16:44:08 2007 @@ -22,9 +22,12 @@ #include "ConfigWidgetUI.h" +class ConfigWidget; +class ConfigWidgetUI; + typedef QMap PluginMap; -class ConfigWidget : public ConfigWidgetUI +class ConfigWidget : ConfigWidgetUI { Q_OBJECT Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h Mon Dec 10 16:44:08 2007 @@ -1,60 +1,173 @@ -/**************************************************************************** -** Form interface generated from reading ui file 'ConfigWidgetUI.ui' +/******************************************************************************** +** Form generated from reading ui file 'ConfigWidgetUI.ui' ** -** Created: Mi Mai 9 15:48:17 2007 -** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.7 edited Aug 31 2005 $) +** Created: Fri Dec 7 03:49:35 2007 +** by: Qt User Interface Compiler version 4.3.2 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ -#ifndef CONFIGWIDGETUI_H -#define CONFIGWIDGETUI_H +#ifndef UI_CONFIGWIDGETUI_H +#define UI_CONFIGWIDGETUI_H -#include -#include -//Added by qt3to4: -#include #include -#include -#include -#include <QLabel> - -class Q3VBoxLayout; -class Q3HBoxLayout; -class Q3GridLayout; -class QSpacerItem; -class QSpinBox; -class QCheckBox; -class QTextedit; -class Q3Frame; -class QComboBox; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -class ConfigWidgetUI : public QWidget +class ConfigWidgetUI { - Q_OBJECT - public: - ConfigWidgetUI( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 ); -// port ~ConfigWidgetUI(); + QVBoxLayout *vboxLayout; + QHBoxLayout *hboxLayout; + QLabel *l1; + QSpinBox *kcfg_Interval; + QHBoxLayout *hboxLayout1; + QLabel *l2; + QSpinBox *kcfg_WarnInterval; + QHBoxLayout *hboxLayout2; + QLabel *l3; + QHBoxLayout *hboxLayout3; + Q3Frame *BackendFrame; + QLabel *l4; + QCheckBox *kcfg_Autostart; + QCheckBox *kcfg_ShowPackages; + QCheckBox *kcfg_ShowNotifications; + QCheckBox *kcfg_NoSimpleView; + QCheckBox *kcfg_CheckingAnimation; + + void setupUi(QWidget *ConfigWidgetUI) + { + if (ConfigWidgetUI->objectName().isEmpty()) + ConfigWidgetUI->setObjectName(QString::fromUtf8("ConfigWidgetUI")); + ConfigWidgetUI->resize(600, 166); + vboxLayout = new QVBoxLayout(ConfigWidgetUI); + vboxLayout->setSpacing(6); + vboxLayout->setMargin(11); + vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); + hboxLayout = new QHBoxLayout(); + hboxLayout->setSpacing(6); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); + l1 = new QLabel(ConfigWidgetUI); + l1->setObjectName(QString::fromUtf8("l1")); + l1->setWordWrap(false); + + hboxLayout->addWidget(l1); + + kcfg_Interval = new QSpinBox(ConfigWidgetUI); + kcfg_Interval->setObjectName(QString::fromUtf8("kcfg_Interval")); + kcfg_Interval->setMinimum(1); + + hboxLayout->addWidget(kcfg_Interval); + + + vboxLayout->addLayout(hboxLayout); + + hboxLayout1 = new QHBoxLayout(); + hboxLayout1->setSpacing(6); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); + l2 = new QLabel(ConfigWidgetUI); + l2->setObjectName(QString::fromUtf8("l2")); + l2->setWordWrap(false); + + hboxLayout1->addWidget(l2); + + kcfg_WarnInterval = new QSpinBox(ConfigWidgetUI); + kcfg_WarnInterval->setObjectName(QString::fromUtf8("kcfg_WarnInterval")); + kcfg_WarnInterval->setMinimum(0); + kcfg_WarnInterval->setMaximum(720); + + hboxLayout1->addWidget(kcfg_WarnInterval); + + + vboxLayout->addLayout(hboxLayout1); + + hboxLayout2 = new QHBoxLayout(); + hboxLayout2->setSpacing(6); + hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); + l3 = new QLabel(ConfigWidgetUI); + l3->setObjectName(QString::fromUtf8("l3")); + l3->setWordWrap(false); + + hboxLayout2->addWidget(l3); + + hboxLayout3 = new QHBoxLayout(); + hboxLayout3->setSpacing(6); + hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3")); + BackendFrame = new Q3Frame(ConfigWidgetUI); + BackendFrame->setObjectName(QString::fromUtf8("BackendFrame")); + BackendFrame->setFrameShape(Q3Frame::NoFrame); + BackendFrame->setFrameShadow(Q3Frame::Plain); + + hboxLayout3->addWidget(BackendFrame); + + l4 = new QLabel(ConfigWidgetUI); + l4->setObjectName(QString::fromUtf8("l4")); + l4->setWordWrap(false); + + hboxLayout3->addWidget(l4); + + + hboxLayout2->addLayout(hboxLayout3); + + + vboxLayout->addLayout(hboxLayout2); + + kcfg_Autostart = new QCheckBox(ConfigWidgetUI); + kcfg_Autostart->setObjectName(QString::fromUtf8("kcfg_Autostart")); + + vboxLayout->addWidget(kcfg_Autostart); + + kcfg_ShowPackages = new QCheckBox(ConfigWidgetUI); + kcfg_ShowPackages->setObjectName(QString::fromUtf8("kcfg_ShowPackages")); + + vboxLayout->addWidget(kcfg_ShowPackages); + + kcfg_ShowNotifications = new QCheckBox(ConfigWidgetUI); + kcfg_ShowNotifications->setObjectName(QString::fromUtf8("kcfg_ShowNotifications")); + + vboxLayout->addWidget(kcfg_ShowNotifications); + + kcfg_NoSimpleView = new QCheckBox(ConfigWidgetUI); + kcfg_NoSimpleView->setObjectName(QString::fromUtf8("kcfg_NoSimpleView")); + + vboxLayout->addWidget(kcfg_NoSimpleView); + + kcfg_CheckingAnimation = new QCheckBox(ConfigWidgetUI); + kcfg_CheckingAnimation->setObjectName(QString::fromUtf8("kcfg_CheckingAnimation")); + + vboxLayout->addWidget(kcfg_CheckingAnimation); + + + retranslateUi(ConfigWidgetUI); - QSpinBox* kcfg_Interval; - QCheckBox* kcfg_Autostart; - QCheckBox* kcfg_ShowPackages; - QCheckBox* kcfg_ShowNotifications; - QCheckBox* kcfg_NoSimpleView; - QCheckBox* kcfg_CheckingAnimation; - QLineEdit* kcfg_BackendPlugin; - Q3Frame* BackendFrame; - QSpinBox* kcfg_WarnInterval; - QLabel* privateLabel, privateLabel_2, privateLabel_3; - -protected: - Q3VBoxLayout* ConfigWidgetUILayout; - Q3HBoxLayout* unnamedLayout; + QMetaObject::connectSlotsByName(ConfigWidgetUI); + } // setupUi -protected slots: - virtual void languageChange(); + void retranslateUi(QWidget *ConfigWidgetUI) + { + l1->setText(QApplication::translate("ConfigWidgetUI", "Check for updates every:", 0, QApplication::UnicodeUTF8)); + kcfg_Interval->setSuffix(QApplication::translate("ConfigWidgetUI", " Hours", 0, QApplication::UnicodeUTF8)); + l2->setText(QApplication::translate("ConfigWidgetUI", "Show recurring notification when updates are available every:", 0, QApplication::UnicodeUTF8)); + kcfg_WarnInterval->setSuffix(QApplication::translate("ConfigWidgetUI", " Minutes", 0, QApplication::UnicodeUTF8)); + l3->setText(QApplication::translate("ConfigWidgetUI", "Backend:", 0, QApplication::UnicodeUTF8)); + l4->setText(QString()); + kcfg_Autostart->setText(QApplication::translate("ConfigWidgetUI", "Automa&tically start updater on login", 0, QApplication::UnicodeUTF8)); + kcfg_ShowPackages->setText(QApplication::translate("ConfigWidgetUI", "Show available upgrades when backend provides them (for experts only)", 0, QApplication::UnicodeUTF8)); + kcfg_ShowNotifications->setText(QApplication::translate("ConfigWidgetUI", "Show notifications", 0, QApplication::UnicodeUTF8)); + kcfg_NoSimpleView->setText(QApplication::translate("ConfigWidgetUI", "Always show detailed view", 0, QApplication::UnicodeUTF8)); + kcfg_CheckingAnimation->setText(QApplication::translate("ConfigWidgetUI", "Animated icon on check", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(ConfigWidgetUI); + } // retranslateUi }; -#endif // CONFIGWIDGETUI_H +#endif // UI_CONFIGWIDGETUI_H Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h Mon Dec 10 16:44:08 2007 @@ -20,22 +20,23 @@ #ifndef _CONSTANTS_H_ #define _CONSTANTS_H_ -#define PROGRAM_NAME "opensuseupdater" -#define PROGRAM_DISPLAY_NAME "openSUSE Updater" -#define VERSION "0.6" +#define PROGRAM_NAME "opensuseupdater" +#define PROGRAM_DISPLAY_NAME "openSUSE Updater" +#define VERSION "0.7.0" +// don't forget to change VERSION.cmake too -#define TRAY_ICON_GREEN "opensuseupdater_green" -#define TRAY_ICON_RED "opensuseupdater_red" +#define TRAY_ICON_GREEN "opensuseupdater_green" +#define TRAY_ICON_RED "opensuseupdater_red" #define TRAY_ICON_YELLOW "opensuseupdater_yellow" #define TRAY_ICON_PROBLEM "dialog-warning" -#define TRAY_ICON_CHECKING "opensuseupdater_busy" -#define TRAY_ICON_INSTALLING "opensuseupdater_busy" -#define TRAY_ICON_UNKNOWN "opensuseupdater_unknown" -#define TRAY_ICON_GRAY "opensuseupdater_gray" +#define TRAY_ICON_CHECKING "opensuseupdater_busy" +#define TRAY_ICON_INSTALLING "opensuseupdater_busy" +#define TRAY_ICON_UNKNOWN "opensuseupdater_unknown" +#define TRAY_ICON_GRAY "opensuseupdater_gray" -#define PROGRAM_ICON "opensuseupdater" +#define PROGRAM_ICON "opensuseupdater" -#define DEFAULT_BACKEND "zypp_backend" +#define DEFAULT_BACKEND "zypp_backend" #endif Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp Mon Dec 10 16:44:08 2007 @@ -54,7 +54,8 @@ #include "Updater.h" #include "UpdateListItem.h" #include "TrayIcon.h" -#include "ConfigWidget.h" +//port #include "ConfigWidget.h" +#include "ConfigWidgetUI.h" //port #include "progresspopup.h" @@ -541,6 +542,7 @@ void MainWindow::configButtonClicked() { +/* port static ConfigWidget* confWidget = 0; if (KConfigDialog::showDialog("settings")) @@ -563,6 +565,8 @@ emit (settingsChanged()); configDialog->show(); + +*/ } void MainWindow::installButtonClicked() { Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp Mon Dec 10 16:44:08 2007 @@ -20,6 +20,7 @@ #include #include #include +#include #include "UpdaterApplication.h" #include "Constants.h" @@ -34,7 +35,7 @@ int main(int argc, char **argv) { - KAboutData about(PROGRAM_NAME, PROGRAM_DISPLAY_NAME, VERSION, "SUSE Updater"); + KAboutData about(PROGRAM_NAME, NULL, ki18n(PROGRAM_DISPLAY_NAME) , VERSION); KCmdLineArgs::init(argc, argv, &about); KUniqueApplication::addCmdLineOptions(); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp?rev=8094&r1=8093&r2=8094&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp Mon Dec 10 16:44:08 2007 @@ -4,7 +4,7 @@ #include #include //Added by qt3to4: -#include <Q3GridLayout> +#include #include <QPixmap> #include #include -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org