[yast-commit] r42499 - in /branches/tmp/coolo/wizard-rework/src: CMakeLists.txt QHelpDialog.ui YQWizard.cc YQWizard.h

Author: coolo Date: Thu Nov 29 12:08:08 2007 New Revision: 42499 URL: http://svn.opensuse.org/viewcvs/yast?rev=42499&view=rev Log: Help is from now on in a popup that makes it possible to read the text line by line Added: branches/tmp/coolo/wizard-rework/src/QHelpDialog.ui Modified: branches/tmp/coolo/wizard-rework/src/CMakeLists.txt branches/tmp/coolo/wizard-rework/src/YQWizard.cc branches/tmp/coolo/wizard-rework/src/YQWizard.h Modified: branches/tmp/coolo/wizard-rework/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/CMakeLists.txt?rev=42499&r1=42498&r2=42499&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/CMakeLists.txt (original) +++ branches/tmp/coolo/wizard-rework/src/CMakeLists.txt Thu Nov 29 12:08:08 2007 @@ -32,6 +32,8 @@ QT4_AUTOMOC(${qt4_yast_plugin_SRCS}) +QT4_WRAP_UI(qt4_yast_plugin_SRCS QHelpDialog.ui) + INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui ) @@ -50,6 +52,5 @@ #ADD_SUBDIRECTORY(pkg) - #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) Added: branches/tmp/coolo/wizard-rework/src/QHelpDialog.ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/QHelpDialog.ui?rev=42499&view=auto ============================================================================== --- branches/tmp/coolo/wizard-rework/src/QHelpDialog.ui (added) +++ branches/tmp/coolo/wizard-rework/src/QHelpDialog.ui Thu Nov 29 12:08:08 2007 @@ -0,0 +1,68 @@ +<ui version="4.0" > + <class>QHelpDialog</class> + <widget class="QDialog" name="QHelpDialog" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle" > + <string>Help</string> + </property> + <layout class="QVBoxLayout" > + <item> + <layout class="QVBoxLayout" > + <item> + <widget class="QTextBrowser" name="textBrowser" /> + </item> + <item> + <layout class="QHBoxLayout" > + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" > + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton" > + <property name="text" > + <string>Close</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>pushButton</sender> + <signal>clicked()</signal> + <receiver>QHelpDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel" > + <x>371</x> + <y>282</y> + </hint> + <hint type="destinationlabel" > + <x>289</x> + <y>-15</y> + </hint> + </hints> + </connection> + </connections> +</ui> Modified: branches/tmp/coolo/wizard-rework/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQWizard.cc?rev=42499&r1=42498&r2=42499&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWizard.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQWizard.cc Thu Nov 29 12:08:08 2007 @@ -28,6 +28,8 @@ #include <string> #include +#include <QDialog> +#include "ui_QHelpDialog.h" #include #include #include @@ -118,8 +120,6 @@ _releaseNotesButton = 0; _treePanel = 0; _tree = 0; - _helpPanel = 0; - _helpBrowser = 0; _clientArea = 0; _menuBar = 0; _dialogIcon = 0; @@ -443,29 +443,11 @@ void YQWizard::layoutHelpPanel() { - _helpPanel = new Q3HBox( _sideBar ); - YUI_CHECK_NEW( _helpPanel ); - _sideBar->addWidget( _helpPanel ); - - Q3VBox * vbox = new Q3VBox( _helpPanel ); - YUI_CHECK_NEW( vbox ); - - // Help browser - - _helpBrowser = new Q3TextBrowser( vbox ); - YUI_CHECK_NEW( _helpBrowser ); - - _helpBrowser->setMimeSourceFactory( 0 ); - _helpBrowser->installEventFilter( this ); - _helpBrowser->setTextFormat( Qt::RichText ); - _helpBrowser->setMargin( 4 ); - _helpBrowser->setResizePolicy( Q3ScrollView::Manual ); - // // Button box with bottom gradient // - QLabel * buttonBox = new QLabel( vbox ); + QLabel * buttonBox = new QLabel( _sideBar ); YUI_CHECK_NEW( buttonBox ); QPushButton * button; @@ -952,17 +934,8 @@ void YQWizard::setHelpText( const string & helpText ) { - if ( _helpBrowser ) - { - if ( ! helpText.empty() ) - { - QString qHelpText = fromUTF8( helpText ); - qHelpText.replace( "&product;", YQUI::ui()->productName() ); - _helpBrowser->setText( qHelpText ); - } - else - _helpBrowser->clear(); - } + _qHelpText = fromUTF8( helpText ); + _qHelpText.replace( "&product;", YQUI::ui()->productName() ); } @@ -999,10 +972,11 @@ void YQWizard::showHelp() { - if ( _sideBar && _helpPanel ) - { - _sideBar->raiseWidget( _helpPanel ); - } + QDialog helpDlg( this ); + Ui_QHelpDialog ui; + ui.setupUi( &helpDlg ); + ui.textBrowser->setText( _qHelpText ); + helpDlg.exec(); } @@ -1250,13 +1224,13 @@ _status = s; if ( s == Todo ) - _statusLabel->setProperty( "class", "todo Step" ); + _statusLabel->setProperty( "class", "todo-step QLabel" ); if ( s == Done ) - _statusLabel->setProperty( "class", "done Step" ); + _statusLabel->setProperty( "class", "done-step QLabel" ); if ( s == Current ) - _statusLabel->setProperty( "class", "current Step" ); + _statusLabel->setProperty( "class", "current-step QLabel" ); qApp->style()->polish( _statusLabel ); } Modified: branches/tmp/coolo/wizard-rework/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQWizard.h?rev=42499&r1=42498&r2=42499&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWizard.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQWizard.h Thu Nov 29 12:08:08 2007 @@ -521,6 +521,7 @@ Direction _direction; QString _currentStepID; + QString _qHelpText; Q3WidgetStack * _sideBar; @@ -528,8 +529,6 @@ QPushButton * _releaseNotesButton; string _releaseNotesButtonId; QPushButton * _helpButton; - Q3HBox * _helpPanel; - Q3TextBrowser * _helpBrowser; QPushButton * _stepsButton; QPushButton * _treeButton; Q3HBox * _treePanel; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org