March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56518 - /trunk/repair/src/osr_module_partition.ycp
by aschnell＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: aschnell Date: Tue Mar 31 20:16:16 2009 New Revision: 56518 URL: http://svn.opensuse.org/viewcvs/yast?rev=56518&view=rev Log: - added missing import Modified: trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.… ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Tue Mar 31 20:16:16 2009 @@ -39,6 +39,7 @@ import "Stage"; import "Storage"; import "Update"; + import "Installation"; textdomain "repair"; -- 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] r56517 - in /trunk/sound: package/yast2-sound.changes sound/src/routines.ycp
by lslezak＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: lslezak Date: Tue Mar 31 20:09:02 2009 New Revision: 56517 URL: http://svn.opensuse.org/viewcvs/yast?rev=56517&view=rev Log: - convert Autoyast volume settings to the expected format Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/routines.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Mar 31 20:09:02 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 31 20:03:27 CEST 2009 - lslezak(a)suse.cz + +- convert Autoyast volume settings to the expected format + +------------------------------------------------------------------- Tue Mar 31 19:00:20 CEST 2009 - lslezak(a)suse.cz - improved logging in alsa-agent when a requested volume Modified: trunk/sound/sound/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/routines.ycp?rev… ============================================================================== --- trunk/sound/sound/src/routines.ycp (original) +++ trunk/sound/sound/src/routines.ycp Tue Mar 31 20:09:02 2009 @@ -410,6 +410,37 @@ else return it; }); } + + if (is(vol_settings, list<list<map> >)) + { + y2milestone("AutoYast data detected, converting..."); + /* convert + [ + [ $["mute":false, "name":"Master", "volume":96], ... ] + [ ... ] + ] + to + [ + [ ["PCM", 32, false], ["Master", 100, true]], + [ [....], ..... ] + ] + */ + + list cnv_vol_settings = maplist(list<map> card_setting, (list<list<map> >)vol_settings, + { + return maplist(map channel_config, card_setting, + { + return [ channel_config["name"]:"", channel_config["volume"]:0, channel_config["mute"]:true ]; + } + ); + } + ); + + y2milestone("Volume settings converted: %1 -> %2", vol_settings, cnv_vol_settings); + + vol_settings = cnv_vol_settings; + } + any item = vol_settings [0]:nil; if (is (item, map)) { -- 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] r56516 - in /trunk/yast2/library/cwm/doc: cwm.xml cwm_table.xml
by jreidinger＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: jreidinger Date: Tue Mar 31 19:27:09 2009 New Revision: 56516 URL: http://svn.opensuse.org/viewcvs/yast?rev=56516&view=rev Log: add documentation to cwm table Added: trunk/yast2/library/cwm/doc/cwm_table.xml Modified: trunk/yast2/library/cwm/doc/cwm.xml Modified: trunk/yast2/library/cwm/doc/cwm.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/cwm.xml?re… ============================================================================== --- trunk/yast2/library/cwm/doc/cwm.xml (original) +++ trunk/yast2/library/cwm/doc/cwm.xml Tue Mar 31 19:27:09 2009 @@ -8,6 +8,7 @@ <!ENTITY concept SYSTEM "concept.xml"> <!ENTITY advanced SYSTEM "advanced.xml"> <!ENTITY widgets SYSTEM "widgets.xml"> +<!ENTITY cwm_table SYSTEM "cwm_table.xml"> <!ENTITY table_popup SYSTEM "table_popup.xml"> <!ENTITY dialog_tree SYSTEM "dialog_tree.xml"> <!ENTITY cwm_tab SYSTEM "cwm_tab.xml"> @@ -16,7 +17,7 @@ <!ENTITY terminology SYSTEM "terminology.xml"> <!ENTITY tutor SYSTEM "tutor.xml"> -<!ENTITY date "June 2003"> +<!ENTITY date "March 2009"> ]> <book id="cwm"> @@ -85,6 +86,7 @@ &concept; &advanced; &widgets; +&cwm_table; &table_popup; &dialog_tree; &cwm_tab; Added: trunk/yast2/library/cwm/doc/cwm_table.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/cwm_table.… ============================================================================== --- trunk/yast2/library/cwm/doc/cwm_table.xml (added) +++ trunk/yast2/library/cwm/doc/cwm_table.xml Tue Mar 31 19:27:09 2009 @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet href="/usr/share/xml/docbook/stylesheet/css/current/driver.css" type="text/css"?> +<chapter id="cwr_table"> + <title>CWM Table concept</title> + + <para> Table widget and manupulation with data in this widget need same + behavior across whole YaST. </para> + + <para> The CWM Table widget exists in order to make development of modules + using this UI concept consistent. It contains few most used buttons and few + automatic manipulation features. </para> + + <para> + The CWM Table widget allows Add/delete buttons, Edit button, + Up/down reorder buttons and custom button, which developer set to what they need. + Automatic edit action after double-click on table collumn. After reorder is still + selected same item, even if is moved. Reordering handlers is called only if cell really + can move in choosed direction. Whole table Enable/Disable and automatic enable/disable + reordering button on collums which doesn't allow move in that direction. + </para> + + + <section> + <title>Simple example for CWM Table</title> + + <para> This example show basic features of CWM table and also basic how + to use. </para> + + <example id="tw_basic"> + <title>Usage of the CWM Table widget - basic case</title> + + <screen> +{ + import "CWM"; + import "CWMTable"; + import "Popup"; + import "Wizard"; + + list<string> items = []; + integer counter =0; + + void redraw_table(list<string> values){ + list<term> table_items = maplist(string s, values, { + return `item(`id(s),s); + }); + UI::ChangeWidget(`id(`_tw_table),`Items, table_items); + } + + symbol add_handle(string key, map event){ + counter = counter +1; + items = add(items,sformat("item %1",counter)); + redraw_table(items); + return nil; + } + + symbol edit_handle(string key, map event){ + Popup::Warning("edit"); + return nil; + } + + symbol delete_handle(string key, map event){ + Popup::Warning("delete"); + return nil; + } + + symbol updown_handle(string key, map event, boolean up, integer index){ + integer second = up ? (index-1):(index+1); + y2milestone("updown with up %1 and index %2 and second %3",up,index,second); + string value = items[second]:""; + items[second] = items[index]:""; + items[index] = value; + redraw_table(items); + return nil; + } + + symbol custom_handle(string key, map event){ + Popup::Warning("Custom button"); + return nil; + } + + map<string,any> table = CWMTable::CreateTableDescr( + $[ + "add_delete_buttons" : true, + "edit_button" : true, + "up_down_buttons" : true, + "custom_button" : true, + "custom_button_name" : "Additional button", + "custom_handle" : custom_handle, + "header" : `header("id"), + "edit":edit_handle, + "delete":delete_handle, + "add" : add_handle, + "updown" : updown_handle, + ], + $[ + "help" : "", + ] + ); + + Wizard::CreateDialog(); + symbol ret = CWM::ShowAndRun($[ + "widget_names" : ["table"], + "widget_descr" : $[ "table" : table], + "contents" : `VBox("table"), + "caption" : "test" + ]); +} + + </screen> + </example> + + <section id="create_cwr_table"> + <title>Creating the table container </title> + + <para> For getting the initial map the function map<string,any> + CWMTable::CreateTableDescr () can be used. It takes as a parameters a map + specifying the attributes of the table and a map specifying additional + settings that will be merged to the description map (see below). + Currently supported attributes are: <itemizedlist> + <listitem id="add_delete_buttons"> + <para> "add_delete_buttons" : boolean - if the Add and Delete + buttons are wanted, set to true. If false, they will not be shown. + Default (if key not present) is true. </para> + </listitem> + + <listitem id="edit_button"> + <para> "edit_button" : boolean - if the Edit button is wanted, set + to true. If false, it will not be shown. Default (if key not + present) is true. </para> + </listitem> + + <listitem id="up_down_buttons"> + <para> "up_down_buttons" : boolean - if the Up and Down (reorder) + buttons are wanted, set to true. Otherwise, they will not be + shown. Default (if not present) is false. </para> + </listitem> + + <listitem id="custom_button"> + <para> "custom_button" : boolean - if the Custom button + are wanted, set to true. Otherwise, they will not be shown. + Default (if not present) is false. </para> + </listitem> + + <listitem id="custom_button_name"> + <para> "custom_button_name" : string - label for the Custom button. + Default (if not present) is "Custom button". </para> + </listitem> + + <listitem id="custom_handle"> + <para> "custom_handle" : symbol(string,map) - handler for the Custom button. + Default (if not present) is empty handler (do nothing). </para> + </listitem> + + <listitem id="add"> + <para> "add" : symbol(string,map) - handler for the Add button. + Default (if not present) is empty handler (do nothing). </para> + </listitem> + + <listitem id="delete"> + <para> "delete" : symbol(string,map) - handler for the Delete button. + Default (if not present) is empty handler (do nothing). </para> + </listitem> + + <listitem id="edit"> + <para> "edit" : symbol(string,map) - handler for the Edit button. + Default (if not present) is empty handler (do nothing). </para> + </listitem> + + <listitem id="updown"> + <para> "updown" : symbol(string,map, boolean, integer) - handler for the Updown button. + Extra parameters is boolean if button is Up button and index of selected table collumn. + Default (if not present) is empty handler (do nothing). </para> + </listitem> + + <listitem id="header"> + <para> "header" : term - header term for table. It is mandatory key for CWM Table. + Default (if not present) is nil and fail of widget. </para> + </listitem> + </itemizedlist> </para> + + <para> For id of the widgets related to the table see <xref + linkend="tw_events" />. </para> + </section> + + <section> + <title>Setting the widget map </title> + + <para> This is the same as for normal widgets. Set the keys + according to your needs. Only doesn't overwrite handle function, + as it make all handling stuff</para> + + </section> + + </section> + + <section id="tw_events"> + <title>Reserved UI events</title> + + <para> Some UI events (return values of UI::UserInput ()) are used + internally by the handling mechanism, and can't be used for other widgets. + </para> + + <para> The table widget contains following ids: <itemizedlist> + <listitem> + <para> `_tw_add - Add button - don't use although it is not present + </para> + </listitem> + + <listitem> + <para> `_tw_edit - Edit button </para> + </listitem> + + <listitem> + <para> `_tw_delete - Delete button - don't use although it is not + present </para> + </listitem> + + <listitem> + <para> `_tw_table - The table </para> + </listitem> + + <listitem> + <para> `_tw_up - The Up button </para> + </listitem> + + <listitem> + <para> `_tw_down - The Down button </para> + </listitem> + + <listitem> + <para> `_tw_custom - The Custom button </para> + </listitem> + </itemizedlist> </para> + + </section> +</chapter> + -- 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] r56515 - in /trunk/sound: agent-audio/src/AlsaAudio.cc package/yast2-sound.changes
by lslezak＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: lslezak Date: Tue Mar 31 19:03:28 2009 New Revision: 56515 URL: http://svn.opensuse.org/viewcvs/yast?rev=56515&view=rev Log: - improved logging in alsa-agent when a requested volume setting failed due to an unsupported operation (e.g. missing mute switch) Modified: trunk/sound/agent-audio/src/AlsaAudio.cc trunk/sound/package/yast2-sound.changes Modified: trunk/sound/agent-audio/src/AlsaAudio.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/agent-audio/src/AlsaAudio.… ============================================================================== --- trunk/sound/agent-audio/src/AlsaAudio.cc (original) +++ trunk/sound/agent-audio/src/AlsaAudio.cc Tue Mar 31 19:03:28 2009 @@ -77,18 +77,30 @@ // is it the required channel? if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_volume(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_volume(elem)) + { + y2warning("Channel %s has no volume control", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + snd_mixer_selem_get_playback_volume_range(elem, &from, &to); for (chn = (snd_mixer_selem_channel_id_t)0; - chn <= SND_MIXER_SCHN_LAST; - chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) - { + chn <= SND_MIXER_SCHN_LAST; + chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) + { if (!snd_mixer_selem_has_playback_channel(elem, chn)) - continue; - snd_mixer_selem_get_playback_volume(elem, chn, &left); + continue; + snd_mixer_selem_get_playback_volume(elem, chn, &left); if (to - from == 0) { @@ -98,7 +110,7 @@ value = (long long)(100.0 * ((double)(left - from) / (double)(to - from))); snd_mixer_close(handle); return YCPInteger(value); - } + } } } @@ -126,20 +138,31 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_switch(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { - for (chn = (snd_mixer_selem_channel_id_t)0; - chn <= SND_MIXER_SCHN_LAST; - chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) - { - // if ( - snd_mixer_selem_get_playback_switch(elem, chn, &left); + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_switch(elem)) + { + y2warning("Channel %s has no mute switch", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + for (chn = (snd_mixer_selem_channel_id_t)0; + chn <= SND_MIXER_SCHN_LAST; + chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) + { + snd_mixer_selem_get_playback_switch(elem, chn, &left); snd_mixer_close(handle); - return left ? YCPBoolean(false) : YCPBoolean(true); - } + return left ? YCPBoolean(false) : YCPBoolean(true); + } } } @@ -165,11 +188,23 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_volume(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { - snd_mixer_selem_get_playback_volume_range(elem, &from, &to); + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_volume(elem)) + { + y2warning("Channel %s has no volume control", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + snd_mixer_selem_get_playback_volume_range(elem, &from, &to); val = (long)( (double)(value * (to - from)) / 100.0 ); @@ -200,14 +235,26 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_switch(elem)) - { + && snd_mixer_selem_get_index(elem) == ch_index) + { + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_switch(elem)) + { + y2warning("Channel %s has no mute switch", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + snd_mixer_selem_set_playback_switch_all(elem, value ? 0 : 1); snd_mixer_close(handle); return YCPBoolean(true); - } + } } y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Mar 31 19:03:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 31 19:00:20 CEST 2009 - lslezak(a)suse.cz + +- improved logging in alsa-agent when a requested volume + setting failed due to an unsupported operation + (e.g. missing mute switch) + +------------------------------------------------------------------- Thu Mar 26 12:54:41 CET 2009 - lslezak(a)suse.cz - Use /etc/modprobe.d/50-sound.conf config file instead of -- 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] r56514 - in /trunk/storage/storage/src/include: ep-lvm-dialogs.ycp ep-lvm-lib.ycp
by kmachalkova＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: kmachalkova Date: Tue Mar 31 18:01:15 2009 New Revision: 56514 URL: http://svn.opensuse.org/viewcvs/yast?rev=56514&view=rev Log: Less talkative removal of logical volumes (#426907) Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Tue Mar 31 18:01:15 2009 @@ -79,8 +79,9 @@ //pop-up dialog title _("Confirm Deleting of Volume Group"), //pop-up dialog message part 1: %1 is vol.group name - sformat( _("The volume group \"%1\" contains at least one logical -volume. If you proceed, the following volumes will be deleted:"), vgname), + sformat( _("The volume group \"%1\" contains at least one logical volume. +If you proceed, the following volumes will be unmounted (if mounted) +and deleted:"), vgname), //pop-up dialog message part 2: %1 is vol.group name sformat( _("Really delete volume group \"%1\" and all related logical volumes?"), vgname) ); Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Tue Mar 31 18:01:15 2009 @@ -142,6 +142,7 @@ //how many of those we have? integer count = size(log_volumes); + boolean ret = false; boolean proceed = (count > 0) ? //non-empty VG - make sure user wants to delete all LVs ConfirmVgDelete(vgname, log_volumes) : @@ -150,33 +151,27 @@ if (proceed) { - foreach (string one_volume, log_volumes, { - if (!EpDeleteDevice(one_volume)) - { - proceed = false; - break; - } - }); + boolean recursive = Storage::GetRecursiveRemoval(); + Storage::SetRecursiveRemoval( true ); - if (proceed) + if (Storage::DeleteLvmVg(vgname)) { - if (Storage::DeleteLvmVg(vgname)) - { - UpdateMainStatus(); - UpdateNavigationTree(`lvm); - TreePanel::Create(); - } - return true; + UpdateMainStatus(); + UpdateNavigationTree(`lvm); + TreePanel::Create(); + ret = true; } else { Popup::Error( sformat(_("Deleting volume group \"%1\" failed."), vgname)); //FIXME: some rollback? - return false; + ret = false; } + + Storage::SetRecursiveRemoval( recursive ); } - else - return false; + + return ret; } -- 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] r56513 - in /trunk/yast2/library/cwm/src: CWMTable.ycp Makefile.am
by jreidinger＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: jreidinger Date: Tue Mar 31 17:29:40 2009 New Revision: 56513 URL: http://svn.opensuse.org/viewcvs/yast?rev=56513&view=rev Log: add unified CWMTable widget, which servers basic behavior of table with manipulation buttons Added: trunk/yast2/library/cwm/src/CWMTable.ycp Modified: trunk/yast2/library/cwm/src/Makefile.am Added: trunk/yast2/library/cwm/src/CWMTable.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMTable.y… ============================================================================== --- trunk/yast2/library/cwm/src/CWMTable.ycp (added) +++ trunk/yast2/library/cwm/src/CWMTable.ycp Tue Mar 31 17:29:40 2009 @@ -0,0 +1,372 @@ +/** + * File: modules/CWMTable.ycp + * Package: Table dialogs backend + * Summary: Routines for Unified Table widget + * Authors: Josef Reidinger <jreidinger(a)suse.cz> + * + * $Id: CWMTable.ycp + * + */ + +{ + + module "CWMTable"; + textdomain "base"; + + import "CWM"; + import "Label"; + import "Mode"; + import "Report"; + + +// local functions + +/** + * Validate table options specifyign attributesA + * @param attr a map of table attributes + * @return boolean true if validation succeeded + */ +boolean ValidateTableAttr (map<string,any> attr) { + map<string,string> types = $[ + "add_delete_buttons" : "boolean", + "edit_button" : "boolean", + "up_down_buttons" : "boolean", + "custom_button" : "boolean", + "custom_button_name" : "string", + "custom_handle" :"symbol(string,map)", + "header" : "term", + "add" : "symbol(string,map)", + "edit" : "symbol(string,map)", + "delete" : "symbol(string,map)", + "updown" : "symbol(string,map,boolean)", + ]; + boolean ret = true; + foreach (string k, any v, attr, { + string type = (string)types[k]:nil; + if (type == nil) + { + y2error ("Unknown attribute %1", k); + ret = false; + } + else + { + ret = CWM::ValidateBasicType (v, type) && ret; + } + }); + return ret; +} + + +/** + * Validate type of entry of the option description map + * Also checks option description maps if present + * @param key string key of the map entry + * @param value any value of the map entry + * @param widget any name of the widget/option + * @param popup boolean true if is option of a popup + * @return boolean true if validation succeeded + */ +boolean ValidateValueType (string key, any value, string widget) { + boolean success = true; + if (key == "help") + success = is (value, string); + + if (! success) + y2error ("Wrong type of option %1 in description map of %2", + key, widget); + + return success; +} + +/** + * Validate the table description + * @param descr a map containing the table description + * @return boolean true if validation succeeded + */ +boolean ValidateTableDescr (string key, map<string,any> descr) { + boolean ret = true; + foreach (string k, any v, descr, { + ret = ValidateValueType (k, v, key) && ret; + }); + return ret; +} + +string getItemId(term ter){ + list<any> args = (list<any>)argsof(ter); + args = filter(any t, args, { + if (is(t,term) && (symbolof((term)t)==`id)) + return true; + return false; + }); + list<term>targs = (list<term>)args; + if (size(targs)==1){ + return ((list<string>)argsof(targs[0]:nil))[0]:nil; + } + return nil; + } + + /** + * Enable or disable the Delete and up/down buttons + * @param descr map table description map + * @param opt_descr map selected option description map + */ + void updateButtons (map<string,any> descr ) { + y2milestone("update buttons"); + string id = (string)UI::QueryWidget (`id(`_tw_table), `CurrentItem); + list<term> item_list = (list<term>)UI::QueryWidget (`id(`_tw_table), `Items); + integer index = -1; + integer counter = 0; + integer max = item_list == nil ? 0 : size(item_list)-1; + foreach(term t, item_list, { + if (getItemId(t)==id) + index = counter; + counter=counter+1; + }); + if (descr["_cwm_attrib", "up_down_buttons"]:false) + { + if (max < 1 || index==-1){ + y2milestone("short list"); + UI::ChangeWidget (`id (`_tw_up), `Enabled,false); + UI::ChangeWidget (`id (`_tw_down), `Enabled,false); + } else { + if ( index ==0){ + y2milestone("first item"); + UI::ChangeWidget (`id (`_tw_up), `Enabled, false); + UI::ChangeWidget (`id (`_tw_down), `Enabled, true); + } else if ( index == max){ + y2milestone("last item"); + UI::ChangeWidget (`id (`_tw_up), `Enabled, true); + UI::ChangeWidget (`id (`_tw_down), `Enabled, false); + } else { + UI::ChangeWidget (`id (`_tw_up), `Enabled, true); + UI::ChangeWidget (`id (`_tw_down), `Enabled, true); + } + } + } else { + UI::ChangeWidget (`id (`_tw_up), `Enabled,false); + UI::ChangeWidget (`id (`_tw_down), `Enabled,false); + } + } + +// functions + + + /** + * Initialize the displayed table + * @param descr map description map of the whole table + * @param key table widget key + */ + global define void TableInit (map<string, any> descr, string key) ``{ + descr["_cwm_key"] = key; + } + + /** + * Handle the event that happened on the table + * @param descr map description of the table + * @param key table widget key + * @param event_descr map event to handle + * @return symbol modified event if needed + */ + symbol TableHandle (map<string, any> descr, string key, map event_descr) { + any event_id = event_descr["ID"]:nil; + map<string,any> attrib = descr["_cwm_attrib"]:$[]; + symbol ret = nil; + if (event_id == `_tw_table) + { + if (event_descr["EventReason"]:"" == "Activated" + && event_descr["EventType"]:"" == "WidgetEvent" + && UI::WidgetExists (`id (`_tw_edit))) + { + event_id = `_tw_edit; + } + } + if (event_id == `_tw_edit) + { + symbol(string,map) edit_handle = (symbol(string,map))attrib["edit"]:nil; + if (edit_handle != nil){ + ret = edit_handle(key,event_descr); + } + } else if (event_id == `_tw_add) + { + symbol(string,map) add_handle = (symbol(string,map))attrib["add"]:nil; + if (add_handle != nil){ + ret = add_handle(key,event_descr); + } + } + else if (event_id == `_tw_delete) + { + symbol(string,map) delete_handle = (symbol(string,map))attrib["delete"]:nil; + if (delete_handle != nil){ + ret = delete_handle(key,event_descr); + } + } + else if (event_id == `_tw_custom) + { + symbol(string,map) custom_handle = (symbol(string,map))attrib["custom_handle"]:nil; + if (custom_handle != nil){ + ret = custom_handle(key,event_descr); + } + } + else if (event_id == `_tw_up || event_id == `_tw_down) + { + boolean up = event_id==`_tw_up; + string id = (string)UI::QueryWidget (`id(`_tw_table), `CurrentItem); + list<term> item_list = (list<term>)UI::QueryWidget (`id(`_tw_table), `Items); + integer index = -1; + integer counter = 0; + foreach(term t, item_list, { + if (getItemId(t)==id) + index = counter; + counter=counter+1; + }); + symbol(string,map,boolean,integer) updown_handle = (symbol(string,map,boolean,integer))attrib["updown"]:nil; + if (updown_handle != nil && + !(index==0 && up) && + !(index==size(item_list)-1 && !up)){ + ret = updown_handle(key,event_descr,up,index); + if (ret == nil){ + UI::ChangeWidget(`id(`_tw_table), `CurrentItem, id); + } + } + } + updateButtons (descr); + return ret; + } + + /** + * Disable whole table + * @param descr map table widget description map + */ + global define void DisableTable (map<string,any> descr) ``{ + UI::ChangeWidget (`id (`_tw_table), `Enabled, false); + if (descr["_cwm_attrib", "edit_button"]:true) + { + UI::ChangeWidget (`id (`_tw_edit), `Enabled, false); + } + if (descr["_cwm_attrib", "add_delete_buttons"]:true) + { + UI::ChangeWidget (`id (`_tw_delete), `Enabled, false); + UI::ChangeWidget (`id (`_tw_add), `Enabled, false); + } + if (descr["_cwm_attrib", "up_down_buttons"]:false) + { + UI::ChangeWidget (`id (`_tw_up), `Enabled, false); + UI::ChangeWidget (`id (`_tw_down), `Enabled, false); + } + if (descr["_cwm_attrib", "custom_button"]:false) + { + UI::ChangeWidget (`id (`_tw_custom), `Enabled, false); + } + } + + /** + * Enable whole table (except buttons that should be grayed according to + * currently selected table row + * @param descr map table widget description map + */ + global define void EnableTable (map<string, any> descr) ``{ + UI::ChangeWidget (`id (`_tw_table), `Enabled, true); + if (descr["_cwm_attrib", "edit_button"]:true) + { + UI::ChangeWidget (`id (`_tw_edit), `Enabled, true); + } + if (descr["_cwm_attrib", "add_delete_buttons"]:true) + { + UI::ChangeWidget (`id (`_tw_add), `Enabled, true); + } + if (descr["_cwm_attrib", "custom_button"]:false) + { + UI::ChangeWidget (`id (`_tw_custom), `Enabled, true); + } + TableHandle(descr,"",$[]); + } + /** + * Wrapper for TableInit using CWM::GetProcessedWidget () for getting + * widget description map + * @param key any widget key + */ + global define void TableInitWrapper (string key) ``{ + TableInit (CWM::GetProcessedWidget (), key); + } + + /** + * Wrapper for TableHandle using CWM::GetProcessedWidget () for getting + * widget description map + * @param key any widget key + * @param event_descr map event description map + * @return symbol return value for wizard sequencer or nil + */ + global define symbol TableHandleWrapper (string key, map event_descr) ``{ + return TableHandle(CWM::GetProcessedWidget (), key, event_descr); + } + + /** + * Get the map with the table widget + * @param attrib map table attributes + * @param widget_descr map widget description map of the table, will be + * unioned with the generated map + * @return map table widget + */ + global define map<string,any> CreateTableDescr (map<string,any> attrib, map<string,any> widget_descr) ``{ + ValidateTableAttr (attrib); + term add_button = attrib["add_delete_buttons"]:true + ? `PushButton (`id (`_tw_add), `opt (`key_F3,`notify), Label::AddButton ()) + : `HSpacing (0); + term edit_button = attrib["edit_button"]:true + ? `PushButton (`id (`_tw_edit), `opt (`key_F4,`notify), Label::EditButton ()) + : `HSpacing (0); + term delete_button = attrib["add_delete_buttons"]:true + ? `PushButton (`id (`_tw_delete), `opt (`key_F5,`notify), Label::DeleteButton ()) + : `HSpacing (0); + term table_header = (term)attrib["header"]:nil; + + term custom_button = attrib["custom_button"]:false + ? `PushButton (`id (`_tw_custom), `opt (`notify), attrib["custom_button_name"]:"Custom button") + : `HSpacing (0); + + term up_down = attrib["up_down_buttons"]:false + ? `VBox ( + `VStretch (), + // push button + `PushButton (`id (`_tw_up), `opt(`notify,`immediate), _("&Up")), + // push button + `PushButton (`id (`_tw_down), `opt(`notify,`immediate), _("&Down")), + `VStretch () + ) + : `HSpacing (0); + + map<string,any> ret = (map<string,any>)union ($[ + "custom_widget" : (`HBox (`HSpacing (2), `VBox ( + `HBox ( + `Table (`id (`_tw_table), + `opt (`immediate, `notify,`keepSorting), + table_header, + []), + up_down + ), + `HBox ( + add_button, + edit_button, + delete_button, + `HStretch (), + custom_button + ) + ), `HSpacing (2))), + "_cwm_attrib" : attrib, + "widget" : `custom, + "_cwm_do_validate" : ValidateTableDescr, + ], widget_descr); + + if (! haskey (ret, "init")) + { + ret["init"] = CWMTable::TableInitWrapper; + } + if (! haskey (ret, "handle")) + { + ret["handle"] = CWMTable::TableHandleWrapper; + } + + return ret; + } + +} Modified: trunk/yast2/library/cwm/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/Makefile.a… ============================================================================== --- trunk/yast2/library/cwm/src/Makefile.am (original) +++ trunk/yast2/library/cwm/src/Makefile.am Tue Mar 31 17:29:40 2009 @@ -7,6 +7,7 @@ TablePopup.ycp \ DialogTree.ycp \ CWMTab.ycp \ + CWMTable.ycp \ CWMServiceStart.ycp \ CWMTsigKeys.ycp \ WizardHW.ycp -- 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] r56512 - /trunk/storage/storage/src/modules/Storage.ycp
by locilka＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: locilka Date: Tue Mar 31 17:21:56 2009 New Revision: 56512 URL: http://svn.opensuse.org/viewcvs/yast?rev=56512&view=rev Log: Added some FIXMEs where needed Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Mar 31 17:21:56 2009 @@ -3731,7 +3731,12 @@ /** * Reads and returns fstab from directory * + * FIXME: please, add description of the list that is returned by this function. + * + * @struct [...unknown...] + * * @param string directory + * @return list fstab? */ global list ReadFstab( string dir ) { @@ -3762,6 +3767,9 @@ } +/** + * FIXME: please, add description of the list that is returned by this function. + */ global list<map> GetCommitInfos() { list<any> infos = []; @@ -3820,6 +3828,7 @@ /** * GetMountPoints() * collect mountpoint:device as map to get a sorted list + * * @returns: map of lists, the map key is the mount point, * usually starting with a "/". Exception is "swap" * For directory mount points (key starting with /) the value @@ -3827,6 +3836,10 @@ * For swap mount points, the value is a list of lists: * [[partitionName, fsid, targetdevice, raid_type], ...] * + * FIXME: please, add more detailed description of the 'map of lists' + * with examples if possible. + * + * @struct $[ [...], [...], ... ] */ global define map GetMountPoints() ``{ -- 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] r56511 - in /trunk: country/ country/package/ country/timezone/src/ ntp-client/ ntp-client/package/ ntp-client/src/
by mvidner＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: mvidner Date: Tue Mar 31 17:21:51 2009 New Revision: 56511 URL: http://svn.opensuse.org/viewcvs/yast?rev=56511&view=rev Log: Moved more code dealing with NTP setup from yast2-country to yast2-ntp-client to make the API less fragile (bnc#483787). Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp trunk/country/yast2-country.spec.in trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=56511&r1=565… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Mar 31 17:21:51 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Mar 31 17:21:51 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 31 16:52:04 CEST 2009 - mvidner(a)suse.cz + +- Moved more code dealing with NTP setup from yast2-country + to yast2-ntp-client to make the API less fragile (bnc#483787). +- 2.18.3 + +------------------------------------------------------------------- Wed Feb 25 19:22:48 CET 2009 - jsuchome(a)suse.cz - install language dependent packages in firstboot (bnc#479553) Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Mar 31 17:21:51 2009 @@ -66,23 +66,51 @@ UI::ChangeWidget(`id(`date), `Value, Timezone::GetDateTime (really, false)); }; + + // handles the complication that the package yast2-ntp-client may not be present + any ntp_call(string acall, map<string,any> args) { + if (!ntp_installed) { + // replace "replace_point" by the widgets + if (acall == "ui_init") + return false; // deselect the RB + // the help text + else if (acall == "ui_help_text") + return ""; // or say "will install"? TODO recompute help text + // save settings, return false if dialog should not exit + else if (acall == "ui_try_save") + return true; // success, exit loop + // Service::Enabled. FIXME too smart? + else if (acall == "GetNTPEnabled") + return false; + + // default: do nothing + return nil; + /* + other API for completeness: + // before UserInput + else if (acall == "ui_enable_disable_widgets") + else if (acall == "SetUseNTP") + else if (acall == "Write") + */ + } + + any ret = WFM::CallFunction ("ntp-client_proposal", [ acall, args ]); + return ret; + } + /** * Dialog for setinge system date and time * @return true if user changed the time (dialog accepted) */ define boolean SetTimeDialog() { + string ntp_help_text = (string) ntp_call("ui_help_text", $[]); // help text for set time dialog string htext = _("<p>The current system time and date are displayed. If required change them to the correct values manually, or use Network Time Protocol (NTP).</p>") + + // help text, cont. + _("<p>Press <b>Accept</b> to save your changes.</p>") + - // help text, cont. - _("<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>") + - - // help text, cont. - _("<p>Using the <b>Configure</b> button, open the advanced NTP configuration. Press <b>Accept</b> to save your changes.</p>") + - - // help text, cont. - _("<p>Synchronization with the NTP server can be done only when the network is configured.</p>"); + ntp_help_text; boolean dt_widgets = false; @@ -168,40 +196,8 @@ dt_widgets = true; } - boolean ntp_was_used = false; - - void enable_disable_widgets () { - UI::ChangeWidget (`id (`ntp_address), `Enabled, ntp_used); - UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used); - UI::ChangeWidget (`id (`ntp_now), `Enabled, ntp_used); - UI::ChangeWidget (`id (`ntp_save), `Enabled, ntp_used); - } - - void handle_invalid_hostname( string server ) { - // translators: error popup - Popup::Error( sformat(_("Invalid NTP server hostname %1"), server) ); - } - - // param: when asking for first time, we check if service is running - void CreateUI (boolean first_time) { - WFM::CallFunction("ntp-client_proposal", ["CreateUI"]); - if (first_time && !Stage::initial ()) - ntp_used = (boolean) - WFM::CallFunction("ntp-client_proposal", ["GetNTPEnabled"]); - else - ntp_used = (boolean) - WFM::CallFunction("ntp-client_proposal", ["GetUseNTP"]); - if ( UI::WidgetExists(`id(`ntp_content)) ) - { - UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_used ? `ntp : `manual)); - enable_disable_widgets (); - if (first_time) - // ntp_used with first_time means that ntp service is enabled - UI::ChangeWidget (`id(`ntp_save), `Value, ntp_used); - } - } term cont = `HBox ( `HWeight (1, `VBox ()), @@ -218,29 +214,28 @@ ) ), `VSpacing (1), - `VBox (`id(`ntp_content), - `Left (`RadioButton (`id (`ntp), `opt (`notify), - // radio button label - _("Synchronize with NTP Server"), false) - ), - `ReplacePoint(`id(`rp), `Empty()) - ) + `Left (`RadioButton (`id (`ntp), `opt (`notify), + // radio button label + _("Synchronize with NTP Server"), false) + ), + `ReplacePoint(`id(`rp), `Empty()) ))), `HWeight (1, `VBox ()) ); Wizard::OpenAcceptDialog (); + // TODO replace help text after ntp_installed, is. Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true); Wizard::SetDesktopIcon("timezone"); show_current_time (); - if (ntp_installed) { - CreateUI (true); - ntp_was_used = ntp_used; - if (ntp_used) - WFM::CallFunction ("ntp-client_proposal", [ "MakeProposal", - $[ "country" : Language::GetLanguageCountry() ] ]); - } + + boolean ntp_rb = false; + ntp_rb = (boolean) ntp_call ("ui_init", $[ + "replace_point": `id (`rp), + "country" : Language::GetLanguageCountry(), + /*WTF*/"first_time" : true ]); + UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_rb ? `ntp : `manual)); if (!dt_widgets) { @@ -255,71 +250,50 @@ any ret = nil; repeat { + ntp_call ("ui_enable_disable_widgets", $["enabled": ntp_rb]); + ret = UI::UserInput(); y2debug ("UserInput ret:%1", ret ); + + symbol ntp_handled = (symbol) ntp_call ("ui_handle", $["ui": ret]); + if (ntp_handled != nil) { + ret = ntp_handled; + } + if (ret == `redraw) + show_current_time (); + if (ret == `ntp || ret == `manual) { - ntp_used = (ret == `ntp); - if (ntp_used && !Stage::initial () && !ntp_installed) + ntp_rb = (ret == `ntp); + // need to install it first? + if (ntp_rb && !Stage::initial () && !ntp_installed) { ntp_installed = Package::Install ("yast2-ntp-client"); + // succeeded? create UI, otherwise revert the click if (!ntp_installed) { - ntp_used = false; - UI::ChangeWidget (`id (`manual), `Value, true); - UI::ChangeWidget (`id (`ntp), `Value, false); + ntp_rb = false; + UI::ChangeWidget (`id(`rb), `CurrentButton, `manual); } else - CreateUI (false); - } - if (ntp_used ) - { - WFM::CallFunction("ntp-client_proposal", [ "MakeProposal", $[ - "country" : Language::GetLanguageCountry() ] ] - ); - } - enable_disable_widgets (); - } - if (ret == `ntp_configure) - { - symbol rv = (symbol) WFM::CallFunction ("ntp-client_proposal", ["AskUser"]); - if( rv == `invalid_hostname) - { - handle_invalid_hostname ( - (string) UI::QueryWidget (`id (`ntp_address), `Value)); - ret = `retry; - continue; - } - if (rv != `next) - continue; - else if (!Stage::initial ()) - { - // show the 'save' status after configuration - boolean enabled = (boolean) - WFM::CallFunction("ntp-client_proposal", ["GetNTPEnabled"]); - UI::ChangeWidget (`id(`ntp_save), `Value, enabled); + { + // ignore retval, user clicked to use ntp + ntp_call ("ui_init", $[ + "replace_point": `id (`rp), + "country" : Language::GetLanguageCountry(), + "first_time" : false ]); + } } } - if (ret == `ntp_now) + + if (ret == `accept && ntp_rb) { - map argmap = $[ - "ntpdate_only" : true - ]; - symbol rv = (symbol) WFM::CallFunction ("ntp-client_proposal", - ["Write", argmap]); - if( rv == `invalid_hostname) - { - handle_invalid_hostname ( - (string) UI::QueryWidget (`id (`ntp_address), `Value)); - ret = `retry; - continue; - } - if (rv == `success) - { - show_current_time (); - } + // true: go on, exit; false: loop on + boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]); + if (!ntp_handled) + ret = `retry; // loop on } - if (ret == `accept && !ntp_used) + if (ret == `accept && !ntp_rb) { if (dt_widgets) { @@ -367,54 +341,18 @@ { Timezone::SetTime( year, month, day, hour, minute, second ); } -// if (ntp_was_used) FIXME remove NTP config now? - } - if (ret == `accept && ntp_used) - { - map argmap = $[]; - if (UI::QueryWidget (`id (`ntp_save), `Value) == false) - argmap["ntpdate_only"] = true; - symbol rv = (symbol) WFM::CallFunction ("ntp-client_proposal", - ["Write", argmap]); - - string server = (string) UI::QueryWidget (`id(`ntp_address),`Value); - - if (rv == `invalid_hostname) - { - handle_invalid_hostname( server ); - ret = `retry; - continue; - } - else if ( rv == `ntpdate_failed) - { - // Translators: yes-no popup, - // ntpdate is a command, %1 is the server address - if (Popup::YesNo( sformat(_("'ntpdate %1' failed. Revisit NTP server configuration?"), server) )) - { - ret = `retry; - continue; - } - else - { - ntp_used = false; - UI::ChangeWidget (`id(`rb), `CurrentButton, `manual); - } - } - else - { - // new system time from ntpdate must be saved to hw clock - Timezone::SystemTime2HWClock (); - } } } until( ret==`accept || ret==`cancel ); - if (ret == `accept && ntp_installed) + if (ret == `accept) { - ntp_used = (UI::QueryWidget (`id(`rb), `Value) == `ntp) && - (UI::QueryWidget (`id(`ntp_save), `Value) == true); - WFM::CallFunction("ntp-client_proposal", [ "SetUseNTP", $["ntp_used" : ntp_used] ]); + // new system time from ntpdate must be saved to hw clock + Timezone::SystemTime2HWClock (); + // remember ui + ntp_call ("SetUseNTP", $["ntp_used" : ntp_rb]); } + Wizard::CloseDialog (); return (ret == `accept); }; @@ -501,7 +439,7 @@ // configure NTP client srandom (); string server = sformat ("%1.opensuse.pool.ntp.org", random (4)); - map argmap = $[ + map<string, any> argmap = $[ "server" : server, // FIXME ntp-client_proposal doesn't understand 'servers' yet "servers" : [ @@ -511,8 +449,7 @@ "3.opensuse.pool.ntp.org", ], ]; - symbol rv = (symbol) - WFM::CallFunction ("ntp-client_proposal", ["Write", argmap]); + symbol rv = (symbol) ntp_call ("Write", argmap); if (rv == `invalid_hostname) { y2warning ("Invalid NTP server hostname %1", server); @@ -522,8 +459,7 @@ { Timezone::SystemTime2HWClock (); y2milestone ("proposing NTP server %1", server); - WFM::CallFunction ("ntp-client_proposal", - [ "SetUseNTP", $["ntp_used" : ntp_used] ]); + ntp_call ("SetUseNTP", $["ntp_used" : ntp_used]); } } else if (Stage::initial ()) @@ -531,9 +467,10 @@ // from installation summaru ntp_used = Timezone::ntp_used; } - else if (ntp_installed) - ntp_used = (boolean) - WFM::CallFunction ("ntp-client_proposal", ["GetNTPEnabled"]); + else if (ntp_installed) { + ntp_used = (boolean) ntp_call ("GetNTPEnabled", $[]); + ntp_used = ntp_used == true; // nil->false, just in case of parse error + } string time_frame_label = // frame label Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?re… ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Tue Mar 31 17:21:51 2009 @@ -9,6 +9,8 @@ Requires: yast2-pkg-bindings >= 2.15.3 # IconPath support for MultiSelectionBox Requires: yast2-core >= 2.16.28 +# new API of ntp-client_proposal.ycp +Conflicts: yast2-ntp-client < 2.18.0 Requires: yast2-country-data Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=56511&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Tue Mar 31 17:21:51 2009 @@ -1 +1 @@ -2.17.14 +2.18.0 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Tue Mar 31 17:21:51 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 31 16:52:04 CEST 2009 - mvidner(a)suse.cz + +- Moved more code dealing with NTP setup from yast2-country + to yast2-ntp-client to make the API less fragile (bnc#483787). +- 2.18.0 + +------------------------------------------------------------------- Tue Mar 17 14:01:57 CET 2009 - mvidner(a)suse.cz - Do not pop up with questions in CLI mode (bnc#456553). Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Tue Mar 31 17:21:51 2009 @@ -21,10 +21,7 @@ import "Popup"; import "Progress"; import "Report"; - -y2milestone("----------------------------------------"); -y2milestone("Ntp client proposal started"); -y2milestone("Arguments: %1", WFM::Args()); +import "Wizard"; /* API: @@ -32,12 +29,9 @@ Usual *_proposal functions: MakeProposal, AskUser, Write. (but not Description; see, it just *looks* like *_proposal) Additionally: - CreateUI (thick and fragile interface, grr) GetNTPEnabled (queries Service::Enabled) - GetUseNTP (queries NtpClient::ntp_selected, just a storage for the caller) SetUseNTP [ntp_used] */ - any ret = nil; string func = ""; map param = $[]; @@ -48,7 +42,69 @@ param = (map)WFM::Args(1); } -void ProposeSomething() + +string ui_help_text() { + // help text + return _("<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>") + + + // help text, cont. + _("<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>") + + + // help text, cont. + _("<p>Synchronization with the NTP server can be done only when the network is configured.</p>"); +} + +// FIXME must go to module to preserve value +boolean ntp_was_used = false; + +void ui_enable_disable_widgets (boolean enabled) { + UI::ChangeWidget (`id (`ntp_address), `Enabled, enabled); + UI::ChangeWidget (`id (`ntp_now), `Enabled, enabled); + UI::ChangeWidget (`id (`ntp_save), `Enabled, enabled); + if (UI::WidgetExists (`id (`ntp_configure))) // bnc#483787 + UI::ChangeWidget (`id (`ntp_configure), `Enabled, enabled); +} + +void handle_invalid_hostname( string server ) { + // translators: error popup + Popup::Error( sformat(_("Invalid NTP server hostname %1"), server) ); +} + +boolean GetNTPEnabled () { + return Service::Enabled (NtpClient::service_name); +} + +boolean ValidateSingleServer( string ntp_server ) +{ + if (!Address::Check(ntp_server) ) + { + UI::SetFocus(`id(`ntp_address)); + return false; + } + + return true; +} + +void AddSingleServer( string server ) +{ + + integer idx = NtpClient::findSyncRecord("server", server); + + // -1 means adding new server + if (idx == -1) + { + NtpClient::selected_record["address"] = server; + NtpClient::selected_record["type"] = "server"; + } + else + NtpClient::selectSyncRecord(idx); + + NtpClient::storeSyncRecord(); +} + + +// @param cc country code +void MakeProposal(string cc) { list ntp_items = []; @@ -74,116 +130,93 @@ // avoid calling Read again (bnc #427712) NtpClient::config_has_been_read = true; } +/* + FIXME: does MakeProposal have sense? + would it have sense if implemented properly? +real proposal starts here, it is ui_read before... +*/ + if( ntp_items == []) { - string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); y2milestone("Nothing found in /etc/ntp.conf, proposing current language-based NTP server list"); ntp_items = NtpClient::GetNtpServersByCountry( cc, true ); NtpClient::config_has_been_read = true; } ntp_items = add(ntp_items, ""); UI::ChangeWidget(`id(`ntp_address), `Items, ntp_items); - -} - -void AddSingleServer( string server ) -{ - - integer idx = NtpClient::findSyncRecord("server", server); - - // -1 means adding new server - if (idx == -1) - { - NtpClient::selected_record["address"] = server; - NtpClient::selected_record["type"] = "server"; - } - else - NtpClient::selectSyncRecord(idx); - - NtpClient::storeSyncRecord(); } -boolean ValidateSingleServer( string ntp_server ) -{ - if (!Address::Check(ntp_server) ) - { - UI::SetFocus(`id(`ntp_address)); - return false; - } - - return true; -} - -if (func == "CreateUI") -{ +/** +@param first_time when asking for first time, we check if service is running +@return should our radio button be selected +*/ +boolean ui_init(term rp, string country, boolean first_time) { term cont = `VBox (`VSpacing (0.5), `HBox ( `HSpacing (3), `HWeight (1, `VBox ( `Left (`ComboBox (`id (`ntp_address), `opt (`editable, `hstretch), // combo box label - _("NTP Server Address") + _("&NTP Server Address") )), `VSpacing (0.3), `HBox ( `HSpacing (0.5), // check box label - `Left (`CheckBox (`id (`ntp_save), _("Save NTP Configuration"))) + `Left (`CheckBox (`id (`ntp_save), _("&Save NTP Configuration"))) ) )), `HWeight (1, `VBox ( - `Label (""), + `Label (""), `VSpacing (0.3), // try to line up the widgets horizontally - // push button label - `Left (`PushButton (`id (`ntp_now), _("Synchronize now"))), + // push button label + `Left (`PushButton (`id (`ntp_now), _("S&ynchronize now"))), `VSpacing (0.3), - // push button label + // push button label // bnc#449615: only simple config for inst-sys - Stage::initial() ? `Label("") : `Left (`PushButton (`id (`ntp_configure), _("Configure..."))) + Stage::initial() ? `Label("") : `Left (`PushButton (`id (`ntp_configure), _("&Configure..."))) )) )); - if (UI::WidgetExists(`id(`rp))) - { - UI::ReplaceWidget(`id(`rp), cont); - - if (!NetworkService::isNetworkRunning()) - { - y2warning("Network is not running, NTP synchronization will not be available"); - UI::ChangeWidget(`id(`ntp_content), `Enabled, false); - } - } + UI::ReplaceWidget(rp, cont); - ret = true; -} + if (!NetworkService::isNetworkRunning()) + { + y2warning("Network is not running, NTP synchronization will not be available"); + UI::ChangeWidget(`id(`ntp_content), `Enabled, false); // FIXME it is outside + } -else if (func == "GetNTPEnabled") -{ - ret = Service::Enabled (NtpClient::service_name); -} +// ^ createui0 + // FIXME is it correct? move out? + boolean ntp_used = (first_time && !Stage::initial ()) ? + GetNTPEnabled () : NtpClient::ntp_selected; -else if (func == "GetUseNTP") -{ - /* - if (param["first_time"]:false && !Stage::initial ()) - { - ret = Service::Enabled (NtpClient::service_name); - } - else - */ - ret = NtpClient::ntp_selected; -} + if (first_time) + // ntp_used with first_time means that ntp service is enabled + UI::ChangeWidget (`id(`ntp_save), `Value, ntp_used); -else if (func == "SetUseNTP") -{ - NtpClient::ntp_selected = param["ntp_used"]:false; - ret = true; + // ntp_was_used = ntp_used; + if (ntp_used) + MakeProposal (country); + return ntp_used; } -else if (func == "MakeProposal") -{ - ProposeSomething(); - ret = true; +symbol AskUser () { + symbol ret = nil; + string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + if ( !ValidateSingleServer( ntp_server ) ) + ret = `invalid_hostname; + else + { + string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + AddSingleServer(ntp_server); + boolean retval = (boolean) WFM::CallFunction("ntp-client"); + if (retval) + ret = `next; + string cc = NtpClient::GetCurrentLanguageCode(); + MakeProposal(cc); + } + return ret; } /* @@ -192,100 +225,194 @@ servers (intended to use all of opensuse.pool.ntp.org, but I did not have time to make it work) ntpdate_only (TODO rename to onetime) +return: + `success, `invalid_hostname or `ntpdate_failed */ -else if (func == "Write") -{ +symbol Write(map param) { + symbol ret = nil; string ntp_server = param["server"]:""; if (ntp_server == "") // get the value from UI only when it wasn't given as a parameter ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + if ( !ValidateSingleServer( ntp_server ) ) + return `invalid_hostname; // One-time adjusment without running the ntp daemon // Meanwhile, ntpdate was replaced by sntp boolean ntpdate_only = param["ntpdate_only"]:false; - if ( !ValidateSingleServer( ntp_server ) ) - ret = `invalid_hostname; - else + string required_package = "ntp"; + + //In 1st stage, schedule packages for installation + //but not in case user wants to set the time only (F#302917) + //(ntpdate is in inst-sys so we don't need the package) + if (Stage::initial() && !ntpdate_only) { - string required_package = "ntp"; + import "Packages"; + Packages::addAdditionalPackage(required_package); + // bugzilla #327050 + // Agent for writing /etc/ntp.conf needs to be installed + // to write the settings at the end of the installation + Packages::addAdditionalPackage("yast2-ntp-client"); + } + //Otherwise, prompt user for confirming pkg installation + else if (!Stage::initial ()) + { + if (!PackageSystem::CheckAndInstallPackages([ required_package ])) + { + Report::Error(sformat( _("Synchronization with NTP server is not possible +without having package %1 installed"), required_package)); + } + } - //In 1st stage, schedule packages for installation - //but not in case user wants to set the time only (F#302917) - //(ntpdate is in inst-sys so we don't need the package) - if (Stage::initial() && !ntpdate_only) + Popup::ShowFeedback("", _("Synchronizing with NTP server...")); + + y2milestone("Running sntp to sync with %1", ntp_server); + + // -r: do set the system time + // -P no: do not ask if time difference is too large + // -c 1 -d 15: delay 15s, only one try (bnc#442287) + integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/sntp -c 1 -d 15 -r -P no '%1'", String::Quote(ntp_server))); + y2milestone ("'sntp %1' returned %2", ntp_server, r); + + Popup::ClearFeedback(); + + if (r != 0) + return `ntpdate_failed; + + // User wants to more than running sntp (synchronize on boot) + if (!ntpdate_only) + { + NtpClient::modified = true; + AddSingleServer(ntp_server); + + //OK, so we stored the server address + //In inst-sys we don't need to care further + //ntp-client_finish will do the job + //In installed system we must write the settings + if (!Stage::initial()) { + Wizard::OpenAcceptDialog(); // FIXME so that the progress does not disturb the dialog to be returned to + NtpClient::Write(); + Wizard::CloseDialog(); + } + } + + return `success; +} + +// ui = UI::UserInput +symbol ui_handle(any ui) { + boolean redraw = false; + if (ui == `ntp_configure) + { + symbol rv = AskUser (); + if( rv == `invalid_hostname) { - import "Packages"; - Packages::addAdditionalPackage(required_package); - // bugzilla #327050 - // Agent for writing /etc/ntp.conf needs to be installed - // to write the settings at the end of the installation - Packages::addAdditionalPackage("yast2-ntp-client"); + handle_invalid_hostname ( + (string) UI::QueryWidget (`id (`ntp_address), `Value)); } - //Otherwise, prompt user for confirming pkg installation - else if (!Stage::initial ()) + else if (rv == `next && !Stage::initial ()) { - if (!PackageSystem::CheckAndInstallPackages([ required_package ])) - { - Report::Error(sformat( _("Synchronization with NTP server is not possible -without having package %1 installed"), required_package)); - } + // show the 'save' status after configuration + UI::ChangeWidget (`id(`ntp_save), `Value, GetNTPEnabled ()); + } + } + if (ui == `ntp_now) + { + symbol rv = Write ($["ntpdate_only" : true]); + if( rv == `invalid_hostname) + { + handle_invalid_hostname ( + (string) UI::QueryWidget (`id (`ntp_address), `Value)); } + else if (rv == `success) + { + redraw = true; // update time widgets + } + } + + return redraw? `redraw : nil; +} + +boolean ui_try_save() { + map argmap = $[]; + if (UI::QueryWidget (`id (`ntp_save), `Value) == false) + argmap["ntpdate_only"] = true; - Popup::ShowFeedback("", _("Synchronizing with NTP server...")); + symbol rv = Write (argmap); - y2milestone("Running sntp to sync with %1", ntp_server); + string server = (string) UI::QueryWidget (`id(`ntp_address),`Value); - // -r: do set the system time - // -P no: do not ask if time difference is too large - // -c 1 -d 15: delay 15s, only one try (bnc#442287) - integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/sntp -c 1 -d 15 -r -P no '%1'", String::Quote(ntp_server))); - y2milestone ("'sntp %1' returned %2", ntp_server, r); - - Popup::ClearFeedback(); - - if (r == 0) - { - ret = `success; - - // User wants to more than running sntp (synchronize on boot) - if (!ntpdate_only) - { - NtpClient::modified = true; - AddSingleServer(ntp_server); - - //OK, so we stored the server address - //In inst-sys we don't need to care further - //ntp-client_finish will do the job - //In installed system we must write the settings - if (!Stage::initial()) - NtpClient::Write(); - } - } - else - ret = `ntpdate_failed; + if (rv == `invalid_hostname) + { + handle_invalid_hostname( server ); + return false; // loop on + } + else if ( rv == `ntpdate_failed) + { + // Translators: yes-no popup, + // ntpdate is a command, %1 is the server address + if (Popup::YesNo( sformat(_("'ntpdate %1' failed. Revisit NTP server configuration?"), server) )) + { + return false; // loop on + } } + // success, exit + return true; } -else if (func == "AskUser") + + +if (false) { - string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); - if ( !ValidateSingleServer( ntp_server ) ) - ret = `invalid_hostname; - else - { - string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); - AddSingleServer(ntp_server); - boolean retval = (boolean) WFM::CallFunction("ntp-client"); - if (retval) - ret = `next; - ProposeSomething(); - } + return; +} +else if (func == "GetNTPEnabled") +{ + ret = GetNTPEnabled (); } -y2milestone("Ntp client proposal finished"); -y2milestone("----------------------------------------"); -return ret; + +else if (func == "SetUseNTP") +{ + NtpClient::ntp_selected = param["ntp_used"]:false; + ret = true; +} + +else if (func == "MakeProposal") +{ + string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); + ret = MakeProposal(cc); +} + +else if (func == "Write") +{ + ret = Write (param); } +else if (func == "ui_help_text") +{ + ret = ui_help_text(); +} +else if (func == "ui_init") +{ + term rp = param["replace_point"]:`id(`rp); + string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); + boolean ft = param["first_time"]:false; + ret = ui_init(rp, cc, ft); +} +else if (func == "ui_try_save") +{ + ret = ui_try_save(); +} +else if (func == "ui_enable_disable_widgets") +{ + ret = ui_enable_disable_widgets(param["enabled"]:false); +} +else if (func == "ui_handle") +{ + ret = ui_handle(param["ui"]:nil); +} +return ret; +} -- 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] r56510 - in /trunk/storage/libstorage/src: DmPartCo.h DmmultipathCo.h DmraidCo.h
by aschnell＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: aschnell Date: Tue Mar 31 17:18:28 2009 New Revision: 56510 URL: http://svn.opensuse.org/viewcvs/yast?rev=56510&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/DmmultipathCo.h trunk/storage/libstorage/src/DmraidCo.h Modified: trunk/storage/libstorage/src/DmPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.h (original) +++ trunk/storage/libstorage/src/DmPartCo.h Tue Mar 31 17:18:28 2009 @@ -14,7 +14,6 @@ class Storage; -class SystemCmd; class ProcPart; class Region; Modified: trunk/storage/libstorage/src/DmmultipathCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.h (original) +++ trunk/storage/libstorage/src/DmmultipathCo.h Tue Mar 31 17:18:28 2009 @@ -10,9 +10,7 @@ { class Storage; -class SystemCmd; class ProcPart; -class Region; class DmmultipathCo : public DmPartCo { Modified: trunk/storage/libstorage/src/DmraidCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.h (original) +++ trunk/storage/libstorage/src/DmraidCo.h Tue Mar 31 17:18:28 2009 @@ -10,9 +10,7 @@ { class Storage; -class SystemCmd; class ProcPart; -class Region; class DmraidCo : public DmPartCo { -- 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] r56509 - /trunk/repair/src/osr_module_partition.ycp
by jreidinger＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: jreidinger Date: Tue Mar 31 16:46:17 2009 New Revision: 56509 URL: http://svn.opensuse.org/viewcvs/yast?rev=56509&view=rev Log: fix direct boot from DVD repair menu. (bnc #450944) Modified: trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.… ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Tue Mar 31 16:46:17 2009 @@ -1305,6 +1305,7 @@ if (!RootPart::didSearchForRootPartitions) { + Installation::destdir = "/mnt/"; UI::OpenDialog (`opt(`decorated ), // label `Label(_("Evaluating root partition. One moment please...")) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0