[yast-commit] r57127 - in /trunk/ncurses/src: NCAskForDirectory.cc NCAskForDirectory.h NCAskForFile.cc NCAskForFile.h NCDialog.cc NCurses.h

Author: gs Date: Tue May 12 12:16:55 2009 New Revision: 57127 URL: http://svn.opensuse.org/viewcvs/yast?rev=57127&view=rev Log: partially revert changes done for usage of widgetFactory(), esp. NCursesEvent property 'widget' has to be a NCWidget * Modified: trunk/ncurses/src/NCAskForDirectory.cc trunk/ncurses/src/NCAskForDirectory.h trunk/ncurses/src/NCAskForFile.cc trunk/ncurses/src/NCAskForFile.h trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/NCurses.h Modified: trunk/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForDirectory.cc?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCAskForDirectory.cc (original) +++ trunk/ncurses/src/NCAskForDirectory.cc Tue May 12 12:16:55 2009 @@ -24,6 +24,7 @@ #include "YDialog.h" #include "YTypes.h" #include "NCWidgetFactory.h" +#include "NCWidgetFactory.h" #include "NCLayoutBox.h" #include "NCSpacing.h" #include "NCFrame.h" @@ -69,15 +70,12 @@ YLayoutBox * split = YUI::widgetFactory()->createVBox( this ); // the headline - YUI::widgetFactory()->createLabel( split, headline, - true, // isHeading = true - false ); + new NCLabel( split, headline, true, false ); // isHeading = true YFrame * frame = YUI::widgetFactory()->createFrame( split, "" ); // label for text field showing the selected dir - dirName =YUI::widgetFactory()->createComboBox( frame, _( "Selected Directory:" ), - false ); // editable = false + dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false dirName->setNotify( true ); dirName->setStretchable( YD_HORIZ, true ); @@ -85,7 +83,7 @@ YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( split ); // label for checkbox - detailed = YUI::widgetFactory()->createCheckBox( hSplit, _( "&Detailed View" ), false ); + detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); detailed->setNotify( true ); // create table header for table type T_Overview @@ -105,16 +103,16 @@ YLayoutBox * hSplit1 = YUI::widgetFactory()->createHBox( split ); YUI::widgetFactory()->createSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true - + // add the OK button - okButton = YUI::widgetFactory()->createPushButton( hSplit1, _( "&OK" ) ); + okButton = new NCPushButton( hSplit1, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); YUI::widgetFactory()->createSpacing( hSplit1, YD_HORIZ, true, 0.4 ); - + // add the Cancel button - cancelButton = YUI::widgetFactory()->createPushButton( hSplit1, _( "&Cancel" ) ); + cancelButton = new NCPushButton( hSplit1, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true ); @@ -240,7 +238,7 @@ } -bool NCAskForExistingDirectory::getCheckBoxValue( YCheckBox * checkBox ) +bool NCAskForExistingDirectory::getCheckBoxValue( NCCheckBox * checkBox ) { if ( checkBox ) { Modified: trunk/ncurses/src/NCAskForDirectory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForDirectory.h?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCAskForDirectory.h (original) +++ trunk/ncurses/src/NCAskForDirectory.h Tue May 12 12:16:55 2009 @@ -40,13 +40,13 @@ NCAskForExistingDirectory & operator=( const NCAskForExistingDirectory & ); NCAskForExistingDirectory( const NCAskForExistingDirectory & ); - YPushButton * okButton; - YPushButton * cancelButton; - YComboBox * dirName; + NCPushButton * okButton; + NCPushButton * cancelButton; + NCComboBox * dirName; NCDirectoryTable *dirList; // directory list - YCheckBox *detailed; + NCCheckBox *detailed; - bool getCheckBoxValue( YCheckBox * detailed ); + bool getCheckBoxValue( NCCheckBox * detailed ); protected: Modified: trunk/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForFile.cc?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCAskForFile.cc (original) +++ trunk/ncurses/src/NCAskForFile.cc Tue May 12 12:16:55 2009 @@ -21,10 +21,12 @@ #include "NCAskForFile.h" -#include "NCWidgetFactory.h" #include "YDialog.h" - +#include "NCWidgetFactory.h" +#include "NCLayoutBox.h" +#include "NCSpacing.h" +#include "NCFrame.h" #include "NCi18n.h" #include @@ -110,10 +112,7 @@ // the vertical split is the (only) child of the dialog YLayoutBox * split = YUI::widgetFactory()->createVBox( this ); - YUI::widgetFactory()->createLabel( split, - headline, - true, // isHeading = true - false ); + new NCLabel( split, headline, true, false ); // isHeading = true YFrame * frame = YUI::widgetFactory()->createFrame( split, "" ); @@ -126,7 +125,7 @@ YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( split ); // label for checkbox - detailed = YUI::widgetFactory()->createCheckBox( hSplit, _( "&Detailed View" ), false ); + detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); detailed->setNotify( true ); // HBox for the lists @@ -174,8 +173,7 @@ fileName->setValue( iniFileName ); // label for text field showing the filter (e.g. *.bak) - YComboBox * extension = YUI::widgetFactory()->createComboBox( hSplit2, _( "Filter:" ), - false ); // editable = false + NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), false ); // editable = false extension->setStretchable( YD_HORIZ, true ); extension->addItem( filter, true ); // selected @@ -188,14 +186,14 @@ YUI::widgetFactory()->createSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button - okButton = YUI::widgetFactory()->createPushButton( hSplit3, _( "&OK" ) ); + okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); YUI::widgetFactory()->createSpacing( hSplit3, YD_HORIZ, true, 0.4 ); // add the Cancel button - cancelButton = YUI::widgetFactory()->createPushButton( hSplit3, _( "&Cancel" ) ); + cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true ); @@ -354,7 +352,7 @@ } -bool NCAskForFile::getCheckBoxValue( YCheckBox * checkBox ) +bool NCAskForFile::getCheckBoxValue( NCCheckBox * checkBox ) { if ( checkBox ) { Modified: trunk/ncurses/src/NCAskForFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForFile.h?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCAskForFile.h (original) +++ trunk/ncurses/src/NCAskForFile.h Tue May 12 12:16:55 2009 @@ -42,13 +42,13 @@ NCAskForFile( const NCAskForFile & ); - YPushButton * okButton; - YPushButton * cancelButton; + NCPushButton * okButton; + NCPushButton * cancelButton; NCComboBox * dirName; // the selected directory NCDirectoryTable *dirList; // the directory list - YCheckBox *detailed; // the 'Details' checkbox + NCCheckBox *detailed; // the 'Details' checkbox - bool getCheckBoxValue( YCheckBox * detailed ); + bool getCheckBoxValue( NCCheckBox * detailed ); string iniFileName; // initial file name Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Tue May 12 12:16:55 2009 @@ -1269,7 +1269,7 @@ if ( wActive->isValid() ) { ret = wHandleInput( ch ); - ret.widget = dynamic_cast(wActive); + ret.widget = wActive; } return ret; @@ -1289,7 +1289,7 @@ if ( wActive->isValid() ) { ret = wHandleHotkey( key ); - ret.widget = dynamic_cast(wActive); + ret.widget = wActive; } return ret; Modified: trunk/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.h?rev=57127&r1=57126&r2=57127&view=diff ============================================================================== --- trunk/ncurses/src/NCurses.h (original) +++ trunk/ncurses/src/NCurses.h Tue May 12 12:16:55 2009 @@ -86,7 +86,7 @@ }; Type type; - YWidget * widget; + NCWidget * widget; YMenuItem * selection; // used for MenuEvent (the menu selection) string result; // can be used for any (string) result -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org