[yast-commit] r48782 - in /branches/tmp/jdsn/registration/src: RegMain.cc RegWizard.cc RegWizard.h RegWizardPage.h

Author: sh-sh-sh Date: Wed Jul 2 14:53:47 2008 New Revision: 48782 URL: http://svn.opensuse.org/viewcvs/yast?rev=48782&view=rev Log: history handling (still not 100% reliable) Modified: branches/tmp/jdsn/registration/src/RegMain.cc branches/tmp/jdsn/registration/src/RegWizard.cc branches/tmp/jdsn/registration/src/RegWizard.h branches/tmp/jdsn/registration/src/RegWizardPage.h Modified: branches/tmp/jdsn/registration/src/RegMain.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegMain.cc?rev=48782&r1=48781&r2=48782&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegMain.cc (original) +++ branches/tmp/jdsn/registration/src/RegMain.cc Wed Jul 2 14:53:47 2008 @@ -31,7 +31,7 @@ updateRepoPage.setNextPage ( &updateRepoPage2 ); updateRepoPage2.setNextPage( &updateRepoPage3 ); - updateRepoPage.show(); + RegWizard::regWizard()->showPage( &updateRepoPage ); bool success = RegWizard::runWorkflow(); Modified: branches/tmp/jdsn/registration/src/RegWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegWizard.cc?rev=48782&r1=48781&r2=48782&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegWizard.cc (original) +++ branches/tmp/jdsn/registration/src/RegWizard.cc Wed Jul 2 14:53:47 2008 @@ -118,11 +118,9 @@ { YUI_CHECK_PTR( regWizard()->currentPage() ); - YDialog * dia = dialog(); - YWizard * wiz = wizard(); - YUI_CHECK_PTR( dia ); - YUI_CHECK_PTR( wiz ); - + YDialog * dia = dialog(); YUI_CHECK_PTR( dia ); + YWizard * wiz = wizard(); YUI_CHECK_PTR( wiz ); + while( true ) { YEvent * event = dia->waitForEvent(); @@ -136,24 +134,13 @@ { if ( event->widget() == wiz->nextButton() ) { - // Go to next page + // Go to next page, if there is any RegWizardPage * nextPage = currentPage->nextPage(); if ( nextPage ) { - currentPage->save(); - currentPage->forgetWidgets(); - - currentPage = nextPage; - currentPage->init(); - currentPage->show(); - regWizard()->setCurrentPage( currentPage ); - - if ( ! currentPage->nextPage() ) - { - wiz->nextButton()->setLabel( _( "&Finish" ) ); - } + regWizard()->showPage( nextPage ); } else // No next page -> finished { @@ -163,10 +150,7 @@ } else if ( event->widget() == wiz->backButton() ) { - // Go back in page history - - - // TO DO + regWizard()->historyBack(); } else if ( event->widget() == wiz->abortButton() || event->eventType() == YEvent::CancelEvent ) @@ -189,3 +173,67 @@ } } } + + +void RegWizard::showPage( RegWizardPage * newPage ) +{ + RegWizardPage * oldPage = regWizard()->currentPage(); + + if ( oldPage ) + { + oldPage->save(); + oldPage->forgetWidgets(); + } + + regWizard()->setCurrentPage( newPage ); + newPage->init(); + newPage->show(); + + YWizard * wiz = wizard(); + YUI_CHECK_PTR( wiz ); + + wiz->nextButton()->setLabel( newPage->nextPage() ? + _( "&Next" ) : + _( "&Finish" ) ); + + if ( _history.empty() || _history.top() == newPage ) + wiz->backButton()->setEnabled( false ); + else + wiz->backButton()->setEnabled( true ); + + if ( _history.empty() || _history.top() != newPage ) + historyAdd( newPage ); + else + { + yuiDebug() << "page already in history" << endl; + } +} + + +void RegWizard::historyAdd( RegWizardPage * page ) +{ + yuiDebug() << "Adding page " << hex << page << dec << " to history" << endl; + _history.push( page ); +} + + +bool RegWizard::historyEmpty() const +{ + return _history.empty(); +} + + +void RegWizard::historyBack() +{ + if ( _history.empty() ) + { + yuiDebug() << "History empty" << endl; + return; + } + + yuiDebug() << "Going back one page" << endl; + + _history.pop(); + RegWizardPage * prevPage = _history.top(); + showPage( prevPage ); +} Modified: branches/tmp/jdsn/registration/src/RegWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegWizard.h?rev=48782&r1=48781&r2=48782&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegWizard.h (original) +++ branches/tmp/jdsn/registration/src/RegWizard.h Wed Jul 2 14:53:47 2008 @@ -3,10 +3,16 @@ #ifndef RegWizard_h #define RegWizard_h +#include <stack> + class YDialog; class YWizard; class RegWizardPage; +using std::stack; + +typedef std::stack RegWizardPageStack; + /** * Wrapper class for the wizard-related calls for registration. @@ -15,6 +21,12 @@ { public: /** + * Return the singleton for this class. This creates an instance of this + * class upon the first call. + **/ + static RegWizard * regWizard(); + + /** * Open a registration wizard. * This creates the singleton object for this class upon the first call. * @@ -33,11 +45,6 @@ static void close(); /** - * Return the singleton for this class. - **/ - static RegWizard * regWizard(); - - /** * Return the dialog for this wizard or 0 if there is none. **/ static YDialog * dialog(); @@ -48,17 +55,6 @@ static YWizard * wizard(); /** - * Set the current page for this workflow. - * This is called from RegWizardPage() each time a new page is shown. - **/ - void setCurrentPage( RegWizardPage * page ) { _currentPage = page; } - - /** - * Return the current page. - **/ - RegWizardPage * currentPage() const { return _currentPage; } - - /** * Run the workflow: Wait for events and handle them until the workflow is * finished (the last page is reached) or until the user clicks the "Abort" * or WM_CLOSE buttons. @@ -71,10 +67,45 @@ **/ static bool runWorkflow(); + /** + * Show another page. + **/ + void showPage( RegWizardPage * page ); + + /** + * Set the current page for this workflow. + * This is called from RegWizardPage() each time a new page is shown. + **/ + void setCurrentPage( RegWizardPage * page ) { _currentPage = page; } + + /** + * Return the current page. + **/ + RegWizardPage * currentPage() const { return _currentPage; } + + /** + * Add a wizard page to the page history. Pages add themselves to the + * history as they are shown. The "Back" button goes back in the page + * history one step. + **/ + void historyAdd( RegWizardPage * page ); + + /** + * Return 'true' if the page history is empty. + **/ + bool historyEmpty() const; + + /** + * Go back in the page history one step, if there is one. This will make + * the previous page in the history the current page and show that page. + **/ + void historyBack(); + protected: // Constructor and destructor are not public: - // Use the public static methods instead. + // Use the public static methods rather than creating an instance of this + // class directly. RegWizard(); ~RegWizard(); @@ -82,6 +113,7 @@ YDialog * _dialog; YWizard * _wizard; RegWizardPage * _currentPage; + RegWizardPageStack _history; }; #endif // RegWizard_h Modified: branches/tmp/jdsn/registration/src/RegWizardPage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegWizardPage.h?rev=48782&r1=48781&r2=48782&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegWizardPage.h (original) +++ branches/tmp/jdsn/registration/src/RegWizardPage.h Wed Jul 2 14:53:47 2008 @@ -11,7 +11,7 @@ **/ class RegWizardPage { -public: +protected: /** * Constructor. **/ @@ -22,6 +22,8 @@ **/ virtual ~RegWizardPage(); +public: + /** * Show the page inside a RegWizard. This will create the RegWizard if it * doesn't exist yet. @@ -75,7 +77,7 @@ /** * Return the help text for this wizard page. **/ - virtual string helpText() = 0; + virtual string helpText() { return ""; }; /** * Set the next wizard page for this page. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org