Mailinglist Archive: yast-commit (711 mails)

< Previous Next >
[yast-commit] r48112 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes src/complex.ycp src/dialogs.ycp src/wizards.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Fri, 06 Jun 2008 13:21:52 -0000
  • Message-id: <20080606132152.3790B275A0@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Fri Jun 6 15:21:51 2008
New Revision: 48112

URL: http://svn.opensuse.org/viewcvs/yast?rev=48112&view=rev
Log:
- do not show back button in main dialog (bnc#390098)
- disable buttons for editing when table is empty
- 2.17.0


Modified:
trunk/profile-manager/VERSION
trunk/profile-manager/package/yast2-profile-manager.changes
trunk/profile-manager/src/complex.ycp
trunk/profile-manager/src/dialogs.ycp
trunk/profile-manager/src/wizards.ycp

Modified: trunk/profile-manager/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=48112&r1=48111&r2=48112&view=diff
==============================================================================
--- trunk/profile-manager/VERSION (original)
+++ trunk/profile-manager/VERSION Fri Jun 6 15:21:51 2008
@@ -1 +1 @@
-2.16.1
+2.17.0

Modified: trunk/profile-manager/package/yast2-profile-manager.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-profile-manager.changes?rev=48112&r1=48111&r2=48112&view=diff
==============================================================================
--- trunk/profile-manager/package/yast2-profile-manager.changes (original)
+++ trunk/profile-manager/package/yast2-profile-manager.changes Fri Jun 6
15:21:51 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jun 6 15:17:47 CEST 2008 - jsuchome@xxxxxxx
+
+- do not show back button in main dialog (bnc#390098)
+- disable buttons for editing when table is empty
+- 2.17.0
+
+-------------------------------------------------------------------
Fri May 16 16:40:22 CEST 2008 - jsrain@xxxxxxx

- added categories Settings and System into desktop file

Modified: trunk/profile-manager/src/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/complex.ycp?rev=48112&r1=48111&r2=48112&view=diff
==============================================================================
--- trunk/profile-manager/src/complex.ycp (original)
+++ trunk/profile-manager/src/complex.ycp Fri Jun 6 15:21:51 2008
@@ -26,9 +26,7 @@
*/
define symbol ReadDialog() ``{
Wizard::RestoreHelp(HELPS["read"]:"");
- Wizard::DisableAbortButton ();
boolean ret = ProfileManager::Read();
- Wizard::EnableAbortButton ();
return ret ? `next : `abort;
}

@@ -38,7 +36,6 @@
*/
define symbol WriteDialog() ``{
Wizard::RestoreHelp(HELPS["write"]:"");
- Wizard::DisableAbortButton ();
boolean ret = ProfileManager::Write();
return ret ? `next : `abort;
}
@@ -129,8 +126,7 @@
`HSpacing(3));

Wizard::SetContentsButtons (caption, contents, HELPS["main"]:"",
- Label::BackButton (), Label::FinishButton ());
- Wizard::RestoreAbortButton ();
+ Label::AbortButton (), Label::FinishButton ());

if (ProfileManager::enabled)
{

Modified: trunk/profile-manager/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/dialogs.ycp?rev=48112&r1=48111&r2=48112&view=diff
==============================================================================
--- trunk/profile-manager/src/dialogs.ycp (original)
+++ trunk/profile-manager/src/dialogs.ycp Fri Jun 6 15:21:51 2008
@@ -531,8 +531,6 @@
Wizard::SetContentsButtons (caption, contents, HELPS["resources"]:"",
Label::CancelButton (), Label::OKButton ());

- Wizard::HideAbortButton();
-
list items = resource_groups_items();
UI::ChangeWidget(`id(`rgroups), `Items, items);

@@ -790,13 +788,15 @@

Wizard::SetContentsButtons (caption, contents, HELPS["users"]:"",
Label::CancelButton (), Label::OKButton ());
- Wizard::HideAbortButton();

list items = users_items ();
UI::ChangeWidget(`id(`users), `Items, items);
if (items != [])
UI::SetFocus(`id(`users));

+ UI::ChangeWidget(`id (`edit), `Enabled, items != []);
+ UI::ChangeWidget(`id (`delete), `Enabled, items != []);
+
while (true)
{
ret = UI::UserInput ();
@@ -812,23 +812,28 @@
if (user != $[])
{
users[user["name"]:""] = user["permission"]:"";
- UI::ChangeWidget(`id(`users),`Items, users_items());
+ items = users_items ();
+ UI::ChangeWidget(`id(`users),`Items, items);
UI::ChangeWidget(`id(`users), `CurrentItem, user["name"]:"");
}
- continue;
}
else if (ret == `delete)
{
- users = remove (users, selected);
- UI::ChangeWidget(`id(`users),`Items, users_items());
- continue;
+ users = remove (users, selected);
+ items = users_items ();
+ UI::ChangeWidget (`id (`users), `Items, items);
}
- else if (ret == `back ||
+ if (ret == `add || ret == `delete)
+ {
+ UI::ChangeWidget (`id (`edit), `Enabled, items != []);
+ UI::ChangeWidget (`id (`delete), `Enabled, items != []);
+ }
+ if (ret == `back ||
(ret == `cancel && Popup::ReallyAbort (ProfileManager::Modified())))
{
break;
}
- else if (ret == `next)
+ if (ret == `next)
{
ProfileManager::SetUsers (users);
break;

Modified: trunk/profile-manager/src/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/wizards.ycp?rev=48112&r1=48111&r2=48112&view=diff
==============================================================================
--- trunk/profile-manager/src/wizards.ycp (original)
+++ trunk/profile-manager/src/wizards.ycp Fri Jun 6 15:21:51 2008
@@ -84,7 +84,8 @@
]
];

- Wizard::CreateDialog();
+ Wizard::OpenNextBackDialog();
+ Wizard::HideAbortButton ();
Wizard::SetDesktopIcon("profile-manager");
any ret = Sequencer::Run (aliases, sequence);
UI::CloseDialog();

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

< Previous Next >
This Thread
  • No further messages