December 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r54314 - in /trunk/core: libycp/src/ libycp/testsuite/tests/builtin/ package/
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 19:49:36 2008 New Revision: 54314 URL: http://svn.opensuse.org/viewcvs/yast?rev=54314&view=rev Log: - added isempty builtin for string, list and map Modified: trunk/core/libycp/src/YCPBuiltinList.cc trunk/core/libycp/src/YCPBuiltinMap.cc trunk/core/libycp/src/YCPBuiltinString.cc trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.err trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.out trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp trunk/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp trunk/core/libycp/testsuite/tests/builtin/Builtin-String.err trunk/core/libycp/testsuite/tests/builtin/Builtin-String.out trunk/core/libycp/testsuite/tests/builtin/Builtin-String.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinList.c… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinList.cc (original) +++ trunk/core/libycp/src/YCPBuiltinList.cc Sat Dec 20 19:49:36 2008 @@ -914,6 +914,27 @@ } +static YCPValue +l_isempty(const YCPList& l) +{ + /** + * @builtin isempty + * @id isempty-list + * @short Returns whether the list <tt>l</tt> is empty. + * @param list l List + * @return boolean Emptiness of list <tt>l</tt> + * + * @description + * Notice that the list <tt>l</tt> must not be nil. + * + * @usage isempty([]) -> true + * @usage isempty([19, 29]) -> false + */ + + return YCPBoolean(l->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue l_size (const YCPValue &list) @@ -1352,6 +1373,7 @@ { "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <any> (const list <any>, any)", (void *)l_add }, + { "isempty", "boolean (const list <any>)", (void *)l_isempty }, { "size", "integer (const list <any>)", (void *)l_size, DECL_NIL }, { "remove", "list <flex> (const list <flex>, const integer)", (void *)l_remove, DECL_FLEX }, { "select", "flex (const list <flex>, integer, flex)", (void *)l_select, DECL_NIL|DECL_FLEX }, Modified: trunk/core/libycp/src/YCPBuiltinMap.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinMap.cc… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinMap.cc (original) +++ trunk/core/libycp/src/YCPBuiltinMap.cc Sat Dec 20 19:49:36 2008 @@ -361,6 +361,27 @@ } +static YCPValue +m_isempty(const YCPMap& m) +{ + /** + * @builtin isempty + * @id isempty-map + * @short Returns whether the map <tt>m</tt> is empty. + * @param map m Map + * @return boolean Emptiness of map <tt>m</tt> + * + * @description + * Notice that the map <tt>m</tt> must not be nil. + * + * @usage isempty($[]) -> true + * @usage isempty($[ `host : "pandora" ]) -> false + */ + + return YCPBoolean(m->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue m_size (const YCPValue &map) @@ -547,6 +568,7 @@ { "+", "map <any,any> (const map <any,any>, const map <any,any>)", (void *)m_unionmap }, { "add", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_addmap, DECL_FLEX }, { "change", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_changemap,DECL_FLEX|DECL_DEPRECATED }, + { "isempty", "boolean (const map <any,any>)", (void *)m_isempty }, { "size", "integer (const map <any,any>)", (void *)m_size, DECL_NIL }, { "foreach","flex1 (variable <flex2>, variable <flex3>, const map <flex2,flex3>, const block <flex1>)", (void *)m_foreach, DECL_LOOP|DECL_SYMBOL|DECL_FLEX }, { "tomap", "map <any,any> (const any)", (void *)m_tomap, DECL_FLEX }, Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Sat Dec 20 19:49:36 2008 @@ -58,6 +58,27 @@ static YCPValue +s_isempty(const YCPString& s) +{ + /** + * @builtin isempty + * @id isempty-string + * @short Returns whether the string <tt>s</tt> is empty. + * @param string s String + * @return boolean Emptiness of string <tt>s</tt> + * + * @description + * Notice that the string <tt>s</tt> must not be nil. + * + * @usage isempty("") -> true + * @usage isempty("test") -> false + */ + + return YCPBoolean(s->isEmpty()); +} + + +static YCPValue s_size (const YCPString &s) { /** @@ -1488,6 +1509,7 @@ { "tostring", "string (any)", (void *)s_tostring }, { "tohexstring", "string (integer)", (void *)s_tohexstring1 }, { "tohexstring", "string (integer, integer)", (void *)s_tohexstring2 }, + { "isempty", "boolean (string)", (void *)s_isempty }, { "size", "integer (string)", (void *)s_size }, { "find", "integer (string, string)", (void *)s_find, DECL_DEPRECATED }, { "search", "integer (string, string)", (void *)s_search }, Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.err Sat Dec 20 19:49:36 2008 @@ -124,6 +124,23 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-List2.ycp:72 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -166,12 +183,12 @@ ---------------------------------------------------------------------- "** change **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:90 Warning: change(...) is deprecated, please fix +[Parser] tests/builtin/Builtin-List2.ycp:97 Warning: change(...) is deprecated, please fix Parsed: ---------------------------------------------------------------------- change ([1, 4], 8) ---------------------------------------------------------------------- -[libycp] tests/builtin/Builtin-List2.ycp:90 Change does not work as expected! The argument is not passed by reference. +[libycp] tests/builtin/Builtin-List2.ycp:97 Change does not work as expected! The argument is not passed by reference. Parsed: ---------------------------------------------------------------------- "** remove **" @@ -184,34 +201,34 @@ ---------------------------------------------------------------------- remove ([], 0) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Index 0 for remove () out of range +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Index 0 for remove () out of range Parsed: ---------------------------------------------------------------------- "** select **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:101 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:108 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][-1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:102 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:109 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][0]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:103 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:110 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:104 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:111 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][3]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:105 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:112 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- /* any -> string */[1, "two"][0]:"wrong type" ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Can't convert value '1' to type 'string' +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Can't convert value '1' to type 'string' Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.out Sat Dec 20 19:49:36 2008 @@ -27,6 +27,10 @@ ([true, 1, 1, 2]) ([8, 6, 3, 2]) ([8, 6, 3, 2]) +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (3) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp Sat Dec 20 19:49:36 2008 @@ -65,6 +65,13 @@ (sort (`x, `y, [ 3, 6, 2, 8 ], ``(x>y))) +("** isempty **") + +(isempty ([])) +(isempty ([1, 2, 3])) +(isempty ((list) nil)) + + ("** size **") (size ([])) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp Sat Dec 20 19:49:36 2008 @@ -75,6 +75,13 @@ (add ($[`a: 17, `b: 11], `b, nil)) +("** isempty **") + +(isempty ($[])) +(isempty ($[1:"a", 2:"b"])) +(isempty ((map) nil)) + + ("** size **") (size ($[])) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-String.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-String.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-String.err Sat Dec 20 19:49:36 2008 @@ -1,5 +1,22 @@ Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("linux") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:15 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -12,6 +29,11 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +size (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:22 Argument (nil) to size(...) is nil +Parsed: +---------------------------------------------------------------------- "** plus **" ---------------------------------------------------------------------- Parsed: @@ -94,7 +116,7 @@ ---------------------------------------------------------------------- substring ("some text", 42) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:48 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:56 Substring index out of range Parsed: ---------------------------------------------------------------------- substring ("some text", 5, 2) @@ -103,7 +125,7 @@ ---------------------------------------------------------------------- substring ("some text", 42, 2) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:51 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:59 Substring index out of range Parsed: ---------------------------------------------------------------------- "** lsubstring **" @@ -116,7 +138,7 @@ ---------------------------------------------------------------------- lsubstring ("some text", 42) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:57 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:65 Substring index out of range Parsed: ---------------------------------------------------------------------- lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5) @@ -129,7 +151,7 @@ ---------------------------------------------------------------------- lsubstring ("some text", 42, 2) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:61 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:69 Substring index out of range Parsed: ---------------------------------------------------------------------- lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5, 2) @@ -146,9 +168,9 @@ ---------------------------------------------------------------------- mergestring (["abc", "dev", "ghi", ""], "/") ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-String.ycp:69 No match for 'mergestring : <unspec> (list, string)' -[Parser] tests/builtin/Builtin-String.ycp:69 Please fix parameter types to match one of: -[Parser] tests/builtin/Builtin-String.ycp:69 'mergestring : string (const list <string>, string)' -[Parser] tests/builtin/Builtin-String.ycp:69 Wrong parameters in call to mergestring(...) -[Parser] tests/builtin/Builtin-String.ycp:69 Expected '(const list <string>, string)', seen '(list, string)'. +[Parser] tests/builtin/Builtin-String.ycp:77 No match for 'mergestring : <unspec> (list, string)' +[Parser] tests/builtin/Builtin-String.ycp:77 Please fix parameter types to match one of: +[Parser] tests/builtin/Builtin-String.ycp:77 'mergestring : string (const list <string>, string)' +[Parser] tests/builtin/Builtin-String.ycp:77 Wrong parameters in call to mergestring(...) +[Parser] tests/builtin/Builtin-String.ycp:77 Expected '(const list <string>, string)', seen '(list, string)'. runycp: parser error Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-String.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-String.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-String.out Sat Dec 20 19:49:36 2008 @@ -1,6 +1,11 @@ +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (5) +(nil) ("** plus **") ("YaST2") ("YaST2") Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-String.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-String.ycp Sat Dec 20 19:49:36 2008 @@ -8,10 +8,18 @@ # --------------------------------------------------------- +("** isempty **") + +(isempty ("")) +(isempty ("linux")) +(isempty ((string) nil)) + + ("** size **") (size ("")) (size ("linux")) +(size ((string) nil)) ("** plus **") Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Sat Dec 20 19:49:36 2008 @@ -2,6 +2,7 @@ Sat Dec 20 10:45:55 CET 2008 - aschnell(a)suse.de - added tosymbol builtin (bnc #192389) +- added isempty builtin for string, list and map - 2.18.0 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54313 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 19:15:02 2008 New Revision: 54313 URL: http://svn.opensuse.org/viewcvs/yast?rev=54313&view=rev Log: - removed dots Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Sat Dec 20 19:15:02 2008 @@ -219,7 +219,7 @@ Change your partitioning? "), deletechars(_("Create New Partition Table"), "&"), - deletechars(_("Expert.."), "&"))); + deletechars(_("Expert"), "&"))); if (ret == true) retval = `again; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54312 - in /trunk/core/libycp/src: YCPMap.cc YCPString.cc include/ycp/YCPMap.h include/ycp/YCPString.h
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 17:21:36 2008 New Revision: 54312 URL: http://svn.opensuse.org/viewcvs/yast?rev=54312&view=rev Log: - added isEmpty for YCPString and YCPMap Modified: trunk/core/libycp/src/YCPMap.cc trunk/core/libycp/src/YCPString.cc trunk/core/libycp/src/include/ycp/YCPMap.h trunk/core/libycp/src/include/ycp/YCPString.h Modified: trunk/core/libycp/src/YCPMap.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPMap.cc?rev=54… ============================================================================== --- trunk/core/libycp/src/YCPMap.cc (original) +++ trunk/core/libycp/src/YCPMap.cc Sat Dec 20 17:21:36 2008 @@ -113,6 +113,13 @@ } +bool +YCPMapRep::isEmpty() const +{ + return stl_map.empty(); +} + + long YCPMapRep::size() const { Modified: trunk/core/libycp/src/YCPString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPString.cc?rev… ============================================================================== --- trunk/core/libycp/src/YCPString.cc (original) +++ trunk/core/libycp/src/YCPString.cc Sat Dec 20 17:21:36 2008 @@ -33,6 +33,14 @@ { } + +bool +YCPStringRep::isEmpty() const +{ + return v.empty(); +} + + string YCPStringRep::value() const { Modified: trunk/core/libycp/src/include/ycp/YCPMap.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPM… ============================================================================== --- trunk/core/libycp/src/include/ycp/YCPMap.h (original) +++ trunk/core/libycp/src/include/ycp/YCPMap.h Sat Dec 20 17:21:36 2008 @@ -82,6 +82,11 @@ void remove(const YCPValue& key); /** + * Returns true, iff this map is empty. + */ + bool isEmpty() const; + + /** * Returns the number of key/value pairs. */ long size() const; @@ -212,6 +217,7 @@ void add(const YCPValue& key, const YCPValue& value) { ELEMENT->add (key,value); } YCPMap functionalAdd(const YCPValue& key, const YCPValue& value) const { return CONST_ELEMENT-> functionalAdd (key,value); } void remove(const YCPValue& key) { ELEMENT-> remove (key); } + bool isEmpty() const { return CONST_ELEMENT->isEmpty(); } long size() const { return CONST_ELEMENT-> size (); } YCPValue value(const YCPValue& key) const { return CONST_ELEMENT-> value (key); } YCPMapIterator begin() const { return CONST_ELEMENT-> begin (); } Modified: trunk/core/libycp/src/include/ycp/YCPString.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPS… ============================================================================== --- trunk/core/libycp/src/include/ycp/YCPString.h (original) +++ trunk/core/libycp/src/include/ycp/YCPString.h Sat Dec 20 17:21:36 2008 @@ -53,6 +53,12 @@ YCPStringRep(string s); public: + + /** + * Returns true, iff this string is empty. + */ + bool isEmpty() const; + /** * Returns the value of this object in form of a C++ * string value. @@ -94,6 +100,9 @@ YCPValueType valuetype() const; }; + +#define CONST_ELEMENT (static_cast<const YCPStringRep*>(element)) + /** * @short Wrapper for YCPStringRep * This class realizes an automatic memory management @@ -106,7 +115,11 @@ public: YCPString(string s) : YCPValue(new YCPStringRep(s)) {} YCPString(bytecodeistream & str); + + bool isEmpty() const { return CONST_ELEMENT->isEmpty(); } }; +#undef CONST_ELEMENT + #endif // YCPString_h -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54311 - /trunk/storage/storage/src/modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 14:41:07 2008 New Revision: 54311 URL: http://svn.opensuse.org/viewcvs/yast?rev=54311&view=rev Log: - use Region::Start/End Modified: trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Sat Dec 20 14:41:07 2008 @@ -18,6 +18,7 @@ import "HTML"; import "Integer"; import "String"; + import "Region"; /** @@ -785,7 +786,7 @@ if (part == nil) value = tostring(0); else - value = tostring(part["region", 0]:0); + value = tostring(Region::Start(part["region"]:[])); } if (style == `table) return value; @@ -801,7 +802,7 @@ if (part == nil) value = tostring(disk["cyl_count"]:0 - 1); else - value = tostring(part["region", 0]:0 + part["region", 1]:0 - 1); + value = tostring(Region::End(part["region"]:[])); } if (style == `table) return value; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54310 - in /trunk/storage: storage/src/include/ep-raid-dialogs.ycp storage/src/include/ep-raid-lib.ycp storage/src/modules/Partitions.ycp storage/src/modules/StorageSettings.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 12:05:07 2008 New Revision: 54310 URL: http://svn.opensuse.org/viewcvs/yast?rev=54310&view=rev Log: - use new builtin tosymbol Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageSettings.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Sat Dec 20 12:05:07 2008 @@ -92,7 +92,7 @@ integer callback(list<map> devices) { integer sizeK = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), maplist(map device, devices, { return device["device"]:""; }), sizeK); + Storage::ComputeMdSize(tosymbol(raid_type), maplist(map device, devices, { return device["device"]:""; }), sizeK); return sizeK; } @@ -173,7 +173,7 @@ data["devices"] = devices; integer size_k = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), devices, size_k); + Storage::ComputeMdSize(tosymbol(raid_type), devices, size_k); data["size_k"] = size_k; } @@ -283,7 +283,7 @@ integer callback(list<map> devices) { integer sizeK = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), maplist(map device, devices, { return device["device"]:""; }), sizeK); + Storage::ComputeMdSize(tosymbol(raid_type), maplist(map device, devices, { return device["device"]:""; }), sizeK); return sizeK; } Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Sat Dec 20 12:05:07 2008 @@ -59,7 +59,7 @@ if (DlgCreateRaidNew(data)) { integer nr = data["nr"]:0; - symbol raid_type = symbolof(toterm(data["raid_type"]:"raid0")); + symbol raid_type = tosymbol(data["raid_type"]:"raid0"); if (Storage::CreateMdWithDevs(nr, raid_type, [])) { Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sat Dec 20 12:05:07 2008 @@ -145,7 +145,7 @@ if (tmp == nil || !contains([ "ext2", "ext3", "reiser", "xfs" ], tolower(tmp))) tmp = "ext3"; - default_fs = symbolof(toterm(tolower(tmp))); + default_fs = tosymbol(tolower(tmp)); } return default_fs; } Modified: trunk/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageSettings.ycp (original) +++ trunk/storage/storage/src/modules/StorageSettings.ycp Sat Dec 20 12:05:07 2008 @@ -33,7 +33,7 @@ if (tmp == nil || !contains([ "device", "id", "path" ], tolower(tmp))) tmp = "device"; - display_name = symbolof(toterm(tolower(tmp))); + display_name = tosymbol(tolower(tmp)); } return display_name; @@ -80,7 +80,7 @@ tmp = ""; hidden_fields = toset(maplist(string field, splitstring(tmp, " \t"), { - return symbolof(toterm(tolower(field))); + return tosymbol(tolower(field)); })); } Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Sat Dec 20 12:05:07 2008 @@ -1,11 +1,12 @@ @HEADER-COMMENT@ - @HEADER@ -BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings -Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup -Requires: yast2-core >= 2.17.10 -Requires: yast2 >= 2.17.45 +BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel +BuildRequires: update-desktop-files yast2 yast2-core-devel >= 2.18.0 yast2-devtools +BuildRequires: yast2-testsuite yast2-perl-bindings +Requires: yast2-storage-lib = %version yast2-perl-bindings parted mdadm lvm2 dmraid +Requires: multipath-tools kpartx cryptsetup yast2-core >= 2.18.0 yast2 >= 2.17.45 Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x Requires: yast2-s390 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54309 - in /trunk: core/ core/libycp/src/ core/libycp/src/include/ycp/ core/libycp/testsuite/tests/builtin/ core/package/ devtools/yast2/
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 10:47:56 2008 New Revision: 54309 URL: http://svn.opensuse.org/viewcvs/yast?rev=54309&view=rev Log: - added tosymbol builtin (bnc #192389) Added: trunk/core/libycp/src/YCPBuiltinSymbol.cc trunk/core/libycp/src/include/ycp/YCPBuiltinSymbol.h trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Modified: trunk/core/VERSION trunk/core/libycp/src/Makefile.am trunk/core/libycp/src/YBuiltin.cc trunk/core/libycp/src/include/ycp/Makefile.am trunk/core/libycp/src/include/ycp/YCPCodeCompare.h trunk/core/package/yast2-core.changes trunk/devtools/yast2/ycp-mode.el Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=54309&r1=54308&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Sat Dec 20 10:47:56 2008 @@ -1 +1 @@ -2.17.25 +2.18.0 Modified: trunk/core/libycp/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/Makefile.am?rev=… ============================================================================== --- trunk/core/libycp/src/Makefile.am (original) +++ trunk/core/libycp/src/Makefile.am Sat Dec 20 10:47:56 2008 @@ -45,7 +45,7 @@ YCPBuiltinList.cc YCPBuiltinBoolean.cc \ YCPBuiltinString.cc YCPBuiltinTerm.cc \ YCPBuiltinVoid.cc YCPBuiltinMap.cc \ - YCPBuiltinMisc.cc \ + YCPBuiltinMisc.cc YCPBuiltinSymbol.cc \ YSymbolEntry.cc \ TypeStatics.cc \ y2string.cc \ Modified: trunk/core/libycp/src/YBuiltin.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YBuiltin.cc?rev=… ============================================================================== --- trunk/core/libycp/src/YBuiltin.cc (original) +++ trunk/core/libycp/src/YBuiltin.cc Sat Dec 20 10:47:56 2008 @@ -50,6 +50,9 @@ #include "ycp/YCPBuiltinList.h" static YCPBuiltinList builtin_list; // trigger constructor +#include "ycp/YCPBuiltinSymbol.h" +static YCPBuiltinSymbol builtin_symbol; // trigger constructor + #include "ycp/YCPBuiltinMap.h" static YCPBuiltinMap builtin_map; // trigger constructor Added: trunk/core/libycp/src/YCPBuiltinSymbol.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinSymbol… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinSymbol.cc (added) +++ trunk/core/libycp/src/YCPBuiltinSymbol.cc Sat Dec 20 10:47:56 2008 @@ -0,0 +1,63 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YCPBuiltinSymbol.cc + Summary: YCP Symbol Builtins + + Authors: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ + +#include "ycp/YCPBuiltinSymbol.h" +#include "ycp/YCPSymbol.h" +#include "ycp/YCPString.h" +#include "ycp/YCPVoid.h" +#include "ycp/YCPCode.h" +#include "ycp/YCPCodeCompare.h" +#include "ycp/StaticDeclaration.h" + +#include "ycp/y2log.h" + +extern StaticDeclaration static_declarations; + + +static YCPValue +s_tosymbol (const YCPString& v) +{ + /* @builtin tostring + * @short Converts a string to a symbol. + * + * @param string VALUE + * @return symbol + * + * @usage tosymbol("test") -> `test + */ + + if (v.isNull()) + return YCPNull(); + if (v->valuetype() == YT_STRING) + return YCPSymbol(v->asString()->value()); + return YCPNull(); +} + + +YCPBuiltinSymbol::YCPBuiltinSymbol () +{ + // must be static, registerDeclarations saves a pointer to it! + static declaration_t declarations[] = { + { "tosymbol", "symbol (const string)", (void*) s_tosymbol }, + { 0 } + }; + + static_declarations.registerDeclarations ("YCPBuiltinSymbol", declarations); +} Modified: trunk/core/libycp/src/include/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/Make… ============================================================================== --- trunk/core/libycp/src/include/ycp/Makefile.am (original) +++ trunk/core/libycp/src/include/ycp/Makefile.am Sat Dec 20 10:47:56 2008 @@ -19,7 +19,7 @@ YCPDebugger.h \ Type.h TypePtr.h \ YCPBuiltinBoolean.h YCPBuiltinFloat.h \ - YCPBuiltinByteblock.h \ + YCPBuiltinByteblock.h YCPBuiltinSymbol.h \ YCPBuiltinInteger.h YCPBuiltinList.h \ YCPBuiltinMap.h YCPBuiltinMisc.h \ YCPBuiltinPath.h YCPBuiltinString.h \ Added: trunk/core/libycp/src/include/ycp/YCPBuiltinSymbol.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPB… ============================================================================== --- trunk/core/libycp/src/include/ycp/YCPBuiltinSymbol.h (added) +++ trunk/core/libycp/src/include/ycp/YCPBuiltinSymbol.h Sat Dec 20 10:47:56 2008 @@ -0,0 +1,34 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPBuiltinSymbol.h + + Author: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ +// -*- c++ -*- + + +#ifndef YCPBuiltinSymbol_h +#define YCPBuiltinSymbol_h + +class YCPBuiltinSymbol +{ + +public: + YCPBuiltinSymbol(); + +}; + + +#endif // YCPBuiltinSymbol_h Modified: trunk/core/libycp/src/include/ycp/YCPCodeCompare.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPC… ============================================================================== --- trunk/core/libycp/src/include/ycp/YCPCodeCompare.h (original) +++ trunk/core/libycp/src/include/ycp/YCPCodeCompare.h Sat Dec 20 10:47:56 2008 @@ -20,6 +20,7 @@ #include "y2/SymbolEntry.h" #include "ycp/YCPCode.h" +#include "ycp/YCPBoolean.h" #include "ycp/y2log.h" /** Added: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (added) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Sat Dec 20 10:47:56 2008 @@ -0,0 +1,8 @@ +Parsed: +---------------------------------------------------------------------- +"** tosymbol **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tosymbol ("test") +---------------------------------------------------------------------- Added: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (added) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Sat Dec 20 10:47:56 2008 @@ -0,0 +1,2 @@ +("** tosymbol **") +(`test) Added: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (added) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Sat Dec 20 10:47:56 2008 @@ -0,0 +1,14 @@ + +# --------------------------------------------------------- +# +# Filename: Builtin-Symbol.ycp +# +# Purpose: test cases for all symbol builtins +# +# --------------------------------------------------------- + + +("** tosymbol **") + +(tosymbol ("test")) + Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Sat Dec 20 10:47:56 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Dec 20 10:45:55 CET 2008 - aschnell(a)suse.de + +- added tosymbol builtin (bnc #192389) +- 2.18.0 + +------------------------------------------------------------------- Thu Dec 11 15:06:31 CET 2008 - lslezak(a)suse.cz - tty_wrapper - fixed a deadlock in tty setting (set the terminal Modified: trunk/devtools/yast2/ycp-mode.el URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2/ycp-mode.el?rev=5… ============================================================================== --- trunk/devtools/yast2/ycp-mode.el (original) +++ trunk/devtools/yast2/ycp-mode.el Sat Dec 20 10:47:56 2008 @@ -63,7 +63,7 @@ (regexp-opt '("is" "select" "lookup" "contains" "setcontains" "size" "haskey" "add" "prepend" "union" "merge" "foreach" "filter" "find" "maplist" "flatten" "sort" "time" "toset" "listmap" "mapmap" - "tointeger" "tofloat" "tostring" "topath" "toterm" + "tointeger" "tofloat" "tostring" "topath" "toterm" "tosymbol" "crypt" "substring" "findfirstnotof" "tolower" "toascii" "filterchars" "eval" "symbolof" "argsof" "sleep" "sformat" "y2log" "mergestring" "splitstring" "sublist" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54308 - /branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp
by aschnell＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: aschnell Date: Sat Dec 20 10:14:20 2008 New Revision: 54308 URL: http://svn.opensuse.org/viewcvs/yast?rev=54308&view=rev Log: - fixed test condition Modified: branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp Modified: branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/s… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp Sat Dec 20 10:14:20 2008 @@ -86,7 +86,7 @@ swapable = $[]; list swaps = Storage::SwappingPartitions(); foreach(string dev, map disk, tg, { - if (disk["used_by_type"]:`UB_NONE != `UB_NONE) + if (disk["used_by_type"]:`UB_NONE == `UB_NONE) { list<map> sw = filter(map p, disk["partitions"]:[], ``(p["type"]:`unknown!=`extended && -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54307 - in /branches/SuSE-Code-11-Branch/gtk: ChangeLog src/YGTable.cc src/YGWidget.cc
by rpmcruz＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: rpmcruz Date: Sat Dec 20 03:23:23 2008 New Revision: 54307 URL: http://svn.opensuse.org/viewcvs/yast?rev=54307&view=rev Log: sync with trunk. Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc branches/SuSE-Code-11-Branch/gtk/src/YGWidget.cc Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/Chang… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-Branch/gtk/ChangeLog Sat Dec 20 03:23:23 2008 @@ -7,6 +7,8 @@ * src/ygtkfieldentry.c: select entry besides focusing it. + * src/YGTable.cc: bug fix 460746: table multi-selection broken. + 2008-12-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGSelectionModel.h/cc: bug fix 459313: we are using GTK model Modified: branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc Sat Dec 20 03:23:23 2008 @@ -114,8 +114,13 @@ GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); gtk_tree_view_expand_to_path (getView(), path); - gtk_tree_view_set_cursor (getView(), path, NULL, FALSE); - gtk_tree_view_scroll_to_cell (getView(), path, NULL, TRUE, 0.5, 0.5); + if (gtk_tree_selection_get_mode (getSelection()) == GTK_SELECTION_MULTIPLE) { + gtk_tree_selection_select_iter (getSelection(), iter); + } + else { + gtk_tree_view_set_cursor (getView(), path, NULL, FALSE); + gtk_tree_view_scroll_to_cell (getView(), path, NULL, TRUE, 0.5, 0.5); + } gtk_tree_path_free (path); } else @@ -162,10 +167,8 @@ emitEvent (YEvent::ValueChanged); } - static void selected_cb (GtkTreeView *view, YGTableView* pThis) + static void selection_changed_cb (GtkTreeSelection *selection, YGTableView* pThis) { - if (pThis->immediateEvent()) - pThis->emitEvent (YEvent::SelectionChanged, IF_NOT_PENDING_EVENT); if (!pThis->toggleMode()) { GtkTreeSelection *selection = pThis->getSelection(); for (YItemConstIterator it = pThis->itemsBegin(); it != pThis->itemsEnd(); it++) { @@ -176,6 +179,8 @@ } } } + if (pThis->immediateEvent()) + pThis->emitEvent (YEvent::SelectionChanged, IF_NOT_PENDING_EVENT); } static void activated_cb (GtkTreeView *tree_view, GtkTreePath *path, @@ -235,8 +240,8 @@ connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView*) this); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); } virtual void setKeepSorting (bool keepSorting) @@ -339,8 +344,8 @@ { connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView*) this); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); } virtual bool isShrinkable() { return shrinkable(); } @@ -373,8 +378,8 @@ appendIconTextColumn ("", YAlignUnchanged, 1, 2); setModel(); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); // Let the user toggle, using space/enter or double click (not an event). connect_after (getWidget(), "row-activated", G_CALLBACK (multi_activated_cb), this); @@ -523,10 +528,11 @@ static void row_selected_cb (GtkTreeView *view, YGTree *pThis) { // expand selected row + GtkTreeSelection *selection = pThis->getSelection(); GtkTreeIter iter; - if (gtk_tree_selection_get_selected (pThis->getSelection(), NULL, &iter)) + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) pThis->expand (&iter); - YGTable::selected_cb (view, pThis); + YGTable::selection_changed_cb (selection, pThis); } YGWIDGET_IMPL_COMMON Modified: branches/SuSE-Code-11-Branch/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGWidget.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGWidget.cc Sat Dec 20 03:23:23 2008 @@ -91,6 +91,7 @@ YGWidget::~YGWidget() { IMPL + delete m_signals; if (YGUI::ui()->eventPendingFor (m_ywidget)) YGUI::ui()->m_event_handler.consumePendingEvent(); // remove children if container? @@ -105,7 +106,6 @@ #endif gtk_widget_destroy (m_adj_size); g_object_unref (G_OBJECT (m_adj_size)); - delete m_signals; } YGWidget *YGWidget::get (YWidget *ywidget) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54306 - in /trunk/gtk: ChangeLog src/YGTable.cc src/YGWidget.cc
by rpmcruz＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: rpmcruz Date: Sat Dec 20 03:23:03 2008 New Revision: 54306 URL: http://svn.opensuse.org/viewcvs/yast?rev=54306&view=rev Log: * src/YGTable.cc: bug fix 460746: table multi-selection broken. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc trunk/gtk/src/YGWidget.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=54306&r1=54305… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Dec 20 03:23:03 2008 @@ -7,6 +7,8 @@ * src/ygtkfieldentry.c: select entry besides focusing it. + * src/YGTable.cc: bug fix 460746: table multi-selection broken. + 2008-12-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGSelectionModel.h/cc: bug fix 459313: we are using GTK model Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=54306&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Sat Dec 20 03:23:03 2008 @@ -114,8 +114,13 @@ GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); gtk_tree_view_expand_to_path (getView(), path); - gtk_tree_view_set_cursor (getView(), path, NULL, FALSE); - gtk_tree_view_scroll_to_cell (getView(), path, NULL, TRUE, 0.5, 0.5); + if (gtk_tree_selection_get_mode (getSelection()) == GTK_SELECTION_MULTIPLE) { + gtk_tree_selection_select_iter (getSelection(), iter); + } + else { + gtk_tree_view_set_cursor (getView(), path, NULL, FALSE); + gtk_tree_view_scroll_to_cell (getView(), path, NULL, TRUE, 0.5, 0.5); + } gtk_tree_path_free (path); } else @@ -162,10 +167,8 @@ emitEvent (YEvent::ValueChanged); } - static void selected_cb (GtkTreeView *view, YGTableView* pThis) + static void selection_changed_cb (GtkTreeSelection *selection, YGTableView* pThis) { - if (pThis->immediateEvent()) - pThis->emitEvent (YEvent::SelectionChanged, IF_NOT_PENDING_EVENT); if (!pThis->toggleMode()) { GtkTreeSelection *selection = pThis->getSelection(); for (YItemConstIterator it = pThis->itemsBegin(); it != pThis->itemsEnd(); it++) { @@ -176,6 +179,8 @@ } } } + if (pThis->immediateEvent()) + pThis->emitEvent (YEvent::SelectionChanged, IF_NOT_PENDING_EVENT); } static void activated_cb (GtkTreeView *tree_view, GtkTreePath *path, @@ -235,8 +240,8 @@ connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView*) this); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); } virtual void setKeepSorting (bool keepSorting) @@ -339,8 +344,8 @@ { connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView*) this); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); } virtual bool isShrinkable() { return shrinkable(); } @@ -373,8 +378,8 @@ appendIconTextColumn ("", YAlignUnchanged, 1, 2); setModel(); - connect (getWidget(), "cursor-changed", - G_CALLBACK (selected_cb), (YGTableView*) this); + connect (G_OBJECT (getSelection()), "changed", + G_CALLBACK (selection_changed_cb), (YGTableView*) this); // Let the user toggle, using space/enter or double click (not an event). connect_after (getWidget(), "row-activated", G_CALLBACK (multi_activated_cb), this); @@ -523,10 +528,11 @@ static void row_selected_cb (GtkTreeView *view, YGTree *pThis) { // expand selected row + GtkTreeSelection *selection = pThis->getSelection(); GtkTreeIter iter; - if (gtk_tree_selection_get_selected (pThis->getSelection(), NULL, &iter)) + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) pThis->expand (&iter); - YGTable::selected_cb (view, pThis); + YGTable::selection_changed_cb (selection, pThis); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=54306&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Sat Dec 20 03:23:03 2008 @@ -91,6 +91,7 @@ YGWidget::~YGWidget() { IMPL + delete m_signals; if (YGUI::ui()->eventPendingFor (m_ywidget)) YGUI::ui()->m_event_handler.consumePendingEvent(); // remove children if container? @@ -105,7 +106,6 @@ #endif gtk_widget_destroy (m_adj_size); g_object_unref (G_OBJECT (m_adj_size)); - delete m_signals; } YGWidget *YGWidget::get (YWidget *ywidget) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r54305 - in /branches/SuSE-Code-11-Branch/gtk: ./ src/
by rpmcruz＠svn.opensuse.org 20 Dec '08

20 Dec '08

Author: rpmcruz Date: Sat Dec 20 02:51:57 2008 New Revision: 54305 URL: http://svn.opensuse.org/viewcvs/yast?rev=54305&view=rev Log: Sync with trunk. Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog branches/SuSE-Code-11-Branch/gtk/src/YGDialog.h branches/SuSE-Code-11-Branch/gtk/src/YGDumbTab.cc branches/SuSE-Code-11-Branch/gtk/src/YGFrame.cc branches/SuSE-Code-11-Branch/gtk/src/YGInputField.cc branches/SuSE-Code-11-Branch/gtk/src/YGLayout.cc branches/SuSE-Code-11-Branch/gtk/src/YGRadioButton.cc branches/SuSE-Code-11-Branch/gtk/src/YGWidget.h branches/SuSE-Code-11-Branch/gtk/src/YGWizard.cc branches/SuSE-Code-11-Branch/gtk/src/ygtkfieldentry.c Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/Chang… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-Branch/gtk/ChangeLog Sat Dec 20 02:51:57 2008 @@ -1,3 +1,12 @@ +2008-12-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGWidget.h, src/YGLayoutBox.cc, src/YGDialog.h, src/YGFrame.cc, + src/YGDumbTab.cc, src/YGRadioButton.cc, src/YGWizard.cc: + bug fix 460728: make sure to call parent class for add and removeChild + methods. Affects YAlignment. + + * src/ygtkfieldentry.c: select entry besides focusing it. + 2008-12-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGSelectionModel.h/cc: bug fix 459313: we are using GTK model Modified: branches/SuSE-Code-11-Branch/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGDialog.h (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGDialog.h Sat Dec 20 02:51:57 2008 @@ -44,8 +44,8 @@ void setTitle (const std::string &title, bool sticky = false); void setIcon (const std::string &icon); - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YDialog, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YDialog, m_containee) }; #endif // YGDIALOG_H Modified: branches/SuSE-Code-11-Branch/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGDumbTab.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGDumbTab.cc Sat Dec 20 02:51:57 2008 @@ -153,8 +153,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YDumbTab, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YDumbTab, m_containee) }; YDumbTab *YGOptionalWidgetFactory::createDumbTab (YWidget *parent) Modified: branches/SuSE-Code-11-Branch/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGFrame.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGFrame.cc Sat Dec 20 02:51:57 2008 @@ -101,8 +101,8 @@ { return label(); } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YFrame, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YFrame, m_containee) }; @@ -173,8 +173,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_containee) - YGWIDGET_IMPL_CHILD_REMOVED (m_containee) + YGWIDGET_IMPL_CHILD_ADDED (YCheckBoxFrame, m_containee) + YGWIDGET_IMPL_CHILD_REMOVED (YCheckBoxFrame, m_containee) private: static void toggled_cb (GtkWidget *widget, YGCheckBoxFrame *pThis) Modified: branches/SuSE-Code-11-Branch/gtk/src/YGInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGInputField.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGInputField.cc Sat Dec 20 02:51:57 2008 @@ -8,7 +8,7 @@ #include "YGUtils.h" #include "ygtkfieldentry.h" -#include "YInputField.h" +#include <YInputField.h> class YGInputField : public YInputField, public YGLabeledWidget { Modified: branches/SuSE-Code-11-Branch/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGLayout.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGLayout.cc Sat Dec 20 02:51:57 2008 @@ -83,12 +83,12 @@ virtual void addChild (YWidget *ychild) { - YWidget::addChild (ychild); + YLayoutBox::addChild (ychild); doAddChild (ychild, getWidget()); if (primary() == YD_HORIZ) group.addWidget (ychild); } - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YLayoutBox, getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YLayoutBox) YGLAYOUT_SET_SIZE_IMPL (YLayoutBox) }; @@ -119,11 +119,11 @@ virtual void addChild (YWidget *ychild) { - YWidget::addChild (ychild); + YButtonBox::addChild (ychild); doAddChild (ychild, getWidget()); group.addWidget (ychild); } - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YButtonBox, getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YButtonBox) YGLAYOUT_SET_SIZE_IMPL (YButtonBox) }; @@ -158,8 +158,8 @@ g_object_unref (G_OBJECT (m_background_pixbuf)); } - YGWIDGET_IMPL_CHILD_ADDED (m_widget) - YGWIDGET_IMPL_CHILD_REMOVED (m_widget) + YGWIDGET_IMPL_CHILD_ADDED (YAlignment, m_widget) + YGWIDGET_IMPL_CHILD_REMOVED (YAlignment, m_widget) YGLAYOUT_PREFERRED_SIZE_IMPL (YAlignment) YGLAYOUT_SET_SIZE_IMPL (YAlignment) @@ -278,8 +278,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YReplacePoint, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YReplacePoint, getWidget()) }; YReplacePoint *YGWidgetFactory::createReplacePoint (YWidget *parent) @@ -303,8 +303,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YSquash, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YSquash, getWidget()) }; YSquash *YGWidgetFactory::createSquash (YWidget *parent, bool hsquash, bool vsquash) Modified: branches/SuSE-Code-11-Branch/gtk/src/YGRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGRadioButton.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGRadioButton.cc Sat Dec 20 02:51:57 2008 @@ -128,8 +128,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (m_widget) - YGWIDGET_IMPL_CHILD_REMOVED (m_widget) + YGWIDGET_IMPL_CHILD_ADDED (YRadioButtonGroup, m_widget) + YGWIDGET_IMPL_CHILD_REMOVED (YRadioButtonGroup, m_widget) }; YRadioButtonGroup *YGWidgetFactory::createRadioButtonGroup (YWidget *parent) Modified: branches/SuSE-Code-11-Branch/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGWidget.h (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGWidget.h Sat Dec 20 02:51:57 2008 @@ -116,14 +116,14 @@ } // for containers -#define YGWIDGET_IMPL_CHILD_ADDED(container) \ +#define YGWIDGET_IMPL_CHILD_ADDED(ParentClass, container) \ virtual void addChild (YWidget *ychild) { \ - YWidget::addChild (ychild); \ + ParentClass::addChild (ychild); \ doAddChild (ychild, container); \ } -#define YGWIDGET_IMPL_CHILD_REMOVED(container) \ +#define YGWIDGET_IMPL_CHILD_REMOVED(ParentClass, container) \ virtual void removeChild (YWidget *ychild) { \ - YWidget::removeChild (ychild); \ + ParentClass::removeChild (ychild); \ doRemoveChild (ychild, container); \ } Modified: branches/SuSE-Code-11-Branch/gtk/src/YGWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGWizard.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGWizard.cc Sat Dec 20 02:51:57 2008 @@ -293,8 +293,8 @@ } YGWIDGET_IMPL_COMMON - YGWIDGET_IMPL_CHILD_ADDED (getWidget()) - YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) + YGWIDGET_IMPL_CHILD_ADDED (YWizard, getWidget()) + YGWIDGET_IMPL_CHILD_REMOVED (YWizard, getWidget()) }; YWizard *YGOptionalWidgetFactory::createWizard (YWidget *parent, Modified: branches/SuSE-Code-11-Branch/gtk/src/ygtkfieldentry.c URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/ygtkfieldentry.c (original) +++ branches/SuSE-Code-11-Branch/gtk/src/ygtkfieldentry.c Sat Dec 20 02:51:57 2008 @@ -192,7 +192,9 @@ GList *children = gtk_container_get_children (GTK_CONTAINER (fields)); g_return_val_if_fail (children != NULL, FALSE); GtkWidget *widget = GTK_WIDGET (children->data); + g_list_free (children); + gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); gtk_widget_grab_focus (widget); return gtk_widget_is_focus (widget); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0