Author: mzugec
Date: Tue Nov 6 16:45:59 2007
New Revision: 41826
URL: http://svn.opensuse.org/viewcvs/yast?rev=41826&view=rev
Log:
tabbed UI done (without help)
Modified:
trunk/printer/VERSION
trunk/printer/package/yast2-printer.changes
trunk/printer/src/common/dialogs-connection.ycp
trunk/printer/src/common/dialogs.ycp
trunk/printer/src/common/wizards.ycp
trunk/printer/src/cups/dialogs-cups.ycp
Modified: trunk/printer/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Tue Nov 6 16:45:59 2007
@@ -1 +1 @@
-2.16.3
+2.16.4
Modified: trunk/printer/package/yast2-printer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Tue Nov 6 16:45:59 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Nov 6 16:44:36 CET 2007 - mzugec@suse.cz
+
+- tabbed UI done (without help)
+- 2.16.4
+
+-------------------------------------------------------------------
Fri Nov 2 12:54:13 CET 2007 - mzugec@suse.cz
- show network printers - fixed (problem when password contains
Modified: trunk/printer/src/common/dialogs-connection.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-connection.ycp?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs-connection.ycp (original)
+++ trunk/printer/src/common/dialogs-connection.ycp Tue Nov 6 16:45:59 2007
@@ -440,10 +440,10 @@
if (local == false)
{
items = add (items,
- `Frame(_("Network Printers"),
+ `Frame(_("Network Printers"),
`VBox(
// radio button
- `Left (`RadioButton (`id (`cups),_("Print via &CUPS Network Server"),selected == `cups)),
+ `Left (`RadioButton (`id (`ipp),_("Remote &IPP Queue (only for special cases)"),selected == `ipp)),
// radio button
`Left (`RadioButton (`id (`lpd),_("Print via &LPD-Style Network Server"),selected == `lpd)),
// radio button
@@ -526,6 +526,7 @@
* Dialog asking about connection type for connection to remote CUPS server
* @return symbol wizard sequencer symbol
*/
+/*
define symbol runCupsConnectionDialog () ``{
symbol selected = `cups_client;
string uri_type = Printerlib::getUriType (Printer::printer["uri"]:"");
@@ -565,6 +566,7 @@
_("Type of Connection to the CUPS Server"),
getCupsConnectionsHelp (), `connection_cups);
}
+*/
/**
* Dialog asking about connection type for small print servers
Modified: trunk/printer/src/common/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs.ycp (original)
+++ trunk/printer/src/common/dialogs.ycp Tue Nov 6 16:45:59 2007
@@ -34,6 +34,7 @@
include "printer/helps.ycp";
include "printer/misc.ycp";
+ string initial_tab = "overview";
/**
* Read settings dialog
* @return `abort if aborted and `next otherwise
@@ -1634,6 +1635,7 @@
* Start dialog with advanced spooler settings
* @return symbol for wizzard seq
*/
+/*
define symbol runAdvancedDialog () ``{
string new_spooler = Spooler::Get ();
if (new_spooler == "cups"
@@ -1829,11 +1831,13 @@
}
return ret;
}
+*/
/**
* Dialog for choosing what kind of devices to use
* @return wizard sequencer symbol
*/
+/*
define symbol runCupsUsbDeviceTypeDialog () ``{
term contents = `HBox (`HStretch (), `VBox (
`VStretch (),
@@ -1882,6 +1886,7 @@
}
return ret;
}
+*/
/**
* Decide how to configure autodetected printer
@@ -2145,6 +2150,7 @@
* Run dialog for expert settings
* @return symbol ret (`change_ipp_listen, `cupsd, `cupsusb)
*/
+/*
define symbol runCupsExpertDialog() ``{
@@ -2185,6 +2191,7 @@
}
return (symbol) ret;
}
+*/
void initServerType (string key) {
CUPS::ReadCupsSettings ();
@@ -2300,6 +2307,20 @@
return nil;
}
+boolean validateServerType(string key, map event){
+ if (! (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local)){
+ if (size((string)UI::QueryWidget (`id (`server_name), `Value))==0){
+ Popup::Warning (_("Enter a valid server name."));
+ return false;
+ }
+ if (!(boolean)UI::QueryWidget(`use_default, `Value) && size((string)UI::QueryWidget(`queues, `Value))==0){
+ Popup::Warning (sformat("%1 \"%2\".", _("Select default queue or check"), _("Use Server's Default Queue")));
+ return false;
+ }
+ }
+ return true;
+}
+
void storeServerType(string key, map event){
boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local);
if (local){
@@ -2321,7 +2342,7 @@
*/
list > o_items = nil;
-void initHWDialogData (string key) {
+void initOverview (string key) {
string new_spooler = Spooler::Get ();
if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client";
y2milestone("%1", new_spooler);
@@ -2407,7 +2428,7 @@
* Common detected hardware dialog.
* @return symbol for ws
*/
- define symbol handleDetected (string key, map event) ``{
+ define symbol handleOverview (string key, map event) ``{
y2milestone ("Starting detected dialog");
// several functions dialog
@@ -2429,7 +2450,7 @@
case `delete :
if (new_spooler == "cups-client") {CUPS::cups_installation=`server;new_spooler="cups";}
else if ( (Printer::conf_unconf_printers[selected, "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:""))) Printer::deletePrinter ();
- initHWDialogData("");
+ initOverview("");
ret=nil;
break;
// TODO handle all events here
@@ -2499,11 +2520,89 @@
return ret; // FIXME
}
-/*
-void runCups(string key){
- runCupsServerDialog ();
+ map firewall_widget =
+ CWMFirewallInterfaces::CreateOpenFirewallWidget ($["services":[ "ipp-tcp" ], "display_details":true]);
+ list<string> addresses = [];
+
+void initCupsServer(string key){
+ string firewall_help = firewall_widget["help"]:"";
+ term firewall_layout = firewall_widget["custom_widget"]:`VBox ();
+ UI::ReplaceWidget(`fw, firewall_layout);
+ addresses = CUPS::cups_server_settings["BrowseAddress"]:[];
+ UI::ChangeWidget (`id (`browsing), `CurrentButton, CUPS::cups_server_settings["Browsing"]:["On"] == ["Off"] ? `off : `on);
+ // selectionbox
+ UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+ CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
+ boolean enable = true;
+ if (CUPS::InstallationType () != `server) enable=false;
+ UI::ChangeWidget(`f_browsing, `Enabled, enable);
+ UI::ChangeWidget(`f_address, `Enabled, enable);
+
+}
+
+define symbol handleCupsServer (string key, map event) {
+ CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget, "", event);
+ symbol id = event["ID"]:`nil;
+ any ret = nil;
+ if (id!=`nil) switch(id){
+ case `propose_server:
+ if ((size(addresses)>0 && Popup::ContinueCancel(_("Really replace with the suggested value?")))
+ ||(size(addresses)==0)){
+ CUPS::ProposeServerSettings ();
+ addresses = CUPS::cups_server_settings["BrowseAddress"]:[];
+ UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+ }
+ break;
+ case `change:
+ ret = (symbol)UI::QueryWidget (`id (`loc), `CurrentButton);
+ break;
+ case `add:
+ // popup request
+ UI::OpenDialog (ipAddrPopup (false, _("&IP Address"), "", nil));
+ symbol r = nil;
+ while (nil == r) r = (symbol)UI::UserInput ();
+ string ad = (string)UI::QueryWidget (`id (`ad), `Value);
+ UI::CloseDialog ();
+ if (r != `ok) break;
+ if (ad != "") addresses = toset (add (addresses, ad));
+ // selectionbox label
+ UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+ break;
+ case `del:
+ addresses = (list<string>)DeleteItem (addresses, UI::QueryWidget (`id (`addr), `CurrentItem));
+ // selectionbox label
+ UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+ break;
+ case `edit:
+ if (UI::QueryWidget (`id (`addr), `CurrentItem) == nil) break;
+ // popup request
+ UI::OpenDialog (ipAddrPopup (false, _("&IP Address"), (string)UI::QueryWidget (`id (`addr), `CurrentItem), nil));
+ symbol r2 = nil;
+ while (nil == r2) r2 = (symbol)UI::UserInput ();
+ string ad2 = (string)UI::QueryWidget (`id (`ad), `Value);
+ UI::CloseDialog ();
+ if (r2 != `ok) break;
+ if (ad2 != "")
+ {
+ addresses = (list<string>)DeleteItem (addresses, UI::QueryWidget (`id (`addr), `CurrentItem));
+ addresses = (list<string>)toset (add (addresses, ad2));
+ }
+ // selectionbox label
+ UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+ break;
+ }
+ UI::ChangeWidget(`edit, `Enabled, (size(addresses)>0));
+ UI::ChangeWidget(`del, `Enabled, (size(addresses)>0));
+ if (ret!=nil)initial_tab = "server";
+ else initial_tab = "overview";
+ return (symbol)ret;
+}
+
+void storeCupsServer(string key, map event){
+ CUPS::cups_server_settings["BrowseAddress"] = addresses;
+ CUPS::cups_server_settings["Browsing"] = UI::QueryWidget (`id (`browsing), `CurrentButton) == `on ? ["On"] : ["Off"];
+ CWMFirewallInterfaces::OpenFirewallStore (firewall_widget, "", event);
}
-*/
map > wd = $[
"SERVER_TYPE" : $[
@@ -2547,6 +2646,8 @@
)),
"init" : initServerType,
"handle" : handleServerType,
+ "validate_type" : `function,
+ "validate_function" : validateServerType,
"store" : storeServerType
],
"OVERVIEW" : $[
@@ -2563,8 +2664,8 @@
`HStretch ()
)
),
- "init" : initHWDialogData,
- "handle" : handleDetected,
+ "init" : initOverview,
+ "handle" : handleOverview,
// "store" : storeOverview,
// "help" : help["overview"]:""
],
@@ -2574,7 +2675,7 @@
`HBox (`HSpacing (2), `VBox (
`VSpacing (1),
// frame
- `Frame (_("Browsing Settings"), `VBox (
+ `Frame (`id(`f_browsing), _("Browsing Settings"), `VBox (
`HBox (`HSpacing (3), `RadioButtonGroup (`id (`browsing), `HBox (
// label
`Label (_("Browsing")),
@@ -2598,7 +2699,7 @@
)
)),
// frame
- `Frame (_("Access Settings"), `VBox (
+ `Frame (`id(`f_address), _("Access Settings"), `VBox (
`RadioButtonGroup (`id (`loc), `VBox (
`HBox (
`RadioButton (`id (`root), `opt (`hstretch), "/ (r&oot)", true),
@@ -2611,10 +2712,13 @@
)),
// pushbutton
`PushButton (`id (`change), _("Change P&ermissions"))
- ))
+ )),
// firewall_layout
+ `ReplacePoint( `id( `fw ), `Empty() )
), `HSpacing (2)),
- "init" : runCupsServerDialog
+ "init" : initCupsServer,
+ "handle" : handleCupsServer,
+ "store" : storeCupsServer
]
];
@@ -2643,15 +2747,14 @@
];
-symbol runDetectedDialog(){
-
+symbol runMainDialog(){
string caption = _("Detected Printers");
map widget_descr = $[
"tab": CWMTab::CreateWidget($[
"tab_order": [ "global", "overview", "server" ],
"tabs": tabs_descr,
"widget_descr": wd,
- "initial_tab" : "overview",
+ "initial_tab" : initial_tab,
"tab_help" : "",
]),
];
@@ -2665,9 +2768,7 @@
Wizard::DisableBackButton();
symbol ret = CWM::Run(w, $[]);
-
return ret;
-
}
@@ -2733,6 +2834,7 @@
* Complex dialog.
* @return symbol for ws
*/
+/*
define symbol runComplexDialog () ``{
Printer::confmode = `adm;
string spoolerlabel = "";
@@ -2749,9 +2851,7 @@
Wizard::SetContentsButtons (
// Header of the dialog with all the printers
sformat (_("Printer Administration for %1"), spoolerlabel),
- Wizard_hw::ConfiguredContent (
- (Spooler::Get () == "cups")
- ?
+ Wizard_hw::ConfiguredContent ( (Spooler::Get () == "cups") ?
// table header
`header (_("Default"),
// table header
@@ -2857,13 +2957,13 @@
}
return ret;
}
+*/
/**
* Detect installation type
* @return symbol `server or `client
*/
define symbol getInstType () ``{
- if (Spooler::Get () != "cups")
- return `server;
+ if (Spooler::Get () != "cups") return `server;
return CUPS::InstallationType ();
}
Modified: trunk/printer/src/common/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/wizards.ycp?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/src/common/wizards.ycp (original)
+++ trunk/printer/src/common/wizards.ycp Tue Nov 6 16:45:59 2007
@@ -53,8 +53,8 @@
// real dialogs
"name_auto" : ``(runNameDialog (true)),
"name" : ``(runNameDialog (false)),
- "detected" : ``(runDetectedDialog ()),
- "complex" : ``(runComplexDialog ()),
+ "main" : ``(runMainDialog ()),
+// "complex" : ``(runComplexDialog ()),
"model" : ``(runManufModelDialog ()),
"model_unknown" : ``(runManufModelDialog ()),
"inst_printer" : ``(runInstalledPrinterDialog ()),
@@ -63,7 +63,7 @@
// connection selection
// "connection_type" : ``(runConnectionTypeDialog ()),
"connection_local" :``(runLocalConnectionDialog ()),
- "connection_cups" : ``(runCupsConnectionDialog ()),
+// "connection_cups" : ``(runCupsConnectionDialog ()),
"connection_direct":``(runDirectConnectionDialog ()),
"connection_other": ``(runOtherConnectionDialog ()),
// by connection type
@@ -87,9 +87,9 @@
"pipe" : ``(runPipeDialog ()),
"other" : ``(runUriDialog()),
// cups-only
- "listen_ipp_bcast": ``(runListenIPPDialog ()),
- "cups_client" : ``(runCupsClientDialog (false)),
- "cups_expert" : ``(runCupsExpertDialog ()),
+// "listen_ipp_bcast": ``(runListenIPPDialog ()),
+// "cups_client" : ``(runCupsClientDialog (false)),
+// "cups_expert" : ``(runCupsExpertDialog ()),
"remote_access" : ``(runRemoteAccessDialog()),
// cups only
@@ -100,14 +100,14 @@
"add_local_printer":``(runConnectionTypeDialog(true)),
"add_remote_printer":``(runConnectionTypeDialog(false)),
"add_new_queue" : ``(runNewQueueDialog()),
- "advanced" : ``(runAdvancedDialog ()),
+// "advanced" : ``(runAdvancedDialog ()),
// "cupsd" : ``(runCupsServerDialog ("")),
"cupsaclroot" : ``(runCupsAclDialog (`root)),
"cupsacladmin" : ``(runCupsAclDialog (`admin)),
"cupsaclprinters" : ``(runCupsAclDialog (`printers)),
"cupsaclclasses" : ``(runCupsAclDialog (`classes)),
"cupsaclbcast" : ``(runCupsAclDialog (`bcast)),
- "cups_client_main": ``(runCupsClientDialog (true)),
+// "cups_client_main": ``(runCupsClientDialog (true)),
"useppd" : ``(runSelectPpdFile ()),
"downloadppd" : ``(runDownloadPpdFile ()),
"ppdselect" : ``(runPpdSelectDialog (false)),
@@ -121,7 +121,7 @@
"storeprinter" : [ ``(storePrinter ()) , true ],
- "cups_usb" : ``(runCupsUsbDeviceTypeDialog ()),
+// "cups_usb" : ``(runCupsUsbDeviceTypeDialog ()),
];
}
/**
@@ -137,7 +137,7 @@
];
Printer::default_queue = "lp";
Printer::selectPrinter (3);
- list<string> seq = [ "detected", "configdetected", "quick", "complex", "connection_local", "usb", "name", "model", "filter", "featues", "edit", ];
+ list<string> seq = [ "main", "configdetected", "quick", "complex", "connection_local", "usb", "name", "model", "filter", "featues", "edit", ];
foreach (string i, seq, ``{
eval (getAliases ()[i]:nil);
});
@@ -295,7 +295,7 @@
],
"add_remote_printer" : $[
`abort : `abort,
- `cups : "connection_cups",
+ `ipp : "ipp",
`lpd : "lpd",
`smb : "samba",
`ipx : "novell",
@@ -307,13 +307,14 @@
`next: `next,
`abort : `abort,
],
-
+/*
"connection_cups" : $[
- `cups_client : "cups_client",
- `listen_ipp : "listen_ipp_bcast",
+// `cups_client : "cups_client",
+// `listen_ipp : "listen_ipp_bcast",
`ipp : "ipp",
`abort : `abort,
],
+*/
"connection_direct" : $[
`socket : "socket",
`lpd : "lpd",
@@ -350,13 +351,15 @@
"other" : $[ `next : "name_auto", `abort : `abort, ],
"ppdetails" : $[ `abort : `abort, `next : "parallel", ],
"spdetails" : $[ `abort : `abort, `next : "serial", ],
+/*
"listen_ipp_bcast" : $[
`abort : `abort,
`next : "storeprinter",
`perm : "cupsaclbcast",
],
- "cupsaclbcast" : $[ `abort : `abort, `next : "listen_ipp_bcast"],
- "cups_client" : $[ `abort : `abort, `next : `next ],
+*/
+// "cupsaclbcast" : $[ `abort : `abort, `next : "listen_ipp_bcast"],
+// "cups_client" : $[ `abort : `abort, `next : `next ],
// end of connection types
"inst_printer" : $[ `next : `edit, `abort : `abort, ],
@@ -444,38 +447,48 @@
define symbol MainSequence() ``{
map aliases = getAliases ();
map sequence = $[
- "ws_start" : "detected",
+ "ws_start" : "main",
+/*
"config_type" : $[
- `server : "detected",
- `client : "cups_client_main",
+ `server : "main",
+// `client : "cups_client_main",
],
+*/
//old dialogs
- "detected" : $[
+ "main" : $[
`next : `next,
`abort : `abort,
`configure_button : "add_printer_wz",
- `restart_button : "redetect",
+// `restart_button : "redetect",
`edit_button : "edit_printer_wz",
`edit_unconf : "edit_printer_unconf",
- `change_ipp_listen : "listen_ipp_bcast",
- `cups_expert : "cups_expert",
+// `change_ipp_listen : "listen_ipp_bcast",
+// `cups_expert : "cups_expert",
`change_remote_access : "remote_access",
// `cupsd : "cupsd",
// `cupsusb : "cups_usb",
- `connection_cups : "cups_client"
+// `connection_cups : "cups_client"
+ `root : "cupsaclroot",
+ `admin : "cupsacladmin",
+ `printers : "cupsaclprinters",
+ `classes : "cupsaclclasses",
],
+/*
"cups_client" : $[
`next : "detected",
`abort : `abort,
],
-
- "redetect" : $[`next : "detected", ],
+*/
+ "redetect" : $[`next : "main", ],
+/*
"listen_ipp_bcast" : $[
`next : "detected",
`abort : `abort,
`perm : "cupsaclbcast",
],
- "cupsaclbcast" : $[ `abort : `abort, `next : "listen_ipp_bcast"],
+*/
+// "cupsaclbcast" : $[ `abort : `abort, `next : "listen_ipp_bcast"],
+/*
"advanced" : $[
`next : "config_type",
`this : "advanced",
@@ -484,21 +497,26 @@
`switch : `switch,
`abort : `abort,
],
+*/
+/*
"cups_expert" : $[
`abort : `abort,
`next : `next,
- `change_ipp_listen : "listen_ipp_bcast",
+// `change_ipp_listen : "listen_ipp_bcast",
// `cupsd : "cupsd",
`cupsusb : "cups_usb"
],
+*/
"remote_access" : $[
`abort : `abort,
- `next : "detected"
+ `next : "main"
],
+/*
"cups_usb" : $[
- `next : "detected",
+ `next : "main",
`abort : `abort,
],
+*/
/*
"cupsd" : $[
`next : "detected",
@@ -510,39 +528,41 @@
],
*/
"cupsaclroot" : $[
-// `next : "cupsd",
+ `next : "main",
`abort : `abort,
],
"cupsacladmin" : $[
-// `next : "cupsd",
+ `next : "main",
`abort : `abort,
],
"cupsaclprinters" : $[
-// `next : "cupsd",
+ `next : "main",
`abort : `abort,
],
"cupsaclclasses" : $[
-// `next : "cupsd",
+ `next : "main",
`abort : `abort,
],
"add_printer_wz" : $[
- `next: "detected",
+ `next: "main",
`abort : `abort,
],
"edit_printer_wz": $[
- `next: "detected",
+ `next: "main",
`abort : `abort,
],
"edit_printer_unconf": $[
- `next: "detected",
+ `next: "main",
`abort : `abort,
],
+/*
"cups_client_main" : $[
`next : `next,
`abort : `abort,
`advanced : "advanced",
`switch : `switch,
],
+*/
];
aliases = (map)filter (string k, any v, aliases, ``(haskey (sequence, k)));
return Sequencer::Run(aliases, sequence);
Modified: trunk/printer/src/cups/dialogs-cups.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/cups/dialogs-cups.ycp?rev=41826&r1=41825&r2=41826&view=diff
==============================================================================
--- trunk/printer/src/cups/dialogs-cups.ycp (original)
+++ trunk/printer/src/cups/dialogs-cups.ycp Tue Nov 6 16:45:59 2007
@@ -33,6 +33,7 @@
* Run dialog informing about IPP queue listening
* @return symbol for WS
*/
+/*
define symbol runListenIPPDialog () ``{
// this avoids problem with unread CUPS settings in the proposal
// see bug #46822
@@ -72,7 +73,6 @@
_("Listen to IPP &Broadcast Packets"),
contains (
CUPS::cups_server_settings["Browsing"]:["On"],"On"))),
- // push button
`PushButton (`id (`perm), _("Select A&ddresses"))
), `HStretch ())),
`VSpacing (2),
@@ -105,13 +105,14 @@
}
return (symbol)ret;
}
-
+*/
/**
* Is there only client?
* @param main boolean true if this is used as replacement of the
* "Complex" dialog
* @return symbol for wizard sequencer
*/
+/*
define symbol runCupsClientDialog (boolean main) ``{
// main=true;
term advanced = main
@@ -126,7 +127,6 @@
`HBox (
// `HSpacing(20),
`HStretch(),
-// `VWeight( 20,
`MinWidth( 20,
`ReplacePoint (
`id (`hostent_replace),
@@ -288,6 +288,7 @@
}
return ret;
}
+*/
/**
* Choose PPD file
* @return symbol `next, `abort or `back
@@ -966,6 +967,7 @@
* CUPS server settings dialog
* @return symbol `next or `back
*/
+/*
define void runCupsServerDialog (string key) ``{
map firewall_settings = $[
@@ -976,7 +978,7 @@
= CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings);
string firewall_help = firewall_widget["help"]:"";
term firewall_layout = firewall_widget["custom_widget"]:`VBox ();
-/*
+
term contents = `HBox (`HSpacing (2), `VBox (
`VSpacing (1),
// frame
@@ -1020,7 +1022,6 @@
)),
firewall_layout
), `HSpacing (2));
-*/
// dialog caption
// Wizard::SetContentsButtons (_("CUPS Server Settings"), contents, getCupsServerHelp () + firewall_help, Label::BackButton (), Label::NextButton ());
@@ -1031,7 +1032,7 @@
// selectionbox
UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
-// CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
+ CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
map event = $[];
any ret = nil;
@@ -1040,8 +1041,7 @@
event = UI::WaitForEvent ();
ret = event["ID"]:nil;
if (ret == `cancel) ret = `abort;
- CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget,
- "", event);
+ CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget, "", event);
if (`abort == ret)
{
if (reallyAbort ())
@@ -1122,4 +1122,5 @@
CUPS::cups_server_settings["BrowseAddress"] = addresses;
// return (symbol)ret;
}
+*/
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
