Author: tgoettlicher
Date: Fri Jul 13 17:07:06 2007
New Revision: 6009
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6009&view=rev
Log:
Logic for simpleview and mainwindow
Modified:
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/MainWindow.h
trunk/updater-kde/updater/UpdaterApplication.cpp
trunk/updater-kde/updater/UpdaterApplication.h
trunk/updater-kde/updater/simpleview.cpp
trunk/updater-kde/updater/simpleview.h
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6009&r1=6008&r2=6009&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Fri Jul 13 17:07:06 2007
@@ -56,20 +56,17 @@
-MainWindow::MainWindow(QWidget *parent)
- : KMainWindow(parent)
+MainWindow::MainWindow(QWidget *parent, QWidget *simple)
+ : KMainWindow(parent) , _simple(simple)
{
- SimpleView *simple = new SimpleView();
- simple->show();
-
-
KIconLoader iconLoader(PROGRAM_NAME);
- applet = new TrayIcon(this);
+// applet = new TrayIcon(this);
+ applet = new TrayIcon(simple);
applet->show();
connect(applet, SIGNAL(quitSelected()), this, SLOT(slotExit()));
- connect(applet, SIGNAL(showSimpleView()), this, SLOT(showMainWindow()));
+ connect(applet, SIGNAL(showSimpleView()), this, SLOT(showSimpleView()));
initGUI();
@@ -97,7 +94,6 @@
patchesSelected = 0;
packagesSelected = 0;
-// popup = new OSUpdaterPopup(applet,this);
progressPopup = new ProgressPopup(applet);
@@ -141,6 +137,7 @@
patchList->addColumn(i18n("Catalog"));
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);
@@ -179,6 +176,8 @@
packageList->addColumn(i18n("Catalog"));
packageList->addColumn(i18n("Size"));
packageList->addColumn(i18n("Restart"));
+ packageList->addColumn(i18n("RestartHidden"),0);
+
QVBoxLayout *packageBox = new QVBoxLayout(packageWidget);
packageDescription = new KTextEdit(packageWidget);
packageDescription->setReadOnly(true);
@@ -490,7 +489,6 @@
updateButtons();
}
-
void MainWindow::patchClearButtonClicked()
{
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
@@ -498,7 +496,7 @@
while (item != NULL) {
if (item->isOn()) {
item->setState(QCheckListItem::Off);
- item->setSelected(false);
+ item->setSelected(false);
}
item = (QCheckListItem*)item->nextSibling();
}
@@ -506,6 +504,54 @@
updateButtons();
}
+void MainWindow::patchStandardSelection()
+{
+ QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
+
+ while (item != NULL) {
+ if (item->text(COLUMN_TYPE) == "security" ) {
+ item->setState(QCheckListItem::On);
+ item->setSelected(true);
+ }
+ else
+ {
+ item->setState(QCheckListItem::Off);
+ item->setSelected(false);
+ }
+ item = (QCheckListItem*)item->nextSibling();
+ }
+ updateButtons();
+}
+
+void MainWindow::patchSelectRecommended()
+{
+ QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
+
+ while (item != NULL) {
+ if (item->text(COLUMN_TYPE) == "recommended" ) {
+ item->setState(QCheckListItem::On);
+ item->setSelected(true);
+ }
+ item = (QCheckListItem*)item->nextSibling();
+ }
+ updateButtons();
+}
+
+
+void MainWindow::patchUnselectRestart()
+{
+ QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
+
+ while (item != NULL) {
+ if (item->text(COLUMN_RESTART_HIDDEN) == "restart" ) {
+ item->setState(QCheckListItem::Off);
+ item->setSelected(false);
+ }
+ item = (QCheckListItem*)item->nextSibling();
+ }
+ updateButtons();
+}
+
void MainWindow::packageClearButtonClicked()
{
QCheckListItem *item = (QCheckListItem*)packageList->firstChild();
@@ -617,9 +663,15 @@
kapp->quit();
}
+void MainWindow::showSimpleView()
+{
+ kdDebug() << "showSimpleView" << endl;
+ _simple->show();
+}
+
void MainWindow::showMainWindow()
{
- kdDebug() << "showMainWindow" << endl;
+ 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=6009&r1=6008&r2=6009&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.h (original)
+++ trunk/updater-kde/updater/MainWindow.h Fri Jul 13 17:07:06 2007
@@ -38,9 +38,11 @@
class Updater;
class HeaderWidget;
class OSUpdaterPopup;
-
class KAction;
+
+
+
/**
@file
@@ -65,6 +67,7 @@
COLUMN_DOWNLOADSIZE, /** Download size **/
COLUMN_RESTART, /** Restart needed **/
COLUMN_ID, /** The ID of the Package/Patch **/
+ COLUMN_RESTART_HIDDEN, /** Restart needed (hidden column, machine readable )**/
};
/**
@@ -83,7 +86,7 @@
Init function
@param parent the parent window, always null in our case.
*/
- MainWindow(QWidget *parent=0);
+ MainWindow(QWidget *parent=0, QWidget *simple=0);
@@ -209,6 +212,17 @@
*/
void showMainWindow();
+ /**
+ Shows the SimpleView
+ */
+ void showSimpleView();
+
+ // TODO
+ void patchSelectRecommended();
+ void patchStandardSelection();
+ void patchUnselectRestart();
+
+
private slots:
void slotExit();
@@ -282,6 +296,7 @@
//popup
// OSUpdaterPopup *popup;
ProgressPopup *progressPopup;
+ QWidget *_simple;
UpdaterCapabilities _caps;
Modified: trunk/updater-kde/updater/UpdaterApplication.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/UpdaterApplication.cpp?rev=6009&r1=6008&r2=6009&view=diff
==============================================================================
--- trunk/updater-kde/updater/UpdaterApplication.cpp (original)
+++ trunk/updater-kde/updater/UpdaterApplication.cpp Fri Jul 13 17:07:06 2007
@@ -27,6 +27,7 @@
#include "UpdaterApplication.h"
#include "opensuseupdater_settings.h"
+#include "simpleview.h"
#include "Updater.h"
#include "MainWindow.h"
#include "Constants.h"
@@ -34,17 +35,26 @@
UpdaterApplication::UpdaterApplication()
: KUniqueApplication(true,true,false)
- , _main(0L), _updater(0L)
+ , _main(0L), _updater(0L), _simple(0L)
{
- _main = new MainWindow();
- setMainWidget(_main);
- setTopWidget(_main);
+ _simple = new SimpleView();
+ _main = new MainWindow(0, _simple);
+
+ setMainWidget(_simple);
+ setTopWidget(_simple);
connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(slotAppletError(const QString &)));
connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(configButtonClicked()));
+
connect(_main, SIGNAL(signalConfigChanged()), this, SLOT(slotConfigChanged()));
+ connect(_simple, SIGNAL(showDetailView()), _main, SLOT(showMainWindow()));
+ connect(_simple, SIGNAL(startInstall()), _main, SLOT(installButtonClicked()));
+ connect(_simple, SIGNAL(patchSelectRecommended()), _main, SLOT(patchSelectRecommended()));
+ connect(_simple, SIGNAL(patchStandardSelection()), _main, SLOT(patchStandardSelection()));
+ connect(_simple, SIGNAL(patchUnselectRestart()), _main, SLOT(patchUnselectRestart()));
+
connectToPlugin();
}
Modified: trunk/updater-kde/updater/UpdaterApplication.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/UpdaterApplication.h?rev=6009&r1=6008&r2=6009&view=diff
==============================================================================
--- trunk/updater-kde/updater/UpdaterApplication.h (original)
+++ trunk/updater-kde/updater/UpdaterApplication.h Fri Jul 13 17:07:06 2007
@@ -26,6 +26,7 @@
class MainWindow;
class Updater;
+class SimpleView;
/**
@file
@@ -55,6 +56,7 @@
MainWindow *_main;
Updater *_updater;
+ SimpleView *_simple;
bool loadPlugin(KService::Ptr service);
KService::Ptr selectPlugin(QString backendName);
void connectToPlugin();
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6009&r1=6008&r2=6009&view=diff
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Fri Jul 13 17:07:06 2007
@@ -10,12 +10,18 @@
#include