Author: jsmeix Date: Tue Oct 7 12:13:47 2008 New Revision: 51900 URL: http://svn.opensuse.org/viewcvs/yast?rev=51900&view=rev Log: Added keepSorting to all Table widgets to avoid that automated sorting disturbs the intentional ordering. Increased the maximum number of possible drivers for the same model to 20 from which one driver is autoselected. Modified: trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/overview.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Tue Oct 7 12:13:47 2008 @@ -1327,9 +1327,15 @@ // (in openSUSE 10.2 the 13 entries are for the "Kyocera FS-600"). // In openSUSE 10.2 there are only 4 models (HP LaserJet 4, 4100, 9000 and the Kyocera FS-600) // for which more than 9 entries exist (11 for LaserJet 4100 and 12 for LaserJet 4 and 9000) - // but there are 23 models with 9 entries (there is no no model with 10 entries) - // so that a maximum of 10 entries for the special sorting should be o.k.: - if( size( driver_items ) <= 10 ) + // but there are 23 models with 9 entries (there is no no model with 10 entries). + // Since there is /usr/lib/cups/driver/gutenprint.* the Gutenprint entries are listed twice: + // Once for the readymade PPDs in /usr/share/cups/model/gutenprint/ + // and additionally a second entry from /usr/lib/cups/driver/gutenprint.* + // which increases the maximum lenght of the driver_items list for the same model + // in openSUSE 11.0 up to 17 for the Kyocera FS-600 and 16 for the HP LaserJet 4 + // and several other HP LaserJet and Kyocera models with more than 10 entries + // so that a maximum of 20 entries for the special sorting should be o.k.: + if( size( driver_items ) <= 20 ) { // Test if all entries in the driver_items list seem to be for the same model. list< integer > position = []; string manufacturer_and_model = ""; Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Tue Oct 7 12:13:47 2008 @@ -76,7 +76,7 @@ // (without clicking additionally a button) // but the notify and immediate options // forces UserInput() in this case: - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), // Headers of a Table with a list of printer connections: `header ( // Header of a Table column with a list of printer connections. @@ -289,7 +289,7 @@ // (without clicking additionally a button) // but the notify and immediate options // forces UserInput() in this case: - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), // Headers of a Table with a list of printer connections: `header( // Header of a Table column with a list of printer connections. // Printer model name: Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Tue Oct 7 12:13:47 2008 @@ -260,7 +260,7 @@ // (without clicking additionally a button) // but the notify and immediate options // forces UserInput() in this case: - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), // Headers of a Table with a list of printer connections: `header ( // Header of a Table column with a list of printer connections. @@ -575,7 +575,7 @@ // (without clicking additionally a button) // but the notify and immediate options // forces UserInput() in this case: - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), // Headers of a Table with a list of printer connections: `header( // Header of a Table column with a list of printer connections. // Printer model name: Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Tue Oct 7 12:13:47 2008 @@ -24,7 +24,7 @@ // (without clicking additionally a button) // but the notify and immediate options // forces UserInput() in this case: - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), // Headers of a Table with a list of printer connections: `header ( // Header of a Table column with a list of printer connections. Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Tue Oct 7 12:13:47 2008 @@ -79,7 +79,7 @@ ( 2, `Table ( `id(`overview_table), - `opt(`notify, `immediate), + `opt(`notify, `immediate, `keepSorting), `header ( // Header of a Table column with a list of print queues. // Where the queue configuration exists (local or remote): Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=51900&r1=51899&r2=51900&view=diff ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Tue Oct 7 12:13:47 2008 @@ -113,6 +113,7 @@ ), `Table ( `id(`interface_table), + `opt(`keepSorting), `header ( // A table column header where the column lists network interfaces: _("Interface"), @@ -163,6 +164,7 @@ ), `Table ( `id(`ip_table), + `opt(`keepSorting), `header ( // A table column header where the column lists IP addresses: _("IP address"), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org