Author: aschnell Date: Mon Nov 10 12:20:36 2008 New Revision: 53119 URL: http://svn.opensuse.org/viewcvs/yast?rev=53119&view=rev Log: - moved button "Import Mount Points" (bnc #438995 and bnc #441018) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=53119&r1=53118&r2=53119&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Nov 10 12:20:36 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 10 12:16:49 CET 2008 - aschnell@suse.de + +- moved button "Import Mount Points" (bnc #438995 and bnc #441018) + +------------------------------------------------------------------- Fri Nov 07 19:03:38 CET 2008 - aschnell@suse.de - flush /etc/sysconfig/storage after writing USED_FS_LIST (bnc Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-all.ycp?rev=53119&r1=53118&r2=53119&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Mon Nov 10 12:20:36 2008 @@ -21,13 +21,22 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); + term buttons = `HBox(); + + if (Mode::installation()) { + // push button text + buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points..."))); + buttons = add(buttons, `HStretch()); + } + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( // dialog heading, %1 is replaced with hostname `IconAndHeading(sformat(_("Available Storage on %1"), short_hostname), all_icon), `Table(`id(`table), `opt(`keepSorting, `notify), - table_header, table_contents) + table_header, table_contents), + buttons )) ); @@ -53,4 +62,18 @@ Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } + + + void HandleAllPanel(any user_data, symbol widget) + { + switch (widget) + { + case `import: + ImportMountPoints(); + Storage::CreateTargetBackup("expert-partitioner"); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + } + } } Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd.ycp?rev=53119&r1=53118&r2=53119&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Nov 10 12:20:36 2008 @@ -49,11 +49,6 @@ `PushButton(`id(`rescan), _("Rescan Disks")) ); - if (Mode::installation()) { - // push button text - buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points..."))); - } - buttons = add(buttons, `HStretch()); list<term> configs = []; @@ -150,13 +145,6 @@ Really rescan disks?"), nil, nil); break; - case `import: - ImportMountPoints(); - Storage::CreateTargetBackup("expert-partitioner"); - UpdateNavigationTree(nil); - TreePanel::Create(); - break; - case `iscsi: // popup text CallConfig(_("Calling iSCSI configuration cancels all current changes. Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-main.ycp?rev=53119&r1=53118&r2=53119&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Mon Nov 10 12:20:36 2008 @@ -87,7 +87,7 @@ { // TODO: somehow use AlwaysHideDisk - data = $[ `all : $[ `create : CreateAllPanel ], + data = $[ `all : $[ `create : CreateAllPanel, `handle : HandleAllPanel ], `hd : $[ `create : CreateHdMainPanel, `handle : HandleHdMainPanel ], `lvm : $[ `create : CreateLvmMainPanel, `handle : HandleLvmMainPanel ], `md : $[ `create : CreateRaidMainPanel, `handle : HandleRaidMainPanel ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org