Author: aschnell Date: Thu Dec 11 14:58:51 2008 New Revision: 54052 URL: http://svn.opensuse.org/viewcvs/yast?rev=54052&view=rev Log: - fixed button label (bnc #450176) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dm-lib.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-loop-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/include/ep-unused.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Dec 11 14:58:51 2008 @@ -1,9 +1,14 @@ ------------------------------------------------------------------- +Thu Dec 11 14:47:19 CET 2008 - aschnell@suse.de + +- fixed button label (bnc #450176) +- 2.17.62 + +------------------------------------------------------------------- Tue Dec 09 15:50:10 CET 2008 - aschnell@suse.de - show only last part of device name in navigation tree (bnc #450043) -- 2.17.62 ------------------------------------------------------------------- Tue Dec 09 13:24:36 CET 2008 - aschnell@suse.de 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=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Thu Dec 11 14:58:51 2008 @@ -71,6 +71,8 @@ case `import: ImportMountPoints(); Storage::CreateTargetBackup("expert-partitioner"); + + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); break; Modified: trunk/storage/storage/src/include/ep-dm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dm-lib.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-dm-lib.ycp Thu Dec 11 14:58:51 2008 @@ -32,6 +32,7 @@ { Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-lib.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Thu Dec 11 14:58:51 2008 @@ -69,6 +69,8 @@ on %1 and all RAIDs and Volume Groups using partitions on %1."), disk_device))) { Storage::CreatePartitionTable(disk_device, label); + + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } @@ -94,6 +96,8 @@ { if (deleteAllDevPartitions(disk, Stage::initial(), false)) Storage::DeleteDmraid(device); + + UpdateMainStatus(); UpdateNavigationTree(`hd); TreePanel::Create(); } @@ -194,6 +198,7 @@ data["region",0]:0, data["region",1]:0, mby); Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -233,6 +238,7 @@ { Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -279,6 +285,7 @@ { Storage::ResizePartition(device, disk["device"]:"error", data["region", 1]:0); + UpdateMainStatus(); TreePanel::Create(); UpdateTableFocus(device); } @@ -298,6 +305,7 @@ if (EpDeleteDevice(device)) { + UpdateMainStatus(); UpdateNavigationTree(parent); TreePanel::Create(); } @@ -333,6 +341,7 @@ Storage::InitializeDisk(device, false); } + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } 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=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Thu Dec 11 14:58:51 2008 @@ -131,6 +131,8 @@ WFM::call(call); RescanDisks(); Storage::CreateTargetBackup("expert-partitioner"); + + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } Modified: trunk/storage/storage/src/include/ep-loop-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop-lib.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-loop-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-lib.ycp Thu Dec 11 14:58:51 2008 @@ -24,6 +24,7 @@ Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -54,6 +55,7 @@ { Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -72,6 +74,7 @@ if (EpDeleteDevice(device)) { + UpdateMainStatus(); UpdateNavigationTree(`loop); TreePanel::Create(); } Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-lib.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Thu Dec 11 14:58:51 2008 @@ -64,6 +64,7 @@ list<string> devices = data["devices"]:[]; AddPvs(vg_name, devices); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus("/dev/" + vg_name); @@ -117,6 +118,7 @@ if (DlgResizeVolumeGroup(data, Commit)) { + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } @@ -152,6 +154,7 @@ { if (Storage::DeleteLvmVg(vgname)) { + UpdateMainStatus(); UpdateNavigationTree(`lvm); TreePanel::Create(); } @@ -199,6 +202,7 @@ if (DlgCreateLogicalVolume(data, Commit)) { + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus("/dev/" + data["vg_name"]:"error" + "/" + data["name"]:"error"); @@ -222,6 +226,7 @@ { Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -246,6 +251,7 @@ { Storage::ResizeVolume(device, vg_data["device"]:"error", lv_data["size_k"]:0); + UpdateMainStatus(); TreePanel::Create(); UpdateTableFocus(device); } @@ -265,6 +271,7 @@ if (EpDeleteDevice(device)) { + UpdateMainStatus(); UpdateNavigationTree(parent); TreePanel::Create(); } 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=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Thu Dec 11 14:58:51 2008 @@ -39,6 +39,9 @@ string caption = _("Expert Partitioner"); + void UpdateMainStatus(); + + void UpdateNavigationTree(any new_focus); @@ -67,6 +70,18 @@ include "partitioning/ep-unused.ycp"; + void UpdateMainStatus() + { + if (Mode::normal()) + { + string next_label = Storage::EqualBackupStates("expert-partitioner", "", true) ? + Label::FinishButton() : Label::NextButton(); + + Wizard::SetNextButton(`next, next_label); + } + } + + void MakeNavigationTree(map open_items, list<term>& tree, map& data) { // TODO: somehow use AlwaysHideDisk @@ -194,6 +209,7 @@ TreePanel::Update(data, tree, new_focus); } + /** * Confirm leaving the module */ @@ -259,6 +275,7 @@ return ret; } + /** * apply changes in running system */ @@ -287,6 +304,7 @@ } } + symbol ExpertPartitioner() { SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); @@ -298,7 +316,7 @@ MakeNavigationTree($[`all : "ID"], tree, data); string back_label = Label::BackButton(); - string next_label = Mode::normal() ? Label::NextButton() : Label::AcceptButton(); + string next_label = Mode::normal() ? Label::FinishButton() : Label::AcceptButton(); string abort_label = Label::AbortButton(); term contents = `MarginBox(0.5, 0.5, Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-lib.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Thu Dec 11 14:58:51 2008 @@ -76,6 +76,7 @@ Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(data["device"]:"error"); @@ -108,6 +109,7 @@ { Storage::ChangeVolumeProperties(data); + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus(device); @@ -163,6 +165,7 @@ Popup::Error(_("Failed to remove some devices.")); } + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } @@ -181,6 +184,7 @@ if (EpDeleteDevice(device)) { + UpdateMainStatus(); UpdateNavigationTree(`md); TreePanel::Create(); } Modified: trunk/storage/storage/src/include/ep-unused.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-unused.ycp?rev=54052&r1=54051&r2=54052&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-unused.ycp (original) +++ trunk/storage/storage/src/include/ep-unused.ycp Thu Dec 11 14:58:51 2008 @@ -80,6 +80,8 @@ { RescanDisks(); Storage::CreateTargetBackup("expert-partitioner"); + + UpdateMainStatus(); UpdateNavigationTree(nil); TreePanel::Create(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org