Author: mzugec
Date: Tue May 20 16:01:35 2008
New Revision: 47717
URL: http://svn.opensuse.org/viewcvs/yast?rev=47717&view=rev
Log:
use cups backend for detect parallel (bnc#391324)
Modified:
trunk/printer/VERSION
trunk/printer/data/hp_all_in_one_model_list
trunk/printer/package/yast2-printer.changes
trunk/printer/src/common/dialogs-connection.ycp
Modified: trunk/printer/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=47717&r1=47716&r2=47717&view=diff
==============================================================================
--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Tue May 20 16:01:35 2008
@@ -1 +1 @@
-2.16.27
+2.16.28
Modified: trunk/printer/data/hp_all_in_one_model_list
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/data/hp_all_in_one_model_list?rev=47717&r1=47716&r2=47717&view=diff
==============================================================================
--- trunk/printer/data/hp_all_in_one_model_list (original)
+++ trunk/printer/data/hp_all_in_one_model_list Tue May 20 16:01:35 2008
@@ -1,32 +1,119 @@
-DESKJET 450
+915
+COLOR LASERJET 2800
+COLOR LASERJET 2820
+COLOR LASERJET 2830
+COLOR LASERJET 2840
+DESKJET F2100
+DESKJET F2120
+DESKJET F2128
+DESKJET F2140
+DESKJET F2179
+DESKJET F2180
+DESKJET F2187
+DESKJET F2188
+DESKJET F300
+DESKJET F310
+DESKJET F325
+DESKJET F335
+DESKJET F340
+DESKJET F350
+DESKJET F370
+DESKJET F375
+DESKJET F378
+DESKJET F380
+DESKJET F385
+DESKJET F388
+DESKJET F390
+DESKJET F394
+DESKJET F4100
+DESKJET F4140
+DESKJET F4172
+DESKJET F4180
+DESKJET F4185
+LASERJET 1100
LASERJET 1100A
-LASERJET 1150
-LASERJET 1200
+LASERJET 1100A SE
+LASERJET 1100A XI
+LASERJET 1100SE
+LASERJET 1100XI
LASERJET 1220
-LASERJET 1300
-LASERJET 2200
+LASERJET 1220SE
+LASERJET 3015
+LASERJET 3020
+LASERJET 3030
+LASERJET 3050
+LASERJET 3052
+LASERJET 3055
LASERJET 3200
LASERJET 3200M
LASERJET 3200SE
-LASERJET 3300 MFP
-LASERJET 3310 MFP
-LASERJET 3320 MFP
+LASERJET 3300 3310 3320
+LASERJET 3300MFP
+LASERJET 3310
+LASERJET 3320
+LASERJET 3320MFP
LASERJET 3320N MFP
-LASERJET 3330 MFP
-OFFICEJET
-OFFICEJET 300
-OFFICEJET 330
-OFFICEJET 350
+LASERJET 3330
+LASERJET 3330MFP
+LASERJET 3380
+LASERJET 3390
+LASERJET 3392
+LASERJET 4100 MFP
+LASERJET 4100MFP
+LASERJET 4101MFP
OFFICEJET 4100
OFFICEJET 4105
OFFICEJET 4110
+OFFICEJET 4110V
+OFFICEJET 4110XI
OFFICEJET 4115
+OFFICEJET 4200
+OFFICEJET 4211
+OFFICEJET 4212
+OFFICEJET 4215
+OFFICEJET 4215V
+OFFICEJET 4215XI
+OFFICEJET 4219
+OFFICEJET 4251
+OFFICEJET 4252
+OFFICEJET 4255
+OFFICEJET 4259
+OFFICEJET 4300
+OFFICEJET 4311
+OFFICEJET 4312
+OFFICEJET 4314
+OFFICEJET 4315
+OFFICEJET 4315V
+OFFICEJET 4315XI
+OFFICEJET 4317
+OFFICEJET 4319
+OFFICEJET 4352
+OFFICEJET 4353
+OFFICEJET 4355
+OFFICEJET 4357
+OFFICEJET 4359
OFFICEJET 500
+OFFICEJET 5100
OFFICEJET 5105
OFFICEJET 5110
+OFFICEJET 5110V
OFFICEJET 5110XI
OFFICEJET 520
OFFICEJET 5500
+OFFICEJET 5505
+OFFICEJET 5508
+OFFICEJET 5510
+OFFICEJET 5510V
+OFFICEJET 5510XI
+OFFICEJET 5515
+OFFICEJET 5600
+OFFICEJET 5605
+OFFICEJET 5608
+OFFICEJET 5609
+OFFICEJET 5610
+OFFICEJET 5610V
+OFFICEJET 5610XI
+OFFICEJET 5615
OFFICEJET 570
OFFICEJET 580
OFFICEJET 590
@@ -35,80 +122,313 @@
OFFICEJET 6100
OFFICEJET 6105
OFFICEJET 6110
+OFFICEJET 6110V
+OFFICEJET 6110XI
OFFICEJET 6150
-OFFICEJET 625
+OFFICEJET 6200
+OFFICEJET 6210
+OFFICEJET 6210V
+OFFICEJET 6210XI
+OFFICEJET 6213
+OFFICEJET 6215
OFFICEJET 630
+OFFICEJET 6300
+OFFICEJET 6310
+OFFICEJET 6310XI
OFFICEJET 635
OFFICEJET 700
OFFICEJET 710
OFFICEJET 7100
OFFICEJET 7110
+OFFICEJET 7110XI
+OFFICEJET 7115
OFFICEJET 7130
-OFFICEJET 7140
+OFFICEJET 7130XI
+OFFICEJET 7135XI
+OFFICEJET 7140XI
OFFICEJET 720
+OFFICEJET 7200
+OFFICEJET 7210
+OFFICEJET 7210V
+OFFICEJET 7210XI
+OFFICEJET 7213
OFFICEJET 725
-OFFICEJET D125
+OFFICEJET 7300
+OFFICEJET 7310
+OFFICEJET 7310XI
+OFFICEJET 7313
+OFFICEJET 7400
+OFFICEJET 7410
+OFFICEJET 7410XI
+OFFICEJET 7413
+OFFICEJET 9100
+OFFICEJET 9110
+OFFICEJET 9120
+OFFICEJET 9130
+OFFICEJET D
+OFFICEJET D125XI
OFFICEJET D135
+OFFICEJET D135XI
OFFICEJET D145
-OFFICEJET D155
+OFFICEJET D145XI
+OFFICEJET D155XI
OFFICEJET G55
+OFFICEJET G55XI
OFFICEJET G85
+OFFICEJET G85XI
OFFICEJET G95
+OFFICEJET J3600
+OFFICEJET J3608
+OFFICEJET J3640
+OFFICEJET J3650
+OFFICEJET J3680
+OFFICEJET J5500
+OFFICEJET J5505
+OFFICEJET J5508
+OFFICEJET J5510
+OFFICEJET J5510V
+OFFICEJET J5510XI
+OFFICEJET J5515
+OFFICEJET J5520
+OFFICEJET J5700
+OFFICEJET J5725
+OFFICEJET J5730
+OFFICEJET J5735
+OFFICEJET J5738
+OFFICEJET J5740
+OFFICEJET J5750
+OFFICEJET J5780
+OFFICEJET J5783
+OFFICEJET J5785
+OFFICEJET J5788
+OFFICEJET J5790
OFFICEJET K60
OFFICEJET K60XI
OFFICEJET K80
OFFICEJET K80XI
-OFFICEJET LX
OFFICEJET PRO 1150C
+OFFICEJET PRO 1150CSE
OFFICEJET PRO 1170C
+OFFICEJET PRO 1170CSE
+OFFICEJET PRO 1170CXI
OFFICEJET PRO 1175C
+OFFICEJET PRO 1175CSE
+OFFICEJET PRO 1175CXI
+OFFICEJET PRO L7300
+OFFICEJET PRO L7380
+OFFICEJET PRO L7400
+OFFICEJET PRO L7480
+OFFICEJET PRO L7500
+OFFICEJET PRO L7550
+OFFICEJET PRO L7580
+OFFICEJET PRO L7600
+OFFICEJET PRO L7650
+OFFICEJET PRO L7680
+OFFICEJET PRO L7700
+OFFICEJET PRO L7750
+OFFICEJET PRO L7780
OFFICEJET R40
+OFFICEJET R40XI
OFFICEJET R45
OFFICEJET R60
OFFICEJET R65
OFFICEJET R80
+OFFICEJET R80XI
+OFFICEJET T
OFFICEJET T45
+OFFICEJET T45XI
OFFICEJET T65
+OFFICEJET T65XI
+OFFICEJET V30
OFFICEJET V40
+OFFICEJET V40S
OFFICEJET V40XI
-PHOTOSMART 140
-PHOTOSMART 240
-PHOTOSMART 7150
-PHOTOSMART 7260
-PHOTOSMART 7268
-PHOTOSMART 7345
-PHOTOSMART 7350
-PHOTOSMART 7550
-PHOTOSMART 7660
-PHOTOSMART 7760
-PHOTOSMART 7960
-PHOTOSMART P100
-PHOTOSMART P1000
-PHOTOSMART P1100
-PHOTOSMART P1115
-PHOTOSMART P1215
-PHOTOSMART P1218
-PHOTOSMART P130
-PHOTOSMART P1315
-PHOTOSMART P230
+OFFICEJET V45
+PHOTOSMART 2570
+PHOTOSMART 2573
+PHOTOSMART 2575
+PHOTOSMART 2575A
+PHOTOSMART 2575V
+PHOTOSMART 2575XI
+PHOTOSMART 2578
+PHOTOSMART 2600
+PHOTOSMART 2605
+PHOTOSMART 2608
+PHOTOSMART 2610
+PHOTOSMART 2610V
+PHOTOSMART 2610XI
+PHOTOSMART 2613
+PHOTOSMART 2615
+PHOTOSMART 2700
+PHOTOSMART 2710
+PHOTOSMART 2710XI
+PHOTOSMART 2713
+PHOTOSMART 3100
+PHOTOSMART 3108
+PHOTOSMART 3110
+PHOTOSMART 3110V
+PHOTOSMART 3200
+PHOTOSMART 3207
+PHOTOSMART 3210
+PHOTOSMART 3210A
+PHOTOSMART 3210V
+PHOTOSMART 3210XI
+PHOTOSMART 3213
+PHOTOSMART 3214
+PHOTOSMART 3300
+PHOTOSMART 3308
+PHOTOSMART 3310
+PHOTOSMART 3310XI
+PHOTOSMART 3313
+PHOTOSMART 3314
+PHOTOSMART C3100
+PHOTOSMART C3110
+PHOTOSMART C3125
+PHOTOSMART C3135
+PHOTOSMART C3140
+PHOTOSMART C3150
+PHOTOSMART C3180
+PHOTOSMART C3183
+PHOTOSMART C3190
+PHOTOSMART C4100
+PHOTOSMART C4110
+PHOTOSMART C4140
+PHOTOSMART C4150
+PHOTOSMART C4180
+PHOTOSMART C4183
+PHOTOSMART C4188
+PHOTOSMART C4200
+PHOTOSMART C4240
+PHOTOSMART C4250
+PHOTOSMART C4280
+PHOTOSMART C4340
+PHOTOSMART C4343
+PHOTOSMART C4345
+PHOTOSMART C4380
+PHOTOSMART C4385
+PHOTOSMART C5100
+PHOTOSMART C5140
+PHOTOSMART C5150
+PHOTOSMART C5180
+PHOTOSMART C5185
+PHOTOSMART C5188
+PHOTOSMART C5200
+PHOTOSMART C5240
+PHOTOSMART C5250
+PHOTOSMART C5280
+PHOTOSMART C6100
+PHOTOSMART C6150
+PHOTOSMART C6180
+PHOTOSMART C6185
+PHOTOSMART C6188
+PHOTOSMART C6200
+PHOTOSMART C6240
+PHOTOSMART C6250
+PHOTOSMART C6280
+PHOTOSMART C7100
+PHOTOSMART C7150
+PHOTOSMART C7180
+PHOTOSMART C7185
+PHOTOSMART C7200
+PHOTOSMART C7250
+PHOTOSMART C7280
+PHOTOSMART C7283
+PHOTOSMART C8100
+PHOTOSMART C8150
+PHOTOSMART C8180
+PHOTOSMART C8183
+PRINTER SCANNER COPIER 300
+PSC 1000
PSC 1100
PSC 1110
+PSC 1110V
+PSC 1118
PSC 1200
PSC 1205
+PSC 1209
PSC 1210
+PSC 1210V
+PSC 1210XI
+PSC 1215
+PSC 1216
+PSC 1217
+PSC 1219
PSC 1300
+PSC 1310
+PSC 1311
+PSC 1315
+PSC 1315V
+PSC 1315XI
+PSC 1317
+PSC 1318
+PSC 1340
+PSC 1350
+PSC 1350V
+PSC 1350XI
+PSC 1355
+PSC 1358
+PSC 1400
+PSC 1401
+PSC 1402
+PSC 1410
+PSC 1410V
+PSC 1410XI
+PSC 1417
+PSC 1500
+PSC 1503
+PSC 1504
+PSC 1507
+PSC 1508
+PSC 1510
+PSC 1510V
+PSC 1510XI
+PSC 1513
+PSC 1513S
+PSC 1600
+PSC 1610
+PSC 1610V
+PSC 1610XI
+PSC 1613
+PSC 2100
+PSC 2105
+PSC 2108
PSC 2110
+PSC 2115
PSC 2150
PSC 2170
+PSC 2171
PSC 2175
+PSC 2175V
+PSC 2175XI
+PSC 2179
+PSC 2200
PSC 2210
+PSC 2210V
+PSC 2210XI
PSC 2300
+PSC 2350
+PSC 2353
+PSC 2355
+PSC 2355P
+PSC 2355V
+PSC 2355XI
PSC 2400
+PSC 2410
+PSC 2410V
+PSC 2410XI
PSC 2500
-PSC 370
-PSC 380
+PSC 2510
+PSC 2510XI
+PSC 2550
PSC 500
+PSC 500XI
+PSC 720
PSC 750
PSC 750XI
+PSC 760
+PSC 780
+PSC 780XI
+PSC 900
+PSC 920
PSC 950
-PSC 950XI
+PSC 950VR
Modified: trunk/printer/package/yast2-printer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=47717&r1=47716&r2=47717&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Tue May 20 16:01:35 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue May 20 16:00:51 CEST 2008 - mzugec@suse.cz
+
+- use cups backend for detect parallel (bnc#391324)
+- 2.16.28
+
+-------------------------------------------------------------------
Sun May 18 12:03:13 CEST 2008 - mzugec@suse.cz
- marked strings for translation (bnc#390588)
Modified: trunk/printer/src/common/dialogs-connection.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-connection.ycp?rev=47717&r1=47716&r2=47717&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs-connection.ycp (original)
+++ trunk/printer/src/common/dialogs-connection.ycp Tue May 20 16:01:35 2008
@@ -628,22 +628,23 @@
if (type !="hp") Printerlib::getUriDevice (uri);
list<string> devices = [];
- path read_devs = "parallel" == type
- ? .proc.parport.devices
- : ("usb" == type
+ path read_devs = "usb" == type
? .proc.usblp.devices
- : ("irda" == type
- ? .proc.irlpt.devices
- : .proc.serial.devices
- )
- );
+ : ("irda" == type ? .proc.irlpt.devices : .proc.serial.devices
+ ) ;
integer baudrate = Printerlib::getUriBaudrate (uri);
string ser_settings = Printerlib::getUriValue (uri, "ty");
if (0 == baudrate && -1 == Printer::index) baudrate = 9600;
integer i = search (device, "?");
if (nil != i) device = substring (device, 0, i);
- if ("irda" != type && "bluetooth" != type && type != "hp") devices = (list<string>)SCR::Read (read_devs);
- else devices = [];
+ if (!contains([ "irda", "bluetooth", "hp", "parallel"], type)) devices = (list<string>)SCR::Read (read_devs);
+ // for parallel use CUPS backend (bnc#391324)
+ else if (type=="parallel"){
+ string cmd_output = ((map