Mailinglist Archive: yast-commit (711 mails)

< Previous Next >
[yast-commit] r48365 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-dialogs.ycp ep-hd-dialogs.ycp ep-hd-lib.ycp ep-lvm-dialogs.ycp ep-lvm.ycp ep-main.ycp
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Tue, 17 Jun 2008 14:16:55 -0000
  • Message-id: <20080617141655.44E67300F8@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Tue Jun 17 16:16:54 2008
New Revision: 48365

URL: http://svn.opensuse.org/viewcvs/yast?rev=48365&view=rev
Log:
- backup commit

Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp

Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=48365&r1=48364&r2=48365&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
(original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Tue
Jun 17 16:16:54 2008
@@ -13,8 +13,9 @@
* read data["slots"]
* read data["type"]
* read data["cyl_size"]
+ * read/write data["region"]
*/
- symbol MiniWorkflowStepSize(map &data)
+ symbol MiniWorkflowStepSize(map<string, any> &data)
{
y2milestone("MiniWorkflowStepSize data:%1", data);

@@ -267,7 +268,7 @@
}


- symbol MiniWorkflowStepPassword(map &data)
+ symbol MiniWorkflowStepPassword(map<string, any> &data)
{
y2milestone("MiniWorkflowStepPassword data:%1", data);

@@ -355,6 +356,7 @@

if (widget == `next)
{
+ // TODO: this seems to be handled completely different
data["password"] = (string) UI::QueryWidget(`id(`pw1), `Value);

widget = `finish;

Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp?rev=48365&r1=48364&r2=48365&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
(original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
Tue Jun 17 16:16:54 2008
@@ -13,7 +13,7 @@
* read data["slots"]
* read/write data["type"]
*/
- symbol MiniWorkflowStepPartitionType(map &data)
+ symbol MiniWorkflowStepPartitionType(map<string, any> &data)
{
y2milestone("MiniWorkflowStepPartitionType data:%1", data);


Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp?rev=48365&r1=48364&r2=48365&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp
(original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp Tue
Jun 17 16:16:54 2008
@@ -76,7 +76,7 @@
Storage::ChangeVolumeProperties(data);

UpdateNavigationTree(nil);
- TabPanel::Create();
+ TreePanel::Create();
}
}
}

Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=48365&r1=48364&r2=48365&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
(original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
Tue Jun 17 16:16:54 2008
@@ -8,7 +8,7 @@
textdomain "storage";


- symbol MiniWorkflowStepVg(map &data)
+ symbol MiniWorkflowStepVg(map<string, any> &data)
{
y2milestone("MiniWorkflowStepVg data:%1", data);

@@ -112,13 +112,22 @@
}
until (widget == `abort || widget == `back || widget == `next);

+ if (widget == `next)
+ {
+ data["vgname"] = vgname;
+ data["pesize"] = pesize;
+ data["pvs"] = pvs;
+
+ widget = `finish;
+ }
+
y2milestone("MiniWorkflowStepVg data:%1 ret:%2", data, widget);

return widget;
}


- string DlgCreateVolumeGroupNew()
+ void DlgCreateVolumeGroupNew()
{
map<string, any> data = $[ "mode" : `create ];

@@ -134,19 +143,20 @@

if (widget == `finish)
{
- /*
- if (Storage::CreateLvmVgWithDevs(vgname, pesize_str_to_byte
(pesize), true, pvs))
- return vgname;
- */
+ if (Storage::CreateLvmVgWithDevs(data["vgname"]:"error",
+
pesize_str_to_byte(data["pesize"]:""), true,
+ data["pvs"]:[]))
+ {
+ UpdateNavigationTree(nil);
+ TreePanel::Create();
+ }
}
-
- return "";
}


boolean DlgResizeVolumeGroup()
{
- map data = $[ "mode" : `resize ];
+ map<string, any> data = $[ "mode" : `resize ];

map<string, any> aliases = $[
"TheOne" : ``(MiniWorkflowStepVg(data))
@@ -162,21 +172,20 @@
}


- symbol MiniWorkflowStepLvName(map &data)
+ symbol MiniWorkflowStepLvName(map<string, any> &data)
{
y2milestone("MiniWorkflowStepLvName data:%1", data);

term contents = `HVSquash(`Frame("Name",
`VBox(
- `Left(`ComboBox("Volume Group", ["system",
"data"])),
- `Left(`InputField("Logical Volume"))))
+ `Left(`InputField(`id(`lvname), "Logical
Volume")))
+ )
);

MiniWorkflow::SetContents(Greasemonkey::Transform(contents),
"help");

MiniWorkflow::SetLastStep(false);
- MiniWorkflow::SetLastStep(false);

symbol widget = nil;

@@ -188,8 +197,11 @@

if (widget == `next)
{
+ data["lvname"] = (string) UI::QueryWidget(`id(`lvname), `Value);
}

+ Debug("data", data);
+
y2milestone("MiniWorkflowStepLvName data:%1 ret:%2", data, widget);

return widget;
@@ -219,6 +231,10 @@

symbol ret = MiniWorkflow::Run(_("Add Logical Volume"), aliases,
sequence, "Name");

+ if (ret == `finish)
+ {
+ }
+
return false;
}


Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp?rev=48365&r1=48364&r2=48365&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp
(original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Tue Jun
17 16:16:54 2008
@@ -35,7 +35,6 @@
table_header, table_contents),
`HBox(
`PushButton(`id(`create_vg), _("Add
Volume Group...")),
- `PushButton(`id(`create_lv), _("Add
Logical Volume...")),
`HStretch()
)
)
@@ -48,18 +47,11 @@

void HandleLvmMainPanel(any user_data, symbol widget)
{
- if (widget == `create_vg)
- {
- string vgname = DlgCreateVolumeGroupNew();
- if (vgname != nil)
- {
- // TODO: update tree (with focus)
- UpdateNavigationTree("/dev/" + vgname);
- }
- }
- else if (widget == `create_lv)
+ switch (widget)
{
- DlgCreateLogicalVolume();
+ case `create_vg:
+ DlgCreateVolumeGroupNew();
+ break;
}
}

@@ -70,7 +62,7 @@

map<string, map> target_map = Storage::GetTargetMap();

- list<symbol> fields = StorageFields::Filter([ `heading_device, `device,
`size,
+ list<symbol> fields = StorageFields::Filter([ `heading_device, `device,
`size,
`heading_lvm,
`lvm_metadata, `pe_size ]);

UI::ReplaceWidget(`tab_panel,
@@ -241,7 +233,7 @@

list<symbol> fields = StorageFields::Filter([ `heading_device, `device,
`size, `used_by,
`heading_lvm, `stripes,
`heading_filesystem,
- `fs_type, `mount_point,
`mount_by, `uuid,
+ `fs_type, `mount_point,
`mount_by, `uuid,
`label, `encrypted ]);

UI::ReplaceWidget(`tree_panel,
@@ -266,17 +258,19 @@
{
string device = (string) user_data;

- if (widget == `edit)
- {
- DlgEditLogicalVolume(device);
- }
- else if (widget == `resize)
- {
- DlgResizeLogicalVolumeNew(device);
- }
- else if (widget == `delete)
+ switch (widget)
{
- EpDeleteDevice(device);
+ case `edit:
+ DlgEditLogicalVolume(device);
+ break;
+
+ case `resize:
+ DlgResizeLogicalVolumeNew(device);
+ break;
+
+ case `delete:
+ EpDeleteDevice(device);
+ break;
}
}
}

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=48365&r1=48364&r2=48365&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 Jun
17 16:16:54 2008
@@ -21,7 +21,7 @@

void Debug(string text, any value)
{
- return;
+ // return;

import "ValueBrowser";
UI::OpenDialog(`MinSize(50, 20,

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

< Previous Next >
This Thread
  • No further messages