- YaST Commits

[yast-commit] r38332 - in /branches/SuSE-SLE-10-SP2-Branch/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 10:50:30 2007 New Revision: 38332 URL: http://svn.opensuse.org/viewcvs/yast?rev=38332&view=rev Log: - do not offer disabling DHCP changes of hostname when it is already disabled (#169260) - 2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION Thu Jun 7 10:50:30 2007 @@ -1 +1 @@ -2.13.37 +2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes Thu Jun 7 10:50:30 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 7 10:26:06 CEST 2007 - jsuchome(a)suse.cz + +- do not offer disabling DHCP changes of hostname when + it is already disabled (#169260) +- 2.13.38 + +------------------------------------------------------------------- Thu Jun 7 09:10:03 CEST 2007 - jsuchome(a)suse.cz - removed Browse button (#240045) Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp Thu Jun 7 10:50:30 2007 @@ -118,6 +118,9 @@ ], ]; +// network configuration (to be read from NetworkConfig module) +global map network_setup = $[]; + /** * Return list of architecture specific packages (derived from package list * given as parameter) merged with the packages in parameter @@ -454,6 +457,10 @@ Autologin::Read(); + // read network settings (for bug 169260: do not allow DHCP to change the hostname) + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + // finished Progress::NextStage(); globals_configured = true; @@ -513,11 +520,14 @@ // write progress step steps = add (steps, _("Writing Kerberos configuration...")); } - // hack for bug 169260: do not allow DHCP to change the hostname + // bug 169260: do not allow DHCP to change the hostname if (winbind_enabled && disable_dhcp_hostname) { - NetworkConfig::Read (); - map network_setup = NetworkConfig::Export (); + if (network_setup == $[]) + { + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + } network_setup["dhcp","DHCLIENT_SET_HOSTNAME"] = "no"; NetworkConfig::Import (network_setup); NetworkConfig::Write (); Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Thu Jun 7 10:50:30 2007 @@ -378,7 +378,9 @@ Autologin::AskForDisabling(_("Samba is now enabled.")); } } - if (Mode::config () || (Stage::cont() && Samba::in_domain == `ok)) + if (Mode::config () || + (Stage::cont() && Samba::in_domain == `ok && + Samba::network_setup["dhcp","DHCLIENT_SET_HOSTNAME"]:"yes" == "yes")) { // yes/no popup text Samba::disable_dhcp_hostname = Popup::YesNo (_("In a Microsoft environment, -- 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] r38331 - in /trunk/yast2: library/packages/src/PackageSystem.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: lslezak Date: Thu Jun 7 10:26:24 2007 New Revision: 38331 URL: http://svn.opensuse.org/viewcvs/yast?rev=38331&view=rev Log: - speed up PackageSystem::InstallKernel() - call rpm directly instead of starting the package manager Modified: trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Thu Jun 7 10:26:24 2007 @@ -322,6 +322,32 @@ return true; // nothing to do } + // check whether tag "kernel" is provided + // do not initialize the package manager if it's not necessary + string rpm_command = "/bin/rpm -q --whatprovides kernel"; + y2milestone("Starting RPM query: %1", rpm_command); + map output = (map)SCR::Execute(.target.bash_output, rpm_command); + y2debug("result of the query: %1", output); + + if (output["exit"]:-1 == 0) + { + list<string> packages = splitstring(output["stdout"]:"", "\n"); + packages = filter(string pkg, packages, {return pkg != "";}); + y2milestone("Packages providing tag 'kernel': %1", packages); + + if (size(packages) > 0) + { + return true; + } + + y2milestone("Huh? Kernel is not installed??"); + } + else + { + y2warning("RPM query failed, quering the package manager..."); + } + + EnsureTargetInit (); list <list> provides = Pkg::PkgQueryProvides ("kernel"); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jun 7 10:26:24 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 10:14:06 CEST 2007 - lslezak(a)suse.cz + +- speed up PackageSystem::InstallKernel() - call rpm directly + instead of starting the package manager + +------------------------------------------------------------------- Tue Jun 5 21:22:50 CEST 2007 - locilka(a)suse.cz - Extended PackageLock::Check function to allow to 'Retry' getting -- 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] r38330 - in /trunk/kdump/src: Kdump.ycp dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: juhliarik Date: Thu Jun 7 10:16:53 2007 New Revision: 38330 URL: http://svn.opensuse.org/viewcvs/yast?rev=38330&view=rev Log: added init function for inicialization KDUMP_SAVEDIR Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=38330&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Jun 7 10:16:53 2007 @@ -248,6 +248,11 @@ */ boolean ReadAvailableMemory () { + + //list <any> fero = ["stano" , 45]; + //y2milestone("[kdump] (ReadAvailableMemory) before fero: %1", fero); + //add(fero, nil); + //y2milestone("[kdump] (ReadAvailableMemory) after fero: %1", fero); list <map> output = (list<map>)SCR::Read(.probe.memory); y2milestone("[kdump] (ReadAvailableMemory) SCR::Read(.probe.memory): %1", output); Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38330&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Thu Jun 7 10:16:53 2007 @@ -233,7 +233,7 @@ `Left(`Label(`id("usable_memory"),"0123456789")), `HStretch () )), - `Left(`IntField(`id("memory_buffer"), `opt(`notify), _("Kdump Memor&y [MB]"),128,4096,128)) + `Left(`IntField(`id("memory_buffer"), `opt(`notify), _("Kdump Memor&y [MB]"),128,1048576,128)) )), "init" : InitKdumpMemory, "handle" : HandleKdumpMemory, Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Thu Jun 7 10:16:53 2007 @@ -39,6 +39,22 @@ boolean set_kdump_append = false; +/** + * map of values for "KDUMP_SAVEDIR" + * + * local map <string, string > + */ +map <string, string > KDUMP_SAVE_TARGET = $[ + "target" : "file", // ftp, ssh, nfs, cifs + "server" : "", + "dir" : "", + "user_name" : "", // anonymous + "port" : "", // deafults ftp: 21 ssh:22 + "share" : "", + "password" : "", +]; + + term local_filesystem = `VBox( `Frame(_("Local Filesystem"),`HBox(`HSpacing(1),`VBox( `Left(`ComboBox(`id("local_partitions"), "&The list of available paritions of all disks with filesystem")), @@ -68,11 +84,15 @@ term ftp = `VBox( `Frame(_("FTP"),`HBox(`HSpacing(1),`VBox( - `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), + `Left(`HBox( + `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), + `Left(`TextEntry(`id ("port"), _("P&ort"))), + `HStretch () + )), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), `Left(`CheckBox(`id ("anonymous"), `opt (`notify),_("&Anonymous"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), + `Left(`TextEntry(`id ("user_name"), _("&User Name"))), // password entry `Left(`Password(`id ("password"), _("&Password"))) ))) @@ -88,9 +108,7 @@ )), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), - // password entry - `Left(`Password(`id ("password"), _("&Password"))) + `Left(`TextEntry(`id ("user_name"), _("&User Name"))) ))) ); @@ -113,7 +131,7 @@ `Left(`TextEntry(`id ("share"), _("Sha&re"))), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), + `Left(`TextEntry(`id ("user_name"), _("&User Name"))), // password entry `Left(`Password(`id ("password"), _("&Password"))) ))) @@ -146,6 +164,88 @@ } +/** + * Function for handling map values + * + * local map <string, string > KDUMP_SAVE_TARGET + */ + +boolean SetUpKDUMP_SAVE_TARGET(string target) { + + string parse_target = target; + if (target != "") { + integer pos = find(parse_target, "/"); + integer pos1 = -1; + KDUMP_SAVE_TARGET["target"]=substring(parse_target,0,pos-1); + parse_target = substring(parse_target,pos+2); + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + KDUMP_SAVE_TARGET["dir"]=parse_target; + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + pos = find(parse_target, ":"); + pos1 = pos; + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["share"]=substring(parse_target,pos1+1,pos-(pos1+1)); + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + pos = find(parse_target, "@"); + if (pos != -1) { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); + parse_target = substring(parse_target,pos+1); + } + pos1 = find(parse_target, ":"); + pos = find(parse_target, "/"); + if (pos1 !=-1) { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); + } else { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + } + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else if ((KDUMP_SAVE_TARGET["target"]:nil == "ftp") + || (KDUMP_SAVE_TARGET["target"]:nil == "cifs")) { + + pos = find(parse_target, "@"); + if (pos != -1) { + string user_pas = substring(parse_target,0,pos); + pos1 = find(user_pas, ":"); + if (pos1 != -1) { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["password"]=substring(parse_target,pos1+1,pos); + } else { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); + } + parse_target = substring(parse_target,pos+1); + } + if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + pos1 = find(parse_target, ":"); + pos = find(parse_target, "/"); + if (pos1 !=-1) { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); + } else { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + } + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else { + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + parse_target = substring(parse_target,pos+1); + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["share"]=substring(parse_target,0,pos); + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } + + } + + + return true; + } else { + return false; + } + +} + /** * Function initializes option "Kdump Command Line" @@ -153,10 +253,68 @@ */ void InitTargetKdump (string key) { - UI::ReplaceWidget (`id ("Network"), `Empty()); - UI::ReplaceWidget (`id ("Targets"), local_filesystem); - UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); - y2milestone("[kdump] (InitTargetKdump) Kdump::available_partitions %1", Kdump::available_partitions); + + SetUpKDUMP_SAVE_TARGET(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil); + //Popup::Message(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil); + //Popup::Message(KDUMP_SAVE_TARGET["target"]:nil); + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + UI::ChangeWidget(`id ("local_filesystem"), `Value, true); + UI::ReplaceWidget (`id ("Network"), `Empty()); + UI::ReplaceWidget (`id ("Targets"), local_filesystem); + UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); + y2milestone("[kdump] (InitTargetKdump) Kdump::available_partitions %1", Kdump::available_partitions); + UI::ChangeWidget(`id ("dir_save_image"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), nfs); + UI::ChangeWidget(`id ("nfs"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("share"), `Value, KDUMP_SAVE_TARGET["share"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), ssh); + UI::ChangeWidget(`id ("ssh"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("port"), `Value, KDUMP_SAVE_TARGET["port"]:nil); + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), ftp); + UI::ChangeWidget(`id ("ftp"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("port"), `Value, KDUMP_SAVE_TARGET["port"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + if (KDUMP_SAVE_TARGET["user_name"]:nil == "") { + UI::ChangeWidget(`id ("user_name"), `Enabled, false); + UI::ChangeWidget(`id ("password"), `Enabled, false); + UI::ChangeWidget(`id ("anonymous"), `Value, true); + } else { + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("password"), `Value, KDUMP_SAVE_TARGET["password"]:nil); + } + } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), smb); + UI::ChangeWidget(`id ("smb"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + UI::ChangeWidget(`id ("share"), `Value, KDUMP_SAVE_TARGET["share"]:nil); + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("password"), `Value, KDUMP_SAVE_TARGET["password"]: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] r38329 - /tags/branch-SLE-10-SP2-2_13_37/samba-client/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 09:29:20 2007 New Revision: 38329 URL: http://svn.opensuse.org/viewcvs/yast?rev=38329&view=rev Log: Created tag branch-SLE-10-SP2-2_13_37 for samba-client Added: tags/branch-SLE-10-SP2-2_13_37/samba-client/ - copied from r38328, branches/SuSE-SLE-10-SP2-Branch/samba-client/ -- 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] r38328 - /tags/branch-SLE-10-SP2-2_13_37/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 09:29:19 2007 New Revision: 38328 URL: http://svn.opensuse.org/viewcvs/yast?rev=38328&view=rev Log: Created tag branch-SLE-10-SP2-2_13_37 Added: tags/branch-SLE-10-SP2-2_13_37/ -- 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] r38327 - in /branches/SuSE-SLE-10-SP2-Branch/samba-client: VERSION package/yast2-samba-client.changes src/dialogs.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 09:28:51 2007 New Revision: 38327 URL: http://svn.opensuse.org/viewcvs/yast?rev=38327&view=rev Log: - removed Browse button (#240045) - 2.13.37 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION Thu Jun 7 09:28:51 2007 @@ -1 +1 @@ -2.13.36 +2.13.37 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes Thu Jun 7 09:28:51 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 09:10:03 CEST 2007 - jsuchome(a)suse.cz + +- removed Browse button (#240045) +- 2.13.37 + +------------------------------------------------------------------- Mon Mar 26 06:52:46 CEST 2007 - jsuchome(a)suse.cz - added autoyast support for disabling DHCLIENT_SET_HOSTNAME (#169260) Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Thu Jun 7 09:28:51 2007 @@ -209,12 +209,7 @@ `TextEntry(`id(`workgroup), (Stage::cont() ? _("&Domain") : // translators: text entry label - _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()), - `VBox ( - `Label(""), - // translators: push button label - `PushButton(`id(`browse), _("Br&owse...")) - ) + _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()) ), status_term, winbind_term, @@ -263,9 +258,6 @@ Wizard::HideBackButton(); check_domain_membership (Samba::GetWorkgroupOrRealm()); } - if (Mode::config ()) { - UI::ChangeWidget (`id(`browse), `Enabled, false); - } any ret = nil; while(true) { @@ -432,15 +424,6 @@ ")); } break; - } else if (ret == `browse) { - - string new_workgroup = BrowseNeighbours( Stage::cont() ); - if( new_workgroup != nil && new_workgroup != "" ) { - // fill in the new workgroup name - UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup ); - check_domain_membership (new_workgroup); - } - continue; } else if (ret == `back ) { break; } Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp Thu Jun 7 09:28:51 2007 @@ -174,54 +174,6 @@ /** - * Show a selection popup to select a workgroup from the ones existing on LAN. - * - * @return string chosen workgroup or nil if cancelled - */ -define string BrowseNeighbours(boolean domains_only) ``{ - list<string> groups = nil; - - UI::OpenDialog ( - // popup window - `Label (_("Looking for available workgroups and domains..."))); - - UI::BusyCursor (); - - if (domains_only) { - groups = SambaNmbLookup::GetAvailableDomains(); - } else { - groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)")); - } - - UI::CloseDialog (); - if( groups == nil ) return nil; - groups = filter (string group, groups, ``(size (group) > 0)); - - // let the user choose a workgroup - UI::OpenDialog( `VBox( - `HSpacing (36), - // translators: selection box label - `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups), - `HBox( - `PushButton( `id(`ok), Label::OKButton() ), - `PushButton( `id(`cancel), Label::CancelButton() ) - ) - ) ); - - any ret = UI::UserInput(); - string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem ); - // textentry constant (automatically added to some kind of values) - if ( sel != nil && issubstring (sel, _(" (Domain)") ) ) - { - integer pos = search (sel, _(" (Domain)") ); - sel = (pos == nil) ? sel : substring (sel, 0, pos); - } - UI::CloseDialog(); - return ret == `ok ? sel : nil; -} - - -/** * Check if user shares already exist * @param path to directory with shares */ -- 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] r38326 - in /trunk/installation/startup: Second-Stage/S07-medium common/misc.sh
by aschnell＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: aschnell Date: Wed Jun 6 19:02:37 2007 New Revision: 38326 URL: http://svn.opensuse.org/viewcvs/yast?rev=38326&view=rev Log: - fixed some typos Modified: trunk/installation/startup/Second-Stage/S07-medium trunk/installation/startup/common/misc.sh Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Wed Jun 6 19:02:37 2007 @@ -17,7 +17,7 @@ fi #============================================= -# 11.1) activate network if counfiguration found +# 11.1) activate network if configuration found #--------------------------------------------- if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then log "\tnetwork configuration found -> activate network" Modified: trunk/installation/startup/common/misc.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/misc… ============================================================================== --- trunk/installation/startup/common/misc.sh (original) +++ trunk/installation/startup/common/misc.sh Wed Jun 6 19:02:37 2007 @@ -60,7 +60,7 @@ # if the installation is ssh based, TERM is not allowed to # be overwritten by the value of install.inf. The TERM value # of install.inf points to the console and not to the remote - # terminal type. Therefore the previosly set terminal type + # terminal type. Therefore the previously set terminal type # from the remote terminal is restored # ---- if [ "$UseSSH" = 1 ];then @@ -186,7 +186,7 @@ #----[ disable_splash ]-----# function disable_splash () { #-------------------------------------------------- -# disable splash sceen. This means be verbose and +# disable splash screen. This means be verbose and # show the kernel messages # --- [ -f /proc/splash ] && echo "verbose" > /proc/splash -- 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] r38325 - /branches/tmp/sh/mod-ui/qt/src/
by sh-sh-sh＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: sh-sh-sh Date: Wed Jun 6 16:55:19 2007 New Revision: 38325 URL: http://svn.opensuse.org/viewcvs/yast?rev=38325&view=rev Log: new base method name Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc branches/tmp/sh/mod-ui/qt/src/YQAlignment.h branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc branches/tmp/sh/mod-ui/qt/src/YQComboBox.h branches/tmp/sh/mod-ui/qt/src/YQDate.cc branches/tmp/sh/mod-ui/qt/src/YQDate.h branches/tmp/sh/mod-ui/qt/src/YQDialog.cc branches/tmp/sh/mod-ui/qt/src/YQDialog.h branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h branches/tmp/sh/mod-ui/qt/src/YQFrame.cc branches/tmp/sh/mod-ui/qt/src/YQFrame.h branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h branches/tmp/sh/mod-ui/qt/src/YQIntField.cc branches/tmp/sh/mod-ui/qt/src/YQIntField.h branches/tmp/sh/mod-ui/qt/src/YQLabel.cc branches/tmp/sh/mod-ui/qt/src/YQLabel.h branches/tmp/sh/mod-ui/qt/src/YQLogView.cc branches/tmp/sh/mod-ui/qt/src/YQLogView.h branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h branches/tmp/sh/mod-ui/qt/src/YQRichText.cc branches/tmp/sh/mod-ui/qt/src/YQRichText.h branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h branches/tmp/sh/mod-ui/qt/src/YQSlider.cc branches/tmp/sh/mod-ui/qt/src/YQSlider.h branches/tmp/sh/mod-ui/qt/src/YQSplit.cc branches/tmp/sh/mod-ui/qt/src/YQSplit.h branches/tmp/sh/mod-ui/qt/src/YQSquash.cc branches/tmp/sh/mod-ui/qt/src/YQSquash.h branches/tmp/sh/mod-ui/qt/src/YQTable.cc branches/tmp/sh/mod-ui/qt/src/YQTable.h branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h branches/tmp/sh/mod-ui/qt/src/YQTime.cc branches/tmp/sh/mod-ui/qt/src/YQTime.h branches/tmp/sh/mod-ui/qt/src/YQTree.cc branches/tmp/sh/mod-ui/qt/src/YQTree.h branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQAlignm… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc Wed Jun 6 16:55:19 2007 @@ -37,7 +37,7 @@ } -void YQAlignment::setEnabling( bool enabled ) +void YQAlignment::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQAlignm… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQAlignment.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQAlignment.h Wed Jun 6 16:55:19 2007 @@ -52,7 +52,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc Wed Jun 6 16:55:19 2007 @@ -52,7 +52,7 @@ } -void YQBarGraph::setEnabling( bool enabled ) +void YQBarGraph::setEnabled( bool enabled ) { _barGraph->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h Wed Jun 6 16:55:19 2007 @@ -43,7 +43,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc Wed Jun 6 16:55:19 2007 @@ -129,7 +129,7 @@ } -void YQCheckBox::setEnabling( bool enabled ) +void YQCheckBox::setEnabled( bool enabled ) { _qt_checkbox->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc Wed Jun 6 16:55:19 2007 @@ -65,7 +65,7 @@ } -void YQCheckBoxFrame::setEnabling( bool enabled ) +void YQCheckBoxFrame::setEnabled( bool enabled ) { if ( enabled ) { Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Set the size. Modified: branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQColore… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc Wed Jun 6 16:55:19 2007 @@ -51,7 +51,7 @@ } -void YQColoredLabel::setEnabling( bool enabled ) +void YQColoredLabel::setEnabled( bool enabled ) { QLabel::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQColore… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc Wed Jun 6 16:55:19 2007 @@ -137,7 +137,7 @@ } -void YQComboBox::setEnabling( bool enabled ) +void YQComboBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_combo_box->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.h Wed Jun 6 16:55:19 2007 @@ -45,7 +45,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQDate.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDate.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDate.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDate.cc Wed Jun 6 16:55:19 2007 @@ -65,7 +65,7 @@ } -void YQDate::setEnabling( bool enabled ) +void YQDate::setEnabled( bool enabled ) { setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDate.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDate.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDate.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDate.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDialog… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDialog.cc Wed Jun 6 16:55:19 2007 @@ -147,7 +147,7 @@ } -void YQDialog::setEnabling( bool enabled ) +void YQDialog::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDialog… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDialog.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDialog.h Wed Jun 6 16:55:19 2007 @@ -81,7 +81,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the new size of the widget. Modified: branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDownlo… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc Wed Jun 6 16:55:19 2007 @@ -58,7 +58,7 @@ } -void YQDownloadProgress::setEnabling( bool enabled ) +void YQDownloadProgress::setEnabled( bool enabled ) { _qt_progress->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDownlo… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDumbTa… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc Wed Jun 6 16:55:19 2007 @@ -89,7 +89,7 @@ } -void YQDumbTab::setEnabling( bool enabled ) +void YQDumbTab::setEnabled( bool enabled ) { QVBox::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDumbTa… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQFrame.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQFrame.cc Wed Jun 6 16:55:19 2007 @@ -39,7 +39,7 @@ setWidgetRep ( this ); } -void YQFrame::setEnabling( bool enabled ) +void YQFrame::setEnabled( bool enabled ) { QFrame::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQFrame.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQFrame.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQFrame.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Set the size. Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQGeneri… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc Wed Jun 6 16:55:19 2007 @@ -68,12 +68,12 @@ } -void YQGenericButton::setEnabling( bool enabled ) +void YQGenericButton::setEnabled( bool enabled ) { if ( _qPushButton ) _qPushButton->setEnabled( enabled ); - YWidget::setEnabling( enabled ); + YWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQGeneri… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h Wed Jun 6 16:55:19 2007 @@ -60,7 +60,7 @@ * * Reimplemented from YWidget. **/ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Returns 'true' if this button is enabled, 'false' otherwise. Modified: branches/tmp/sh/mod-ui/qt/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQIntFie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQIntField.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQIntField.cc Wed Jun 6 16:55:19 2007 @@ -60,7 +60,7 @@ } -void YQIntField::setEnabling( bool enabled ) +void YQIntField::setEnabled( bool enabled ) { _qt_label->setEnabled ( enabled ); _qt_spinbox->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQIntFie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQIntField.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQIntField.h Wed Jun 6 16:55:19 2007 @@ -54,7 +54,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLabel.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLabel.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLabel.cc Wed Jun 6 16:55:19 2007 @@ -63,7 +63,7 @@ } -void YQLabel::setEnabling( bool enabled ) +void YQLabel::setEnabled( bool enabled ) { QLabel::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLabel.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLabel.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLabel.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.cc Wed Jun 6 16:55:19 2007 @@ -59,7 +59,7 @@ } -void YQLogView::setEnabling( bool enabled ) +void YQLogView::setEnabled( bool enabled ) { _qt_text->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMenuBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ } void -YQMenuButton::setEnabling( bool enabled ) +YQMenuButton::setEnabled( bool enabled ) { _qt_pushbutton->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMenuBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiL… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc Wed Jun 6 16:55:19 2007 @@ -66,7 +66,7 @@ } -void YQMultiLineEdit::setEnabling( bool enabled ) +void YQMultiLineEdit::setEnabled( bool enabled ) { _qt_textedit->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiL… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiP… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc Wed Jun 6 16:55:19 2007 @@ -355,7 +355,7 @@ } -void YQMultiProgressMeter::setEnabling( bool enabled ) +void YQMultiProgressMeter::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); QWidget::update(); Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiP… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Wed Jun 6 16:55:19 2007 @@ -107,7 +107,7 @@ void -YQMultiSelectionBox::setEnabling( bool enabled ) +YQMultiSelectionBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_listview->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPartit… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc Wed Jun 6 16:55:19 2007 @@ -142,7 +142,7 @@ } -void YQPartitionSplitter::setEnabling( bool enabled ) +void YQPartitionSplitter::setEnabled( bool enabled ) { _qt_freeFieldLabel->setEnabled ( enabled ); _qt_newPartFieldLabel->setEnabled ( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPartit… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h Wed Jun 6 16:55:19 2007 @@ -58,7 +58,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc Wed Jun 6 16:55:19 2007 @@ -61,7 +61,7 @@ } -void YQProgressBar::setEnabling( bool enabled ) +void YQProgressBar::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_progressbar->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * Inherited from YWidget: Sets the enabled state of the * widget. Disabling a progress bar makes it grey */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc Wed Jun 6 16:55:19 2007 @@ -104,7 +104,7 @@ } -void YQRadioButton::setEnabling( bool enabled ) +void YQRadioButton::setEnabled( bool enabled ) { _qt_radiobutton->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h Wed Jun 6 16:55:19 2007 @@ -63,7 +63,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc Wed Jun 6 16:55:19 2007 @@ -66,7 +66,7 @@ } -void YQRadioButtonGroup::setEnabling( bool enabled ) +void YQRadioButtonGroup::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h Wed Jun 6 16:55:19 2007 @@ -61,7 +61,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Resize this widget Modified: branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQReplac… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc Wed Jun 6 16:55:19 2007 @@ -40,7 +40,7 @@ } -void YQReplacePoint::setEnabling( bool enabled ) +void YQReplacePoint::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQReplac… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.cc Wed Jun 6 16:55:19 2007 @@ -83,7 +83,7 @@ } -void YQRichText::setEnabling( bool enabled ) +void YQRichText::setEnabled( bool enabled ) { _textBrowser->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.h Wed Jun 6 16:55:19 2007 @@ -47,7 +47,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc Wed Jun 6 16:55:19 2007 @@ -129,7 +129,7 @@ } -void YQSelectionBox::setEnabling( bool enabled ) +void YQSelectionBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_listbox->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSlider… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSlider.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSlider.cc Wed Jun 6 16:55:19 2007 @@ -75,7 +75,7 @@ } -void YQSlider::setEnabling( bool enabled ) +void YQSlider::setEnabled( bool enabled ) { _qt_label->setEnabled ( enabled ); _qt_slider->setEnabled ( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSlider… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSlider.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSlider.h Wed Jun 6 16:55:19 2007 @@ -55,7 +55,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQSplit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSplit.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSplit.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSplit.cc Wed Jun 6 16:55:19 2007 @@ -33,7 +33,7 @@ } -void YQSplit::setEnabling( bool enabled ) +void YQSplit::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQSplit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSplit.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSplit.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSplit.h Wed Jun 6 16:55:19 2007 @@ -43,7 +43,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Inherited from YWidget. Sets the new size of the widget. Modified: branches/tmp/sh/mod-ui/qt/src/YQSquash.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSquash… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSquash.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSquash.cc Wed Jun 6 16:55:19 2007 @@ -31,7 +31,7 @@ } -void YQSquash::setEnabling( bool enabled ) +void YQSquash::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQSquash.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSquash… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSquash.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSquash.h Wed Jun 6 16:55:19 2007 @@ -44,7 +44,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.cc Wed Jun 6 16:55:19 2007 @@ -171,7 +171,7 @@ } -void YQTable::setEnabling( bool enabled ) +void YQTable::setEnabled( bool enabled ) { _qt_listview->setEnabled( enabled ); _qt_listview->triggerUpdate(); Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTextEn… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc Wed Jun 6 16:55:19 2007 @@ -105,7 +105,7 @@ } -void YQTextEntry::setEnabling( bool enabled ) +void YQTextEntry::setEnabled( bool enabled ) { _qt_lineEdit->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTextEn… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h Wed Jun 6 16:55:19 2007 @@ -96,7 +96,7 @@ * * Reimplemented from YWidget. **/ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTime.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTime.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTime.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTime.cc Wed Jun 6 16:55:19 2007 @@ -64,7 +64,7 @@ } -void YQTime::setEnabling( bool enabled ) +void YQTime::setEnabled( bool enabled ) { setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTime.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTime.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTime.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTime.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTree.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTree.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTree.cc Wed Jun 6 16:55:19 2007 @@ -98,7 +98,7 @@ void -YQTree::setEnabling( bool enabled ) +YQTree::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _listView->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTree.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTree.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTree.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Wed Jun 6 16:55:19 2007 @@ -1811,7 +1811,7 @@ return; if ( button ) - button->setEnabling( enabled ); + button->setEnabled( enabled ); } -- 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] r38324 - /branches/tmp/sh/mod-ui/core/libyui/src/
by sh-sh-sh＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: sh-sh-sh Date: Wed Jun 6 16:55:02 2007 New Revision: 38324 URL: http://svn.opensuse.org/viewcvs/yast?rev=38324&view=rev Log: parent management Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc Wed Jun 6 16:55:02 2007 @@ -63,7 +63,7 @@ enabled ? "Enabling" : "Diabling", widgetClass(), debugLabel().c_str() ); - setChildrenEnabling( enabled ); + setChildrenEnabled( enabled ); } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Wed Jun 6 16:55:02 2007 @@ -30,7 +30,7 @@ **/ template<class T> class YChildrenManager { -protected: +public: /** * Constructor. @@ -46,8 +46,7 @@ **/ virtual ~YChildrenManager() {} -public: - + typedef std::list<T *> ChildrenList; /** Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc Wed Jun 6 16:55:02 2007 @@ -91,12 +91,20 @@ void YContainerWidget::dumpDialogWidgetTree() { - YContainerWidget *dialog = dynamic_cast <YContainerWidget *> ( yDialog() ); +#if 0 + // FIXME + // FIXME + // FIXME + YDialog * dialog = findDialog(); if ( dialog ) dialog->dumpWidgetTree(); else dumpWidgetTree(); + // FIXME + // FIXME + // FIXME +#endif } @@ -152,7 +160,7 @@ } -void YContainerWidget::setChildrenEnabling( bool enabled ) +void YContainerWidget::setChildrenEnabled( bool enabled ) { for ( int i = 0; i < numChildren(); i++ ) { @@ -163,14 +171,14 @@ if ( container ) { // y2debug( "Recursing into %s", container->debugLabel().c_str() ); - container->setEnabling( enabled ); - container->setChildrenEnabling( enabled ); + container->setEnabled( enabled ); + container->setChildrenEnabled( enabled ); } } else { // y2debug( "%s %s", enabled ? "Enabling" : "Disabling", children[i]->debugLabel().c_str() ); - children[i]->setEnabling( enabled ); + children[i]->setEnabled( enabled ); } } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h Wed Jun 6 16:55:02 2007 @@ -151,7 +151,7 @@ /** * Enable or disable all widgets in this widget tree. **/ - void setChildrenEnabling( bool enabled ); + void setChildrenEnabled( bool enabled ); /** * Returns a (possibly translated) text describing this dialog for Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Wed Jun 6 16:55:02 2007 @@ -146,16 +146,16 @@ YRadioButtonGroup * YRadioButton::findRadioButtonGroup() const { - YWidget * parent = yParent(); + YWidget * widget = parent(); - while ( parent ) + while ( widget ) { - YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (parent); + YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (widget); if ( radioButtonGroup ) return radioButtonGroup; else - parent = parent->yParent(); + widget = widget->parent(); } return 0; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Wed Jun 6 16:55:02 2007 @@ -143,13 +143,43 @@ #define YUI_CHECK_NEW( PTR ) \ do \ { \ - if ( ! ( PTR ) ) \ + if ( ! (PTR) ) \ { \ YUI_THROW( YUIOutOfMemoryException() ); \ } \ } while( 0 ) + +/** + * Check for null pointer. + * Throws YUINullPointerException if the pointer is 0. + **/ +#define YUI_CHECK_PTR( PTR ) \ + do \ + { \ + if ( ! (PTR) ) \ + { \ + YUI_THROW( YUINullPointerException() ); \ + } \ + } while( 0 ) + + +/** + * Check if a widget pointer is valid. + * Throws YUIInvalidWidgetException if it is 0 or invalid (already deleted). + **/ +#define YUI_CHECK_WIDGET( WIDGET ) \ + do \ + { \ + if ( ! (WIDGET) || ! (WIDGET)->isValid() ) \ + { \ + YUI_THROW( YUIInvalidWidgetException() ); \ + } \ + } while( 0 ) + + + /** * Helper class for UI exceptions: Store _FILE_, _FUNCTION_ and _LINE_. * Construct this using the YUI_EXCEPTION_CODE_LOCATION macro. @@ -323,6 +353,22 @@ /** + * Exception class for generic null pointer exceptions. + * When available, a more specialized exception class should be used. + **/ +class YUINullPointerException: public YUIException +{ +public: + YUINullPointerException() + : YUIException( "Null pointer" ) + {} + + virtual ~YUINullPointerException() throw() + {} +}; + + +/** * Exception class for "out of memory". * Typically used if operator new returned 0. **/ @@ -336,7 +382,23 @@ virtual ~YUIOutOfMemoryException() throw() {} -}; // class YUIOutOfMemoryException +}; + +/** + * Exception class vor invalid widgets. + * This is typically caused by widget pointers that continue living after the + * corresponding widget has already been deleted. + **/ +class YUIInvalidWidgetException: public YUIException +{ +public: + YUIInvalidWidgetException() + : YUIException( "Invalid widget" ) + {} + + virtual ~YUIInvalidWidgetException() throw() + {} +}; /** @@ -538,7 +600,7 @@ * Returns the child widget. **/ YWidget * child() const { return _child; } - + protected: /** @@ -560,7 +622,7 @@ << containerWidgetClass << std::endl; } - + private: YWidget * _container; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Wed Jun 6 16:55:02 2007 @@ -633,7 +633,7 @@ return 0; } - if ( widgetEvent->widget()->yDialog() != currentDialog() ) + if ( widgetEvent->widget()->findDialog() != currentDialog() ) { /** * Silently discard events from all but the current (topmost) dialog. @@ -1809,7 +1809,7 @@ YContainerWidget * container = dynamic_cast<YContainerWidget *>( widget ); if ( ! container ) - container = dynamic_cast<YContainerWidget *>( widget->yParent() ); + container = dynamic_cast<YContainerWidget *>( widget->parent() ); if ( container ) { Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc Wed Jun 6 16:55:02 2007 @@ -292,7 +292,7 @@ } if ( opt.isDisabled.value() ) - w->setEnabling( false ); + w->setDisabled(); w->setParent(p); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Wed Jun 6 16:55:02 2007 @@ -12,8 +12,7 @@ File: YWidget.cc - Author: Mathias Kettner <kettner(a)suse.de> - Maintainer: Stefan Hundhammer <sh(a)suse.de> + Author: Stefan Hundhammer <sh(a)suse.de> /-*/ @@ -30,6 +29,7 @@ #include "YUISymbols.h" #include "YShortcut.h" #include "YWidget.h" +#include "YDialog.h" #include "YUIComponent.h" #include "YUI.h" #include "YDialog.h" @@ -37,26 +37,38 @@ #include "YChildrenManager.h" -using std::string; - #define MAX_DEBUG_LABEL_LEN 50 +#define YWIDGET_MAGIC 42 + + +using std::string; struct YWidgetPrivate { /** * Constructor **/ - YWidgetPrivate( YWidget * widget ) - : childrenRejector( widget ) - , childrenManager( childrenRejector ) + YWidgetPrivate( YWidgetChildrenManager * manager ) + : magic( YWIDGET_MAGIC ) + , childrenManager( manager ) + , parent( 0 ) + , beingDestroyed( false ) + , enabled( true ) + , notify( false ) + , toolkitWidgetRep( 0 ) {} // // Data members // - - YWidgetChildrenRejector childrenRejector; // default: no children - YWidgetChildrenManager & childrenManager; + + int magic; + YWidgetChildrenManager * childrenManager; + YWidget * parent; + bool beingDestroyed; + bool enabled; + bool notify; + void * toolkitWidgetRep; }; @@ -64,11 +76,8 @@ YWidget::YWidget( const YWidgetOpt & opt ) - : priv( new YWidgetPrivate( this ) ) - , magic( YWIDGET_MAGIC ) + : priv( new YWidgetPrivate( new YWidgetChildrenRejector( this ) ) ) , user_widget_id( YCPNull() ) - , yparent(0) - , rep(0) , windowID( -1 ) { internal_widget_id = next_internal_widget_id++; @@ -82,27 +91,27 @@ _weight[ YD_HORIZ ] = opt.hWeight.value(); _weight[ YD_VERT ] = opt.vWeight.value(); - if ( ! enabled ) setEnabling( false ); + if ( ! enabled ) setDisabled(); if ( notify ) setNotify( notify ); } YWidget::~YWidget() { - if ( ! isValid() ) - { - y2error( "ERROR: Trying to destroy invalid widget" ); - return; - } + YUI_CHECK_WIDGET( this ); + setBeingDestroyed(); - if ( yparent && yparent->isValid() ) - yparent->childDeleted( this ); + deleteChildren(); + if ( parent() && ! parent()->isBeingDestroyed() ) + parent()->removeChild( this ); + + delete priv->childrenManager; invalidate(); } -YChildrenManager & +YWidgetChildrenManager * YWidget::childrenManager() const { return priv->childrenManager; @@ -110,8 +119,11 @@ void -YWidget::setChildrenManager( YChildrenManager & newChildrenManager ) +YWidget::setChildrenManager( YWidgetChildrenManager * newChildrenManager ) { + YUI_CHECK_PTR( newChildrenManager ); + + delete priv->childrenManager; priv->childrenManager = newChildrenManager; } @@ -119,14 +131,29 @@ void YWidget::addChild( YWidget * child ) { - childrenManager().addChild( child ); + childrenManager()->add( child ); } void YWidget::removeChild( YWidget * child ) { - childrenManager().removeChild( child ); + childrenManager()->remove( child ); +} + + +void +YWidget::deleteChildren() +{ + for ( YWidgetList::const_iterator it = childrenBegin(); + it != childrenEnd(); + ++it ) + { + if ( (*it)->isValid() ) + delete *it; + } + + childrenManager()->clear(); } @@ -145,60 +172,62 @@ } -void YWidget::setId( const YCPValue & id ) +bool +YWidget::isValid() const { - user_widget_id = id; + return priv->magic == YWIDGET_MAGIC; } -bool YWidget::hasId() const +void +YWidget::invalidate() { - return ( ! user_widget_id.isNull() && ! user_widget_id->isVoid() ); + priv->magic = 0; } -YCPValue YWidget::id() const +bool +YWidget::isBeingDestroyed() const { - if ( ! isValid() ) - { - y2error( "YWidget::id(): Invalid widget" ); - return YCPString( "<invalid widget>" ); - } + return priv->beingDestroyed; +} - if ( user_widget_id.isNull() ) - return YCPVoid(); - else - return user_widget_id; +void +YWidget::setBeingDestroyed() +{ + priv->beingDestroyed = true; } -void YWidget::setParent( YWidget *parent ) +YWidget * +YWidget::parent() const { - yparent = parent; + return priv->parent; } -YWidget * YWidget::yParent() const +void +YWidget::setParent( YWidget * newParent ) { - return yparent; + priv->parent = newParent; } -YWidget * YWidget::yDialog() +YDialog * YWidget::findDialog() { - YWidget *parent = this; + YWidget * widget = this; - while ( parent && ! parent->isDialog() ) + while ( widget ) { - parent = parent->yParent(); - } + YDialog * dialog = dynamic_cast<YDialog *> (widget); - if ( ! parent ) - { - y2warning( "Warning: No dialog parent for %s", widgetClass() ); + if ( dialog ) + return dialog; + else + widget = widget->parent(); } - return parent; + return 0; } @@ -234,8 +263,8 @@ throw; } - if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); - else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); + if ( propertyName == YUIProperty_Enabled ) setEnabled( val.boolVal() ); + else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); } @@ -252,115 +281,87 @@ throw; } - if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); + if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( isEnabled() ); if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); - if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + if ( propertyName == YUIProperty_DialogDebugLabel ) + { + YDialog * dialog = findDialog(); + + if ( dialog ) + return YPropertyValue( dialog->debugLabel() ); + else + return YPropertyValue( debugLabel() ); + } return YPropertyValue( false ); // NOTREACHED } - -YCPValue YWidget::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +void * +YWidget::widgetRep() const { - string symbol = property->symbol(); + return priv->toolkitWidgetRep; +} - if ( ! isValid() ) - { - y2error( "YWidget::changeWidget( %s ): ERROR: Invalid widget", symbol.c_str() ); - return YCPBoolean( false ); // Error - } +void +YWidget::setWidgetRep( void * rep ) +{ + priv->toolkitWidgetRep = rep; +} - /* - * @property boolean Enabled the current enabled/disabled state - */ - if ( symbol == YUIProperty_Enabled ) - { - if ( newvalue->isBoolean() ) - { - bool e = newvalue->asBoolean()->value(); - setEnabling(e); - enabled = e; - return YCPBoolean( true ); - } - else y2error( "Wrong argument %s for widget property `Enabled - boolean expected.", - newvalue->toString().c_str() ); - } - /* - * @property boolean Notify the current notify state (see also `opt( `notify )) - */ - if ( symbol == YUIProperty_Notify ) - { - if ( newvalue->isBoolean() ) - { - setNotify( newvalue->asBoolean()->value() ); - return YCPBoolean( true ); - } - else y2error( "Wrong argument %s for widget property `Notify - boolean expected.", - newvalue->toString().c_str() ); - } +void +YWidget::setEnabled( bool enabled ) +{ + priv->enabled = enabled; +} - return YCPBoolean( false ); + +bool +YWidget::isEnabled() const +{ + return priv->enabled; } -YCPValue YWidget::changeWidgetTerm( const YCPTerm & property, const YCPValue & newvalue ) +void YWidget::setShortcutString( const std::string & str ) { - y2warning( "Widget %s: Couldn't change unknown widget property %s to %s", - id()->toString().c_str(), property->toString().c_str(), newvalue->toString().c_str() ); - return YCPVoid(); + y2error( "Default setShortcutString() method called - " + "should be reimplemented in %s", widgetClass() ); } -YCPValue YWidget::queryWidget( const YCPSymbol & property ) + + + +void YWidget::setId( const YCPValue & id ) { - string symbol = property->symbol(); - if ( symbol == YUIProperty_Enabled ) return YCPBoolean( getEnabling() ); - if ( symbol == YUIProperty_Notify ) return YCPBoolean( getNotify() ); - if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); - /** - * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) - */ - if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); - /** - * @property string DebugLabel a (possibly translated) text describing this widget for debugging - */ - if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); - /** - * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging - */ - if ( symbol == YUIProperty_DialogDebugLabel ) - { - return YUIComponent::ui()->currentDialog()->queryWidget( property ); - } - else - { - y2error( "Widget %s: Couldn't query unkown widget property %s", - id()->toString().c_str(), symbol.c_str() ); - return YCPVoid(); - } + user_widget_id = id; } -YCPValue YWidget::queryWidgetTerm( const YCPTerm & property ) +bool YWidget::hasId() const { - y2warning( "Widget %s: Couldn't query unkown widget property %s", - id()->toString().c_str(), property->toString().c_str() ); - return YCPVoid(); + return ( ! user_widget_id.isNull() && ! user_widget_id->isVoid() ); } -void YWidget::setShortcutString( const std::string & str ) +YCPValue YWidget::id() const { - y2error( "Default setShortcutString() method called - " - "should be reimplemented in %s", widgetClass() ); + YUI_CHECK_WIDGET( this ); + + if ( user_widget_id.isNull() ) + return YCPVoid(); + else + return user_widget_id; } + + void YWidget::setNotify( bool notify ) { this->notify = notify; @@ -373,12 +374,6 @@ } -bool YWidget::getEnabling() const -{ - return enabled; -} - - long YWidget::nicesize( YUIDimension dim ) { y2error( "YWidget::nicesize( YUIDimension dim ) called - " @@ -424,25 +419,6 @@ } -void YWidget::setEnabling( bool ) -{ - // Default implementation for widgets that can't be enabled - // or disabled -} - - -void *YWidget::widgetRep() -{ - return rep; -} - - -void YWidget::setWidgetRep( void *r ) -{ - rep = r; -} - - bool YWidget::isDialog() const { return false; @@ -487,3 +463,113 @@ */ } + + + + + + + + + + +// FIXME: Obsolete +// FIXME: Obsolete +// FIXME: Obsolete + + +YCPValue YWidget::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +{ + string symbol = property->symbol(); + + if ( ! isValid() ) + { + y2error( "YWidget::changeWidget( %s ): ERROR: Invalid widget", symbol.c_str() ); + + return YCPBoolean( false ); // Error + } + + /* + * @property boolean Enabled the current enabled/disabled state + */ + if ( symbol == YUIProperty_Enabled ) + { + if ( newvalue->isBoolean() ) + { + bool e = newvalue->asBoolean()->value(); + setEnabled(e); + enabled = e; + return YCPBoolean( true ); + } + else y2error( "Wrong argument %s for widget property `Enabled - boolean expected.", + newvalue->toString().c_str() ); + } + + /* + * @property boolean Notify the current notify state (see also `opt( `notify )) + */ + if ( symbol == YUIProperty_Notify ) + { + if ( newvalue->isBoolean() ) + { + setNotify( newvalue->asBoolean()->value() ); + return YCPBoolean( true ); + } + else y2error( "Wrong argument %s for widget property `Notify - boolean expected.", + newvalue->toString().c_str() ); + } + + return YCPBoolean( false ); +} + + +YCPValue YWidget::changeWidgetTerm( const YCPTerm & property, const YCPValue & newvalue ) +{ + y2warning( "Widget %s: Couldn't change unknown widget property %s to %s", + id()->toString().c_str(), property->toString().c_str(), newvalue->toString().c_str() ); + return YCPVoid(); +} + + +YCPValue YWidget::queryWidget( const YCPSymbol & property ) +{ + string symbol = property->symbol(); + if ( symbol == YUIProperty_Enabled ) return YCPBoolean( isEnabled() ); + if ( symbol == YUIProperty_Notify ) return YCPBoolean( getNotify() ); + if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); + /** + * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) + */ + if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); + /** + * @property string DebugLabel a (possibly translated) text describing this widget for debugging + */ + if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); + /** + * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging + */ + if ( symbol == YUIProperty_DialogDebugLabel ) + { + return YUIComponent::ui()->currentDialog()->queryWidget( property ); + } + else + { + y2error( "Widget %s: Couldn't query unkown widget property %s", + id()->toString().c_str(), symbol.c_str() ); + return YCPVoid(); + } +} + + +YCPValue YWidget::queryWidgetTerm( const YCPTerm & property ) +{ + y2warning( "Widget %s: Couldn't query unkown widget property %s", + id()->toString().c_str(), property->toString().c_str() ); + return YCPVoid(); +} + + +// FIXME: Obsolete +// FIXME: Obsolete +// FIXME: Obsolete + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Wed Jun 6 16:55:02 2007 @@ -30,10 +30,10 @@ #include "YChildrenManager.h" #include "ImplPtr.h" -#define YWIDGET_MAGIC 42 // what else? ;- ) class YCPSymbol; class YMacroRecorder; +class YDialog; #define YUIAllDimensions 2 @@ -51,26 +51,27 @@ class YWidgetPrivate; + /** - * @short Abstract base class of all ui widgets + * Abstract base class of all UI widgets */ class YWidget { public: /** - * Constructor - */ + * Constructor. + **/ YWidget( const YWidgetOpt & opt ); /** * Destructor - */ + **/ virtual ~YWidget(); /** * Returns a descriptive name of this widget class for logging, * debugging etc. - */ + **/ virtual const char * widgetClass() { return "YWidget"; } /** @@ -176,31 +177,31 @@ * Returns 'true' if this widget has any children. **/ bool hasChildren() const - { return childrenManager().hasChildren(); } + { return childrenManager()->hasChildren(); } /** * Returns the first child or 0 if there is none. * Useful mostly for children managers that handle only one child. **/ YWidget * firstChild() const - { return childrenManager().firstChild(); } + { return childrenManager()->firstChild(); } /** * Return an iterator that points to the first child or to childrenEnd() if * there are no children. **/ YWidgetListConstIterator childrenBegin() const - { return childrenManager().begin(); } + { return childrenManager()->begin(); } /** * Returns the current number of children. **/ - int childrenCount() const { return childrenManager().count(); } + int childrenCount() const { return childrenManager()->count(); } /** * Return an interator that points after the last child. **/ YWidgetListConstIterator childrenEnd() const - { return childrenManager().end(); } + { return childrenManager()->end(); } /** * Add a new child. @@ -216,21 +217,86 @@ **/ virtual void removeChild( YWidget * child ); + /** + * Delete all children and remove them from the children manager's list. + **/ + void deleteChildren(); + + /** + * Return this widget's parent or 0 if it doesn't have a parent. + **/ + YWidget * parent() const; + + /** + * Set this widget's parent. + **/ + void setParent( YWidget * newParent ); + + /** + * Traverse up the widget hierarchy and find the dialog this widget belongs + * to. Returns 0 if there is none. + **/ + YDialog * findDialog(); + // // Misc // - /** * Checks whether or not this object is valid. This is to enable - * dangling pointer error checking ( i.e. this object is already - * deallocated, but a pointer to it is still in use ). + * dangling pointer error checking (i.e. this object is already + * deallocated, but a pointer to it is still in use). + * + * See also the YUI_CHECK_WIDGET() macro in YUIException.h + **/ + bool isValid() const; + + /** + * Check if this widget is in the process of being destroyed. + **/ + bool isBeingDestroyed() const; + + /** + * Return a pointer to the underlying toolkit's (Qt, ...) widget + * representing this abstract UI widget. + **/ + void *widgetRep() const; + + /** + * set the pointer to the underlying toolkit's (Qt, ...) widget + * representing this abstract UI widget. + **/ + void setWidgetRep( void * toolkitWidgetRep ); + + /** + * Enable or disable this widget, i.e. make it accept or reject user input. + * + * Derived classes should call the base class method to update the internal + *"enabled" flag. */ - bool isValid() const { return magic == YWIDGET_MAGIC; } + virtual void setEnabled( bool enabled = true ); /** + * Disable this widget (overloaded for better readability). + **/ + void setDisabled() { setEnabled( false); } + + /** + * Returns 'true' if this widget is enabled. + **/ + virtual bool isEnabled() const; + + + + + + + + + + /** * Return the widget serial number (the internal widget ID). */ int internalId() const { return internal_widget_id; } @@ -251,22 +317,6 @@ YCPValue id() const; /** - * Set the parent YWidget of this widget. - */ - void setParent( YWidget *parent ); - - /** - * Return the parent YWidget of this widget. - */ - YWidget * yParent() const; - - /** - * Return the YDialog this widget belongs to. - * Returns 0 if there is no dialog parent. - */ - YWidget * yDialog(); - - /** * Notify a widget that can have children that a child has been deleted. * This is called in the YWidget destructor for the parent widget. * All container widgets should overwrite this function and update @@ -372,17 +422,6 @@ virtual void setSize( long newwidth, long newheight ); /** - * Sets the enabled state of the widget. All new widgets are enabled per - * definition. Only enabled widgets can take user input. - */ - virtual void setEnabling( bool enabled ); - - /** - * Queries the enabled of a widget. - */ - bool getEnabling() const; - - /** * Sets the Notify property */ void setNotify( bool notify ); @@ -448,16 +487,6 @@ virtual YCPValue queryWidgetTerm( const YCPTerm & property ); /** - * Returns a pointer to the ui specific widget implementation. - */ - void *widgetRep(); - - /** - * Sets the pointer to the ui specific widget implementation. - */ - void setWidgetRep( void * ); - - /** * Set the keyboard focus to this widget. * The default implementation just emits a warning message. * Overwrite this function for all widgets that can accept the @@ -539,10 +568,12 @@ /** * Returns this widget's children manager. **/ - YWidgetChildrenManager & childrenManager() const; + YWidgetChildrenManager * childrenManager() const; /** - * Sets a new children manager for this widget. + * Sets a new children manager for this widget. The widget assumes + * ownership of this children manager and will delete it when appropriate. + * * The default children manager (a YWidgetChildrenRejector) rejects all * children. This is useful for leaf widgets such as PushButton, ComboBox * etc. @@ -552,7 +583,17 @@ * children) or to a YSingleWidgetChildManager (the class that handles * exactly one child widget). **/ - void setChildrenManager( YWidgetChildrenManager & manager ); + void setChildrenManager( YWidgetChildrenManager * manager ); + + /** + * Set the "being destroyed" flag, i.e. indicate that this widget is in the + * process of being destroyed. The base class method already sets this, but + * sometimes it might be useful to call this in a derived class's + * destructor so certain optimizations work better. + * + * This status intentionally cannot be reverted to "not being destroyed". + **/ + void setBeingDestroyed(); private: @@ -560,13 +601,24 @@ /** * Make this widget invalid. This operation cannot be reversed. */ - void invalidate() { magic=0; } + void invalidate(); + + +private: + + ImplPtr<YWidgetPrivate> priv; + static YPropertySet _propertySet; - /** - * This object is only valid if this magic number is - * YWIDGET_MAGIC. Use YWidget::isValid() to check this. - */ - int magic; + + + + + + + + + + protected: @@ -590,11 +642,6 @@ static int next_internal_widget_id; /** - * The parent YWidget. - */ - YWidget *yparent; - - /** * Flag: Can this widget currently receive user input? */ bool enabled; @@ -616,12 +663,6 @@ bool _autoShortcut; /** - * Pointer to the UI specific widget representation that belongs to this - * widget. For Qt, this will be a pointer to a QWidget (subclass). - **/ - void * rep; - - /** * Stretchability in both dimensions. */ bool _stretch [ YUIAllDimensions ]; @@ -637,11 +678,20 @@ long windowID; -private: - ImplPtr<YWidgetPrivate *> priv; - static YPropertySet _propertySet; + + + + + + + + + // FIXME: Get this stuff out of here - it is utterly out of place + // FIXME: Get this stuff out of here - it is utterly out of place + // FIXME: Get this stuff out of here - it is utterly out of place + public: /** * Helper class that calls startMultipleChanges() in its constructor -- 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] r38323 - /branches/SuSE-SLE-10-SP2-Branch/
by mvidner＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: mvidner Date: Wed Jun 6 16:39:05 2007 New Revision: 38323 URL: http://svn.opensuse.org/viewcvs/yast?rev=38323&view=rev Log: Branched SLE10 SP2 development. The SP1 branch is for maintenance now. See also http://en.opensuse.org/YaST_Development_Branches Added: branches/SuSE-SLE-10-SP2-Branch/ - copied from r38322, branches/SuSE-SLE-10-SP1-Branch/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0