[yast-commit] r43158 - in /trunk/core/libyui: doc/examples/ src/

Author: coolo Date: Tue Dec 18 14:51:42 2007 New Revision: 43158 URL: http://svn.opensuse.org/viewcvs/yast?rev=43158&view=rev Log: adding another optional widget: timezone selector So far it's only implemented in the Qt UI and provides a graphical map interface Added: trunk/core/libyui/doc/examples/TimezoneSelector.ycp - copied, changed from r43156, branches/tmp/coolo/zone/core/libyui/doc/examples/TimezoneSelector.ycp trunk/core/libyui/src/YTimezoneSelector.cc - copied unchanged from r43156, branches/tmp/coolo/zone/core/libyui/src/YTimezoneSelector.cc trunk/core/libyui/src/YTimezoneSelector.h - copied unchanged from r43156, branches/tmp/coolo/zone/core/libyui/src/YTimezoneSelector.h Modified: trunk/core/libyui/src/Makefile.am trunk/core/libyui/src/YCPDialogParser.cc trunk/core/libyui/src/YCPDialogParser.h trunk/core/libyui/src/YOptionalWidgetFactory.cc trunk/core/libyui/src/YOptionalWidgetFactory.h trunk/core/libyui/src/YUISymbols.h trunk/core/libyui/src/YUI_builtins.cc Copied: trunk/core/libyui/doc/examples/TimezoneSelector.ycp (from r43156, branches/tmp/coolo/zone/core/libyui/doc/examples/TimezoneSelector.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/doc/examples/TimezoneSelector.ycp?p2=trunk/core/libyui/doc/examples/TimezoneSelector.ycp&p1=branches/tmp/coolo/zone/core/libyui/doc/examples/TimezoneSelector.ycp&r1=43156&r2=43158&rev=43158&view=diff ============================================================================== --- branches/tmp/coolo/zone/core/libyui/doc/examples/TimezoneSelector.ycp (original) +++ trunk/core/libyui/doc/examples/TimezoneSelector.ycp Tue Dec 18 14:51:42 2007 @@ -1,4 +1,6 @@ { + import "Directory"; + // Build a dialog with a "special" widget - one that may not be supported // by all UIs. @@ -53,7 +55,7 @@ // Only create a dialog with this kind of widget if it is supported UI::OpenDialog( `VBox( - `TimezoneSelector(`id(`timezone), `opt(`notify), "/home/col/prod/yast2/core/libyui/doc/examples/earth_2400.jpg", examples), + `TimezoneSelector(`id(`timezone), `opt(`notify), Directory::themedir + "/current/worldmap/GLOBALeb10colshade.jpg", examples), `PushButton(`id(`ok), `opt(`default), "&Close"), `ComboBox(`id(`combozone), `opt(`notify), "", Modified: trunk/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/Makefile.am?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/Makefile.am (original) +++ trunk/core/libyui/src/Makefile.am Tue Dec 18 14:51:42 2007 @@ -87,6 +87,7 @@ YSquash.cc \ YTable.cc \ YTimeField.cc \ + YTimezoneSelector.cc \ YTree.cc \ YWizard.cc \ \ @@ -187,6 +188,7 @@ YSquash.h \ YTable.h \ YTimeField.h \ + YTimezoneSelector.h \ YTree.h \ YWizard.h \ \ Modified: trunk/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPDialogParser.cc?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YCPDialogParser.cc (original) +++ trunk/core/libyui/src/YCPDialogParser.cc Tue Dec 18 14:51:42 2007 @@ -79,6 +79,7 @@ #include "YTimeField.h" #include "YTree.h" #include "YWizard.h" +#include "YTimezoneSelector.h" using std::string; @@ -280,6 +281,7 @@ else if ( s == YUISpecialWidget_Time ) w = parseTimeField ( p, opt, term, ol, n ); else if ( s == YUISpecialWidget_TimeField ) w = parseTimeField ( p, opt, term, ol, n ); else if ( s == YUISpecialWidget_Wizard ) w = parseWizard ( p, opt, term, ol, n ); + else if ( s == YUISpecialWidget_TimezoneSelector ) w = parseTimezoneSelector ( p, opt, term, ol, n ); else { YUI_THROW( YUIException( string( "Unknown widget type " ) + s.c_str() ) ); @@ -3259,6 +3261,51 @@ return wizard; } +/** + * @widgets TimezoneSelector + * @short Timezone selector map + * @class YTimezoneSelector + * + * @arg string pixmap path to a jpg or png of a world map - with 0°0° being the + * middle of the picture + * @arg map timezones a map of timezones. The map should be between e.g. Europe/London + * and the tooltip to be displayed ("United Kingdom") + * + * @usage if ( HasSpecialWidget( `TimezoneSelector ) {... + * `TimezoneSelector( "world.jpg", timezones ) + * + * @description + * An graphical timezone selector map + * + * @note This is a "special" widget, i.e. not all UIs necessarily support it. Check + * for availability with <tt>HasSpecialWidget( `TimezoneSelector)</tt> before using it. + **/ +YWidget * +YCPDialogParser::parseTimezoneSelector( YWidget * parent, YWidgetOpt & opt, + const YCPTerm & term, const YCPList & optList, int argnr ) +{ + + if ( term->size() - argnr != 2 + || !term->value(argnr)->isString() + || !term->value(argnr+1)->isMap() ) + { + y2error( "Invalid arguments for the TimezoneSelector widget: %s", + term->toString().c_str() ); + return 0; + } + + rejectAllOptions( term, optList ); + + string pixmap = term->value( argnr )->asString()->value(); + map zones; + YCPMap secondArg = term->value( argnr+1 )->asMap(); + for ( YCPMapIterator it = secondArg.begin(); it != secondArg.end(); ++it ) + zones[ it.key()->asString()->value() ] = it.value()->asString()->value(); + + YTimezoneSelector * selector = YUI::optionalWidgetFactory()->createTimezoneSelector( parent, pixmap, zones ); + + return selector; +} Modified: trunk/core/libyui/src/YCPDialogParser.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPDialogParser.h?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YCPDialogParser.h (original) +++ trunk/core/libyui/src/YCPDialogParser.h Tue Dec 18 14:51:42 2007 @@ -265,6 +265,9 @@ static YWidget * parseSimplePatchSelector( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); + static YWidget * parseTimezoneSelector ( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, + const YCPList & optList, int argnr ); + /** * Look for a widget id in a widget term. If it finds one, returns * it and sets argnr to 1, otherwise it creates a new unique widget Modified: trunk/core/libyui/src/YOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YOptionalWidgetFactory.cc?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YOptionalWidgetFactory.cc (original) +++ trunk/core/libyui/src/YOptionalWidgetFactory.cc Tue Dec 18 14:51:42 2007 @@ -228,3 +228,15 @@ return YUI::widgetFactory()->createOutputField( parent, "YDummySpecialWidget" ); } +bool YOptionalWidgetFactory::hasTimezoneSelector() +{ + return false; +} + +YTimezoneSelector * +YOptionalWidgetFactory::createTimezoneSelector( YWidget * parent, + const string & map, + const map& zones) +{ + THROW_UNSUPPORTED( "YTimezoneSelector" ); +} Modified: trunk/core/libyui/src/YOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YOptionalWidgetFactory.h?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YOptionalWidgetFactory.h (original) +++ trunk/core/libyui/src/YOptionalWidgetFactory.h Tue Dec 18 14:51:42 2007 @@ -38,7 +38,7 @@ class YSlider; class YTimeField; class YWidget; - +class YTimezoneSelector; /** * Abstract widget factory for optional ("special") widgets. @@ -115,7 +115,10 @@ bool hasDummySpecialWidget(); YWidget * createDummySpecialWidget( YWidget * parent ); - + virtual bool hasTimezoneSelector(); + virtual YTimezoneSelector * createTimezoneSelector( YWidget * parent, + const string & pixmap, + const map & timezones ); protected: Modified: trunk/core/libyui/src/YUISymbols.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUISymbols.h?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YUISymbols.h (original) +++ trunk/core/libyui/src/YUISymbols.h Tue Dec 18 14:51:42 2007 @@ -143,6 +143,7 @@ #define YUISpecialWidget_Time "Time" #define YUISpecialWidget_TimeField "TimeField" #define YUISpecialWidget_Wizard "Wizard" +#define YUISpecialWidget_TimezoneSelector "TimezoneSelector" // Widget properties Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?rev=43158&r1=43157&r2=43158&view=diff ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Tue Dec 18 14:51:42 2007 @@ -98,6 +98,7 @@ else if ( symbol == YUISpecialWidget_Wizard ) hasWidget = fact->hasWizard(); else if ( symbol == YUISpecialWidget_Date ) hasWidget = fact->hasDateField(); else if ( symbol == YUISpecialWidget_Time ) hasWidget = fact->hasTimeField(); + else if ( symbol == YUISpecialWidget_TimezoneSelector ) hasWidget = fact->hasTimezoneSelector(); else { y2error( "HasSpecialWidget(): Unknown special widget: %s", symbol.c_str() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org