Author: aschnell Date: Tue Jun 17 12:04:03 2008 New Revision: 48348 URL: http://svn.opensuse.org/viewcvs/yast?rev=48348&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-lib.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=48348&r1=48347&r2=48348&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 12:04:03 2008 @@ -8,9 +8,6 @@ textdomain "storage"; - // TODO: y2milestones at begin and end of MiniWorkflowSteps as decorators - // or in MiniWorkflow (Sequencer) module? - /** * read data["flavour"] * read data["slots"] @@ -119,21 +116,33 @@ symbol flavour = data["flavour"]:`none; + if (!haskey(data, "format")) + { + string mount_point_proposal = GetMountPointProposal(Storage::GetTargetMap(), []); + + symbol used_fs = Partitions::DefaultFs(); + if (mount_point_proposal == Partitions::BootMount()) + used_fs = Partitions::DefaultBootFs(); + + data["format"] = true; + data["fsid"] = Partitions::fsid_native; + data["mount"] = mount_point_proposal; + data["used_fs"] = used_fs; + data["fs_options"] = FileSystems::DefaultFormatOptions(data); + } + term tmp1 = `Empty(); if (flavour == `part) tmp1 = `VBox(`id(`do_not_format_attachment), FsidComboBox($[], FileSystems::GetAllFileSystems(true, true))); - map new_val = $[]; - list mountpoints = nil; if (mountpoints == nil) - mountpoints = [ "/", "/usr", Partitions::BootMount(), "/var", "/home", - "/opt" , "" ]; + mountpoints = [ "/", "/usr", Partitions::BootMount(), "/var", "/home", "/opt" , "" ]; - if (!contains(mountpoints, "") && new_val["enc_type"]:`none==`none) + if (!contains(mountpoints, "") && data["enc_type"]:`none==`none) mountpoints = add(mountpoints, ""); - string mount = new_val["mount"]:""; + string mount = data["mount"]:""; if (!contains(mountpoints, mount)) mountpoints = union([mount], mountpoints); @@ -192,11 +201,8 @@ break; case `fs_options: - // TODO - map haha = FileSystems::GetAllFileSystems(true, true); - map hihi = haha[`ext3]:$[]; - - data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], hihi); + map filesystems = FileSystems::GetAllFileSystems(true, true); + data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], filesystems[data["used_fs"]:`unknown]:$[]); break; case `fstab_options: @@ -232,8 +238,9 @@ if (widget == `next) { - // TODO - widget = `finish; + if (UI::QueryWidget(`id(`do_format), `Value) != true || + UI::QueryWidget(`id(`crypt_fs), `Value) != true) + widget = `finish; } y2milestone("MiniWorkflowStepFormatMount data:%1 ret:%2", data, widget); 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=48348&r1=48347&r2=48348&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 12:04:03 2008 @@ -75,7 +75,8 @@ data["region",0]:0, data["region",1]:0, mby); Storage::ChangeVolumeProperties(data); - UpdateNavigationTree(data["device"]:""); + UpdateNavigationTree(nil); + TabPanel::Create(); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org