February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55725 - in /branches/tmp/visnov: ./ python-ui/ python-ui/main.py python-ui/widget_library.py
by visnov＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: visnov Date: Tue Feb 24 15:49:14 2009 New Revision: 55725 URL: http://svn.opensuse.org/viewcvs/yast?rev=55725&view=rev Log: my small Python UI library, right now can do main window and wizard window Added: branches/tmp/visnov/ branches/tmp/visnov/python-ui/ branches/tmp/visnov/python-ui/main.py branches/tmp/visnov/python-ui/widget_library.py Added: branches/tmp/visnov/python-ui/main.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/python-ui/main.py?… ============================================================================== --- branches/tmp/visnov/python-ui/main.py (added) +++ branches/tmp/visnov/python-ui/main.py Tue Feb 24 15:49:14 2009 @@ -0,0 +1,9 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +import yui +from widget_library import * + +if __name__== "__main__": + td = WizardDialog() + td.run() + Added: branches/tmp/visnov/python-ui/widget_library.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/python-ui/widget_l… ============================================================================== --- branches/tmp/visnov/python-ui/widget_library.py (added) +++ branches/tmp/visnov/python-ui/widget_library.py Tue Feb 24 15:49:14 2009 @@ -0,0 +1,57 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +import yui + +class MainDialog: + def __init__(self): + self.factory = yui.YUI.widgetFactory() + self.optionalFactory = yui.YUI.optionalWidgetFactory() + self.dialog = self.factory.createMainDialog() + self.setupWidgets(self.dialog) + + def __del__(self): + self.dialog.destroy() + + def run(self): + etype=-1 + while etype != yui.YEvent.CancelEvent: + event = self.dialog.waitForEvent() + etype = event.eventType() + res = self.handleEvent( event ) + if res != None: + return res; + + def setupWidgets(self, dialog): + pass + +# need to handle this better + def handleEvent(self, event): + return None + +class WizardDialog(MainDialog): + + def setupWidgets(self, dialog): + self.wizard = self.optionalFactory.createWizard( dialog, self.backButton(), self.abortButton(), self.nextButton() ) + self.abortID = yui.YStringWidgetID( "abort" ) + self.wizard.abortButton().setId( self.abortID ) + self.nextID = yui.YStringWidgetID( "next" ) + self.wizard.nextButton().setId( self.nextID ) + self.backID = yui.YStringWidgetID( "back" ) + self.wizard.backButton().setId( self.backID ) + + def backButton(self): + return "Back" + + def nextButton(self): + return "Next" + + def abortButton(self): + return "Abort" + + def handleEvent(self, event): + if event.eventType() == yui.YEvent.WidgetEvent: + eventId = event.widget().id().toString(); + if eventId == "back" or eventId == "next" or eventId == "abort": + return "eventId"; + else: + return MainDialog.handleEvent(self,event) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55724 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines: dialogs.ycp section_widgets.ycp
by juhliarik＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: juhliarik Date: Tue Feb 24 15:29:13 2009 New Revision: 55724 URL: http://svn.opensuse.org/viewcvs/yast?rev=55724&view=rev Log: added some fixes for old/new UI Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Tue Feb 24 15:29:13 2009 @@ -165,13 +165,13 @@ // frame `Frame (_("Section Settings"), `HBox (`HSpacing (2), `VBox ( `VSpacing (1), - "kernel", + "image", `VSpacing (1), "initrd", `VSpacing (1), `HBox ( `HWeight (1, "root"), - `HWeight (1, "vga") + `HWeight (1, "vgamode") ), `VSpacing (1), "append", @@ -180,9 +180,11 @@ `VStretch () ), `HSpacing (2)); - list<string> widget_names = ["name", "kernel", "initrd", "root", "vga", "append"]; - map<string,map<string,any> > widget_descr = (map<string,map<string,any> >) - union (CommonSectionWidgets (), Bootloader::blWidgetMaps ()); + list<string> widget_names = ["name", "image", "initrd", "root", "vgamode", "append"]; + //map<string,map<string,any> > widget_descr = (map<string,map<string,any> >) + // union (CommonSectionWidgets (), Bootloader::blWidgetMaps ()); + + map<string,map<string,any> > widget_descr =CommonSectionWidgets (); // dialog caption string caption = _("Boot Loader Settings: Section Management"); return CWM::ShowAndRun ($[ Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Tue Feb 24 15:29:13 2009 @@ -107,12 +107,16 @@ * @param widget any id of the widget */ void KernelImageInit (string widget) { + /* list<string> available = (list<string>)SCR::Read (.target.dir, "/boot"); available = filter (string f, available, { return substring (f, 0, 13) == "/boot/vmlinuz"; }); if (size (available) == 0) available = ["/boot/vmlinuz"]; + */ + string image = BootCommon::current_section["image"]:""; + list<string> available = [image]; UI::ChangeWidget (`id (widget), `Items, available); SectionOptionInit (widget); } @@ -356,14 +360,14 @@ "store" : SectionNameStore, "help" : SectionNameHelp (), ], - "kernel" : $[ + "image" : $[ "widget" : `custom, "custom_widget" : Stage::initial () - ? `InputField (`id ("kernel"), `opt (`hstretch), + ? `InputField (`id ("image"), `opt (`hstretch), // text entry _("&Kernel")) : `HBox ( - `ComboBox (`id ("kernel"), `opt (`editable, `hstretch), + `ComboBox (`id ("image"), `opt (`editable, `hstretch), // combo box _("&Kernel"), []), @@ -410,7 +414,7 @@ "store" : RootDeviceStore, "help" : RootDeviceHelp (), ], - "vga" : $[ + "vgamode" : $[ "widget" : `combobox, // combo box "label" : _("&VGA Mode"), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55723 - /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp
by jreidinger＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: jreidinger Date: Tue Feb 24 15:18:26 2009 New Revision: 55723 URL: http://svn.opensuse.org/viewcvs/yast?rev=55723&view=rev Log: add common global widgets Added: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Added: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp (added) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Tue Feb 24 15:18:26 2009 @@ -0,0 +1,49 @@ +/** + * File: + * include/bootloader/routines/common_options.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Shared widgets for bootloader options. + * + * Authors: + * Josef Reidinger<jreidinger(a)suse.cz> + * + * $Id: $ + * + */ + +{ + +textdomain "bootloader"; + +void InitGlobalInt(string widget){ + integer value = BootCommon::globals[widget]:0; + UI::ChangeWidget (`id (widget), `Value, value); +} +void StoreGlobalInt(string widget){ + integer value = (integer)UI::QueryWidget (`id (widget), `Value); + BootCommon::globals[widget] = sformat ("%1", timeout); +} + +map<string,any> TimeoutWidget () { + return $[ + "widget" : `intfield, + "label" : _("Boot Menu"), + "minimum" : 0, + "maximum" : 300, + "init" : InitGlobalInt, + "store" : StoreGlobalInt, + //"help" : i386BootMenuHelp (), //TODO + ]; +} + +map<string,map<string,any> > CommonOptions(){ + return $[ + "timeout" : TimeoutWidget(), + ]; +} + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55722 - /tags/stable-2_18_9/installation/
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:50:28 2009 New Revision: 55722 URL: http://svn.opensuse.org/viewcvs/yast?rev=55722&view=rev Log: Created tag stable-2_18_9 for installation Added: tags/stable-2_18_9/installation/ - copied from r55721, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55721 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_worker_continue.ycp src/include/inst_inc_second.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:50:08 2009 New Revision: 55721 URL: http://svn.opensuse.org/viewcvs/yast?rev=55721&view=rev Log: - Added support for `reboot_same_step (bnc #475650). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_continue.ycp trunk/installation/src/include/inst_inc_second.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 24 14:50:08 2009 @@ -2,6 +2,7 @@ Tue Feb 24 13:30:15 CET 2009 - locilka(a)suse.cz - Added support for .xz images deployment (bnc #476079). +- Added support for `reboot_same_step (bnc #475650). - 2.18.9 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/inst_worker_continue.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_wo… ============================================================================== --- trunk/installation/src/clients/inst_worker_continue.ycp (original) +++ trunk/installation/src/clients/inst_worker_continue.ycp Tue Feb 24 14:50:08 2009 @@ -120,7 +120,7 @@ y2milestone("Evaluating ret: %1", ret); - if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step) { + if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step || ret == `rebot_same_step) { ret = PrepareYaSTforRestart (ret); // Installation has been aborted } else if (ret == `abort) { @@ -134,7 +134,7 @@ StoreNetworkServices (ret); // when the installation is not aborted or YaST is not restarted on purpose - // ret == `next -> (ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) + // ret == `next -> (ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort && ret != `rebot_same_step) if (ret == `next) { HandleSecondStageFinishedCorrectly(); // installation (second stage) has been aborted Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Tue Feb 24 14:50:08 2009 @@ -370,6 +370,11 @@ ret = `restart_yast; } + if (ret == `reboot_same_step) { + last_step = last_step - 1; + ret = `reboot; + } + integer next_step = last_step + 1; y2milestone ("Creating %1 file with values %2", Installation::restart_data_file, [next_step, restarting_step]); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Feb 24 14:50:08 2009 @@ -22,8 +22,8 @@ # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 -# ag_freespace -Requires: yast2 >= 2.18.4 +# `reboot_same_step +Requires: yast2 >= 2.18.11 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55720 - /tags/stable-2_18_9/installation/
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:47:27 2009 New Revision: 55720 URL: http://svn.opensuse.org/viewcvs/yast?rev=55720&view=rev Log: One more change Removed: tags/stable-2_18_9/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55719 - /tags/stable-2_18_11/yast2/
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:46:38 2009 New Revision: 55719 URL: http://svn.opensuse.org/viewcvs/yast?rev=55719&view=rev Log: Created tag stable-2_18_11 for yast2 Added: tags/stable-2_18_11/yast2/ - copied from r55718, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55718 - in /trunk/yast2: VERSION package/yast2.changes
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:45:47 2009 New Revision: 55718 URL: http://svn.opensuse.org/viewcvs/yast?rev=55718&view=rev Log: New version Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=55718&r1=55717… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Feb 24 14:45:47 2009 @@ -1 +1 @@ -2.18.10 +2.18.11 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 24 14:45:47 2009 @@ -2,6 +2,7 @@ Tue Feb 24 14:34:50 CET 2009 - locilka(a)suse.cz - Added support for `rebot_same_step return value (bnc #475650). +- 2.18.11 ------------------------------------------------------------------- Mon Feb 23 12:43:46 CET 2009 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55717 - in /trunk/yast2: library/control/src/ProductControl.ycp package/yast2.changes
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:35:21 2009 New Revision: 55717 URL: http://svn.opensuse.org/viewcvs/yast?rev=55717&view=rev Log: - Added support for `rebot_same_step return value (bnc #475650). Modified: trunk/yast2/library/control/src/ProductControl.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Produc… ============================================================================== --- trunk/yast2/library/control/src/ProductControl.ycp (original) +++ trunk/yast2/library/control/src/ProductControl.ycp Tue Feb 24 14:35:21 2009 @@ -1422,17 +1422,8 @@ { continue; // Show same dialog again } - else if (result == `restart_yast) - { - final_result = result; - break; - } - else if (result == `restart_same_step) - { - final_result = result; - break; - } - else if (result == `reboot) + // BNC #475650: Adding `rebot_same_step + else if (result == `restart_yast || result == `restart_same_step || result == `reboot || result == `rebot_same_step) { final_result = result; break; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 24 14:35:21 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 24 14:34:50 CET 2009 - locilka(a)suse.cz + +- Added support for `rebot_same_step return value (bnc #475650). + +------------------------------------------------------------------- Mon Feb 23 12:43:46 CET 2009 - locilka(a)suse.cz - Fixing ProductControl to avoid leaving a workflow with the `auto -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55716 - /trunk/yast2/library/control/src/GetInstArgs.ycp
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 14:31:10 2009 New Revision: 55716 URL: http://svn.opensuse.org/viewcvs/yast?rev=55716&view=rev Log: Corrected comment Modified: trunk/yast2/library/control/src/GetInstArgs.ycp Modified: trunk/yast2/library/control/src/GetInstArgs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/GetIns… ============================================================================== --- trunk/yast2/library/control/src/GetInstArgs.ycp (original) +++ trunk/yast2/library/control/src/GetInstArgs.ycp Tue Feb 24 14:31:10 2009 @@ -29,7 +29,8 @@ /* Check arguments */ args = $[]; integer i=0; - // assign to args first available map (in 2nd stage, first argument is string - bnc#475169) + // assign to args first available map + // (in proposals, first argument is string - bnc#475169) while(i<size(WFM::Args())){ if(is(WFM::Args(i), map)){ args=(map)WFM::Args(i); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0