Author: tgoettlicher Date: Mon Dec 10 12:43:50 2007 New Revision: 8087 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8087&view=rev Log: backup Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h 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=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt Mon Dec 10 12:43:50 2007 @@ -1,4 +1,4 @@ -ADD_SUBDIRECTORY( zypp ) +#ADD_SUBDIRECTORY( zypp ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kxmlrpcclient @@ -9,15 +9,16 @@ ${QT_QTGUI_INCLUDE_DIR} ${KDEPIM4_CONNECTION_INCLUDE_DIR} ) - -MESSAGE( STATUS ${QT_QT3SUPPORT_INCLUDE_DIR} ) -########### next target ############### +########### next target ############# +# opensuseupdater.so # +##################################### KDE4_ADD_KCFG_FILES(settings_SRCS opensuseupdater_settings.kcfgc) SET(opensuseupdater_LIB_SRCS Updater.cpp Updater.h simpleview.cpp + simpleview.h TrayIcon.cpp UpdateListItem.cpp HeaderWidget.cpp @@ -25,23 +26,33 @@ ConfigWidget.h ConfigWidgetUI.h ConfigWidgetUI.ui + MainWindow.cpp #port + MainWindow.h #port ${settings_SRCS}) + + KDE4_ADD_UI_FILES( opensuseupdater_LIB_SRCS ConfigWidgetUI.ui ) QT4_AUTOMOC(${opensuseupdater_LIB_SRCS}) ADD_LIBRARY(opensuseupdater SHARED ${opensuseupdater_LIB_SRCS}) -TARGET_LINK_LIBRARIES(opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui ${KDEPIM3_CONNECTION_LIBRARY} ) +TARGET_LINK_LIBRARIES(opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui ${KDEPIM3_CONNECTION_LIBRARY} Qt3Support ) INSTALL(TARGETS opensuseupdater DESTINATION ${KDE4_LIB_INSTALL_DIR} ) + + ########### next target ############### SET(opensuseupdater_SRCS progresspopup.cpp progresspopup.h main.cpp + simpleview.h + simpleview.cpp UpdaterApplication.cpp MainWindow.cpp + MainWindow.h #port ConfigWidget.h + ConfigWidget.cpp ConfigWidgetUI.h ConfigWidgetUI.ui ) @@ -52,7 +63,9 @@ ${QT_AND_KDECORE_LIBS} kdeui kio - connectionmanager ) + connectionmanager + Qt3Support +) INSTALL_TARGETS(/bin opensuseupdater-kde ) 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=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h Mon Dec 10 12:43:50 2007 @@ -35,7 +35,7 @@ public: ConfigWidgetUI( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 ); - ~ConfigWidgetUI(); +// port ~ConfigWidgetUI(); QSpinBox* kcfg_Interval; QCheckBox* kcfg_Autostart; 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=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp Mon Dec 10 12:43:50 2007 @@ -22,8 +22,8 @@ #include //Added by qt3to4: -#include <Q3HBoxLayout> -#include <Q3VBoxLayout> +#include +#include #include #include #include @@ -32,12 +32,13 @@ #include #include #include -#include + +//#include port #include #include #include -#include -#include +//#include port +//#include port #include #include @@ -80,17 +81,17 @@ connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdatesWithoutProgress())); timer->start(timerInterval,false); + //port +// _edit_sources_action = new KAction(i18n("Add/Remove Update Sources..."),0,0,this,SLOT(serverButtonClicked()), actionCollection(),"edit_sources"); +// _configure_applet_action = new KAction(i18n("Configure Applet..."),0,0,this,SLOT(configButtonClicked()), actionCollection(),"confgure_applet"); +// _check_updates_action = new KAction(i18n("Check Now"),0,0,this,SLOT(checkUpdatesWithProgress()), actionCollection(),"configure_applet"); +// _install_updates_action = new KAction(i18n("Install"),0,0,this,SLOT(installButtonClicked()), actionCollection(),"configure_applet");; - _edit_sources_action = new KAction(i18n("Add/Remove Update Sources..."),0,0,this,SLOT(serverButtonClicked()), actionCollection(),"edit_sources"); - _configure_applet_action = new KAction(i18n("Configure Applet..."),0,0,this,SLOT(configButtonClicked()), actionCollection(),"confgure_applet"); - _check_updates_action = new KAction(i18n("Check Now"),0,0,this,SLOT(checkUpdatesWithProgress()), actionCollection(),"configure_applet"); - _install_updates_action = new KAction(i18n("Install"),0,0,this,SLOT(installButtonClicked()), actionCollection(),"configure_applet");; - - _edit_sources_action->plug(applet->contextMenu(), 1); - _configure_applet_action->plug(applet->contextMenu(), 2);; - _check_updates_action->plug(applet->contextMenu(), 3);; - _hide_action = KStandardAction::close (this, SLOT(hide()), actionCollection(), 0); - _quit_action = KStandardAction::quit(this, SLOT(slotExit()), actionCollection(), 0); +// _edit_sources_action->plug(applet->contextMenu(), 1); +// _configure_applet_action->plug(applet->contextMenu(), 2);; +// _check_updates_action->plug(applet->contextMenu(), 3);; +// _hide_action = KStandardAction::close (this, SLOT(hide()), actionCollection(), 0); +// _quit_action = KStandardAction::quit(this, SLOT(slotExit()), actionCollection(), 0); connect(this, SIGNAL(updateApplet(int, int, int)), this, SLOT(slotAppletState(int, int, int))); connect(this, SIGNAL(updateAppletError(const QString &)), this, SLOT(slotAppletError(const QString &))); @@ -99,7 +100,8 @@ patchesSelected = 0; packagesSelected = 0; - progressPopup = new ProgressPopup(applet); +//port +// progressPopup = new ProgressPopup(applet); hide(); @@ -119,7 +121,7 @@ setCentralWidget( centralWidget ); KIconLoader *loader = KIconLoader::global(); - setIcon(loader->loadIcon(PROGRAM_NAME, KIcon::Small)); + setIcon(loader->loadIcon(PROGRAM_NAME, KIconLoader::Small)); mainBox = new Q3VBoxLayout(centralWidget); header = new HeaderWidget(centralWidget); @@ -544,8 +546,10 @@ if (KConfigDialog::showDialog("settings")) return; - configDialog = new KConfigDialog(this, "settings", UpdaterSettings::self(), - KDialogBase::Plain, KDialogBase::Ok | KDialogBase::Cancel ); + configDialog = new KConfigDialog(this, "settings", UpdaterSettings::self()); + + configDialog->setFaceType( KPageDialog::Plain ); +// port KPageDialog::Ok | KPageDialog::Cancel ); configDialog->setHelp(QString::null); @@ -783,18 +787,18 @@ // Check whether network is avaiable: // If no network is available let ConnectionManager call this // function again when network ist connected +//port +// if (ConnectionManager::self()->status() != NetworkStatus::Online && +// ConnectionManager::self()->status() != NetworkStatus::NoNetworks ) +// { +// ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress())); +// kDebug() << "No network available" << endl; +// kDebug() << "Waiting for network connection..." << endl; +// slotAppletState(APPLET_NO_NETWORK, 0, 0); +// return; +// } - if (ConnectionManager::self()->status() != NetworkStatus::Online && - ConnectionManager::self()->status() != NetworkStatus::NoNetworks ) - { - ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress())); - kDebug() << "No network available" << endl; - kDebug() << "Waiting for network connection..." << endl; - slotAppletState(APPLET_NO_NETWORK, 0, 0); - return; - } - - ConnectionManager::self()->forgetConnectSlot(); +// ConnectionManager::self()->forgetConnectSlot(); kDebug() << "Network connection available." << endl; kDebug() << "Checking for updates..." << endl; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h?rev=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h Mon Dec 10 12:43:50 2007 @@ -29,9 +29,9 @@ #include "UpdaterCapabilities.h" #include "progresspopup.h" #include -#include "simpleview.h" +class SimpleView; class TrayIcon; class KTextEdit; class KPushButton; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp?rev=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp Mon Dec 10 12:43:50 2007 @@ -1,39 +1,20 @@ -/* - Copyright (C) 2006 Narayan Newton - - 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 #include #include #include -#include -//Added by qt3to4: +#include + #include #include <QLabel> -#include -#include +#include <QMovie> +#include #include +#include #include "TrayIcon.h" #include "Updater.h" #include "opensuseupdater_settings.h" -#include <QMovie> TrayIcon::TrayIcon(QWidget *parent) : KSystemTrayIcon(parent), Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h?rev=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h Mon Dec 10 12:43:50 2007 @@ -1,26 +1,6 @@ -/* - Copyright (C) 2006 Narayan Newton - - 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 _TRAY_ICON_H_ #define _TRAY_ICON_H_ -//#include #include #include "progresspopup.h" Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp?rev=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp Mon Dec 10 12:43:50 2007 @@ -1,28 +1,28 @@ -#include "simpleview.h" -#include -#include -#include -//Added by qt3to4: -#include <QShowEvent> -#include -#include <QPixmap> #include -#include "Constants.h" #include #include -#include -#include -#include -#include #include #include #include + +#include <QShowEvent> +#include +#include <QPixmap> + #include #include +#include +#include +#include +#include +#include +#include +#include + #include "Updater.h" #include "UpdaterCapabilities.h" - - +#include "simpleview.h" +#include "Constants.h" SimpleView::SimpleView() : _detailWindow(0L) { Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h?rev=8087&r1=8086&r2=8087&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h Mon Dec 10 12:43:50 2007 @@ -1,3 +1,7 @@ +#ifndef _SIMPLEVIEW_H_ +#define _SIMPLEVIEW_H_ + + #include #include #include @@ -11,71 +15,69 @@ class MainWindow; class Q3TextBrowser; -#ifndef SIMPLEVIEW_H -#define SIMPLEVIEW_H - class SimpleView : public KMainWindow { Q_OBJECT - public: - SimpleView(); - void setDetailWindow(MainWindow *); - protected: - private: - QLabel *title; - QCheckBox *recommended; - QLabel *additionalText; - QCheckBox *norestart; - void showEvent(QShowEvent *); - MainWindow *_detailWindow; - QLabel *headline; - KPushButton *install; - KPushButton *details; - KPushButton *ok; - Q3ProgressBar *bar; - Q3TextBrowser *textBrowser; - - int recommendedCount; - int securityCount; - int restartCount; - int patchCount; - int packageCount; - - int recommendedCountSelected; - int securityCountSelected; - int restartCountSelected; - - - public slots: - void setState(int state, const QString &description = QString() ); - void setRecommendedCount(int count); - void setPatchCount(int count); - void setPackageCount(int count); - void setSecurityCount(int count); - void setRestartCount(int count); - void setProgress(int step); - void nextStep(); - void setTotalSteps(int steps); - void setText(QString text); - - void setRecommendedCountSelected(int count); - void setSecurityCountSelected(int count); - void setRestartCountSelected(int count); + + public: + SimpleView(); + void setDetailWindow(MainWindow *); + + private: + QLabel *title; + QCheckBox *recommended; + QLabel *additionalText; + QCheckBox *norestart; + void showEvent(QShowEvent *); + MainWindow *_detailWindow; + QLabel *headline; + KPushButton *install; + KPushButton *details; + KPushButton *ok; + Q3ProgressBar *bar; + Q3TextBrowser *textBrowser; + + int recommendedCount; + int securityCount; + int restartCount; + int patchCount; + int packageCount; + + int recommendedCountSelected; + int securityCountSelected; + int restartCountSelected; + + + public slots: + void setState(int state, const QString &description = QString() ); + void setRecommendedCount(int count); + void setPatchCount(int count); + void setPackageCount(int count); + void setSecurityCount(int count); + void setRestartCount(int count); + void setProgress(int step); + void nextStep(); + void setTotalSteps(int steps); + void setText(QString text); + + void setRecommendedCountSelected(int count); + void setSecurityCountSelected(int count); + void setRestartCountSelected(int count); - private slots: - bool queryClose(); - void slotDetailsButtonClicked(); - void slotStartInstall(); - void updateSelection(); + private slots: + bool queryClose(); + void slotDetailsButtonClicked(); + void slotStartInstall(); + void updateSelection(); - signals: - void showDetailView(); - void startInstall(); - void patchSelectRecommended(); - void patchStandardSelection(); - void patchUnselectRestart(); + signals: + void showDetailView(); + void startInstall(); + void patchSelectRecommended(); + void patchStandardSelection(); + void patchUnselectRestart(); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org