October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52665 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-loop-lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 14:30:42 2008 New Revision: 52665 URL: http://svn.opensuse.org/viewcvs/yast?rev=52665&view=rev Log: - fixed crypt file setup (bnc #433484) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-loop-lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 29 14:30:42 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 14:29:52 CET 2008 - aschnell(a)suse.de + +- fixed crypt file setup (bnc #433484) + +------------------------------------------------------------------- Tue Oct 28 20:14:59 CET 2008 - aschnell(a)suse.de - allow creation of partitions by providing cylinder start and Modified: trunk/storage/storage/src/include/ep-loop-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-lib.ycp Wed Oct 29 14:30:42 2008 @@ -13,28 +13,21 @@ map<string, any> data = $[ "new" : true, "create" : true ]; - data["device"] = Storage::GetLoopDevice(); - data["type"] = `loop; data["format"] = true; if (DlgCreateLoop(data)) { - Storage::UpdateLoop(data["device"]:"", data["fpath"]:"", - data["create_file"]:false, data["size_k"]:0); + string device = Storage::CreateLoop(data["fpath"]:"", data["create_file"]:false, + data["size_k"]:0, data["mount"]:""); + data["device"] = device; Storage::ChangeVolumeProperties(data); UpdateNavigationTree(nil); TreePanel::Create(); - UpdateTableFocus(data["device"]:"error"); + UpdateTableFocus(device); } - else - { - // TODO: This is ugly. Storage::GetLoopDevice creates a loop device which - // must be deleted if the user abort the creation dialog. - Storage::DeleteDevice("/dev/loop", data["device"]:""); - } } -- 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] r52664 - in /trunk/audit-laf/src: AuditLaf.ycp complex.ycp
by gs＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: gs Date: Wed Oct 29 14:25:04 2008 New Revision: 52664 URL: http://svn.opensuse.org/viewcvs/yast?rev=52664&view=rev Log: remove obsolete comments, add new ones, add package 'audit' to install list for AutoYasT Modified: trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=5… ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Wed Oct 29 14:25:04 2008 @@ -243,9 +243,9 @@ ]; /** - * Rules for the subsystem audit (passed via auditctl) - * (initially read from /etc/audit/audit.rules and edited in - * rules editor) + * Rules for the subsystem audit (passed via auditctl). + * Iinitially read from /etc/audit/audit.rules and edited in + * the rules editor. */ string RULES = ""; @@ -484,7 +484,7 @@ if ( ! FileUtils::Exists ( config_file ) ) return false; - // list all options set in auditd.conf + // write all options to auditd.conf foreach (string key, list <string> value, SETTINGS, { // and write each value success = (boolean)SCR::Write(add(.auditd, key), value ); @@ -556,7 +556,6 @@ write_success = WriteAuditdSettings(); - /* Error message */ if ( write_success ) { // restart auditd @@ -564,12 +563,14 @@ y2milestone( "'auditd restart' returned: %1", exit_code ); if ( exit_code != 0 ) + // Error message Report::Error ( _("Restart of the audit daemon failed" ) ); else go_on = true; } else { + // Error message Report::Error (_("Cannot write settings to auditd.conf.") ); } @@ -593,6 +594,7 @@ { Report::Error( sformat( "%1\n%2", output["stderr"]:"", + // Error message, rules cannot be set _("Please start yast2-audit-laf again and check the rules") ) ); } } @@ -672,8 +674,7 @@ * @return map with 2 lists. */ global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; + return $[ "install":[audit], "remove":[] ]; } /* EOF */ Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 29 14:25:04 2008 @@ -346,8 +346,6 @@ if ( AuditLaf::RulesAlreadyLocked() ) { - // FIXME - does it make sense to call SCR::Execute( .target.bash, "auditctl -D" ) ??? - // Warning - the audit configuration is locked, reset impossible Report::Warning( _("The rules are already locked, a reset is impossible.\n If you want to unlock, set the enabled flag accordingly and -- 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] r52663 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 14:13:14 2008 New Revision: 52663 URL: http://svn.opensuse.org/viewcvs/yast?rev=52663&view=rev Log: - fixed classified data for crypt files Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 29 14:13:14 2008 @@ -440,7 +440,10 @@ if (widget == `next) { - Storage::UpdateClassified(data["device"]:"", pw1); + if (data["type"]:`unknown != `loop) + Storage::UpdateClassified(data["device"]:"", pw1); + else + Storage::UpdateClassified(data["fpath"]:"", pw1); widget = `finish; } -- 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] r52662 - /tags/stable-2_17_12/support/
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 14:10:12 2008 New Revision: 52662 URL: http://svn.opensuse.org/viewcvs/yast?rev=52662&view=rev Log: Created tag stable-2_17_12 for support Added: tags/stable-2_17_12/support/ (props changed) - copied from r52661, trunk/support/ -- 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] r52661 - in /trunk/support: VERSION package/yast2-support.changes src/dialogs.ycp
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 14:09:34 2008 New Revision: 52661 URL: http://svn.opensuse.org/viewcvs/yast?rev=52661&view=rev Log: fixed layout Modified: trunk/support/VERSION trunk/support/package/yast2-support.changes trunk/support/src/dialogs.ycp Modified: trunk/support/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/VERSION?rev=52661&r1=526… ============================================================================== --- trunk/support/VERSION (original) +++ trunk/support/VERSION Wed Oct 29 14:09:34 2008 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Wed Oct 29 14:09:34 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 14:07:23 CET 2008 - mzugec(a)suse.de + +- fixed layout +- 2.17.12 + +------------------------------------------------------------------- Mon Oct 27 16:24:10 CET 2008 - mzugec(a)suse.cz - improved Upload dialog Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5266… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Wed Oct 29 14:09:34 2008 @@ -152,11 +152,11 @@ `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton()))) ); - term contents = `VBox( + term contents = `Frame("", + `VBox( load_save, - `Left( `CheckBoxFrame(`id(`upload), _("Upload log files tarball into URL"), true, - `InputField(`id(`url), _("Upload Target"), url) + `Left( `InputField(`id(`url), _("Upload Target"), url) ) ) ) ); -- 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] r52660 - /trunk/audit-laf/package/yast2-audit-laf.changes
by gs＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: gs Date: Wed Oct 29 13:47:32 2008 New Revision: 52660 URL: http://svn.opensuse.org/viewcvs/yast?rev=52660&view=rev Log: improve input of scripts, log file, arrangement Modified: trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Wed Oct 29 13:47:32 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 28 11:01:59 CET 2008 - gs(a)suse.de + +- Allow to enter any log file name (replace AskForExistingFile + by AskForSaveFileName) +- Add input fields to specify a script (for option EXEC) +- Better arrangements of input fields + +------------------------------------------------------------------- Tue Oct 7 13:56:18 CEST 2008 - gs(a)suse.de - Fixed typos and grammatical errors (bnc #432378, bcn #415719) -- 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] r52659 - in /trunk/audit-laf/src: complex.ycp dialogs.ycp wizards.ycp
by gs＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: gs Date: Wed Oct 29 13:43:23 2008 New Revision: 52659 URL: http://svn.opensuse.org/viewcvs/yast?rev=52659&view=rev Log: add extra input fields to specify a script, rearrange some widgets Modified: trunk/audit-laf/src/complex.ycp trunk/audit-laf/src/dialogs.ycp trunk/audit-laf/src/wizards.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 29 13:43:23 2008 @@ -94,7 +94,6 @@ UI::ChangeWidget( `id("num_logs"), `Value, tointeger( AuditLaf::GetAuditdOption("num_logs")) ); foreach (string key, ["log_file", "max_log_file", - "action_mail_acct", "name" ], { UI::ChangeWidget(`id(key), `Value, (AuditLaf::GetAuditdOption(key))); @@ -120,7 +119,7 @@ if ( action == "select_file" ) { string file_name = UI::AskForSaveFileName("/var/log/audit", "*.log", _("Select the log file") ); - + y2milestone( "Filename: %1", file_name ); UI::ChangeWidget( `id("log_file"), `Value, file_name ); y2milestone( "Logfile set to: %1", file_name ); } @@ -143,7 +142,6 @@ "max_log_file", "flush", "max_log_file_action", - "action_mail_acct", "name_format", "name" ], { @@ -208,38 +206,100 @@ // Set all values to values read from /etc/audit/auditd.conf foreach (string key, ["space_left", + "action_mail_acct", "admin_space_left" ], { UI::ChangeWidget(`id(key), `Value, (AuditLaf::GetAuditdOption(key))); }); - foreach (string key, ["space_left_action", - "admin_space_left_action", - "disk_full_action", - "disk_error_action" - ], { - UI::ChangeWidget(`id(key), `Value, toupper(AuditLaf::GetAuditdOption(key)) ); - }); + foreach ( string key, ["space_left_action", + "admin_space_left_action", + "disk_full_action", + "disk_error_action" + ], { + + if ( toupper(substring( AuditLaf::GetAuditdOption(key), 0, 4 ) ) == "EXEC" ) + { + UI::ChangeWidget( `id(key), `Value, "EXEC" ); + UI::ChangeWidget( `id(key+"_exec"), `Enabled, true ); + UI::ChangeWidget( `id(key+"_exec"), `Value, substring( AuditLaf::GetAuditdOption(key), 4 ) ); + } + else + { + UI::ChangeWidget( `id(key), `Value, toupper(AuditLaf::GetAuditdOption(key)) ); + UI::ChangeWidget( `id(key+"_exec"), `Enabled, false ); + } + }); - y2milestone( "Init disk space settings" ); + +} + +/* + * Handle actions of disk space + */ +symbol HandleDiskspaceSettingsDialog(string id, map event) { + any action = event["ID"]:nil; + y2milestone( "action: %1", action ); + + list actions_list = ["space_left_action", + "admin_space_left_action", + "disk_full_action", + "disk_error_action" + ]; + + if ( is( action, string ) && contains( actions_list, (string)action) ) + { + string option = (string)UI::QueryWidget(`id((string)action), `Value ); + y2milestone( "Option: %1", option ); + + if ( option == "EXEC" ) + { + UI::ChangeWidget( `id((string)action+"_exec"), `Enabled, true ); + } + else + { + UI::ChangeWidget( `id((string)action+"_exec"), `Enabled, false ); + } + } + + return nil; } /* * Store all settings made in disk space dialog */ void StoreDiskspaceSettingsDialog (string id, map event) { + string option = ""; + string exec = ""; + AuditLaf::SetModified( true ); - foreach (string key, ["space_left", - "admin_space_left", - "space_left_action", - "admin_space_left_action", - "disk_full_action", - "disk_error_action" + foreach ( string key, ["space_left", + "action_mail_acct", + "admin_space_left" ], { - AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); - }); + AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); + }); + + foreach ( string key, ["space_left_action", + "admin_space_left_action", + "disk_full_action", + "disk_error_action" + ], { + + option = (string)UI::QueryWidget( `id(key), `Value ); + if ( option == "EXEC" ) + { + exec = (string)UI::QueryWidget( `id(key+"_exec"), `Value ); + AuditLaf::SetAuditdOption( key, option + " " + exec ); + } + + else + { + AuditLaf::SetAuditdOption( key, option ); + } + }); y2milestone( "Store disk space settings" ); } Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Wed Oct 29 13:43:23 2008 @@ -69,8 +69,7 @@ ]) ), `HSpacing(2.0), - // InputField label - `HWeight( 1, `IntField(`id("num_logs"), `opt(`hstretch), _("&Number of Log Files"), 0, 99, 4) ) + `HWeight( 1, `Empty() ) ), `HBox( // ComboBox label - select how to flush data on disk @@ -107,7 +106,7 @@ ), `HSpacing(2.0), // InputField label - `HWeight( 1, `InputField(`id("action_mail_acct"), _("Action Mail Account"))) + `HWeight( 1, `IntField(`id("num_logs"), `opt(`hstretch), _("&Number of Log Files"), 0, 99, 4) ) ) ), `VStretch(), @@ -166,6 +165,23 @@ ); } +list actions_list = [`item(`id("IGNORE"), "IGNORE" ), + `item(`id("SYSLOG"), "SYSLOG", true ), + `item(`id("SUSPEND"), "SUSPEND" ), + `item(`id("SINGLE"), "SINGLE" ), + `item(`id("HALT"), "HALT" ), + `item(`id("EXEC"), "EXEC" ), + `item(`id("EMAIL"), "EMAIL" ) + ]; + +list error_actions_list = [`item(`id("IGNORE"), "IGNORE" ), + `item(`id("SYSLOG"), "SYSLOG", true ), + `item(`id("SUSPEND"), "SUSPEND" ), + `item(`id("SINGLE"), "SINGLE" ), + `item(`id("HALT"), "HALT" ), + `item(`id("EXEC"), "EXEC" ) + ]; + term DiskspaceSettingsDialogContent () { return `MarginBox( mbox_x, mbox_y, `VBox( @@ -177,69 +193,57 @@ // InputField label - space on disk is starting to run low if the entered value is reached `HWeight( 1, `InputField(`id("space_left"), _("&Space Left on Disk (MB)") )), `HSpacing(2.0), - `HWeight( 1, `ComboBox(`id("space_left_action"), `opt(`editable), + `HWeight( 1, `ComboBox(`id("space_left_action"), `opt(`notify), // ComboBox label - select an action which is performed if space on disk is low - _("&Action"), - [`item(`id("IGNORE"), "IGNORE" ), - `item(`id("SYSLOG"), "SYSLOG", true ), - `item(`id("SUSPEND"), "SUSPEND" ), - `item(`id("SINGLE"), "SINGLE" ), - `item(`id("HALT"), "HALT" ), - `item(`id("EXEC"), "EXEC" ), - `item(`id("EMAIL"), "EMAIL" ) - ]) - ) + _("&Action"), actions_list ) + ), + `HSpacing(1.0), + // InputField label - enter the path to a script (which will be executed) + `HWeight( 1, `InputField(`id("space_left_action_exec"), _("Path to Script" ) ) ) ) ), `VStretch(), - `Frame ( + `Frame( // Frame label - keep it short! _("Value and Action for Space is Running Low"), `HBox( - // InputField label - space on disk is running low if the entered value is reached - `HWeight( 1, `InputField(`id("admin_space_left"), _("&Admin Space Left on Disk (MB) ")) ), + // InputField label - space on disk is running low if the entered value is reached + `HWeight( 1, `InputField(`id("admin_space_left"), _("&Admin Space Left (MB) ")) ), `HSpacing(2.0), - `HWeight( 1, `ComboBox(`id("admin_space_left_action"), `opt(`editable), - // ComboBox label - select an action which is performed if space on disk is running low - _("Ac&tion"), - [`item(`id("IGNORE"), "IGNORE" ), - `item(`id("SYSLOG"), "SYSLOG", true ), - `item(`id("SUSPEND"), "SUSPEND" ), - `item(`id("SINGLE"), "SINGLE" ), - `item(`id("HALT"), "HALT" ), - `item(`id("EXEC"), "EXEC" ), - `item(`id("EMAIL"), "EMAIL" ) - ]) ) - + `HWeight( 1, `ComboBox(`id("admin_space_left_action"), `opt(`notify), + // ComboBox label - select an action which is performed if space on disk is running low + _("Ac&tion"), actions_list ) + ), + `HSpacing(1.0), + // InputField label - enter the path to a script (which will be executed) + `HWeight( 1, `InputField(`id("admin_space_left_action_exec"), _("Path to Script" ) ) ) ) ), `VStretch(), + `InputField(`id("action_mail_acct"), _("Action Mail Account")), + `VStretch(), `Frame( // Frame label - keep it short! _("Action on Error or Disk Full"), `VBox( - `ComboBox(`id("disk_full_action"), `opt(`editable, `hstretch), - // ComboBox label - select an action which is performed if disk is full - _("Disk &Full Action"), - [`item(`id("IGNORE"), "IGNORE" ), - `item(`id("SYSLOG"), "SYSLOG", true ), - `item(`id("SUSPEND"), "SUSPEND" ), - `item(`id("SINGLE"), "SINGLE" ), - `item(`id("HALT"), "HALT" ), - `item(`id("EXEC"), "EXEC" ) - ]), - `ComboBox(`id("disk_error_action"), `opt(`editable, `hstretch ), - // ComboBox label - select an action which is performed on error - _("Disk &Error Action"), - [`item(`id("IGNORE"), "IGNORE" ), - `item(`id("SYSLOG"), "SYSLOG", true ), - `item(`id("SUSPEND"), "SUSPEND" ), - `item(`id("SINGLE"), "SINGLE" ), - `item(`id("HALT"), "HALT" ), - `item(`id("EXEC"), "EXEC" ) - ]) + `HBox( + `HWeight( 1, `ComboBox(`id("disk_full_action"), `opt(`notify), + // ComboBox label - select an action which is performed if disk is full + _("Disk &Full Action"), error_actions_list ) ), + `HSpacing(2.0), + // InputField label - enter the path to a script (which will be executed) + `HWeight( 1, `InputField(`id("disk_full_action_exec"), _("Path to Script" ) ) ) + ), + `HBox( + `HWeight ( 1, `ComboBox(`id("disk_error_action"), `opt(`notify ), + // ComboBox label - select an action which is performed on error + _("Disk &Error Action"), error_actions_list ) ), + `HSpacing(2.0), + // InputField label - enter the path to a script (which will be executed) + `HWeight( 1, `InputField(`id("disk_error_action_exec"), _("Path to Script" ) ) ) + ) ) - ), + ), `VStretch() ) ); Modified: trunk/audit-laf/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/wizards.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/wizards.ycp (original) +++ trunk/audit-laf/src/wizards.ycp Wed Oct 29 13:43:23 2008 @@ -66,6 +66,7 @@ "help" : HELPS["diskspace_settings"]:"", "custom_widget" : DiskspaceSettingsDialogContent(), "init" : InitDiskspaceSettingsDialog, + "handle" : HandleDiskspaceSettingsDialog, "store" : StoreDiskspaceSettingsDialog, ], "rules" : $[ -- 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] r52658 - /trunk/audit-laf/src/helps.ycp
by gs＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: gs Date: Wed Oct 29 13:38:27 2008 New Revision: 52658 URL: http://svn.opensuse.org/viewcvs/yast?rev=52658&view=rev Log: add help for action mail account Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5265… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Wed Oct 29 13:38:27 2008 @@ -93,20 +93,24 @@ _("Communication: Controls the communication between the daemon and the dispatcher program."), - /* disk space dialog help 1/4 */ + /* disk space dialog help 1/5 */ "diskspace_settings" : _("<big>Auditd Disk Space Configuration</big> The settings made here refer to disk space on log partition. Detailed information can be obtained from 'man auditd.conf' ") + - /* disk space dialog help 2/4 */ + /* disk space dialog help 2/5 */ _("Space Left and Action describe how much disk space (in megabytes) to left and which action to perform if the system is starting to run low on space.") + - /* disk space dialog help 3/4 */ + /* disk space dialog help 3/5 */ _("Admin Space Left and Action describe how much disk space (in megabytes) to left and which action to perform if the system is running low.") + + + /* disk space dialog help 4/5 */ + _("If the action is set to EMAIL a warning mail will be send to the account specified in +Action Mail Account" ) + - /* disk space dialog help 3/4 */ + /* disk space dialog help 5/5 */ _("You can also specify a Disk Full Action (disk has become full already) and a Disk Error Action (performed whenever an error is detected while writing to disk)."), -- 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] r52657 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: rpmcruz Date: Wed Oct 29 13:17:14 2008 New Revision: 52657 URL: http://svn.opensuse.org/viewcvs/yast?rev=52657&view=rev Log: * src/YGPackageSelector.cc (ListView): tooltip for status icon. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52657&r1=52656… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 29 13:17:14 2008 @@ -1,3 +1,7 @@ +2008-10-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc (ListView): tooltip for status icon. + 2008-10-29 Michael Meeks <michael.meeks(a)novell.com> * Version 2.17.4 Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Oct 29 13:17:14 2008 @@ -418,7 +418,7 @@ struct ListView : public View { bool m_isTree; - ListView (bool isTree, bool showTooltips, bool editable, PackagesView *parent) + ListView (bool isTree, bool editable, PackagesView *parent) : View (parent), m_isTree (isTree) { GtkTreeView *view = GTK_TREE_VIEW (m_widget = gtk_tree_view_new()); @@ -460,11 +460,9 @@ g_signal_connect (G_OBJECT (m_widget), "button-press-event", G_CALLBACK (popup_button_cb), this); } - if (showTooltips) { - gtk_widget_set_has_tooltip (m_widget, TRUE); - g_signal_connect (G_OBJECT (m_widget), "query-tooltip", - G_CALLBACK (query_tooltip_cb), this); - } + gtk_widget_set_has_tooltip (m_widget, TRUE); + g_signal_connect (G_OBJECT (m_widget), "query-tooltip", + G_CALLBACK (query_tooltip_cb), this); ensure_view_visible_hook (m_widget); } @@ -534,20 +532,28 @@ return package != NULL; } - static gboolean query_tooltip_cb (GtkWidget *view, gint x, gint y, + static gboolean query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer data) { + GtkTreeView *view = GTK_TREE_VIEW (widget); GtkTreeModel *model; GtkTreePath *path; GtkTreeIter iter; - if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (view), + if (gtk_tree_view_get_tooltip_context (view, &x, &y, keyboard_mode, &model, &path, &iter)) { - Ypp::Package *package = 0; - gtk_tree_model_get (model, &iter, - YGtkZyppModel::PTR_COLUMN, &package, -1); - gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (view), tooltip, path); + GtkTreeViewColumn *column; + int bx, by; + gtk_tree_view_convert_widget_to_bin_window_coords (view, x, y, &bx, &by); + gtk_tree_view_get_path_at_pos (view, x, y, NULL, &column, NULL, NULL); + + gtk_tree_view_set_tooltip_row (view, tooltip, path); gtk_tree_path_free (path); - if (package) { + + Ypp::Package *package = 0; + gtk_tree_model_get (model, &iter, YGtkZyppModel::PTR_COLUMN, &package, -1); + if (!package) return FALSE; + + if (package->type() == Ypp::Package::PATTERN_TYPE) { gtk_tooltip_set_text (tooltip, package->description (true).c_str()); const std::string &icon = package->icon(); if (!icon.empty()) { @@ -559,6 +565,37 @@ } return TRUE; } + else if (column == gtk_tree_view_get_column (view, 0)) { + std::string status; + if (package->toInstall (NULL)) { + if (package->isInstalled()) + status = _("To re-install a different version"); + else + status = _("To install"); + } + else if (package->toRemove()) + status = _("To remove"); + else if (package->isInstalled()) { + status = _("Installed"); + if (package->hasUpgrade()) + status += _(" (upgrade available)"); + } + else + status = _("Not installed"); + if (package->isAuto()) + status += _("\nstatus changed by the dependency solver"); + if (package->isLocked()) + status += _("\nlocked: right-click to unlock"); + gtk_tooltip_set_markup (tooltip, status.c_str()); + GdkPixbuf *pixbuf = 0; + gtk_tree_model_get (model, &iter, + YGtkZyppModel::ICON_COLUMN, &pixbuf, -1); + if (pixbuf) { + gtk_tooltip_set_icon (tooltip, pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } + return TRUE; + } } return FALSE; } @@ -669,7 +706,7 @@ gtk_container_remove (GTK_CONTAINER (m_bin), m_view->m_widget); delete m_view; if (mode == LIST_MODE) - m_view = new ListView (m_isTree, m_isTree, editable, this); + m_view = new ListView (m_isTree, editable, this); else // if (mode == ICON_MODE) m_view = new IconView (editable, this); gtk_container_add (GTK_CONTAINER (m_bin), m_view->m_widget); @@ -793,7 +830,7 @@ else gtk_widget_show (m_button); gtk_label_set_text (GTK_LABEL (m_label), text.c_str()); - std::string tooltip = action + " " + package->summary(); + std::string tooltip = action + " " + package->name(); if (version) tooltip += std::string (_("\nfrom")) + " " + version->repo->name + ""; gtk_widget_set_tooltip_markup (m_label, tooltip.c_str()); @@ -838,7 +875,7 @@ ygtk_wizard_set_information_expose_hook (vbox, &vbox->allocation); ygtk_wizard_set_information_expose_hook (m_entries_box, &m_entries_box->allocation); - int width = YGUtils::getCharsWidth (vbox, 25); + int width = YGUtils::getCharsWidth (vbox, 35); gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); -- 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] r52656 - /tags/stable-2_17_4/gtk/
by michael_meeks＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: michael_meeks Date: Wed Oct 29 12:34:25 2008 New Revision: 52656 URL: http://svn.opensuse.org/viewcvs/yast?rev=52656&view=rev Log: Created tag stable-2_17_4 for gtk Added: tags/stable-2_17_4/gtk/ - copied from r52655, trunk/gtk/ -- 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] r52655 - in /trunk/gtk: ChangeLog VERSION package/yast2-gtk.changes
by michael_meeks＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: michael_meeks Date: Wed Oct 29 12:34:05 2008 New Revision: 52655 URL: http://svn.opensuse.org/viewcvs/yast?rev=52655&view=rev Log: 2008-10-29 Michael Meeks <michael.meeks(a)novell.com> * Version 2.17.4 Modified: trunk/gtk/ChangeLog trunk/gtk/VERSION trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52655&r1=52654… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 29 12:34:05 2008 @@ -1,3 +1,7 @@ +2008-10-29 Michael Meeks <michael.meeks(a)novell.com> + + * Version 2.17.4 + 2008-10-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkfindentry.h/c: added tooltip argument to insert_item. @@ -70,8 +74,7 @@ at the window position x=0. * src/YGBarGraph.cc (YGPartitionSplitter): bug fix: the widget was - broken. Aligned labels correctly as well. -437738 + broken. Aligned labels correctly as well. #437738# * src/ygtkwizard.h/cc: added history combo box to the help dialog. 2008-10-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=52655&r1=52654&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Wed Oct 29 12:34:05 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Wed Oct 29 12:34:05 2008 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Oct 29 10:54:07 CEST 2008 - michael.meeks(a)novell.com + +- Update to 2.17.4 + * sizing fixes to wizard, partition splitter, ratiobox + * improved tooltips + * package selector fixes: updated zypper API use, + add unsupported support, updated recent spin box, png + icons, ergonomic fixes, sync groups with qt, support + non-edit mode + * bar graph color fixes + * help / history + * selectable multi-line labels + * fixes to scrolling widgets + +------------------------------------------------------------------- Mon Oct 13 10:21:07 CEST 2008 - michael.meeks(a)novell.com - Update to 2.17.3 -- 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] r52654 - /trunk/storage/storage/src/include/ep-loop-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 11:57:08 2008 New Revision: 52654 URL: http://svn.opensuse.org/viewcvs/yast?rev=52654&view=rev Log: - work on crypt files (bnc #433484) Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-dialogs.ycp Wed Oct 29 11:57:08 2008 @@ -87,7 +87,12 @@ fpath = tmp; UI::ChangeWidget(`id(`fpath), `Value, fpath); - // TODO: file existence -> set create + if (Mode::normal()) + { + integer s = (integer) SCR::Read(.target.size, fpath); + create_file = s < 0; + UI::ChangeWidget(`id(`create_file), `Value, create_file); + } break; @@ -99,6 +104,16 @@ case `next: fpath = (string) UI::QueryWidget(`id(`fpath), `Value); + if (fpath == "" || substring(fpath, 0, 1) != "/") + { + // popup text + Popup::Error(sformat(_("The file name \"%1\" is invalid. +Use an absolute path name. +"), fpath)); + widget = `again; + continue; + } + if (create_file) { string tmp = (string) UI::QueryWidget(`id(`size), `Value); @@ -115,10 +130,31 @@ Popup::Error(sformat(_("The size entered is invalid. Enter a size of at least %1."), Storage::KByteToHumanString(min_size_k))); widget = `again; + continue; } } + else + { + integer s = (integer) SCR::Read(.target.size, fpath); + y2milestone("loop file size:%1", s); - // TODO checks, valid filename, file existence + if (Mode::normal()) + { + if (s < 0) + { + // popup text + Popup::Error( sformat(_("The file name \"%1\" does not exist +and the flag for create is off. Either use an existing file or activate +the create flag."), fpath)); + widget = `again; + continue; + } + else + { + size_k = s / 1024; + } + } + } break; } -- 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] r52653 - /trunk/gtk/src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: rpmcruz Date: Wed Oct 29 11:12:40 2008 New Revision: 52653 URL: http://svn.opensuse.org/viewcvs/yast?rev=52653&view=rev Log: bug fix: clear state when changing item. Modified: trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Oct 29 11:12:40 2008 @@ -1555,6 +1555,7 @@ gtk_entry_set_text (GTK_ENTRY (entry), text); g_signal_handlers_unblock_by_func (entry, (gpointer) name_changed_cb, pThis); gtk_editable_set_position (GTK_EDITABLE (entry), -1); + ygtk_find_entry_set_state (entry, TRUE); pThis->signalChanged(); } -- 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] r52652 - /trunk/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 10:53:14 2008 New Revision: 52652 URL: http://svn.opensuse.org/viewcvs/yast?rev=52652&view=rev Log: changelog up Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 29 10:53:14 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 10:51:00 CET 2008 - kmachalkova(a)suse.cz + +- Fit internet test dialog into 80x24 console (bnc#433091) + +------------------------------------------------------------------- Mon Oct 27 13:24:33 CET 2008 - kmachalkova(a)suse.cz - Remote administration (VNC): service name for opening port in -- 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] r52651 - /trunk/network/src/installation/dialogs.ycp
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 10:50:38 2008 New Revision: 52651 URL: http://svn.opensuse.org/viewcvs/yast?rev=52651&view=rev Log: Fit the dialog into 80x24 Modified: trunk/network/src/installation/dialogs.ycp Modified: trunk/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs… ============================================================================== --- trunk/network/src/installation/dialogs.ycp (original) +++ trunk/network/src/installation/dialogs.ycp Wed Oct 29 10:50:38 2008 @@ -130,13 +130,13 @@ string current = Internet::device; /* Radiobuttons */ term buttons = `VBox( - `VSpacing(1), + `VSpacing(0.4), /* RadioButton label */ `Left(`RadioButton(`id(`yes), `opt(`notify), _("&Yes, Test Connection to the Internet Via"), Internet::do_test)), getDeviceContens(current), /* RadioButton label */ `Left(`RadioButton(`id(`no), `opt(`notify), _("N&o, Skip This Test"), !Internet::do_test)), - `VSpacing(1) + `VSpacing(0.4) ); /* the steps */ -- 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] r52650 - /trunk/storage/storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 10:40:49 2008 New Revision: 52650 URL: http://svn.opensuse.org/viewcvs/yast?rev=52650&view=rev Log: - lengths is at least 1 Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Oct 29 10:40:49 2008 @@ -128,7 +128,7 @@ `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), _("Start Cylinder"), 0, cyl_count, region[0]:0)), `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 0, cyl_count, region[1]:0)) + _("Number of Cylinders"), 1, cyl_count, region[1]:0)) )) ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52649 - /tags/stable-2_17_20/users/
by jsuchome＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsuchome Date: Wed Oct 29 09:25:47 2008 New Revision: 52649 URL: http://svn.opensuse.org/viewcvs/yast?rev=52649&view=rev Log: Created tag stable-2_17_20 for users Added: tags/stable-2_17_20/users/ - copied from r52648, trunk/users/ -- 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] r52648 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/inst_user_first.ycp
by jsuchome＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsuchome Date: Wed Oct 29 09:25:41 2008 New Revision: 52648 URL: http://svn.opensuse.org/viewcvs/yast?rev=52648&view=rev Log: - during live installation, available package is installed one - bind tools are in 'bind' image, not 'bind.rpm' (bnc#438691) - 2.17.20 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/inst_user_first.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=52648&r1=52647… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Oct 29 09:25:41 2008 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Oct 29 09:25:41 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 09:08:54 CET 2008 - jsuchome(a)suse.cz + +- during live installation, available package is installed one +- bind tools are in 'bind' image, not 'bind.rpm' (bnc#438691) +- 2.17.20 + +------------------------------------------------------------------- Wed Oct 22 12:55:32 CEST 2008 - jsuchome(a)suse.cz - do not call extend during live installation Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=526… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Wed Oct 29 09:25:41 2008 @@ -1323,6 +1323,10 @@ BEGIN { $TYPEINFO{LoadCracklib} = ["function", "boolean"]; } sub LoadCracklib { + if (!Stage->initial () || Mode->live_installation ()) { + y2debug ("no extend in this stage/mode"); + return 1; + } return InstExtensionImage->LoadExtension ("cracklib-dict-full.rpm", # busy popup message sformat (__("Retrieving %1 extension..."), "cracklib-dict-full.rpm")); @@ -1333,6 +1337,10 @@ BEGIN { $TYPEINFO{UnLoadCracklib} = ["function", "boolean"]; } sub UnLoadCracklib { + if (!Stage->initial () || Mode->live_installation ()) { + y2debug ("no extend in this stage/mode"); + return 1; + } return InstExtensionImage->UnLoadExtension ("cracklib-dict-full.rpm", # busy popup message sformat (__("Releasing %1 extension..."), "cracklib-dict-full.rpm")); Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Wed Oct 29 09:25:41 2008 @@ -75,7 +75,7 @@ "x86_64" : "-32bit", ]; string arch_package = package + dependency[arch]:""; - if (arch_package != package && Package::Available (arch_package)) + if (arch_package != package && Package::Available(arch_package) == true) Pkg::ResolvableInstall (package, `package); } @@ -137,7 +137,9 @@ string package = sformat ("yast2-%1-client", client); if (client == "edir_ldap") package = "yast2-linux-user-mgmt"; - return Mode::normal () || Package::Available (package); + return Mode::normal () || Package::Available (package) == true || + // during Mode::live_installation, available = installed + (Mode::live_installation () && Package::Installed (package)); }); available_clients = prepend (available_clients, "users"); -- 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] r52647 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 21:18:54 2008 New Revision: 52647 URL: http://svn.opensuse.org/viewcvs/yast?rev=52647&view=rev Log: - use better log functions Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Oct 28 21:18:54 2008 @@ -75,9 +75,9 @@ : lock(ronly, tmode), readonly(ronly), testmode(tmode), initialized(false), autodetect(autodetec) { - y2milestone( "constructed Storage ronly:%d testmode:%d autodetect:%d", - ronly, testmode, autodetect ); - y2milestone( "package string \"%s\"", PACKAGE_STRING ); + y2mil("constructed Storage ronly:" << ronly << " testmode:" << testmode << + " autodetect:" << autodetect); + y2mil("package string \"" PACKAGE_STRING "\""); char * tenv = getenv( "YAST_IS_RUNNING" ); inst_sys = tenv!=NULL && strcmp(tenv,"instsys")==0; root_mounted = !inst_sys; @@ -90,8 +90,8 @@ logdir = "/var/log/YaST2"; if( tenv!=0 ) string(tenv) >> max_log_num; - y2milestone( "instsys:%d testmode:%d autodetect:%d log:%d", inst_sys, - testmode, autodetect, max_log_num ); + y2mil("instsys:" << inst_sys << " testmode:" << testmode << " autodetect:" << autodetect << + " log:" << max_log_num); progress_bar_cb = NULL; install_info_cb = NULL; info_popup_cb = NULL; @@ -170,7 +170,7 @@ testdir = logdir; } } - y2milestone( "instsys:%d testdir:%s", inst_sys, testdir.c_str() ); + y2mil("instsys:" << inst_sys << " testdir:" << testdir); detectObjects(); setCacheChanges( true ); dumpObjectList(); @@ -292,16 +292,17 @@ SystemCmd c( "rmdir " + tempdir ); if( c.retcode()!=0 ) { - y2error( "stray tmpfile" ); + y2err("stray tmpfile"); c.execute( "ls -l" + tempdir ); c.execute( "rm -rf " + tempdir ); } } - y2milestone( "destructed Storage" ); + y2mil("destructed Storage"); } void Storage::rescanEverything() { + y2mil("rescan everything"); deleteClist(cont); detectObjects(); } @@ -341,24 +342,24 @@ { AsciiFile cpu( "/proc/cpuinfo" ); int l = cpu.find( 0, "^machine\t" ); - y2milestone( "line:%d", l ); + y2mil("line:" << l); if( l >= 0 ) { string line = cpu[l]; line = extractNthWord( 2, line ); - y2milestone( "line:%s", line.c_str() ); + y2mil("line:" << line); is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0; is_ppc_pegasos = line.find( "EFIKA5K2" )==0; if( is_ppc_mac == 0 && is_ppc_pegasos == 0 ) { line = cpu[l]; line = extractNthWord( 3, line ); - y2milestone( "line:%s", line.c_str() ); + y2mil("line:" << line); is_ppc_pegasos = line.find( "Pegasos" )==0; } } } - y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos:%d", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos ); + y2mil("Arch:" << proc_arch << " IsPPCMac:" << is_ppc_mac << " IsPPCPegasos:" << is_ppc_pegasos); } void -- 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] r52646 - /tags/stable-2_17_46/storage/
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:49:36 2008 New Revision: 52646 URL: http://svn.opensuse.org/viewcvs/yast?rev=52646&view=rev Log: Created tag stable-2_17_46 for storage Added: tags/stable-2_17_46/storage/ - copied from r52645, trunk/storage/ -- 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] r52645 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:22:45 2008 New Revision: 52645 URL: http://svn.opensuse.org/viewcvs/yast?rev=52645&view=rev Log: - allow creation of partitions by providing cylinder start and end (bnc #431583) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=52645&r1=526… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Tue Oct 28 20:22:45 2008 @@ -1 +1 @@ -2.17.45 +2.17.46 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Oct 28 20:22:45 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 28 20:14:59 CET 2008 - aschnell(a)suse.de + +- allow creation of partitions by providing cylinder start and + end (bnc #431583) +- 2.17.46 + +------------------------------------------------------------------- Mon Oct 27 11:54:55 CET 2008 - aschnell(a)suse.de - provide simple interface to activate multipath if yast2-multipath Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 20:22:45 2008 @@ -106,7 +106,7 @@ integer min_size_k = tointeger(float::ceil(cyl_size / 1024.0)); integer max_size_k = (slot[1]:0 * cyl_size) / 1024; - symbol what = (region == slot) ? `max_size : `manual_size; + symbol what = (region == slot) ? `max_size : `manual_region; term contents = `HVSquash( // frame heading @@ -126,9 +126,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, cyl_count, 42)), + _("Start Cylinder"), 0, cyl_count, region[0]:0)), `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 0, cyl_count, 42)) + _("Number of Cylinders"), 0, cyl_count, region[1]:0)) )) ) ) @@ -204,7 +204,7 @@ if (!valid) { // error popup - Popup::Error(_("The region is invalid.")); + Popup::Error(_("The region entered is invalid.")); widget = `again; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52644 - in /trunk/storage/storage/src/include: ep-hd-dialogs.ycp ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:11:06 2008 New Revision: 52644 URL: http://svn.opensuse.org/viewcvs/yast?rev=52644&view=rev Log: - proper limits for cylinder input fields Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 20:11:06 2008 @@ -96,6 +96,7 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; + integer cyl_count = data["cyl_count"]:0; list< list<integer> > slots = data["slots", data["type"]:`unknown]:[]; list<integer> slot = slots[0]:[]; @@ -125,9 +126,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, 10000 /* TODO */, 42)), + _("Start Cylinder"), 0, cyl_count, 42)), `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 0, 10000 /* TODO */, 42)) + _("Number of Cylinders"), 0, cyl_count, 42)) )) ) ) Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Oct 28 20:11:06 2008 @@ -112,7 +112,7 @@ Storage::GetUnusedPartitionSlots(disk_device, slots); y2milestone("slots %1", slots); - // sort primary, extended and logical slots + // individual sort primary, extended and logical slots map<symbol, list> ret = $[]; list<map> tmp = []; @@ -180,6 +180,7 @@ "create" : true, "disk_device" : disk_device, "cyl_size" : disk["cyl_size"]:0, + "cyl_count" : disk["cyl_count"]:0, "slots" : slots ]; if (DlgCreatePartition(data)) -- 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] r52643 - /trunk/storage/libstorage/src/Partition.h
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:04:57 2008 New Revision: 52643 URL: http://svn.opensuse.org/viewcvs/yast?rev=52643&view=rev Log: - tiny simplification Modified: trunk/storage/libstorage/src/Partition.h Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Tue Oct 28 20:04:57 2008 @@ -31,7 +31,7 @@ unsigned long cylStart() const { return reg.start(); } unsigned long cylSize() const { return reg.len(); } - unsigned long cylEnd() const { return reg.start()+reg.len()-1; } + unsigned long cylEnd() const { return reg.end(); } const Region& region() const { return reg; } const std::list<string> udevId() const; const string& udevPath() const; -- 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] r52642 - in /trunk/gtk/src: Makefile.am icons/pkg-install-upgrade.png icons/pkg-upgrade.png ygtkzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 19:47:30 2008 New Revision: 52642 URL: http://svn.opensuse.org/viewcvs/yast?rev=52642&view=rev Log: Renamed install-upgrade to just upgrade. Added: trunk/gtk/src/icons/pkg-upgrade.png (with props) Removed: trunk/gtk/src/icons/pkg-install-upgrade.png Modified: trunk/gtk/src/Makefile.am trunk/gtk/src/ygtkzyppwrapper.cc Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=52642&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Tue Oct 28 19:47:30 2008 @@ -95,7 +95,7 @@ icons/pkg-remove.png \ icons/pkg-install.png \ icons/pkg-install-auto.png \ - icons/pkg-install-upgrade.png \ + icons/pkg-upgrade.png \ icons/pkg-installed-locked.png \ icons/pkg-unlocked.png \ icons/pkg-installed-upgradable-locked.png \ Added: trunk/gtk/src/icons/pkg-upgrade.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-upgrade.png?re… ============================================================================== Binary file - no diff available. Modified: trunk/gtk/src/ygtkzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppwrapper.cc?rev=5… ============================================================================== --- trunk/gtk/src/ygtkzyppwrapper.cc (original) +++ trunk/gtk/src/ygtkzyppwrapper.cc Tue Oct 28 19:47:30 2008 @@ -40,8 +40,8 @@ available = loadPixbuf ("pkg-available.png"); available_locked = loadPixbuf ("pkg-available-locked.png"); to_install = loadPixbuf ("pkg-install.png"); + to_install_upgrade = loadPixbuf ("pkg-upgrade.png"); to_remove = loadPixbuf ("pkg-remove.png"); - to_install_upgrade = loadPixbuf ("pkg-install-upgrade.png"); to_auto_install = loadPixbuf ("pkg-install-auto.png"); to_auto_remove = loadPixbuf ("pkg-remove-auto.png"); } -- 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] r52641 - in /trunk/storage/storage/src: include/ep-hd-dialogs.ycp include/ep-main.ycp modules/Makefile.am modules/Region.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 19:45:18 2008 New Revision: 52641 URL: http://svn.opensuse.org/viewcvs/yast?rev=52641&view=rev Log: - validate manual region Added: trunk/storage/storage/src/modules/Region.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/modules/Makefile.am Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 19:45:18 2008 @@ -96,7 +96,7 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; - list slots = data["slots", data["type"]:`unknown]:[]; + list< list<integer> > slots = data["slots", data["type"]:`unknown]:[]; list<integer> slot = slots[0]:[]; list<integer> region = data["region"]:slot; @@ -193,17 +193,20 @@ case `manual_region: { - integer tmp1 = (integer) UI::QueryWidget(`id(`start_cyl), `Value); - integer tmp2 = (integer) UI::QueryWidget(`id(`num_cyls), `Value); + region = [ (integer) UI::QueryWidget(`id(`start_cyl), `Value), + (integer) UI::QueryWidget(`id(`num_cyls), `Value) ]; - if (false) // TODO + boolean valid = find(list<integer> slot, slots, { + return Region::Inside(slot, region); + }) != nil; + + if (!valid) { + // error popup Popup::Error(_("The region is invalid.")); widget = `again; } - region = [ tmp1, tmp2 ]; - break; } } Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Oct 28 19:45:18 2008 @@ -26,6 +26,7 @@ import "DevicesSelectionBox"; import "Integer"; import "String"; + import "Region"; include "partitioning/lvm_ui_dialogs.ycp"; Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Tue Oct 28 19:45:18 2008 @@ -21,7 +21,8 @@ MiniWorkflow.ycp \ Greasemonkey.ycp \ DevicesSelectionBox.ycp \ - DualMultiSelectionBox.ycp + DualMultiSelectionBox.ycp \ + Region.ycp EXTRA_DIST = $(module_DATA) Added: trunk/storage/storage/src/modules/Region.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Regi… ============================================================================== --- trunk/storage/storage/src/modules/Region.ycp (added) +++ trunk/storage/storage/src/modules/Region.ycp Tue Oct 28 19:45:18 2008 @@ -0,0 +1,39 @@ +/** + * File: Region.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + * A region is a list of two integers, the first being the start and the + * second the length. + */ +{ + module "Region"; + + + integer Start(list<integer> a) + { + return a[0]:0; + } + + + integer Length(list<integer> a) + { + return a[1]:0; + } + + + integer End(list<integer> a) + { + return a[0]:0 + a[1]:0 - 1; + } + + + /** + * Checks whether region b lies within region a. + */ + global boolean Inside(list<integer> a, list<integer> b) + { + return Start(b) >= Start(a) && End(b) <= End(a); + } +} -- 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] r52640 - in /trunk/gtk: ./ src/ src/icons/
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 19:36:49 2008 New Revision: 52640 URL: http://svn.opensuse.org/viewcvs/yast?rev=52640&view=rev Log: * src/Makefile.am, src/YGPackageSelector.cc & src/ygtkzyppwrapper.cc: install quality PNG icons, instead of embeding XPM ones. Added: trunk/gtk/src/hr.xpm trunk/gtk/src/icons/harddisk-full.png (with props) trunk/gtk/src/icons/harddisk.png (with props) trunk/gtk/src/icons/pkg-available-locked.png (with props) trunk/gtk/src/icons/pkg-available.png (with props) trunk/gtk/src/icons/pkg-install-auto.png (with props) trunk/gtk/src/icons/pkg-install-upgrade.png (with props) trunk/gtk/src/icons/pkg-install.png (with props) trunk/gtk/src/icons/pkg-installed-locked.png (with props) trunk/gtk/src/icons/pkg-installed-upgradable-locked.png (with props) trunk/gtk/src/icons/pkg-installed-upgradable.png (with props) trunk/gtk/src/icons/pkg-installed.png (with props) trunk/gtk/src/icons/pkg-locked.png (with props) trunk/gtk/src/icons/pkg-remove-auto.png (with props) trunk/gtk/src/icons/pkg-remove.png (with props) trunk/gtk/src/icons/pkg-unlocked.png (with props) Removed: trunk/gtk/src/icons/harddisk-full.xpm trunk/gtk/src/icons/harddisk.xpm trunk/gtk/src/icons/hr.xpm trunk/gtk/src/icons/pkg-available-locked.xpm trunk/gtk/src/icons/pkg-available.xpm trunk/gtk/src/icons/pkg-install-auto.xpm trunk/gtk/src/icons/pkg-install.xpm trunk/gtk/src/icons/pkg-installed-locked.xpm trunk/gtk/src/icons/pkg-installed-upgradable-locked.xpm trunk/gtk/src/icons/pkg-installed-upgradable.xpm trunk/gtk/src/icons/pkg-installed.xpm trunk/gtk/src/icons/pkg-locked.xpm trunk/gtk/src/icons/pkg-remove-auto.xpm trunk/gtk/src/icons/pkg-remove.xpm trunk/gtk/src/icons/pkg-unlocked.xpm Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52640&r1=52639… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 19:36:49 2008 @@ -13,6 +13,9 @@ * src/YGPackageSelector.cc: honor enableRepoMgr flag. + * src/Makefile.am, src/YGPackageSelector.cc & src/ygtkzyppwrapper.cc: + install quality PNG icons, instead of embeding XPM ones. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=52640&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Tue Oct 28 19:36:49 2008 @@ -1,7 +1,10 @@ +DATADIR=/usr/share/YaST2/gtk/ + AM_CFLAGS = $(GTK_CFLAGS) \ -DY2LOG=\"ui-gtk\" \ -DTHEMEDIR=\"${themedir}/current\" \ - -DLOCALEDIR=\"${localedir}\" + -DLOCALEDIR=\"${localedir}\" \ + -DDATADIR=\"${DATADIR}\" AM_CXXFLAGS = $(AM_CFLAGS) noinst_HEADERS = $(wildcard *.h) @@ -69,7 +72,7 @@ yzyppwrapper.cc \ yzypptags.cc \ ygtkzyppwrapper.cc -# should only append ygtkrichtext.c if WITH_GTKHTML or WEBKIT isn't set +# should (maybe?) only append ygtkrichtext.c if WITH_GTKHTML or WEBKIT isn't set dummy_SOURCES = dummy.cc dummy_LDADD = libpy2gtk.la @@ -82,23 +85,26 @@ INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS) $(GTKHTML_CFLAGS) $(WEBKIT_CFLAGS) -EXTRA_DIST = \ - icons/pkg-available-locked.xpm \ - icons/pkg-installed-upgradable.xpm \ - icons/pkg-remove-auto.xpm \ - icons/pkg-available.xpm \ - icons/pkg-installed.xpm \ - icons/pkg-remove.xpm \ - icons/pkg-install-auto.xpm \ - icons/pkg-install.xpm \ +sharedir = $(DATADIR) +dist_share_DATA = \ + icons/pkg-available-locked.png \ + icons/pkg-installed-upgradable.png \ + icons/pkg-remove-auto.png \ + icons/pkg-available.png \ + icons/pkg-installed.png \ + icons/pkg-remove.png \ + icons/pkg-install.png \ + icons/pkg-install-auto.png \ + icons/pkg-install-upgrade.png \ + icons/pkg-installed-locked.png \ + icons/pkg-unlocked.png \ + icons/pkg-installed-upgradable-locked.png \ + icons/pkg-locked.png \ icons/pkg-tiles-mode.xpm \ - icons/pkg-installed-locked.xpm \ icons/pkg-list-mode.xpm \ - icons/pkg-unlocked.xpm \ - icons/pkg-installed-upgradable-locked.xpm \ - icons/pkg-locked.xpm \ - icons/harddisk.xpm \ - icons/harddisk-full.xpm \ - icons/hr.xpm \ - pkg-selector-help.h + icons/harddisk.png \ + icons/harddisk-full.png +EXTRA_DIST = $(dist_share_DATA) \ + pkg-selector-help.h \ + hr.xpm Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 28 19:36:49 2008 @@ -25,13 +25,10 @@ #include "ygtkzyppwrapper.h" // utilities -static GtkWidget *createImageFromXPM (const char **xpm) +static GtkWidget *image_new_from_file (const char *filename) { - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (xpm); - GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf); - gtk_widget_show (image); - g_object_unref (pixbuf); - return image; + std::string file = std::string (DATADIR) + "/" + filename; + return gtk_image_new_from_file (file.c_str()); } static GdkPixbuf *loadThemeIcon (const char *icon, int size) @@ -236,11 +233,6 @@ _allModified : 2, _allLocked : 2, _allUnlocked : 2, _allCanLock : 2; }; -#include "icons/pkg-list-mode.xpm" -#include "icons/pkg-tiles-mode.xpm" -#include "icons/pkg-locked.xpm" -#include "icons/pkg-unlocked.xpm" - class PackagesView { public: @@ -330,23 +322,22 @@ struct inner { static void appendItem (GtkWidget *menu, const char *label, - const char *tooltip, const char *stock_icon, const char **xpm_icon, - bool sensitive, + const char *tooltip, const char *icon, bool sensitive, void (& callback) (GtkMenuItem *item, View *pThis), View *pThis) { GtkWidget *item; - if (stock_icon || xpm_icon) { + if (icon) { if (label) { item = gtk_image_menu_item_new_with_mnemonic (label); - GtkWidget *icon; - if (stock_icon) - icon = gtk_image_new_from_stock (stock_icon, GTK_ICON_SIZE_MENU); + GtkWidget *image; + if (*icon == 'g') + image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU); else - icon = createImageFromXPM (xpm_icon); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), icon); + image = image_new_from_file (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); } else - item = gtk_image_menu_item_new_from_stock (stock_icon, NULL); + item = gtk_image_menu_item_new_from_stock (icon, NULL); } else item = gtk_menu_item_new_with_mnemonic (label); @@ -392,28 +383,28 @@ bool empty = true, canLock = packages.canLock(), unlocked = packages.unlocked(); bool locked = !unlocked && canLock; if (packages.notInstalled()) - inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, 0, + inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, !locked, inner::install_cb, this), empty = false; if (packages.upgradable()) - inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GOTO_TOP, 0, + inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GOTO_TOP, !locked, inner::install_cb, this), empty = false; if (packages.installed()) - inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, 0, + inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, !locked, inner::remove_cb, this), empty = false; if (packages.modified()) - inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, 0, + inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, true, inner::undo_cb, this), empty = false; if (canLock) { if (packages.locked()) - inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), 0, pkg_unlocked_xpm, - true, inner::unlock_cb, this), empty = false; + inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), "pkg-unlocked.png", + true, inner::unlock_cb, this), empty = false; if (unlocked) - inner::appendItem (menu, _("_Lock"), _(lock_tooltip), 0, pkg_locked_xpm, - true, inner::lock_cb, this), empty = false; + inner::appendItem (menu, _("_Lock"), _(lock_tooltip), "pkg-locked.png", + true, inner::lock_cb, this), empty = false; } if (!empty) gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); - inner::appendItem (menu, 0, 0, GTK_STOCK_SELECT_ALL, 0, + inner::appendItem (menu, 0, 0, GTK_STOCK_SELECT_ALL, true, inner::select_all_cb, this); gtk_menu_attach_to_widget (GTK_MENU (menu), m_widget, NULL); @@ -647,9 +638,9 @@ if (!isTree) { GtkWidget *buttons = gtk_vbox_new (FALSE, 0), *button; - button = create_toggle_button (pkg_list_mode_xpm, _("View as list"), NULL); + button = create_toggle_button ("pkg-list-mode.xpm", _("View as list"), NULL); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); - button = create_toggle_button (pkg_tiles_mode_xpm, _("View as grid"), button); + button = create_toggle_button ("pkg-tiles-mode.xpm", _("View as grid"), button); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); gtk_widget_show_all (buttons); @@ -720,7 +711,7 @@ { m_view->unselectAll(); } private: - GtkWidget *create_toggle_button (const char **xpm, const char *tooltip, GtkWidget *member) + GtkWidget *create_toggle_button (const char *icon, const char *tooltip, GtkWidget *member) { GSList *group = NULL; if (member) @@ -741,7 +732,7 @@ g_signal_connect (G_OBJECT (button), "toggle-changed", G_CALLBACK (mode_toggled_cb), this); - GtkWidget *image = createImageFromXPM (xpm); + GtkWidget *image = image_new_from_file (icon); gtk_container_add (GTK_CONTAINER (button), image); return button; } @@ -793,7 +784,7 @@ action = _("install"); } else - action = _("Remove"); + action = _("remove"); text = action + " " + package->name(); if (package->isAuto()) { text = "\t" + text; @@ -920,10 +911,6 @@ } }; -#include "icons/pkg-installed.xpm" -#include "icons/pkg-installed-upgradable.xpm" -#include "icons/pkg-available.xpm" - class Collections { public: @@ -1399,14 +1386,14 @@ GtkWidget *button; GSList *group; - button = createButton (_("_Available"), pkg_available_xpm, NULL); + button = createButton (_("_Available"), "pkg-available.png", NULL); group = ygtk_toggle_button_get_group (YGTK_TOGGLE_BUTTON (button)); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); if (!updateMode) { - button = createButton (_("_Upgrades"), pkg_installed_upgradable_xpm, group); + button = createButton (_("_Upgrades"), "pkg-installed-upgradable.png", group); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); } - button = createButton (_("_Installed"), pkg_installed_xpm, group); + button = createButton (_("_Installed"), "pkg-installed.png", group); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); button = createButton (_("A_ll"), 0, group); gtk_box_pack_start (GTK_BOX (m_box), button, FALSE, TRUE, 0); @@ -1417,13 +1404,13 @@ return m_selected; } - GtkWidget *createButton (const char *label, const char **xpm, GSList *group) + GtkWidget *createButton (const char *label, const char *icon, GSList *group) { GtkWidget *button = ygtk_toggle_button_new (group); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); GtkWidget *hbox = gtk_hbox_new (FALSE, 0); - if (xpm) - gtk_box_pack_start (GTK_BOX (hbox), createImageFromXPM (xpm), FALSE, TRUE, 0); + if (icon) + gtk_box_pack_start (GTK_BOX (hbox), image_new_from_file (icon), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new_with_mnemonic (label), TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (button), hbox); @@ -1764,8 +1751,8 @@ gtk_widget_set_tooltip_markup (m_lock_button, lock_tooltip); g_signal_connect (G_OBJECT (m_lock_button), "toggled", G_CALLBACK (locked_toggled_cb), this); - m_locked_image = createImageFromXPM (pkg_locked_xpm); - m_unlocked_image = createImageFromXPM (pkg_unlocked_xpm); + m_locked_image = image_new_from_file ("pkg-locked.png"); + m_unlocked_image = image_new_from_file ("pkg-unlocked.png"); g_object_ref_sink (G_OBJECT (m_locked_image)); g_object_ref_sink (G_OBJECT (m_unlocked_image)); @@ -2232,9 +2219,6 @@ } }; -#include "icons/harddisk.xpm" -#include "icons/harddisk-full.xpm" - class DiskView : public Ypp::Disk::Listener { GtkWidget *m_widget; @@ -2263,8 +2247,8 @@ m_widget = createMenuButton (m_model); g_object_unref (G_OBJECT (m_model)); - m_diskPixbuf = gdk_pixbuf_new_from_xpm_data (harddisk_xpm); - m_diskFullPixbuf = gdk_pixbuf_new_from_xpm_data (harddisk_full_xpm); + m_diskPixbuf = YGUtils::loadPixbuf (std::string (DATADIR) + "/harddisk.png"); + m_diskFullPixbuf = YGUtils::loadPixbuf (std::string (DATADIR) + "/harddisk-full.png"); Ypp::get()->getDisk()->setListener (this); update(); Added: trunk/gtk/src/hr.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/hr.xpm?rev=52640&view=au… ============================================================================== --- trunk/gtk/src/hr.xpm (added) +++ trunk/gtk/src/hr.xpm Tue Oct 28 19:36:49 2008 @@ -0,0 +1,173 @@ +/* XPM */ +static const char * hr_xpm[] = { +"200 1 169 2", +" c None", +". c #F0F8F0", +"+ c #EEF8EF", +"@ c #EEF7ED", +"# c #EDF6EC", +"$ c #EBF6EB", +"% c #E9F4E9", +"& c #E9F4E8", +"* c #E7F3E7", +"= c #E6F3E6", +"- c #E4F2E4", +"; c #E2F1E3", +"> c #E1F1E1", +", c #E0F0E0", +"' c #DFEFDF", +") c #DDEFDE", +"! c #DCEEDD", +"~ c #DBEEDB", +"{ c #DAEDDA", +"] c #D8EDD8", +"^ c #D7ECD7", +"/ c #D5EBD5", +"( c #D4EBD4", +"_ c #D3EAD3", +": c #D2EAD2", +"< c #D0E9D0", +"[ c #CFE8CF", +"} c #CEE8CE", +"| c #CCE7CC", +"1 c #CBE6CB", +"2 c #CAE5CA", +"3 c #C9E5C9", +"4 c #C7E4C7", +"5 c #C6E4C6", +"6 c #C4E3C4", +"7 c #C3E2C3", +"8 c #C2E2C2", +"9 c #C1E1C0", +"0 c #BFE1C0", +"a c #BEE0BE", +"b c #BDE0BC", +"c c #BBDFBB", +"d c #BADEBA", +"e c #B8DEB8", +"f c #B7DDB7", +"g c #B6DCB6", +"h c #B5DBB5", +"i c #B3DBB3", +"j c #B2DAB2", +"k c #B1DAB1", +"l c #AFD9AF", +"m c #AED8AE", +"n c #ADD8AD", +"o c #ABD7AC", +"p c #AAD6AA", +"q c #A8D6A9", +"r c #A7D5A7", +"s c #A6D5A6", +"t c #A4D4A4", +"u c #A3D3A3", +"v c #A2D3A2", +"w c #A0D2A0", +"x c #A0D1A0", +"y c #9ED19E", +"z c #9CD19D", +"A c #9BCF9B", +"B c #9ACF9A", +"C c #99CF99", +"D c #98CE97", +"E c #96CD97", +"F c #95CC94", +"G c #94CC94", +"H c #92CB92", +"I c #91CA91", +"J c #90CA8F", +"K c #8EC98E", +"L c #8DC88D", +"M c #8BC88C", +"N c #8AC88B", +"O c #89C689", +"P c #87C788", +"Q c #86C586", +"R c #85C585", +"S c #84C484", +"T c #82C483", +"U c #81C380", +"V c #7FC37F", +"W c #7EC27E", +"X c #7DC17D", +"Y c #7BC17C", +"Z c #7ABF7B", +"` c #79BF79", +" . c #78BF78", +".. c #76BE76", +"+. c #75BE75", +"@. c #74BD73", +"#. c #73BC72", +"$. c #71BB71", +"%. c #70BA70", +"&. c #6FBA6E", +"*. c #6EBA6E", +"=. c #EFF7EF", +"-. c #EEF7EE", +";. c #ECF6EC", +">. c #EAF5EA", +",. c #E9F5E9", +"'. c #E8F4E8", +"). c #E4F3E4", +"!. c #E3F1E3", +"~. c #E2F1E2", +"{. c #DFF0DF", +"]. c #DEEFDD", +"^. c #DCEFDC", +"/. c #DAEED9", +"(. c #D8ECD8", +"_. c #D7ECD6", +":. c #D6ECD6", +"<. c #D4EAD4", +"[. c #D2EAD1", +"}. c #D1E9D1", +"|. c #CDE7CD", +"1. c #CBE7CB", +"2. c #CAE6CA", +"3. c #C8E5C9", +"4. c #C7E5C7", +"5. c #C6E4C5", +"6. c #C5E3C4", +"7. c #C0E1C1", +"8. c #BFE1BF", +"9. c #BDE0BE", +"0. c #BDDFBC", +"a. c #BCDEBB", +"b. c #B4DBB5", +"c. c #B2DAB1", +"d. c #B0DAB0", +"e. c #B0D9B0", +"f. c #AED9AE", +"g. c #ACD8AC", +"h. c #ACD8AB", +"i. c #AAD6A9", +"j. c #A7D6A8", +"k. c #A6D4A6", +"l. c #A5D4A5", +"m. c #A3D3A4", +"n. c #A1D2A1", +"o. c #9FD29F", +"p. c #9CD09C", +"q. c #9BD09C", +"r. c #98CE99", +"s. c #97CE98", +"t. c #96CD96", +"u. c #95CD95", +"v. c #93CC93", +"w. c #8FCA8F", +"x. c #8DC88C", +"y. c #8CC88B", +"z. c #8AC78A", +"A. c #88C687", +"B. c #86C587", +"C. c #84C585", +"D. c #82C382", +"E. c #80C381", +"F. c #80C280", +"G. c #7EC27F", +"H. c #7CC07B", +"I. c #7AC07B", +"J. c #75BD75", +"K. c #74BD74", +"L. c #6EBB6E", +". =.-.;.>.,.'.* = ).!.~., {.].^.~ /.(._.:.<._ [.}.[ |.| 1.2.3.4.5.6.7 8 7.8.9.0.a.d e f g b.i c.d.e.f.g.h.i.q j.k.l.m.v n.o.y p.q.B r.s.t.u.v.H I w.K x.y.z.O A.B.C.S D.E.F.G.X H.I.` ...J.K.#.$.%.L.*.*.L.%.$.#.K.J... .` I.H.X G.F.E.D.S C.B.A.O z.y.x.K w.I H v.u.t.s.r.B q.p.y o.n.v m.l.k.j.q i.h.g.f.e.d.c.i b.g f e d a.0.9.8.7.8 7 6.5.4.3.2.1.| |.[ }.[._ <.:._.(./.~ ^.].{., ~.!.).= * '.,.>.;.-.=.. "}; Added: trunk/gtk/src/icons/harddisk-full.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/harddisk-full.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/harddisk.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/harddisk.png?rev=5… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-available-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-available-lock… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-available.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-available.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install-auto.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install-auto.p… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install-upgrade.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install-upgrad… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install.png?re… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-lock… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-upgradable-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-upgr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-upgradable.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-upgr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-locked.png?rev… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-remove-auto.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-remove-auto.pn… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-remove.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-remove.png?rev… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-unlocked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-unlocked.png?r… ============================================================================== Binary file - no diff available. Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=52640… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Oct 28 19:36:49 2008 @@ -684,7 +684,7 @@ state->htags = g_list_append (state->htags, tag); } -#include "icons/hr.xpm" +#include "hr.xpm" static void rt_end_element (GMarkupParseContext *context, Modified: trunk/gtk/src/ygtkzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppwrapper.cc?rev=5… ============================================================================== --- trunk/gtk/src/ygtkzyppwrapper.cc (original) +++ trunk/gtk/src/ygtkzyppwrapper.cc Tue Oct 28 19:36:49 2008 @@ -9,16 +9,8 @@ #include "ygtkzyppwrapper.h" #include "YGUtils.h" -#include "icons/pkg-installed.xpm" -#include "icons/pkg-installed-upgradable.xpm" -#include "icons/pkg-installed-upgradable-locked.xpm" -#include "icons/pkg-installed-locked.xpm" -#include "icons/pkg-available.xpm" -#include "icons/pkg-available-locked.xpm" -#include "icons/pkg-install.xpm" -#include "icons/pkg-remove.xpm" -#include "icons/pkg-install-auto.xpm" -#include "icons/pkg-remove-auto.xpm" +static GdkPixbuf *loadPixbuf (const char *icon) +{ return YGUtils::loadPixbuf (std::string (DATADIR) + "/" + icon); } // bridge as we don't want to mix c++ class polymorphism and gobject static void ygtk_zypp_model_entry_changed (YGtkZyppModel *model, Ypp::Pool::Iter iter); @@ -38,20 +30,20 @@ struct PackageIcons { GdkPixbuf *installed, *installed_upgradable, *installed_locked, *installed_upgradable_locked, *available, *available_locked, - *to_install, *to_remove, *to_auto_install, *to_auto_remove; + *to_install, *to_install_upgrade, *to_remove, *to_auto_install, + *to_auto_remove; PackageIcons() { - installed = gdk_pixbuf_new_from_xpm_data (pkg_installed_xpm); - installed_upgradable = - gdk_pixbuf_new_from_xpm_data (pkg_installed_upgradable_xpm); - installed_locked = gdk_pixbuf_new_from_xpm_data (pkg_installed_locked_xpm); - installed_upgradable_locked = - gdk_pixbuf_new_from_xpm_data (pkg_installed_upgradable_locked_xpm); - available = gdk_pixbuf_new_from_xpm_data (pkg_available_xpm); - available_locked = gdk_pixbuf_new_from_xpm_data (pkg_available_locked_xpm); - to_install = gdk_pixbuf_new_from_xpm_data (pkg_install_xpm); - to_remove = gdk_pixbuf_new_from_xpm_data (pkg_remove_xpm); - to_auto_install = gdk_pixbuf_new_from_xpm_data (pkg_install_auto_xpm); - to_auto_remove = gdk_pixbuf_new_from_xpm_data (pkg_remove_auto_xpm); + installed = loadPixbuf ("pkg-installed.png"); + installed_upgradable = loadPixbuf ("pkg-installed-upgradable.png"); + installed_locked = loadPixbuf ("pkg-installed-locked.png"); + installed_upgradable_locked = loadPixbuf ("pkg-installed-upgradable-locked.png"); + available = loadPixbuf ("pkg-available.png"); + available_locked = loadPixbuf ("pkg-available-locked.png"); + to_install = loadPixbuf ("pkg-install.png"); + to_remove = loadPixbuf ("pkg-remove.png"); + to_install_upgrade = loadPixbuf ("pkg-install-upgrade.png"); + to_auto_install = loadPixbuf ("pkg-install-auto.png"); + to_auto_remove = loadPixbuf ("pkg-remove-auto.png"); } ~PackageIcons() { g_object_unref (G_OBJECT (installed)); @@ -62,6 +54,7 @@ g_object_unref (G_OBJECT (available_locked)); g_object_unref (G_OBJECT (to_install)); g_object_unref (G_OBJECT (to_remove)); + g_object_unref (G_OBJECT (to_install_upgrade)); g_object_unref (G_OBJECT (to_auto_install)); g_object_unref (G_OBJECT (to_auto_remove)); } @@ -269,8 +262,11 @@ if (package->toInstall()) { if (auto_) pixbuf = icons->to_auto_install; - else + else { pixbuf = icons->to_install; + if (package->isInstalled()) + pixbuf = icons->to_install_upgrade; + } } else if (package->toRemove()) { if (auto_) @@ -296,7 +292,8 @@ else pixbuf = icons->available; } - g_value_set_object (value, (GObject *) pixbuf); + if (pixbuf) // otherwise it would crash (give it broken icon?) + g_value_set_object (value, (GObject *) pixbuf); break; } case YGtkZyppModel::NAME_COLUMN: -- 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] r52639 - /trunk/storage/libstorage/src/Dm.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 18:42:36 2008 New Revision: 52639 URL: http://svn.opensuse.org/viewcvs/yast?rev=52639&view=rev Log: - fixed debug message Modified: trunk/storage/libstorage/src/Dm.cc Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue Oct 28 18:42:36 2008 @@ -38,10 +38,12 @@ getTableInfo(); } + Dm::~Dm() - { - y2debug( "destructed dem dev %s", dev.c_str() ); - } +{ + y2deb("destructed dm dev " << dev); +} + unsigned Dm::dmMajor() { -- 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] r52638 - in /trunk/storage/storage/src/include: ep-hd-dialogs.ycp ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 18:07:44 2008 New Revision: 52638 URL: http://svn.opensuse.org/viewcvs/yast?rev=52638&view=rev Log: - work on bug #431583 Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 18:07:44 2008 @@ -96,7 +96,8 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; - list<integer> slot = data["slots", data["type"]:`unknown]:[]; + list slots = data["slots", data["type"]:`unknown]:[]; + list<integer> slot = slots[0]:[]; list<integer> region = data["region"]:slot; integer size_k = (region[1]:0 * cyl_size) / 1024; @@ -124,9 +125,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, 1000 /* TODO */, 42)), - `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), - _("End Cylinder"), 0, 1000 /* TODO */, 42)) + _("Start Cylinder"), 0, 10000 /* TODO */, 42)), + `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), + _("Number of Cylinders"), 0, 10000 /* TODO */, 42)) )) ) ) @@ -149,7 +150,7 @@ switch (widget) { case `max_size: - UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); + UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, false); break; @@ -166,24 +167,44 @@ case `next: what = (symbol) UI::QueryWidget(`id(`size), `Value); - if (what == `manual_size) + switch (what) { - string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); - if (!Storage::HumanStringToKByte(tmp, size_k)) + case `manual_size: { - // error popup, %1 and %2 are replaced by sizes - Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), - Storage::KByteToHumanString(500*1024), - Storage::KByteToHumanString(1024*1024))); - widget = `again; + string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); + if (!Storage::HumanStringToKByte(tmp, size_k)) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), + Storage::KByteToHumanString(1024*1024))); + widget = `again; + } + else if (size_k < min_size_k || size_k > max_size_k) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), + Storage::KByteToHumanString(min_size_k), + Storage::KByteToHumanString(max_size_k))); + widget = `again; + } + break; } - else if (size_k < min_size_k || size_k > max_size_k) + + case `manual_region: { - // error popup, %1 and %2 are replaced by sizes - Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), - Storage::KByteToHumanString(min_size_k), - Storage::KByteToHumanString(max_size_k))); - widget = `again; + integer tmp1 = (integer) UI::QueryWidget(`id(`start_cyl), `Value); + integer tmp2 = (integer) UI::QueryWidget(`id(`num_cyls), `Value); + + if (false) // TODO + { + Popup::Error(_("The region is invalid.")); + widget = `again; + } + + region = [ tmp1, tmp2 ]; + + break; } } @@ -208,6 +229,12 @@ data["region"] = [ slot[0]:0, num_cyl ]; break; } + + case `manual_region: + { + data["region"] = region; + break; + } } if (data["type"]:`unknown == `extended) Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Oct 28 18:07:44 2008 @@ -106,31 +106,31 @@ } - map GetPossibleSlots(map disk, string disk_device) + map<symbol, list> GetPossibleSlots(map disk, string disk_device) { list<map> slots = []; Storage::GetUnusedPartitionSlots(disk_device, slots); y2milestone("slots %1", slots); - // find biggest primary, extended and logical slot + // sort primary, extended and logical slots - map ret = $[]; + map<symbol, list> ret = $[]; list<map> tmp = []; tmp = filter(map slot, slots, { return slot["primary_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`primary] = tmp[0, "region"]:[]; + ret[`primary] = maplist(map slot, tmp, { return slot["region"]:[]; }); tmp = filter(map slot, slots, { return slot["extended_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`extended] = tmp[0, "region"]:[]; + ret[`extended] = maplist(map slot, tmp, { return slot["region"]:[]; }); tmp = filter(map slot, slots, { return slot["logical_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`logical] = tmp[0, "region"]:[]; + ret[`logical] = maplist(map slot, tmp, { return slot["region"]:[]; }); if (size(ret) == 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52637 - /trunk/autoinstallation/src/clients/inst_autoconfigure.ycp
by ug＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: ug Date: Tue Oct 28 17:29:45 2008 New Revision: 52637 URL: http://svn.opensuse.org/viewcvs/yast?rev=52637&view=rev Log: fix Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Tue Oct 28 17:29:45 2008 @@ -65,8 +65,9 @@ } if( haskey( process, "script" ) ) { string debug = ( process["script","debug"]:true ? "-x" : "" ); - string scriptName = sformat("%1-%2.log", stage,resource); + string scriptName = sformat("%1-%2", stage,resource); string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName); + SCR::Write(.target.string, scriptPath, process["script","source"]:"echo Empty script!"); string executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, AutoinstConfig::logs_dir, scriptName ); SCR::Execute (.target.bash, executionString); } -- 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] r52636 - /trunk/gtk/src/yzypptags.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 17:21:31 2008 New Revision: 52636 URL: http://svn.opensuse.org/viewcvs/yast?rev=52636&view=rev Log: Modified a couple of icons. Modified: trunk/gtk/src/yzypptags.cc Modified: trunk/gtk/src/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzypptags.cc?rev=52636&r… ============================================================================== --- trunk/gtk/src/yzypptags.cc (original) +++ trunk/gtk/src/yzypptags.cc Tue Oct 28 17:21:31 2008 @@ -60,6 +60,7 @@ const char * zypp_tag_enum_to_icon (YPkgGroupEnum group) { + // NOTE: some icons are customized (bug 404818) switch (group) { case PK_GROUP_ENUM_ACCESSIBILITY: return( "package_main" ); @@ -68,15 +69,15 @@ case PK_GROUP_ENUM_GAMES: return( "package_games" ); case PK_GROUP_ENUM_GRAPHICS: return( "package_graphics" ); case PK_GROUP_ENUM_INTERNET: return( "package_network" ); - case PK_GROUP_ENUM_OFFICE: return( "package_office_addressbook" ); + case PK_GROUP_ENUM_OFFICE: return( "applications-office" ); case PK_GROUP_ENUM_OTHER: return( "package_main" ); case PK_GROUP_ENUM_PROGRAMMING: return( "package_development" ); case PK_GROUP_ENUM_MULTIMEDIA: return( "package_multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return( "yast-system" ); + case PK_GROUP_ENUM_SYSTEM: return( "applications-system" ); case PK_GROUP_ENUM_DESKTOP_GNOME: return( "pattern-gnome" ); case PK_GROUP_ENUM_DESKTOP_KDE: return( "pattern-kde" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return( "package_utility_desktop" ); + case PK_GROUP_ENUM_DESKTOP_XFCE: return( "pattern-xfce" ); + case PK_GROUP_ENUM_DESKTOP_OTHER: return( "user-desktop" ); case PK_GROUP_ENUM_PUBLISHING: return( "package_main" ); case PK_GROUP_ENUM_SERVERS: return( "package_editors" ); case PK_GROUP_ENUM_FONTS: return( "package_main" ); -- 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] r52635 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes
by sh-sh-sh＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: sh-sh-sh Date: Tue Oct 28 17:16:16 2008 New Revision: 52635 URL: http://svn.opensuse.org/viewcvs/yast?rev=52635&view=rev Log: version bump Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=52635&r1=52… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Oct 28 17:16:16 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "16") +SET(VERSION_PATCH "17") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Oct 28 17:16:16 2008 @@ -2,6 +2,7 @@ Tue Oct 28 17:14:07 CET 2008 - sh(a)suse.de - (coolo) Fixed bnc #427632: Steps in wizard not updated +- V 2.17.17 ------------------------------------------------------------------- Tue Oct 21 11:51:17 CEST 2008 - tgoettlicher(a)suse.de -- 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] r52634 - /trunk/qt/package/yast2-qt.changes
by sh-sh-sh＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: sh-sh-sh Date: Tue Oct 28 17:15:05 2008 New Revision: 52634 URL: http://svn.opensuse.org/viewcvs/yast?rev=52634&view=rev Log: added coolo's missing change log entry Modified: trunk/qt/package/yast2-qt.changes Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Oct 28 17:15:05 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 28 17:14:07 CET 2008 - sh(a)suse.de + +- (coolo) Fixed bnc #427632: Steps in wizard not updated + +------------------------------------------------------------------- Tue Oct 21 11:51:17 CEST 2008 - tgoettlicher(a)suse.de - Fixed default button (bnc #381187) -- 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] r52633 - /trunk/qt/src/YQWizard.cc
by coolo＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: coolo Date: Tue Oct 28 17:12:10 2008 New Revision: 52633 URL: http://svn.opensuse.org/viewcvs/yast?rev=52633&view=rev Log: page 6 on "QStyle for dummies" ;) fixing bnc#427632 Modified: trunk/qt/src/YQWizard.cc Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=52633&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Tue Oct 28 17:12:10 2008 @@ -640,7 +640,7 @@ _workArea->setObjectName( "work_area" ); QY2Styler::styler()->registerChildWidget( this, _workArea ); - + QVBoxLayout *vbox = new QVBoxLayout( _workArea ); _menuBar = new QMenuBar( _workArea ); @@ -1237,7 +1237,9 @@ _nameLabel->setProperty ( "class", "current-step-name QLabel" ); } + _statusLabel->style()->unpolish( _statusLabel ); _statusLabel->style()->polish( _statusLabel ); + _nameLabel->style()->unpolish( _nameLabel ); _nameLabel->style()->polish( _nameLabel ); } -- 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] r52632 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 16:07:45 2008 New Revision: 52632 URL: http://svn.opensuse.org/viewcvs/yast?rev=52632&view=rev Log: - spacing cleanup Modified: trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Oct 28 16:07:45 2008 @@ -427,7 +427,7 @@ */ struct ContVolInfo { - ContVolInfo() {numeric=false; nr=0; type=CUNKNOWN;}; + ContVolInfo() { numeric=false; nr=0; type=CUNKNOWN; } CType type; string cname; string vname; @@ -1236,12 +1236,12 @@ virtual int forgetCryptPassword( const string& device ) = 0; /** - * Get crypt password of a volume - * - * @param device name of volume, e.g. /dev/hda1 - * @param pwd crypt password for this volume - * @return zero if all is ok, a negative number to indicate an error - */ + * Get crypt password of a volume + * + * @param device name of volume, e.g. /dev/hda1 + * @param pwd crypt password for this volume + * @return zero if all is ok, a negative number to indicate an error + */ virtual int getCryptPassword( const string& device, string& pwd ) = 0; /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52631 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 15:58:12 2008 New Revision: 52631 URL: http://svn.opensuse.org/viewcvs/yast?rev=52631&view=rev Log: - fixed define for PB Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Oct 28 15:58:12 2008 @@ -1005,9 +1005,10 @@ return( ret ); } + +// note: factors are in the context of kilo #define TB (1024ULL * 1024ULL * 1024ULL) -#define EB (1024ULL * 1024ULL * 1024ULL * 1024ULL) -#define PB (1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL) +#define PB (1024ULL * 1024ULL * 1024ULL * 1024ULL) string Disk::defaultLabel(const Storage& storage, unsigned long long size_k) @@ -1042,9 +1043,9 @@ }; #undef TB -#undef EB #undef PB + string Disk::p_disks [] = { "cciss/", "ida/", "ataraid/", "etherd/", "rd/" }; bool Disk::needP( const string& disk ) -- 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] r52630 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml doc/examples/example.generalOptions.xml package/autoyast2.changes src/clients/inst_autoconfigure.ycp src/schema/general.rnc
by ug＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: ug Date: Tue Oct 28 15:50:02 2008 New Revision: 52630 URL: http://svn.opensuse.org/viewcvs/yast?rev=52630&view=rev Log: <wait> section added to <general> section Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/doc/examples/example.generalOptions.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoconfigure.ycp trunk/autoinstallation/src/schema/general.rnc Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Tue Oct 28 15:50:02 2008 @@ -124,6 +124,12 @@ </listitem> </itemizedlist> </para> + <para> + The wait section was invented with openSUSE 11.1 and SLES11. You can let AutoYaST sleep before and after each module during the second stage. + You can run scripts and/or you can pass a value (in seconds) for AutoYaST to sleep. In the example above AutoYaST will sleep for 15 seconds (10+5) before + the network configuration happens and 10 seconds (3+7) after the network configuration is done. The scripts in the example don't really make a lot of sense + because you could pass that value as "time" value too but I think you get how scripts in the wait section work now. + </para> <note> <title>Change starting from SUSE Linux 10.1/SLES10</title> <para> Modified: trunk/autoinstallation/doc/examples/example.generalOptions.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/examples/ex… ============================================================================== --- trunk/autoinstallation/doc/examples/example.generalOptions.xml (original) +++ trunk/autoinstallation/doc/examples/example.generalOptions.xml Tue Oct 28 15:50:02 2008 @@ -20,6 +20,39 @@ <proposals config:type="list">  <proposal>partitions_proposal</proposal> </proposals> + <wait>  + <pre-modules config:type="list"> + <module> + <name>networking</name> + <sleep> + <time config:type="integer">10</time> + <feedback config:type="boolean">true</feedback> + </sleep> + <script> + <source> + sleep 5 + </source> + <debug config:type="boolean">false</debug> + </script> + </module> + </pre-modules> + <post-modules config:type="list"> + <module> + <name>networking</name> + <sleep> + <time config:type="integer">3</time> + <feedback config:type="boolean">true</feedback> + </sleep> + <script> + <source> + sleep 7 + </source> + <debug config:type="boolean">false</debug> + </script> + </module> + </post-modules> + </wait> + </general> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Oct 28 15:50:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 28 15:49:02 CET 2008 - ug(a)suse.de + +- <wait> section added to <general> section + +------------------------------------------------------------------- Mon Oct 27 15:52:44 CET 2008 - ug(a)suse.de - added kdump support Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Tue Oct 28 15:50:02 2008 @@ -13,6 +13,8 @@ import "Profile"; import "AutoinstScripts"; + import "AutoinstConfig"; + import "Popup"; import "Wizard"; import "Call"; import "Y2ModuleConfig"; @@ -51,6 +53,28 @@ return; } + define void processWait( string resource, string stage ) { + foreach( map process, Profile::current["general","wait",stage]:[], ``{ + if( process["name"]:"" == resource ) { + if( haskey( process, "sleep" ) ) { + if( process["sleep","feedback"]:false == true ) + Popup::ShowFeedback( "", sformat( _("processing resource %1"), resource)); + sleep( 1000*process["sleep","time"]:0 ); + if( process["sleep","feedback"]:false == true ) + Popup::ClearFeedback(); + } + if( haskey( process, "script" ) ) { + string debug = ( process["script","debug"]:true ? "-x" : "" ); + string scriptName = sformat("%1-%2.log", stage,resource); + string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName); + string executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, AutoinstConfig::logs_dir, scriptName ); + SCR::Execute (.target.bash, executionString); + } + } + }); + return; + } + // Help text for last dialog of base installation string help_text = _(" Please wait while the system is being configured. @@ -142,8 +166,10 @@ else logStep( sformat (_("Not Configuring %1"), p)); + processWait( p, "pre-modules" ); Call::Function(module_auto, ["Import", eval(result) ]); Call::Function(module_auto, ["Write"]); + processWait( p, "post-modules" ); } else if (d["X-SuSE-YaST-AutoInstDataType"]:"map" == "map") { @@ -153,7 +179,9 @@ else logStep( sformat (_("Not Configuring %1"), p)); //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[]) ]); + processWait( resource, "pre-modules" ); Call::Function(module_auto, ["Write"]); + processWait( resource, "post-modules" ); } else { @@ -164,7 +192,9 @@ y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:[])); //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:[]) ]); + processWait( resource, "pre-modules" ); Call::Function(module_auto, ["Write"]); + processWait( resource, "post-modules" ); } } else @@ -182,7 +212,9 @@ /* online update */ if( Profile::current["software","do_online_update"]:false == true ) { + processWait( "do_online_update", "pre-modules" ); symbol online_update_ret = (symbol)Call::Function("do_online_update_auto", ["Write"]); + processWait( "do_online_update", "post-modules" ); if( online_update_ret == `reboot ) { map script = $[ "filename":"zzz_reboot", "source":"shutdown -r now" ]; AutoinstScripts::init = add( AutoinstScripts::init, script ); Modified: trunk/autoinstallation/src/schema/general.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/gene… ============================================================================== --- trunk/autoinstallation/src/schema/general.rnc (original) +++ trunk/autoinstallation/src/schema/general.rnc Tue Oct 28 15:50:02 2008 @@ -10,6 +10,36 @@ element proposals { LIST, element proposal { text }* + }? & + element wait { + element pre-modules { + LIST, + element module { + element name { text }? & + element sleep { + element time { INTEGER }? & + element feedback { BOOLEAN }? + }? & + element script { + element debug { BOOLEAN }? & + element source { text }? + } + }* + }? & + element post-modules { + LIST, + element module { + element name { text }? & + element sleep { + element time { INTEGER }? & + element feedback { BOOLEAN }? + }? & + element script { + element debug { BOOLEAN }? & + element source { text }? + } + }* + }? }? } ask-list = element ask-list { LIST, ask* } -- 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] r52629 - /tags/stable-2_17_5/ntp-client/
by varkoly＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: varkoly Date: Tue Oct 28 15:49:30 2008 New Revision: 52629 URL: http://svn.opensuse.org/viewcvs/yast?rev=52629&view=rev Log: Created tag stable-2_17_5 for ntp-client Added: tags/stable-2_17_5/ntp-client/ - copied from r52628, trunk/ntp-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] r52628 - in /trunk/ntp-client: VERSION package/yast2-ntp-client.changes
by varkoly＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: varkoly Date: Tue Oct 28 15:49:03 2008 New Revision: 52628 URL: http://svn.opensuse.org/viewcvs/yast?rev=52628&view=rev Log: new build version Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=52628&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Tue Oct 28 15:49:03 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Tue Oct 28 15:49:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 28 15:47:41 CET 2008 - varkoly(a)suse.de + +- (bnc#438704) â ntp server do not work +- 2.17.5 + +------------------------------------------------------------------- Wed Oct 15 13:24:52 CEST 2008 - mvidner(a)suse.cz - Use sntp instead of ntpdate which is obsolete (bnc#431516). -- 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] r52627 - /trunk/storage/libstorage/src/SystemCmd.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 15:47:25 2008 New Revision: 52627 URL: http://svn.opensuse.org/viewcvs/yast?rev=52627&view=rev Log: - removed unused define Modified: trunk/storage/libstorage/src/SystemCmd.cc Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Tue Oct 28 15:47:25 2008 @@ -518,7 +518,6 @@ } #define BUF_LEN 256 -#define MAX_STRING (STRING_MAXLEN - BUF_LEN - 10) void SystemCmd::getUntilEOF( FILE* File_Cr, vector<string>& Lines_Cr, -- 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] r52626 - /trunk/ntp-client/src/widgets.ycp
by varkoly＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: varkoly Date: Tue Oct 28 15:47:18 2008 New Revision: 52626 URL: http://svn.opensuse.org/viewcvs/yast?rev=52626&view=rev Log: (bnc#438704) – ntp server do not work Modified: trunk/ntp-client/src/widgets.ycp Modified: trunk/ntp-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/widgets.ycp?rev=5… ============================================================================== --- trunk/ntp-client/src/widgets.ycp (original) +++ trunk/ntp-client/src/widgets.ycp Tue Oct 28 15:47:18 2008 @@ -692,7 +692,7 @@ * @param id any widget id */ define void optionsInit (string id) ``{ - UI::ChangeWidget (`id ("options"), `Value, NtpClient::selected_record["options"]:""); + UI::ChangeWidget (`id ("options"), `Value, NtpClient::selected_record["options"]:"iburst"); } /** -- 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] r52625 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 15:03:43 2008 New Revision: 52625 URL: http://svn.opensuse.org/viewcvs/yast?rev=52625&view=rev Log: * src/YGPackageSelector.cc: honor enableRepoMgr flag. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52625&r1=52624… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 15:03:43 2008 @@ -11,6 +11,8 @@ accurate, but it features disabled repositories, so use it for that purpose. + * src/YGPackageSelector.cc: honor enableRepoMgr flag. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 28 15:03:43 2008 @@ -1190,7 +1190,7 @@ struct Repositories : public StoreView { public: - Repositories (Collections::Listener *listener) + Repositories (Collections::Listener *listener, bool repoMgrEnabled) : StoreView (listener) { GtkWidget *align, *button, *box, *image, *label; @@ -1340,7 +1340,7 @@ GtkWidget *getWidget() { return m_bin; } - void setType (Type type, bool patch_mode) + void setType (Type type, bool patch_mode, bool repo_mgr_enabled) { if (m_view) gtk_container_remove (GTK_CONTAINER (m_bin), m_view->getWidget()); @@ -1358,7 +1358,7 @@ m_view = new Pool (m_listener, Ypp::Package::LANGUAGE_TYPE); break; default: - m_view = new Repositories (m_listener); + m_view = new Repositories (m_listener, repo_mgr_enabled); break; } @@ -1514,7 +1514,7 @@ G_CALLBACK (type_changed_cb), this); m_collection = new Collections (this); - m_collection->setType (Collections::GROUPS_TYPE, updateMode); + m_collection->setType (Collections::GROUPS_TYPE, updateMode, enableRepoMgr); } ~Filters() @@ -1540,7 +1540,8 @@ int type = gtk_combo_box_get_active (combo); if (pThis->m_updateMode && type == 1) type = Collections::REPOS_TYPE; - pThis->m_collection->setType ((Collections::Type) type, pThis->m_updateMode); + pThis->m_collection->setType ((Collections::Type) type, + pThis->m_updateMode, pThis->m_enableRepoMgr); pThis->signalChangedDelay(); } -- 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] r52624 - in /trunk/storage/libstorage/src: DmPart.cc Dmmultipath.cc DmmultipathCo.cc Dmraid.cc DmraidCo.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 13:40:38 2008 New Revision: 52624 URL: http://svn.opensuse.org/viewcvs/yast?rev=52624&view=rev Log: - some cleanup (while analysing bugs) Modified: trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/Dmmultipath.cc trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/Dmraid.cc trunk/storage/libstorage/src/DmraidCo.cc Modified: trunk/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc… ============================================================================== --- trunk/storage/libstorage/src/DmPart.cc (original) +++ trunk/storage/libstorage/src/DmPart.cc Tue Oct 28 13:40:38 2008 @@ -14,9 +14,10 @@ using namespace storage; using namespace std; -DmPart::DmPart( const DmPartCo& d, unsigned nr, Partition* pa ) : - Dm( d, "" ) - { + +DmPart::DmPart(const DmPartCo& d, unsigned nr, Partition* pa) + : Dm(d, "") +{ init( d.numToName(nr) ); numeric = true; num = nr; @@ -24,14 +25,15 @@ p = pa; if( pa ) setSize( pa->sizeK() ); - y2milestone( "constructed DmPart %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + y2mil("constructed DmPart " << dev << " on co " << cont->name()); +} + DmPart::~DmPart() - { - y2debug( "destructed DmPart %s", dev.c_str() ); - } +{ + y2deb("destructed DmPart " << dev); +} + void DmPart::init( const string& name ) { @@ -187,16 +189,18 @@ y2mil(log); } -DmPart& DmPart::operator= ( const DmPart& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); + +DmPart& DmPart::operator=(const DmPart& rhs) +{ + y2deb("operator= from " << rhs.nm); *((Dm*)this) = rhs; - return( *this ); - } + return *this; +} -DmPart::DmPart( const DmPartCo& d, const DmPart& rhs ) : Dm(d,rhs) - { - y2debug( "constructed dmraid by copy constructor from %s", - rhs.dev.c_str() ); + +DmPart::DmPart(const DmPartCo& d, const DmPart& rhs) + : Dm(d, rhs) +{ + y2deb("constructed dmraid by copy constructor from " << rhs.dev); *this = rhs; - } +} Modified: trunk/storage/libstorage/src/Dmmultipath.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.cc (original) +++ trunk/storage/libstorage/src/Dmmultipath.cc Tue Oct 28 13:40:38 2008 @@ -13,17 +13,19 @@ using namespace storage; using namespace std; -Dmmultipath::Dmmultipath( const DmmultipathCo& d, unsigned nr, Partition* p ) : - DmPart( d, nr, p ) - { - y2milestone( "constructed dmmultipath %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + +Dmmultipath::Dmmultipath(const DmmultipathCo& d, unsigned nr, Partition* p) + : DmPart(d, nr, p) +{ + y2mil("constructed dmmultipath " << dev << " on co " << cont->name()); +} + Dmmultipath::~Dmmultipath() - { - y2debug( "destructed dmmultipath %s", dev.c_str() ); - } +{ + y2deb("destructed dmmultipath " << dev); +} + string Dmmultipath::removeText( bool doing ) const { @@ -242,10 +244,10 @@ DmPart::logDifference(rhs); } -Dmmultipath& Dmmultipath::operator= ( const Dmmultipath& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); - *((DmPart*)this) = rhs; - return( *this ); - } +Dmmultipath& Dmmultipath::operator=(const Dmmultipath& rhs) +{ + y2deb("operator= from " << rhs.nm); + *((DmPart*)this) = rhs; + return *this; +} Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Tue Oct 28 13:40:38 2008 @@ -290,4 +290,3 @@ void DmmultipathCo::logData( const string& Dir ) {} bool DmmultipathCo::active = false; - Modified: trunk/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.cc… ============================================================================== --- trunk/storage/libstorage/src/Dmraid.cc (original) +++ trunk/storage/libstorage/src/Dmraid.cc Tue Oct 28 13:40:38 2008 @@ -13,17 +13,19 @@ using namespace storage; using namespace std; -Dmraid::Dmraid( const DmraidCo& d, unsigned nr, Partition* p ) : - DmPart( d, nr, p ) - { - y2milestone( "constructed dmraid %s on co %s", dev.c_str(), - cont->name().c_str() ); - } + +Dmraid::Dmraid(const DmraidCo& d, unsigned nr, Partition* p) + : DmPart(d, nr, p) +{ + y2mil("constructed dmraid " << dev << " on co " << cont->name()); +} + Dmraid::~Dmraid() - { - y2debug( "destructed dmraid %s", dev.c_str() ); - } +{ + y2deb("destructed dmraid " << dev); +} + string Dmraid::removeText( bool doing ) const { @@ -94,7 +96,7 @@ txt = sformat( _("Create extended raid partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } - else + else { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) @@ -155,7 +157,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Format raid partition %1$s (%2$s) with %3$s"), - d.c_str(), sizeString().c_str(), + d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } } @@ -242,10 +244,10 @@ DmPart::logDifference(rhs); } -Dmraid& Dmraid::operator= ( const Dmraid& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); - *((DmPart*)this) = rhs; - return( *this ); - } +Dmraid& Dmraid::operator=(const Dmraid& rhs) +{ + y2deb("operator= from " << rhs.nm); + *((DmPart*)this) = rhs; + return *this; +} Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Tue Oct 28 13:40:38 2008 @@ -2,8 +2,8 @@ Textdomain "storage" */ -#include <iostream> -#include <sstream> +#include <iostream> +#include <sstream> #include "y2storage/DmraidCo.h" #include "y2storage/Dmraid.h" @@ -15,18 +15,21 @@ using namespace std; using namespace storage; -DmraidCo::DmraidCo( Storage * const s, const string& Name, ProcPart& ppart ) : - DmPartCo(s, "/dev/mapper/"+Name, staticType(), ppart ) - { - DmPartCo::init( ppart ); - getRaidData( Name ); - y2debug( "constructing dmraid co %s", Name.c_str() ); - } + +DmraidCo::DmraidCo(Storage * const s, const string& Name, ProcPart& ppart) + : DmPartCo(s, "/dev/mapper/"+Name, staticType(), ppart) +{ + DmPartCo::init(ppart); + getRaidData(Name); + y2deb("constructing dmraid co " << Name); +} + DmraidCo::~DmraidCo() - { - y2debug( "destructed raid co %s", dev.c_str() ); - } +{ + y2deb("destructed raid co " << dev); +} + void DmraidCo::getRaidData( const string& name ) { @@ -91,7 +94,7 @@ void -DmraidCo::newP( DmPart*& dm, unsigned num, Partition* p ) +DmraidCo::newP( DmPart*& dm, unsigned num, Partition* p ) { y2mil( "num:" << num ); dm = new Dmraid( *this, num, p ); @@ -273,5 +276,3 @@ void DmraidCo::logData( const string& Dir ) {;} bool DmraidCo::active = false; - - -- 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] r52623 - /trunk/audit-laf/src/complex.ycp
by gs＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: gs Date: Tue Oct 28 10:20:33 2008 New Revision: 52623 URL: http://svn.opensuse.org/viewcvs/yast?rev=52623&view=rev Log: replace AskForExistingFile by AskForSaveFileName (log file name) Modified: trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Tue Oct 28 10:20:33 2008 @@ -119,7 +119,7 @@ if ( action == "select_file" ) { - string file_name = UI::AskForExistingFile("/var/log/audit", "*.log", _("Select the log file") ); + string file_name = UI::AskForSaveFileName("/var/log/audit", "*.log", _("Select the log file") ); UI::ChangeWidget( `id("log_file"), `Value, file_name ); y2milestone( "Logfile set to: %1", file_name ); -- 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] r52622 - in /trunk/storage/libstorage/src: DmmultipathCo.cc StorageDefines.h
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 10:14:16 2008 New Revision: 52622 URL: http://svn.opensuse.org/viewcvs/yast?rev=52622&view=rev Log: - also start/stop multipathd Modified: trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/StorageDefines.h Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Tue Oct 28 10:14:16 2008 @@ -140,9 +140,13 @@ c.execute(MODPROBEBIN " dm-multipath"); c.execute(MULTIPATHBIN); + sleep(1); + c.execute(MULTIPATHDBIN); } else { + c.execute(MULTIPATHDBIN " -F"); + sleep(1); c.execute(MULTIPATHBIN " -F"); } Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Tue Oct 28 10:14:16 2008 @@ -31,6 +31,7 @@ #define CRYPTSETUPBIN "/sbin/cryptsetup" #define LOSETUPBIN "/sbin/losetup" #define MULTIPATHBIN "/sbin/multipath" +#define MULTIPATHDBIN "/sbin/multipathd" #define DMSETUPBIN "/sbin/dmsetup" #define KPARTXBIN "/sbin/kpartx" #define DMRAIDBIN "/sbin/dmraid" -- 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] r52621 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 03:04:12 2008 New Revision: 52621 URL: http://svn.opensuse.org/viewcvs/yast?rev=52621&view=rev Log: src/yzyppwrapper.cc: re-formatted installed/build time. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5262… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Oct 28 03:04:12 2008 @@ -450,11 +450,19 @@ #else text += br + "" + _("Size:") + " " + object->installsize().asString(); #endif - if (!isInstalled() || hasUpgrade()) { - text += br + "" + _("Build time:") + " " + m_sel->candidateObj()->buildtime().form("%x"); - if (hasUpgrade()) - text += std::string ("   (") + _("Installed time:") + " " + m_sel->installedObj()->installtime().form("%x") + ")"; + + bool hasCandidate = m_sel->hasCandidateObj(); + if (isInstalled()) { + text += br + "" + _("Installed at:") + " " + m_sel->installedObj()->installtime().form("%x"); + if (!hasUpgrade()) + hasCandidate = false; // only for upgrades + if (hasCandidate) + text += "   "; } + else if (hasCandidate) + text += br; + if (hasCandidate) + text += std::string ("") + _("Last build from:") + " " + m_sel->candidateObj()->buildtime().form("%x"); break; } case Ypp::Package::PATCH_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] r52620 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/ygtkfindentry.c src/ygtkfindentry.h src/ygtkwizard.c src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 02:39:26 2008 New Revision: 52620 URL: http://svn.opensuse.org/viewcvs/yast?rev=52620&view=rev Log: * src/ygtkfindentry.h/c: added tooltip argument to insert_item. added set_state() method to highlight the entry for incorrect input, and select_item(). * src/YGPackageSelector.cc: moved recent spin box into a find entry item. Also, only remove find entry when changing the type combo. * src/yzyppwrapper.cc: zypp::RepoManager::knownRepositories() isn't accurate, but it features disabled repositories, so use it for that purpose. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygtkfindentry.c trunk/gtk/src/ygtkfindentry.h trunk/gtk/src/ygtkwizard.c trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52620&r1=52619… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 02:39:26 2008 @@ -1,3 +1,16 @@ +2008-10-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkfindentry.h/c: added tooltip argument to insert_item. + added set_state() method to highlight the entry for incorrect + input, and select_item(). + + * src/YGPackageSelector.cc: moved recent spin box into a find entry + item. Also, only remove find entry when changing the type combo. + + * src/yzyppwrapper.cc: zypp::RepoManager::knownRepositories() isn't + accurate, but it features disabled repositories, so use it for that + purpose. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 28 02:39:26 2008 @@ -1100,7 +1100,6 @@ struct Categories : public StoreView { bool m_patchMode, m_rpmGroups; - GtkWidget *m_daysSpin; public: Categories (Collections::Listener *listener, bool patch_mode) : StoreView (listener), m_patchMode (patch_mode), m_rpmGroups (false) @@ -1114,40 +1113,7 @@ "RPM information.")); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (rpm_groups_toggled_cb), this); - - struct inner { - static void value_changed_cb (GtkWidget *widget, Categories *pThis) - { pThis->signalChangedDelay(); } - static void days_toggled_cb (GtkToggleButton *button, Categories *pThis) - { - gboolean active = gtk_toggle_button_get_active (button); - gtk_widget_set_sensitive (pThis->m_daysSpin, active); - pThis->signalChangedDelay(); - } - }; - GtkWidget *daysCheck; - daysCheck = gtk_check_button_new_with_label (_("Recent:")); - m_daysSpin = gtk_spin_button_new_with_range (0, 90, 1); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_daysSpin), 7); - gtk_widget_set_sensitive (m_daysSpin, FALSE); - g_signal_connect (G_OBJECT (daysCheck), "toggled", - G_CALLBACK (inner::days_toggled_cb), this); - g_signal_connect (G_OBJECT (m_daysSpin), "value-changed", - G_CALLBACK (inner::value_changed_cb), this); - GtkWidget *hbox = gtk_hbox_new (FALSE, 4); - GtkWidget *label = gtk_label_new (_("days")); - gtk_box_pack_start (GTK_BOX (hbox), daysCheck, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), m_daysSpin, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - YGUtils::setWidgetFont (label, - PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); - YGUtils::setWidgetFont (m_daysSpin, - PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); - YGUtils::setWidgetFont (GTK_BIN (daysCheck)->child, - PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); - gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_box), hbox, FALSE, TRUE, 0); } build (m_rpmGroups, !m_rpmGroups, false); } @@ -1211,11 +1177,6 @@ else query->addCategory2 (node); } - - if (GTK_WIDGET_IS_SENSITIVE (m_daysSpin)) { - int days = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_daysSpin)); - query->setBuildAge (days); - } } static void rpm_groups_toggled_cb (GtkToggleButton *button, Categories *pThis) @@ -1516,16 +1477,18 @@ "will be matched against RPM name and summary attributes. " "Other criteria attributes are available by pressing the search icon.\n" "(usage example: \"yast dhcp\" will return yast's dhcpd tool)")); - g_signal_connect (G_OBJECT (m_name), "changed", - G_CALLBACK (name_changed_cb), this); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by name & summary"), - GTK_STOCK_FIND); + GTK_STOCK_FIND, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by description"), - GTK_STOCK_EDIT); + GTK_STOCK_EDIT, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by file"), - GTK_STOCK_OPEN); + GTK_STOCK_OPEN, NULL); ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by author"), - GTK_STOCK_ABOUT); + GTK_STOCK_ABOUT, NULL); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by novelty (in days)"), + GTK_STOCK_NEW, _("Number of days since the package was built by the repository.")); + g_signal_connect (G_OBJECT (m_name), "changed", + G_CALLBACK (name_changed_cb), this); g_signal_connect (G_OBJECT (m_name), "menu-item-selected", G_CALLBACK (name_item_changed_cb), this); @@ -1561,8 +1524,19 @@ } private: + void clearNameEntry() + { + g_signal_handlers_block_by_func (m_name, (gpointer) name_changed_cb, this); + g_signal_handlers_block_by_func (m_name, (gpointer) name_item_changed_cb, this); + gtk_entry_set_text (GTK_ENTRY (m_name), ""); + ygtk_find_entry_select_item (YGTK_FIND_ENTRY (m_name), 0); + g_signal_handlers_unblock_by_func (m_name, (gpointer) name_changed_cb, this); + g_signal_handlers_unblock_by_func (m_name, (gpointer) name_item_changed_cb, this); + } + static void type_changed_cb (GtkComboBox *combo, Filters *pThis) { + pThis->clearNameEntry(); int type = gtk_combo_box_get_active (combo); if (pThis->m_updateMode && type == 1) type = Collections::REPOS_TYPE; @@ -1571,9 +1545,31 @@ } static void name_changed_cb (YGtkFindEntry *entry, Filters *pThis) - { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } - static void name_item_changed_cb (gpointer widget, gint nb, Filters *pThis) - { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } + { + gint nb = ygtk_find_entry_get_selected_item (entry); + if (nb == 4) { // novelty only allows numbers + const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry)); + gboolean correct = TRUE; + for (const gchar *i = text; *i; i++) + if (!g_ascii_isdigit (*i)) { + correct = FALSE; + break; + } + ygtk_find_entry_set_state (entry, correct); + } + pThis->signalChangedDelay(); + } + static void name_item_changed_cb (YGtkFindEntry *entry, gint nb, Filters *pThis) + { + const gchar *text = ""; + if (nb == 4) text = "7"; // novelty is weird; show usage case + g_signal_handlers_block_by_func (entry, (gpointer) name_changed_cb, pThis); + gtk_entry_set_text (GTK_ENTRY (entry), text); + g_signal_handlers_unblock_by_func (entry, (gpointer) name_changed_cb, pThis); + gtk_editable_set_position (GTK_EDITABLE (entry), -1); + + pThis->signalChanged(); + } static void field_changed_cb (gpointer widget, Filters *pThis) { pThis->signalChangedDelay(); } @@ -1585,15 +1581,6 @@ if (!m_listener) return; busyCursor(); - if (!m_nameChanged && *gtk_entry_get_text (GTK_ENTRY (m_name))) { - g_signal_handlers_block_by_func (m_name, - (gpointer) name_changed_cb, this); - gtk_entry_set_text (GTK_ENTRY (m_name), ""); - g_signal_handlers_unblock_by_func (m_name, - (gpointer) name_changed_cb, this); - } - m_nameChanged = false; - // create query Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); if (m_updateMode) @@ -1604,58 +1591,65 @@ const char *name = gtk_entry_get_text (GTK_ENTRY (m_name)); if (*name) { gint item = ygtk_find_entry_get_selected_item (YGTK_FIND_ENTRY (m_name)); - bool use_name, use_summary, use_description, use_filelist, use_authors; - use_name = use_summary = use_description = use_filelist = use_authors = false; - switch (item) { - case 0: // name & summary - default: - use_name = use_summary = true; - break; - case 1: // description - use_name = use_summary = use_description = true; - break; - case 2: // file - use_filelist = true; - break; - case 3: // author - use_authors = true; - break; + if (item == 4) { // novelty + int days = atoi (name); + query->setBuildAge (days); + } + else { + bool use_name, use_summary, use_description, use_filelist, use_authors; + use_name = use_summary = use_description = use_filelist = use_authors = false; + switch (item) { + case 0: // name & summary + default: + use_name = use_summary = true; + break; + case 1: // description + use_name = use_summary = use_description = true; + break; + case 2: // file + use_filelist = true; + break; + case 3: // author + use_authors = true; + break; + } + query->addNames (name, ' ', use_name, use_summary, use_description, + use_filelist, use_authors); } - query->addNames (name, ' ', use_name, use_summary, use_description, - use_filelist, use_authors); - // tip: the user may be searching for patterns - static bool shown_pattern_tip = false; - if (!m_updateMode && !shown_pattern_tip && - gtk_combo_box_get_active (GTK_COMBO_BOX (m_type)) == 0 && - (m_statuses->getActive() == StatusButtons::AVAILABLE || - m_statuses->getActive() == StatusButtons::ALL)) { - Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); - query->addType (Ypp::Package::PATTERN_TYPE); - query->addNames (name, ' ', true, false, false, false, false, true); - query->setIsInstalled (false); - Ypp::QueryPool pool (query); - if (!pool.empty()) { - shown_pattern_tip = true; - //std::string first = pool.getName (pool.getFirst()); - std::string text = - _("Patterns are available that can\n" - "assist you in the installment\nof"); - text += " " + std::string (name) + " "; - text += _("related packages."); - GtkWidget *tooltip, *box, *label, *image; - tooltip = ygtk_tooltip_new(); - label = gtk_label_new (text.c_str()); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, - GTK_ICON_SIZE_BUTTON); - box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); - gtk_widget_show_all (box); - gtk_container_add (GTK_CONTAINER (tooltip), box); - ygtk_tooltip_show_at_widget (YGTK_TOOLTIP (tooltip), m_type, - YGTK_POINTER_UP_LEFT); + if (item == 0) { // tip: the user may be searching for patterns + static bool shown_pattern_tip = false; + if (!m_updateMode && !shown_pattern_tip && + gtk_combo_box_get_active (GTK_COMBO_BOX (m_type)) == 0 && + (m_statuses->getActive() == StatusButtons::AVAILABLE || + m_statuses->getActive() == StatusButtons::ALL)) { + Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); + query->addType (Ypp::Package::PATTERN_TYPE); + query->addNames (name, ' ', true, false, false, false, false, true); + query->setIsInstalled (false); + Ypp::QueryPool pool (query); + if (!pool.empty()) { + shown_pattern_tip = true; + //std::string first = pool.getName (pool.getFirst()); + std::string text = + _("Patterns are available that can\n" + "assist you in the installment\nof"); + text += " " + std::string (name) + " "; + text += _("related packages."); + GtkWidget *tooltip, *box, *label, *image; + tooltip = ygtk_tooltip_new(); + label = gtk_label_new (text.c_str()); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, + GTK_ICON_SIZE_BUTTON); + box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + gtk_widget_show_all (box); + gtk_container_add (GTK_CONTAINER (tooltip), box); + ygtk_tooltip_show_at_widget (YGTK_TOOLTIP (tooltip), m_type, + YGTK_POINTER_UP_LEFT); + } } } } Modified: trunk/gtk/src/ygtkfindentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.c?rev=5262… ============================================================================== --- trunk/gtk/src/ygtkfindentry.c (original) +++ trunk/gtk/src/ygtkfindentry.c Tue Oct 28 02:39:26 2008 @@ -570,18 +570,20 @@ GtkWidget *menu = gtk_widget_get_parent (GTK_WIDGET (item)); GList *items = gtk_container_get_children (GTK_CONTAINER (menu)); entry->selected_item = g_list_index (items, item); - g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); g_list_free (items); generate_find_icon (entry); + g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); } -guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock) +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock, const char *tooltip) { if (!entry->context_menu) ygtk_find_entry_attach_menu (entry, GTK_MENU (gtk_menu_new())); GtkWidget *item = gtk_image_menu_item_new_with_label (text); GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + if (tooltip) + gtk_widget_set_tooltip_text (item, tooltip); gtk_menu_shell_append (GTK_MENU_SHELL (entry->context_menu), item); gtk_widget_show_all (GTK_WIDGET (entry->context_menu)); g_signal_connect (G_OBJECT (item), "activate", @@ -597,6 +599,31 @@ return entry->selected_item; } +void ygtk_find_entry_select_item (YGtkFindEntry *entry, gint item) +{ + if (entry->selected_item != item) { + entry->selected_item = item; + generate_find_icon (entry); + g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); + } +} + +void ygtk_find_entry_set_state (YGtkFindEntry *entry, gboolean correct) +{ + GtkWidget *widget = GTK_WIDGET (entry); + if (correct) { // revert + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (widget, GTK_STATE_NORMAL, NULL); + } + else { + GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }, + white = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &red); + gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &white); + gtk_widget_error_bell (widget); + } +} + GtkWidget *ygtk_find_entry_new (void /*gboolean will_use_find_icon */) { return g_object_new (YGTK_TYPE_FIND_ENTRY, NULL); Modified: trunk/gtk/src/ygtkfindentry.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.h?rev=5262… ============================================================================== --- trunk/gtk/src/ygtkfindentry.h (original) +++ trunk/gtk/src/ygtkfindentry.h Tue Oct 28 02:39:26 2008 @@ -103,8 +103,12 @@ void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *popup_menu); // add an internal menu -guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock); +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, + const char *stock, const char *tooltip); gint ygtk_find_entry_get_selected_item (YGtkFindEntry *entry); +void ygtk_find_entry_select_item (YGtkFindEntry *entry, gint item); + +void ygtk_find_entry_set_state (YGtkFindEntry *entry, gboolean correct); G_END_DECLS #endif /*YGTK_FIND_ENTRY_H*/ Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52620&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Oct 28 02:39:26 2008 @@ -45,17 +45,8 @@ static void search_entry_modified_cb (GtkEditable *editable, YGtkHelpDialog *dialog) { gchar *key = gtk_editable_get_chars (editable, 0, -1); - if (!ygtk_html_wrap_search (dialog->help_text, key)) { - GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }, - white = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, &red); - gtk_widget_modify_text (dialog->search_entry, GTK_STATE_NORMAL, &white); - gtk_widget_error_bell (GTK_WIDGET (dialog)); - } - else { - gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (dialog->search_entry, GTK_STATE_NORMAL, NULL); - } + gboolean found = ygtk_html_wrap_search (dialog->help_text, key); + ygtk_find_entry_set_state (YGTK_FIND_ENTRY (dialog->search_entry), found); g_free (key); } static void search_entry_activated_cb (GtkEntry *entry, YGtkHelpDialog *dialog) Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5262… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Oct 28 02:39:26 2008 @@ -2022,19 +2022,35 @@ const Ypp::Repository *Ypp::Impl::getRepository (int nb) { if (!repos) { + struct inner { + static void addRepo (Ypp::Impl *impl, const zypp::RepoInfo &info) + { + Repository *repo = new Repository(); + repo->name = info.name(); + if (!info.baseUrlsEmpty()) + repo->url = info.baseUrlsBegin()->asString(); + repo->alias = info.alias(); + repo->enabled = info.enabled(); + impl->repos = g_slist_append (impl->repos, repo); + } + }; for (zypp::ResPoolProxy::repository_iterator it = zyppPool().knownRepositoriesBegin(); it != zyppPool().knownRepositoriesEnd(); it++) { const zypp::Repository &zrepo = *it; if (zrepo.isSystemRepo()) continue; - const zypp::RepoInfo info = zrepo.info(); - Repository *repo = new Repository(); - repo->name = info.name(); - if (!info.baseUrlsEmpty()) - repo->url = info.baseUrlsBegin()->asString(); - repo->alias = info.alias(); - repo->enabled = info.enabled(); - repos = g_slist_append (repos, repo); + inner::addRepo (this, zrepo.info()); + } + // zyppPool::knownRepositories is more accurate, but it doesn't feature disabled + // repositories. Add them with the following API. + zypp::RepoManager manager; + std::list <zypp::RepoInfo> known_repos = manager.knownRepositories(); + for (std::list <zypp::RepoInfo>::const_iterator it = known_repos.begin(); + it != known_repos.end(); it++) { + const zypp::RepoInfo info = *it; + if (info.enabled()) + continue; + inner::addRepo (this, info); } } return (Repository *) g_slist_nth_data (repos, nb); -- 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] r52619 - /tags/stable-2_17_3/wagon/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:18:09 2008 New Revision: 52619 URL: http://svn.opensuse.org/viewcvs/yast?rev=52619&view=rev Log: Created tag stable-2_17_3 for wagon Added: tags/stable-2_17_3/wagon/ - copied from r52618, trunk/wagon/ -- 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] r52618 - in /trunk/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:18:01 2008 New Revision: 52618 URL: http://svn.opensuse.org/viewcvs/yast?rev=52618&view=rev Log: version Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=52618&r1=52617… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Mon Oct 27 17:18:01 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Oct 27 17:18:01 2008 @@ -2,6 +2,7 @@ Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz - Calling inst_prepareprogress before inst_kickoff (bnc #438848). +- 2.17.3 ------------------------------------------------------------------- Wed Oct 22 19:15:47 CEST 2008 - locilka(a)suse.cz -- 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] r52617 - /tags/stable-2_17_41/yast2/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:15:22 2008 New Revision: 52617 URL: http://svn.opensuse.org/viewcvs/yast?rev=52617&view=rev Log: Created tag stable-2_17_41 for yast2 Added: tags/stable-2_17_41/yast2/ - copied from r52616, 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] r52616 - /tags/stable-2_17_41/
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 17:15:21 2008 New Revision: 52616 URL: http://svn.opensuse.org/viewcvs/yast?rev=52616&view=rev Log: Created tag stable-2_17_41 Added: tags/stable-2_17_41/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0