[yast-commit] r39264 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/

Author: sh-sh-sh Date: Tue Jul 10 02:01:27 2007 New Revision: 39264 URL: http://svn.opensuse.org/viewcvs/yast?rev=39264&view=rev Log: (partially) ported wizard Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQUI.h branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc branches/tmp/sh/mod-ui/qt/src/YQWizard.cc branches/tmp/sh/mod-ui/qt/src/YQWizard.h branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc branches/tmp/sh/mod-ui/qt/src/YQWizardButton.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Tue Jul 10 02:01:27 2007 @@ -68,6 +68,7 @@ #include "YSquash.h" #include "YTable.h" #include "YTree.h" +#include "YWizard.h" using std::string; @@ -3322,26 +3323,29 @@ // Parse options + YWizardMode wizardMode = YWizardMode_Standard; + for ( int o=0; o < optList->size(); o++ ) { - if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_stepsEnabled ) opt.stepsEnabled.setValue( true ); - else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_treeEnabled ) opt.treeEnabled.setValue( true ); + if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_stepsEnabled ) wizardMode = YWizardMode_Steps; + else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_treeEnabled ) wizardMode = YWizardMode_Tree; else logUnknownOption( term, optList->value(o) ); } - YCPValue backButtonId = parseIdTerm( term->value( argnr ) ); - YCPString backButtonLabel = term->value( argnr+1 )->asString(); + YWidgetID * backButtonId = new YCPValueWidgetID( parseIdTerm( term->value( argnr ) ) ); + string backButtonLabel = term->value( argnr+1 )->asString()->value(); - YCPValue abortButtonId = parseIdTerm( term->value( argnr+2 ) ); - YCPString abortButtonLabel = term->value( argnr+3 )->asString(); + YWidgetID * abortButtonId = new YCPValueWidgetID( parseIdTerm( term->value( argnr+2 ) ) ); + string abortButtonLabel = term->value( argnr+3 )->asString()->value(); - YCPValue nextButtonId = parseIdTerm( term->value( argnr+4 ) ); - YCPString nextButtonLabel = term->value( argnr+5 )->asString(); + YWidgetID * nextButtonId = new YCPValueWidgetID( parseIdTerm( term->value( argnr+4 ) ) ); + string nextButtonLabel = term->value( argnr+5 )->asString()->value(); - return YUI::ui()->createWizard( parent, opt, - backButtonId, backButtonLabel, - abortButtonId, abortButtonLabel, - nextButtonId, nextButtonLabel ); + return YUI::optionalWidgetFactory()->createWizard( parent, + backButtonId, backButtonLabel, + abortButtonId, abortButtonLabel, + nextButtonId, nextButtonLabel, + wizardMode ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc Tue Jul 10 02:01:27 2007 @@ -47,12 +47,31 @@ } YWizard * -YOptionalWidgetFactory::createWizard( YWidget * parent ) +YOptionalWidgetFactory::createWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode ) { THROW_UNSUPPORTED( "YWizard" ); } +YWizard * +YOptionalWidgetFactory::createWizard( YWidget * parent, + const string & backButtonLabel, + const string & abortButtonLabel, + const string & nextButtonLabel, + YWizardMode wizardMode ) +{ + return createWizard( parent, + 0, backButtonLabel, + 0, abortButtonLabel, + 0, nextButtonLabel, + wizardMode ); +} + + bool YOptionalWidgetFactory::hasDumbTab() { Modified: branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h Tue Jul 10 02:01:27 2007 @@ -22,6 +22,8 @@ #include <string> #include <list> +#include "YWizard.h" + using std::string; using std::list; @@ -35,7 +37,6 @@ class YSlider; class YTimeField; class YWidget; -class YWizard; /** @@ -54,7 +55,17 @@ // virtual bool hasWizard(); - virtual YWizard * createWizard ( YWidget * parent ); + YWizard * createWizard ( YWidget * parent, + const string & backButtonLabel, + const string & abortButtonLabel, + const string & nextButtonLabel, + YWizardMode wizardMode = YWizardMode_Standard ); + + virtual YWizard * createWizard ( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode = YWizardMode_Standard ); virtual bool hasDumbTab(); virtual YDumbTab * createDumbTab ( YWidget * parent ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Tue Jul 10 02:01:27 2007 @@ -575,21 +575,9 @@ virtual bool hasPartitionSplitter() { return false; } - /** - * Creates a Wizard frame. - **/ - virtual YWidget *createWizard( YWidget *parent, YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ); - - virtual bool hasWizard() { return false; } - + protected: - - - /** * UI-specific setLanguage() function. * Returns YCPVoid() if OK and YCPNull() on error. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Tue Jul 10 02:01:27 2007 @@ -92,7 +92,7 @@ else if ( symbol == YUISpecialWidget_PatternSelector ) hasWidget = fact->hasPatternSelector(); else if ( symbol == YUISpecialWidget_PartitionSplitter ) hasWidget = hasPartitionSplitter(); else if ( symbol == YUISpecialWidget_SimplePatchSelector ) hasWidget = fact->hasSimplePatchSelector(); - else if ( symbol == YUISpecialWidget_Wizard ) hasWidget = hasWizard(); + else if ( symbol == YUISpecialWidget_Wizard ) hasWidget = fact->hasWizard(); else if ( symbol == YUISpecialWidget_Date ) hasWidget = hasDate(); else if ( symbol == YUISpecialWidget_Time ) hasWidget = hasTime(); else @@ -1108,6 +1108,7 @@ * If the current UI does not provide a wizard widget, 'false' is returned. * It is safe to call this even for UIs that don't provide a wizard widget. In * this case, all calls to this builtin simply return 'false'. + * * @param term wizardCommand * * @return boolean Returns true on success. @@ -1115,7 +1116,7 @@ YCPValue YUI::evaluateWizardCommand( const YCPTerm & command ) { - if ( ! hasWizard() ) + if ( ! YUI::optionalWidgetFactory()->hasWizard() ) return YCPBoolean( false ); // A wizard widget always has ID `wizard Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc Tue Jul 10 02:01:27 2007 @@ -144,16 +144,4 @@ } -YWidget * YUI::createWizard( YWidget *parent, YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ) -{ - y2error( "Default createWizard() method called - " - "forgot to call HasSpecialWidget()?" ); - - return 0; -} - - // EOF Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc Tue Jul 10 02:01:27 2007 @@ -24,25 +24,50 @@ #include "YWizard.h" +struct YWizardPrivate +{ + YWizardPrivate( YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode ) + : backButtonLabel( backButtonLabel ) + , abortButtonLabel( abortButtonLabel ) + , nextButtonLabel( nextButtonLabel ) + , backButtonId( backButtonId ) + , abortButtonId( abortButtonId ) + , nextButtonId( nextButtonId ) + {} + + string backButtonLabel; + string abortButtonLabel; + string nextButtonLabel; + YWidgetID * backButtonId; + YWidgetID * abortButtonId; + YWidgetID * nextButtonId; + YWizardMode wizardMode; +}; + -YWizard::YWizard( const YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ) - : YWidget( opt ) - , _backButtonId( backButtonId ) - , _backButtonLabel( backButtonLabel ) - , _abortButtonId( abortButtonId ) - , _abortButtonLabel( abortButtonLabel ) - , _nextButtonId( nextButtonId ) - , _nextButtonLabel( nextButtonLabel ) + +YWizard::YWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode ) + : YWidget( parent ) + , priv( new YWizardPrivate( backButtonId, backButtonLabel, + abortButtonId, abortButtonLabel, + nextButtonId, nextButtonLabel, + wizardMode ) ) { + YUI_CHECK_NEW( priv ); + // On the YWidget level, a Wizard has a content area and a couple of // buttons as children, so simply subclassing from YSimpleChildManager // won't do; a children manager that can handle more children is needed. setChildrenManager( new YWidgetChildrenManager( this ) ); - + // All wizard widgets have a fixed ID `wizard YWidget::setId( new YCPValueWidgetID( YCPSymbol( YWizardID ) ) ); @@ -51,6 +76,90 @@ } +YWizard::~YWizard() +{ + // Intentionally not deleting the button IDs here: The wizard buttons + // assume responsibility for them. For YWidget derived wizard buttons, the + // YWidget destructor will delete the ID. +} + + +string YWizard::backButtonLabel() const +{ + return priv->backButtonLabel; +} + + +string YWizard::abortButtonLabel() const +{ + return priv->abortButtonLabel; +} + + +string YWizard::nextButtonLabel() const +{ + return priv->nextButtonLabel; +} + + +YWidgetID * YWizard::backButtonId() const +{ + return priv->backButtonId; +} + + +YWidgetID * YWizard::abortButtonId() const +{ + return priv->abortButtonId; +} + + +YWidgetID * YWizard::nextButtonId() const +{ + return priv->nextButtonId; +} + + +void YWizard::setBackButtonLabel ( const string & newLabel ) +{ + priv->backButtonLabel = newLabel; +} + + +void YWizard::setAbortButtonLabel( const string & newLabel ) +{ + priv->abortButtonLabel = newLabel; +} + + +void YWizard::setNextButtonLabel ( const string & newLabel ) +{ + priv->nextButtonLabel = newLabel; +} + + +void YWizard::setBackButtonId ( YWidgetID * newId ) +{ + priv->backButtonId = newId; +} + + +void YWizard::setAbortButtonId( YWidgetID * newId ) +{ + priv->abortButtonId = newId; +} + + +void YWizard::setNextButtonId ( YWidgetID * newId ) +{ + priv->nextButtonId = newId; +} + + + + + + YCPValue YWizard::command( const YCPTerm & command ) { y2error( "YWizard::command() not reimplemented!" ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h Tue Jul 10 02:01:27 2007 @@ -24,22 +24,96 @@ #include class YMacroRecorder; +class YWizardPrivate; #define YWizardID "wizard" #define YWizardContentsReplacePointID "contents" + +enum YWizardMode +{ + YWizardMode_Standard, // Normal wizard (help panel or nothing) + YWizardMode_Steps, // Steps visible in left side panel + YWizardMode_Tree // Tree in left side panel +}; + + +/** + * A wizard is a more complex frame typically used for multi-step workflows: + * + * +------------+------------------------------------------------+ + * | | | + * | | | + * | | | + * | | | + * | | | + * | | | + * | | | + * | | | + * | Side bar | Content Area | + * | | (YReplacePoint) | + * | | | + * | | | + * | | | + * | | | + * | | | + * | | | + * | | [Back] [Abort] [Next] | + * +------------+------------------------------------------------+ + * + * The side bar can contain help text, a list of steps that are performed, or + * an embedded tree (much like the YTree widget). + * + * The client application creates the wizard and replaces the widget in the + * content area for each step. + * + * The wizard buttons can theoretically be used to do anything, but good UI + * design will stick to the model above: [Back], [Abort], [Next]. + * + * If only two buttons are desired, leave the [Back] button's label emtpy. The + * remaining two buttons will be rearranged accordingly in the button area. + * + * In the last step of a multi-step workflow, the [Next] button's label is + * customarily replaced with a label that indicates that this is the last + * step. [Accept] is recommended for that button label: [Finish] (as sometimes + * used in other environments) by no means clearly indicates that this is the + * positive ending, the final "do it" button. Worse, translations of that are + * often downright miserable: To German, [Finish] gets translated as [Beenden] + * which is the same word as "Quit" (used in menus). This does not at all tell + * the user that that button really performs the requested action the + * multi-step wizard is all about. + **/ class YWizard: public YWidget { protected: /** * Constructor. + * + * If only two buttons are desired, leave 'backButtonLabel' empty. + * + * Each button can take an ID. All IDs can be 0. + * + * For wizard buttons that have an ID, a wizard button event will return + * that ID. For wizard buttons that don't have an ID, a wizard button event + * will return the button label (stripped of any '&' indicating keyboard + * shortcuts). + * + * The Wizard's internal wizard buttons assume ownership of the button IDs + * and will delete them (if non-null) in their destructors. **/ - YWizard( const YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ); + YWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode = YWizardMode_Standard ); public: + + /** + * Destructor. + **/ + ~YWizard(); + /** * Returns a descriptive name of this widget class for logging, * debugging etc. @@ -57,7 +131,43 @@ **/ YCPValue queryWidget( const YCPSymbol & property ); + /** + * Return the button labels. + **/ + string backButtonLabel() const; + string abortButtonLabel() const; + string nextButtonLabel() const; + /** + * Return the button IDs or 0 if a button doesn't have an ID. + **/ + YWidgetID * backButtonId() const; + YWidgetID * abortButtonId() const; + YWidgetID * nextButtonId() const; + + /** + * Set the button labels. + * + * Derived classes might want to overwrite this, but they should call this + * respective base class function in the new implementation. + **/ + virtual void setBackButtonLabel ( const string & newLabel ); + virtual void setAbortButtonLabel( const string & newLabel ); + virtual void setNextButtonLabel ( const string & newLabel ); + + /** + * Set the button IDs. The receiving wizard button assumes ownership over + * the respective ID and will delete it in its destructor (or when a new ID + * is set). + * + * Derived classes might want to overwrite this, but they should call this + * respective base class function in the new implementation. + **/ + virtual void setBackButtonId ( YWidgetID * newId ); + virtual void setAbortButtonId( YWidgetID * newId ); + virtual void setNextButtonId ( YWidgetID * newId ); + + protected: /** @@ -67,14 +177,13 @@ virtual YCPString currentTreeSelection() { return YCPString( "" ); } + + // Data members - YCPValue _backButtonId; - YCPString _backButtonLabel; - YCPValue _abortButtonId; - YCPString _abortButtonLabel; - YCPValue _nextButtonId; - YCPString _nextButtonLabel; + +private: + ImplPtr<YWizardPrivate> priv; }; Modified: branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc Tue Jul 10 02:01:27 2007 @@ -43,13 +43,24 @@ bool YQOptionalWidgetFactory::hasWizard() { - return false; + return true; } YQWizard * -YQOptionalWidgetFactory::createWizard( YWidget * parent ) -{ - THROW_UNSUPPORTED( "QYWizard" ); +YQOptionalWidgetFactory::createWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode ) +{ + YQWizard * wizard = new YQWizard( parent, + backButtonId, backButtonLabel, + abortButtonId, abortButtonLabel, + nextButtonId, nextButtonLabel, + wizardMode ); + YUI_CHECK_NEW( wizard ); + + return wizard; } Modified: branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h Tue Jul 10 02:01:27 2007 @@ -62,7 +62,11 @@ virtual bool hasWizard(); - virtual YQWizard * createWizard ( YWidget * parent ); + virtual YQWizard * createWizard ( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode = YWizardMode_Standard ); virtual bool hasDumbTab(); virtual YQDumbTab * createDumbTab ( YWidget * parent ); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI.h Tue Jul 10 02:01:27 2007 @@ -495,13 +495,6 @@ const YCPString & freeFieldLabel, const YCPString & newPartFieldLabel ); - bool hasWizard(); - YWidget * createWizard ( YWidget * parent, YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ); - - /*** END widget creation methods ***/ Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Tue Jul 10 02:01:27 2007 @@ -39,7 +39,6 @@ #include "YQTable.h" #include "YQTime.h" #include "YQTree.h" -#include "YQWizard.h" @@ -251,23 +250,4 @@ } - -bool YQUI::hasWizard() -{ - return true; -} - - -YWidget * YQUI::createWizard( YWidget *parent, YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ) -{ - return new YQWizard( (QWidget *) ( parent->widgetRep() ), opt, - backButtonId, backButtonLabel, - abortButtonId, abortButtonLabel, - nextButtonId, nextButtonLabel ); -} - - // EOF Modified: branches/tmp/sh/mod-ui/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Tue Jul 10 02:01:27 2007 @@ -119,26 +119,22 @@ #define USE_ICON_ON_HELP_BUTTON 0 -YQWizard::YQWizard( QWidget * parent, - const YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ) - : QVBox( parent ) - , YWizard( opt, +YQWizard::YQWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode ) + : QVBox( (QWidget *) parent->widgetRep() ) + , YWizard( parent, backButtonId, backButtonLabel, abortButtonId, abortButtonLabel, - nextButtonId, nextButtonLabel ) + nextButtonId, nextButtonLabel, + wizardMode ) { setWidgetRep( this ); - _stepsEnabled = opt.stepsEnabled.value(); - _treeEnabled = opt.treeEnabled.value(); - if ( _stepsEnabled && _treeEnabled ) - { - y2error( "Can't enable steps and tree at the same time - disabling steps" ); - _stepsEnabled = false; - } + _stepsEnabled = (wizardMode == YWizardMode_Steps); + _treeEnabled = (wizardMode == YWizardMode_Tree); _verboseCommands = false; _protectNextButton = false; @@ -1145,7 +1141,7 @@ // "Back" button // - _backButton = new YQWizardButton( this, buttonBox, _backButtonLabel->value(), _backButtonId ); + _backButton = new YQWizardButton( this, buttonBox, backButtonLabel(), backButtonId() ); YUI_CHECK_NEW( _backButton ); hbox->addWidget( (QWidget *) _backButton->widgetRep() ); @@ -1174,7 +1170,7 @@ // "Abort" button // - _abortButton = new YQWizardButton( this, buttonBox, _abortButtonLabel->value(), _abortButtonId ); + _abortButton = new YQWizardButton( this, buttonBox, abortButtonLabel(), abortButtonId() ); YUI_CHECK_NEW( _abortButton ); hbox->addWidget( (QWidget *) _abortButton->widgetRep() ); @@ -1197,7 +1193,7 @@ // "Next" button // - _nextButton = new YQWizardButton( this, buttonBox, _nextButtonLabel->value(), _nextButtonId ); + _nextButton = new YQWizardButton( this, buttonBox, nextButtonLabel(), nextButtonId() ); YUI_CHECK_NEW( _nextButton ); hbox->addWidget( (QWidget *) _nextButton->widgetRep() ); Modified: branches/tmp/sh/mod-ui/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizard.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizard.h Tue Jul 10 02:01:27 2007 @@ -58,16 +58,16 @@ public: /** - * Constructor + * Constructor. **/ - YQWizard( QWidget * parent, - const YWidgetOpt & opt, - const YCPValue & backButtonId, const YCPString & backButtonLabel, - const YCPValue & abortButtonId, const YCPString & abortButtonLabel, - const YCPValue & nextButtonId, const YCPString & nextButtonLabel ); + YQWizard( YWidget * parent, + YWidgetID * backButtonId, const string & backButtonLabel, + YWidgetID * abortButtonId, const string & abortButtonLabel, + YWidgetID * nextButtonId, const string & nextButtonLabel, + YWizardMode wizardMode = YWizardMode_Standard ); /** - * Destructor + * Destructor. **/ virtual ~YQWizard(); @@ -93,9 +93,9 @@ /** * Returns a descriptive label of this dialog instance for debugging. * - * Reimplemented from YWidget + * Reimplemented from YWidget. **/ - virtual std::string debugLabel(); + virtual string debugLabel(); /** * Preferred width of the widget. @@ -119,9 +119,9 @@ virtual void setSize( int newWidth, int newHeight ); /** - * Event filter - inherited from QWidget + * Event filter - inherited from QWidget. **/ - bool eventFilter( QObject * obj, QEvent * ev ); + virtual bool eventFilter( QObject * obj, QEvent * ev ); /** * Set a dialog icon. 0 is a valid value - it clears the current icon. @@ -269,7 +269,7 @@ * * Notice: As long as this signal is connected, the wizard will no longer * send button events to the UI. Rather, the connected QObject has to take - * care to propatage those events. + * care to propagate those events. * This is used in YQPatternSelector, for example. **/ void nextClicked(); @@ -277,7 +277,6 @@ public slots: - /** * Set the help text. 0 is a valid value - it clears the old text. **/ Modified: branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc Tue Jul 10 02:01:27 2007 @@ -21,7 +21,6 @@ #include #define y2log_component "qt-ui" #include -#include "YCPValueWidgetID.h" #include "utf8.h" #include "YQUI.h" @@ -29,10 +28,10 @@ #include "YQWizard.h" -YQWizardButton::YQWizardButton( YQWizard * wizard, - QWidget * buttonParent, - const std::string & label, - const YCPValue & id ) +YQWizardButton::YQWizardButton( YQWizard * wizard, + QWidget * buttonParent, + const string & label, + YWidgetID * id ) : YQGenericButton( wizard, label ) , _wizard( wizard ) { @@ -41,7 +40,9 @@ setQPushButton( button ); setWidgetRep( button ); - setId( new YCPValueWidgetID( id ) ); + + if ( id ) + setId( id ); connect( button, SIGNAL( clicked() ), this, SIGNAL( clicked() ) ); Modified: branches/tmp/sh/mod-ui/qt/src/YQWizardButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizardButton.h?rev=39264&r1=39263&r2=39264&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizardButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizardButton.h Tue Jul 10 02:01:27 2007 @@ -21,12 +21,12 @@ #define YQWizardButton_h #include - #include "YQGenericButton.h" - +using std::string; class YQDialog; class YQWizard; +class YWidgetID; class YQWizardButton : public YQGenericButton @@ -39,8 +39,8 @@ **/ YQWizardButton( YQWizard * wizard, QWidget * buttonParent, - const std::string & label, - const YCPValue & id ); + const string & label, + YWidgetID * id = 0 ); /** * Destructor. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org