Author: gs Date: Thu Sep 27 16:26:58 2007 New Revision: 41149 URL: http://svn.opensuse.org/viewcvs/yast?rev=41149&view=rev Log: remove obsolete code Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc?rev=41149&r1=41148&r2=41149&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Thu Sep 27 16:26:58 2007 @@ -334,59 +334,9 @@ dlg->closeDialog(); } -/////////////////////////////////////////////////////////////////// -// -// Widget creation functions - container widgets -// -/////////////////////////////////////////////////////////////////// - #define ONCREATE WIDDBG << endl //#define ONCREATE -#if 0 -YLayoutBox * YNCursesUI::createSplit( YWidget * parent, YWidgetOpt & opt, - YUIDimension dimension ) -{ - ONCREATE; - return new NCLayoutBox( parent, dimension ); -} - -YSingleChildContainerWidget * YNCursesUI::createReplacePoint( YWidget * parent ) -{ - ONCREATE; - return new NCReplacePoint( parent ); -} - -YSingleChildContainerWidget * YNCursesUI::createAlignment( YWidget * parent, - YAlignmentType halign, - YAlignmentType valign ) -{ - ONCREATE; - return new NCAlignment( parent, halign, valign ); -} - -YSingleChildContainerWidget * YNCursesUI::createSquash( YWidget * parent, - bool hsquash, - bool vsquash ) -{ - ONCREATE; - return new NCSquash( parent, hsquash, vsquash ); -} - -YSingleChildContainerWidget * YNCursesUI::createFrame( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCFrame( parent, label ); -} - -YSingleChildContainerWidget * YNCursesUI::createCheckBoxFrame( YWidget * parent, - const string & label, bool checked ) -{ - ONCREATE; - return new NCCheckBoxFrame( parent, label, checked ); -} -#endif /////////////////////////////////////////////////////////////////// // @@ -394,31 +344,6 @@ // /////////////////////////////////////////////////////////////////// -#if 0 -YWidget * YNCursesUI::createEmpty( YWidget * parent ) -{ - ONCREATE; - return new NCEmpty( parent ); -} - - -YWidget * YNCursesUI::createSpacing( YWidget * parent, - YUIDimension dim, - bool stretchable, - YLayoutSize_t layoutUnits ) -{ - ONCREATE; - return new NCSpacing( parent, dim, stretchable, layoutUnits ); -} - -YWidget * YNCursesUI::createLabel( YWidget * parent, const string & text, - bool isHeading, bool isOutputField ) -{ - ONCREATE; - return new NCLabel( parent, text, isHeading, isOutputField ); -} - -#endif YWidget * YNCursesUI::createLogView( YWidget * parent, YWidgetOpt & opt, const YCPString & label, @@ -429,14 +354,6 @@ return new NCLogView( parent, opt, label, visibleLines, maxLines ); } -#if 0 -YWidget * YNCursesUI::createPushButton( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCPushButton( parent, label ); -} -#endif YWidget * YNCursesUI::createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ) @@ -445,59 +362,6 @@ return new NCMenuButton( parent, opt, label ); } -#if 0 -YWidget * YNCursesUI::createRadioButton( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCRadioButton( parent, label ); -} - -YWidget * YNCursesUI::createCheckBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - bool checked ) -{ - ONCREATE; - return new NCCheckBox( parent, opt, label, checked ); -} - -YWidget * YNCursesUI::createInputField( YWidget * parent, - const string & label, - bool passwordMode ) -{ - ONCREATE; - return new NCInputField( parent, label, passwordMode ); -} - -YWidget * YNCursesUI::createSelectionBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCSelectionBox( parent, opt, label ); -} - -YWidget * YNCursesUI::createMultiSelectionBox( YWidget *parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCMultiSelectionBox( parent, opt, label ); -} - -YWidget * YNCursesUI::createComboBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCComboBox( parent, opt, label ); -} - - -YWidget * YNCursesUI::createTree( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCTree( parent, opt, label ); -} -#endif YWidget * YNCursesUI::createTable( YWidget * parent, YWidgetOpt & opt, vector<string> header ) @@ -507,16 +371,6 @@ return new NCTable( parent, opt, header, true ); } -#if 0 -YWidget * YNCursesUI::createProgressBar( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxprogress, - const YCPInteger & progress ) -{ - ONCREATE; - return new NCProgressBar( parent, opt, label, maxprogress, progress ); -} -#endif YWidget * YNCursesUI::createIntField( YWidget * parent, YWidgetOpt & opt, const YCPString & label, @@ -559,56 +413,6 @@ return plugin; } -#if 0 -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::createPackageSelector -// METHOD TYPE : YWidget -// -// DESCRIPTION : Calls NCPackageSelectorPlugin::createPackageSelector -// -YWidget * YNCursesUI::createPackageSelector( YWidget * parent, - YWidgetOpt & opt, - const YCPString & floppyDevice ) -{ - ONCREATE; - YWidget * w = 0; - - NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - - if ( plugin ) - { - w = plugin->createPackageSelector( parent, opt ); - } - - return w; -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::createPkgSpecial -// METHOD TYPE : YWidget -// -// DESCRIPTION : creates special widgets used for the package selection -// dialog (which do not have a corresponding widget in qt-ui) -// -YWidget * YNCursesUI::createPkgSpecial( YWidget *parent, YWidgetOpt &opt, const YCPString &subwidget ) -{ - ONCREATE; - YWidget * w = 0; - - NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - - if ( plugin ) - { - w = plugin->createPkgSpecial( parent, opt, subwidget ); - } - - return w; -} -#endif /////////////////////////////////////////////////////////////////// // Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h?rev=41149&r1=41148&r2=41149&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Thu Sep 27 16:26:58 2007 @@ -136,77 +136,6 @@ */ virtual void closeDialog( YDialog * dialog ); - // - // Widget creation functions - container widgets - // -#if 0 - /** - * Creates a split - */ - virtual YLayoutBox * createSplit( YWidget * parent, YWidgetOpt & opt, - YUIDimension dimension ); - - /** - * Creates a replace point. - */ - virtual YSingleChildContainerWidget * createReplacePoint( YWidget * parent ); - - /** - * Creates an alignment widget - */ - virtual YSingleChildContainerWidget * createAlignment( YWidget * parent, - YAlignmentType halign, - YAlignmentType valign); - - /** - * Creates a squash widget - */ - virtual YSingleChildContainerWidget * createSquash( YWidget * parent, - bool hsquash, - bool vsquash ); - - /** - * Creates a radio button group. - */ - // virtual YContainerWidget * createRadioButtonGroup( YWidget * parent, YWidgetOpt & opt ); - - /** - * Creates a frame widget - */ - virtual YSingleChildContainerWidget * createFrame( YWidget * parent, - const string & label ); - - virtual YSingleChildContainerWidget * createCheckBoxFrame( YWidget * parent, - const string & label, - bool checked ); - // - // Widget creation functions - leaf widgets - // - - /** - * Creates an empty widget - */ - virtual YWidget * createEmpty( YWidget * parent ); - - /** - * Creates a spacing widget - */ - virtual YWidget * createSpacing( YWidget * parent, - YUIDimension dim, - bool stretchable, - YLayoutSize_t layoutUnits ); - - /** - * Creates a label. - * @param text Initial text of the label - * @param heading true if the label is a Heading() - * @param output_field true if the label should look like an output field (3D look) - */ - virtual YWidget * createLabel( YWidget * parent, const string & text, - bool isHeading, bool isOutputField ); - -#endif - /** * Creates a log view widget * @param label label above the log view @@ -217,15 +146,6 @@ const YCPString & label, int visibleLines, int maxLines ); -#if 0 - /** - * Creates a push button. - * @param label Label of the button - * @param default_button true if the button should be the dialogs default button - */ - virtual YWidget * createPushButton( YWidget * parent, - const string & label ); -#endif /** * Creates a menu button. @@ -234,86 +154,12 @@ virtual YWidget * createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ); -#if 0 - /** - * Creates a radio button and inserts it into a radio button group - * @param label Label of the radio button - * @param rbg the radio button group the new button will belong to - */ - virtual YWidget * createRadioButton( YWidget * parent, - const string & label ); - - /** - * Creates a check box - * @param label Label of the checkbox - * @param true if it is checked - */ - virtual YWidget * createCheckBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - bool checked ); - - /** - * Creates a text entry or password entry field. - */ - virtual YWidget * createInputField( YWidget * parent, - const string & label, - bool passwordMode ); - - /** - * Creates a selection box - */ - virtual YWidget * createSelectionBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a multi selection box - */ - virtual YWidget * createMultiSelectionBox( YWidget *parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a combo box - */ - virtual YWidget * createComboBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a tree - */ - virtual YWidget * createTree( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); -#endif - /** * Creates a table widget */ virtual YWidget * createTable( YWidget * parent, YWidgetOpt & opt, vector<string> header ); -#if 0 - /** - * Creates a progress bar - */ - virtual YWidget * createProgressBar( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxprogress, - const YCPInteger & progress); - - /** - * Creates an image widget from a YCP byteblock - */ - virtual YWidget * createImage( YWidget * parent, YWidgetOpt & opt, - YCPByteblock imagedata, - YCPString defaulttext); - - /** - * Creates an image widget from a YCP byteblock - */ - virtual YWidget * createImage( YWidget * parent, YWidgetOpt & opt, - YCPString filename, - YCPString defaulttext); - -#endif /** * Creates an IntField widget. */ @@ -321,21 +167,6 @@ const YCPString & label, int minValue, int maxValue, int initialValue ); -#if 0 - /** - * Creates the PackageSelector widget (i.e. a widget tree). - */ - virtual YWidget * createPackageSelector( YWidget *parent, - YWidgetOpt &opt, - const YCPString & floppyDevice ); - /** - * Creates a special subwidget used for Package Selection (which doesn't exist in QT-UI). - */ - virtual YWidget * createPkgSpecial( YWidget *parent, - YWidgetOpt &opt, - const YCPString &subwidget ); - -#endif /** * Fills the PackageSelector widget. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org