Author: aschnell
Date: Tue Feb 19 13:28:27 2008
New Revision: 44632
URL: http://svn.opensuse.org/viewcvs/yast?rev=44632&view=rev
Log:
- some UI stuff
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp
branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp?rev=44632&r1=44631&r2=44632&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Tue Feb 19 13:28:27 2008
@@ -44,15 +44,16 @@
map tg = Storage::GetTargetMap();
list table_list = MakePartitionList(tg, columns, predicate_all);
- UI::ReplaceWidget(`tree_panel,
- `VBox(
+ UI::ReplaceWidget(`tree_panel,
+ `VBox(
`Left(`Heading("Available Storage on pandora")),
`HBox(`HStretch(),
`ComboBox(`id(`filter), `opt(`notify), "Show",
- huhu([`item(`id(`all), "All"),
- `item(`id(`disks), "Disks"),
- `item(`id(`lvm), "LVM"),
- `item(`id(`nfs), "NFS")], `id(filter_)))),
+ SelectOne([`item(`id(`all), "All"),
+ `item(`id(`disks), "Disks"),
+ `item(`id(`lvm), "LVM"),
+ `item(`id(`nfs), "NFS")],
+ `id(filter_)))),
`Table(`id(`table), `opt(`keepSorting),
header, table_list
)
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=44632&r1=44631&r2=44632&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Tue Feb 19 13:28:27 2008
@@ -15,7 +15,7 @@
// useful for e.g. ComboBox, SelectionBox and DumbTab
- list<term> huhu(list<term> items, any id)
+ list<term> SelectOne(list<term> items, any id)
{
return maplist(term item, items, { return `item(item[0]:nil, item[1]:nil, item[0]:nil == id); });
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp?rev=44632&r1=44631&r2=44632&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Tue Feb 19 13:28:27 2008
@@ -1,15 +1,35 @@
/**
- * File: ep-settings.ycp
- * Package: yast2-storage
- * Summary: Expert Partitioner
- * Authors: Arvin Schnell
+ * File: ep-settings.ycp
+ * Package: yast2-storage
+ * Summary: Expert Partitioner
+ * Authors: Arvin Schnell
*
*/
{
textdomain "storage";
- any default_fs = `ext2;
+ map fs = $[ `ext2 : "ext2",
+ `ext3 : "ext3",
+ `reiserfs : "reiserfs" ];
+
+
+ symbol preferred_displayname = `name;
+ symbol default_mountby = `uuid;
+ symbol default_fs = `ext2;
+
+
+ void LoadSettings()
+ {
+ string tmp = (string) SCR::Read(.sysconfig.storage.DEFAULT_FS);
+ foreach(symbol k, string v, fs, { if (tmp == v) default_fs = k; });
+ }
+
+
+ void SaveSettings()
+ {
+ SCR::Write(.sysconfig.storage.DEFAULT_FS, fs[default_fs]:"");
+ }
void CreateSettingsPanel(any user_data)
@@ -17,12 +37,25 @@
UI::ReplaceWidget(`tree_panel,
`VBox(
`Left(`Heading("Settings")),
- `HBox(`ComboBox(`id(`default_fs), "Default Filesystem",
- huhu([`item(`id(`ext2), "Ext2"),
- `item(`id(`ext3), "Ext3"),
- `item(`id(`reiserfs), "ReiserFS"),
- `item(`id(`xfs), "XFS")
- ], `id(default_fs)))
+ `VBox(
+ `ComboBox(`id(`preferred_displayname), "Preferred Display Name",
+ SelectOne([`item(`id(`name), "Device Name"),
+ `item(`id(`id), "Device ID"),
+ `item(`id(`path), "Device Path")],
+ `id(preferred_displayname))),
+ `ComboBox(`id(`default_mountby), "Default Mount by",
+ SelectOne([`item(`id(`name), "Device Name"),
+ `item(`id(`label), "Volume Label"),
+ `item(`id(`uuid), "UUID"),
+ `item(`id(`id), "Device ID"),
+ `item(`id(`path), "Device Path")],
+ `id(default_mountby))),
+ `ComboBox(`id(`default_fs), "Default Filesystem",
+ SelectOne([`item(`id(`ext2), "Ext2"),
+ `item(`id(`ext3), "Ext3"),
+ `item(`id(`reiserfs), "ReiserFS"),
+ `item(`id(`xfs), "XFS")],
+ `id(default_fs)))
),
`VStretch()
));
@@ -33,6 +66,8 @@
void SaveSettingsPanel(any user_data)
{
- default_fs = UI::QueryWidget(`id(`default_fs), `Value);
+ preferred_displayname = (symbol) UI::QueryWidget(`id(`preferred_displayname), `Value);
+ default_mountby = (symbol) UI::QueryWidget(`id(`default_mountby), `Value);
+ default_fs = (symbol) UI::QueryWidget(`id(`default_fs), `Value);
}
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp?rev=44632&r1=44631&r2=44632&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp Tue Feb 19 13:28:27 2008
@@ -7,7 +7,7 @@
* The items in the item-list must contain these entries:
* 0: any id
* 1: string label
- * 2: boolean selected (which side), optional, default is false
+ * 2: boolean selected, optional, default is false
* 3: boolean selected (checkbox), optional, default is false
*/
{
@@ -19,14 +19,14 @@
list<term> items = [];
- list<term> MakeLeftContent()
+ list<term> MakeUnselContent()
{
list<term> ret = filter(term item, items, { return item[2]:false == false; });
return maplist(term item, ret, { return `item(item[0]:nil, item[1]:nil, item[3]:false); });
}
- list<term> MakeRightContent()
+ list<term> MakeSelContent()
{
list<term> ret = filter(term item, items, { return item[2]:false == true; });
return maplist(term item, ret, { return `item(item[0]:nil, item[1]:nil, item[3]:false); });
@@ -38,7 +38,7 @@
items = i;
return `HBox(
- `MultiSelectionBox(`id(`left), "Available Physical Volumes:", MakeLeftContent()),
+ `MultiSelectionBox(`id(`unsel), "Available Physical Volumes:", MakeUnselContent()),
`VBox(
`PushButton(`id(`add), "Add" + " " + UI::Glyph(`ArrowRight)),
`PushButton(`id(`add_all), "Add All" + " " + UI::Glyph(`ArrowRight)),
@@ -46,7 +46,7 @@
`PushButton(`id(`remove), UI::Glyph(`ArrowLeft) + " " + "Remove"),
`PushButton(`id(`remove_all), UI::Glyph(`ArrowLeft) + " " + "Remove All")
),
- `MultiSelectionBox(`id(`right), "Selected Physical Volumes:", MakeRightContent())
+ `MultiSelectionBox(`id(`sel), "Selected Physical Volumes:", MakeSelContent())
);
}
@@ -55,15 +55,15 @@
{
items = i;
- UI::ChangeWidget(`id(`left), `Items, MakeLeftContent());
- UI::ChangeWidget(`id(`right), `Items, MakeRightContent());
+ UI::ChangeWidget(`id(`unsel), `Items, MakeUnselContent());
+ UI::ChangeWidget(`id(`sel), `Items, MakeSelContent());
}
global list<term> GetItems()
{
- list<term> tmp = (list<term>) merge((list<term>) UI::QueryWidget(`id(`left), `Items),
- (list<term>) UI::QueryWidget(`id(`right), `Items));
+ list<term> tmp = (list<term>) merge((list<term>) UI::QueryWidget(`id(`unsel), `Items),
+ (list<term>) UI::QueryWidget(`id(`sel), `Items));
items = maplist(term item, items, {
any id = item[0]:nil;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org