October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41672 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:24:49 2007 New Revision: 41672 URL: http://svn.opensuse.org/viewcvs/yast?rev=41672&view=rev Log: More changes... Removed: tags/stable-2_16_0/update/ -- 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] r41671 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:23:48 2007 New Revision: 41671 URL: http://svn.opensuse.org/viewcvs/yast?rev=41671&view=rev Log: Created tag stable-2_16_0 for update Added: tags/stable-2_16_0/update/ - copied from r41670, trunk/update/ -- 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] r41670 - /tags/stable-2_16_4/yast2/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:23:05 2007 New Revision: 41670 URL: http://svn.opensuse.org/viewcvs/yast?rev=41670&view=rev Log: Created tag stable-2_16_4 for yast2 Added: tags/stable-2_16_4/yast2/ - copied from r41669, trunk/yast2/ -- 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] r41669 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp src/modules/Update.ycp yast2-update.spec.in
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:22:48 2007 New Revision: 41669 URL: http://svn.opensuse.org/viewcvs/yast?rev=41669&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. - 2.16.0 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp trunk/update/src/modules/Update.ycp trunk/update/yast2-update.spec.in Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=41669&r1=4166… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Oct 31 13:22:48 2007 @@ -1 +1 @@ -2.15.23 +2.16.0 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Oct 31 13:22:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 31 13:21:55 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.0 + +------------------------------------------------------------------- Thu Oct 25 14:00:51 CEST 2007 - locilka(a)suse.cz - Never list duplicate entries in "upgrade based on products" in Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Oct 31 13:22:48 2007 @@ -624,7 +624,7 @@ // translate them list <string> new_names = Storage::GetTranslatedDevices ( - Update::installedVersion, Update::updateVersion, old_names + Installation::installedVersion, Installation::updateVersion, old_names ); integer i = 0; @@ -1535,7 +1535,7 @@ `Label(_("Mounting partitions. One moment please..."))); boolean tmp = RootPart::MountPartitions (RootPart::selectedRootPartition); - sleep (500); + // sleep (500); UI::CloseDialog (); Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?re… ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Wed Oct 31 13:22:48 2007 @@ -68,25 +68,17 @@ global boolean products_incompatible = false; - - /* - * Information about old and new product. - * - * They do contain: - * name (string), e.g. "SuSE Linux" - * version (string), e.g. "9.1" - * nameandversion (string), e.g. "SuSE Linux 9.1" - * - * They may contain: - * major (integer), e.g. "9" - * minor (integer), e.g. "1" - */ - // Version of the targetsystem - global map <string, any> installedVersion = $[]; + // + // !!! moved to Installation::installedVersion !!! + // + // global map <string, any> installedVersion = $[]; // Version of the source medium - global map <string, any> updateVersion = $[]; + // + // !!! moved to Installation::updateVersion !!! + // + // global map <string, any> updateVersion = $[]; // Flag, if the basesystem have to be installed @@ -472,13 +464,13 @@ /** * Read product name and version for the old and new release. - * Fill installedVersion and updateVersion. + * Fill Installation::installedVersion and Installation::updateVersion. * @return success */ global define boolean GetProductName () { - installedVersion = $[]; - updateVersion = $[]; + Installation::installedVersion = $[]; + Installation::updateVersion = $[]; // get old product name @@ -501,32 +493,32 @@ if (p == nil) { y2error ("release info <%1> is screwed", old_name); - installedVersion = $[]; + Installation::installedVersion = $[]; } else { - installedVersion["show"] = old_name; - installedVersion["name"] = substring (old_name, 0, p); - installedVersion["version"] = substring (old_name, p + 1); - fill_version_map (installedVersion); + Installation::installedVersion["show"] = old_name; + Installation::installedVersion["name"] = substring (old_name, 0, p); + Installation::installedVersion["version"] = substring (old_name, p + 1); + fill_version_map (Installation::installedVersion); } // "minor" and "major" version keys // bug #153576, "version" == "9" or "10.1" or ... - string inst_ver = installedVersion["version"]:""; + string inst_ver = Installation::installedVersion["version"]:""; if (inst_ver != "" && inst_ver != nil) { // SLE, SLD, OES... if (regexpmatch (inst_ver, "^[0123456789]+$")) { - installedVersion["major"] = tointeger (inst_ver); + Installation::installedVersion["major"] = tointeger (inst_ver); // openSUSE } else if (regexpmatch (inst_ver, "^[0123456789]+\.[0123456789]+$")) { - installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); - installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); + Installation::installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); + Installation::installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); } else { y2error("Cannot find out major/minor from >%1<", inst_ver); } } else { - y2error("Cannot find out version: %1", installedVersion); + y2error("Cannot find out version: %1", Installation::installedVersion); } if (Mode::test()) { @@ -541,9 +533,9 @@ if (num <= 0) { y2error ("No source"); - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + fill_version_map (Installation::updateVersion); return false; } @@ -556,7 +548,7 @@ // source need to be described if (source_map != $[]) { - if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + if (source_map["productversion"]:"A" == Installation::installedVersion["version"]:"B") { y2milestone ("Found matching product: %1", source_map); // first valid product is selected if (update_to_source == nil) @@ -578,45 +570,45 @@ if (new_product == nil) { - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - y2error("Cannot find out source details: %1", updateVersion); - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + y2error("Cannot find out source details: %1", Installation::updateVersion); + fill_version_map (Installation::updateVersion); return false; } // bugzilla #225256, use "label" first, then a "productname" - updateVersion["show"] = new_product["label"]:nil; - if (updateVersion["show"]:nil == nil) { + Installation::updateVersion["show"] = new_product["label"]:nil; + if (Installation::updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { - updateVersion["show"] = "?"; + Installation::updateVersion["show"] = "?"; } else { - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + Installation::updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; } } - updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; - updateVersion["version"] = new_product["productversion"]:"?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; + Installation::updateVersion["version"] = new_product["productversion"]:"?"; + fill_version_map (Installation::updateVersion); - string new_ver = updateVersion["version"]:""; + string new_ver = Installation::updateVersion["version"]:""; if (new_ver != "" && new_ver != nil) { // SLE, SLD, OES... if (regexpmatch (new_ver, "^[0123456789]+$")) { - updateVersion["major"] = tointeger (new_ver); + Installation::updateVersion["major"] = tointeger (new_ver); // openSUSE } else if (regexpmatch (new_ver, "^[0123456789]+\.[0123456789]$")) { - updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); - updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); + Installation::updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); + Installation::updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); } else { y2error("Cannot find out major/minor from %1", new_ver); } } else { - y2error("Cannot find out version: %1", updateVersion); + y2error("Cannot find out version: %1", Installation::updateVersion); } - y2milestone ("update from %1 to %2", installedVersion, updateVersion); + y2milestone ("update from %1 to %2", Installation::installedVersion, Installation::updateVersion); return true; } Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Oct 31 13:22:48 2007 @@ -1,10 +1,15 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite update-desktop-files +BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files +BuildRequires: yast2 >= 2.16.4 # package not really needed to be installed but this breaks the building cycle + +# FIXME !!! #!BuildIgnore: autoyast2-installation -Requires: yast2 + +# Installation::installedVersion && Installation::updateVersion +Requires: yast2 >= 2.16.4 Requires: yast2-installation Requires: yast2-packager -- 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] r41668 - in /trunk/yast2: VERSION library/control/src/Installation.ycp package/yast2.changes yast2.spec.in
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:21:40 2007 New Revision: 41668 URL: http://svn.opensuse.org/viewcvs/yast?rev=41668&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. - 2.16.4 Modified: trunk/yast2/VERSION trunk/yast2/library/control/src/Installation.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=41668&r1=41667… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Oct 31 13:21:40 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Instal… ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Wed Oct 31 13:21:40 2007 @@ -112,6 +112,34 @@ */ global boolean license_accepted = false; + // These maps are used by several YaST modules. + + /** + * Version of the targetsystem (currently installed one). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "10.1", + * "nameandversion" : (string) "openSUSE 10.1", + * "major" : (integer) 10, + * "minor" : (integer) 1, + * ] + */ + global map <string, any> installedVersion = $[]; + + /** + * Version of system to update to (will be installed, or is + * just being installed). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "11.0", + * "nameandversion" : (string) "openSUSE 11.0", + * "major" : (integer) 11, + * "minor" : (integer) 0, + * ] + */ + global map <string, any> updateVersion = $[]; //--------------------------------------------------------------- // constructor 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 Wed Oct 31 13:21:40 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 31 13:19:42 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.4 + +------------------------------------------------------------------- Tue Oct 30 17:24:06 CET 2007 - locilka(a)suse.cz - Modules Hotplug and HwStatus moved here from yast2-installation Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41668&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Oct 31 13:21:40 2007 @@ -28,6 +28,7 @@ Conflicts: yast2-network < 2.15.58 # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 +Conflicts: yast2-update < 2.16.0 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -- 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] r41667 - in /trunk/mail: agents/sysconfig.mail src/MailServer.ycp src/mail-server_complex.ycp src/mail-server_dialogs.ycp src/mail-server_wizards.ycp src/mail.ycp
by varkoly＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: varkoly Date: Wed Oct 31 12:29:56 2007 New Revision: 41667 URL: http://svn.opensuse.org/viewcvs/yast?rev=41667&view=rev Log: fixing the return values of wizard elements Modified: trunk/mail/agents/sysconfig.mail trunk/mail/src/MailServer.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_wizards.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/agents/sysconfig.mail URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/sysconfig.mail?rev=4… ============================================================================== --- trunk/mail/agents/sysconfig.mail (original) +++ trunk/mail/agents/sysconfig.mail Wed Oct 31 12:29:56 2007 @@ -46,4 +46,4 @@ # # This variable contains the type of the mail server configuration. # -CONF_TYPE="undef" +CONFIG_TYPE="undef" Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=4166… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Wed Oct 31 12:29:56 2007 @@ -159,6 +159,8 @@ return Package::Installed (package); } +global boolean pam_ldap_installed = false; +global boolean nss_ldap_installed = false; global boolean procmail_installed = false; global boolean amavis_installed = false; global boolean ldap_installed = false; @@ -258,6 +260,8 @@ */ global boolean CheckPackages() { + pam_ldap_installed = Installed("pam_ldap"); + nss_ldap_installed = Installed("nss_ldap"); procmail_installed = Installed("procmail"); cyrus_installed = Installed("cyrus-imapd"); postfix_installed = Installed("postfix"); @@ -269,16 +273,26 @@ string to_install = ""; list<string> l_to_install = []; - if (!ldap_installed) + if (!pam_ldap_installed) { - l_to_install = add( l_to_install, "yast2-ldap-client" ); - to_install = to_install + "yast2-ldap-client\n"; + l_to_install = add( l_to_install, "pam_ldap" ); + to_install = to_install + "pam_ldap\n"; + } + if (!nss_ldap_installed) + { + l_to_install = add( l_to_install, "nss_ldap" ); + to_install = to_install + "nss_ldap\n"; } if (!postfix_installed) { l_to_install = add( l_to_install, "postfix" ); to_install = to_install + "postfix\n"; } + if (!ldap_installed) + { + l_to_install = add( l_to_install, "yast2-ldap-client" ); + to_install = to_install + "yast2-ldap-client\n"; + } if(!sasl_installed) { l_to_install = add( l_to_install, "cyrus-sasl-plain" ); Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp… ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Wed Oct 31 12:29:56 2007 @@ -37,7 +37,7 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -boolean SetupDialog() { +symbol SetupDialog() { Wizard::RestoreHelp(HELPS["setup"]:""); string caption = _("Setup the Mail Server"); integer steps = 3; @@ -74,17 +74,17 @@ Progress::NextStage(); if( ! MailServer::CheckPackages() ) { - return false; + return `abort; } sleep(sl); // read packages Progress::NextStage(); if( CheckLDAPDialog() != `ok ) { - return false; + return `abort; } sleep(sl); - return true; + return `next; } /** Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Wed Oct 31 12:29:56 2007 @@ -41,7 +41,8 @@ Ldap::LDAPInit(); map<string, any> LDAPSettings = (map <string, any>) Ldap::Export(); list args = []; - if(LDAPSettings["ldap_domain"]:"" == "" ) + y2milestone(" LDAPSettings %1", LDAPSettings); + if( ! LDAPSettings["start_ldap"]:false ) { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; @@ -102,6 +103,7 @@ { // Now we setup the ca managemant args = add(args, "ca_mgm"); } + Progress::NextStage(); if( setup_ldap_server ) { // Now we setup the LDAP Server args = add(args, "setup"); @@ -110,6 +112,7 @@ Ldap::LDAPInit(); LDAPSettings = (map <string, any>) Ldap::Export(); } + Progress::NextStage(); MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); if( MailServer::AdminPassword != nil ) { @@ -124,11 +127,12 @@ //tell Ldap module to create the default objects: LDAPSettings [ "create_ldap" ] = true; Ldap::Import(LDAPSettings); +y2milestone("after LDAPSettings %1", LDAPSettings); //write the settings: Ldap::Write(abort); //create default mail-server configuration YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,LDAPSettings); - return `next; + return `ok; } else { Modified: trunk/mail/src/mail-server_wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_wizards.ycp… ============================================================================== --- trunk/mail/src/mail-server_wizards.ycp (original) +++ trunk/mail/src/mail-server_wizards.ycp Wed Oct 31 12:29:56 2007 @@ -109,6 +109,10 @@ `abort : `abort, `next : "main" ], + "main" : $[ + `abort : `abort, + `next : `next + ] ]; Wizard::CreateDialog(); Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=41667&r1=4… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Wed Oct 31 12:29:56 2007 @@ -204,6 +204,8 @@ { ret = WFM::CallFunction("mail-standard",args); } + y2milestone ("Mail module %1 returned %2", conf_type, ret); + if( ret != nil && ret != `cancel && ret != `abort ) { SCR::Write (.sysconfig.mail.CONFIG_TYPE, conf_type); -- 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] r41666 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 12:02:19 2007 New Revision: 41666 URL: http://svn.opensuse.org/viewcvs/yast?rev=41666&view=rev Log: correct spacing Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 12:02:19 2007 @@ -220,7 +220,7 @@ // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); @@ -230,7 +230,7 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); @@ -240,7 +240,7 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); } /////////////////////////////////////////////////////////////////// -- 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] r41665 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:56:59 2007 New Revision: 41665 URL: http://svn.opensuse.org/viewcvs/yast?rev=41665&view=rev Log: setNotify for checkbox Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Wed Oct 31 11:56:59 2007 @@ -94,26 +94,13 @@ void NCAskForExistingDirectory::createLayout( const YCPString & iniDir, const YCPString & headline ) { - // FIXME - check all options settings! - YWidgetOpt opt; - // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - // addChild() is obsolete (handled by new libyui) - - opt.notifyMode.setValue( false ); - // the headline new NCLabel( split, headline->value(), true, false ); // isHeading = true - new NCSpacing( split, YD_VERT, false, 0.4 ); - NCFrame * frame = new NCFrame( split, "" ); - //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); - - opt.isEditable.setValue( false ); // see dirName - opt.notifyMode.setValue( true ); // see dirName // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false @@ -123,8 +110,6 @@ YStringWidgetID * dirID = new YStringWidgetID( idDirName ); dirName->setId( dirID ); - //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); - // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); @@ -132,10 +117,8 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); + detailed->setNotify( true ); - //hSplit->addChild( new NCSpacing( hSplit, opt, 0.1, true, false ) ); - new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true - // create table header for table type T_Overview YTableHeader * tableHeader = new YTableHeader(); tableHeader->addColumn( " ", YAlignBegin ); @@ -150,38 +133,31 @@ YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); - //split->addChild( new NCSpacing( split, opt, 0.4, false, true ) ); - new NCSpacing( split, YD_VERT, false, 0.4 ); + new NCSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); - opt.isHStretchable.setValue( true ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true - opt.key_Fxx.setValue( 10 ); // see okButton - // add the OK button okButton = new NCPushButton( hSplit1, _( "&OK" ) ); okButton->setFunctionKey( 10 ); + okButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * okID = new YStringWidgetID ( idOk ); okButton->setId( okID ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.4, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); - opt.key_Fxx.setValue( 9 ); // see cancelButton - // add the Cancel button cancelButton = new NCPushButton( hSplit1, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); + cancelButton->setStretchable( YD_HORIZ, true); YStringWidgetID * cancelID = new YStringWidgetID (idCancel ); cancelButton->setId( cancelID ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:56:59 2007 @@ -158,6 +158,7 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); + detailed->setNotify( true ); // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); @@ -219,6 +220,8 @@ // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true + // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); @@ -227,6 +230,8 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); + // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); @@ -235,6 +240,7 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); } /////////////////////////////////////////////////////////////////// -- 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] r41664 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/OneClickInstall.ycp src/OneClickInstallWorkerResponse.ycp
by benjimanw＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: benjimanw Date: Wed Oct 31 11:40:03 2007 New Revision: 41664 URL: http://svn.opensuse.org/viewcvs/yast?rev=41664&view=rev Log: Fixes bugs 310813 and 331557 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstall.ycp trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Wed Oct 31 11:40:03 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 31 10:40:00 GMT 2007 - benji.weber(a)gmail.com + +- Allow package names that are not valid XML element names e.g. 3ddiag (#331557) +- Alter default error message to indicate most likely cause for failure - user didn't enter password (#310813) +------------------------------------------------------------------- Thu Oct 4 15:34:25 CEST 2007 - mvidner(a)suse.cz - Use an actual icon (sw_single) for the YaST windows instead of the Modified: trunk/metapackage/src/OneClickInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstall.… ============================================================================== --- trunk/metapackage/src/OneClickInstall.ycp (original) +++ trunk/metapackage/src/OneClickInstall.ycp Wed Oct 31 11:40:03 2007 @@ -757,7 +757,7 @@ { SetupXML(); map<string,any > toSerialise = $[]; - toSerialise = add(toSerialise,"software",software); + toSerialise = add(toSerialise,"software",makeXMLFriendly(software)); toSerialise = add(toSerialise,"repositories",makeXMLFriendly(repositories)); toSerialise = add(toSerialise,"remainSubscribed",remainSubscribed); toSerialise = add(toSerialise,"name",name); @@ -775,7 +775,7 @@ { SetupXML(); map<string,any> deSerialised = (map<string,any >)XML::XMLToYCPFile(filename); - software = deSerialised["software"]:$[]; + software = fromXMLFriendly((list<map<string,string> >)deSerialised["software"]:[]); repositories = fromXMLFriendly((list<map<string,string> >)deSerialised["repositories"]:[]); remainSubscribed = deSerialised["remainSubscribed"]:false; summary = deSerialised["summary"]:""; Modified: trunk/metapackage/src/OneClickInstallWorkerResponse.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallW… ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerResponse.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Wed Oct 31 11:40:03 2007 @@ -5,7 +5,7 @@ import "XML"; string DEFAULT_FAILURE_STAGE = _("unknown"); - string DEFAULT_ERROR_MESSAGE = _("An unknown error occurred."); + string DEFAULT_ERROR_MESSAGE = _("Administrator (root) privileges are required, either they were not supplied or an unknown error occurred."); string DEFAULT_NOTE = ""; string success = "false"; string note = DEFAULT_NOTE; -- 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] r41663 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:30:42 2007 New Revision: 41663 URL: http://svn.opensuse.org/viewcvs/yast?rev=41663&view=rev Log: remove NCSpacings Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:30:42 2007 @@ -141,8 +141,6 @@ new NCLabel( split, headline, true, false ); // isHeading = true - new NCSpacing( split, YD_VERT, false, 0.4 ); - NCFrame * frame = new NCFrame( split, "" ); // label for text field showing the selected dir @@ -160,7 +158,6 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); - new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); @@ -217,13 +214,11 @@ extension->addItem( filter, true ); // selected - new NCSpacing( split, YD_VERT, false, 0.8 ); + new NCSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); @@ -232,8 +227,6 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); - // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); @@ -242,8 +235,6 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - } /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0