Author: sh-sh-sh Date: Fri Nov 30 17:19:46 2007 New Revision: 42562 URL: http://svn.opensuse.org/viewcvs/yast?rev=42562&view=rev Log: Removed obsolete YWidgetOpts Modified: trunk/core/libyui/src/YCPDialogParser.cc trunk/core/libyui/src/YWidgetOpt.h Modified: trunk/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPDialogParser.cc?rev=42562&r1=42561&r2=42562&view=diff ============================================================================== --- trunk/core/libyui/src/YCPDialogParser.cc (original) +++ trunk/core/libyui/src/YCPDialogParser.cc Fri Nov 30 17:19:46 2007 @@ -166,7 +166,6 @@ else if ( sym == YUIOpt_vstretch ) opt.isVStretchable.setValue( true ); else if ( sym == YUIOpt_hvstretch ) { opt.isHStretchable.setValue( true ); opt.isVStretchable.setValue( true ); } else if ( sym == YUIOpt_autoShortcut ) opt.autoShortcut.setValue( true ); - else if ( sym == YUIOpt_testMode ) opt.testMode.setValue( true ); else if ( sym == YUIOpt_boldFont ) opt.boldFont.setValue( true ); else if ( sym == YUIOpt_keyEvents ) opt.keyEvents.setValue( true ); else if ( sym == YUIOpt_key_F1 ) opt.key_Fxx.setValue( 1 ); @@ -1183,6 +1182,7 @@ { string label; string iconName; + bool isDefaultButton = false; if ( isIconButton ) { @@ -1219,7 +1219,7 @@ { string sym = optList->value(o)->asSymbol()->symbol(); - if ( sym == YUIOpt_default ) opt.isDefaultButton.setValue( true ); + if ( sym == YUIOpt_default ) isDefaultButton = true; else logUnknownOption( term, optList->value(o) ); } else logUnknownOption( term, optList->value(o) ); @@ -1227,7 +1227,7 @@ YPushButton * button = YUI::widgetFactory()->createPushButton( parent, label ); - if ( opt.isDefaultButton.value() ) + if ( isDefaultButton ) button->setDefaultButton(); if ( isIconButton ) Modified: trunk/core/libyui/src/YWidgetOpt.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidgetOpt.h?rev=42562&r1=42561&r2=42562&view=diff ============================================================================== --- trunk/core/libyui/src/YWidgetOpt.h (original) +++ trunk/core/libyui/src/YWidgetOpt.h Fri Nov 30 17:19:46 2007 @@ -124,18 +124,13 @@ YBoolOpt isVStretchable; YBoolOpt autoShortcut; YBoolOpt keyEvents; - YBoolOpt testMode; - YBoolOpt boldFont; // YCheckBox, YRadioButton, YLabel // Widget-specific options // // See the respective widget doc in YCPDialogParser::parse???() - YBoolOpt isDefaultButton; // YPushButton - YBoolOpt isOutputField; // YLabel - YBoolOpt autoScrollDown; // YRichText - YBoolOpt plainTextMode; // YRichText + YBoolOpt boldFont; // YCheckBox, YRadioButton, YLabel YLongOpt key_Fxx; // YPushButton: No. of F-Key (1..24), 0 if none }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org