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