Author: sh-sh-sh Date: Thu Jul 3 15:20:29 2008 New Revision: 48832 URL: http://svn.opensuse.org/viewcvs/yast?rev=48832&view=rev Log: cruft Modified: branches/tmp/jdsn/registration/src/RegHWInfoPage.cc branches/tmp/jdsn/registration/src/WizardEmulation.cc branches/tmp/jdsn/registration/src/WizardEmulation.h Modified: branches/tmp/jdsn/registration/src/RegHWInfoPage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegHWInfoPage.cc?rev=48832&r1=48831&r2=48832&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegHWInfoPage.cc (original) +++ branches/tmp/jdsn/registration/src/RegHWInfoPage.cc Thu Jul 3 15:20:29 2008 @@ -97,7 +97,8 @@ fac->createVSpacing( vbox, 0.8 ); - _sendHWInfoCheckBoxFrame = fac->createCheckBoxFrame( vbox, _( "Send Hardware and System Information" ), _sendHWInfo ); + _sendHWInfoCheckBoxFrame = + fac->createCheckBoxFrame( vbox, _( "Send Hardware and System Information" ), _sendHWInfo ); YAlignment * innerMarginBox = fac->createMarginBox( _sendHWInfoCheckBoxFrame, 1.5, 0.7 ); _hwInfoRichText = fac->createRichText( innerMarginBox, _hwInfoText, true ); // plainText } Modified: branches/tmp/jdsn/registration/src/WizardEmulation.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/WizardEmulation.cc?rev=48832&r1=48831&r2=48832&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/WizardEmulation.cc (original) +++ branches/tmp/jdsn/registration/src/WizardEmulation.cc Thu Jul 3 15:20:29 2008 @@ -40,7 +40,6 @@ using std::string; -WizardEmulation *WizardEmulation::main_wizard = 0; WizardEmulation::WizardEmulation( YWidget * parent, const string & backButtonLabel, @@ -55,7 +54,6 @@ , _backButtonLabel( backButtonLabel ) , _abortButtonLabel( abortButtonLabel ) , _nextButtonLabel( nextButtonLabel ) - , _helpDlg ( NULL ) { yuiMilestone() << "Creating widgets" << endl; @@ -91,17 +89,8 @@ WizardEmulation::~WizardEmulation() { - if ( this == main_wizard ) - main_wizard = 0; - - if ( _helpDlg ) - YDialog::deleteTopmostDialog(); } -bool WizardEmulation::isSecondary() const -{ - return this != main_wizard; -} YLayoutBox *WizardEmulation::layoutButtonBox( YWidget * parent ) { @@ -117,7 +106,7 @@ // Help button - intentionally without keyboard shortcut _helpButton = YUI::widgetFactory()->createPushButton( hbox, "Help" ); YUI_CHECK_NEW( _helpButton ); - //_helpButton->setShortcut( Qt::Key_F1 ); + _helpButton->setHelpButton(); // // "Abort" button @@ -187,27 +176,10 @@ void WizardEmulation::setHelpText( const string & helpText ) { - _helpText = helpText; - // FIXME - //_helpText.replace( "&product;", YUI::app()->productName() ); + YWidget::setHelpText( helpText ); } -void WizardEmulation::showHelp() -{ - -#if 0 - if (!_helpDlg) - _helpDlg = new YHelpDialog ( _helpText, NULL ); - else - _helpDlg->setHelpText( _helpText ); - - _helpDlg->show(); - _helpDlg->raise(); - _helpDlg->activateWindow(); -#endif -} - void WizardEmulation::setSize( int newWidth, int newHeight ) { // don't call YDialog::currentDialog()->setSize() - leads to endless loop Modified: branches/tmp/jdsn/registration/src/WizardEmulation.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/WizardEmulation.h?rev=48832&r1=48831&r2=48832&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/WizardEmulation.h (original) +++ branches/tmp/jdsn/registration/src/WizardEmulation.h Thu Jul 3 15:20:29 2008 @@ -61,15 +61,6 @@ **/ virtual string debugLabel() const; - enum Direction { Forward, Backward }; - - /** - * Returns the current direction of wizard operations - going forward or - * going backward. This can be used to maintain a consistent direction when - * assigning default buttons to a dialog. - **/ - Direction direction() const { return _direction; } - // // Wizard basics // @@ -226,13 +217,6 @@ **/ virtual void setSize( int newWidth, int newHeight ); - /** - * Returns true if the wizard should follow the first wizard with steps - **/ - bool isSecondary() const; - - void showHelp(); - protected: // Layout functions @@ -265,13 +249,10 @@ bool _sendButtonEvents; - Direction _direction; - string _releaseNotesButtonId; string _helpText; YPushButton * _helpButton; - YDialog * _helpDlg; YFrame * _workArea; YWidget * _clientArea; YLabel * _dialogHeading; @@ -282,10 +263,6 @@ YReplacePoint * _contentsReplacePoint; -private: - static WizardEmulation *main_wizard; - - }; // class WizardEmulation -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org