December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42619 - /branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 16:59:29 2007 New Revision: 42619 URL: http://svn.opensuse.org/viewcvs/yast?rev=42619&view=rev Log: YQPackageSelectorPlugin Modified: branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Modified: branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPack… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Mon Dec 3 16:59:29 2007 @@ -18,8 +18,6 @@ /-*/ -#define QT3_SUPPORT 1 - #include "YQPackageSelectorPlugin.h" #define y2log_component "qt-ui" #include <ycp/y2log.h> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42618 - /branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 16:59:28 2007 New Revision: 42618 URL: http://svn.opensuse.org/viewcvs/yast?rev=42618&view=rev Log: YQUI_builtins Modified: branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Modified: branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_b… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Mon Dec 3 16:59:28 2007 @@ -17,7 +17,6 @@ Textdomain "packages-qt" /-*/ -#define QT3_SUPPORT #define USE_QT_CURSORS 1 #define FORCE_UNICODE_FONT 0 @@ -25,12 +24,11 @@ #include <sys/stat.h> #include <unistd.h> -#include <qcursor.h> -#include <q3filedialog.h> -#include <qmessagebox.h> -#include <qpixmap.h> -#include <qinputdialog.h> -#include <q3vbox.h> +#include <QCursor> +#include <QFileDialog> +#include <QMessageBox> +#include <QPixmap> +#include <QInputDialog> #include <ycp/YCPTerm.h> #define y2log_component "qt-ui" @@ -117,7 +115,7 @@ QWidget * dialog = (QWidget *) YDialog::currentDialog()->widgetRep(); QPixmap screenShot = QPixmap::grabWindow( dialog->winId() ); - XSync( dialog->x11Display(), false ); + //FIXME XSync( dialog->x11Display(), false ); QString fileName ( stl_filename.c_str() ); bool interactive = false; @@ -134,7 +132,7 @@ // Initialize screen shot directory // - QString home = QDir::homeDirPath(); + QString home = QDir::homePath(); char * ssdir = getenv("Y2SCREENSHOTS"); QString dir = ssdir ? ssdir : "yast2-screen-shots"; @@ -149,7 +147,7 @@ dir = "/tmp/" + dir; - if ( mkdir( dir, 0700 ) == -1 ) + if ( mkdir( qPrintable(dir), 0700 ) == -1 ) dir = ""; } else @@ -159,7 +157,7 @@ // chance to create symlinks to a better location if he wishes so. dir = home + "/" + dir; - (void) mkdir( dir, 0750 ); + (void) mkdir( qPrintable(dir), 0750 ); } screenShotNameTemplate = dir + "/%s-%03d.png"; @@ -173,8 +171,8 @@ const char * baseName = moduleName(); if ( ! baseName ) baseName = "scr"; int no = screenShotNo[ baseName ]; - fileName.sprintf( screenShotNameTemplate, baseName, no ); - y2debug( "screenshot: %s", (const char *) fileName ); + fileName.sprintf( qPrintable(screenShotNameTemplate), baseName, no ); + y2debug( "screenshot: %s", qPrintable(fileName) ); { YQSignalBlocker sigBlocker( &_user_input_timer ); @@ -196,12 +194,12 @@ // Actually save the screen shot // - y2debug( "Saving screen shot to %s", (const char *) fileName ); + y2debug( "Saving screen shot to %s", qPrintable(fileName) ); bool success = screenShot.save( fileName, "PNG" ); if ( ! success ) { - y2error( "Couldn't save screen shot %s", (const char *) fileName ); + y2error( "Couldn't save screen shot %s", qPrintable(fileName) ); if ( interactive ) { @@ -218,7 +216,7 @@ { macroRecorder->beginBlock(); YDialog::currentDialog()->saveUserInput( macroRecorder ); - macroRecorder->recordMakeScreenShot( true, (const char *) fileName ); + macroRecorder->recordMakeScreenShot( true, qPrintable(fileName) ); macroRecorder->recordUserInput( YCPVoid() ); macroRecorder->endBlock(); } @@ -235,16 +233,16 @@ { QString saveLogsCommand = "/sbin/save_y2logs"; - if ( access( saveLogsCommand.ascii(), X_OK ) == 0 ) + if ( access( saveLogsCommand.toAscii(), X_OK ) == 0 ) { saveLogsCommand += " '" + fileName + "'"; - y2milestone( "Saving y2logs: %s", saveLogsCommand.ascii() ); - int result = system( saveLogsCommand.ascii() ); + y2milestone( "Saving y2logs: %s", qPrintable(saveLogsCommand) ); + int result = system( qPrintable(saveLogsCommand) ); if ( result != 0 ) { y2error( "Error saving y2logs: \"%s\" exited with %d", - (const char *) saveLogsCommand, result ); + qPrintable(saveLogsCommand), result ); QMessageBox::warning( 0, // parent "Error", // caption QString( "Couldn't save y2logs to %1 - " @@ -255,13 +253,13 @@ } else { - y2milestone( "y2logs saved to %s", (const char *) fileName ); + y2milestone( "y2logs saved to %s", qPrintable(fileName) ); } } else { y2error( "Error saving y2logs: Command %s not found", - saveLogsCommand.ascii() ); + qPrintable(saveLogsCommand) ); QMessageBox::warning( 0, // parent "Error", // caption @@ -282,18 +280,14 @@ items << "Debug logging off" << "Debug logging on"; - QString result = QInputDialog::getItem( "YaST2 Logging", // caption - "Configure YaST2 Logging:", // label - items, - get_log_debug() ? 1 : 0, - false, // editable - &okButtonPressed, - _main_win ); // parent - + QString result = QInputDialog::getItem( _main_win, + tr("YaST2 Logging"), + tr("Configure YaST2 Logging:"), + items, 0, get_log_debug() ? 1 : 0, &okButtonPressed); if ( okButtonPressed ) { set_log_debug( result.endsWith( "on" ) ); - y2milestone( "Changing logging: %s - %s", (const char *) result, + y2milestone( "Changing logging: %s - %s", qPrintable(result), get_log_debug() ? "y2debug on" : "y2debug off" ); } } @@ -318,15 +312,15 @@ normalCursor(); QString filename = - Q3FileDialog::getSaveFileName( DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp", // filter - 0, // parent - 0, // (widget) name - "Select Macro File to Record to" ); // caption + QFileDialog::getSaveFileName( 0, + "Select Macro File to Record to", + DEFAULT_MACRO_FILE_NAME, // startWith + "*.ycp" // filter + ); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled { - recordMacro( (const char *) filename ); + recordMacro( qPrintable(filename) ); } } } @@ -337,16 +331,15 @@ normalCursor(); QString filename = - Q3FileDialog::getOpenFileName( DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp", // filter - 0, // parent - 0, // (widget) name - "Select Macro File to Play" ); // caption + QFileDialog::getOpenFileName( 0, + "Select Macro File to Play", + DEFAULT_MACRO_FILE_NAME, // startWith + "*.ycp" ); busyCursor(); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled { - playMacro( (const char *) filename ); + playMacro( qPrintable(filename) ); // Do special magic to get out of any UserInput() loop right now // without doing any harm - otherwise this would hang until the next @@ -356,7 +349,7 @@ if ( _do_exit_loop ) { - qApp->exit_loop(); + _eventLoop->exit(); } } } @@ -369,10 +362,9 @@ normalCursor(); QString dir_name = - Q3FileDialog::getExistingDirectory( fromUTF8( startDir->value() ), - _main_win, // parent - "dir_selector", // name - fromUTF8( headline->value() ) ); // caption + QFileDialog::getExistingDirectory( _main_win, + fromUTF8( headline->value() ), + fromUTF8( startDir->value() ) ); busyCursor(); if ( dir_name.isEmpty() ) // this includes dir_name.isNull() @@ -389,11 +381,10 @@ normalCursor(); QString file_name = - Q3FileDialog::getOpenFileName( fromUTF8( startWith->value() ), - fromUTF8( filter->value() ), - _main_win, // parent - "file_selector", // name - fromUTF8( headline->value() ) ); // caption + QFileDialog::getOpenFileName( _main_win, // parent + fromUTF8( headline->value() ), + fromUTF8( startWith->value() ), + fromUTF8( filter->value() ) ); busyCursor(); if ( file_name.isEmpty() ) // this includes file_name.isNull() @@ -434,21 +425,20 @@ // Leave the mouse cursor alone - this function might be called from // some other widget, not only from UI::AskForSaveFileName(). - file_name = Q3FileDialog::getSaveFileName( startWith, - filter, - _main_win, // parent - "file_selector", // name - headline ); // caption + file_name = QFileDialog::getSaveFileName( _main_win, + headline, + startWith, + filter ); if ( file_name.isEmpty() ) // this includes file_name.isNull() return QString::null; - if ( access( (const char *) file_name, F_OK ) == 0 ) // file exists? + if ( access( qPrintable(file_name), F_OK ) == 0 ) // file exists? { QString msg; - if ( access( (const char *) file_name, W_OK ) == 0 ) + if ( access( qPrintable(file_name), W_OK ) == 0 ) { // Confirm if the user wishes to overwrite an existing file msg = ( _( "%1 exists! Really overwrite?" ) ).arg( file_name ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42617 - /branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 16:59:26 2007 New Revision: 42617 URL: http://svn.opensuse.org/viewcvs/yast?rev=42617&view=rev Log: YQUI_widgets Modified: branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc Modified: branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_w… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc Mon Dec 3 16:59:26 2007 @@ -15,11 +15,10 @@ Author: Stefan Hundhammer <sh(a)suse.de> /-*/ -#define QT3_SUPPORT #define y2log_component "qt-ui" #include <ycp/y2log.h> -#include <QtGui/qdesktopwidget.h> +#include <QDesktopWidget> #include "YQUI.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42616 - in /branches/tmp/coolo/qt4-port/src: ./ pkg/
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 16:59:25 2007 New Revision: 42616 URL: http://svn.opensuse.org/viewcvs/yast?rev=42616&view=rev Log: ported everything n pkg selector needed to port the rest of the UI Modified: branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h Modified: branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQOpti… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc Mon Dec 3 16:59:25 2007 @@ -16,8 +16,6 @@ /-*/ -#define QT3_SUPPORT - #include "YQOptionalWidgetFactory.h" #include "YQUI.h" #include "YUIException.h" Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_c… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Mon Dec 3 16:59:25 2007 @@ -16,14 +16,13 @@ /-*/ -#define QT3_SUPPORT #include <rpc/types.h> // MAXHOSTNAMELEN #include <dlfcn.h> #include <libintl.h> -#include <qcursor.h> -#include <qmessagebox.h> -#include <Qt/qsocketnotifier.h> +#include <QCursor> +#include <QMessageBox> +#include <QSocketNotifier> #include <QStackedWidget> #include <QDesktopWidget> #include <QThread> @@ -173,7 +172,7 @@ } } - _main_win->setCaption( title ); + _main_win->setWindowTitle( title ); // Hide the main window for now. The first call to UI::OpenDialog() on an @@ -202,8 +201,8 @@ // and make sure there is no corresponding dlclose(). QString qt_lib_name = QString( QTLIBDIR "/libQtGui.so.%1" ).arg( QT_VERSION >> 16 );; - void * qt_lib = dlopen( qt_lib_name.utf8().constData(), RTLD_GLOBAL ); - y2milestone( "Forcing %s open %s", qt_lib_name.utf8().constData(), + void * qt_lib = dlopen( qt_lib_name.toUtf8().constData(), RTLD_GLOBAL ); + y2milestone( "Forcing %s open %s", qt_lib_name.toUtf8().constData(), qt_lib ? "successful" : "failed" ); // Init other stuff Modified: branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc Mon Dec 3 16:59:25 2007 @@ -16,7 +16,6 @@ /-*/ -#define QT3_SUPPORT #include <QColorGroup> #include "YQWidgetFactory.h" #include "YQUI.h" @@ -25,10 +24,8 @@ #include <string> - using std::string; - YQWidgetFactory::YQWidgetFactory() : YWidgetFactory() { Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc Mon Dec 3 16:59:25 2007 @@ -28,23 +28,21 @@ #include <fstream> #include <boost/bind.hpp> -#include <q3action.h> -#include <qapplication.h> -#include <q3accel.h> -#include <qcheckbox.h> -#include <qdialog.h> -#include <q3filedialog.h> -#include <q3hbox.h> -#include <qlabel.h> -#include <qmap.h> -#include <qmenubar.h> -#include <qmessagebox.h> -#include <qpushbutton.h> -#include <qsplitter.h> -#include <qtabwidget.h> -#include <qtimer.h> -//Added by qt3to4: -#include <q3popupmenu.h> +#include <QAction> +#include <QShortcut> +#include <QApplication> +#include <QCheckBox> +#include <QDialog> +#include <QFileDialog> +#include <QLabel> +#include <QMap> +#include <QMenuBar> +#include <QMessageBox> +#include <QPushButton> +#include <QSplitter> +#include <QTabWidget> +#include <QTimer> +#include <QMenu> #define y2log_component "qt-pkg" #include <ycp/y2log.h> @@ -206,6 +204,7 @@ // Fire up the first dependency check in the main loop. // Don't do this right away - wait until all initializations are finished. QTimer::singleShot( 0, this, SLOT( resolveDependencies() ) ); + } #endif } @@ -611,7 +610,7 @@ // File menu // - _fileMenu = new Q3PopupMenu( _menuBar ); + _fileMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _fileMenu ); _menuBar->insertItem( _( "&File" ), _fileMenu ); @@ -630,7 +629,7 @@ // View menu // - _viewMenu = new Q3PopupMenu( _menuBar ); + _viewMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _viewMenu ); _menuBar->insertItem( _( "&View" ), _viewMenu ); @@ -655,7 +654,7 @@ // Package menu // - _pkgMenu = new Q3PopupMenu( _menuBar ); + _pkgMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _pkgMenu ); _menuBar->insertItem( _( "&Package" ), _pkgMenu ); @@ -673,7 +672,7 @@ _pkgList->actionDontInstallSourceRpm->addTo( _pkgMenu ); _pkgMenu->insertSeparator(); - Q3PopupMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); + QMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); Q_CHECK_PTR( submenu ); submenu->insertSeparator(); @@ -685,7 +684,7 @@ // Submenu for all packages // - submenu = new Q3PopupMenu( _pkgMenu ); + submenu = new QMenu( _pkgMenu ); Q_CHECK_PTR( submenu ); // Translators: Unlike the "all in this list" submenu, this submenu @@ -707,7 +706,7 @@ // Patch menu // - _patchMenu = new Q3PopupMenu( _menuBar ); + _patchMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _patchMenu ); _menuBar->insertItem( _( "&Patch" ), _patchMenu ); @@ -729,7 +728,7 @@ // Extras menu // - _extrasMenu = new Q3PopupMenu( _menuBar ); + _extrasMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _extrasMenu ); _menuBar->insertItem( _( "&Extras" ), _extrasMenu ); @@ -765,7 +764,7 @@ // Help menu // - _helpMenu = new Q3PopupMenu( _menuBar ); + _helpMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _helpMenu ); _menuBar->insertSeparator(); _menuBar->insertItem( _( "&Help" ), _helpMenu ); @@ -916,11 +915,8 @@ // Hotkey to enable "patches" filter view on the fly // - Q3Accel * accel = new Q3Accel( this ); + QShortcut * accel = new QShortcut( Qt::Key_F2, this, SLOT( hotkeyInsertPatchFilterView() ) ); Q_CHECK_PTR( accel ); - accel->connectItem( accel->insertItem( Qt::Key_F2 ), - this, SLOT( hotkeyInsertPatchFilterView() ) ); - // // Update actions just before opening menus @@ -1113,11 +1109,9 @@ void YQPackageSelector::pkgImport() { - QString filename = Q3FileDialog::getOpenFileName( DEFAULT_EXPORT_FILE_NAME, // startsWith - "*.xml+;;*", // filter - this, // parent - 0, // name - _( "Load Package List" ) ); // caption + QString filename = QFileDialog::getOpenFileName( this, _( "Load Package List" ), DEFAULT_EXPORT_FILE_NAME, // startsWi + "*.xml+;;*"// filter + ); if ( ! filename.isEmpty() ) { Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h Mon Dec 3 16:59:25 2007 @@ -20,11 +20,9 @@ #ifndef YQPackageSelector_h #define YQPackageSelector_h -#include <q3vbox.h> -#include <qcolor.h> -//Added by qt3to4: -#include <qlabel.h> -#include <q3popupmenu.h> +#include <QColor> +#include <QLabel> +#include <QMenu> #include <ycp/YCPString.h> #include "YQPackageSelectorBase.h" @@ -33,12 +31,12 @@ class QCheckBox; class QComboBox; class QLabel; -class Q3ListView; -class Q3ProgressBar; +class QListWidget; +class QProgressBar; class QPushButton; class QSplitter; class QTabWidget; -class Q3PopupMenu; +class QMenu; class QMenuBar; class QY2ComboTabWidget; @@ -317,12 +315,12 @@ YQPkgPatchList * _patchList; QMenuBar * _menuBar; - Q3PopupMenu * _fileMenu; - Q3PopupMenu * _viewMenu; - Q3PopupMenu * _pkgMenu; - Q3PopupMenu * _patchMenu; - Q3PopupMenu * _extrasMenu; - Q3PopupMenu * _helpMenu; + QMenu * _fileMenu; + QMenu * _viewMenu; + QMenu * _pkgMenu; + QMenu * _patchMenu; + QMenu * _extrasMenu; + QMenu * _helpMenu; int _viewShowDevelID; int _viewShowDebugInfoID; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Mon Dec 3 16:59:25 2007 @@ -18,14 +18,13 @@ /-*/ -#include <qmessagebox.h> -//Added by qt3to4: -#include <qevent.h> +#include <QMessageBox> +#include <QEvent> #define y2log_component "qt-pkg" #include <ycp/y2log.h> -#include <q3action.h> +#include <QAction> #include "QY2LayoutUtils.h" #include "YQPackageSelectorBase.h" @@ -50,11 +49,16 @@ YQPackageSelectorBase::YQPackageSelectorBase( YWidget * parent, long modeFlags ) - : Q3VBox( (QWidget *) parent->widgetRep() ) + : QWidget( (QWidget *) parent->widgetRep() ) , YPackageSelector( parent, modeFlags ) { setWidgetRep( this ); +// QVBoxLayout *layout = new QVBoxLayout; +// layout->addWidget(child1); +// layout->addWidget(child2); +// setLayout(layout); + _showChangesDialog = false; _pkgConflictDialog = 0; _diskUsageList = 0; @@ -68,10 +72,9 @@ Q_CHECK_PTR( _pkgConflictDialog ); QString label = _( "Reset &Ignored Dependency Conflicts" ); - _actionResetIgnoredDependencyProblems = new Q3Action( label, // text - label, // menu text - (QKeySequence) 0, // accel - this ); // parent + _actionResetIgnoredDependencyProblems = new QAction( label, this); + _actionResetIgnoredDependencyProblems->setShortcut((QKeySequence) 0); + //_actionResetIgnoredDependencyProblems->setMenuRole(QAction::TextHeuristicRole); Q_CHECK_PTR( _actionResetIgnoredDependencyProblems ); connect( _actionResetIgnoredDependencyProblems, SIGNAL( activated() ), Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h Mon Dec 3 16:59:25 2007 @@ -20,15 +20,13 @@ #ifndef YQPackageSelectorBase_h #define YQPackageSelectorBase_h -#include <q3vbox.h> -//Added by qt3to4: -#include <qevent.h> +#include <QEvent> #include "YPackageSelector.h" #include "YQZypp.h" class QY2ComboTabWidget; -class Q3Action; +class QAction; class YQPkgConflictDialog; class YQPkgDiskUsageList; @@ -37,7 +35,7 @@ /** * Abstract base class for package selectors. **/ -class YQPackageSelectorBase : public Q3VBox, public YPackageSelector +class YQPackageSelectorBase : public QWidget, public YPackageSelector { Q_OBJECT @@ -198,7 +196,7 @@ bool _showChangesDialog; YQPkgConflictDialog * _pkgConflictDialog; YQPkgDiskUsageList * _diskUsageList; - Q3Action * _actionResetIgnoredDependencyProblems; + QAction * _actionResetIgnoredDependencyProblems; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc Mon Dec 3 16:59:25 2007 @@ -22,10 +22,10 @@ #define y2log_component "qt-pkg" #include <ycp/y2log.h> -#include <qpixmap.h> -#include <q3action.h> -#include <q3popupmenu.h> -#include <qmessagebox.h> +#include <QPixmap> +#include <QAction> +#include <QMenu> +#include <QMessageBox> #include "utf8.h" @@ -178,12 +178,12 @@ void YQPkgList::createSourceRpmContextMenu() { - _sourceRpmContextMenu = new Q3PopupMenu( this ); + _sourceRpmContextMenu = new QMenu( this ); actionInstallSourceRpm->addTo( _sourceRpmContextMenu ); actionDontInstallSourceRpm->addTo( _sourceRpmContextMenu ); - Q3PopupMenu * submenu = new Q3PopupMenu( _sourceRpmContextMenu ); + QMenu * submenu = new QMenu( _sourceRpmContextMenu ); Q_CHECK_PTR( submenu ); _sourceRpmContextMenu->insertItem( _( "&All in This List" ), submenu ); @@ -246,7 +246,7 @@ void YQPkgList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new Q3PopupMenu( this ); + _notInstalledContextMenu = new QMenu( this ); Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); @@ -265,7 +265,7 @@ void YQPkgList::createInstalledContextMenu() { - _installedContextMenu = new Q3PopupMenu( this ); + _installedContextMenu = new QMenu( this ); Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); @@ -281,10 +281,10 @@ } -Q3PopupMenu * -YQPkgList::addAllInListSubMenu( Q3PopupMenu * menu ) +QMenu * +YQPkgList::addAllInListSubMenu( QMenu * menu ) { - Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + QMenu * submenu = new QMenu( menu ); Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h Mon Dec 3 16:59:25 2007 @@ -22,7 +22,7 @@ #include <YQPkgObjList.h> //Added by qt3to4: -#include <q3popupmenu.h> +#include <QMenu> class YQPkgListItem; @@ -65,7 +65,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); + virtual QMenu * addAllInListSubMenu( QMenu * menu ); /** * Returns 'true' if there are any installed packages. @@ -198,15 +198,15 @@ // Data members int _srpmStatusCol; - Q3PopupMenu * _sourceRpmContextMenu; + QMenu * _sourceRpmContextMenu; public: - Q3Action * actionInstallSourceRpm; - Q3Action * actionDontInstallSourceRpm; - Q3Action * actionInstallListSourceRpms; - Q3Action * actionDontInstallListSourceRpms; + QAction * actionInstallSourceRpm; + QAction * actionDontInstallSourceRpm; + QAction * actionInstallListSourceRpms; + QAction * actionDontInstallListSourceRpms; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc Mon Dec 3 16:59:25 2007 @@ -20,10 +20,10 @@ #define y2log_component "qt-pkg" #include <ycp/y2log.h> -#include <qpixmap.h> -#include <q3header.h> -#include <q3popupmenu.h> -#include <q3action.h> +#include <QPixmap> +#include <QHeaderView> +#include <QMenu> +#include <QAction> //Added by qt3to4: #include <qevent.h> @@ -145,7 +145,7 @@ { updateActions( item ); - Q3PopupMenu * contextMenu = + QMenu * contextMenu = item->selectable()->hasInstalledObj() ? installedContextMenu() : notInstalledContextMenu(); @@ -407,7 +407,7 @@ -Q3Action * +QAction * YQPkgObjList::createAction( ZyppStatus status, const QString & key, bool enabled ) { return createAction( statusText( status ), @@ -418,7 +418,7 @@ } -Q3Action * +QAction * YQPkgObjList::createAction( const QString & text, const QPixmap & icon, const QPixmap & insensitiveIcon, @@ -440,13 +440,11 @@ QIcon::Disabled ); } - Q3Action * action = new Q3Action( label, // text - iconSet, // icon set - label, // menu text - 0, // accel key + QAction * action = new QAction( label, // text this ); // parent Q_CHECK_PTR( action ); action->setEnabled( enabled ); + action->setIcon( iconSet ); return action; } @@ -455,7 +453,7 @@ void YQPkgObjList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new Q3PopupMenu( this ); + _notInstalledContextMenu = new QMenu( this ); Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); @@ -469,7 +467,7 @@ void YQPkgObjList::createInstalledContextMenu() { - _installedContextMenu = new Q3PopupMenu( this ); + _installedContextMenu = new QMenu( this ); Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); @@ -480,10 +478,10 @@ } -Q3PopupMenu * -YQPkgObjList::addAllInListSubMenu( Q3PopupMenu * menu ) +QMenu * +YQPkgObjList::addAllInListSubMenu( QMenu * menu ) { - Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + QMenu * submenu = new QMenu( menu ); Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); @@ -500,7 +498,7 @@ } -Q3PopupMenu * +QMenu * YQPkgObjList::notInstalledContextMenu() { if ( ! _notInstalledContextMenu ) @@ -510,7 +508,7 @@ } -Q3PopupMenu * +QMenu * YQPkgObjList::installedContextMenu() { if ( ! _installedContextMenu ) @@ -829,7 +827,7 @@ if ( parentItem ) parentItem->takeItem( item ); else - Q3ListView::takeItem( item ); + QTreeWidget::takeItem( item ); _excludedItems->add( item, parentItem ); } @@ -843,7 +841,7 @@ if ( oldParent ) oldParent->insertItem( item ); else - Q3ListView::insertItem( item ); + QTreeWidget::insertItem( item ); } } #endif Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Mon Dec 3 16:59:25 2007 @@ -20,11 +20,10 @@ #ifndef YQPkgObjList_h #define YQPkgObjList_h -#include <qpixmap.h> -#include <qregexp.h> -//Added by qt3to4: -#include <q3popupmenu.h> -#include <qevent.h> +#include <QPixmap> +#include <QRegExp> +#include <QMenu> +#include <QEvent> #include <map> #include <list> #include <QY2ListView.h> @@ -33,8 +32,8 @@ #include <FSize.h> class YQPkgObjListItem; -class Q3Action; -class Q3PopupMenu; +class QAction; +class QMenu; using std::string; using std::list; @@ -107,7 +106,7 @@ * Add a submenu "All in this list..." to 'menu'. * Returns the newly created submenu. **/ - virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); + virtual QMenu * addAllInListSubMenu( QMenu * menu ); /** * Returns the suitable icon for a zypp::ResObject status - the regular @@ -286,13 +285,13 @@ * Returns the context menu for items that are not installed. * Creates the menu upon the first call. **/ - virtual Q3PopupMenu * installedContextMenu(); + virtual QMenu * installedContextMenu(); /** * Returns the context menu for items that are installed. * Creates the menu upon the first call. **/ - virtual Q3PopupMenu * notInstalledContextMenu(); + virtual QMenu * notInstalledContextMenu(); /** * Create the context menu for items that are not installed. @@ -315,7 +314,7 @@ * retrieve the corresponding status icons (both sensitive and insensitive) * and text. 'key' is only a descriptive text, no true accelerator. **/ - Q3Action * createAction( ZyppStatus status, + QAction * createAction( ZyppStatus status, const QString & key = QString::null, bool enabled = false ); @@ -323,7 +322,7 @@ * Low-level: Create an action. * 'key' is only a descriptive text, no true accelerator. **/ - Q3Action * createAction( const QString & text, + QAction * createAction( const QString & text, const QPixmap & icon = QPixmap(), const QPixmap & insensitiveIcon = QPixmap(), const QString & key = QString::null, @@ -349,28 +348,28 @@ ExcludeRuleList _excludeRules; ExcludedItems * _excludedItems; - Q3PopupMenu * _installedContextMenu; - Q3PopupMenu * _notInstalledContextMenu; + QMenu * _installedContextMenu; + QMenu * _notInstalledContextMenu; public: - Q3Action * actionSetCurrentInstall; - Q3Action * actionSetCurrentDontInstall; - Q3Action * actionSetCurrentKeepInstalled; - Q3Action * actionSetCurrentDelete; - Q3Action * actionSetCurrentUpdate; - Q3Action * actionSetCurrentTaboo; - Q3Action * actionSetCurrentProtected; - - Q3Action * actionSetListInstall; - Q3Action * actionSetListDontInstall; - Q3Action * actionSetListKeepInstalled; - Q3Action * actionSetListDelete; - Q3Action * actionSetListUpdate; - Q3Action * actionSetListUpdateForce; - Q3Action * actionSetListTaboo; - Q3Action * actionSetListProtected; + QAction * actionSetCurrentInstall; + QAction * actionSetCurrentDontInstall; + QAction * actionSetCurrentKeepInstalled; + QAction * actionSetCurrentDelete; + QAction * actionSetCurrentUpdate; + QAction * actionSetCurrentTaboo; + QAction * actionSetCurrentProtected; + + QAction * actionSetListInstall; + QAction * actionSetListDontInstall; + QAction * actionSetListKeepInstalled; + QAction * actionSetListDelete; + QAction * actionSetListUpdate; + QAction * actionSetListUpdateForce; + QAction * actionSetListTaboo; + QAction * actionSetListProtected; public: Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc Mon Dec 3 16:59:25 2007 @@ -22,10 +22,9 @@ #define y2log_component "qt-pkg" #include <ycp/y2log.h> -#include <q3popupmenu.h> -#include <q3action.h> -//Added by qt3to4: -#include <qevent.h> +#include <QMenu> +#include <QAction> +#include <QEvent> #include <zypp/ui/PatchContents.h> #include <set> @@ -71,7 +70,7 @@ setAllColumnsShowFocus( true ); setColumnAlignment( sizeCol(), Qt::AlignRight ); - connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + connect( this, SIGNAL( selectionChanged ( QTreeWidgetItem * ) ), this, SLOT ( filter() ) ); setSorting( categoryCol() ); @@ -356,7 +355,7 @@ YQPkgPatchList::selection() const { #if FIXME - Q3ListViewItem * item = selectedItem(); + QTreeWidgetItem * item = selectedItem(); if ( ! item ) return 0; @@ -371,7 +370,7 @@ void YQPkgPatchList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new Q3PopupMenu( this ); + _notInstalledContextMenu = new QMenu( this ); Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); @@ -385,7 +384,7 @@ void YQPkgPatchList::createInstalledContextMenu() { - _installedContextMenu = new Q3PopupMenu( this ); + _installedContextMenu = new QMenu( this ); Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); @@ -401,10 +400,10 @@ } -Q3PopupMenu * -YQPkgPatchList::addAllInListSubMenu( Q3PopupMenu * menu ) +QMenu * +YQPkgPatchList::addAllInListSubMenu( QMenu * menu ) { - Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + QMenu * submenu = new QMenu( menu ); Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); @@ -434,7 +433,7 @@ #if ! ENABLE_DELETING_PATCHES if ( event->ascii() == '-' ) { - Q3ListViewItem * selectedListViewItem = selectedItem(); + QTreeWidgetItem * selectedListViewItem = currentItem(); if ( selectedListViewItem ) { Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h Mon Dec 3 16:59:25 2007 @@ -24,9 +24,9 @@ #include "YQPkgObjList.h" #include "YQPkgSelMapper.h" //Added by qt3to4: -#include <Q3ListViewItem> -#include <qevent.h> -#include <q3popupmenu.h> +#include <QTreeWidgetItem> +#include <QEvent> +#include <QMenu> #define ENABLE_DELETING_PATCHES 1 @@ -140,7 +140,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); + virtual QMenu * addAllInListSubMenu( QMenu * menu ); /** * Delayed initialization after the dialog is fully created. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42615 - /branches/tmp/coolo/qt4-port/src/YQUI_x11.cc
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 16:59:22 2007 New Revision: 42615 URL: http://svn.opensuse.org/viewcvs/yast?rev=42615&view=rev Log: YQUI_x11 Modified: branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Modified: branches/tmp/coolo/qt4-port/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_x… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_x11.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Mon Dec 3 16:59:22 2007 @@ -18,18 +18,15 @@ /-*/ -#define QT3_SUPPORT -#include <qevent.h> -#include <qcursor.h> -#include <q3widgetstack.h> -#include <q3vbox.h> -#include <qwidget.h> -#include <qtextcodec.h> -#include <qregexp.h> -#include <qlocale.h> -#include <qmessagebox.h> +#include <QEvent> +#include <QCursor> +#include <QWidget> +#include <QTextCodec> +#include <QRegExp> +#include <QLocale> +#include <QMessageBox> #include <QColorGroup> -#include <QtGui/qdesktopwidget.h> +#include <QDesktopWidget> #define y2log_component "qt-ui" @@ -126,15 +123,13 @@ { if ( _usingVisionImpairedPalette ) { - qApp->setPalette( normalPalette(), - true ); // informWidgets + qApp->setPalette( normalPalette()); // informWidgets _usingVisionImpairedPalette = false; } else { - qApp->setPalette( visionImpairedPalette(), - true ); // informWidgets + qApp->setPalette( visionImpairedPalette() ); // informWidgets _usingVisionImpairedPalette = true; } @@ -144,37 +139,33 @@ QPalette YQUI::visionImpairedPalette() { const QColor dark ( 0x20, 0x20, 0x20 ); + QPalette pal; - QColorGroup activeCg; // for the active window (the one with the keyboard focus) - - activeCg.setColor( QColorGroup::Background, Qt::black ); - activeCg.setColor( QColorGroup::Foreground, Qt::cyan ); - activeCg.setColor( QColorGroup::Text, Qt::cyan ); - activeCg.setColor( QColorGroup::Base, dark ); - activeCg.setColor( QColorGroup::Button, dark ); - activeCg.setColor( QColorGroup::ButtonText, Qt::green ); - activeCg.setColor( QColorGroup::Highlight, Qt::yellow ); - activeCg.setColor( QColorGroup::HighlightedText, Qt::black ); - - QColorGroup inactiveCg; // for other windows (those that don't have the keyboard focus) - - inactiveCg.setColor( QColorGroup::Background, Qt::black ); - inactiveCg.setColor( QColorGroup::Foreground, Qt::cyan ); - inactiveCg.setColor( QColorGroup::Text, Qt::cyan ); - inactiveCg.setColor( QColorGroup::Base, dark ); - inactiveCg.setColor( QColorGroup::Button, dark ); - inactiveCg.setColor( QColorGroup::ButtonText, Qt::green ); - - QColorGroup disabledCg; // for disabled widgets - - disabledCg.setColor( QColorGroup::Background, Qt::black ); - disabledCg.setColor( QColorGroup::Foreground, Qt::gray ); - disabledCg.setColor( QColorGroup::Text, Qt::gray ); - disabledCg.setColor( QColorGroup::Base, dark ); - disabledCg.setColor( QColorGroup::Button, dark ); - disabledCg.setColor( QColorGroup::ButtonText, Qt::gray ); - - QPalette pal( activeCg, disabledCg, inactiveCg ); + // for the active window (the one with the keyboard focus) + pal.setColor( QPalette::Active, QPalette::Background, Qt::black ); + pal.setColor( QPalette::Active, QPalette::Foreground, Qt::cyan ); + pal.setColor( QPalette::Active, QPalette::Text, Qt::cyan ); + pal.setColor( QPalette::Active, QPalette::Base, dark ); + pal.setColor( QPalette::Active, QPalette::Button, dark ); + pal.setColor( QPalette::Active, QPalette::ButtonText, Qt::green ); + pal.setColor( QPalette::Active, QPalette::Highlight, Qt::yellow ); + pal.setColor( QPalette::Active, QPalette::HighlightedText, Qt::black ); + + // for other windows (those that don't have the keyboard focus) + pal.setColor( QPalette::Inactive, QPalette::Background, Qt::black ); + pal.setColor( QPalette::Inactive, QPalette::Foreground, Qt::cyan ); + pal.setColor( QPalette::Inactive, QPalette::Text, Qt::cyan ); + pal.setColor( QPalette::Inactive, QPalette::Base, dark ); + pal.setColor( QPalette::Inactive, QPalette::Button, dark ); + pal.setColor( QPalette::Inactive, QPalette::ButtonText, Qt::green ); + + // for disabled widgets + pal.setColor( QPalette::Disabled, QPalette::Background, Qt::black ); + pal.setColor( QPalette::Disabled, QPalette::Foreground, Qt::gray ); + pal.setColor( QPalette::Disabled, QPalette::Text, Qt::gray ); + pal.setColor( QPalette::Disabled, QPalette::Base, dark ); + pal.setColor( QPalette::Disabled, QPalette::Button, dark ); + pal.setColor( QPalette::Disabled, QPalette::ButtonText, Qt::gray ); return pal; } @@ -256,7 +247,7 @@ QWidget * widget = dynamic_cast<QWidget *> (obj); if ( widget ) - widget->setActiveWindow(); + widget->activateWindow(); } return false; // Don't stop event processing -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42614 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_network_check.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: locilka Date: Mon Dec 3 16:52:59 2007 New Revision: 42614 URL: http://svn.opensuse.org/viewcvs/yast?rev=42614&view=rev Log: - Installation Mode dialog adapted to new bright and better mod_UI. - Using informative icon in some inst_network_check script. - 2.16.6 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_network_check.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=42614&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Dec 3 16:52:59 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Dec 3 16:52:59 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 3 16:49:46 CET 2007 - locilka(a)suse.cz + +- Installation Mode dialog adapted to new bright and better mod_UI. +- Using informative icon in some inst_network_check script. +- 2.16.6 + +------------------------------------------------------------------- Mon Dec 3 14:34:38 CET 2007 - locilka(a)suse.cz - Installation Mode dialog adapted to new mod-UI and to new Modified: trunk/installation/src/clients/inst_network_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_check.ycp (original) +++ trunk/installation/src/clients/inst_network_check.ycp Mon Dec 3 16:52:59 2007 @@ -19,20 +19,39 @@ import "Wizard"; import "Popup"; import "GetInstArgs"; - + import "Directory"; + import "Icon"; + boolean enable_next = true; boolean enable_back = true; + /** + * Script can be called with some arguments + * + * @struct [$[ + * "dontskip" : true, // do not skipt the dialog even if network is configured + * ]] + */ + map argmap = GetInstArgs::argmap(); + y2milestone ("Script args: %1", argmap); + /* * We don't need to run this script to setup the network * If some network is already running... */ if (NetworkService::isNetworkRunning()) { - y2milestone ("Network is already running, skipping..."); - return `next; + if (argmap["dontskip"]:false == true) { + y2milestone ("Network is already running, not skipping (forced)..."); + } else { + y2milestone ("Network is already running, skipping..."); + return `next; + } + } else { + y2milestone ("No network configuration found, offering to set it up..."); } - y2milestone ("No network configuration found, offering to set it up..."); + map displayinfo = UI::GetDisplayInfo(); + boolean supports_images = displayinfo["HasImageSupport"]:false; Wizard::SetContents ( // TRANSLATORS: dialog caption @@ -45,9 +64,19 @@ `HStretch (), `VBox ( // TRANSLATORS: dialog label - `Left(`Label (_("No network setup has been found. + `HBox ( + (supports_images ? + `HBox ( + Icon::Simple ("warning"), + `HSpacing (2) + ) + : + `Empty() + ), + `Left (`Label (_("No network setup has been found. It is vitally important for using remote repositories -otherwise you can safely skip it."))), +otherwise you can safely skip it."))) + ), `VSpacing (2), // TRANSLATORS: dialog label `Left(`Label (_("Would you like to configure your network card now?"))), Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Mon Dec 3 16:52:59 2007 @@ -8,6 +8,7 @@ Requires: autoyast2-installation # Progress::NewProgressIcons +# Icon YCP module Requires: yast2 >= 2.16.16 # Required in in the first stage, after # switching to the installed system, bugzilla #249679 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42613 - in /trunk/yast2: VERSION library/modules/Popup.ycp library/wizard/src/Progress.ycp package/yast2.changes yast2.spec.in
by locilka＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: locilka Date: Mon Dec 3 16:46:30 2007 New Revision: 42613 URL: http://svn.opensuse.org/viewcvs/yast?rev=42613&view=rev Log: - yast2.rpm always depends on the $current version of yast2-core. - Updated Progress with icons to rather use Image-Dimm support if available. - Added new Icon YCP module to provide basic acces to icon files. - Popup::ConfirmAbort now uses Icons. - 2.16.16 Modified: trunk/yast2/VERSION trunk/yast2/library/modules/Popup.ycp trunk/yast2/library/wizard/src/Progress.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=42613&r1=42612… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Dec 3 16:46:30 2007 @@ -1 +1 @@ -2.16.15 +2.16.16 Modified: trunk/yast2/library/modules/Popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Popup.ycp?… ============================================================================== --- trunk/yast2/library/modules/Popup.ycp (original) +++ trunk/yast2/library/modules/Popup.ycp Mon Dec 3 16:46:30 2007 @@ -25,6 +25,7 @@ import "Mode"; import "Directory"; import "String"; +import "Icon"; boolean feedback_open = false; @@ -656,6 +657,8 @@ string abort_button = _("&Abort Installation"); // Button that will continue with the installation string continue_button = _("&Continue Installation"); + // Dialog icon + string icon_name = "warning"; if ( severity == `painless ) { @@ -675,6 +678,7 @@ Linux will not be installed. Your hard disk will remain untouched."); } + // icon_name = "info"; } else if ( severity == `incomplete ) { @@ -702,8 +706,16 @@ string message = abort_label + "\n\n" + what_will_happen; - boolean ret = AnyQuestion (NoHeadline (), message, abort_button, - continue_button, `focus_no); + term button_box = AnyQuestionButtonBox (abort_button, continue_button, `focus_no); + UI::OpenDialog ( + `opt (`decorated), + popupLayoutInternal (NoHeadline(), message, Icon::IconPath (icon_name), button_box) + ); + + any user_ret = UI::UserInput(); + UI::CloseDialog(); + + boolean ret = (user_ret == `yes); y2debug("ConfirmAbort returned: %1", ret); Modified: trunk/yast2/library/wizard/src/Progress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Progres… ============================================================================== --- trunk/yast2/library/wizard/src/Progress.ycp (original) +++ trunk/yast2/library/wizard/src/Progress.ycp Mon Dec 3 16:46:30 2007 @@ -77,6 +77,10 @@ map display_info = UI::GetDisplayInfo(); boolean can_display_images = (display_info["HasImageSupport"]:false == true); + // native UI support to dimm images + // `opt (`disabled) for `Image () + // boolean has_dimm_image_support = (display_info["HasDimmImageSupport"]:false == true); + boolean has_dimm_image_support = (display_info["HasImageSupport"]:false == true); /** * Sets progress bar state: @@ -197,8 +201,15 @@ while (i < number_of_stages) { i = i + 1; - one_icon = NormalizeIconPath (global_invisible_icons_definition[i]:nil, false); - ret = add (ret, `ReplacePoint (`id (IconId (i)), `Image (one_icon, "[_]"))); + + + if (has_dimm_image_support) { + one_icon = NormalizeIconPath (global_visible_icons_definition[i]:nil, false); + ret = add (ret, `Image (`id (IconId (i)), `opt (`disabled), one_icon, "[X]")); + } else { + one_icon = NormalizeIconPath (global_invisible_icons_definition[i]:nil, false); + ret = add (ret, `ReplacePoint (`id (IconId (i)), `Image (one_icon, "[_]"))); + } ret = add (ret, `HSpacing (2)); } @@ -367,8 +378,12 @@ string icon_id = IconId (last_highlighted_icon); if (UI::WidgetExists (`id (icon_id))) { - string one_icon = NormalizeIconPath (global_visible_icons_definition[current_step]:nil, true); - UI::ReplaceWidget (`id (icon_id), `Image (one_icon, "[x]")); + if (has_dimm_image_support) { + UI::ChangeWidget (`id (icon_id), `Enabled, true); + } else { + string one_icon = NormalizeIconPath (global_visible_icons_definition[current_step]:nil, true); + UI::ReplaceWidget (`id (icon_id), `Image (one_icon, "[x]")); + } } } } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Dec 3 16:46:30 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 3 16:43:50 CET 2007 - locilka(a)suse.cz + +- yast2.rpm always depends on the $current version of yast2-core. +- Updated Progress with icons to rather use Image-Dimm support + if available. +- Added new Icon YCP module to provide basic acces to icon files. +- Popup::ConfirmAbort now uses Icons. +- 2.16.16 + +------------------------------------------------------------------- Mon Dec 3 14:24:02 CET 2007 - ug(a)suse.de - XMLToYCPString added to convert an XML string to Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=42613&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Mon Dec 3 16:46:30 2007 @@ -4,8 +4,11 @@ Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite yast2-perl-bindings -# SCR::RegisterNewAgents() -Requires: yast2-core >= 2.16.10 + +# With each yast2-core rebuild, change the 'Requires' +# Suggested by Coolo +Requires: yast2-core >= %(echo `rpm -q --queryformat '%{VERSION}' yast2-core`) + # Pkg::PkgAvailable() and Pkg::PkgInstalled() Requires: yast2-pkg-bindings >= 2.15.47 Requires: yast2_ui yast2_theme -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42612 - /trunk/ncurses/package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: kmachalkova Date: Mon Dec 3 15:40:16 2007 New Revision: 42612 URL: http://svn.opensuse.org/viewcvs/yast?rev=42612&view=rev Log: czenglish Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Dec 3 15:40:16 2007 @@ -4,7 +4,7 @@ - Further changes to package selector (gs) - NCDialog adapted to new YDialog (sh) - Correct setValue for CheckBox (do not forget to redraw) -- Do not set focus to default button each time dialog size is +- Do not set focus to default button each time dialog layout is recalculated (#343870) - 2.16.4 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42611 - /tags/stable-2_16_4/ncurses/
by kmachalkova＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: kmachalkova Date: Mon Dec 3 15:37:42 2007 New Revision: 42611 URL: http://svn.opensuse.org/viewcvs/yast?rev=42611&view=rev Log: Created tag stable-2_16_4 for ncurses Added: tags/stable-2_16_4/ncurses/ - copied from r42610, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42610 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: kmachalkova Date: Mon Dec 3 15:37:31 2007 New Revision: 42610 URL: http://svn.opensuse.org/viewcvs/yast?rev=42610&view=rev Log: version 2.16.4 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=42610&r1=426… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Mon Dec 3 15:37:31 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Dec 3 15:37:31 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 3 15:33:53 CET 2007 - kmachalkova(a)suse.cz + +- Further changes to package selector (gs) +- NCDialog adapted to new YDialog (sh) +- Correct setValue for CheckBox (do not forget to redraw) +- Do not set focus to default button each time dialog size is + recalculated (#343870) +- 2.16.4 + +------------------------------------------------------------------- Mon Nov 26 14:24:19 CET 2007 - kmachalkova(a)suse.cz - First version of YCP-less package selector (gs) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0