Author: tgoettlicher Date: Mon Jul 16 16:11:13 2007 New Revision: 6027 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6027&view=rev Log: backup Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/UpdaterApplication.cpp trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/simpleview.h Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Mon Jul 16 16:11:13 2007 @@ -56,13 +56,12 @@ -MainWindow::MainWindow(QWidget *parent, QWidget *simple) +MainWindow::MainWindow(QWidget *parent, SimpleView *simple) : KMainWindow(parent) , _simple(simple) { KIconLoader iconLoader(PROGRAM_NAME); -// applet = new TrayIcon(this); applet = new TrayIcon(simple); applet->show(); connect(applet, SIGNAL(quitSelected()), this, SLOT(slotExit())); @@ -138,7 +137,6 @@ patchList->addColumn(i18n("Size")); patchList->addColumn(i18n("Restart")); patchList->addColumn(i18n("RestartHidden"),0); -// patchList->addColumn("ID", 0); // This is a hidden column to hold the ID of the patch QVBoxLayout *patchBox = new QVBoxLayout(patchWidget); patchDescription = new KTextEdit(patchWidget); patchDescription->setReadOnly(true); @@ -308,16 +306,19 @@ kdDebug() << "Applet error, description length: " << desc.length() << endl; applet->setUpdates(0); applet->setState(APPLET_PROBLEM, desc); + + _simple->setUpdates(0); + _simple->setState(APPLET_PROBLEM, desc); } // todo void MainWindow::slotAppletState(int state, int patches, int packages) { -// applet->setUpdates(patchList->childCount()); applet->setState(state); applet->setUpdates(patches, packages); -// popup->setUpdates(patches, packages); + _simple->setState(state); + _simple->setUpdates(patches, packages); } void MainWindow::slotSetProgress(int step, int totalSteps, QString text) @@ -666,12 +667,12 @@ void MainWindow::showSimpleView() { kdDebug() << "showSimpleView" << endl; - _simple->show(); + _simple->show(); + _simple->raise(); } void MainWindow::showMainWindow() { - kdDebug() << "showMainWindow" << endl; show(); } Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Mon Jul 16 16:11:13 2007 @@ -25,6 +25,7 @@ #include "UpdaterCapabilities.h" #include "progresspopup.h" #include +#include "simpleview.h" class TrayIcon; @@ -86,7 +87,7 @@ Init function @param parent the parent window, always null in our case. */ - MainWindow(QWidget *parent=0, QWidget *simple=0); + MainWindow(QWidget *parent=0, SimpleView *simple=0); @@ -296,7 +297,7 @@ //popup // OSUpdaterPopup *popup; ProgressPopup *progressPopup; - QWidget *_simple; + SimpleView *_simple; UpdaterCapabilities _caps; Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Mon Jul 16 16:11:13 2007 @@ -47,7 +47,7 @@ QHBoxLayout *vb = new QHBoxLayout(popupWidget); QLabel *iconLabel = new QLabel(popupWidget); QLabel *description = new QLabel(popupWidget); - description->setText(i18n("New software for your system is available!")); + 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); @@ -87,7 +87,7 @@ setPixmap(loadIcon(TRAY_ICON_YELLOW)); if (patchCount + packageCount > 0) - QToolTip::add(this, i18n("New software for your system is available!")); + QToolTip::add(this, i18n("New software for your system is available")); /* // the following isn't realy stylish but allows fine translations Modified: trunk/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/UpdaterApplication.cpp?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/UpdaterApplication.cpp (original) +++ trunk/updater-kde/updater/UpdaterApplication.cpp Mon Jul 16 16:11:13 2007 @@ -40,6 +40,7 @@ _simple = new SimpleView(); _main = new MainWindow(0, _simple); + _simple->setDetailWindow(_main); setMainWidget(_simple); setTopWidget(_simple); Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Mon Jul 16 16:11:13 2007 @@ -13,9 +13,11 @@ #include #include #include +#include +#include "Updater.h" -SimpleView::SimpleView() +SimpleView::SimpleView() : _detailWindow(0L) { QWidget *centralWidget = new QWidget( this ); @@ -31,8 +33,8 @@ QPixmap *pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge)); suseLogo->setPixmap(*pic); - QLabel *headline = new QLabel(centralWidget); - headline->setText(i18n("<b>New software for your system is available!</b>")); + headline = new QLabel(centralWidget); + headline->setText(i18n("<b>New software for your system is available</b>")); headline->setAlignment(Qt::SingleLine); layout->addMultiCellWidget(suseLogo,0,1,0,0); @@ -121,4 +123,72 @@ +void SimpleView::showEvent(QShowEvent *) +{ + // don't show simple view, when detail view is shown + if (!_detailWindow->isHidden()) + { + _detailWindow->show(); + _detailWindow->raise(); + _detailWindow->setActiveWindow(); + + QTimer::singleShot(0, this, SLOT(hide())); + } +} + +void SimpleView::setDetailWindow(QWidget * detailWindow) +{ + _detailWindow = detailWindow; +} + +void SimpleView::setState(int state, const QString &description ) +{ + + + kdDebug() << "Set applet status to: " << state << endl; +// appletState = state; + switch (state) + { + case APPLET_CHECKING: + headline->setText(i18n("<b>Checking for updates...</b>")); + break; + + case APPLET_PROBLEM: + headline->setText(i18n("<b>Error:</b>\n" + description)); //TODO + break; + + case APPLET_NO_UPDATES: + headline->setText(i18n("<b>No Updates Available</b>")); + break; + + case APPLET_UPDATES: + case APPLET_CRITICAL_UPDATES: +// if (patchCount + packageCount > 0) + headline->setText(i18n("<b>New software for your system is available</b>")); + break; + + case APPLET_INSTALLING: + headline->setText(i18n("<b>Updating...</b>")); + break; + + } +} + +void SimpleView::setUpdates(int patches, int packages) +{ +/* if (patches >= 0) + + patchCount = patches; + else + patchCount = 0; + + if (packages >= 0) + packageCount = packages; + else + packageCount = 0; */ + +// setState(appletState); +} + + #include "simpleview.moc" Modified: trunk/updater-kde/updater/simpleview.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.h?rev=6027&r1=6026&r2=6027&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.h (original) +++ trunk/updater-kde/updater/simpleview.h Mon Jul 16 16:11:13 2007 @@ -1,5 +1,6 @@ #include #include +#include #ifndef SIMPLEVIEW_H #define SIMPLEVIEW_H @@ -9,11 +10,21 @@ Q_OBJECT public: SimpleView(); + void setDetailWindow(QWidget *); protected: private: QCheckBox *security; QCheckBox *recommended; QCheckBox *norestart; + void showEvent(QShowEvent *); + QWidget *_detailWindow; + QLabel *headline; + + public slots: + void setState(int state, const QString &description = QString() ); + void setUpdates(int pat, int pac=0); + + private slots: bool queryClose(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org