Author: mzugec Date: Fri Nov 2 13:06:29 2007 New Revision: 41734 URL: http://svn.opensuse.org/viewcvs/yast?rev=41734&view=rev Log: - show network printers - fixed (problem when password contains space for smb backend)(#332237) - disable edit for raw queues (#247336) - split UI into tabs (not done completly) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp trunk/printer/src/modules/CUPS.ycp trunk/printer/src/modules/Printer.ycp trunk/printer/src/modules/Printerlib.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41734&r1=41733&r2=41734&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Nov 2 13:06:29 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=41734&r1=41733&r2=41734&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Nov 2 13:06:29 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Nov 2 12:54:13 CET 2007 - mzugec@suse.cz + +- show network printers - fixed (problem when password contains + space for smb backend)(#332237) +- disable edit for raw queues (#247336) +- split UI into tabs (not done completly) +- 2.16.3 + +------------------------------------------------------------------- Tue Oct 30 15:55:17 CET 2007 - mzugec@suse.cz - let the user accept even non-compliant PPDs - (#310177) Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?rev=41734&r1=41733&r2=41734&view=diff ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Fri Nov 2 13:06:29 2007 @@ -28,7 +28,8 @@ import "Stage"; import "Wizard"; import "Wizard_hw"; - import "WizardHW"; + import "CWMTab"; + import "CWM"; include "printer/helps.ycp"; include "printer/misc.ycp"; @@ -2144,30 +2145,191 @@ return add (items, `item (`id (-1), _("Other (not detected)"), !selected)); } + + + /** + * Restart detection of printers. + * @return symbol always `next + */ + define symbol runProbeDialog () ``{ + Printer::Detect (); + return `next; + } + + /** + * Run dialog for expert settings + * @return symbol ret (`change_ipp_listen, `cupsd, `cupsusb) + */ + define symbol runCupsExpertDialog() ``{ + + + term contents = `HBox (`HStretch (), `VBox ( + `VStretch (), + `RadioButtonGroup (`id (`rb), + // frame + `Frame (_("Configure CUPS"),`HBox ( + `HSpacing (3), + `VBox ( + `VSpacing (3), + // radiobutton + `Left(`RadioButton( `id(0), _("Change IPP Listen"))), + `Left(`RadioButton( `id(1), _("CUPS Server Se&ttings"))), + `Left(`RadioButton( `id(2), _("CUPS &USB Device Settings"))), + // radiobutton + `VSpacing (3) + ), + `HSpacing (3) + ) + )), + `VStretch () + ), `HStretch ()); + + Wizard::SetContentsButtons (_("Expert CUPS Settings"), contents, getHelpCupsExperts() , + Label::BackButton (), Label::NextButton () ); + + UI::ChangeWidget (`id (`rb), `CurrentButton,0); + + any ret = UI::UserInput(); + if (ret == `next){ + integer option = tointeger(UI::QueryWidget(`id(`rb), `CurrentButton)); + switch (option){ + case 0 : return `change_ipp_listen; + case 1 : return `cupsd; + case 2 : return `cupsusb; + }; + } + return (symbol) ret; + } + +void initServerType (string key) { + CUPS::ReadCupsSettings (); + if (CUPS::InstallationType () == `server){ + UI::ChangeWidget(`id(`server_type), `CurrentButton, `local); + } else { + UI::ChangeWidget(`id(`server_type), `CurrentButton, `remote); + } + if ( contains (CUPS::cups_server_settings["Browsing"]:["On"],"On") ) UI::ChangeWidget(`ipp_listen, `Value, true); +} + +list<string> getAddresses(list<string> addr_orig){ + list<string> addresses=addr_orig; + term contents = `Frame (_("Browsing Settings"), `VBox ( + // selectionbox label + `HBox (`HSpacing (3), `SelectionBox (`id (`addr), _("Browse Addre&sses")), `HSpacing (3)), + `HBox ( + `HSpacing (3), + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`del), `opt (`key_F5), Label::DeleteButton ()), + `HStretch (), + // push button +// `PushButton (`id (`propose_server), _("&Propose")), + `PushButton (`id (`ok), Label::OKButton()), + `HSpacing (3) + ) + )); + UI::OpenDialog(contents); + symbol ret = nil; + do { + UI::ChangeWidget(`addr, `Items, addresses); + boolean enabled = (size(addresses)>0); + UI::ChangeWidget(`edit, `Enabled, enabled); + UI::ChangeWidget(`del, `Enabled, enabled); + ret = (symbol) UI::UserInput(); + string curr = (string)UI::QueryWidget(`addr, `CurrentItem); + switch(ret){ + case `add: + curr=""; + case `edit: + UI::OpenDialog(`VBox(`TextEntry(`id(`ip_addr), _("IP Address"), curr), + `HBox(`PushButton(`id(`cancel), Label::CancelButton()), `PushButton(`id(`ok), Label::OKButton())))); + if ((symbol)UI::UserInput()==`ok){ + list<string> tmp_list = []; + foreach(string row, addresses, { + if (row==curr && curr!="") tmp_list = add(tmp_list, (string)UI::QueryWidget(`ip_addr, `Value)); + else tmp_list = add(tmp_list, row); + }); + if (curr=="") tmp_list = add(tmp_list, (string)UI::QueryWidget(`ip_addr, `Value)); + addresses = tmp_list; + } + UI::CloseDialog(); + break; + case `del: + addresses = filter(string item, addresses, {return (item != curr);}); + break; + case `cancel: + addresses = addr_orig; + case `ok: + ret = nil; + break; + } + }while (ret !=nil); + + UI::CloseDialog(); + return addresses; +} + +symbol handleServerType (string key, map event) ``{ + boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local); + + UI::ChangeWidget(`ipp_listen, `Enabled, local); + if (local){ + boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); + UI::ChangeWidget(`select_addr, `Enabled, listen); + } + UI::ChangeWidget(`server_name, `Enabled, !local); + UI::ChangeWidget(`lookup_server, `Enabled, !local); + UI::ChangeWidget(`test_ipp, `Enabled, !local); + UI::ChangeWidget(`use_default, `Enabled, !local); + + boolean use_def=false; + if (!local) use_def=!(boolean) UI::QueryWidget(`use_default, `Value); + UI::ChangeWidget(`queues, `Enabled, use_def); + UI::ChangeWidget(`lookup_queue, `Enabled, use_def); + if (event["EventReason"]:""=="Activated" && event["ID"]:`nil==`select_addr) { + CUPS::cups_server_settings["BrowseAddress"] = getAddresses(CUPS::cups_server_settings["BrowseAddress"]:[]); + } + return nil; +} + +void storeServerType(string key, map event){ + boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local); + if (local){ + CUPS::cups_installation=`server; + boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); + CUPS::cups_server_settings["Browsing"] = listen ? ["On"] : ["Off"]; + }else{ + CUPS::cups_installation=`client; + } +} + /** * Function to set the data to the hardware dialog * get inspired by summary and getAutoprobedSelectionBox when writing it */ -void SetHWDialogData () { +list > o_items = nil; + +void initHWDialogData (string key) { string new_spooler = Spooler::Get (); if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client"; y2milestone("%1", new_spooler); - list < map > printers = []; + o_items = []; if (new_spooler == "cups") { list < map > items = maplist (map i, Printer::printcap, ``{ y2milestone("printcap %1", i); string def = ""; if (i["name"]:"unknown" == Printer::default_queue) def="Default"; - return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), - "MODEL":i["ppd_info", "model"]:"unknown", - "SPOOL":i["name"]:"unknown", - "DESCR":("<b>" + i["ppd_info", "manufacturer"]:"none" + "<br>" + - " " + i["ppd_info", "model"]:"" + - " / " + i["name"]:"" + "</b><br>" + - (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")) + "<br>" + - _(" Connected As ") + Printerlib::getReplacedString(i["uri"]:"none", false)) + "<br>" + - _(" With Spool ") + i["name"]:"none", + return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), + "MODEL":i["ppd_info", "model"]:"unknown", + "SPOOL":i["name"]:"unknown", + "DESCR": sformat("<b>%1 %2 / %3</b><br>%4<br>%5 %6<br>%7 %8", + i["ppd_info", "manufacturer"]:"none", i["ppd_info", "model"]:"", i["name"]:"", + (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")), + _("Connected As"), Printerlib::getReplacedString(i["uri"]:"none", false), + _("With Spool"), i["name"]:"none" + ), + "DEFAULT":def ]; }); @@ -2200,7 +2362,7 @@ integer pos=0; Printer::conf_unconf_printers = items; maplist(map s, items, { - printers = add(printers, $[ + o_items = add(o_items, $[ "id" : tostring(pos), "rich_descr" : s["DESCR"]:"none", "table_descr":[ @@ -2212,7 +2374,7 @@ pos = pos + 1; }); } else { - printers = [ $[ + o_items = [ $[ "id" : "0", "rich_descr" : "<b>" + CUPS::server_hostname + "</b><br>" + ((CUPS::server_default == true) ? _("Default Queue") : (_(" With Spool ") + Printer::default_queue)), @@ -2223,164 +2385,239 @@ "" ] ] ]; } - WizardHW::SetContents ( printers ); + list<term> term_items = maplist (map i, o_items, { + term t = `item (`id (i["id"]:"")); + foreach (string l, i["table_descr"]:[], { + t = add (t, l); + }); + return t; + }); + UI::ChangeWidget (`id (`_hw_items), `Items, term_items); + if (size(o_items)>0) UI::ChangeWidget(`_hw_sum, `Value, o_items[0, "rich_descr"]:""); + else UI::ChangeWidget(`_hw_sum, `Value, ""); } /** - * Restart detection of printers. - * @return symbol always `next - */ - define symbol runProbeDialog () ``{ - Printer::Detect (); - return `next; - } - - /** - * Run dialog for expert settings - * @return symbol ret (`change_ipp_listen, `cupsd, `cupsusb) - */ - define symbol runCupsExpertDialog() ``{ - - - term contents = `HBox (`HStretch (), `VBox ( - `VStretch (), - `RadioButtonGroup (`id (`rb), - // frame - `Frame (_("Configure CUPS"),`HBox ( - `HSpacing (3), - `VBox ( - `VSpacing (3), - // radiobutton - `Left(`RadioButton( `id(0), _("Change IPP Listen"))), - `Left(`RadioButton( `id(1), _("CUPS Server Se&ttings"))), - `Left(`RadioButton( `id(2), _("CUPS &USB Device Settings"))), - // radiobutton - `VSpacing (3) - ), - `HSpacing (3) - ) - )), - `VStretch () - ), `HStretch ()); - - Wizard::SetContentsButtons (_("Expert CUPS Settings"), contents, getHelpCupsExperts() , - Label::BackButton (), Label::NextButton () ); - - UI::ChangeWidget (`id (`rb), `CurrentButton,0); - - any ret = UI::UserInput(); - if (ret == `next){ - integer option = tointeger(UI::QueryWidget(`id(`rb), `CurrentButton)); - switch (option){ - case 0 : return `change_ipp_listen; - case 1 : return `cupsd; - case 2 : return `cupsusb; - }; - } - return (symbol) ret; - } - - /** * Common detected hardware dialog. * @return symbol for ws */ - define symbol runDetectedDialog () ``{ + define symbol handleDetected (string key, map event) ``{ y2milestone ("Starting detected dialog"); // several functions dialog - WizardHW::CreateHWDialog (_("Printer Configuration"), getComplexHelp (), - [_("Queue Name"),_("Device"), _("Model"), _("Default Queue") ], - [ - [ `redetect, _("Restart Detection") ], - [ `default_q, _("Set Default") ], - [ `cups_expert , _("CUPS Expert Settings") ], - [ `change_ipp_listen, _("Change IPP Listen") ], - [ `change_remote_access, _("Change Remote Access Settings") ] - ]); - SetHWDialogData (); - if (Stage::normal()) Wizard::SetNextButton(`next, Label::FinishButton()); else Wizard::SetNextButton(`next, Label::AcceptButton()); - WizardHW::SetSelectedItem (Printer::runAutoprobedListDialog__current); - - - boolean cont = true; symbol ret=nil; string new_spooler = Spooler::Get (); - while (cont) - { - map hw_ret = WizardHW::WaitForEvent (); - map event = hw_ret["event"]:$[]; - string selected = hw_ret["selected"]:""; - ret = (symbol) event["ID"]:nil; - if (tointeger(selected) != nil) Printer::selectPrinter(tointeger(selected)); + integer selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem)); + if (selected != nil) Printer::selectPrinter(selected); else Printer::selectPrinter(-1); - if (new_spooler == "cups" && CUPS::InstallationType () == `client) - { - new_spooler = "cups-client"; - } - if (ret == `delete) - { - if (new_spooler == "cups-client") {CUPS::cups_installation=`server;new_spooler="cups";} - else if ( (Printer::conf_unconf_printers[tointeger(selected), "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:""))) Printer::deletePrinter (); - SetHWDialogData(); - continue; - } + if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client"; + + // FIXME : test if this is string or term + if ( (symbol)event["ID"]:nil==nil ) { ret=nil; } + else{ + ret = (symbol) event["ID"]:nil; + switch((symbol) event["ID"]:nil){ + 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(""); + ret=nil; + break; // TODO handle all events here - else - if (ret == `default_q) - { - Printer::setDefaultPrinter (); - ret = `restart_button; - } - if (ret == `add) - { - Printer::selectPrinter(-1); - ret = `configure_button; - } - if (ret == `edit) - { - if (new_spooler == "cups") - { - if (Printer::printer == $["type":"yast2"]) - { - integer from_detect = -1; - integer count = 0; - string prn_id=""; - - foreach(map temp_printer, Printer::Detect(), { - string temp_string = splitstring(temp_printer["uri"]:"", ":")[1]:""; - if (tointeger(selected) >= count) - { - if (Printerlib::getReplacedString(temp_string, false) == - Printer::conf_unconf_printers[tointeger(selected), "ID"]:"") - { - from_detect = from_detect + 1; - break; - } - if (temp_string != prn_id) - { - from_detect = from_detect+1; - prn_id = temp_printer["ID"]:""; - } - count=count + 1; - } - }); - Printer::editDetected(Printer::Detect()[from_detect]:$[]); - y2milestone("Configuring detected, non-configured printer %1", Printer::Detect()[from_detect]:$[]); - } - if (Printer::printer["ppd_info", "model"]:nil == nil) ret=`edit_unconf; - else ret = `edit_button; - } else ret=`connection_cups; - } - else if (ret == `redetect) ret = `restart_button; - cont = false; + case `default_q : + Printer::setDefaultPrinter (); + ret = `restart_button; + break; + case `add : + Printer::selectPrinter(-1); + ret = `configure_button; + break; + case `edit : + if (new_spooler == "cups") + { + if (Printer::printer == $["type":"yast2"]) + { + integer from_detect = -1; + integer count = 0; + string prn_id=""; + foreach(map temp_printer, Printer::Detect(), { + string temp_string = splitstring(temp_printer["uri"]:"", ":")[1]:""; + if (selected >= count) + { + if (Printerlib::getReplacedString(temp_string, false) == + Printer::conf_unconf_printers[selected, "ID"]:"") + { + from_detect = from_detect + 1; + break; + } + if (temp_string != prn_id) + { + from_detect = from_detect+1; + prn_id = temp_printer["ID"]:""; + } + count=count + 1; + } + }); + Printer::editDetected(Printer::Detect()[from_detect]:$[]); + y2milestone("Configuring detected, non-configured printer %1", Printer::Detect()[from_detect]:$[]); + } + if (Printer::printer["ppd_info", "model"]:nil == nil) ret=`edit_unconf; + else ret = `edit_button; + } else ret=`connection_cups; + break; + case `redetect: + ret = `restart_button; + break; + default: + if (event["EventReason"]:"" == "SelectionChanged") + { + if (size(o_items)>0) + { + UI::ChangeWidget(`_hw_sum, `Value, o_items[selected, "rich_descr"]:""); + // #247336 - don't allow to edit queues without local filtering (raw:true) + UI::ChangeWidget(`id(`edit), `Enabled, !Printer::printer["raw"]:true); + UI::ChangeWidget(`id(`delete), `Enabled, true); + } else + { + UI::ChangeWidget(`_hw_sum, `Value, ""); + UI::ChangeWidget(`id(`edit), `Enabled, false); + UI::ChangeWidget(`id(`delete), `Enabled, false); + } + } else y2warning("Invalid return: %1, %2", ret, event); + ret = nil; } - return ret; // FIXME } +/* + boolean exists=size((list)UI::QueryWidget(`id(`_hw_items), `Items))>0; + UI::ChangeWidget(`id(`edit), `Enabled, exists); + UI::ChangeWidget(`id(`delete), `Enabled, exists); +*/ + return ret; // FIXME +} + + +void runCups(string key){ + runCupsServerDialog (); +} + + +map > wd = $[ + "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")), + `HBox(`CheckBox(`id(`ipp_listen), `opt(`notify), _("Listen to IPP Broadcast Packets")), + `PushButton(`id(`select_addr), _("Select Addresses")) + ) + ), + `VBox( + `Left(`RadioButton(`id(`remote), `opt(`notify), "Remote CUPS Server" )), + `HBox( + `TextEntry(`id(`server_name), _("Server Name")), + `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), _("Queues")), + `PushButton(`id(`lookup_queue), _("Lookup")) + ) + ) + ))), + `VStretch() + )), + "init" : initServerType, + "handle" : handleServerType, + "store" : storeServerType + ], + "OVERVIEW" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `VWeight(2,`Table (`id (`_hw_items), `opt (`notify, `immediate), + `header(_("Queue Name"),_("Device"), _("Model"), _("Default Queue")))), + `VWeight(1,`RichText (`id (`_hw_sum), "")), + `HBox ( + `PushButton (`id (`add), Label::AddButton ()), + `PushButton (`id (`edit), _("Configure")), + `PushButton (`id (`delete), Label::DeleteButton ()), + `HStretch () + ) + ), + "init" : initHWDialogData, + "handle" : handleDetected, +// "store" : storeOverview, +// "help" : help["overview"]:"" + ], + "SERVER" : $[ + "widget" : `custom, + "custom_widget" : `Empty(), + "init" : runCups + ] + ]; + +map tabs_descr = $[ + "global" : $[ + "header" : _("Global Settings"), + "contents" : `VBox ( + "SERVER_TYPE" + ), + "widget_names" : ["SERVER_TYPE"] + ], + "overview" : $[ + "header" : _("Printers and Queues"), + "contents" : `VBox ( + "OVERVIEW" + ), + "widget_names" : ["OVERVIEW"] + ], + "server" : $[ + "header" : _("Some server settings"), + "contents" : `VBox (), + "widget_names" : ["SERVER"] + ], +]; + + +symbol runDetectedDialog(){ + + string caption = _("Detected Printers"); + map widget_descr = $[ + "tab": CWMTab::CreateWidget($[ + "tab_order": [ "global", "overview", "server" ], + "tabs": tabs_descr, + "widget_descr": wd, + "initial_tab" : "overview", + "tab_help" : "", + ]), + ]; + term contents = `VBox( "tab"); + + list