Author: tgoettlicher Date: Mon Jun 4 17:00:53 2007 New Revision: 5665 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5665&view=rev Log: patches tab has new layout Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=5665&r1=5664&r2=5665&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Mon Jun 4 17:00:53 2007 @@ -99,7 +99,7 @@ /************************************************************* - INIT Methods +INIT Methods **************************************************************/ @@ -118,77 +118,91 @@ tabwidget = new QTabWidget(centralWidget); QWidget *patchWidget = new QWidget(tabwidget); - QWidget *packageWidget = new QWidget(tabwidget); - - QVBoxLayout *patchBox = new QVBoxLayout(patchWidget); - QVBoxLayout *packageBox = new QVBoxLayout(packageWidget); - + QLabel *patchLabel = new QLabel(patchWidget); + patchLabel->setText(i18n("The following are software patches to fix bugs.")); patchList = new QListView(patchWidget); - packageList = new QListView(packageWidget); + patchList->addColumn(i18n("Name")); + patchList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); + patchList->addColumn(i18n("Type")); + patchList->addColumn(i18n("New Version")); + patchList->addColumn(i18n("Catalog")); + patchList->addColumn("ID", 0); // This is a hidden column to hold the ID of the patch/package + QVBoxLayout *patchBox = new QVBoxLayout(patchWidget); patchDescription = new KTextEdit(patchWidget); - packageDescription = new KTextEdit(packageWidget); + patchDescription->setReadOnly(true); + tabwidget->addTab(patchWidget, "Patches"); + patchBox->addWidget(patchLabel,0,0); patchBox->addWidget(patchList,0,0); - patchBox->addWidget(patchDescription,0,0); + + QWidget *packageWidget = new QWidget(tabwidget); + QLabel *packageLabel = new QLabel(packageWidget); + packageLabel->setText(i18n("<b>For experts only!</b><br>The following are software upgrades to add features.")); + packageList = new QListView(packageWidget); + packageList->addColumn(i18n("Name")); + packageList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); + packageList->addColumn(i18n("Type")); + packageList->addColumn(i18n("New Version")); + packageList->addColumn(i18n("Catalog")); + packageList->addColumn("ID", 0); // This is a hidden column to hold the ID of the patch/package + QVBoxLayout *packageBox = new QVBoxLayout(packageWidget); + packageDescription = new KTextEdit(packageWidget); + packageDescription->setReadOnly(true); + packageBox->addWidget(packageLabel,0,0); packageBox->addWidget(packageList,0,0); packageBox->addWidget(packageDescription,0,0); - - tabwidget->addTab(patchWidget, "Patches" ); - tabwidget->addTab(packageWidget, "Packages (for experts only)" ); + tabwidget->addTab(packageWidget, "Upgrades" ); + + // configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), centralWidget); - cancelButton = new KPushButton(KStdGuiItem::cancel(), centralWidget); - installButton = new KPushButton(KStdGuiItem::ok(), centralWidget); - installButton->setText(i18n("Install")); + patchCancelButton = new KPushButton(KStdGuiItem::cancel(), patchWidget); + patchInstallButton = new KPushButton(KStdGuiItem::ok(), patchWidget); + patchInstallButton->setText(i18n("Install")); - selectAllButton = new KPushButton(i18n("Select All"), centralWidget); - clearSelectionButton = new KPushButton(i18n("Clear Selection"), centralWidget); + patchSelectAllButton = new KPushButton(i18n("Select All"), patchWidget); + patchClearSelectionButton = new KPushButton(i18n("Clear Selection"), patchWidget); mainBox->addWidget(header, 0, 0); mainBox->addWidget(tabwidget, 0, 0); - selectionButtonsLayout = new QHBoxLayout(mainBox); - selectionButtonsLayout->addWidget(selectAllButton, false, Qt::AlignLeft); - selectionButtonsLayout->addWidget(clearSelectionButton, false, Qt::AlignRight); + patchSelectionButtonsLayout = new QHBoxLayout(patchBox); + patchSelectionButtonsLayout->addWidget(patchSelectAllButton, false, Qt::AlignLeft); + patchSelectionButtonsLayout->addWidget(patchClearSelectionButton, false, Qt::AlignRight); - patchDescription->setReadOnly(true); - packageDescription->setReadOnly(true); - -// patchDescription->setMinimumHeight(125); + patchBox->addWidget(patchDescription,0,0); - buttonsLayout = new QHBoxLayout(mainBox); + patchButtonsLayout = new QHBoxLayout(patchBox); // buttonsLayout->addWidget(configureButton, false, Qt::AlignLeft); // buttonsLayout->insertSpacing(1, 250); - buttonsLayout->addWidget(installButton, false, Qt::AlignRight); - buttonsLayout->addSpacing(10); - buttonsLayout->addWidget(cancelButton, false, Qt::AlignRight); - - connect(configureButton, SIGNAL(clicked()), this, SLOT(serverButtonClicked())); - connect(installButton, SIGNAL(clicked()), this, SLOT(installButtonClicked())); - connect(cancelButton, SIGNAL(clicked()), this, SLOT(hide())); - connect(selectAllButton, SIGNAL(clicked()), this, SLOT(selectButtonClicked())); - connect(clearSelectionButton, SIGNAL(clicked()), this, SLOT(clearButtonClicked())); + patchButtonsLayout->addWidget(patchInstallButton, false, Qt::AlignLeft); +// patchButtonsLayout->addSpacing(10); + patchButtonsLayout->addWidget(patchCancelButton, false, Qt::AlignRight); - header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>")); - patchList->addColumn(i18n("Name")); - patchList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); - patchList->addColumn(i18n("Type")); - patchList->addColumn(i18n("New Version")); - patchList->addColumn(i18n("Catalog")); - packageList->addColumn(i18n("Name")); - packageList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); - packageList->addColumn(i18n("Type")); - packageList->addColumn(i18n("New Version")); - packageList->addColumn(i18n("Catalog")); + + patchBox->setSpacing(10); + patchBox->setMargin(10); + + packageBox->setSpacing(10); + packageBox->setMargin(10); + + mainBox->setSpacing(10); + mainBox->setMargin(10); + + + +// connect(configureButton, SIGNAL(clicked()), this, SLOT(serverButtonClicked())); + connect(patchInstallButton, SIGNAL(clicked()), this, SLOT(patchInstallButtonClicked())); + connect(patchCancelButton, SIGNAL(clicked()), this, SLOT(hide())); + connect(patchSelectAllButton, SIGNAL(clicked()), this, SLOT(patchSelectButtonClicked())); + connect(patchClearSelectionButton, SIGNAL(clicked()), this, SLOT(patchClearButtonClicked())); + + header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>")); - /* - Hidden Columns, we use these to store data about the packages/patches - */ - patchList->addColumn("ID", 0); // This is a hidden column to hold the ID of the patch/package connect(patchList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotPackageSelected(QListViewItem*))); @@ -202,18 +216,14 @@ connect(patchList, SIGNAL(selectionChanged()), this, SLOT(slotPackageSelectionChanged())); - patchBox->setSpacing(10); - patchBox->setMargin(10); - - packageBox->setSpacing(10); - packageBox->setMargin(10); - mainBox->setSpacing(10); - mainBox->setMargin(10); resize(400,500); setIcon(UserIcon(TRAY_ICON_GREEN)); setCaption(i18n("Available Updates")); hide(); + +// tabwidget->removePage(packageWidget); +// tabwidget->removePage(patchWidget); } void MainWindow::updateButtons() @@ -222,11 +232,11 @@ if ( (_caps.canSelectIndividualUpdates==true && updatesSelected > 0) || (_caps.canSelectIndividualUpdates==false && patchList->childCount() > 0 ) ) { - installButton->setDisabled(false); + patchInstallButton->setDisabled(false); } else { - installButton->setDisabled(true); + patchInstallButton->setDisabled(true); } } @@ -236,14 +246,14 @@ if (_caps.canSelectIndividualUpdates==false) { - selectAllButton->hide(); - clearSelectionButton->hide(); + patchSelectAllButton->hide(); + patchClearSelectionButton->hide(); patchList->setSelectionMode ( QListView::NoSelection ); } else { - selectAllButton->show(); - clearSelectionButton->show(); + patchSelectAllButton->show(); + patchClearSelectionButton->show(); patchList->setSelectionMode ( QListView::Multi ); } updateButtons(); @@ -258,7 +268,7 @@ void MainWindow::slotInstallAllowed( bool allowed ) { - installButton->setEnabled(allowed); + patchInstallButton->setEnabled(allowed); } void MainWindow::slotAppletError(const QString &desc) Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=5665&r1=5664&r2=5665&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Mon Jun 4 17:00:53 2007 @@ -252,15 +252,23 @@ KTextEdit *packageDescription; HeaderWidget *header; - KPushButton *installButton; - KPushButton *cancelButton; + KPushButton *patchInstallButton; + KPushButton *patchCancelButton; + KPushButton *patchSelectAllButton; + KPushButton *patchClearSelectionButton; + + KPushButton *packageInstallButton; + KPushButton *packageCancelButton; + KPushButton *packageSelectAllButton; + KPushButton *packageClearSelectionButton; + KPushButton *configureButton; - KPushButton *selectAllButton; - KPushButton *clearSelectionButton; QVBoxLayout *mainBox; - QHBoxLayout *selectionButtonsLayout; - QHBoxLayout *buttonsLayout; + QHBoxLayout *patchSelectionButtonsLayout; + QHBoxLayout *packageSelectionButtonsLayout; + QHBoxLayout *patchButtonsLayout; + QHBoxLayout *packageButtonsLayout; QTimer *timer; int timerInterval; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org