Author: gs Date: Wed Aug 27 13:21:24 2008 New Revision: 50405 URL: http://svn.opensuse.org/viewcvs/yast?rev=50405&view=rev Log: add value name_format and name, use toupper() for ComboBox values Modified: trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=50405&r1=50404&r2=50405&view=diff ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Wed Aug 27 13:21:24 2008 @@ -87,13 +87,21 @@ UI::ChangeWidget( `id("freq"), `Value, tointeger( Auditd::GetAuditdOption("freq")) ); UI::ChangeWidget( `id("num_logs"), `Value, tointeger( Auditd::GetAuditdOption("num_logs")) ); foreach (string key, ["log_file", - "log_format", "max_log_file", - "flush", - "max_log_file_action" // TODO: add 'name_format' and 'name' + "action_mail_acct", + "name" ], { UI::ChangeWidget(`id(key), `Value, (Auditd::GetAuditdOption(key))); }); + + foreach (string key, ["log_format", + "flush", + "max_log_file_action", + "name_format" + ], { + UI::ChangeWidget(`id(key), `Value, toupper(Auditd::GetAuditdOption(key)) ); + }); + y2milestone( "Init logfile settings"); } @@ -129,7 +137,10 @@ "log_format", "max_log_file", "flush", - "max_log_file_action" // TODO: add 'name_format' and 'name' + "max_log_file_action", + "action_mail_acct", + "name_format", + "name" ], { Auditd::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); @@ -183,14 +194,19 @@ // Set all values to values read from /etc/audit/auditd.conf foreach (string key, ["space_left", - "admin_space_left", - "space_left_action", + "admin_space_left" + ], { + UI::ChangeWidget(`id(key), `Value, (Auditd::GetAuditdOption(key))); + }); + + foreach (string key, ["space_left_action", "admin_space_left_action", "disk_full_action", "disk_error_action" ], { - UI::ChangeWidget(`id(key), `Value, (Auditd::GetAuditdOption(key))); + UI::ChangeWidget(`id(key), `Value, toupper(Auditd::GetAuditdOption(key)) ); }); + y2milestone( "Init diskspace settings" ); } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=50405&r1=50404&r2=50405&view=diff ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Wed Aug 27 13:21:24 2008 @@ -166,12 +166,14 @@ `VBox( `VStretch(), `Frame( - _("Action on Space is Starting to Run low"), + // Frame label - keep it short! + _("Value and action for space is starting to run low"), `HBox( - + // 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_action"), `opt(`editable), + `HWeight( 1, `ComboBox(`id("space_left_action"), `opt(`editable), + // ComboBox label - select an action which is performed if space on disk is low _("Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), @@ -182,17 +184,18 @@ `item(`id("EMAIL"), "EMAIL" ) ]) ) - ) ), `VStretch(), `Frame ( - _("Action on Space is Running low"), + // 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) ")) ), `HSpacing(2.0), - `HWeight( 1, `ComboBox(`id("admin_space_action"), `opt(`editable), + `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 _("Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), @@ -207,9 +210,11 @@ ), `VStretch(), `Frame( + // Frame label - keep it short! _("Action on Error or Disk full"), `VBox( - `ComboBox(`id("full_action"), `opt(`editable, `hstretch), + `ComboBox(`id("disk_full_action"), `opt(`editable), + // ComboBox label - select an action which is performed if disk is full _("Disk Full Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), @@ -218,7 +223,8 @@ `item(`id("HALT"), "HALT" ), `item(`id("EXEC"), "EXEC" ) ]), - `ComboBox(`id("error_action"), `opt(`editable, `hstretch), + `ComboBox(`id("disk_error_action"), `opt(`editable ), + // ComboBox label - select an action which is performed on error _("Disk Error Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org