July 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39848 - in /branches/tmp/mvidner/ui-as-namespace/core/libycp/src: Bytecode.cc StaticDeclaration.cc YExpression.cc YStatement.cc include/ycp/Bytecode.h
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 19:33:36 2007 New Revision: 39848 URL: http://svn.opensuse.org/viewcvs/yast?rev=39848&view=rev Log: Catch invalid bytecode only once per import, improve error reporting. Does away with "Code is no statement: 4". Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/Bytecode.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YExpression.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YStatement.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/include/ycp/Bytecode.h Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/Bytecode.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/Bytecode.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/Bytecode.cc Tue Jul 31 19:33:36 2007 @@ -845,8 +845,7 @@ YCodePtr res = 0; - try - { + // there used to be a try/catch here but it was moved to readFile switch (code) { @@ -1059,13 +1058,6 @@ break; } - } - catch (const Bytecode::Invalid&) - { - // there are memory leaks all over the place now - y2error ("Caught invalid bytecode"); - } - return res; } @@ -1158,8 +1150,17 @@ #if DO_DEBUG // y2debug ("Header accepted"); #endif - - return readCode (instream); + + try + { + return readCode (instream); + } + catch (const Bytecode::Invalid&) + { + // there are memory leaks all over the place now + y2error ("Caught invalid bytecode in '%s'", filename.c_str()); + return 0; + } } y2error ("Unsupported version %d.%d.%d" Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc Tue Jul 31 19:33:36 2007 @@ -526,7 +526,10 @@ if (decl == 0) { ycp2error ("No match for '%s (%s)'", name, type->toString().c_str()); - str.setstate (std::ostream::failbit); + ycp2error ("That is a builtin function, so your bytecode"); + ycp2error ("needs to be recompiled using a recent yast2-core."); + delete [] name; + throw Bytecode::Invalid(); } delete [] name; return decl; Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YExpression.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YExpression.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YExpression.cc Tue Jul 31 19:33:36 2007 @@ -1727,12 +1727,6 @@ { Bytecode::popNamespace (m_parameterblock->nameSpace()); } - if (!m_decl - || m_type->isError ()) - { - ycp2error ("Can't find builtin '%s'", m_decl ? StaticDeclaration::Decl2String (m_decl, true).c_str() : m_type->toString().c_str()); - str.setstate (ios::failbit); - } // throw away type info m_type = Type::Void; } Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YStatement.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YStatement.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YStatement.cc Tue Jul 31 19:33:36 2007 @@ -1521,9 +1521,9 @@ if (nameSpace() == 0) { - ycp2error ("Import '%s' failed\n", name().c_str()); - ycp2error ("No namespace\n"); - return; + ycp2error ("Import '%s' failed...\n", name().c_str()); + ycp2error ("Could not create its namespace\n"); + throw Bytecode::Invalid(); } // now load symbols we need from the just imported namespace Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/include/ycp/Bytecode.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/include/ycp/Bytecode.h (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/include/ycp/Bytecode.h Tue Jul 31 19:33:36 2007 @@ -67,7 +67,12 @@ static map<string, YBlockPtr>* m_bytecodeCache; public: - /** Thrown instead of unsetting YCode::valid */ + /** Thrown when it does not make sense to parse more bytecode. + * Formerly we used to unset YCode::valid instead. + * Any function taking bytecodeistream as a parameter may throw this. + * It is recommended to catch them in the same function where the stream + * is constructed (Bytecode::readFile). + */ class Invalid {}; // bool I/O -- 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] r39847 - in /branches/tmp/mvidner/ui-as-namespace/core: base/tools/ycpc/ycpc.cc libycp/src/StaticDeclaration.cc libycp/src/YCode.cc wfm/src/Y2WFMComponent.cc
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 19:25:04 2007 New Revision: 39847 URL: http://svn.opensuse.org/viewcvs/yast?rev=39847&view=rev Log: Fixed warnings abour const char *. Modified: branches/tmp/mvidner/ui-as-namespace/core/base/tools/ycpc/ycpc.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YCode.cc branches/tmp/mvidner/ui-as-namespace/core/wfm/src/Y2WFMComponent.cc Modified: branches/tmp/mvidner/ui-as-namespace/core/base/tools/ycpc/ycpc.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/base/tools/ycpc/ycpc.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/base/tools/ycpc/ycpc.cc Tue Jul 31 19:25:04 2007 @@ -59,7 +59,7 @@ static int freshen = 0; // freshen recompilation static int force = 0; // force recompilation static int no_implicit_namespaces = 0; // don't preload implicit namespaces -static char *ui_name = 0; +static const char *ui_name = 0; #define UI_QT_NAME "qt" #define UI_NCURSES_NAME "ncurses" Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/StaticDeclaration.cc Tue Jul 31 19:25:04 2007 @@ -49,7 +49,7 @@ // list of namespace prefixes to mark as 'predefined' // They will be auto-loaded by the scanner on first appearance // -static char *predefined[] = { +static const char *predefined[] = { "UI", "WFM", "SCR", "Pkg", 0 }; //------------------------------------------------------------------------ @@ -61,7 +61,7 @@ #if DO_DEBUG y2debug ("m_declTable %p", m_declTable); #endif - char **pptr = predefined; + const char **pptr = predefined; SymbolEntryPtr sentry; Point *point = new Point ("<predefined>"); while (*pptr != 0) Modified: branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YCode.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YCode.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libycp/src/YCode.cc Tue Jul 31 19:25:04 2007 @@ -102,7 +102,7 @@ string YCode::toString (ykind kind) { - static char *names[] = { + static const char *names[] = { "yxError", // [1] Constants (-> YCPValue, except(!) locale -> yeLocale) "ycVoid", "ycBoolean", "ycInteger", "ycFloat", // constants Modified: branches/tmp/mvidner/ui-as-namespace/core/wfm/src/Y2WFMComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/wfm/src/Y2WFMComponent.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/wfm/src/Y2WFMComponent.cc Tue Jul 31 19:25:04 2007 @@ -202,7 +202,7 @@ const char* Y2WFMComponent::get_env_lang () const { - static char* names[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" }; + static const char* names[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" }; for (size_t i = 0; i < sizeof (names)/sizeof (names[0]); i++) { -- 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] r39846 - in /trunk/squid/src: Squid.ycp SquidACL.ycp SquidACL_local_functions.ycp complex.ycp dialogs.ycp
by dfiser＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: dfiser Date: Tue Jul 31 17:02:50 2007 New Revision: 39846 URL: http://svn.opensuse.org/viewcvs/yast?rev=39846&view=rev Log: Written a lot of ACLs. And some little improvements. Modified: trunk/squid/src/Squid.ycp trunk/squid/src/SquidACL.ycp trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=39846&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Jul 31 17:02:50 2007 @@ -184,6 +184,10 @@ { acls[id_item] = value; } +global void DelACL(integer id_item) +{ + acls = remove(acls, id_item); +} /******* ACL END *******/ /******* HTTP_ACCESS ******/ @@ -419,7 +423,7 @@ return ok; } -/** +/** TODO: Regular expressions! * Read setting of parameter acl. * acl aclname acltype string1 string2 ... * @@ -431,6 +435,14 @@ list tmp = []; map <string, any> tmp_acl = $[]; + //list of types which contains regular expression + list<string> regexps = [ + "srcdom_regex", + "dstdom_regex", + "url_regex", + "urlpath_regex", + "browser" + ]; acls = []; foreach (string value, (list<string>)SCR::Read( add(squid_path, "acl")), @@ -448,6 +460,15 @@ tmp_acl["type"] = tmp[1]:""; tmp_acl["options"] = remove(remove(tmp,0),0); + // concat list of regular expressions into one option + if (contains(regexps, tmp_acl["type"]:"")){ + if ((tmp_acl["options"]:[])[0]:"" == "-i"){ + tmp_acl["options"] = ["-i", mergestring((list<string>)remove(tmp_acl["options"]:[], 0), " ")]; + }else{ + tmp_acl["options"] = [mergestring(tmp_acl["options"]:[], " ")]; + } + } + acls = add(acls, tmp_acl); }); return ok; Modified: trunk/squid/src/SquidACL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL.ycp?rev=39846… ============================================================================== --- trunk/squid/src/SquidACL.ycp (original) +++ trunk/squid/src/SquidACL.ycp Tue Jul 31 17:02:50 2007 @@ -40,29 +40,29 @@ * "type" : $[ "name" : "Name shown in dialogs", * "widget" : `WidgetDescribingThisType, * "widget_init" : FunctionWithInitsOfWidget, - * "verification_func" : FunctionCalledToVerificateContentsOfWidget, - * "store_func" : FunctionCalledToStoreDataFromWidget //returns list of options + * "verification" : FunctionCalledToVerificateContentsOfWidget, + * "options" : FunctionThatReturnsListOfOptions * ] * ] * * widget_init prototype: void FuncName(integer id_item) - * verification_func prototype: boolean FuncName() - * store_func prototype: list<string> FuncName() + * verification prototype: boolean FuncName() + * options prototype: list<string> FuncName() */ map<string,map> acl_map = $[ "src" : $[ "name" : "src", "widget" : `Frame( _("src"), `VBox( - `TextEntry(`id("acl_addr1"), _("IP Address 1"), ""), + //`TextEntry(`id("acl_addr1"), _("IP Address 1"), ""), //`Label(" - "), - `TextEntry(`id("acl_addr2"), _("IP Address 2"), ""), + `TextEntry(`id("acl_addr"), _("IP Address or Range of IP Addresses"), ""), //`Label("/"), `TextEntry(`id("acl_mask"), _("Network Mask"), "") ) ), "widget_init" : srcWidgetInit, - "verification_func" : srcVerif, - "store_func" : srcStore ], + "verification" : srcVerif, + "options" : srcOptions ], "dst" : $[ "name" : "dst", "widget" : `Frame( _("dst"), @@ -72,26 +72,137 @@ ) ), "widget_init" : dstWidgetInit, - "verification_func" : dstVerif, - "store_func" : dstStore ], + "verification" : dstVerif, + "options" : dstOptions ], "myip" : $[ "name" : "myip", "widget" : `Frame( _("myip"), `VBox( `TextEntry(`id("acl_addr"), _("Local IP Address"), ""), `TextEntry(`id("acl_mask"), _("Network Mask"), "") - ) + ) + ), + "widget_init" : dstWidgetInit, + "verification" : dstVerif, + "options" : dstOptions ], + + "srcdomain" : $[ "name" : "srcdomain", + "widget" : `Frame( _("srcdomain"), + `VBox( + `TextEntry(`id("acl_domain"), _("Clients Domain Name"), "") + ) + ), + "widget_init" : srcdomainWidgetInit, + "verification" : srcdomainVerif, + "options" : srcdomainOptions ], + + "dstdomain" : $[ "name" : "dstdomain", + "widget" : `Frame( _("dstdomain"), + `VBox( + `TextEntry(`id("acl_domain"), _("Destination Domain"), "") + ) + ), + "widget_init" : srcdomainWidgetInit, + "verification" : srcdomainVerif, + "options" : srcdomainOptions ], + + "srcdom_regex" : regexp("srcdom_regex", "srcdom_regex"), + "dstdom_regex" : regexp("dstdom_regex", "dstdom_regex"), + + "time" : $[ "name" : "time", + "widget" : `Frame( _("time"), + `VBox( + `HWeight(1, `MinHeight(8, `MultiSelectionBox(`id("acl_days"), _("Days"), + [`item(`id("M"), "Monday"), + `item(`id("T"), "Tuesday"), + `item(`id("W"), "Wednesday"), + `item(`id("H"), "Thursday"), + `item(`id("F"), "Friday"), + `item(`id("A"), "Saturday"), + `item(`id("S"), "Sunday")]))), + `HWeight(1, `HBox( + `TextEntry(`id("acl_from"), `opt(`shrinkable), _("From (H:M)"), ""), + `TextEntry(`id("acl_to"), `opt(`shrinkable), _("To (H:M)"), "") + )) + ) + ), + "widget_init" : timeWidgetInit, + "verification" : timeVerif, + "options" : timeOptions ], + + "url_regex" : regexp("url_regex", "url_regex"), + "urlpath_regex" : regexp("urlpath_regex", "urlpath_regex"), + + "port" : $[ "name" : "port", + "widget" : `Frame( _("port"), + `TextEntry(`id("acl_port"), _("Port Number or Range of Ports"), "") ), - "widget_init" : myipWidgetInit, - "verification_func" : myipVerif, - "store_func" : myipStore ] + "widget_init" : portWidgetInit, + "verification" : portVerif, + "options" : portOptions ], + + "myport" : $[ "name" : "myport", + "widget" : `Frame( _("myport"), + `TextEntry(`id("acl_port"), _("Port Number"), "") + ), + "widget_init" : myportWidgetInit, + "verification" : myportVerif, + "options" : portOptions ], + + "proto" : $[ "name" : "proto", + "widget" : `Frame ( _("proto"), + `TextEntry(`id("acl_proto"), _("Protocol"), "") + ), + "widget_init" : protoWidgetInit, + "verification" : protoVerif, + "options" : protoOptions ], + + "method" : $[ "name" : "method", + "widget" : `Frame( _("method"), + `ComboBox(`id("acl_method"), _("HTTP Method"), + [`item(`id("GET"), "GET"), + `item(`id("HEAD"), "HEAD"), + `item(`id("POST"), "POST"), + `item(`id("PUT"), "PUT"), + `item(`id("DELETE"), "DELETE"), + `item(`id("TRACE"), "TRACE"), + `item(`id("CONNECT"), "CONNECT")]) + ), + "widget_init" : methodWidgetInit, + "verification" : methodVerif, + "options" : methodOptions ], + + "browser" : regexp("browser", "browser"), + + "maxconn" : $[ "name" : "maxconn", + "widget" : `Frame("maxconn", + `IntField(`id("acl_connections"), _("Maximum Number of HTTP Connections"), 0, 999999, 0) + ), + "widget_init" : maxconnWidgetInit, + "verification" : maxconnVerif, + "options" : maxconnOptions ] ]; /** * Specify order of acls. * Values must corespond with keys in acl_map. */ -list<string> acl_order = ["src", "dst", "myip"]; +list<string> acl_order = ["src", + "dst", + "myip", + "srcdomain", + "dstdomain", + "srcdom_regex", + "dstdom_regex", + "time", + "url_regex", + "urlpath_regex", + "port", + "myport", + "proto", + "method", + "browser", + "maxconn"]; @@ -141,14 +252,18 @@ */ global boolean Verify(string id_acl_type) { - boolean() func = (boolean())(acl_map[id_acl_type]:$[])["verification_func"]:nil; + boolean() func = (boolean())(acl_map[id_acl_type]:$[])["verification"]:nil; return (boolean)func(); } -global list<string> Store(string id_acl_type) +/** + * Returns values from widget as list of options in correct form to store + * them into Squid module. + */ +global list<string> GetOptions(string id_acl_type) { - list<string>() func = (list<string>())(acl_map[id_acl_type]:$[])["store_func"]:nil; + list<string>() func = (list<string>())(acl_map[id_acl_type]:$[])["options"]:nil; return func(); } } Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functio… ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Tue Jul 31 17:02:50 2007 @@ -33,14 +33,46 @@ import "Squid"; +list<string> splitToChars(string str) +{ + integer len = size(str); + integer i = 0; + list<string> ret = []; + while (i<len){ + ret = add(ret, substring(str,i,1)); + i = i + 1; + } + + return (ret); +} -boolean isIPAddress(string str) +boolean isIPAddr(string str) { - return regexpmatch(str, "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"); + return regexpmatch(str, "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$"); } boolean isMask(string str) { - return regexpmatch(str, "[0-9]+") || isIPAddress(str); + return regexpmatch(str, "^[0-9]+$") || isIPAddr(str); +} +boolean isHHMMFormat(string str) +{ + if (!regexpmatch(str, "^[0-9]{1,2}:[0-9]{1,2}$")) return false; + list<string> hm = splitstring(str, ":"); + integer tmp = 0; + + tmp = tointeger(hm[0]:""); + if (tmp < 0 || tmp > 23) return false; + tmp = tointeger(hm[1]:""); + if (tmp < 0 || tmp > 59) return false; + + return true; +} +boolean isCorrectFromTo(string from, string to) +{ + integer fr = tointeger(regexpsub(mergestring(splitstring(from, ":"), ""), "([1-9][0-9]*$)", "\\1")); + integer t = tointeger(regexpsub(mergestring(splitstring(to, ":"),""), "([1-9][0-9]*$)", "\\1")); + + return fr<t; } @@ -53,45 +85,40 @@ { UI::ChangeWidget(`id(id), `ValidChars, "1234567890."); } +void widgetInitDomainName(any id) +{ + UI::ChangeWidget(`id(id), `ValidChars, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ."); +} +void widgetInitHHMM(any id) +{ + UI::ChangeWidget(`id(id), `ValidChars, "1234567890:"); + UI::ChangeWidget(`id(id), `InputMaxLength, 5); +} /****************** SRC *************************/ -void srcWidgetInit(integer id_item)//TODO: +void srcWidgetInit(integer id_item) { - widgetInitIPAddr("acl_addr1"); - widgetInitIPAddr("acl_addr2"); + UI::ChangeWidget(`id("acl_addr"), `ValidChars, "1234567890.-"); widgetInitMask("acl_mask"); if (id_item != nil){ map<string,any> acl = Squid::GetACL(id_item); - list<string> tmp = []; list<string> data = splitstring((acl["options"]:[])[0]:"", "/"); - data[2] = data[1]:""; - tmp = splitstring(data[0]:"", "-"); - if (size(tmp) == 1){ - data[0] = ""; - data[1] = tmp[0]:""; - }else{ - data[0] = tmp[0]:""; - data[1] = tmp[1]:""; - } - y2debug("%1", data); - UI::ChangeWidget(`id("acl_addr1"), `Value, data[0]:""); - UI::ChangeWidget(`id("acl_addr2"), `Value, data[1]:""); - UI::ChangeWidget(`id("acl_mask"), `Value, data[2]:""); + UI::ChangeWidget(`id("acl_addr"), `Value, data[0]:""); + UI::ChangeWidget(`id("acl_mask"), `Value, data[1]:""); } } boolean srcVerif(){ boolean ok = true; - string addr1 = (string)UI::QueryWidget(`id("acl_addr1"), `Value); - string addr2 = (string)UI::QueryWidget(`id("acl_addr2"), `Value); + string addr = (string)UI::QueryWidget(`id("acl_addr"), `Value); string mask = (string)UI::QueryWidget(`id("acl_mask"), `Value); + list<string> tmp = splitstring(addr, "-"); - if ((size(addr1) == 0 && size(addr2) == 0) || - (size(addr1) > 0 && !isIPAddress(addr1)) || - (size(addr2) > 0 && !isIPAddress(addr2)) || + if (size(addr) == 0 || + (!isIPAddr(addr) && !isIPAddr(tmp[0]:"") && !isIPAddr(tmp[1]:"")) || (size(mask) > 0 && !isMask(mask))){ ok = false; Report::Error( _("Invalid values.")); @@ -99,18 +126,13 @@ return ok; } -list<string> srcStore(){ +list<string> srcOptions(){ list<string> data = []; - string addr1 = (string)UI::QueryWidget(`id("acl_addr1"), `Value); - string addr2 = (string)UI::QueryWidget(`id("acl_addr2"), `Value); + string addr = (string)UI::QueryWidget(`id("acl_addr"), `Value); string mask = (string)UI::QueryWidget(`id("acl_mask"), `Value); - if (size(addr1) > 0 && size(addr2) > 0){ - data[0] = addr1 + "-" + addr2; - }else{ - data[0] = addr1 + addr2; - } - if (size(mask) > 0 && size(addr1)+size(addr2) > 0) + data[0]=addr; + if (size(mask) > 0 && size(addr) > 0) data[0] = data[0]:"" + "/" + mask; return data; } @@ -138,14 +160,14 @@ string addr = (string)UI::QueryWidget(`id("acl_addr"), `Value); string mask = (string)UI::QueryWidget(`id("acl_mask"), `Value); - if (!isIPAddress(addr) || (size(mask) > 0 && !isMask(mask))){ + if (!isIPAddr(addr) || (size(mask) > 0 && !isMask(mask))){ ok = false; Report::Error( _("Invalid values.")); } return ok; } -list<string> dstStore() +list<string> dstOptions() { list<string> data = []; string addr = (string)UI::QueryWidget(`id("acl_addr"), `Value); @@ -159,20 +181,283 @@ /****************** DST END *********************/ -/****************** MYIP ************************/ -void myipWidgetInit(integer id_item) +/****************** MYIP ************************ + * Uses same functions as DST +/****************** MYIP END ********************/ + + +/**************** SRCDOMAIN *********************/ +void srcdomainWidgetInit(integer id_item) { - widgetInitIPAddr("acl_addr"); - widgetInitMask("acl_mask"); + widgetInitDomainName("acl_domain"); + + if (id_item != nil){ + map<string, any> acl = Squid::GetACL(id_item); + UI::ChangeWidget(`id("acl_domain"), `Value, (acl["options"]:[])[0]:""); + } } -boolean myipVerif() +boolean srcdomainVerif() +{ + boolean ok = true; + + if (size((string)UI::QueryWidget(`id("acl_domain"), `Value)) == 0){ + ok = false; + Report::Error( _("Domain Name must not be empty.")); + } + return ok; +} +list<string> srcdomainOptions() +{ + return [(string)UI::QueryWidget(`id("acl_domain"), `Value)]; +} +/**************** SRCDOMAIN END *****************/ + +/**************** DSTDOMAIN ********************* + * Uses same functions as SRCDOMAIN. +/**************** DSTDOMAIN END *****************/ + + +/**************** REGEXP ************************/ +/** + * Returns univerzal widget for setting a regular expression. + */ +term regexpWidget(string frame_title) +{ + return `Frame( frame_title, + `VBox( + `TextEntry(`id("acl_regexp"), _("Regular Expression"), ""), + `CheckBox(`id("acl_regexp_case_insensitive"), _("Case Insensitive"), false) + ) + ); +} + +/** + * Univerzal widget_init for regular expression. + */ +void regexpWidgetInit(integer id_item) +{ + if (id_item != nil){ + map <string,any> acl = Squid::GetACL(id_item); + + if ((acl["options"]:[])[0]:"" == "-i"){ + UI::ChangeWidget(`id("acl_regexp_case_insensitive"), `Value, true); + acl["options"] = remove(acl["options"]:[],0); + } + UI::ChangeWidget(`id("acl_regexp"), `Value, (acl["options"]:[])[0]:""); + } +} +/** + * Univerzal verification function for regular expression. + */ +boolean regexpVerif() +{ + boolean ok = true; + string regexp = (string)UI::QueryWidget(`id("acl_regexp"), `Value); + + if (size(regexp) == 0){ + ok = false; + Report::Error( _("Regular Expression must not be empty.")); + } + return ok; +} +/** + * Univerzal options function for regular expression. + */ +list<string> regexpOptions() +{ + list<string> ret = []; + if ((boolean)UI::QueryWidget(`id("acl_regexp_case_insensitive"), `Value)) + ret[0] = "-i"; + ret = add(ret, (string)UI::QueryWidget(`id("acl_regexp"), `Value)); + return ret; +} + +/** + * Returns map describing acl which has type of regular expression. + */ +map<string,any> regexp(string name, string frame_title) +{ + return $[ "name" : name, + "widget" : regexpWidget(frame_title), + "widget_init" : regexpWidgetInit, + "verification" : regexpVerif, + "options" : regexpOptions ]; +} +/**************** REGEXP END ********************/ + + + +/**************** TIME **************************/ +void timeWidgetInit(integer id_item) +{ + widgetInitHHMM("acl_from"); + widgetInitHHMM("acl_to"); + + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + list<string> days = splitToChars((acl["options"]:[])[0]:""); + list<string> times = splitstring((acl["options"]:[])[1]:"","-"); + + UI::ChangeWidget(`id("acl_days"), `SelectedItems, days); + UI::ChangeWidget(`id("acl_from"), `Value, times[0]:""); + UI::ChangeWidget(`id("acl_to"), `Value, times[1]:""); + } +} +boolean timeVerif() +{ + boolean ok = true; + string from = (string)UI::QueryWidget(`id("acl_from"), `Value); + string to = (string)UI::QueryWidget(`id("acl_to"), `Value); + integer selected_items = size((list)UI::QueryWidget(`id("acl_days"), `SelectedItems)); + + if (selected_items == 0){ + ok = false; + Report::Error( _("You must select at least on day.")); + }else if (!isHHMMFormat(from) || !isHHMMFormat(to)){ + ok = false; + Report::Error( _("Time isn't filled in corrent format.")); + }else if (!isCorrectFromTo(from, to)){// from must be less then to + ok = false; + Report::Error( _("From must be less then To."));//TODO: better error message + } + return ok; +} +list<string> timeOptions() +{ + string days = mergestring((list<string>)UI::QueryWidget(`id("acl_days"), `SelectedItems),""); + string times = mergestring([(string)UI::QueryWidget(`id("acl_from"), `Value), + (string)UI::QueryWidget(`id("acl_to"), `Value)], "-"); + return [days, times]; +} +/**************** TIME END **********************/ + + +/**************** PORT **************************/ +void portWidgetInit(integer id_item) +{ + UI::ChangeWidget(`id("acl_port"), `ValidChars, "1234567890-"); + + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + + UI::ChangeWidget(`id("acl_port"), `Value, (acl["options"]:[])[0]:""); + } +} +boolean portVerif() +{ + boolean ok = true; + string port = (string)UI::QueryWidget(`id("acl_port"), `Value); + + if (!regexpmatch(port, "^[0-9]+(-[0-9]+){0,1}$")){ + ok = false; + }else{ + list<string> ports = splitstring(port, "-"); + if (size(ports) == 2 && (tointeger(ports[0]:"") > tointeger(ports[1]:""))){ + ok = false; + } + } + if (!ok){ + Report::Error( _("Invalid value.")); + } + return ok; +} +list<string> portOptions() +{ + return [(string)UI::QueryWidget(`id("acl_port"), `Value)]; +} +/**************** PORT END **********************/ + + +/************** MYPORT **************************/ +void myportWidgetInit(integer id_item) +{ + UI::ChangeWidget(`id("acl_port"), `ValidChars, "1234567890"); + + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + + UI::ChangeWidget(`id("acl_port"), `Value, (acl["options"]:[])[0]:""); + } +} +boolean myportVerif() +{ + boolean ok = true; + string port = (string)UI::QueryWidget(`id("acl_port"), `Value); + + if (!regexpmatch(port, "^[0-9]+$")){ + ok = false; + Report::Error( _("Invalid value.")); + } + return ok; +} +/************** MYPORT END **********************/ + + +/*************** PROTO **************************/ +void protoWidgetInit(integer id_item) +{ + UI::ChangeWidget(`id("acl_proto"), `ValidChars, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"); + + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + + UI::ChangeWidget(`id("acl_proto"), `Value, (acl["options"]:[])[0]:""); + } +} +boolean protoVerif() +{ + boolean ok = true; + string protocol = (string)UI::QueryWidget(`id("acl_proto"), `Value); + + if (size(protocol) == 0){ + Report::Error( _("Protocol must not be empty.")); + } + return ok; +} +list<string> protoOptions() +{ + return [(string)UI::QueryWidget(`id("acl_proto"), `Value)]; +} +/*************** PROTO END **********************/ + + +/*************** METHOD *************************/ +void methodWidgetInit(integer id_item) +{ + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + + UI::ChangeWidget(`id("acl_method"), `Value, (acl["options"]:[])[0]:""); + } +} +boolean methodVerif() { return true; } -list<string> myipStore() +list<string> methodOptions() { - return []; + return [(string)UI::QueryWidget(`id("acl_method"), `Value)]; } -/****************** MYIP END ********************/ +/*************** METHOD END *********************/ + + +/*************** MAXCONN ************************/ +void maxconnWidgetInit(integer id_item) +{ + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + + UI::ChangeWidget(`id("acl_connections"), `Value, tointeger((acl["options"]:[])[0]:"")); + } +} +boolean maxconnVerif() +{ + return true; +} +list<string> maxconnOptions() +{ + return [tostring(UI::QueryWidget(`id("acl_connections"), `Value))]; +} +/*************** MAXCONN END ********************/ } /* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39846&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Jul 31 17:02:50 2007 @@ -329,9 +329,13 @@ return ok; } -void DelFromHttpPortsTable(integer id_item) +integer DelFromHttpPortsTable(integer id_item) { Squid::DelHttpPort(id_item); + if (id_item >= size(Squid::GetHttpPorts())){ + id_item = id_item - 1; + } + return id_item; } boolean StoreDataFromAddEditRefreshPatternDialog(integer id_item) @@ -360,9 +364,13 @@ return ok; } -void DelFromRefreshPatternsTable(integer id_item) +integer DelFromRefreshPatternsTable(integer id_item) { Squid::DelRefreshPattern(id_item); + if (id_item >= size(Squid::GetRefreshPatterns())){ + id_item = id_item - 1; + } + return id_item; } /** @@ -461,9 +469,13 @@ return ok; } -void DelFromHttpAccessTable(integer id_item) +integer DelFromHttpAccessTable(integer id_item) { Squid::DelHttpAccess(id_item); + if (id_item >= size(Squid::GetHttpAccesses())){ + id_item = id_item - 1; + } + return (id_item); } integer MoveUpHttpAccess(integer id_item) { @@ -499,7 +511,7 @@ if (verification && size(name) > 0){ data["name"] = name; data["type"] = type; - data["options"] = SquidACL::Store(type); + data["options"] = SquidACL::GetOptions(type); y2debug("complex::StoreDataFromAddEditACLDialog() - data: %1", data); @@ -517,6 +529,14 @@ return ok; } +integer DelFromACLGroupsTable(integer id_item) +{ + Squid::DelACL(id_item); + if (id_item >= size(Squid::GetACLs())){ + id_item = id_item - 1; + } + return id_item; +} /********************* STORING + DELETING END ********************/ } Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=39846&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Tue Jul 31 17:02:50 2007 @@ -153,8 +153,9 @@ UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); } }else if (ret == `del){ - DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); + id_item = DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); InitHttpPortsTable(); + UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); } } @@ -266,8 +267,9 @@ UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); } }else if (ret == `del){ - DelFromRefreshPatternsTable((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + id_item = DelFromRefreshPatternsTable((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); InitRefreshPatternsTable(); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); }else if (ret == `up){ id_item = MoveUpRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); if (id_item != nil){ @@ -421,7 +423,7 @@ items = add(items, `item(`id(i), (not == true ? "not" : ""), item)); UI::ChangeWidget(`id("acls"), `Items, items); } -void delItemFromAddEditHttpAccessDialog(integer id_item) +integer delItemFromAddEditHttpAccessDialog(integer id_item) { list items = []; @@ -434,6 +436,10 @@ } }); UI::ChangeWidget(`id("acls"), `Items, items); + if (id_item >= size(items)){ + id_item = id_item - 1; + } + return id_item; } boolean AddEditHttpAccessDialog(integer id_item) { @@ -442,6 +448,7 @@ string acl = ""; boolean not = false; any tmp = nil; + integer id_acl = 0; term contents = `VBox( `ComboBox(`id("allow_deny"), _("Allow/Deny"), @@ -493,8 +500,9 @@ InitAddEditHttpAccessDialog(nil); } }else if (ui == `del){ - delItemFromAddEditHttpAccessDialog((integer)UI::QueryWidget(`id("acls"), `CurrentItem)); + id_acl = delItemFromAddEditHttpAccessDialog((integer)UI::QueryWidget(`id("acls"), `CurrentItem)); InitAddEditHttpAccessDialog(nil); + UI::ChangeWidget(`id("acls"), `CurrentItem, id_acl); } } @@ -509,6 +517,7 @@ { boolean ret = false; any ui = nil; + string orig_type = ""; string type = ""; term contents = `VBox( @@ -526,9 +535,9 @@ InitAddEditACLDialog(id_item); - type = (string)UI::QueryWidget(`id("type"), `Value); - SquidACL::Replace(`replace_point, type); - SquidACL::InitWidget(type, id_item); + orig_type = (string)UI::QueryWidget(`id("type"), `Value); + SquidACL::Replace(`replace_point, orig_type); + SquidACL::InitWidget(orig_type, id_item); while (true){ ui = UI::UserInput(); @@ -544,7 +553,11 @@ }else if (ui == "type"){ type = (string)UI::QueryWidget(`id("type"), `Value); SquidACL::Replace(`replace_point, type); - SquidACL::InitWidget(type, id_item); + if (type == orig_type){ + SquidACL::InitWidget(type, id_item); + }else{ + SquidACL::InitWidget(type, nil); + } } } @@ -611,6 +624,10 @@ InitACLGroupsTable(); UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); } + }else if (ret == `del_acl){ + id_item = DelFromACLGroupsTable((integer)UI::QueryWidget(`id("acl"), `CurrentItem)); + InitACLGroupsTable(); + UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); }else if (ret == `add_http_access){ if (AddEditHttpAccessDialog(nil)){ @@ -623,8 +640,9 @@ UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); } }else if (ret == `del_http_access){ - DelFromHttpAccessTable((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); + id_item = DelFromHttpAccessTable((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); InitHttpAccessTable(); + UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); }else if (ret == `up_http_access){ id_item = MoveUpHttpAccess((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); if (id_item != nil){ -- 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] r39845 - /branches/tmp/sh/qt4-port/qt/src/YQComboBox.h
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 16:55:52 2007 New Revision: 39845 URL: http://svn.opensuse.org/viewcvs/yast?rev=39845&view=rev Log: cruft Modified: branches/tmp/sh/qt4-port/qt/src/YQComboBox.h Modified: branches/tmp/sh/qt4-port/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQComb… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQComboBox.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQComboBox.h Tue Jul 31 16:55:52 2007 @@ -21,8 +21,6 @@ #define YQComboBox_h #include <q3vbox.h> -//Added by qt3to4: -#include <qlabel.h> #include <ycp/YCPString.h> #include "YComboBox.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] r39844 - in /branches/tmp/sh/qt4-port/qt/src: YQMultiSelectionBox.cc YQTable.cc YQTree.cc
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 16:47:31 2007 New Revision: 39844 URL: http://svn.opensuse.org/viewcvs/yast?rev=39844&view=rev Log: table column stretching Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc branches/tmp/sh/qt4-port/qt/src/YQTable.cc branches/tmp/sh/qt4-port/qt/src/YQTree.cc Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMult… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc Tue Jul 31 16:47:31 2007 @@ -56,6 +56,7 @@ _qt_listview->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _qt_listview->addColumn( "" ); // QListView doesn't have one single column by default! _qt_listview->setSorting( 0, false ); + _qt_listview->header()->setStretchEnabled( true ); _qt_listview->header()->hide(); _qt_label->setBuddy( _qt_listview ); @@ -121,6 +122,7 @@ _qt_listview->blockSignals( true ); YQMultiSelectionBoxItem * item = new YQMultiSelectionBoxItem( this, _qt_listview, fromUTF8( label->value() ) ); + // _qt_listview->header()->adjustHeaderSize(); if ( item && selected ) { Modified: branches/tmp/sh/qt4-port/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTabl… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTable.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTable.cc Tue Jul 31 16:47:31 2007 @@ -92,6 +92,7 @@ setMargin( YQWidgetMargin ); _qt_listview = new Q3ListView( this ); + // _qt_listview->header()->setStretchEnabled( true ); if ( ! _enable_user_sort ) Modified: branches/tmp/sh/qt4-port/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTree… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTree.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTree.cc Tue Jul 31 16:47:31 2007 @@ -60,6 +60,7 @@ _listView = new Q3ListView( this ); _listView->setFont( YQUI::ui()->currentFont() ); _listView->addColumn( "" ); + _listView->header()->setStretchEnabled( true ); _listView->header()->hide(); _listView->setRootIsDecorated ( true ); -- 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] r39843 - in /branches/tmp/sh/qt4-port/qt/src: YQRichText.cc YQRichText.h
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 16:25:04 2007 New Revision: 39843 URL: http://svn.opensuse.org/viewcvs/yast?rev=39843&view=rev Log: fixed hyperlinks Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.cc branches/tmp/sh/qt4-port/qt/src/YQRichText.h Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRich… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.cc Tue Jul 31 16:25:04 2007 @@ -34,9 +34,9 @@ YQRichText::YQRichText( QWidget * parent, const YWidgetOpt & opt, - const YCPString & ycpText ) + const YCPString & text ) : Q3VBox( parent ) - , YRichText( opt, ycpText ) + , YRichText( opt, text ) { setWidgetRep( this ); @@ -44,20 +44,14 @@ _textBrowser = new QTextBrowser( this ); _textBrowser->setFont( YQUI::ui()->currentFont() ); + _textBrowser->setOpenLinks( false ); _textBrowser->installEventFilter( this ); _plainTextMode = opt.plainTextMode.value(); - QString text = fromUTF8( ycpText->value() ); if ( _plainTextMode ) - { _textBrowser->setLineWrapMode( QTextEdit::NoWrap ); - _textBrowser->setText( text ); - } - else - { - _textBrowser->setHtml( text ); - } + setText( text ); // Set the text foreground color to black, regardless of its current // settings - it might be changed if this widget resides in a @@ -84,8 +78,8 @@ // Propagate clicks on hyperlinks - connect( _textBrowser, SIGNAL( linkClicked( const QString & ) ), - this, SLOT ( linkClicked( const QString & ) ) ); + connect( _textBrowser, SIGNAL( anchorClicked( const QUrl & ) ), + this, SLOT ( linkClicked ( const QUrl & ) ) ); } @@ -141,10 +135,10 @@ } -void YQRichText::linkClicked( const QString & url ) +void YQRichText::linkClicked( const QUrl & url ) { - // y2debug( "Selected hyperlink \"%s\"", (const char *) url ); - YQUI::ui()->sendEvent( new YMenuEvent( YCPString( (const char *) url ) ) ); + // y2debug( "Selected hyperlink \"%s\"", (const char *) url.toString() ); + YQUI::ui()->sendEvent( new YMenuEvent( YCPString( (const char *) url.toString() ) ) ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRich… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.h Tue Jul 31 16:25:04 2007 @@ -22,6 +22,7 @@ #define YQRichText_h #include <q3vbox.h> +#include <qurl.h> #include <ycp/YCPString.h> #include "YRichText.h" @@ -88,7 +89,7 @@ /** * Notification that a hyperlink is clicked. **/ - void linkClicked( const QString & url ); + void linkClicked( const QUrl & url ); protected: @@ -103,5 +104,4 @@ }; - #endif // YQRichText_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] r39842 - in /branches/tmp/sh/qt4-port/qt/src: YQLabel.cc YQUI.h YQUIComponent.h YQUI_core.cc
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 16:08:46 2007 New Revision: 39842 URL: http://svn.opensuse.org/viewcvs/yast?rev=39842&view=rev Log: removed cruft Modified: branches/tmp/sh/qt4-port/qt/src/YQLabel.cc branches/tmp/sh/qt4-port/qt/src/YQUI.h branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Modified: branches/tmp/sh/qt4-port/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQLabe… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQLabel.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQLabel.cc Tue Jul 31 16:08:46 2007 @@ -44,7 +44,6 @@ if ( opt.isHeading.value() ) { setFont( YQUI::ui()->headingFont() ); - } else { @@ -52,7 +51,6 @@ YQUI::ui()->boldFont() : YQUI::ui()->currentFont() ); } - if ( opt.isOutputField.value() ) { Modified: branches/tmp/sh/qt4-port/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI.h… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI.h Tue Jul 31 16:08:46 2007 @@ -737,13 +737,6 @@ **/ vector<QWidget *> _popup_stack; -#ifdef FIXME_OBSOLETE - /** - * Numeric ID for defaultsize dialogs for the widget stack - **/ - int _main_dialog_id; -#endif - /** * Size for `opt(`defaultsize) dialogs. */ Modified: branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUICo… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h Tue Jul 31 16:08:46 2007 @@ -21,6 +21,9 @@ #ifndef YQUIComponent_h #define YQUIComponent_h +#define y2log_component "qt-ui" +#include <ycp/y2log.h> + #include <YUIComponent.h> #include "YQUI.h" @@ -38,7 +41,12 @@ **/ virtual YUI * createUI( int argc, char **argv, bool with_threads, const char * macro_file ) { +#ifdef FIXME_ENABLE_THREADS return new YQUI( argc, argv, with_threads, macro_file ); +#else + y2warning( "Threads don't work with Qt4 yet - threading disabled" ); + return new YQUI( argc, argv, false, macro_file ); +#endif } /** Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_c… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Tue Jul 31 16:08:46 2007 @@ -58,9 +58,6 @@ : QObject() , YUI( with_threads ) , _main_win( NULL ) -#ifdef FIXME - , _main_dialog_id(0) -#endif , _eventLoop( 0 ) , _font_family( "Sans Serif" ) , _lang_fonts( 0 ) @@ -86,23 +83,14 @@ qInstallMsgHandler( qMessageHandler ); - // DEBUG - // DEBUG - // DEBUG + // Copy command line arguments for QApplication + char ** argv_copy = (char **) malloc( (argc+1) * sizeof( const char * ) ); for ( int i=0; i < argc; i++ ) argv_copy[i+1] = strdup( argv[i] ); argv_copy[0] = strdup( "YaST2" ); - // DEBUG - // DEBUG - // DEBUG - -#if 0 - new QApplication( argc, argv_copy, - true ); // GUI enabled -#endif int argc_copy = argc; new QApplication( argc_copy, argv_copy, @@ -114,9 +102,7 @@ // Qt keeps track to a global QApplication in qApp. Q_CHECK_PTR( qApp ); -#ifdef FIXME qApp->installEventFilter( this ); -#endif processCommandLineArgs( argc_copy, argv_copy ); calcDefaultSize(); @@ -217,9 +203,7 @@ // Init other stuff -#ifdef FIXME qApp->setFont( currentFont() ); -#endif busyCursor(); connect( & _user_input_timer, SIGNAL( timeout() ), @@ -568,12 +552,6 @@ // y2milestone( "Hiding main window" ); _main_win->hide(); } -#ifdef FIXME_OBSOLETE - else - { - _widget_stack->raiseWidget( _main_dialog_id ); - } -#endif } else // non-defaultsize dialog { -- 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] r39841 - in /branches/tmp/sh/qt4-port/qt/src: YQRichText.cc YQRichText.h
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 16:08:19 2007 New Revision: 39841 URL: http://svn.opensuse.org/viewcvs/yast?rev=39841&view=rev Log: ported to Qt4 Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.cc branches/tmp/sh/qt4-port/qt/src/YQRichText.h Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRich… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.cc Tue Jul 31 16:08:19 2007 @@ -20,10 +20,11 @@ #define y2log_component "qt-ui" #include <ycp/y2log.h> -#include "qregexp.h" -//Added by qt3to4: -#include <qevent.h> +#include <qtextbrowser.h> +#include <qscrollbar.h> +#include <qregexp.h> #include <qevent.h> + #include "YEvent.h" #include "utf8.h" #include "YQUI.h" @@ -33,31 +34,30 @@ YQRichText::YQRichText( QWidget * parent, const YWidgetOpt & opt, - const YCPString & text ) + const YCPString & ycpText ) : Q3VBox( parent ) - , YRichText( opt, text ) + , YRichText( opt, ycpText ) { setWidgetRep( this ); setMargin( YQWidgetMargin ); - _textBrowser = new YQTextBrowser( this ); - _textBrowser->setMimeSourceFactory( 0 ); + _textBrowser = new QTextBrowser( this ); _textBrowser->setFont( YQUI::ui()->currentFont() ); _textBrowser->installEventFilter( this ); + _plainTextMode = opt.plainTextMode.value(); + QString text = fromUTF8( ycpText->value() ); - if ( opt.plainTextMode.value() ) + if ( _plainTextMode ) { - _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrap( Q3TextEdit::NoWrap ); + _textBrowser->setLineWrapMode( QTextEdit::NoWrap ); + _textBrowser->setText( text ); } else { - _textBrowser->setTextFormat( Qt::RichText ); + _textBrowser->setHtml( text ); } - setText( text ); - // Set the text foreground color to black, regardless of its current // settings - it might be changed if this widget resides in a @@ -70,9 +70,12 @@ pal.setNormal( normalColors ); _textBrowser->setPalette( pal ); + +#ifdef FIXME // Set the text background to a light grey _textBrowser->setPaper( QColor( 234, 234, 234 ) ); +#endif // Very small default size if specified @@ -115,11 +118,15 @@ QString text = fromUTF8( ytext->value() ); - if ( _textBrowser->textFormat() != Qt::PlainText ) + if ( ! _plainTextMode ) text.replace( "&product;", YQUI::ui()->productName() ); + if ( _plainTextMode ) + _textBrowser->setText( text ); + else + _textBrowser->setHtml( text ); + YRichText::setText( ytext ); - _textBrowser->setText( text ); if ( autoScrollDown && _textBrowser->verticalScrollBar() ) _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maxValue() ); Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRich… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.h Tue Jul 31 16:08:19 2007 @@ -22,15 +22,14 @@ #define YQRichText_h #include <q3vbox.h> -#include <q3textbrowser.h> -//Added by qt3to4: -#include <qevent.h> #include <ycp/YCPString.h> #include "YRichText.h" class YQTextBrowser; +class QTextBrowser; +class QEvent; class YQRichText : public Q3VBox, public YRichText { @@ -98,43 +97,11 @@ // Data members // - YQTextBrowser * _textBrowser; + QTextBrowser * _textBrowser; + bool _plainTextMode; bool _shrinkable; }; -/** - * Helper class - needed to have the benefits of both QVBox as the base class - * for YQRichText so uniform margins can be implemented (outside, not inside - * the scroll window as QTextBrowser normally does it) and QTextBrowser's - * featurs (enable hyperlinks) without removing the text each time the user - * clicks. - * - * This class is required only to overwrite setSource(). - **/ -class YQTextBrowser: public Q3TextBrowser -{ - Q_OBJECT - - -public: - - /** - * Constructor - **/ - YQTextBrowser( QWidget * parent = 0 ): - Q3TextBrowser( parent ) {} - -public slots: - - /** - * Get the document pointed to by a hyperlink. - * - * Reimplemented from QTextBrowser to avoid having an empty text each time - * the user clicks on a hyperlink. - **/ - virtual void setSource( const QString & name ) {} -}; - #endif // YQRichText_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] r39840 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source.cc
by lslezak＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: lslezak Date: Tue Jul 31 15:51:00 2007 New Revision: 39840 URL: http://svn.opensuse.org/viewcvs/yast?rev=39840&view=rev Log: - Pkg::SourceChangeUrl() adapted to the latest libzypp - implemented Pkg::SourceMoveDownloadArea() Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 31 15:51:00 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 31 15:49:30 CEST 2007 - lslezak(a)suse.cz + +- Pkg::SourceChangeUrl() adapted to the latest libzypp +- implemented Pkg::SourceMoveDownloadArea() + +------------------------------------------------------------------- Tue Jul 31 10:35:56 CEST 2007 - lslezak(a)suse.cz - Pkg::SourceGetCurrent() - return correct IDs (fixed nasty off Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=3… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Tue Jul 31 15:51:00 2007 @@ -1019,10 +1019,7 @@ if (repo->repoInfo().baseUrlsSize() > 1) { // store current urls - std::set<zypp::Url> baseUrls; - for (std::set<zypp::Url>::const_iterator i = repo->repoInfo().baseUrlsBegin(); - i != repo->repoInfo().baseUrlsEnd(); ++i) - baseUrls.insert(*i); + std::set<zypp::Url> baseUrls (repo->repoInfo().baseUrlsBegin(), repo->repoInfo().baseUrlsEnd()); // reset url list and store the new one there repo->repoInfo().setBaseUrl(zypp::Url(u->value())); @@ -2083,23 +2080,21 @@ YCPValue PkgModuleFunctions::SourceMoveDownloadArea (const YCPString & path) { -#warning SourceMoveDownloadArea is NOT implemented -// TODO FIXME - /* try { - y2milestone( "Moving download area of all sources to %s", path->value().c_str()) ; - zypp::SourceManager::sourceManager()->reattachSources (path->value()); + y2milestone("Moving download area of all sources to %s", path->value().c_str()); + zypp::media::MediaManager manager; + manager.setAttachPrefix(path->value()); } catch (zypp::Exception & excpt) { _last_error.setLastError(excpt.asUserString()); - y2error("Pkg::SourceMoveDownloadArea has failed: %s", excpt.msg().c_str() ); + y2error("Pkg::SourceMoveDownloadArea has failed: %s", excpt.msg().c_str()); return YCPBoolean(false); } y2milestone( "Download areas moved"); -*/ + return YCPBoolean(true); } -- 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] r39839 - /trunk/slide-show/SuSELinux/slideshow.xml
by keichwa＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: keichwa Date: Tue Jul 31 15:32:40 2007 New Revision: 39839 URL: http://svn.opensuse.org/viewcvs/yast?rev=39839&view=rev Log: update by Sabine Modified: trunk/slide-show/SuSELinux/slideshow.xml Modified: trunk/slide-show/SuSELinux/slideshow.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/SuSELinux/slideshow.x… ============================================================================== --- trunk/slide-show/SuSELinux/slideshow.xml (original) +++ trunk/slide-show/SuSELinux/slideshow.xml Tue Jul 31 15:32:40 2007 @@ -32,21 +32,19 @@ <para>This distribution is created by the openSUSE.org project. The openSUSE project, sponsored by Novell, is a collaborative community effort to deliver the world's most usable open source computing - platform, the openSUSE distribution. Hosted at opensuse.org, the - project features a transparent development process, simple - participation models, extensive development tools, and easy access - to builds and releases for everyone. Visit www.opensuse.org to learn - how you can join the openSUSE community.</para> - </section> + platform, the openSUSE distribution. Hosted at opensuse.org, many individuals + are involved in packaging software, testing programs, writing documentation, + and also localizing components.</para> + + <para>openSUSE is available in many languages. Localization for openSUSE + specific software is done by community-driven language teams. Find the + localization portal at http://i18n.opensuse.org/ .</para> + + <para>Visit www.opensuse.org to learn how you can join the openSUSE + community.</para> + + - <section label="02_05_localization"> - <title>openSUSE Localization</title> - - <para>The openSUSE project is a community project and many individuals are - involved in packaging software, testing programs, writing documentation, and - also localizing components. Localization for openSUSE specific software is - done by language teams. Find the localization portal at - http://i18n.opensuse.org/ .</para> </section> <section label="03_connect"> @@ -56,14 +54,14 @@ browsing and e-mail management and even includes the newest Internet-based phone technology.</para> - <para>The Firefox Web browser is the best Web browser in the market. It + <para>The Firefox Web browser is one of the best Web browser in the market. It boasts a complete set of browser features, including Java, Adobe Reader, RealPlayer, and Macromedia Flash plug-ins, plus lightning-fast performance.</para> <para>Novell Evolution and Kontact are complete e-mail and contact managers that you can use to manage all your mail accounts. openSUSE also includes - Linphone and Twinkle, Internet-based (VoIP) solutions that let you call + state-of-the-art Internet-based (VoIP) solutions that let you call people connected to the Internet all over the world.</para> </section> @@ -82,21 +80,20 @@ <title>Documents, Spreadsheets, and More</title> <para>openSUSE &suse-version; comes complete with the latest version of the - leading Linux productivity suite, OpenOffice.org 2.0. Openoffice.org includes + leading Linux productivity suite, OpenOffice.org. Openoffice.org includes a word processor, spreadsheet application, HTML editor, presentation designer, and database. It also reads and writes files you can use with popular non-Linux productivity software. It is the perfect choice for reports, papers, home budgets, and simple graphics.</para> - </section> <section label="06_graphics"> <title>Graphics, Graphics, Graphics</title> - <para>With the tools in openSUSE, you can create or edit practically any - kind of graphics. For advanced image manipulation and graphics creation, use - the GIMP, a complete image retouching, composition, and - authoring tool. GIMP has enough features to satisfy the most exacting - artist.</para> + + <para>With the tools in openSUSE, you can create or edit practically any kind + of graphics. For advanced image manipulation and graphics creation, use + powerful tools like the GIMP, a complete image retouching, composition, and + authoring tool. </para> <para>For vector graphics, try Inkscape, a versatile graphics solution complete with support for transparent layers, bitmap tracing, text paths, and @@ -104,82 +101,64 @@ </section> -<section label="07_kde"> - <title>The Latest Desktop Innovations</title> - <para>openSUSE provides you with a choice of the most usable graphical - desktop environments. Choose from the most up-to-date Linux graphical - environments--GNOME and KDE--each combining ease of use, - contemporary functionality, and outstanding graphical design with the - technological superiority of the Linux operating system.</para> - - </section> - <section label="08_mobility"> <title>Computing On-the-Go</title> - <para>If you run Linux on a laptop, you will be glad you chose openSUSE. It - includes the most advanced mobility features. Switch between wireless and - wired networks with our NetworkManager, connect with mobile phones and PDAs - that support Bluetooth, and even use infrared ports to synchronize with cell - phones or PalmOS devices. Of course, USB memory sticks are no - problem. Finally, new power management features give you the option to - "suspend" your session, saving it to disk or RAM. Not only does suspend allow - you to turn off and restart the system faster, but when you do restart, - you are exactly where you were when you stopped.</para> + <para> openSUSE includes the most advanced mobility features. Switch between + wireless and wired networks using NetworkManager. Connect with mobile devices + like mobile phones and PDAs via Bluetooth. Use infrared ports to synchronize + your data. Newest innovations in power management increase your + mobility.</para> </section> <section label="09_security"> <title>Keep Your System Secure and Up-to-Date</title> - <para>If your system is connected to the Internet, SUSE Firewall helps secure - your system and data from Internet - intruders. Leaving it activated gives you enormous protection and configuring - it to your needs takes only a moment. openSUSE also includes AppArmor, - the most effective and easy-to-use Linux application + + <para>SUSE Firewall helps secure your system and data from Internet + intruders. It is activated by default and easy to configure. openSUSE also + includes AppArmor, the most effective and easy-to-use Linux application security system available today. It proactively protects the operating system and applications from external or internal threats.</para> - <para>openSUSE also includes a special security patch update system. As - security patches are created for the Linux kernel and packages included in - openSUSE, we make those available to you on a special update server. To + <para>openSUSE also includes a special security patch update system. To ensure that the latest security patches are installed on your system, choose to perform an online update at the end of this installation - procedure. In the future, the update system keeps you informed of the - availability of important security updates, so you can install them at your - convenience. + procedure. In the future, you will be informed of the availability of + important security updates, so you can install them at your convenience. </para> </section> <section label="10_devel"> - <title>Powerful Home Networking and Application Development Tools</title> + <title>Virtualization Technology and Application Development Tools</title> - <para>openSUSE includes tools for network file sharing and printing (Samba), - Web hosting (Apache), and virtualization (Xen). For application development, + <para>openSUSE includes the highest performing virtualization software, the + XEN hypervisor. In addition, openSUSE provides tools for network file + sharing, printing (Samba) and Web hosting (Apache). For application development, openSUSE comes with a complete set of runtime environments plus extensive - application development tools, including KDevelop, Eclipse, and Mono. That - means that if you can imagine it, you can probably build it with openSUSE. - At openSUSE.org, you can join with thousands of other openSUSE - users to collaborate and create powerful new packages that you can - use.</para> + application development tools, including KDevelop, Eclipse, and Mono. Almost + everything can be build with openSUSE.</para> + + <para>Join openSUSE.org to collaborate. Create and share new packages for + multiple Linux distribution using the unique and powerful openSUSE Build + Service.</para> </section> <section label="11_docs"> - <title>Learn More with Documentation</title> - <para>openSUSE includes both SUSE-specific and general Linux - documentation. The SUSE Help Center, available from the main menu or - with the susehelp command, provides one-stop access to all the help - included with your system. For example, use it to read the SUSE manuals, - man pages, and info pages. If you want to print your own copy of the - manuals, you can download a PDF version. Find the URL for the PDFs at -  - http://en.opensuse.org/Documentation. +(http://en.opensuse.org/Documentation). </para> <para> - Even more documentation is available in the openSUSE wiki at + Even more information is available in the openSUSE wiki at  http://en.opensuse.org/. In Documentation, find links to all sorts of @@ -193,9 +172,9 @@ <section label="12_novell"> <title>Novell and Linux</title> <para> -Novell is committed to your success with Linux. -Besides openSUSE, Novell delivers an exciting suite of products designed - to meet the needs of businesses large and small.</para> +Novell is committed to your success with Linux. Besides openSUSE, Novell +delivers an exciting suite of products designed to meet the needs of businesses +large and small.</para> <para> The enterprise Linux products from Novell include SUSE Linux Enterprise Server, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0