Author: sh-sh-sh Date: Tue Jun 26 17:43:04 2007 New Revision: 39038 URL: http://svn.opensuse.org/viewcvs/yast?rev=39038&view=rev Log: migrated PkgSpecial Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQUI.h branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Tue Jun 26 17:43:04 2007 @@ -2429,9 +2429,9 @@ } rejectAllOptions( term,optList ); - YCPString subwidget = term->value( argnr )->asString(); + string subwidgetName = term->value( argnr )->asString()->value(); - return YUI::ui()->createPkgSpecial( parent, opt, subwidget ); + return YUI::widgetFactory()->createPkgSpecial( parent, subwidgetName ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI.h?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Tue Jun 26 17:43:04 2007 @@ -460,7 +460,6 @@ virtual YWidget *createImage( YWidget *parent, YWidgetOpt & opt, YCPString file_name, YCPString defaulttext ) = 0; virtual YWidget *createIntField( YWidget *parent, YWidgetOpt & opt, const YCPString & label, int minValue, int maxValue, int initialValue ) = 0; virtual YWidget *createPackageSelector( YWidget *parent, YWidgetOpt & opt, const YCPString & floppyDevice ) = 0; - virtual YWidget *createPkgSpecial( YWidget *parent, YWidgetOpt & opt, const YCPString & subwidget ) = 0; // FIXME: Obsolete // FIXME: Obsolete // FIXME: Obsolete Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Tue Jun 26 17:43:04 2007 @@ -42,7 +42,6 @@ class YMenuButton; class YMultiLineEdit; class YPackageSelector; -class YPkgSpecial; class YProgressBar; class YPushButton; class YRadioButton; @@ -117,7 +116,7 @@ virtual YSelectionBox * createMultiSelectionBox ( YWidget * parent, const string & label ) = 0; virtual YPackageSelector * createPackageSelector ( YWidget * parent ) = 0; - virtual YPkgSpecial * createPkgSpecial ( YWidget * parent ) = 0; // NCurses only + virtual YWidget * createPkgSpecial ( YWidget * parent, const string & subwidgetName ) = 0; // NCurses only // // Layout Helpers Modified: branches/tmp/sh/mod-ui/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI.h?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI.h Tue Jun 26 17:43:04 2007 @@ -444,8 +444,6 @@ /*** Widget creation methods, all reimplemented from YUI ***/ - YContainerWidget * createWeight ( YWidget * parent, YWidgetOpt & opt, YUIDimension dim, long weight); - YWidget * createComboBox ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); YWidget * createImage ( YWidget * parent, YWidgetOpt & opt, YCPByteblock imageData, YCPString fallbackText ); YWidget * createImage ( YWidget * parent, YWidgetOpt & opt, YCPString fileName, YCPString fallbackText ); @@ -460,7 +458,6 @@ YWidget * createMultiSelectionBox ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); YWidget * createTable ( YWidget * parent, YWidgetOpt & opt, vector<string> header); YWidget * createTree ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); - YWidget * createPkgSpecial ( YWidget * parent, YWidgetOpt & opt, const YCPString & subwidget ); /*** Widget creation methods for optional widgets, all reimplemented from YUI ***/ Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Tue Jun 26 17:43:04 2007 @@ -136,14 +136,6 @@ } -YWidget * YQUI::createPkgSpecial ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & subwidget ) -{ - y2error( "The Qt UI does not support PkgSpecial subwidgets!" ); - return 0; -} - YWidget * YQUI::createMenuButton ( YWidget * parent, YWidgetOpt & opt, Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Tue Jun 26 17:43:04 2007 @@ -255,8 +255,8 @@ -YPkgSpecial * -YQWidgetFactory::createPkgSpecial( YWidget * parent ) +YWidget * +YQWidgetFactory::createPkgSpecial( YWidget * , const string & ) { YUI_THROW( YUIUnsupportedWidgetException( "YQPkgSpecial" ) ); // NCurses only return 0; Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h?rev=39038&r1=39037&r2=39038&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Tue Jun 26 17:43:04 2007 @@ -106,7 +106,7 @@ virtual YQSelectionBox * createMultiSelectionBox ( YWidget * parent, const string & label ); virtual YQPackageSelector * createPackageSelector ( YWidget * parent ); - virtual YPkgSpecial * createPkgSpecial ( YWidget * parent ); // NCurses only, will throw exception in the Qt UI + virtual YWidget * createPkgSpecial ( YWidget * parent, const string & name ); // NCurses only, will throw exception in the Qt UI // // Layout Helpers -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org