Author: aschnell Date: Mon Jun 16 11:52:59 2008 New Revision: 48319 URL: http://svn.opensuse.org/viewcvs/yast?rev=48319&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp?rev=48319&r1=48318&r2=48319&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp Mon Jun 16 11:52:59 2008 @@ -350,7 +350,7 @@ define map FileSystemOptions( map< any, map > org_fs_options, map fs_define ) ``{ - y2milestone( "FileSystemOptions org_fs_options %1", org_fs_options ); + y2milestone( "FileSystemOptions org_fs_options:%1 fs_define:%2", org_fs_options, fs_define ); map > fs_options = org_fs_options; term contents = `VBox(`VSpacing (1)); string helptext = ""; 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=48319&r1=48318&r2=48319&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 Mon Jun 16 11:52:59 2008 @@ -169,41 +169,46 @@ { widget = MiniWorkflow::UserInput(); - if (widget == `crypt_fs) - { - MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); - } - else if (widget == `fs_options) - { - FileSystemOptions($[], $[]); - } - else if (widget == `fstab_options) - { - FstabOptions($[], $[]); - } - else if (widget == `do_format) - { - // can't the UI do that for me? - UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true); - UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, false); - MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); - } - else if (widget == `do_not_format) - { - UI::ChangeWidget(`id(`do_format_attachment), `Enabled, false); - UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, true); - MiniWorkflow::SetLastStep(true); - } - else if (widget == `do_mount) - { - UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, true); - } - else if (widget == `do_not_mount) - { - UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, false); - } - else if (widget == `next) + switch (widget) { + case `crypt_fs: + MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); + break; + + case `fs_options: + // TODO + map haha = FileSystems::GetAllFileSystems(true, true); + map hihi = haha[`ext3]:$[]; + + data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], hihi); + break; + + case `fstab_options: + FstabOptions($[], $[]); + break; + + case `do_format: + UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true); + UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, false); + MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); + break; + + case `do_not_format: + UI::ChangeWidget(`id(`do_format_attachment), `Enabled, false); + UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, true); + MiniWorkflow::SetLastStep(true); + break; + + case `do_mount: + UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, true); + break; + + case `do_not_mount: + UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, false); + break; + + case `next: + break; } } until (widget == `abort || widget == `back || widget == `next); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org