November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41826 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs-connection.ycp src/common/dialogs.ycp src/common/wizards.ycp src/cups/dialogs-cups.ycp
by mzugec＠svn.opensuse.org 06 Nov '07

06 Nov '07

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=418… ============================================================================== --- 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.ch… ============================================================================== --- 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(a)suse.cz + +- tabbed UI done (without help) +- 2.16.4 + +------------------------------------------------------------------- Fri Nov 2 12:54:13 CET 2007 - mzugec(a)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-conne… ============================================================================== --- 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?r… ============================================================================== --- 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<map<string,any> > 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<string,any> 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<string, map<string,any> > 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?r… ============================================================================== --- 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<string,any> 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<string,any>)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.yc… ============================================================================== --- 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<string,any> 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41825 - in /branches/tmp/sh/mod-ui/core/libyui/src: YApplication.cc YApplication.h YPushButton.cc YUI.h YUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: sh-sh-sh Date: Tue Nov 6 16:41:09 2007 New Revision: 41825 URL: http://svn.opensuse.org/viewcvs/yast?rev=41825&view=rev Log: ported default function key handling Modified: branches/tmp/sh/mod-ui/core/libyui/src/YApplication.cc branches/tmp/sh/mod-ui/core/libyui/src/YApplication.h branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YApplication.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YApplication.cc Tue Nov 6 16:41:09 2007 @@ -18,15 +18,22 @@ /-*/ +#include <map> #include "YApplication.h" #include "YDialog.h" #include "YUIException.h" +#include "YShortcut.h" #include "YUI.h" +using std::map; + +typedef map<string, int> YFunctionKeyMap; + struct YApplicationPrivate { - string iconBasePath; + string iconBasePath; + YFunctionKeyMap defaultFunctionKey; }; @@ -62,8 +69,38 @@ } -void YApplication::setIconBasePath( const string & newIconBasePath ) +void +YApplication::setIconBasePath( const string & newIconBasePath ) { priv->iconBasePath = newIconBasePath; } + +int +YApplication::defaultFunctionKey( const string & label ) const +{ + YFunctionKeyMap::const_iterator result = + priv->defaultFunctionKey.find( YShortcut::cleanShortcutString( label ) ); + + if ( result == priv->defaultFunctionKey.end() ) + return 0; + else + return result->second; +} + + +void +YApplication::setDefaultFunctionKey( const string & label, int fkey ) +{ + if ( fkey > 0 ) + priv->defaultFunctionKey[ YShortcut::cleanShortcutString( label ) ] = fkey; + else + YUI_THROW( YUIException( "Bad function key number" ) ); +} + + +void +YApplication::clearDefaultFunctionKeys() +{ + priv->defaultFunctionKey.clear(); +} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YApplication.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YApplication.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YApplication.h Tue Nov 6 16:41:09 2007 @@ -59,6 +59,41 @@ **/ virtual void setIconBasePath( const string & newIconBasePath ); + /** + * Return the default function key number for a widget with the specified + * label or 0 if there is none. Any keyboard shortcuts that may be + * contained in 'label' are stripped away before any comparison. + * + * The basic idea behind this concept is to have an easy default mapping + * from buttons etc. with the same semantics to function keys: + * + * "OK" -> F10 + * "Accept" -> F10 + * "Yes" -> F10 + * "Next" -> F10 + * + * "Cancel" -> F9 + * "No" -> F9 + * ... + * + * This function returns 10 for F10, F for F9 etc.; + * 0 means "no function key". + **/ + int defaultFunctionKey( const string & label ) const; + + /** + * Add a mapping from the specified label to the specified F-key number. + * This is the counterpart to defaultFunctionKey(). + * + * This only affects widgets that are created after this call. + **/ + void setDefaultFunctionKey( const string & label, int fkey ); + + /** + * Clear all previous label-to-function-key mappings. + **/ + void clearDefaultFunctionKeys(); + protected: Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc Tue Nov 6 16:41:09 2007 @@ -20,6 +20,8 @@ #define y2log_component "ui" #include <ycp/y2log.h> +#include "YUI.h" +#include "YApplication.h" #include "YUISymbols.h" #include "YPushButton.h" @@ -46,6 +48,10 @@ : YWidget( parent ) , priv( new YPushButtonPrivate( label ) ) { + int fkey = YUI::app()->defaultFunctionKey( label ); + + if ( fkey > 0 && ! hasFunctionKey() ) + setFunctionKey( fkey ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Tue Nov 6 16:41:09 2007 @@ -128,9 +128,10 @@ /** * Return the global YApplication object. * - * This will create the YApplication upon the first call and return a pointer to - * the one and only (singleton) YApplication upon each subsequent call. - * This may throw exceptions if the YApplication cannot be created. + * This will create the YApplication upon the first call and return a + * pointer to the one and only (singleton) YApplication upon each + * subsequent call. This may throw exceptions if the YApplication cannot + * be created. **/ static YApplication * app(); @@ -218,13 +219,6 @@ string & dest ); /** - * Returns the default function key number for a widget with the specified - * label or 0 if there is none. Any keyboard shortcuts that may be - * contained in 'label' are stripped away before any comparison. - **/ - int defaultFunctionKey( YCPString label ); - - /** * Returns the current product name * ("SuSE Linux", "SuSE Linux Enterprise Server", "United Linux", etc.). * @@ -899,11 +893,6 @@ deque<YCPValue> fakeUserInputQueue; /** - * The current mapping of widget labels to default function keys. - **/ - YCPMap default_fkeys; - - /** * Flag that keeps track of blocked events. * Never query this directly, use eventsBlocked() instead. **/ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Tue Nov 6 16:41:09 2007 @@ -41,6 +41,7 @@ #include <ycp/YCPVoid.h> #include "YUI.h" +#include "YApplication.h" #include "YEvent.h" #include "YUIException.h" #include "YUISymbols.h" @@ -1783,51 +1784,31 @@ */ void YUI::evaluateSetFunctionKeys( const YCPMap & new_fkeys ) { - default_fkeys = YCPMap(); - - for ( YCPMapIterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it ) + for ( YCPMapIterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it ) + { + if ( it.key()->isString() && it.value()->isInteger() ) { - if ( it.key()->isString() && it.value()->isInteger() ) - { - string label = YShortcut::cleanShortcutString( it.key()->asString()->value() ); - int fkey = it.value()->asInteger()->value(); + string label = YShortcut::cleanShortcutString( it.key()->asString()->value() ); + int fkey = it.value()->asInteger()->value(); - if ( fkey > 0 && fkey <= 24 ) - { - y2debug( "Mapping \"%s\"\t-> F%d", label.c_str(), fkey ); - default_fkeys->add( YCPString( label ), it.value()->asInteger() ); - } - else - { - y2error( "SetFunctionKeys(): Function key %d out of range for \"%s\"", - fkey, label.c_str() ); - } + if ( fkey > 0 && fkey <= 24 ) + { + y2debug( "Mapping \"%s\"\t-> F%d", label.c_str(), fkey ); + app()->setDefaultFunctionKey( label, fkey ); } else { - y2error( "SetFunctionKeys(): Invalid map element: " - "Expected <string>: <integer>, not %s: %s", - it.key()->toString().c_str(), it.value()->toString().c_str() ); + ycperror( "SetFunctionKeys(): Function key %d out of range for \"%s\"", + fkey, label.c_str() ); } } -} - - -int YUI::defaultFunctionKey( YCPString ylabel ) -{ - int fkey = 0; - - string label = YShortcut::cleanShortcutString( ylabel->value() ); - - if ( label.size() > 0 ) - { - YCPValue val = default_fkeys->value( YCPString( label ) ); - - if ( ! val.isNull() && val->isInteger() ) - fkey = val->asInteger()->value(); + else + { + ycperror( "SetFunctionKeys(): Invalid map element: " + "Expected <string>: <integer>, not %s: %s", + it.key()->toString().c_str(), it.value()->toString().c_str() ); + } } - - return fkey; } -- 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] r41824 - /branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc
by sh-sh-sh＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: sh-sh-sh Date: Tue Nov 6 15:42:23 2007 New Revision: 41824 URL: http://svn.opensuse.org/viewcvs/yast?rev=41824&view=rev Log: fixme marker Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Tue Nov 6 15:42:23 2007 @@ -248,6 +248,8 @@ YQMultiSelectionBoxItem * YQMultiSelectionBox::findItem( YItem * wantedItem ) { + // FIXME: Don't search through all items, use the YItem::data() pointer instead + QListViewItemIterator it( _qt_listView ); while ( *it ) -- 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] r41823 - /tags/branch-SLE-10-SP1-2_13_22/product-creator/
by jsuchome＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: jsuchome Date: Tue Nov 6 15:36:40 2007 New Revision: 41823 URL: http://svn.opensuse.org/viewcvs/yast?rev=41823&view=rev Log: Created tag branch-SLE-10-SP1-2_13_22 for product-creator Added: tags/branch-SLE-10-SP1-2_13_22/product-creator/ - copied from r41822, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r41822 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp
by sh-sh-sh＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: sh-sh-sh Date: Tue Nov 6 15:11:11 2007 New Revision: 41822 URL: http://svn.opensuse.org/viewcvs/yast?rev=41822&view=rev Log: added F keys Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp Tue Nov 6 15:11:11 2007 @@ -122,9 +122,9 @@ ); term buttons = `HBox( - `PushButton(`id(`order ), "&Order" ), - `PushButton(`id(`info ), "More &Info" ), - `PushButton(`id(`cancel ), "&Cancel Order" ), + `PushButton(`id(`order ), `opt(`key_F2 ), "&Order" ), + `PushButton(`id(`info ), `opt(`key_F3 ), "More &Info" ), + `PushButton(`id(`cancel ), `opt(`key_F4 ),"&Cancel Order" ), `MenuButton(`id(`special), "&Special...", [ `item(`id(`track_order ), "&Where is my last order?" ), -- 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] r41821 - in /branches/tmp/sh/mod-ui/ncurses/src: NCDialog.cc NCFileSelection.cc NCMenuButton.cc NCPushButton.cc NCWidget.cc NCWidget.h
by sh-sh-sh＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: sh-sh-sh Date: Tue Nov 6 15:05:22 2007 New Revision: 41821 URL: http://svn.opensuse.org/viewcvs/yast?rev=41821&view=rev Log: fixed F-keys Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCD… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Tue Nov 6 15:05:22 2007 @@ -1391,34 +1391,22 @@ for ( tnode<NCWidget*> * c = this->Next(); c; c = c->Next() ) { - int fkey = c->Value()->GetFunctionHotkey( ); - if ( fkey != 0 ) + YWidget * w = dynamic_cast<YWidget *> (c->Value() ); + + if ( w && w->hasFunctionKey() ) { - YWidget * w = dynamic_cast<YWidget *> (c->Value() ); + // Retrieve the widget's "shortcut property" that describes + // whatever it is - regardless of widget type (PushButton, ...) + //YCPSymbol propertyName( w->shortcutProperty() ); + //YCPValue propertyValue = w->queryWidget( propertyName ); + // Get rid of unwanted '&' shortcut markers + //string desc = YShortcut::cleanShortcutString( propertyValue->asString()->value() ); - if ( w ) - { - // Retrieve the widget's "shortcut property" that describes - // whatever it is - regardless of widget type (PushButton, ...) - //YCPSymbol propertyName( w->shortcutProperty() ); - //YCPValue propertyValue = w->queryWidget( propertyName ); - // Get rid of unwanted '&' shortcut markers - //string desc = YShortcut::cleanShortcutString( propertyValue->asString()->value() ); - - // FIXME ??? correct string ??? - string desc = w->debugLabel(); - - int no = fkey - KEY_F(1) + 1; - if ( no == 1 ) - { - hasF1 = true; - } - fkeys[ no ] = desc; - } - else + if ( w->functionKey() == 1 ) { - NCERR << "Dynamic cast to YWidget * failed for" << c->Value() << endl; + hasF1 = true; } + fkeys[ w->functionKey() ] = w->debugLabel(); } } // create the text with sorted F-keys Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCF… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc Tue Nov 6 15:05:22 2007 @@ -350,7 +350,7 @@ data.reserve(6); data.push_back( fileInfo._name ); char size_buf[50]; - sprintf( size_buf, "%ld", fileInfo._size); + sprintf( size_buf, "%lld", fileInfo._size); data.push_back( size_buf ); data.push_back( fileInfo._perm ); data.push_back( fileInfo._user ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Tue Nov 6 15:05:22 2007 @@ -39,11 +39,6 @@ WIDDBG << endl; setLabel( nlabel ); hotlabel = &label; - - // FIXME - // if ( opt.isDefaultButton.value() ) - // setKeyboardFocus(); - // setFunctionHotkey( opt ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc Tue Nov 6 15:05:22 2007 @@ -36,9 +36,6 @@ setWidgetRep(this); setLabel( nlabel ); hotlabel = &label; - - // FIXME !!! - //setFunctionHotkey( opt ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc Tue Nov 6 15:05:22 2007 @@ -49,7 +49,6 @@ , skipNoDimWin( true ) , wstate( NC::WSnormal ) , hotlabel( 0 ) - , hotfkey( 0 ) { NCWidget * myparent = dynamic_cast<NCWidget *> (parent); @@ -71,7 +70,6 @@ , skipNoDimWin( true ) , wstate( NC::WSnormal ) , hotlabel( 0 ) - , hotfkey( 0 ) { if ( myparent ) { ReparentTo( *myparent ); @@ -590,29 +588,19 @@ // bool NCWidget::HasFunctionHotkey( int key ) const { - if ( key < 0 || (hotfkey == 0) ) - return false; - - return( key == hotfkey ) ; -} + const YWidget * w = dynamic_cast<const YWidget *>( this ); -int NCWidget::GetFunctionHotkey() const -{ - return hotfkey; -} + if ( w ) + { + if ( key < 0 || ( ! w->hasFunctionKey() ) ) + return false; -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : NCWidget::setFunctionHotkey -// METHOD TYPE : void -// -// DESCRIPTION : -// -void NCWidget::setFunctionHotkey( const YWidgetOpt & opt ) -{ - if ( opt.key_Fxx.value() > 0 ) + return( key == KEY_F( w->functionKey() ) ); + } + else { - hotfkey = KEY_F( (int) opt.key_Fxx.value() ); + NCERR << "No YWidget" << endl; + return false; } } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h Tue Nov 6 15:05:22 2007 @@ -123,9 +123,6 @@ protected: NClabel * hotlabel; - int hotfkey; - - virtual void setFunctionHotkey( const YWidgetOpt & opt ); public: @@ -166,7 +163,6 @@ virtual bool HasHotkey( int key ) const; virtual bool HasFunctionHotkey( int key ) const; - virtual int GetFunctionHotkey() const; virtual NCursesEvent wHandleHotkey( wint_t key ); virtual NCursesEvent wHandleInput( wint_t key ); -- 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] r41820 - /tags/stable-2_16_3/ca-management/
by mcalmer＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: mcalmer Date: Tue Nov 6 15:03:55 2007 New Revision: 41820 URL: http://svn.opensuse.org/viewcvs/yast?rev=41820&view=rev Log: Created tag stable-2_16_3 for ca-management Added: tags/stable-2_16_3/ca-management/ - copied from r41819, trunk/ca-management/ -- 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] r41819 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes
by mcalmer＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: mcalmer Date: Tue Nov 6 15:03:47 2007 New Revision: 41819 URL: http://svn.opensuse.org/viewcvs/yast?rev=41819&view=rev Log: version 2.16.3 Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=41819&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Tue Nov 6 15:03:47 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Tue Nov 6 15:03:47 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 6 14:48:43 CET 2007 - mc(a)suse.de + +- version 2.16.3 +- Ask for a password during import CA [#337524] + +------------------------------------------------------------------- Mon Oct 29 18:10:12 CET 2007 - mc(a)suse.de - merge SP1 changes to trunk -- 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] r41818 - in /trunk/ca-management/src: YaPI/CaManagement.pm util.ycp
by mcalmer＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: mcalmer Date: Tue Nov 6 15:03:20 2007 New Revision: 41818 URL: http://svn.opensuse.org/viewcvs/yast?rev=41818&view=rev Log: fix importCA Modified: trunk/ca-management/src/YaPI/CaManagement.pm trunk/ca-management/src/util.ycp Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagem… ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Tue Nov 6 15:03:20 2007 @@ -6693,7 +6693,7 @@ * caKey (required - path to private key in PEM format) -* caPasswd (required, if the private key is unencrypted) +* caPasswd (required; password of the private key or a new password if the key is unencrypted) The return value is "undef" on an error and "1" on success. @@ -6702,7 +6702,8 @@ my $data = { caName => 'My_CA', caCertificate => /path/to/cacert.pem, - caKey => /path/to/cacert.key + caKey => /path/to/cacert.key, + caPasswd => "secret" }; my $res = YaPI::CaManagement->ImportCA($data); @@ -6750,23 +6751,24 @@ code => "FILE_DOES_NOT_EXIST"); } + if (!exists $data->{caPasswd} || !defined $data->{"caPasswd"} ) { + return $self->SetError( summary => __("Missing value 'caPasswd'."), + code => "CHECK_PARAM_FAILED"); + } + eval { my $cert = LIMAL::CaMgm::LocalManagement::readFile($data->{caCertificate}); my $key = LIMAL::CaMgm::LocalManagement::readFile($data->{caKey}); - if(!exists $data->{caPasswd} || !defined $data->{caPasswd}) { - $data->{caPasswd} = ""; - } - - if( defined $data->{'repository'}) { - + if( defined $data->{'repository'}) + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}, $data->{"repository"}); - - } else { - + } + else + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}); } Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=4… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Tue Nov 6 15:03:20 2007 @@ -1318,6 +1318,7 @@ ) ) ), + `Password( `id (`passKey), _("&Key Password")), `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -1364,17 +1365,28 @@ string caCertificate = (string) UI::QueryWidget(`id(`pathCert), `Value); string caKey = (string) UI::QueryWidget(`id(`pathKey), `Value); + string caPasswd = (string) UI::QueryWidget(`id(`passKey), `Value); string caName = (string) UI::QueryWidget(`id(`caName), `Value); if (size (caCertificate) == 0) { + // Error popup Popup::Error(_("Path to certificate file required.")); ret = `again; } else if (size (caKey) == 0) { + // Error popup Popup::Error(_("Path of the private key required.")); ret = `again; - } else if (size (caName) == 0) + } + else if (size (caPasswd) == 0) { + // Error popup + Popup::Error(_("Key Password is required. \nIt must be the password for the encrypted key or a new one in case of a not encrypted key.")); + ret = `again; + } + else if (size (caName) == 0) + { + // Error popup Popup::Error(_("CA name required.")); ret = `again; } @@ -1385,37 +1397,26 @@ UI::OpenDialog(`VBox(`Label(_("Importing request...")))); boolean yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey]); - y2milestone ("ImportRequest(%1,%2,%3) return %4", + "caCertificate" : caCertificate, + "caKey" : caKey, + "caPasswd" : caPasswd + ]); + y2milestone ("ImportRequest(%1,%2,%3, <passwd>) return %4", caName, caCertificate, caKey, yapiret); - if (!yapiret) - { - // Checking if password required only - map<string,any> messageMap = YaPI::Error(); - if (messageMap["code"]:"" == "PASSWD_REQUIRED") - { - yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey, - "caPasswd" : getPassword(caName) - ]); - - } - } if (yapiret == nil) { - showErrorCaManagement (); - ret = `again; + showErrorCaManagement (); + ret = `again; } else { - Popup::Message(_("Request has been imported.")); - success = true; - } + // Error popup + Popup::Message(_("CA has been imported.")); + success = true; + } UI::CloseDialog (); } } -- 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] r41817 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp src/wizards.ycp
by jsuchome＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: jsuchome Date: Tue Nov 6 14:01:12 2007 New Revision: 41817 URL: http://svn.opensuse.org/viewcvs/yast?rev=41817&view=rev Log: - remove unsupported source types also for product-creator-> kiwi workflow (#339110) - 2.13.22 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue Nov 6 14:01:12 2007 @@ -1 +1 @@ -2.13.21 +2.13.22 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Nov 6 14:01:12 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 6 13:09:09 CET 2007 - jsuchome(a)suse.cz + +- remove unsupported source types also for product-creator-> kiwi + workflow (#339110) +- 2.13.22 + +------------------------------------------------------------------- Mon Nov 5 21:56:21 CET 2007 - jsuchome(a)suse.cz - do not allow source types not supported by kiwi (#339110) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Tue Nov 6 14:01:12 2007 @@ -1926,7 +1926,7 @@ if (failed_repositories != []) { // continue/cancel popup %1 is a \n separated list - if (!Popup::ContinueCancel (sformat (_("Failed to add these repositories: + if (!Popup::ContinueCancel (sformat (_("Failed to add these installation sources: %1. Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Tue Nov 6 14:01:12 2007 @@ -17,6 +17,7 @@ import "Package"; import "PackageCallbacksInit"; import "Sequencer"; +import "URL"; include "product-creator/complex.ycp"; include "product-creator/dialogs.ycp"; @@ -133,6 +134,27 @@ symbol InitSources () { ProductCreator::EnableSource(); + + // remove the source types unsupported by kiwi (#339110) + list<string> sources = []; + list<string> removed = []; + foreach (string url, ProductCreator::Config["sources"]:[], { + map parsed = URL::Parse(url); + if (contains (Kiwi::unsupported_schemes, parsed["scheme"]:"")) + removed = add (removed, url); + else + sources = add (sources, url); + }); + ProductCreator::Config["sources"] = sources; + if (removed != []) + { + // message popup, %1 is a \n separated list + Popup::Message (sformat (_("These installation sources are not supported by kiwi: + +%1. + +They were removed from current configuration."), mergestring (removed, "\n"))); + } return `next; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0