Mailinglist Archive: yast-commit (953 mails)
| < Previous | Next > |
[yast-commit] r50474 - in /branches/tmp/jdsn/edu-users/src: EduUsers.ycp dialogs.ycp
- From: jdsn@xxxxxxxxxxxxxxxx
- Date: Fri, 29 Aug 2008 10:26:44 -0000
- Message-id: <20080829102644.CABB12D4CB@xxxxxxxxxxxxxxxx>
Author: jdsn
Date: Fri Aug 29 12:26:44 2008
New Revision: 50474
URL: http://svn.opensuse.org/viewcvs/yast?rev=50474&view=rev
Log:
make use of more "recent" functions
Modified:
branches/tmp/jdsn/edu-users/src/EduUsers.ycp
branches/tmp/jdsn/edu-users/src/dialogs.ycp
Modified: branches/tmp/jdsn/edu-users/src/EduUsers.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/EduUsers.ycp?rev=50474&r1=50473&r2=50474&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/EduUsers.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/EduUsers.ycp Fri Aug 29 12:26:44 2008
@@ -333,7 +333,9 @@
global list<string> getRecentTemplates()
{
// recent means - merge/filter the current, edit and delete maps
- return [];
+ // FIXME data has fetched with a filter over the current, edit and delete
maps
+ // for now still get the data from the "current" hash - to be fixed, see
FIXME
+ return (list<string>) Template[`current]:[];
}
Modified: branches/tmp/jdsn/edu-users/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/dialogs.ycp?rev=50474&r1=50473&r2=50474&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/dialogs.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/dialogs.ycp Fri Aug 29 12:26:44 2008
@@ -239,7 +239,7 @@
// fill table with data
//Popup::Notify(_("Templates"));
- list<term> templates = EduUsers::getTemplateItems();
+ list<term> templates = EduUsers::getTemplateItemList();
UI::ReplaceWidget(`id(`tabContent), `Table( `id(`edutable), `opt(`notify,
`vstretch) , `header( _("Templates") ), templates ) );
UI::ChangeWidget(`id(`edit), `Enabled, false);
@@ -298,7 +298,7 @@
UI::OpenDialog(`VBox(
`Label("Create a new group"),
`InputField(`id(`groupEnt),"Groupname"),
-
`ComboBox(`id(`templateCom),"Template",["Waschmaschine","Spuelmaschine","Dusche"]
), //EduUsers::getTemplateItems()
+ `ComboBox(`id(`templateCom), "Template",
EduUsers::getTemplateItemList() ),
`HBox(
`PushButton( `id( `ok ), "OK" ),
`PushButton( `id( `cancel ), "Cancel" )
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
Date: Fri Aug 29 12:26:44 2008
New Revision: 50474
URL: http://svn.opensuse.org/viewcvs/yast?rev=50474&view=rev
Log:
make use of more "recent" functions
Modified:
branches/tmp/jdsn/edu-users/src/EduUsers.ycp
branches/tmp/jdsn/edu-users/src/dialogs.ycp
Modified: branches/tmp/jdsn/edu-users/src/EduUsers.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/EduUsers.ycp?rev=50474&r1=50473&r2=50474&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/EduUsers.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/EduUsers.ycp Fri Aug 29 12:26:44 2008
@@ -333,7 +333,9 @@
global list<string> getRecentTemplates()
{
// recent means - merge/filter the current, edit and delete maps
- return [];
+ // FIXME data has fetched with a filter over the current, edit and delete
maps
+ // for now still get the data from the "current" hash - to be fixed, see
FIXME
+ return (list<string>) Template[`current]:[];
}
Modified: branches/tmp/jdsn/edu-users/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/dialogs.ycp?rev=50474&r1=50473&r2=50474&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/dialogs.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/dialogs.ycp Fri Aug 29 12:26:44 2008
@@ -239,7 +239,7 @@
// fill table with data
//Popup::Notify(_("Templates"));
- list<term> templates = EduUsers::getTemplateItems();
+ list<term> templates = EduUsers::getTemplateItemList();
UI::ReplaceWidget(`id(`tabContent), `Table( `id(`edutable), `opt(`notify,
`vstretch) , `header( _("Templates") ), templates ) );
UI::ChangeWidget(`id(`edit), `Enabled, false);
@@ -298,7 +298,7 @@
UI::OpenDialog(`VBox(
`Label("Create a new group"),
`InputField(`id(`groupEnt),"Groupname"),
-
`ComboBox(`id(`templateCom),"Template",["Waschmaschine","Spuelmaschine","Dusche"]
), //EduUsers::getTemplateItems()
+ `ComboBox(`id(`templateCom), "Template",
EduUsers::getTemplateItemList() ),
`HBox(
`PushButton( `id( `ok ), "OK" ),
`PushButton( `id( `cancel ), "Cancel" )
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
| < Previous | Next > |