Author: tgoettlicher
Date: Thu Jul 12 16:47:14 2007
New Revision: 5994
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5994&view=rev
Log:
- added SimpleView
- removed old icons
Added:
trunk/updater-kde/updater/simpleview.cpp
trunk/updater-kde/updater/simpleview.h
Removed:
trunk/updater-kde/updater/hi128-app-opensuseupdater.png
trunk/updater-kde/updater/hi16-app-opensuseupdater.png
trunk/updater-kde/updater/hi32-app-opensuseupdater.png
trunk/updater-kde/updater/hi48-app-opensuseupdater.png
trunk/updater-kde/updater/hi64-app-opensuseupdater.png
Modified:
trunk/updater-kde/updater/HeaderWidget.cpp
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/MainWindow.h
Modified: trunk/updater-kde/updater/HeaderWidget.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/HeaderWidget.cpp?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/updater-kde/updater/HeaderWidget.cpp (original)
+++ trunk/updater-kde/updater/HeaderWidget.cpp Thu Jul 12 16:47:14 2007
@@ -25,12 +25,11 @@
#include
#include "Constants.h"
-HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent) {
-
+HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent)
+{
layout = new QHBoxLayout(this);
suseLogo = new QLabel(this);
text = new QLabel(this);
-// pic = new QPixmap(UserIcon("suse_logo.png"));
pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge));
@@ -39,10 +38,8 @@
layout->addWidget(suseLogo);
layout->addWidget(text);
-// layout->insertSpacing(1, 30);
text->setText("<b>Default</b><br>");
-// text->setMinimumWidth(400);
show();
}
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Thu Jul 12 16:47:14 2007
@@ -60,6 +60,10 @@
: KMainWindow(parent)
{
+ SimpleView *simple = new SimpleView();
+ simple->show();
+
+
KIconLoader iconLoader(PROGRAM_NAME);
applet = new TrayIcon(this);
@@ -93,7 +97,7 @@
patchesSelected = 0;
packagesSelected = 0;
- popup = new OSUpdaterPopup(applet,this);
+// popup = new OSUpdaterPopup(applet,this);
progressPopup = new ProgressPopup(applet);
@@ -314,7 +318,7 @@
applet->setState(state);
applet->setUpdates(patches, packages);
- popup->setUpdates(patches, packages);
+// popup->setUpdates(patches, packages);
}
void MainWindow::slotSetProgress(int step, int totalSteps, QString text)
Modified: trunk/updater-kde/updater/MainWindow.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.h (original)
+++ trunk/updater-kde/updater/MainWindow.h Thu Jul 12 16:47:14 2007
@@ -280,7 +280,7 @@
int packagesSelected;
//popup
- OSUpdaterPopup *popup;
+// OSUpdaterPopup *popup;
ProgressPopup *progressPopup;
UpdaterCapabilities _caps;
Added: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=5994&view=auto
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (added)
+++ trunk/updater-kde/updater/simpleview.cpp Thu Jul 12 16:47:14 2007
@@ -0,0 +1,72 @@
+#include "simpleview.h"
+#include
+#include
+#include
+#include
+#include "Constants.h"
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+SimpleView::SimpleView() : QWidget (NULL, 0 , Qt::WStyle_Dialog)
+{
+
+ QGridLayout *layout = new QGridLayout(this);
+ layout->setSpacing(5);
+ layout->setMargin(10);
+
+ // ------------------- Header --------------------------
+
+ QLabel *suseLogo = new QLabel(this);
+ QPixmap *pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge));
+ suseLogo->setPixmap(*pic);
+
+ QLabel *headline = new QLabel(this);
+ headline->setText(i18n("<b>New software for your system is available!</b>"));
+ headline->setAlignment(Qt::SingleLine);
+
+ layout->addMultiCellWidget(suseLogo,0,1,0,0);
+ layout->addMultiCellWidget(headline,0,0,1,3);
+
+ // ------------------ Boxes ----------------------------
+
+ QLabel *title = new QLabel(this);
+ title->setText(i18n("Choose the updates to be installed:"));
+
+ QFrame *line = new QFrame(this);
+ line->setFrameShape(QFrame::HLine);
+ line->setFrameShadow(QFrame::Sunken);
+
+ security = new QCheckBox(i18n("%1 security updates").arg(42), this);
+ recommended = new QCheckBox(i18n("%1 recommeded updates").arg(42), this);
+ norestart = new QCheckBox(i18n("Don't install updates that require a restart"), this);
+
+ layout->addMultiCellWidget(title,1,1,1,3);
+ layout->addMultiCellWidget(security,2,2,1,3);
+ layout->addMultiCellWidget(recommended,3,3,1,3);
+ layout->addMultiCellWidget(line,4,4,1,3);
+ layout->addMultiCellWidget(norestart,5,5,1,3);
+
+ // -------------------- Buttons ------------------------
+
+
+ QPushButton *details = new QPushButton(i18n("Details ..."),this);
+ QPushButton *ignore = new QPushButton(i18n("Cancel"),this);
+ QPushButton *install = new QPushButton(i18n("Install"),this);
+
+ layout->addWidget(details,6,0);
+ layout->addWidget(ignore,6,2);
+ layout->addWidget(install,6,3);
+
+
+
+
+
+
+}
+
+#include "simpleview.moc"
Added: trunk/updater-kde/updater/simpleview.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.h?rev=5994&view=auto
==============================================================================
--- trunk/updater-kde/updater/simpleview.h (added)
+++ trunk/updater-kde/updater/simpleview.h Thu Jul 12 16:47:14 2007
@@ -0,0 +1,19 @@
+#include
+#include
+
+#ifndef SIMPLEVIEW_H
+#define SIMPLEVIEW_H
+
+class SimpleView : public QWidget
+{
+ Q_OBJECT
+ public:
+ SimpleView();
+ protected:
+ private:
+ QCheckBox *security;
+ QCheckBox *recommended;
+ QCheckBox *norestart;
+};
+
+#endif
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
