December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42579 - /branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:16 2007 New Revision: 42579 URL: http://svn.opensuse.org/viewcvs/yast?rev=42579&view=rev Log: YQMultiSelectionBoxItem compiles Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Mon Dec 3 00:37:16 2007 @@ -342,7 +342,9 @@ { _yItem->setSelected( newState ); _multiSelectionBox->sendValueChanged(); - QTreeWidgetItem::stateChange( newState ); + //QTreeWidgetItem::stateChange( newState ); + // FIXME checked or selected state? + QTreeWidgetItem::setCheckState( 0, newState ? Qt::Checked : Qt::Unchecked ); } -- 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] r42578 - in /branches/tmp/coolo/qt4-port/src: YQMultiSelectionBox.cc YQMultiSelectionBox.h
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:13 2007 New Revision: 42578 URL: http://svn.opensuse.org/viewcvs/yast?rev=42578&view=rev Log: one signal left and qmultiselectionbox compiles Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Mon Dec 3 00:37:13 2007 @@ -16,7 +16,7 @@ /-*/ -#define QT3_SUPPORT 1 +//#define QT3_SUPPORT 1 #include <limits.h> #include <qstring.h> @@ -56,15 +56,15 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listView = new Q3ListView( this ); + _qt_listView = new QTreeWidget( this ); YUI_CHECK_NEW( _qt_listView ); layout->addWidget( _qt_listView ); _qt_listView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - _qt_listView->addColumn( "" ); // QListView doesn't have one single column by default! - _qt_listView->setSorting( 0, false ); - _qt_listView->header()->setStretchEnabled( true ); - _qt_listView->header()->hide(); + _qt_listView->setHeaderLabel(""); // QListView doesn't have one single column by default! + _qt_listView->sortItems( 0, Qt::AscendingOrder ); + //FIXME _qt_listView->header()->setStretchEnabled( true ); + //_qt_listView->header()->hide(); _caption->setBuddy( _qt_listView ); // Very small default size if specified @@ -97,21 +97,20 @@ YQSignalBlocker sigBlocker( _qt_listView ); YMultiSelectionBox::addItem( yItem ); // will also check for NULL - YQMultiSelectionBoxItem * msbItem = - new YQMultiSelectionBoxItem( this, _qt_listView, yItem ); + YQMultiSelectionBoxItem * msbItem = new YQMultiSelectionBoxItem( this, _qt_listView, yItem ); YUI_CHECK_NEW( msbItem ); // Take care of the item's check box if ( yItem->selected() ) - msbItem->setOn( true ); + msbItem->setCheckState(0, Qt::Checked); // Take care of the QListView's keyboard focus - if ( ! _qt_listView->selectedItem() ) - _qt_listView->setSelected( msbItem, true ); + if ( ! _qt_listView->currentItem() ) + msbItem->setSelected(true); } @@ -121,7 +120,7 @@ YQMultiSelectionBoxItem * msbItem = findItem( yItem ); if ( msbItem ) - msbItem->setOn( selected ); + msbItem->setCheckState( 1, selected ? Qt::Checked : Qt::Unchecked ); } @@ -131,16 +130,16 @@ YQSignalBlocker sigBlocker( _qt_listView ); YMultiSelectionBox::deselectAllItems(); - Q3ListViewItemIterator it( _qt_listView ); + QTreeWidgetItemIterator it( _qt_listView ); while ( *it ) { - YQMultiSelectionBoxItem * item = dynamic_cast<YQMultiSelectionBoxItem *> (*it); + YQMultiSelectionBoxItem * item = dynamic_cast<YQMultiSelectionBoxItem *> (*it); - if ( item ) - item->setOn( false ); + if ( item ) + item->setCheckState(0, Qt::Checked); - ++it; + ++it; } } @@ -180,7 +179,7 @@ // For the purpose of this function, QListView::currentItem() is the // minimum requirement. - Q3ListViewItem * currentQItem = _qt_listView->currentItem(); + QTreeWidgetItem * currentQItem = _qt_listView->currentItem(); if ( currentQItem ) { @@ -214,7 +213,7 @@ YQMultiSelectionBoxItem * msbItem = findItem( yItem ); if ( msbItem ) - _qt_listView->setSelected( msbItem, true ); + msbItem->setSelected(true); // This does NOT change the item's check box! // (see explanations in YQMultiSelectionBox::currentItem() avove) @@ -227,15 +226,15 @@ { _caption->setEnabled( enabled ); _qt_listView->setEnabled( enabled ); - _qt_listView->triggerUpdate(); + //_qt_listView->triggerUpdate(); YWidget::setEnabled( enabled ); } int YQMultiSelectionBox::preferredWidth() { - int hintWidth = _caption->isShown() ? - _caption->sizeHint().width() + frameWidth() : 0; + int hintWidth = (!_caption->isHidden()) ? + _caption->sizeHint().width() + frameWidth() : 0; return max( 80, hintWidth ); } @@ -243,7 +242,7 @@ int YQMultiSelectionBox::preferredHeight() { - int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0; + int hintHeight = (!_caption->isHidden()) ? _caption->sizeHint().height() : 0; int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES; hintHeight += visibleLines * _qt_listView->fontMetrics().lineSpacing(); hintHeight += _qt_listView->frameWidth() * 2; @@ -302,7 +301,7 @@ YQMultiSelectionBox::findItem( YItem * wantedItem ) { // FIXME: Don't search through all items, use the YItem::data() pointer instead - Q3ListViewItemIterator it( _qt_listView ); + QTreeWidgetItemIterator it( _qt_listView ); while ( *it ) { @@ -326,24 +325,24 @@ YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - Q3ListView * listView, + QTreeWidget * listView, YItem * yItem ) - : Q3CheckListItem( listView, fromUTF8( yItem->label() ), Q3CheckListItem::CheckBox ) + : QTreeWidgetItem( listView) , _yItem( yItem ) , _multiSelectionBox( parent ) { YUI_CHECK_PTR( yItem ); - + setText(0, fromUTF8( yItem->label() )); + setFlags(Qt::ItemIsUserCheckable); _serial = _item_count++; } - void YQMultiSelectionBoxItem::stateChange( bool newState ) { _yItem->setSelected( newState ); _multiSelectionBox->sendValueChanged(); - Q3CheckListItem::stateChange( newState ); + QTreeWidgetItem::stateChange( newState ); } Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Mon Dec 3 00:37:13 2007 @@ -22,8 +22,7 @@ #include <QFrame> #include <QColorGroup> -#include <Q3CheckListItem> -#include <qlistview.h> +#include <QTreeWidget> #include "YMultiSelectionBox.h" @@ -164,19 +163,19 @@ YQWidgetCaption * _caption; - Q3ListView * _qt_listView; + QTreeWidget * _qt_listView; }; -class YQMultiSelectionBoxItem: public Q3CheckListItem +class YQMultiSelectionBoxItem: public QTreeWidgetItem { public: /** * Constructor. **/ YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - Q3ListView * listView, + QTreeWidget * listView, YItem * yItem ); /** -- 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] r42577 - in /branches/tmp/coolo/wizard-rework: VERSION VERSION.cmake
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 20:38:55 2007 New Revision: 42577 URL: http://svn.opensuse.org/viewcvs/yast?rev=42577&view=rev Log: perhaps it would be better to keep the simple VERSION format Removed: branches/tmp/coolo/wizard-rework/VERSION Modified: branches/tmp/coolo/wizard-rework/VERSION.cmake Modified: branches/tmp/coolo/wizard-rework/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/VERSI… ============================================================================== --- branches/tmp/coolo/wizard-rework/VERSION.cmake (original) +++ branches/tmp/coolo/wizard-rework/VERSION.cmake Sun Dec 2 20:38:55 2007 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "6") -- 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] r42576 - in /branches/tmp/coolo/wizard-rework: src/YQReplacePoint.cc src/YQUI.h src/YQUI_core.cc theme/style.qss
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 20:09:00 2007 New Revision: 42576 URL: http://svn.opensuse.org/viewcvs/yast?rev=42576&view=rev Log: trying to work on event blocking, but this did not help the original problem Modified: branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc branches/tmp/coolo/wizard-rework/src/YQUI.h branches/tmp/coolo/wizard-rework/src/YQUI_core.cc branches/tmp/coolo/wizard-rework/theme/style.qss Modified: branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc Sun Dec 2 20:09:00 2007 @@ -35,7 +35,7 @@ void YQReplacePoint::showChild() { YWidget * child = firstChild(); - + if ( child ) { QWidget * qChild = (QWidget *) child->widgetRep(); Modified: branches/tmp/coolo/wizard-rework/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI.h Sun Dec 2 20:09:00 2007 @@ -229,16 +229,14 @@ * * Reimplemented from YUI. **/ - virtual void blockEvents( bool block = true ) - { _event_handler.blockEvents( block ); } + virtual void blockEvents( bool block = true ); /** * Returns 'true' if events are currently blocked. * * Reimplemented from YUI. **/ - virtual bool eventsBlocked() const - { return _event_handler.eventsBlocked(); } + virtual bool eventsBlocked() const; /** * Returns the current product name @@ -630,6 +628,8 @@ **/ YSimpleEventHandler _event_handler; + int blocked_level; + /** * Saved normal palette **/ @@ -650,9 +650,9 @@ **/ bool _askedForLeftHandedMouse; - bool _ui_inited; - int _ui_argc; - char **_ui_argv; + bool _ui_inited; + int _ui_argc; + char **_ui_argv; }; #endif // YQUI_h Modified: branches/tmp/coolo/wizard-rework/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI_core.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI_core.cc Sun Dec 2 20:09:00 2007 @@ -72,6 +72,7 @@ _leftHandedMouse = false; _askedForLeftHandedMouse = false; screenShotNameTemplate = ""; + blocked_level = 0; qInstallMsgHandler( qMessageHandler ); @@ -443,7 +444,11 @@ { init_ui(); - // y2milestone( "userInput %ld", timeout_millisec ); + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + blocked_level = 0; + + //y2milestone( "userInput %ld", timeout_millisec ); YEvent * event = 0; YQDialog * dialog = dynamic_cast<YQDialog *> ( YDialog::currentDialog( false ) ); @@ -463,12 +468,7 @@ normalCursor(); _do_exit_loop = true; // should exit_loop() be called in sendEvent()? - - while ( ! pendingEvent() ) - { - _eventLoop->processEvents(QEventLoop::WaitForMoreEvents); - } - + _eventLoop->exec(); _do_exit_loop = false; event = _event_handler.consumePendingEvent(); @@ -654,6 +654,31 @@ } +void YQUI::blockEvents( bool block ) +{ + if ( block ) + { + if ( ++blocked_level == 1 ) + { + _event_handler.blockEvents( true ); + _eventLoop->exit(); + } + } + else + { + if ( --blocked_level == 0 ) + { + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + } + } +} + + +bool YQUI::eventsBlocked() const +{ + return _event_handler.eventsBlocked(); +} static void qMessageHandler( QtMsgType type, const char * msg ) Modified: branches/tmp/coolo/wizard-rework/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme… ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/style.qss (original) +++ branches/tmp/coolo/wizard-rework/theme/style.qss Sun Dec 2 20:09:00 2007 @@ -47,7 +47,7 @@ } .current-step-name { - font: bold; + font: bold 10pt; } .todo-step-status { @@ -72,7 +72,7 @@ font: bold; color: black; margin-bottom: 7px; - font-size: 120%; + font-size: 11pt; } #DialogIcon { max-width: 0px; margin: 0px; } -- 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] r42575 - /branches/tmp/coolo/wizard-rework/theme/style.qss
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 19:01:55 2007 New Revision: 42575 URL: http://svn.opensuse.org/viewcvs/yast?rev=42575&view=rev Log: fix this Modified: branches/tmp/coolo/wizard-rework/theme/style.qss Modified: branches/tmp/coolo/wizard-rework/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme… ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/style.qss (original) +++ branches/tmp/coolo/wizard-rework/theme/style.qss Sun Dec 2 19:01:55 2007 @@ -34,6 +34,8 @@ padding-top: 10px; margin-top: 60px; margin-left: 10px; + min-width: 195px; + max-width: 195px; } QPushButton { -- 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] r42574 - in /branches/tmp/coolo/wizard-rework: CMakeLists.txt theme/style.qss
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 17:25:39 2007 New Revision: 42574 URL: http://svn.opensuse.org/viewcvs/yast?rev=42574&view=rev Log: compile Modified: branches/tmp/coolo/wizard-rework/CMakeLists.txt branches/tmp/coolo/wizard-rework/theme/style.qss Modified: branches/tmp/coolo/wizard-rework/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/CMake… ============================================================================== --- branches/tmp/coolo/wizard-rework/CMakeLists.txt (original) +++ branches/tmp/coolo/wizard-rework/CMakeLists.txt Sun Dec 2 17:25:39 2007 @@ -1,7 +1,7 @@ PROJECT(yast2-qt4) SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} ) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual -DQT3_SUPPORT" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) SET( RPMNAME "yast2-qt4" ) Modified: branches/tmp/coolo/wizard-rework/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme… ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/style.qss (original) +++ branches/tmp/coolo/wizard-rework/theme/style.qss Sun Dec 2 17:25:39 2007 @@ -68,7 +68,9 @@ .steps_heading { font: bold; - font-size: 14pt; + color: black; + margin-bottom: 7px; + font-size: 120%; } #DialogIcon { max-width: 0px; margin: 0px; } -- 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] r42573 - in /branches/tmp/coolo/wizard-rework: ./ doc/ doc/autodocs/ fonts/ package/ src/ src/pkg/ src/pkg/icons/ testsuite/
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 17:14:25 2007 New Revision: 42573 URL: http://svn.opensuse.org/viewcvs/yast?rev=42573&view=rev Log: cherry picked 42559 42570 42571 Removed: branches/tmp/coolo/wizard-rework/acinclude.m4 branches/tmp/coolo/wizard-rework/configure.in.in branches/tmp/coolo/wizard-rework/doc/Makefile.am branches/tmp/coolo/wizard-rework/doc/autodocs/Makefile.am branches/tmp/coolo/wizard-rework/fonts/Makefile.am branches/tmp/coolo/wizard-rework/src/Makefile.am branches/tmp/coolo/wizard-rework/src/pkg/Makefile.am branches/tmp/coolo/wizard-rework/src/pkg/icons/Makefile.am branches/tmp/coolo/wizard-rework/testsuite/Makefile.am Modified: branches/tmp/coolo/wizard-rework/Makefile.cvs branches/tmp/coolo/wizard-rework/VERSION branches/tmp/coolo/wizard-rework/package/yast2-qt4.changes branches/tmp/coolo/wizard-rework/src/CMakeLists.txt branches/tmp/coolo/wizard-rework/src/YQDialog.cc branches/tmp/coolo/wizard-rework/src/YQDialog.h branches/tmp/coolo/wizard-rework/src/YQInputField.cc branches/tmp/coolo/wizard-rework/src/YQUI.h branches/tmp/coolo/wizard-rework/src/YQUI_core.cc branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.cc branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.h branches/tmp/coolo/wizard-rework/src/pkg/YQPkgConflictDialog.cc branches/tmp/coolo/wizard-rework/src/pkg/YQPkgRepoFilterView.cc branches/tmp/coolo/wizard-rework/yast2-qt4.spec.in Modified: branches/tmp/coolo/wizard-rework/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/Makef… ============================================================================== --- branches/tmp/coolo/wizard-rework/Makefile.cvs (original) +++ branches/tmp/coolo/wizard-rework/Makefile.cvs Sun Dec 2 17:14:25 2007 @@ -6,18 +6,15 @@ PREFIX = /usr -configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) - -all: - y2tool y2autoconf - y2tool y2automake - autoreconf --force --install +configure: + mkdir build ;\ + cd build ;\ + cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DLIB=$(LIB) .. install: configure - make - make install + cd build; \ + make && make install -reconf: all - ./config.status --recheck - ./config.status +reconf: + cd build ;\ + cmake rebuild_cache Modified: branches/tmp/coolo/wizard-rework/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/VERSI… ============================================================================== --- branches/tmp/coolo/wizard-rework/VERSION (original) +++ branches/tmp/coolo/wizard-rework/VERSION Sun Dec 2 17:14:25 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: branches/tmp/coolo/wizard-rework/package/yast2-qt4.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/packa… ============================================================================== --- branches/tmp/coolo/wizard-rework/package/yast2-qt4.changes (original) +++ branches/tmp/coolo/wizard-rework/package/yast2-qt4.changes Sun Dec 2 17:14:25 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 30 17:20:49 CET 2007 - sh(a)suse.de + +- Migrated YQDialog to mod-ui +- V 2.16.6 + +------------------------------------------------------------------- Tue Nov 27 19:08:00 CET 2007 - sh(a)suse.de - Moved all YCP related code out of YQWizard Modified: branches/tmp/coolo/wizard-rework/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/C… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/CMakeLists.txt (original) +++ branches/tmp/coolo/wizard-rework/src/CMakeLists.txt Sun Dec 2 17:14:25 2007 @@ -2,7 +2,6 @@ ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} --DQT3_SUPPORT -DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\" -DICONDIR=\\"${Y2QT_ICONDIR}\\" -DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" Modified: branches/tmp/coolo/wizard-rework/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQDialog.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQDialog.cc Sun Dec 2 17:14:25 2007 @@ -39,32 +39,32 @@ // like "Above", "Below" etc. that clash with some Qt headers. #include <X11/Xlib.h> +#define YQMainDialogWFlags Qt::Window -YQDialog::YQDialog( const YWidgetOpt & opt, - QWidget * qt_parent, - bool default_size ) - : QWidget( qt_parent, - default_size ? Qt::Widget : Qt::Window ) // WFlags - , YDialog( opt ) +#define YQPopupDialogWFlags Qt::Widget + +YQDialog::YQDialog( QWidget * qParent, + YDialogType dialogType, + YDialogColorMode colorMode ) + : QWidget( qParent, + dialogType == YMainDialog ? YQMainDialogWFlags : YQPopupDialogWFlags ) + , YDialog( dialogType, colorMode ) { _userResized = false; _focusButton = 0; _defaultButton = 0; setWidgetRep( this ); - setCaption( hasDefaultSize() ? "YaST2" : "" ); + setWindowTitle( dialogType == YMainDialog ? "YaST2" : "" ); setFocusPolicy( Qt::StrongFocus ); - if ( ! default_size ) - setWindowModality( Qt::WindowModal ); - - if ( hasWarnColor() || hasInfoColor() ) + if ( colorMode != YDialogNormalColor ) { QColor normalBackground ( 0, 128, 0 ); QColor inputFieldBackground ( 0, 96, 0 ); QColor text = Qt::white; - if ( hasInfoColor() ) + if ( colorMode == YDialogInfoColor ) { normalBackground = QColor ( 238, 232, 170 ); // PaleGoldenrod } @@ -76,31 +76,6 @@ warnPalette.setNormal( normalColors ); setPalette( warnPalette ); } - - _qFrame = new Q3Frame ( this ); - bool decorate = ! hasDefaultSize() && ! YQUI::ui()->haveWM(); - -#if 0 - if ( hasSmallDecorations() ) - { - // None of this works (yet). :-(( - - clearWFlags( getWFlags() ); - setWFlags( Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop ); - // decorate = true; - } -#endif - - if ( decorate ) - { - _qFrame->setFrameStyle ( Q3Frame::Box | Q3Frame::Raised ); - _qFrame->setLineWidth(2); - _qFrame->setMidLineWidth(3); - } - else - { - _qFrame->setFrameStyle ( Q3Frame::NoFrame ); - } } @@ -113,7 +88,7 @@ { int preferredWidth; - if ( hasDefaultSize() ) + if ( dialogType() == YMainDialog ) { if ( userResized() ) preferredWidth = _userSize.width(); @@ -122,7 +97,7 @@ } else { - preferredWidth = YDialog::preferredWidth() + 2 * decorationWidth(); + preferredWidth = YDialog::preferredWidth(); } int screenWidth = qApp->desktop()->width(); @@ -141,7 +116,7 @@ { int preferredHeight; - if ( hasDefaultSize() ) + if ( dialogType() == YMainDialog ) { if ( userResized() ) preferredHeight = _userSize.height(); @@ -150,7 +125,7 @@ } else { - preferredHeight = YDialog::preferredHeight() + 2 * decorationWidth(); + preferredHeight = YDialog::preferredHeight(); } int screenHeight = qApp->desktop()->height(); @@ -165,19 +140,10 @@ } -int YQDialog::decorationWidth() -{ - if ( ! hasDefaultSize() && _qFrame ) - return _qFrame->frameWidth(); - else - return 0; -} - - void YQDialog::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); - YWidget::setEnabled( enabled ); + YDialog::setEnabled( enabled ); } @@ -191,16 +157,9 @@ if ( hasChildren() ) { - firstChild()->setSize( newWidth - 2 * decorationWidth(), - newHeight - 2 * decorationWidth() ); - - QWidget * qChild = (QWidget *) firstChild()->widgetRep(); - qChild->move( decorationWidth(), decorationWidth() ); + firstChild()->setSize( newWidth, newHeight ); } - if ( _qFrame ) - _qFrame->resize( newWidth, newHeight ); - resize( newWidth, newHeight ); } @@ -243,6 +202,9 @@ _defaultButton = findDefaultButton( childrenBegin(), childrenEnd() ); + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + return _defaultButton; } @@ -349,6 +311,13 @@ _defaultButton = wizardDefaultButton( wizard ); } + if ( _defaultButton ) + { + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + } + + YQGenericButton * def = _focusButton ? _focusButton : _defaultButton; if ( def ) @@ -427,7 +396,7 @@ void -YQDialog::setDefaultButton( YQGenericButton * newDefaultButton ) +YQDialog::setDefaultButton( YPushButton * newDefaultButton ) { if ( _defaultButton && newDefaultButton && @@ -441,13 +410,13 @@ else { y2error( "Too many `opt(`default) PushButtons: [%s]", - (const char *) newDefaultButton->text() ); + newDefaultButton->label().c_str() ); newDefaultButton->setDefaultButton( false ); return; } } - _defaultButton = newDefaultButton; + _defaultButton = dynamic_cast<YQGenericButton*>(newDefaultButton); if ( _defaultButton ) { @@ -457,6 +426,10 @@ if ( _defaultButton && ! _focusButton ) _defaultButton->showAsDefault( true ); } + + + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); } @@ -621,9 +594,9 @@ void YQDialog::closeEvent( QCloseEvent * event ) { - // The window manager "close window" button ( and menu, e.g. Alt-F4 ) will be + // The window manager "close window" button (and WM menu, e.g. Alt-F4) will be // handled just like the user had clicked on the `id`( `cancel ) button in - // that dialog. It's up to the YCP application to handle this ( if desired ). + // that dialog. It's up to the YCP application to handle this (if desired). y2debug( "Ignoring window manager close button." ); event->ignore(); @@ -656,10 +629,10 @@ void YQDialog::show() { - if ( ! hasDefaultSize() && qApp->mainWidget()->isVisible() ) - center( this, qApp->mainWidget() ); - else if ( isCentered() ) - center( this, qApp->desktop() ); +#if FIXME + if ( ! dialogType() == YMainDialog && qApp->mainWidget()->isVisible() ) + center( this, qApp->mainWidget() ); +#endif QWidget::show(); } Modified: branches/tmp/coolo/wizard-rework/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQDialog.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQDialog.h Sun Dec 2 17:14:25 2007 @@ -28,8 +28,6 @@ class YQGenericButton; class YQWizard; -class Q3Frame; - class YQDialog : public QWidget, public YDialog { @@ -37,17 +35,27 @@ public: /** - * Constructor: Constructor. + * Constructor. + * + * 'dialogType' is one of YMainDialog or YPopupDialog. + * + * 'colorMode' can be set to YDialogWarnColor to use very bright "warning" + * colors or YDialogInfoColor to use more prominent, yet not quite as + * bright as "warning" colors. Use both only very rarely. **/ - YQDialog( const YWidgetOpt & opt, - QWidget * qt_parent = 0, - bool default_size = false ); + YQDialog( QWidget * qParent, + YDialogType dialogType, + YDialogColorMode colorMode = YDialogNormalColor ); + +protected: /** - * Destructor: Cleans up. + * Destructor. + * Don't delete a dialog directly, use YDialog::deleteTopmostDialog(). **/ - ~YQDialog(); + virtual ~YQDialog(); +public: /** * Makes this dialog active or inactive **/ @@ -88,12 +96,6 @@ virtual void setSize( int newWidth, int newHeight ); /** - * Returns the size of (artificial) window manager decorations, depending - * on the value of YDialog::isDecorated(). - **/ - int decorationWidth(); - - /** * Return this dialog's (first) default button or 0 if none **/ YQGenericButton * findDefaultButton(); @@ -136,7 +138,7 @@ * [Return] if no other button has the keyboard focus. * 'newDefaultButton' may be 0 if the former default button is destroyed. **/ - void setDefaultButton( YQGenericButton * newDefaultButton ); + void setDefaultButton( YPushButton * newDefaultButton ); /** * Ensure presence of no more than one single default button. @@ -230,8 +232,6 @@ // Data members // - Q3Frame * _qFrame; - bool _userResized; QSize _userSize; Modified: branches/tmp/coolo/wizard-rework/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQInputField.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQInputField.cc Sun Dec 2 17:14:25 2007 @@ -14,7 +14,7 @@ Author: Stefan Hundhammer <sh(a)suse.de> - textdomain "packages-qt" + Textdomain "packages-qt" /-*/ Modified: branches/tmp/coolo/wizard-rework/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI.h Sun Dec 2 17:14:25 2007 @@ -340,13 +340,6 @@ YEvent * pollInput(); /** - * Create a dialog. - * - * Reimplemented from YUI. - **/ - YDialog * createDialog( YWidgetOpt & opt ); - - /** * Show and activate a dialog. * * Reimplemented from YUI. Modified: branches/tmp/coolo/wizard-rework/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI_core.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI_core.cc Sun Dec 2 17:14:25 2007 @@ -521,6 +521,8 @@ } +#warning obsolete +#if 0 YDialog * YQUI::createDialog( YWidgetOpt & opt ) { init_ui(); @@ -542,6 +544,7 @@ return dialog; } +#endif void YQUI::showDialog( YDialog * dialog ) @@ -554,7 +557,7 @@ return; } - if ( dialog->hasDefaultSize() ) + if ( dialog->dialogType() == YMainDialog ) { _widget_stack->addWidget ( qw ); _widget_stack->setCurrentWidget( qw ); @@ -592,7 +595,7 @@ return; } - if ( dialog->hasDefaultSize() ) + if ( dialog->dialogType() == YMainDialog ) { _widget_stack->removeWidget( qw ); } @@ -600,6 +603,8 @@ { qw->hide(); +#warning FIXME +#if 0 // Clean up the popup stack. libyui guarantees that a dialog will be // deleted after closeDialog() so it is safe to pop that dialog from // the popup stack here. @@ -608,6 +613,7 @@ _popup_stack.pop_back(); else y2error( "Popup dialog stack corrupted!" ); +#endif } } Modified: branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.cc Sun Dec 2 17:14:25 2007 @@ -47,22 +47,17 @@ // YQDialog * -YQWidgetFactory::createMainDialog() +YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) { - return 0; // FIXME: TO DO -} - - + QWidget * qParent = 0; + YQDialog * dialog = new YQDialog( qParent, dialogType, colorMode ); + YUI_CHECK_NEW( dialog ); -YQDialog * -YQWidgetFactory::createPopupDialog() -{ - return 0; // FIXME: TO DO + return dialog; } - // // Layout Boxes // Modified: branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQWidgetFactory.h Sun Dec 2 17:14:25 2007 @@ -70,14 +70,13 @@ // Dialogs // - virtual YQDialog * createMainDialog(); - virtual YQDialog * createPopupDialog(); + virtual YQDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); // // Layout Boxes // - virtual YQLayoutBox * createLayoutBox( YWidget * parent, YUIDimension dim ); + virtual YQLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim ); // // Common Leaf Widgets Modified: branches/tmp/coolo/wizard-rework/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/p… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/coolo/wizard-rework/src/pkg/YQPkgConflictDialog.cc Sun Dec 2 17:14:25 2007 @@ -361,7 +361,7 @@ QString heading = QString( "<h2>%1</h2>" ).arg( _( "Create Dependency Resolver Test Case" ) ); QString msg = - _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver." + _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver. " "The logs will be stored in directory <br><tt>%1</tt></p>" ).arg( testCaseDir ); int button_no = QMessageBox::information( 0, // parent Modified: branches/tmp/coolo/wizard-rework/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/p… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/pkg/YQPkgRepoFilterView.cc (original) +++ branches/tmp/coolo/wizard-rework/src/pkg/YQPkgRepoFilterView.cc Sun Dec 2 17:14:25 2007 @@ -97,7 +97,11 @@ // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of - // "all packages", "RPM groups", "search", "summary" + // "All packages", "RPM groups", "search", "summary" + // + // And yes, the colon really belongs there since this is one of the very + // few cases where a combo box label is left to the combo box rather than + // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" ), vbox ); Q_CHECK_PTR( _secondaryFilters ); Modified: branches/tmp/coolo/wizard-rework/yast2-qt4.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/yast2… ============================================================================== --- branches/tmp/coolo/wizard-rework/yast2-qt4.spec.in (original) +++ branches/tmp/coolo/wizard-rework/yast2-qt4.spec.in Sun Dec 2 17:14:25 2007 @@ -5,8 +5,8 @@ BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel Summary: - -BuildRequires: yast2-core-devel >= 2.16.10 -Requires: yast2-core >= 2.16.10 +BuildRequires: yast2-core-devel >= 2.16.11 +Requires: yast2-core >= 2.16.11 Requires: libzypp >= 3.11.8 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- 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] r42572 - in /branches/tmp/coolo/wizard-rework/src: YQImage.cc YQImage.h
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 17:11:13 2007 New Revision: 42572 URL: http://svn.opensuse.org/viewcvs/yast?rev=42572&view=rev Log: cherry pick 42530 Modified: branches/tmp/coolo/wizard-rework/src/YQImage.cc branches/tmp/coolo/wizard-rework/src/YQImage.h Modified: branches/tmp/coolo/wizard-rework/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQImage.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQImage.cc Sun Dec 2 17:11:13 2007 @@ -20,6 +20,7 @@ #include <unistd.h> #include <qpixmap.h> #include <qmovie.h> +#include <QIcon> //Added by qt3to4: #include <qlabel.h> #define y2log_component "qt-ui" @@ -165,5 +166,17 @@ resize( newWidth, newHeight ); } +void YQImage::setEnabled( bool enable ) +{ + qDebug("setEnabled %d", enable); + if (enable) + setImage( imageFileName(), animated() ); + else { + // Trigger image re-display + QPixmap pixmap( fromUTF8( imageFileName() ) ); + QIcon icon(pixmap); + QLabel::setPixmap( icon.pixmap( pixmap.size(), QIcon::Disabled, QIcon::Off) ); + } +} #include "YQImage.moc" Modified: branches/tmp/coolo/wizard-rework/src/YQImage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/Y… ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQImage.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQImage.h Sun Dec 2 17:11:13 2007 @@ -62,6 +62,11 @@ virtual void setAutoScale( bool autoScale = true ); /** + * if false, the image will be displayed in gray + */ + virtual void setEnabled( bool enabled ); + + /** * Preferred width of the widget. * * Reimplemented from YWidget. -- 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] r42571 - /branches/tmp/coolo/qt4-port/src/CMakeLists.txt
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 16:53:52 2007 New Revision: 42571 URL: http://svn.opensuse.org/viewcvs/yast?rev=42571&view=rev Log: the pkg compiles too Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Sun Dec 2 16:53:52 2007 @@ -47,7 +47,7 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -#ADD_SUBDIRECTORY(pkg) +ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) -- 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] r42570 - in /branches/tmp/coolo/qt4-port: ./ package/ src/ src/pkg/
by coolo＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: coolo Date: Sun Dec 2 16:50:25 2007 New Revision: 42570 URL: http://svn.opensuse.org/viewcvs/yast?rev=42570&view=rev Log: merge Huha's ydialog changes Modified: branches/tmp/coolo/qt4-port/VERSION branches/tmp/coolo/qt4-port/package/yast2-qt4.changes branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQDialog.cc branches/tmp/coolo/qt4-port/src/YQDialog.h branches/tmp/coolo/qt4-port/src/YQInputField.cc branches/tmp/coolo/qt4-port/src/YQUI.h branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc branches/tmp/coolo/qt4-port/src/YQWidgetFactory.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc branches/tmp/coolo/qt4-port/yast2-qt4.spec.in Modified: branches/tmp/coolo/qt4-port/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/VERSION?re… ============================================================================== --- branches/tmp/coolo/qt4-port/VERSION (original) +++ branches/tmp/coolo/qt4-port/VERSION Sun Dec 2 16:50:25 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: branches/tmp/coolo/qt4-port/package/yast2-qt4.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/package/ya… ============================================================================== --- branches/tmp/coolo/qt4-port/package/yast2-qt4.changes (original) +++ branches/tmp/coolo/qt4-port/package/yast2-qt4.changes Sun Dec 2 16:50:25 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 30 17:20:49 CET 2007 - sh(a)suse.de + +- Migrated YQDialog to mod-ui +- V 2.16.6 + +------------------------------------------------------------------- Tue Nov 27 19:08:00 CET 2007 - sh(a)suse.de - Moved all YCP related code out of YQWizard Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Sun Dec 2 16:50:25 2007 @@ -47,7 +47,7 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -ADD_SUBDIRECTORY(pkg) +#ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) Modified: branches/tmp/coolo/qt4-port/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDial… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.cc Sun Dec 2 16:50:25 2007 @@ -39,32 +39,32 @@ // like "Above", "Below" etc. that clash with some Qt headers. #include <X11/Xlib.h> +#define YQMainDialogWFlags Qt::Window -YQDialog::YQDialog( const YWidgetOpt & opt, - QWidget * qt_parent, - bool default_size ) - : QWidget( qt_parent, - default_size ? Qt::Widget : Qt::Window ) // WFlags - , YDialog( opt ) +#define YQPopupDialogWFlags Qt::Widget + +YQDialog::YQDialog( QWidget * qParent, + YDialogType dialogType, + YDialogColorMode colorMode ) + : QWidget( qParent, + dialogType == YMainDialog ? YQMainDialogWFlags : YQPopupDialogWFlags ) + , YDialog( dialogType, colorMode ) { _userResized = false; _focusButton = 0; _defaultButton = 0; setWidgetRep( this ); - setWindowTitle( hasDefaultSize() ? "YaST2" : "" ); + setWindowTitle( dialogType == YMainDialog ? "YaST2" : "" ); setFocusPolicy( Qt::StrongFocus ); - if ( ! default_size ) - setWindowModality( Qt::WindowModal ); - - if ( hasWarnColor() || hasInfoColor() ) + if ( colorMode != YDialogNormalColor ) { QColor normalBackground ( 0, 128, 0 ); QColor inputFieldBackground ( 0, 96, 0 ); QColor text = Qt::white; - if ( hasInfoColor() ) + if ( colorMode == YDialogInfoColor ) { normalBackground = QColor ( 238, 232, 170 ); // PaleGoldenrod } @@ -76,31 +76,6 @@ warnPalette.setCurrentColorGroup(QPalette::Active); setPalette( warnPalette ); } - - _qFrame = new Q3Frame ( this ); - bool decorate = ! hasDefaultSize() && ! YQUI::ui()->haveWM(); - -#if 0 - if ( hasSmallDecorations() ) - { - // None of this works (yet). :-(( - - clearWFlags( getWFlags() ); - setWFlags( Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop ); - // decorate = true; - } -#endif - - if ( decorate ) - { - _qFrame->setFrameStyle ( Q3Frame::Box | Q3Frame::Raised ); - _qFrame->setLineWidth(2); - _qFrame->setMidLineWidth(3); - } - else - { - _qFrame->setFrameStyle ( Q3Frame::NoFrame ); - } } @@ -113,7 +88,7 @@ { int preferredWidth; - if ( hasDefaultSize() ) + if ( dialogType() == YMainDialog ) { if ( userResized() ) preferredWidth = _userSize.width(); @@ -122,7 +97,7 @@ } else { - preferredWidth = YDialog::preferredWidth() + 2 * decorationWidth(); + preferredWidth = YDialog::preferredWidth(); } int screenWidth = qApp->desktop()->width(); @@ -141,7 +116,7 @@ { int preferredHeight; - if ( hasDefaultSize() ) + if ( dialogType() == YMainDialog ) { if ( userResized() ) preferredHeight = _userSize.height(); @@ -150,7 +125,7 @@ } else { - preferredHeight = YDialog::preferredHeight() + 2 * decorationWidth(); + preferredHeight = YDialog::preferredHeight(); } int screenHeight = qApp->desktop()->height(); @@ -165,19 +140,10 @@ } -int YQDialog::decorationWidth() -{ - if ( ! hasDefaultSize() && _qFrame ) - return _qFrame->frameWidth(); - else - return 0; -} - - void YQDialog::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); - YWidget::setEnabled( enabled ); + YDialog::setEnabled( enabled ); } @@ -191,16 +157,9 @@ if ( hasChildren() ) { - firstChild()->setSize( newWidth - 2 * decorationWidth(), - newHeight - 2 * decorationWidth() ); - - QWidget * qChild = (QWidget *) firstChild()->widgetRep(); - qChild->move( decorationWidth(), decorationWidth() ); + firstChild()->setSize( newWidth, newHeight ); } - if ( _qFrame ) - _qFrame->resize( newWidth, newHeight ); - resize( newWidth, newHeight ); } @@ -243,6 +202,9 @@ _defaultButton = findDefaultButton( childrenBegin(), childrenEnd() ); + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + return _defaultButton; } @@ -349,6 +311,13 @@ _defaultButton = wizardDefaultButton( wizard ); } + if ( _defaultButton ) + { + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + } + + YQGenericButton * def = _focusButton ? _focusButton : _defaultButton; if ( def ) @@ -427,7 +396,7 @@ void -YQDialog::setDefaultButton( YQGenericButton * newDefaultButton ) +YQDialog::setDefaultButton( YPushButton * newDefaultButton ) { if ( _defaultButton && newDefaultButton && @@ -441,13 +410,13 @@ else { y2error( "Too many `opt(`default) PushButtons: [%s]", - qPrintable(newDefaultButton->text()) ); + newDefaultButton->label().c_str() ); newDefaultButton->setDefaultButton( false ); return; } } - _defaultButton = newDefaultButton; + _defaultButton = dynamic_cast<YQGenericButton*>(newDefaultButton); if ( _defaultButton ) { @@ -457,6 +426,10 @@ if ( _defaultButton && ! _focusButton ) _defaultButton->showAsDefault( true ); } + + + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); } @@ -621,9 +594,9 @@ void YQDialog::closeEvent( QCloseEvent * event ) { - // The window manager "close window" button ( and menu, e.g. Alt-F4 ) will be + // The window manager "close window" button (and WM menu, e.g. Alt-F4) will be // handled just like the user had clicked on the `id`( `cancel ) button in - // that dialog. It's up to the YCP application to handle this ( if desired ). + // that dialog. It's up to the YCP application to handle this (if desired). y2debug( "Ignoring window manager close button." ); event->ignore(); @@ -656,16 +629,11 @@ void YQDialog::show() { - //if ( ! hasDefaultSize() && qApp->mainWidget()->isVisible() ) - if ( ! hasDefaultSize() ) - { - // will use topwidget anyway - center( this, 0 ); - } - else if ( isCentered() ) - { - center( this, qApp->desktop() ); - } +#if FIXME + if ( ! dialogType() == YMainDialog && qApp->mainWidget()->isVisible() ) + center( this, qApp->mainWidget() ); +#endif + QWidget::show(); } Modified: branches/tmp/coolo/qt4-port/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDial… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.h Sun Dec 2 16:50:25 2007 @@ -28,8 +28,6 @@ class YQGenericButton; class YQWizard; -class Q3Frame; - class YQDialog : public QWidget, public YDialog { @@ -37,17 +35,27 @@ public: /** - * Constructor: Constructor. + * Constructor. + * + * 'dialogType' is one of YMainDialog or YPopupDialog. + * + * 'colorMode' can be set to YDialogWarnColor to use very bright "warning" + * colors or YDialogInfoColor to use more prominent, yet not quite as + * bright as "warning" colors. Use both only very rarely. **/ - YQDialog( const YWidgetOpt & opt, - QWidget * qt_parent = 0, - bool default_size = false ); + YQDialog( QWidget * qParent, + YDialogType dialogType, + YDialogColorMode colorMode = YDialogNormalColor ); + +protected: /** - * Destructor: Cleans up. + * Destructor. + * Don't delete a dialog directly, use YDialog::deleteTopmostDialog(). **/ - ~YQDialog(); + virtual ~YQDialog(); +public: /** * Makes this dialog active or inactive **/ @@ -88,12 +96,6 @@ virtual void setSize( int newWidth, int newHeight ); /** - * Returns the size of (artificial) window manager decorations, depending - * on the value of YDialog::isDecorated(). - **/ - int decorationWidth(); - - /** * Return this dialog's (first) default button or 0 if none **/ YQGenericButton * findDefaultButton(); @@ -136,7 +138,7 @@ * [Return] if no other button has the keyboard focus. * 'newDefaultButton' may be 0 if the former default button is destroyed. **/ - void setDefaultButton( YQGenericButton * newDefaultButton ); + void setDefaultButton( YPushButton * newDefaultButton ); /** * Ensure presence of no more than one single default button. @@ -230,8 +232,6 @@ // Data members // - Q3Frame * _qFrame; - bool _userResized; QSize _userSize; Modified: branches/tmp/coolo/qt4-port/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQInpu… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQInputField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQInputField.cc Sun Dec 2 16:50:25 2007 @@ -14,7 +14,7 @@ Author: Stefan Hundhammer <sh(a)suse.de> - textdomain "packages-qt" + Textdomain "packages-qt" /-*/ Modified: branches/tmp/coolo/qt4-port/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI.h… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI.h (original) +++ branches/tmp/coolo/qt4-port/src/YQUI.h Sun Dec 2 16:50:25 2007 @@ -341,13 +341,6 @@ YEvent * pollInput(); /** - * Create a dialog. - * - * Reimplemented from YUI. - **/ - YDialog * createDialog( YWidgetOpt & opt ); - - /** * Show and activate a dialog. * * Reimplemented from YUI. 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 Sun Dec 2 16:50:25 2007 @@ -516,6 +516,8 @@ } +#warning obsolete +#if 0 YDialog * YQUI::createDialog( YWidgetOpt & opt ) { init_ui(); @@ -537,6 +539,7 @@ return dialog; } +#endif void YQUI::showDialog( YDialog * dialog ) @@ -549,7 +552,7 @@ return; } - if ( dialog->hasDefaultSize() ) + if ( dialog->dialogType() == YMainDialog ) { _widget_stack->addWidget ( qw ); _widget_stack->setCurrentWidget( qw ); @@ -587,7 +590,7 @@ return; } - if ( dialog->hasDefaultSize() ) + if ( dialog->dialogType() == YMainDialog ) { _widget_stack->removeWidget( qw ); } @@ -595,6 +598,8 @@ { qw->hide(); +#warning FIXME +#if 0 // Clean up the popup stack. libyui guarantees that a dialog will be // deleted after closeDialog() so it is safe to pop that dialog from // the popup stack here. @@ -603,6 +608,7 @@ _popup_stack.pop_back(); else y2error( "Popup dialog stack corrupted!" ); +#endif } } 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 Sun Dec 2 16:50:25 2007 @@ -48,22 +48,17 @@ // YQDialog * -YQWidgetFactory::createMainDialog() +YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) { - return 0; // FIXME: TO DO -} - - + QWidget * qParent = 0; + YQDialog * dialog = new YQDialog( qParent, dialogType, colorMode ); + YUI_CHECK_NEW( dialog ); -YQDialog * -YQWidgetFactory::createPopupDialog() -{ - return 0; // FIXME: TO DO + return dialog; } - // // Layout Boxes // Modified: branches/tmp/coolo/qt4-port/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetFactory.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetFactory.h Sun Dec 2 16:50:25 2007 @@ -70,14 +70,13 @@ // Dialogs // - virtual YQDialog * createMainDialog(); - virtual YQDialog * createPopupDialog(); + virtual YQDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); // // Layout Boxes // - virtual YQLayoutBox * createLayoutBox( YWidget * parent, YUIDimension dim ); + virtual YQLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim ); // // Common Leaf Widgets Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc Sun Dec 2 16:50:25 2007 @@ -361,7 +361,7 @@ QString heading = QString( "<h2>%1</h2>" ).arg( _( "Create Dependency Resolver Test Case" ) ); QString msg = - _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver." + _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver. " "The logs will be stored in directory <br><tt>%1</tt></p>" ).arg( testCaseDir ); int button_no = QMessageBox::information( 0, // parent Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc Sun Dec 2 16:50:25 2007 @@ -97,7 +97,11 @@ // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of - // "all packages", "RPM groups", "search", "summary" + // "All packages", "RPM groups", "search", "summary" + // + // And yes, the colon really belongs there since this is one of the very + // few cases where a combo box label is left to the combo box rather than + // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" ), vbox ); Q_CHECK_PTR( _secondaryFilters ); Modified: branches/tmp/coolo/qt4-port/yast2-qt4.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/yast2-qt4.… ============================================================================== --- branches/tmp/coolo/qt4-port/yast2-qt4.spec.in (original) +++ branches/tmp/coolo/qt4-port/yast2-qt4.spec.in Sun Dec 2 16:50:25 2007 @@ -5,8 +5,8 @@ BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel Summary: - -BuildRequires: yast2-core-devel >= 2.16.10 -Requires: yast2-core >= 2.16.10 +BuildRequires: yast2-core-devel >= 2.16.11 +Requires: yast2-core >= 2.16.11 Requires: libzypp >= 3.11.8 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0