Author: sh-sh-sh Date: Thu Jul 3 12:07:40 2008 New Revision: 48808 URL: http://svn.opensuse.org/viewcvs/yast?rev=48808&view=rev Log: preliminary fix for NCurses wizard layout Modified: branches/tmp/jdsn/registration/src/RegWizard.cc branches/tmp/jdsn/registration/src/WizardEmulation.cc branches/tmp/jdsn/registration/src/WizardEmulation.h Modified: branches/tmp/jdsn/registration/src/RegWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/RegWizard.cc?rev=48808&r1=48807&r2=48808&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/RegWizard.cc (original) +++ branches/tmp/jdsn/registration/src/RegWizard.cc Thu Jul 3 12:07:40 2008 @@ -77,7 +77,8 @@ else { YLayoutBox* vbox = YUI::widgetFactory()->createVBox( dialog ); - YUI::widgetFactory()->createLabel( vbox , "*** YaST Test Heading ***" ); + + // YUI::widgetFactory()->createLabel( vbox , "*** YaST Test Heading ***" ); // Use wizard emulation as fallback regWizard()->_wizard = new WizardEmulation( vbox, Modified: branches/tmp/jdsn/registration/src/WizardEmulation.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/WizardEmulation.cc?rev=48808&r1=48807&r2=48808&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/WizardEmulation.cc (original) +++ branches/tmp/jdsn/registration/src/WizardEmulation.cc Thu Jul 3 12:07:40 2008 @@ -42,12 +42,12 @@ WizardEmulation *WizardEmulation::main_wizard = 0; -WizardEmulation::WizardEmulation( YWidget * dialog, +WizardEmulation::WizardEmulation( YWidget * parent, const string & backButtonLabel, const string & abortButtonLabel, const string & nextButtonLabel, YWizardMode wizardMode ) - : YWizard( dialog, + : YWizard( parent, backButtonLabel, abortButtonLabel, nextButtonLabel, @@ -65,12 +65,14 @@ _nextButton = 0; _sendButtonEvents = true; _contentsReplacePoint = 0; + setWeight( YD_VERT, 1 ); + setStretchable( YD_VERT, false ); // Try this to get the test heading created in RegWizard::open() // YLayoutBox* vbox = YUI::widgetFactory()->createVBox( this ); // Try this to get the layout created in RegUpdateRepoPage::show() at the replace point - YLayoutBox* vbox = YUI::widgetFactory()->createVBox( dialog ); + YLayoutBox* vbox = YUI::widgetFactory()->createVBox( parent ); _dialogHeading = YUI::widgetFactory()->createLabel( vbox , "YaST Initialising" ); Modified: branches/tmp/jdsn/registration/src/WizardEmulation.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/registration/src/WizardEmulation.h?rev=48808&r1=48807&r2=48808&view=diff ============================================================================== --- branches/tmp/jdsn/registration/src/WizardEmulation.h (original) +++ branches/tmp/jdsn/registration/src/WizardEmulation.h Thu Jul 3 12:07:40 2008 @@ -210,14 +210,14 @@ * * Reimplemented from YWidget. **/ - virtual int preferredWidth() { return 80; } + virtual int preferredWidth() { return 0; } /** * Preferred height of the widget. * * Reimplemented from YWidget. **/ - virtual int preferredHeight() { return 25; }; + virtual int preferredHeight() { return 0; }; /** * Set the new size of the widget. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org