Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47398 - in /trunk/apparmor/src/include/subdomain: config_complain.ycp sd-config.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Fri, 09 May 2008 09:02:42 -0000
  • Message-id: <20080509090242.3DE842DDB0@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Fri May 9 11:02:41 2008
New Revision: 47398

URL: http://svn.opensuse.org/viewcvs/yast?rev=47398&view=rev
Log:
1. Correct opening and closing dialogs (#383292)
2. Do not use 'nil' as button label

Modified:
trunk/apparmor/src/include/subdomain/config_complain.ycp
trunk/apparmor/src/include/subdomain/sd-config.ycp

Modified: trunk/apparmor/src/include/subdomain/config_complain.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/config_complain.ycp?rev=47398&r1=47397&r2=47398&view=diff
==============================================================================
--- trunk/apparmor/src/include/subdomain/config_complain.ycp (original)
+++ trunk/apparmor/src/include/subdomain/config_complain.ycp Fri May 9
11:02:41 2008
@@ -127,9 +127,9 @@
// Profile Mode Configuration -- Sets Complain and Enforce Behavior
define symbol profileModeConfigForm() {

- list<term> recList = getRecordList(showAll);
- term modeForm = getProfModeForm(recList, showAll);
-
+ list<term> recList = getRecordList(showAll);
+ term modeForm = getProfModeForm(recList, showAll);
+ Wizard::CreateDialog();
Wizard::SetContentsButtons( _("Profile Mode Configuration"), modeForm,
modeHelp, Label::BackButton(), _("&Done") );

map event = $[];

Modified: trunk/apparmor/src/include/subdomain/sd-config.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/sd-config.ycp?rev=47398&r1=47397&r2=47398&view=diff
==============================================================================
--- trunk/apparmor/src/include/subdomain/sd-config.ycp (original)
+++ trunk/apparmor/src/include/subdomain/sd-config.ycp Fri May 9 11:02:41 2008
@@ -181,7 +181,7 @@
);

Wizard::CreateDialog();
- Wizard::SetContentsButtons(_("Security Event Notification"),
event_config, EventNotifyHelpText, nil, Label::OKButton());
+ Wizard::SetContentsButtons(_("Security Event Notification"),
event_config, EventNotifyHelpText, Label::BackButton(), Label::OKButton());
Wizard::DisableBackButton();

any ntInput = nil;
@@ -382,7 +382,7 @@
// May want to replace Wizard() with UI()
Wizard::CreateDialog();
Wizard::SetTitleIcon("apparmor/control_panel");
- Wizard::SetContentsButtons(caption, contents, help, nil, _("&Done"));
+ Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), _("&Done"));
Wizard::DisableBackButton();

UI::ChangeWidget(`id(`aaEnableFrame), `Enabled, aaEnabled);
@@ -410,13 +410,9 @@

} else if (ret == `modeconf ) {

- ret = profileModeConfigForm();
+ profileModeConfigForm();

- if ( ret == `back ) {
- displayAppArmorConfig();
- }
-
- break;
+ //displayAppArmorConfig();

} else {
y2error("Unexpected return code: " + tostring(ret));

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages