Author: tgoettlicher Date: Thu Apr 12 14:32:41 2007 New Revision: 5355 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5355&view=rev Log: fix text cut off (#220870) fix Software strings / Window names (#221236) fix warning message on STDOUT (#224548) fix unfortune default column (#262332) Modified: branches/work/updater-kde-refactoring/updater-kde/updater/Constants.h branches/work/updater-kde-refactoring/updater-kde/updater/HeaderWidget.cpp branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h branches/work/updater-kde-refactoring/updater-kde/updater/main.cpp Modified: branches/work/updater-kde-refactoring/updater-kde/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/Constants.h?rev=5355&r1=5354&r2=5355&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/Constants.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/Constants.h Thu Apr 12 14:32:41 2007 @@ -21,6 +21,7 @@ #define _CONSTANTS_H_ #define PROGRAM_NAME "opensuseupdater" +#define PROGRAM_DISPLAY_NAME "openSUSE Updater" #define VERSION "0.4" #define TRAY_ICON_GREEN "opensuseupdater_green" Modified: branches/work/updater-kde-refactoring/updater-kde/updater/HeaderWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/HeaderWidget.cpp?rev=5355&r1=5354&r2=5355&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/HeaderWidget.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/HeaderWidget.cpp Thu Apr 12 14:32:41 2007 @@ -34,8 +34,8 @@ pic->setOptimization(QPixmap::BestOptim); suseLogo->setPixmap(*pic); - layout->addWidget(suseLogo, false, Qt::AlignLeft); - layout->addWidget(text, true, Qt::AlignRight); + layout->addWidget(suseLogo); + layout->addWidget(text); layout->insertSpacing(1, 30); text->setText("<b>Default</b><br>"); Modified: branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp?rev=5355&r1=5354&r2=5355&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp Thu Apr 12 14:32:41 2007 @@ -107,23 +107,27 @@ //Build GUI, setup system tray and hide GUI initially. void MainWindow::initGUI() { + centralWidget = new QWidget( this ); + setCentralWidget( centralWidget ); + + KIconLoader *loader = KGlobal::iconLoader(); setIcon(loader->loadIcon(PROGRAM_NAME, KIcon::Small)); - mainBox = new QVBoxLayout(this); - header = new HeaderWidget(this); - updateList = new QListView(this); - packageDescription = new KTextEdit(this); + mainBox = new QVBoxLayout(centralWidget); + header = new HeaderWidget(centralWidget); + updateList = new QListView(centralWidget); + packageDescription = new KTextEdit(centralWidget); - configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), this); - cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - installButton = new KPushButton(KStdGuiItem::ok(), this); + 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")); if ( _caps.canSelectIndividualUpdates ) { - selectAllButton = new KPushButton(i18n("Select All"), this); - clearSelectionButton = new KPushButton(i18n("Clear Selection"), this); + selectAllButton = new KPushButton(i18n("Select All"), centralWidget); + clearSelectionButton = new KPushButton(i18n("Clear Selection"), centralWidget); } else { @@ -168,12 +172,11 @@ header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>")); - updateList->addColumn(i18n("Name"), 300); - updateList->setColumnWidthMode(COLUMN_NAME, QListView::Manual); + updateList->addColumn(i18n("Name")); + updateList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); updateList->addColumn(i18n("Type")); updateList->addColumn(i18n("New Version")); - updateList->addColumn(i18n("Catalog"), 10000); //cover the rest of the window - updateList->setHScrollBarMode(QListView::AlwaysOff); + updateList->addColumn(i18n("Catalog")); /* Hidden Columns, we use these to store data about the packages/patches Modified: branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h?rev=5355&r1=5354&r2=5355&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.h Thu Apr 12 14:32:41 2007 @@ -238,6 +238,9 @@ OSUpdaterPopup *popup; UpdaterCapabilities _caps; + + QWidget *centralWidget; + }; #endif Modified: branches/work/updater-kde-refactoring/updater-kde/updater/main.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/main.cpp?rev=5355&r1=5354&r2=5355&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/main.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/main.cpp Thu Apr 12 14:32:41 2007 @@ -34,7 +34,8 @@ int main(int argc, char **argv) { - KAboutData about(PROGRAM_NAME, PROGRAM_NAME, VERSION, "SUSE Updater"); + KAboutData about(PROGRAM_NAME, PROGRAM_DISPLAY_NAME, VERSION, "SUSE Updater"); + KCmdLineArgs::init(argc, argv, &about); KUniqueApplication::addCmdLineOptions(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org