Author: mzugec Date: Wed Apr 23 11:06:12 2008 New Revision: 46976 URL: http://svn.opensuse.org/viewcvs/yast?rev=46976&view=rev Log: improved "global" settings layout (bnc#381353) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=46976&r1=46975&r2=46976&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Apr 23 11:06:12 2008 @@ -1 +1 @@ -2.16.15 +2.16.16 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=46976&r1=46975&r2=46976&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Apr 23 11:06:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 23 10:42:22 CEST 2008 - mzugec@suse.cz + +- improved "global" settings layout (bnc#381353) +- 2.16.16 + +------------------------------------------------------------------- Thu Apr 17 01:44:03 CEST 2008 - mzugec@suse.de - fixed testsuite Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?rev=46976&r1=46975&r2=46976&view=diff ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Wed Apr 23 11:06:12 2008 @@ -27,8 +27,9 @@ import "Spooler"; import "Stage"; import "Wizard"; - import "Wizard_hw"; +// import "Wizard_hw"; import "CWMTab"; +// import "DialogTree"; import "CWM"; import "IP"; @@ -2230,45 +2231,63 @@ "SERVER_TYPE" : $[ "widget" : `custom, "custom_widget" : - `MarginBox(1,0, - `VBox( - `Frame(_("Print via"), - `RadioButtonGroup( `id( `server_type ), - `VBox( - `VBox( - `Left( `RadioButton(`id(`local), `opt(`notify), "Local CUPS Server")), - `VBox( - `HBox(`CheckBox(`id(`ipp_listen), `opt(`notify), _("Listen to IPP Broadcast Packets")), - `PushButton(`id(`select_addr), _("Select Addresses")) - ), - `Left(`CheckBox(`id(`lpd_enable), `opt(`notify), _("enable LPD clients"))) - ) - ), - `VBox( - `Left(`RadioButton(`id(`remote), `opt(`notify), "Do All Your Printing Directly via One Remote CUPS Server" )), - `HBox( - `ComboBox(`id(`server_name), `opt(`editable), _("Server Name")), - // menubutton - `MenuButton (`id(`lookup_server), _("&Look Up"), [ - // menu entry - `item (`id (`get_hosts_special), _("Scan for &IPP Servers")), - // menu item - `item (`id (`get_hosts_listen),_("Listen for IPP &Broadcasts")), - // menu entry - `item (`id (`get_hosts), _("Look Up &All Hosts")), - ]), -// `PushButton(`id(`lookup_server), _("Lookup")), - `PushButton(`id(`test_ipp), _("Test Remote IPP Access")) - ), - `CheckBox(`id(`use_default), `opt(`notify), _("Use Server's Default Queue")), - `HBox( - `ComboBox(`id(`queues), `opt(`editable), _("Queues")), - `PushButton(`id(`lookup_queue), _("Lookup")) - ) - ) - ))), - `VStretch() - )), +`HBox( +`HSpacing(5), + `MarginBox(1,0, + `VBox( + `Frame(_("Print via"), + `RadioButtonGroup( `id( `server_type ), + `VBox( + `VBox( + `Left( `RadioButton(`id(`local), `opt(`notify), "Local CUPS Server")), + `VBox( + `Left( + `HBox( + `HSpacing(), + `CheckBox(`id(`ipp_listen), `opt(`notify), _("Listen to IPP Broadcast Packets")), + `PushButton(`id(`select_addr), _("Select Addresses")) + )), + `Left( + `HBox( + `HSpacing(), + `CheckBox(`id(`lpd_enable), `opt(`notify), _("enable LPD clients")))) + )), + `VBox( + `Left(`RadioButton(`id(`remote), `opt(`notify), "Do All Your Printing Directly via One Remote CUPS Server" )), + `Left( + `HBox( + `HSpacing(), + `ComboBox(`id(`server_name), `opt(`editable), _("Server Name")), + // menubutton + `VBox( + `VSpacing(), + `HBox( + `MenuButton (`id(`lookup_server), _("&Look Up"), [ + // menu entry + `item (`id (`get_hosts_special), _("Scan for &IPP Servers")), + // menu item + `item (`id (`get_hosts_listen),_("Listen for IPP &Broadcasts")), + // menu entry + `item (`id (`get_hosts), _("Look Up &All Hosts")), + ]), + `PushButton(`id(`test_ipp), _("Test Remote IPP Access")) + )) + )), + `Left( `HBox(`HSpacing(), `CheckBox(`id(`use_default), `opt(`notify), _("Use Server's Default Queue")))), + `Left( + `HBox( + `HSpacing(), + `ComboBox(`id(`queues), `opt(`editable), _("Queues")), + `VBox(`VSpacing(), + `PushButton(`id(`lookup_queue), _("Lookup")) + ) + ) + )) + ))), + `VStretch() + )), +`HSpacing(5) +), "init" : initServerType, "handle" : handleServerType, "validate_type" : `function, @@ -2353,6 +2372,7 @@ map tabs_descr = $[ "global" : $[ "header" : _("Global Settings"), + "tree_item_label" : _("Global Settings"), "contents" : `VBox ( "SERVER_TYPE" ), @@ -2360,6 +2380,7 @@ ], "overview" : $[ "header" : _("Printers and Queues"), + "tree_item_label" : _("Printers and Queues"), "contents" : `VBox ( "OVERVIEW" ), @@ -2367,6 +2388,7 @@ ], "server" : $[ "header" : _("CUPS server settings"), + "tree_item_label" : _("CUPS server settings"), "contents" : `VBox ( "SERVER" ), @@ -2396,6 +2418,18 @@ Wizard::DisableBackButton(); symbol ret = CWM::Run(w, $[]); +/* + symbol ret = DialogTree::ShowAndRun ($[ + "ids_order" : [ "global", "overview", "server" ], + "initial_screen" : initial_tab, + "screens" : tabs_descr, + "widget_descr" : wd, + "abort_button" : Label::AbortButton(), + "next_button" : (Mode::normal() ? + Label::NextButton () : Label::OKButton () + ) + ]); +*/ return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org