Author: locilka
Date: Tue Jul 15 18:39:03 2008
New Revision: 49128
URL: http://svn.opensuse.org/viewcvs/yast?rev=49128&view=rev
Log:
- SuSEFirewallUI YCP module marked as internal.
- Using [Cancel] instead of [Abort].
Modified:
trunk/firewall/package/yast2-firewall.changes
trunk/firewall/src/SuSEFirewallUI.ycp
trunk/firewall/src/complex.ycp
trunk/firewall/src/dialogs.ycp
trunk/firewall/src/wizards.ycp
Modified: trunk/firewall/package/yast2-firewall.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.changes?rev=49128&r1=49127&r2=49128&view=diff
==============================================================================
--- trunk/firewall/package/yast2-firewall.changes (original)
+++ trunk/firewall/package/yast2-firewall.changes Tue Jul 15 18:39:03 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jul 15 18:37:56 CEST 2008 - locilka@suse.cz
+
+- SuSEFirewallUI YCP module marked as internal.
+- Using [Cancel] instead of [Abort].
+
+-------------------------------------------------------------------
Tue Jul 8 11:30:47 CEST 2008 - locilka@suse.cz
- Explicitely enabling functionality that offers to install
Modified: trunk/firewall/src/SuSEFirewallUI.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/SuSEFirewallUI.ycp?rev=49128&r1=49127&r2=49128&view=diff
==============================================================================
--- trunk/firewall/src/SuSEFirewallUI.ycp (original)
+++ trunk/firewall/src/SuSEFirewallUI.ycp Tue Jul 15 18:39:03 2008
@@ -5,8 +5,9 @@
* Package: Firewall configuration
* Summary: UI for Firewall (Only for Firewall)
* Authors: Lukas Ocilka
+ * Internal
*
- * $Id: $
+ * $Id:$
*/
{
Modified: trunk/firewall/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/complex.ycp?rev=49128&r1=49127&r2=49128&view=diff
==============================================================================
--- trunk/firewall/src/complex.ycp (original)
+++ trunk/firewall/src/complex.ycp Tue Jul 15 18:39:03 2008
@@ -56,6 +56,7 @@
// hidding finished progress
Wizard::SetContentsButtons ("", `Empty(), "", "", "");
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
/* FIXME: handle possible read errors */
return ret ? `next : `abort;
@@ -74,6 +75,7 @@
// hidding finished progress
Wizard::SetContentsButtons ("", `Empty(), "", "", "");
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
}
/**
Modified: trunk/firewall/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/dialogs.ycp?rev=49128&r1=49127&r2=49128&view=diff
==============================================================================
--- trunk/firewall/src/dialogs.ycp (original)
+++ trunk/firewall/src/dialogs.ycp Tue Jul 15 18:39:03 2008
@@ -271,7 +271,7 @@
"screens" : tabs,
"widget_descr" : widgets_handling,
"back_button" : Label::BackButton(),
- "abort_button" : Label::AbortButton(),
+ "abort_button" : Label::CancelButton(),
// if 'normal' or 'installation', [Next] button, else [OK]
"next_button" : (Mode::normal() ?
Label::NextButton () : Label::OKButton ()
@@ -289,6 +289,7 @@
Label::BackButton (),
(Mode::normal() ? Label::FinishButton() : Label::OKButton ())
);
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
SetFirewallIcon();
UI::ChangeWidget(`id(`back), `Enabled, true);
Modified: trunk/firewall/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/wizards.ycp?rev=49128&r1=49127&r2=49128&view=diff
==============================================================================
--- trunk/firewall/src/wizards.ycp (original)
+++ trunk/firewall/src/wizards.ycp Tue Jul 15 18:39:03 2008
@@ -12,6 +12,7 @@
{
import "Wizard";
import "Sequencer";
+ import "Label";
include "firewall/complex.ycp";
include "firewall/dialogs.ycp";
@@ -72,6 +73,7 @@
];
Wizard::CreateDialog();
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
SetFirewallIcon();
any ret = Sequencer::Run(aliases, sequence);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
