October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66341 - in /trunk/printer: ./ package/ src/ tools/
by jsmeix＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: jsmeix Date: Fri Oct 7 15:17:19 2011 New Revision: 66341 URL: http://svn.opensuse.org/viewcvs/yast?rev=66341&view=rev Log: - Added new driver "epson-inkjet-printer-escpr" to the "Add Driver" dialog (bnc#722625). - Fixed typos in help texts (bnc#703201). - 2.21.0 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/Printerlib.ycp trunk/printer/src/autoconfig.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/driveradd.ycp trunk/printer/src/helps.ycp trunk/printer/src/printer_auto.ycp trunk/printer/src/printer_proposal.ycp trunk/printer/tools/autodetect_print_queues trunk/printer/tools/autodetect_printers trunk/printer/tools/create_printer_ppd_database trunk/printer/tools/cups_client_only trunk/printer/tools/determine_printer_driver_options trunk/printer/tools/modify_cupsd_conf trunk/printer/tools/test_device trunk/printer/tools/test_remote_ipp trunk/printer/tools/test_remote_lpd trunk/printer/tools/test_remote_novell trunk/printer/tools/test_remote_smb trunk/printer/tools/test_remote_socket Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=66341&r1=663… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Oct 7 15:17:19 2011 @@ -1 +1 @@ -2.20.8 +2.21.0 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 Fri Oct 7 15:17:19 2011 @@ -1,7 +1,15 @@ ------------------------------------------------------------------- +Fri Oct 7 15:11:58 CEST 2011 - jsmeix(a)suse.de + +- Added new driver "epson-inkjet-printer-escpr" + to the "Add Driver" dialog (bnc#722625). +- Fixed typos in help texts (bnc#703201). +- 2.21.0 + +------------------------------------------------------------------- Fri Aug 5 12:34:37 CEST 2011 - tgoettlicher(a)suse.de -- fixed .desktop file (bnc #681249) +- Removed "X-KDE-RootOnly=true" from printer.desktop (bnc#681249). ------------------------------------------------------------------- Thu Feb 10 16:06:03 CET 2011 - jsmeix(a)suse.de @@ -458,7 +466,7 @@ ------------------------------------------------------------------- Thu Apr 23 13:24:07 CEST 2009 - jsmeix(a)suse.de -- When printing a testpage in the Overview dialog, explicitely +- When printing a testpage in the Overview dialog, explicitly show the pending print jobs so that the user can now better decide whether or not the pending jobs could be deleted. - Fixed serial printer setup in the Connection Wizard Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6634… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Fri Oct 7 15:17:19 2011 @@ -133,7 +133,7 @@ * not the last character in the alphabet, e.g. the Estonian alphabet ends * with ... s ... z ... t u v w ... x y (non-ASCII characters omitted here) * so that [a-z] would exclude t u v w x y in an Estonian locale. - * Therefore uppercase and lowercase characters are both explicitely listed + * Therefore uppercase and lowercase characters are both explicitly listed * to avoid any unexpected result e.g. of "tolower(uppercase_characters)". */ global string number_chars = "0123456789"; @@ -750,7 +750,7 @@ { // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); return false; } @@ -763,7 +763,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); // Progress last stage (progress finished): if( Abort() ) return false; Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=6… ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Fri Oct 7 15:17:19 2011 @@ -142,7 +142,7 @@ { y2milestone( "TestAndInstallPackage: Failed to install required package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: - // Either the user has explicitely rejected to install the package, + // Either the user has explicitly rejected to install the package, // or this error does not happen on a normal system // (i.e. a system which is not totally broken or totally messed up). sformat( _("Failed to install required package %1."), @@ -464,7 +464,7 @@ // which is even the fallback if there is no "Browsing" entry at all // or when the "Browsing" entry is deactivated by a leading '#' character. // Therefore browsing_on is only false if "Browsing Off" or "Browsing No" -// is explicitely set in /etc/cups/cupsd.conf. +// is explicitly set in /etc/cups/cupsd.conf. global boolean cupsd_conf_browsing_on = true; global boolean DetermineBrowsing() Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Fri Oct 7 15:17:19 2011 @@ -159,7 +159,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } if( ! Printerlib::TestAndInstallPackage( package_name, "installed" ) ) Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Fri Oct 7 15:17:19 2011 @@ -973,7 +973,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it @@ -1251,7 +1251,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it @@ -1603,7 +1603,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it @@ -1770,7 +1770,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it @@ -2889,7 +2889,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } } Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=66… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Fri Oct 7 15:17:19 2011 @@ -55,7 +55,8 @@ boolean splix_installed = Printerlib::TestAndInstallPackage( "splix", "installed" ) || Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" ); - y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed ); + boolean epson_inkjet_printer_escpr_installed = Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "installed" ); + y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8' epson_inkjet_printer_escpr_installed:'%9'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed , epson_inkjet_printer_escpr_installed ); term contents = `VBox ( `VStretch(), `Left @@ -144,12 +145,22 @@ `Left ( `CheckBox ( `id("m2300w"), - // CheckBox to select or un-select the printer driver package manufacturer-PPDs. + // CheckBox to select or un-select the printer driver package m2300w. // There is no need to have the package name "m2300w" in this text // because it is shown in a separated column to the left of this text. "m2300&w : " + _("Driver for Konica Minolta 2300W and 2400W (unmaintained)"), m2300w_installed ) + ), + `Left + ( `CheckBox + ( `id("epson-inkjet-printer-escpr"), + // CheckBox to select or un-select the printer driver package epson-inkjet-printer-escpr. + // There is no need to have the package name "epson-inkjet-printer-escpr" in this text + // because it is shown in a separated column to the left of this text. + "&epson-inkjet-printer-escpr : " + _("Epson ESC/P-R Inkjet Printer Driver"), + epson_inkjet_printer_escpr_installed + ) ) ) ), @@ -232,6 +243,7 @@ boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value ); boolean splix_install = (boolean)UI::QueryWidget( `id("splix"), `Value ); boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value ); + boolean epson_inkjet_printer_escpr_install = (boolean)UI::QueryWidget( `id("epson-inkjet-printer-escpr"), `Value ); string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value ); // Ignore an effectively empty ppd_path_input_value: if( OpenPrintingPPDs_ghostscript_install == OpenPrintingPPDs_ghostscript_installed @@ -242,6 +254,7 @@ && manufacturer_PPDs_install == manufacturer_PPDs_installed && splix_install == splix_installed && m2300w_install == m2300w_installed + && epson_inkjet_printer_escpr_install == epson_inkjet_printer_escpr_installed && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) { y2milestone( "Nothing changed in AddDriverDialog." ); @@ -469,6 +482,18 @@ } } } + if( epson_inkjet_printer_escpr_install != epson_inkjet_printer_escpr_installed ) + { if( epson_inkjet_printer_escpr_install ) + { if( Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "install" ) ) + { package_changed = true; + } + } + else + { if( Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "remove" ) ) + { package_changed = true; + } + } + } // If driver packages were actually changed (the user may have rejected it), // enforce that the BasicAddDialog and/or the BasicModifyDialog // (only form those dialogs this AddDriverDialog can be called) @@ -494,7 +519,7 @@ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" - // so that this leftover "abort" button must be explicitely hidden here: + // so that this leftover "abort" button must be explicitly hidden here: Wizard::HideAbortButton(); } // Ignore an effectively empty ppd_path_input_value: Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=66341&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Fri Oct 7 15:17:19 2011 @@ -190,7 +190,7 @@ Some driver option settings must match to your particular printer. In particular the default paper size setting of the driver must match to the paper which is actually loaded in your printer. -You can either explicitely select A4 or Letter as default paper size +You can either explicitly select A4 or Letter as default paper size or select nothing to use the built-in default paper size of the driver which is also the fallback if the driver neither supports A4 nor Letter (for example a driver for a small-format photo printer). @@ -467,7 +467,7 @@ For example if a password is actually 'Foo%20Bar' (non-percent-encoded), it must be entered literally in the password input field in the dialog. The automated percent-encoding results 'Foo%2520Bar' which is how -the vaule of the password component is actually stored in the URI. +the value of the password component is actually stored in the URI. In contrast when an input field in the dialog is intended to enter more that a single value for a single component of the URI (e.g. a single input field for all optional parameters @@ -707,12 +707,12 @@ to make printers available via network. In this case remote CUPS servers must publish their printers via network and accordingly on your host the CUPS daemon process (cupsd) must run -which is listening for incomming information about published printers. -CUPS Browsing information is recieved via UDP port 631. +which is listening for incoming information about published printers. +CUPS Browsing information is received via UDP port 631. Regarding firewall: Check if a firewall is active for a network zone in which printers are published via network. -By default the SuSEfirewall allows any incomming information +By default the SuSEfirewall allows any incoming information via a network interface which belongs to the 'internal zone' because this zone is trusted by default. It does not make sense to do printing in a trusted internal network @@ -738,7 +738,7 @@ _(" If you can access remote CUPS servers for printing but those servers do not publish their printer information via network -or when you cannot accept incomming information about published printers +or when you cannot accept incoming information about published printers (e.g. because you must have firewall protection for the network zone in which printers are published), you can request printer information from CUPS servers (provided the CUPS servers allow your access). @@ -779,8 +779,8 @@ its so called 'Browsing' mode to make printers available via network. In this case CUPS servers publish their local print queues via network and accordingly on CUPS client systems the CUPS daemon process (cupsd) must run -which is listening for incomming information about published printers. -CUPS Browsing information is recieved via UDP port 631. +which is listening for incoming information about published printers. +CUPS Browsing information is received via UDP port 631. ") + // SharingDialog help 2/4: _(" Modified: trunk/printer/src/printer_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_auto.ycp?rev… ============================================================================== --- trunk/printer/src/printer_auto.ycp (original) +++ trunk/printer/src/printer_auto.ycp Fri Oct 7 15:17:19 2011 @@ -271,7 +271,7 @@ // which is only the "Printing via Network" and the "Overview" dialogs // but without running before ReadDialog (which calls only Printer::Read) // and running afterwards WriteDialog (which calls only Printer::Write) - // which is the reason that Printer::Read is called explicitely above. + // which is the reason that Printer::Read is called explicitly above. ret = PrinterAutoSequence(); } /* Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp… ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Fri Oct 7 15:17:19 2011 @@ -330,7 +330,7 @@ // which are all the usual dialogs (starting with the "Overview") // but without running before ReadDialog (which calls only Printer::Read) // and running afterwards WriteDialog (which calls only Printer::Write) - // which is the reason that Printer::Read is called explicitely above. + // which is the reason that Printer::Read is called explicitly above. symbol seq = (symbol) WFM::CallFunction("printer", [.propose]); y2debug("seq=%1",seq); ret = $[ "workflow_sequence" : seq ]; Modified: trunk/printer/tools/autodetect_print_queues URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_q… ============================================================================== --- trunk/printer/tools/autodetect_print_queues (original) +++ trunk/printer/tools/autodetect_print_queues Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x Modified: trunk/printer/tools/autodetect_printers URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_printer… ============================================================================== --- trunk/printer/tools/autodetect_printers (original) +++ trunk/printer/tools/autodetect_printers Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x @@ -37,7 +37,7 @@ # Test if cupsd on localhost is accessible. # Only on localhost print queues should be set up. # CUPS supports even remote queue setup but this is not supported by YaST. -# Therefore explicitely the cupsd on localhost is asked for autodetected printer information. +# Therefore explicitly the cupsd on localhost is asked for autodetected printer information. echo 'Testing if cupsd on localhost is accessible...' >>$PROGRESS # Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. # Therefore we must now grep in its output: Modified: trunk/printer/tools/create_printer_ppd_database URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/create_printer_ppd… ============================================================================== --- trunk/printer/tools/create_printer_ppd_database (original) +++ trunk/printer/tools/create_printer_ppd_database Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x @@ -37,7 +37,7 @@ # Test if cupsd on localhost is accessible. # Only on localhost print queues should be set up. # CUPS supports even remote queue setup but this is not supported by YaST. -# Therefore explicitely the cupsd on localhost is asked for printer driver information. +# Therefore explicitly the cupsd on localhost is asked for printer driver information. echo 'Testing if cupsd on localhost is accessible...' >>$PROGRESS # Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. # Therefore we must now grep in its output: Modified: trunk/printer/tools/cups_client_only URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/cups_client_only?r… ============================================================================== --- trunk/printer/tools/cups_client_only (original) +++ trunk/printer/tools/cups_client_only Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x Modified: trunk/printer/tools/determine_printer_driver_options URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/determine_printer_… ============================================================================== --- trunk/printer/tools/determine_printer_driver_options (original) +++ trunk/printer/tools/determine_printer_driver_options Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x @@ -36,7 +36,7 @@ # Test if cupsd on localhost is accessible. # Only on localhost print queue settings should be changed. # CUPS supports to modify even remote queues but this is not supported by YaST. -# Therefore explicitely the cupsd on localhost is asked for printer driver options. +# Therefore explicitly the cupsd on localhost is asked for printer driver options. # Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. # Therefore we must now grep in its output: if $LPSTAT -h localhost -r | grep -q 'scheduler is not running' Modified: trunk/printer/tools/modify_cupsd_conf URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/modify_cupsd_conf?… ============================================================================== --- trunk/printer/tools/modify_cupsd_conf (original) +++ trunk/printer/tools/modify_cupsd_conf Fri Oct 7 15:17:19 2011 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010, 2011 #set -x @@ -26,7 +26,7 @@ echo " (Browsing On should be set when BrowseAllow or BrowseAddress is not 'none')" 1>&2 echo "BrowseAllow [ all | @LOCAL | host-address | network-address/netmask ] | BrowseAllow none" 1>&2 echo "e.g.: BrowseAllow '@LOCAL 192.168.100.1 192.168.200.0/255.255.255.0'" 1>&2 - echo " BrowseAllow none (to deny all incomming browse packets)" 1>&2 + echo " BrowseAllow none (to deny all incoming browse packets)" 1>&2 echo "BrowsePoll [ host-address ] | BrowsePoll none" 1>&2 echo "e.g.: BrowsePoll '192.168.100.1 192.168.200.1'" 1>&2 echo " BrowsePoll none (to poll not at all, i.e. no BrowsePoll line)" 1>&2 Modified: trunk/printer/tools/test_device URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_device?rev=66… ============================================================================== --- trunk/printer/tools/test_device (original) +++ trunk/printer/tools/test_device Fri Oct 7 15:17:19 2011 @@ -6,7 +6,7 @@ # 2 problems while writing to $2 # # Jan Holesovsky <kendy(a)suse.cz>, 2000 -# Johannes Meixner <jsmeix(a)suse.de>, 2008, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2008, 2010, 2011 # $Id: test_device 2928 2002-06-27 08:53:17Z jsrain $ #set -x Modified: trunk/printer/tools/test_remote_ipp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_ipp?re… ============================================================================== --- trunk/printer/tools/test_remote_ipp (original) +++ trunk/printer/tools/test_remote_ipp Fri Oct 7 15:17:19 2011 @@ -16,7 +16,7 @@ # The program head is in the coreutils RPM and therefore assumed to exist. # The program rpm is assumed to exist and even if not it triggers only a non-matching warning message. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010, 2011 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_ipp 43943 2008-01-28 13:38:58Z mzugec $ Modified: trunk/printer/tools/test_remote_lpd URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_lpd?re… ============================================================================== --- trunk/printer/tools/test_remote_lpd (original) +++ trunk/printer/tools/test_remote_lpd Fri Oct 7 15:17:19 2011 @@ -20,7 +20,7 @@ # since Suse Linux 11.0 /bin/mktemp is in the coreutils RPM which is required by YaST # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010, 2011 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_lpd 43943 2008-01-28 13:38:58Z mzugec $ Modified: trunk/printer/tools/test_remote_novell URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_novell… ============================================================================== --- trunk/printer/tools/test_remote_novell (original) +++ trunk/printer/tools/test_remote_novell Fri Oct 7 15:17:19 2011 @@ -9,7 +9,7 @@ # (11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb) # 17 give up empty-handed because nprint not executable (no ncpfs RPM installed?) # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010, 2011 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_novell 43943 2008-01-28 13:38:58Z mzugec $ Modified: trunk/printer/tools/test_remote_smb URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_smb?re… ============================================================================== --- trunk/printer/tools/test_remote_smb (original) +++ trunk/printer/tools/test_remote_smb Fri Oct 7 15:17:19 2011 @@ -11,7 +11,7 @@ # 16 give up empty-handed because smbclient not executable (no samba-client RPM installed?) # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010, 2011 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_smb 43943 2008-01-28 13:38:58Z mzugec $ Modified: trunk/printer/tools/test_remote_socket URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_socket… ============================================================================== --- trunk/printer/tools/test_remote_socket (original) +++ trunk/printer/tools/test_remote_socket Fri Oct 7 15:17:19 2011 @@ -11,7 +11,7 @@ # 11 give up empty-handed because netcat not executable (no netcat RPM installed?) # The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009, 2010 +# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009, 2010, 2011 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_socket 43943 2008-01-28 13:38:58Z mzugec $ -- 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] r66340 - in /branches/SuSE-Code-11-SP2-Branch/devtools: VERSION package/yast2-devtools.changes
by mvidner＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: mvidner Date: Fri Oct 7 15:11:21 2011 New Revision: 66340 URL: http://svn.opensuse.org/viewcvs/yast?rev=66340&view=rev Log: bump Modified: branches/SuSE-Code-11-SP2-Branch/devtools/VERSION branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Modified: branches/SuSE-Code-11-SP2-Branch/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/VERSION Fri Oct 7 15:11:21 2011 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Fri Oct 7 15:11:21 2011 @@ -5,6 +5,7 @@ - create-spec: added spec file license - create-spec: adjusted whitespace to comply with prepare_spec - create-spec: use %version to minimize diffs +- 2.17.9 ------------------------------------------------------------------- Thu Oct 6 15:00:59 CEST 2011 - visnov(a)suse.cz -- 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] r66339 - in /branches/SuSE-Code-11-SP2-Branch/devtools: ./ devtools/bin/create-spec package/yast2-devtools.changes
by mvidner＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: mvidner Date: Fri Oct 7 15:10:10 2011 New Revision: 66339 URL: http://svn.opensuse.org/viewcvs/yast?rev=66339&view=rev Log: - create-spec: added spec file license - create-spec: adjusted whitespace to comply with prepare_spec - create-spec: use %version to minimize diffs svn merge -c65922 -c65933 -c65941 http://svn.opensuse.org/svn/yast/trunk/devtools Modified: branches/SuSE-Code-11-SP2-Branch/devtools/ (props changed) branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Modified: branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec Fri Oct 7 15:10:10 2011 @@ -74,24 +74,38 @@ "\@HEADER-COMMENT\@" => "# -# spec file for package $RPMNAME (Version $VERSION) +# spec file for package $RPMNAME # -# norootforbuild", -#", +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An \"Open Source License\" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild # The group tag is only a dummy entry. The correct one is inserted by # prepare_spec. +", "\@HEADER\@" => -"Name: $RPMNAME -Version: $VERSION -Release: 0 +"Name: $RPMNAME +Version: $VERSION +Release: 0 License: $LICENSE Group: System/YaST -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: $RPMNAME-$VERSION.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: $RPMNAME-%{version}.tar.bz2 -prefix: /usr +Prefix: /usr $provides_locale", # The group tag is only a dummy entry. The correct one is inserted by @@ -104,13 +118,13 @@ "\@HEADER-INSTSYS\@" => "\%package instsys -Group: SuSE internal", +Group: SuSE internal", ##### PREP ##### "\@PREP\@" => "\%prep -\%setup -n $RPMNAME-$VERSION", +\%setup -n $RPMNAME-%{version}", ##### BUILD ##### Modified: branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Fri Oct 7 15:10:10 2011 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Fri Oct 7 14:56:33 CEST 2011 - mvidner(a)suse.cz -- create_spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). +- create-spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). +- create-spec: added spec file license +- create-spec: adjusted whitespace to comply with prepare_spec +- create-spec: use %version to minimize diffs ------------------------------------------------------------------- Thu Oct 6 15:00:59 CEST 2011 - visnov(a)suse.cz -- 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] r66338 - /tags/branch-Code-11-SP2-2_17_7/snapper/
by jsuchome＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: jsuchome Date: Fri Oct 7 15:01:22 2011 New Revision: 66338 URL: http://svn.opensuse.org/viewcvs/yast?rev=66338&view=rev Log: Created tag branch-Code-11-SP2-2_17_7 for snapper Added: tags/branch-Code-11-SP2-2_17_7/snapper/ - copied from r66337, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r66337 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION package/yast2-snapper.changes
by jsuchome＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: jsuchome Date: Fri Oct 7 15:01:06 2011 New Revision: 66337 URL: http://svn.opensuse.org/viewcvs/yast?rev=66337&view=rev Log: - removed conflicting statusToString - 2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Fri Oct 7 15:01:06 2011 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Fri Oct 7 15:01:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 7 14:41:26 CEST 2011 - jsuchome(a)suse.cz + +- removed conflicting statusToString +- 2.17.7 + +------------------------------------------------------------------- Fri Oct 7 09:07:43 CEST 2011 - jsuchome(a)suse.cz - show path to current subvolume above filesystem tree (bnc#719482) -- 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] r66336 - /tags/stable-2_21_12/snapper/
by jsuchome＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: jsuchome Date: Fri Oct 7 15:00:47 2011 New Revision: 66336 URL: http://svn.opensuse.org/viewcvs/yast?rev=66336&view=rev Log: Created tag stable-2_21_12 for snapper Added: tags/stable-2_21_12/snapper/ - copied from r66335, trunk/snapper/ -- 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] r66335 - in /branches/SuSE-Code-11-SP2-Branch/devtools: devtools/bin/create-spec package/yast2-devtools.changes
by mvidner＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: mvidner Date: Fri Oct 7 14:56:45 2011 New Revision: 66335 URL: http://svn.opensuse.org/viewcvs/yast?rev=66335&view=rev Log: create_spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). Modified: branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Modified: branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec Fri Oct 7 14:56:45 2011 @@ -30,7 +30,7 @@ my $RPMNAME = `cat RPMNAME`; my $VERSION = `cat VERSION`; my $MAINTAINER = `cat MAINTAINER`; -my $LICENSE = -f "YAST_LICENSE" ? "YaST License" : "GPL"; +my $LICENSE = -f "YAST_LICENSE" ? "YaST License" : "GPL-2.0+"; my $PREFIX = "/usr"; Modified: branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devto… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Fri Oct 7 14:56:45 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 7 14:56:33 CEST 2011 - mvidner(a)suse.cz + +- create_spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). + +------------------------------------------------------------------- Thu Oct 6 15:00:59 CEST 2011 - visnov(a)suse.cz - Drop all-packages (bnc #722483) -- 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] r66334 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: lslezak Date: Fri Oct 7 14:46:53 2011 New Revision: 66334 URL: http://svn.opensuse.org/viewcvs/yast?rev=66334&view=rev Log: optimization - skip the other input handlers after handling timeout event Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Fri Oct 7 14:46:53 2011 @@ -803,6 +803,8 @@ mtime = current_mtime; } + + continue; } if (ret == `cancel) ret = `abort; -- 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] r66333 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: lslezak Date: Fri Oct 7 14:44:57 2011 New Revision: 66333 URL: http://svn.opensuse.org/viewcvs/yast?rev=66333&view=rev Log: cleanup - 'joylist' variable need not to be global Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Fri Oct 7 14:44:57 2011 @@ -27,8 +27,6 @@ include "sound/volume_routines.ycp"; include "sound/routines.ycp"; - list joylist = []; - // notice about USB devices, used at several places string usb_notice = _("USB joysticks do not need any configuration, just connect them."); @@ -128,7 +126,7 @@ } // list of joystick drivers and models - joylist = maplist(string modname, list<string> models, JoystickDB, ``( + list joylist = maplist(string modname, list<string> models, JoystickDB, ``( maplist(string model, models, ``([modname, model])) )); joylist = flatten ((list<list>)joylist); -- 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] r66332 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 07 Oct '11

07 Oct '11

Author: lslezak Date: Fri Oct 7 14:43:59 2011 New Revision: 66332 URL: http://svn.opensuse.org/viewcvs/yast?rev=66332&view=rev Log: added comments Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Fri Oct 7 14:43:59 2011 @@ -29,6 +29,7 @@ list joylist = []; + // notice about USB devices, used at several places string usb_notice = _("USB joysticks do not need any configuration, just connect them."); /** @@ -66,6 +67,11 @@ } + /* + * Find index of the sound card in Sound::modules_conf + * @param sound card map (as returned from .probe.sound) + * @return integer index in Sound::modules_conf + */ integer find_sound_card_id(map sound_card) { integer i = 0; @@ -121,6 +127,7 @@ mod = Joystick::generic_joystick_translated; } + // list of joystick drivers and models joylist = maplist(string modname, list<string> models, JoystickDB, ``( maplist(string model, models, ``([modname, model])) )); @@ -246,16 +253,31 @@ return s; } + /* + * Create unique widget id for a broken joystick config + * @param index index of non-working joystick configuration + * @return string the ID + */ define string broken_id(integer index) { return sformat("broken_%1", index); } + /* + * Belogs the ID to a broken joystick? + * @param id + * @return boolean true if the ID belongs to a broken configuration + */ define boolean is_broken(string id) { return regexpmatch(id, "broken_[0-9]+"); } + /* + * Get the joystick index from broken ID string + * @param id + * @return integer the ID or nil if the ID do not belong to a broken configuration + */ define integer broken_index(string id) { string num = regexpsub(id, "broken_([0-9]+)", "\\1"); @@ -268,6 +290,10 @@ return tointeger(num); } + /* + * Create content for the joystick overview table + * @return list<map<string,any>> content for WizardHW::SetContents() function + */ define list<map<string,any> > joystick_table() { list<map<string,any> > content = []; @@ -293,6 +319,7 @@ string bus = js["bus"]:""; + // add the sound card name for gameport joysticks if (bus == "Gameport" && size(js["parent_unique_key"]:"") > 0) { string unique_key = js["parent_unique_key"]:""; @@ -388,11 +415,20 @@ return content; } + /* + * Find detected joystick with requested device name + * @param device joystick device name (e.g. "/dev/input/js0") + * @return map joystick map returned from .probe.joystick agent + */ map find_joystick(string device) { return find(map j, Joystick::Detected(), {return j["dev_name2"]:"" == device;}); } + /* + * Display and run the joystick test dialog + * @param device device name of the joystick to test (e.g. "/dev/input/js0") + */ void test_joystick(string device) { map js = find_joystick(device); @@ -518,6 +554,11 @@ UI::CloseDialog(); } + /* + * Return list of sound cards with gameport that do not have any joystick configured + * @param gameport_cards list of all cards with gameport + * @return list list of cards from gameport_cards that don't have any joystick configured + */ list unconfigured_sound_cards(list gameport_cards) { list ret = filter(map card, (list<map>) gameport_cards, { @@ -528,6 +569,11 @@ return ret; } + /* + * Display dialog for selecting sound card to configure + * @param gameport_cards available sound cards with gameport + * @returen map the selected card (one from gameport_cards) or nil if [Cancel] was pressed + */ map select_sound_card(list gameport_cards) { integer i = -1; @@ -578,6 +624,11 @@ return gameport_cards[joy_card]:$[]; } + /* + * Is the selected joystick connected via USB? + * @param device joystick device name (e.g. "/dev/input/js0") + * @reurn boolean true if the device is an USB joystick + */ boolean is_usb(string device) { map js = find_joystick(device); @@ -586,6 +637,11 @@ return js["bus"]:"" == "USB"; } + /* + * Find joystick index which is attached to a sound card + * @param parent_id the unique key of the sound card + * @return the index or nil if the sound card was not found + */ integer find_joystick_number(string parent_id) { integer i = 0; @@ -611,6 +667,10 @@ return ret; } + /* + * Find the index of the first unused joystick configuration + * @return integer the index or nil when all configs are already used + */ integer find_free_number() { integer i = 0; @@ -636,6 +696,10 @@ return ret; } + /* + * Save one joystick configuration and restart the joystick service to reload drivers + * @param num index of the joystick configuration to change + */ define void restart_joystick(integer num) { // restart joystick service to reload the driver @@ -648,12 +712,19 @@ Joystick::Detect(); } + /* + * Refresh the joystick table in the main configuration dialog + */ define void refresh_table() { list<map<string,any> > items = joystick_table(); WizardHW::SetContents(items); } + /* + * Return the list of detected sound cards that support gameport + * @return list<map> list of devices (as returned by .probe.sound agent) + */ list<map> sound_cards_with_joystick() { list<map> sound_cards = (list<map>)SCR::Read(.probe.sound); @@ -672,11 +743,19 @@ return sound_cards; } + /* + * Return modification time of /dev/input directory + * @return integer mtime in seconds + */ integer input_mtime() { return ((map)SCR::Read(.target.stat, "/dev/input"))["mtime"]:0; } + /* + * Display and run the main joystick dialog + * @return symbol the final user input + */ define symbol joystick_overview() { list<list> extra_buttons = [ @@ -711,6 +790,7 @@ { ret = (symbol)UI::TimeoutUserInput(2000); + // no user input, check for hotplug changes if (ret == `timeout) { integer current_mtime = input_mtime(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0