Author: aschnell Date: Thu Jul 31 11:16:36 2008 New Revision: 49537 URL: http://svn.opensuse.org/viewcvs/yast?rev=49537&view=rev Log: - some cleanup Modified: branches/tmp/aschnell/part-redesign/disk/src/disk.ycp branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp Modified: branches/tmp/aschnell/part-redesign/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/dis... ============================================================================== --- branches/tmp/aschnell/part-redesign/disk/src/disk.ycp (original) +++ branches/tmp/aschnell/part-redesign/disk/src/disk.ycp Thu Jul 31 11:16:36 2008 @@ -16,20 +16,15 @@ * Wrapper file for inst_disk.ycp * */ - { - -/*** - * <h3>Configuration of the disk</h3> - */ - textdomain "storage"; import "Popup"; import "Wizard"; import "Misc"; - string msg=_("Only use this program if you are familiar with partitioning hard disks. + + string msg = _("Only use this program if you are familiar with partitioning hard disks. Never partition disks that may, in any way, be in use (mounted, swap, etc.) unless you know exactly what you are @@ -39,10 +34,10 @@ To continue despite this warning, click Yes. "); - any ret = `back; // no params == UI, some params == commandline - if (size (WFM::Args()) == 0) { + if (size (WFM::Args()) == 0) + { Wizard::CreateDialog(); Wizard::SetContents ( _("Expert Partitioner"), @@ -53,7 +48,6 @@ ); Wizard::SetTitleIcon ("yast-disk"); - ret = `back; // popup headline integer warn = tointeger(Misc::SysconfigRead( .sysconfig.storage.WARN_EXPERT, "1" )); y2milestone( "warn:%1", warn ); @@ -61,16 +55,18 @@ warn = 1; if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } else { - y2milestone ("User decided not to run storage..."); + y2milestone ("User decided not to run disk..."); } Wizard::CloseDialog(); - } else { + } + else + { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } Modified: branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/dis... ============================================================================== --- branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp (original) +++ branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp Thu Jul 31 11:16:36 2008 @@ -16,40 +16,35 @@ * Wrapper file for inst_disk.ycp * */ - { + textdomain "storage"; -/*** - * <h3>Configuration of the disk</h3> - */ + import "CommandLine"; + import "Storage"; - textdomain "storage"; - import "CommandLine"; - import "StorageClients"; - import "Popup"; - import "Storage"; - -define any DiskSequence () { - Storage::SwitchUiAutomounter( false ); - any ret = WFM::CallFunction("inst_disk", [ true, true ]); - Storage::SwitchUiAutomounter( true ); - Storage::SaveUsedFs(); + any DiskSequence() + { + Storage::SwitchUiAutomounter(false); + any ret = WFM::CallFunction("inst_disk", [ true, true ]); + Storage::SwitchUiAutomounter(true); + Storage::SaveUsedFs(); + + return ret; + } - return ret; -} -/* -- the command line description map -------------------------------------- */ -map cmdline = $[ - "id" : "disk", - // translators: command line help text for disk module - "help" : _("Disk partitioner"), - // custum help text (should replace default one) - "customhelp" : _("Command line interface for the partitioner module is not available"), - "guihandler" : DiskSequence, -]; + /* -- the command line description map -------------------------------------- */ + map cmdline = $[ + "id" : "disk", + // translators: command line help text for disk module + "help" : _("Disk partitioner"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the partitioner module is not available"), + "guihandler" : DiskSequence, + ]; -CommandLine::Run (cmdline); -return true; + CommandLine::Run(cmdline); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org