Author: tgoettlicher
Date: Fri Dec 7 13:30:16 2007
New Revision: 8060
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8060&view=rev
Log:
backup
Modified:
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp
branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h
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=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp Fri Dec 7 13:30:16 2007
@@ -21,10 +21,10 @@
#include
#include
-#include
+//#include
#include
//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include
#include
#include
#include
@@ -65,8 +65,8 @@
QString backend = UpdaterSettings::self()->backendPlugin();
- KTrader::OfferList offers = KTrader::self()->query("openSUSEUpdater/Backend");
- KTrader::OfferList::ConstIterator iter;
+ KService::List offers = KServiceTypeTrader::self()->query("openSUSEUpdater/Backend");
+ KService::List::ConstIterator iter;
for (iter = offers.begin(); iter != offers.end(); ++iter )
{
KService::Ptr service = *iter;
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=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidgetUI.h Fri Dec 7 13:30:16 2007
@@ -13,10 +13,10 @@
#include
#include
//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3Frame>
-#include <Q3GridLayout>
-#include <Q3HBoxLayout>
+#include
+#include
+#include
+#include
#include <QLabel>
class Q3VBoxLayout;
Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp?rev=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp Fri Dec 7 13:30:16 2007
@@ -26,7 +26,7 @@
#include
//Added by qt3to4:
#include <QPixmap>
-#include <Q3GridLayout>
+#include
#include "Constants.h"
HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent)
@@ -34,11 +34,12 @@
// layout = new QHBoxLayout(this);
layout = new Q3GridLayout(this);
suseLogo = new QLabel(this);
- text = new QLabel(this, "headline", Qt::SingleLine);
+ text = new QLabel(this, "headline") ; //, Qt::SingleLine);
+ text->setWordWrap(false);
pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeHuge));
text->setText(i18n("<h2>Available Updates</h2>"));
- pic->setOptimization(QPixmap::BestOptim);
+// PORT pic->setOptimization(QPixmap::BestOptim);
suseLogo->setPixmap(*pic);
// layout->addWidget(suseLogo);
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=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.h Fri Dec 7 13:30:16 2007
@@ -23,9 +23,9 @@
#include
//Added by qt3to4:
#include <QPixmap>
-#include <Q3GridLayout>
+#include
#include <QLabel>
-#include <Q3HBoxLayout>
+#include
class QLabel;
class QPixmap;
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=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp Fri Dec 7 13:30:16 2007
@@ -33,22 +33,24 @@
#include "TrayIcon.h"
#include "Updater.h"
#include "opensuseupdater_settings.h"
+#include <QMovie>
-TrayIcon::TrayIcon(QWidget *parent) : KSystemTray(parent),
+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);
+ setIcon(loadIcon(TRAY_ICON_GREEN));
+// setScaledContents(true); PORT
setState(APPLET_NO_UPDATES);
// construct notification popup
- popup = new KPassivePopup(this);
+// popup = new KPassivePopup(this);
+ popup = new KPassivePopup(); //PORT
QWidget *popupWidget = new QWidget(popup);
Q3HBoxLayout *vb = new Q3HBoxLayout(popupWidget);
QLabel *iconLabel = new QLabel(popupWidget);
@@ -76,13 +78,14 @@
kDebug() << "Set applet status to: " << state << endl;
- QToolTip::remove(this);
+// QToolTip::remove(this); //PORT
appletState = state;
+/*
switch (state)
{
case APPLET_CHECKING:
if (UpdaterSettings::self()->checkingAnimation())
- setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_CHECKING, KIconLoader::Panel) ));
+// PORT setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_CHECKING, KIconLoader::Panel) ));
QToolTip::add(this, i18n("Checking for updates..."));
break;
@@ -120,7 +123,7 @@
break;
case APPLET_INSTALLING:
- setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_INSTALLING, KIconLoader::Panel) ));
+// PORT setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_INSTALLING, KIconLoader::Panel) ));
QToolTip::add(this, i18n("Updating..."));
break;
@@ -129,7 +132,7 @@
setPixmap(loadIcon(TRAY_ICON_UNKNOWN));
break;
- }
+ }*/
}
void TrayIcon::showPopup()
@@ -137,7 +140,7 @@
if ( (appletState == APPLET_UPDATES ||
appletState == APPLET_CRITICAL_UPDATES ) && UpdaterSettings::self()->showNotifications() )
{
- QToolTip::add(this, i18n("New software for your system is available"));
+// PORT 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=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h (original)
+++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h Fri Dec 7 13:30:16 2007
@@ -20,7 +20,8 @@
#ifndef _TRAY_ICON_H_
#define _TRAY_ICON_H_
-#include
+//#include
+#include
#include "progresspopup.h"
/**
@@ -35,7 +36,7 @@
@author Narayan Newton
**/
-class TrayIcon : public KSystemTray {
+class TrayIcon : public KSystemTrayIcon {
Q_OBJECT
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
