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

Author: tgoettlicher Date: Wed Dec 5 16:45:39 2007 New Revision: 8034 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8034&view=rev Log: backup Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt 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/HeaderWidget.h 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/UpdateListItem.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.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/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt?rev=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt Wed Dec 5 16:45:39 2007 @@ -1,3 +1,6 @@ +set(QT_USE_QT3SUPPORT TRUE) + + SET(PACKAGE "opensuse-updater-kde") PROJECT(${PACKAGE}) SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) @@ -27,7 +30,8 @@ SET(QT_QT_INCLUDE_DIR /usr/include/Qt ) FIND_PACKAGE(KDE4 REQUIRED) -#FIND_PACKAGE(KDE43im REQUIRED) +add_definitions(${QT_DEFINITIONS} -DQT3_SUPPORT) + FIND_PACKAGE(Gettext REQUIRED) # Library 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt Wed Dec 5 16:45:39 2007 @@ -4,7 +4,7 @@ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} - ${QT_INCLUDE_DIR} + ${QT_INCLUDES} ${KDEPIM3_CONNECTION_INCLUDE_DIR} ) ########### next target ############### 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h Wed Dec 5 16:45:39 2007 @@ -12,15 +12,21 @@ #include #include - -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +//Added by qt3to4: +#include <Q3VBoxLayout> +#include <Q3Frame> +#include <Q3GridLayout> +#include <Q3HBoxLayout> +#include <QLabel> + +class Q3VBoxLayout; +class Q3HBoxLayout; +class Q3GridLayout; class QSpacerItem; class QSpinBox; class QCheckBox; class QTextedit; -class QFrame; +class Q3Frame; class QComboBox; class ConfigWidgetUI : public QWidget @@ -28,7 +34,7 @@ Q_OBJECT public: - ConfigWidgetUI( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ConfigWidgetUI( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 ); ~ConfigWidgetUI(); QSpinBox* kcfg_Interval; @@ -38,13 +44,13 @@ QCheckBox* kcfg_NoSimpleView; QCheckBox* kcfg_CheckingAnimation; QLineEdit* kcfg_BackendPlugin; - QFrame* BackendFrame; + Q3Frame* BackendFrame; QSpinBox* kcfg_WarnInterval; QLabel* privateLabel, privateLabel_2, privateLabel_3; protected: - QVBoxLayout* ConfigWidgetUILayout; - QHBoxLayout* unnamedLayout; + Q3VBoxLayout* ConfigWidgetUILayout; + Q3HBoxLayout* unnamedLayout; protected slots: virtual void languageChange(); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h?rev=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h Wed Dec 5 16:45:39 2007 @@ -21,11 +21,16 @@ #define _HEADER_WIDGET_H_ #include +//Added by qt3to4: +#include <QPixmap> +#include <Q3GridLayout> +#include <QLabel> +#include <Q3HBoxLayout> class QLabel; class QPixmap; -class QHBoxLayout; -class QGridLayout; +class Q3HBoxLayout; +class Q3GridLayout; /** @file @@ -54,7 +59,7 @@ private: // QHBoxLayout *layout; - QGridLayout *layout; + Q3GridLayout *layout; QPixmap *pic; QLabel *suseLogo; QLabel *text; 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h Wed Dec 5 16:45:39 2007 @@ -21,21 +21,27 @@ #define _MAIN_WINDOW_H_ #include +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <QLabel> +#include <Q3VBoxLayout> #include #include "UpdaterCapabilities.h" #include "progresspopup.h" #include #include "simpleview.h" +#include <QTabWidget> + class TrayIcon; class KTextEdit; class KPushButton; -class QListView; -class QListViewItem; +class Q3ListView; +class Q3ListViewItem; class QTimer; -class QVBoxLayout; -class QHBoxLayout; +class Q3VBoxLayout; +class Q3HBoxLayout; class Updater; class HeaderWidget; class OSUpdaterPopup; @@ -100,7 +106,7 @@ @param patchList our QListView we want the backend to pack. */ - void populateLists(QListView* patchList, QListView* packageList, bool displayProgress); + void populateLists(Q3ListView* patchList, Q3ListView* packageList, bool displayProgress); /** Signal we send to our current backend requesting the start of @@ -124,7 +130,7 @@ @param updateSelected the recently selected update. @param resolvableType the type: patch oder package */ - void resolvableSelected(QListViewItem* updateSelected, int resolvableType); + void resolvableSelected(Q3ListViewItem* updateSelected, int resolvableType); /** Signal we send to our current backend when the user has right @@ -230,10 +236,10 @@ private slots: void slotExit(); - void slotPackageSelected(QListViewItem *package); - void slotPatchSelected(QListViewItem *path); - void slotPackageClicked(QListViewItem *); - void slotPatchClicked(QListViewItem *); + void slotPackageSelected(Q3ListViewItem *package); + void slotPatchSelected(Q3ListViewItem *path); + void slotPackageClicked(Q3ListViewItem *); + void slotPatchClicked(Q3ListViewItem *); void slotPackageSelectionChanged(); void slotPatchSelectionChanged(); @@ -267,8 +273,8 @@ void updateTabs(); TrayIcon *applet; - QListView *patchList; - QListView *packageList; + Q3ListView *patchList; + Q3ListView *packageList; KTextEdit *patchDescription; KTextEdit *packageDescription; HeaderWidget *header; @@ -285,11 +291,11 @@ KPushButton *configureButton; - QVBoxLayout *mainBox; - QHBoxLayout *patchSelectionButtonsLayout; - QHBoxLayout *packageSelectionButtonsLayout; - QHBoxLayout *buttonsLayout; - QHBoxLayout *packageButtonsLayout; + Q3VBoxLayout *mainBox; + Q3HBoxLayout *patchSelectionButtonsLayout; + Q3HBoxLayout *packageSelectionButtonsLayout; + Q3HBoxLayout *buttonsLayout; + Q3HBoxLayout *packageButtonsLayout; QTimer *timer; int timerInterval; 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp Wed Dec 5 16:45:39 2007 @@ -22,12 +22,10 @@ #include #include #include -//Added by qt3to4: #include <Q3HBoxLayout> #include <QLabel> #include #include - #include #include "TrayIcon.h" @@ -35,15 +33,17 @@ #include "opensuseupdater_settings.h" -TrayIcon::TrayIcon(QWidget *parent) : KSystemTray(parent), - patchCount(0), - packageCount(0), - appletState(APPLET_NO_UPDATES) +TrayIcon::TrayIcon(QWidget *parent) + : KSystemTrayIcon(parent), + patchCount(0), + packageCount(0), + appletState(APPLET_NO_UPDATES) { KIconLoader iconLoader(PROGRAM_NAME); - setPixmap(loadIcon(TRAY_ICON_GREEN)); - setScaledContents(true); +// setPixmap(loadIcon(TRAY_ICON_GREEN)); + loadIcon(TRAY_ICON_GREEN); + //setScaledContents(true); setState(APPLET_NO_UPDATES); @@ -51,42 +51,40 @@ popup = new KPassivePopup(this); QWidget *popupWidget = new QWidget(popup); Q3HBoxLayout *vb = new Q3HBoxLayout(popupWidget); - QLabel *iconLabel = new QLabel(popupWidget); - QLabel *description = new QLabel(popupWidget); - description->setText(i18n("New software for your system is available")); - iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeMedium)); - vb->addWidget(iconLabel); - vb->addWidget(description); + QLabel *iconLabel = new QLabel(popupWidget); + QLabel *description = new QLabel(popupWidget); + description->setText(i18n("New software for your system is available")); + iconLabel->setPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeMedium)); + vb->addWidget(iconLabel); + vb->addWidget(description); popup->setView(popupWidget); - connect(popup, SIGNAL(clicked()), this, SLOT(popupClicked())); + connect(popup, SIGNAL(clicked()), this, SLOT(popupClicked())); - int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms - if (warnInterval > 0 ) + int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms + if (warnInterval > 0 ) { QTimer *timer = new QTimer (this); connect (timer, SIGNAL(timeout()), this, SLOT(showPopup() )); timer->start(warnInterval,false); } - kdDebug() << "Tray Icon ready" << endl; + kdDebug() << "Tray Icon ready" << endl; } void TrayIcon::setState(int state, const QString &description ) { - - - kdDebug() << "Set applet status to: " << state << endl; + kdDebug() << "Set applet status to: " << state << endl; QToolTip::remove(this); appletState = state; switch (state) - { + { case APPLET_CHECKING: if (UpdaterSettings::self()->checkingAnimation()) - setMovie(QMovie( KGlobal::iconLoader()->moviePath(TRAY_ICON_CHECKING, KIcon::Panel) )); + setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_CHECKING, KIconLoader::Panel) )); QToolTip::add(this, i18n("Checking for updates...")); break; - case APPLET_PROBLEM: + case APPLET_PROBLEM: setPixmap(loadIcon(TRAY_ICON_PROBLEM)); QToolTip::add(this, "<qt>" + i18n("Error:\n") + description + "</qt>" ); break; @@ -113,7 +111,7 @@ break; case APPLET_PKGMGR_UPDATES: - case APPLET_CRITICAL_UPDATES: + case APPLET_CRITICAL_UPDATES: QToolTip::add(this, i18n("New software updates are available.")); setPixmap(loadIcon(TRAY_ICON_RED)); showPopup(); @@ -134,12 +132,12 @@ void TrayIcon::showPopup() { - if ( (appletState == APPLET_UPDATES || - appletState == APPLET_CRITICAL_UPDATES ) && UpdaterSettings::self()->showNotifications() ) - { - QToolTip::add(this, i18n("New software for your system is available")); - popup->show(); - } + if ( (appletState == APPLET_UPDATES || + appletState == APPLET_CRITICAL_UPDATES ) && UpdaterSettings::self()->showNotifications() ) + { + QToolTip::add(this, i18n("New software for your system is available")); + popup->show(); + } } 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h Wed Dec 5 16:45:39 2007 @@ -20,7 +20,7 @@ #ifndef _TRAY_ICON_H_ #define _TRAY_ICON_H_ -#include +#include #include "progresspopup.h" /** @@ -35,7 +35,7 @@ @author Narayan Newton **/ -class TrayIcon : public KSystemTray { +class TrayIcon : public KSystemTrayIcon { Q_OBJECT Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdateListItem.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdateListItem.h?rev=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdateListItem.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdateListItem.h Wed Dec 5 16:45:39 2007 @@ -20,7 +20,7 @@ #ifndef _UPDATE_LIST_ITEM_H_ #define _UPDATE_LIST_ITEM_H_ -#include +#include /** @file @@ -34,11 +34,11 @@ @author Narayan Newton **/ -class UpdateListItem : public QListViewItem { +class UpdateListItem : public Q3ListViewItem { public: - UpdateListItem(QListView *, const QString& ); + UpdateListItem(Q3ListView *, const QString& ); private: Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h?rev=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h Wed Dec 5 16:45:39 2007 @@ -20,8 +20,8 @@ #ifndef _UPDATER_H_ #define _UPDATER_H_ -#include -#include +#include <QObject> +#include #include #include "Constants.h" #include "UpdaterCapabilities.h" @@ -47,16 +47,16 @@ Constants that define the various states our applet can be in. **/ enum { - APPLET_NO_UPDATES, /** No updates **/ - APPLET_UPDATES, /** Updates available **/ - APPLET_CRITICAL_UPDATES, /** Updates available (security) **/ - APPLET_CHECKING, /** Checking for updates **/ - APPLET_PROBLEM, /** problem **/ - APPLET_INSTALLING, /** installing patches or packages **/ - APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ - APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ - APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ - APPLET_NO_NETWORK /** No Network connection available **/ + APPLET_NO_UPDATES, /** No updates **/ + APPLET_UPDATES, /** Updates available **/ + APPLET_CRITICAL_UPDATES, /** Updates available (security) **/ + APPLET_CHECKING, /** Checking for updates **/ + APPLET_PROBLEM, /** Problem **/ + APPLET_INSTALLING, /** Installing patches or packages **/ + APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ + APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ + APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ + APPLET_NO_NETWORK /** No Network connection available **/ }; /** @@ -98,7 +98,6 @@ **/ void updateAppletError( const QString &desc ); - // TODO void setProgress(int step, int totalSteps, QString labelText); void setProgressNextStep(QString labelText); void showProgress(bool visible); @@ -155,7 +154,7 @@ **/ // todo // virtual void populateUpdateList(QListView* updateList) = 0; - virtual void populateLists(QListView* patchList, QListView* packageList, bool displayProgress ) = 0; + virtual void populateLists(Q3ListView* patchList, Q3ListView* packageList, bool displayProgress ) = 0; /** This slot is signaled when an update is selected and @@ -163,7 +162,7 @@ @param selectedItem the currently selected update. **/ - virtual void resolvableSelected(QListViewItem* selectedItem, int resolvableType) = 0; + virtual void resolvableSelected(Q3ListViewItem* selectedItem, int resolvableType) = 0; }; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.h?rev=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.h Wed Dec 5 16:45:39 2007 @@ -1,5 +1,7 @@ #include -#include +#include +//Added by qt3to4: +#include <QLabel> #ifndef PROGRESSPOPUP_H #define PROGRESSPOPUP_H @@ -17,7 +19,7 @@ void setText(QString text); private: - QProgressBar *bar; + Q3ProgressBar *bar; QLabel *packageLabel; }; 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp Wed Dec 5 16:45:39 2007 @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,7 +37,8 @@ // ------------------- Header -------------------------- QLabel *suseLogo = new QLabel(this); - QPixmap *pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge)); + + QPixmap *pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeHuge)); suseLogo->setPixmap(*pic); headline = new QLabel(centralWidget); @@ -54,14 +55,14 @@ textBrowser = new Q3TextBrowser( centralWidget); - recommended = new QCheckBox(i18n("Install %n recommended update additionally", + recommended = new QCheckBox(i18np("Install %n recommended update additionally", "Install %n recommended updates additionally", 0), centralWidget); recommended->setChecked(true); additionalText = new QLabel(centralWidget); - additionalText->setText(i18n( "Install %n recommended update additionally", + additionalText->setText(i18np( "Install %n recommended update additionally", "Install %n recommended updates additionally",0)); norestart = new QCheckBox(i18n("Don't install updates that require a restart"), centralWidget); @@ -79,8 +80,8 @@ // -------------------- Buttons ------------------------ details = new KPushButton(i18n("Details"),centralWidget); - install = new KPushButton(KStdGuiItem::ok(), centralWidget); - ok = new KPushButton(KStdGuiItem::close(), centralWidget); + install = new KPushButton(KStandardGuiItem::ok(), centralWidget); + ok = new KPushButton(KStandardGuiItem::close(), centralWidget); install->setText(i18n("Install")); @@ -240,21 +241,21 @@ case APPLET_CRITICAL_UPDATES: headline->setText(i18n("<b>New software for your system is available</b>")); title->show(); - title->setText(i18n("%n security update is available", + title->setText(i18np("%n security update is available", "%n security updates are available", securityCount)); if (recommendedCount > 0 ) { if ( _detailWindow->getUpdaterCapabilities().canSelectIndividualUpdates ) { - recommended->setText(i18n("Install %n recommended update additionally", + recommended->setText(i18np("Install %n recommended update additionally", "Install %n recommended updates additionally", recommendedCount)); recommended->show(); additionalText->hide(); } else { - additionalText->setText(i18n("%n recommended update is available", + additionalText->setText(i18np("%n recommended update is available", "%n recommended updates are available", recommendedCount)); additionalText->show(); recommended->hide(); @@ -285,15 +286,15 @@ install->setEnabled(false); if (patchCount > 0 && packageCount == 0) - title->setText(i18n("%n optional update is available.<br>You can select optional updates in the detailed dialog.", + title->setText(i18np("%n optional update is available.<br>You can select optional updates in the detailed dialog.", "%n optional updates are available.<br>You can select optional updates in the detailed dialog.", patchCount)); if (packageCount > 0 && patchCount == 0) - title->setText(i18n("%n optional upgrade is available.<br>You can select optional upgrades in the detailed dialog.", + title->setText(i18np("%n optional upgrade is available.<br>You can select optional upgrades in the detailed dialog.", "%n optional upgrades are available.<br>You can select optional upgrades in the detailed dialog.", packageCount)); if (packageCount > 0 && patchCount > 0) - title->setText(i18n("%n optional update and upgrade is available.<br>You can select optional updates and upgrades in the detailed dialog.", + title->setText(i18np("%n optional update and upgrade is available.<br>You can select optional updates and upgrades in the detailed dialog.", "%n optional updates and upgrades are available.<br>You can select optional updates and upgrades in the detailed dialog.", patchCount+packageCount)); } 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=8034&r1=8033&r2=8034&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.h Wed Dec 5 16:45:39 2007 @@ -1,13 +1,15 @@ #include #include #include +//Added by qt3to4: +#include <QShowEvent> #include -#include +#include #include "MainWindow.h" class MainWindow; -class QTextBrowser; +class Q3TextBrowser; #ifndef SIMPLEVIEW_H #define SIMPLEVIEW_H @@ -30,8 +32,8 @@ KPushButton *install; KPushButton *details; KPushButton *ok; - QProgressBar *bar; - QTextBrowser *textBrowser; + Q3ProgressBar *bar; + Q3TextBrowser *textBrowser; int recommendedCount; int securityCount; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org