Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47425 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs-connection.ycp
  • From: mzugec@xxxxxxxxxxxxxxxx
  • Date: Sat, 10 May 2008 21:10:42 -0000
  • Message-id: <20080510211042.51B782DEDC@xxxxxxxxxxxxxxxx>
Author: mzugec
Date: Sat May 10 23:10:41 2008
New Revision: 47425

URL: http://svn.opensuse.org/viewcvs/yast?rev=47425&view=rev
Log:
disable "Test Printer Connection" when no connection (bnc#386592)

Modified:
trunk/printer/VERSION
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=47425&r1=47424&r2=47425&view=diff
==============================================================================
--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Sat May 10 23:10:41 2008
@@ -1 +1 @@
-2.16.23
+2.16.24

Modified: trunk/printer/package/yast2-printer.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=47425&r1=47424&r2=47425&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Sat May 10 23:10:41 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sat May 10 23:08:50 CEST 2008 - mzugec@xxxxxxx
+
+- disable "Test Printer Connection" when no connection (bnc#386592)
+- 2.16.24
+
+-------------------------------------------------------------------
Wed May 7 12:50:54 CEST 2008 - mzugec@xxxxxxx

- stop/start cupsd according client/server mode (bnc#387249)

Modified: trunk/printer/src/common/dialogs-connection.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-connection.ycp?rev=47425&r1=47424&r2=47425&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs-connection.ycp (original)
+++ trunk/printer/src/common/dialogs-connection.ycp Sat May 10 23:10:41 2008
@@ -809,16 +809,13 @@
"));
}
}
-
symbol ret = nil;
repeat {
- ret = (symbol)UI::UserInput ();
- if (ret == `cancel)
- ret = `abort;
+ UI::ChangeWidget(`test, `Enabled, size(device)>0);
+ ret = (symbol)UI::UserInput ();
+ switch(ret){
device = (string)UI::QueryWidget (`id (`devicesel), `CurrentItem);
-
- if (ret == `bt_detect)
- {
+ case `bt_detect :
map<string,string> devs = Printerlib::GetBluetoothDevices ();
devices = maplist (string k, string v, devs, { return k; });
device_val = getDevicesItems (devices, "");
@@ -829,18 +826,18 @@
// Unix device /dev/(lp|usb/lp|ttyS)*
_("D&evice"),
device_val));
-// Wizard::EnableNextButton ();
- }
- else if (ret == `test)
- {
+ break;
+
+ case `test :
Printerlib::testDevice (cups_devices_mapping[device]:device);
- }
- else if (`abort == ret || `cancel == ret)
- {
+ break;
+
+ case `abort :
+ case `cancel :
ret = reallyAbort () ? `abort : (symbol)nil;
- }
- else if (`details == ret)
- {
+ break;
+
+ case `details :
if (device == nil) device="";
string device_temp = getDeviceName (device);
if ("" != device_temp)
@@ -856,16 +853,18 @@
_("D&evice"), device_val)
);
}
- }
- else if (ret == `next)
- {
+// UI::ChangeWidget(`test, `Enabled, size(device)>0);
+ break;
+
+ case `next :
if (device == "" || device == nil)
{
// message report (user forgot to select a device)
Report::Message (_("Select a device."));
ret = nil;
}
- }
+ break;
+ }
} until (ret == `abort || ret == `back || ret == `next || `ppdetails
== ret || `spdetails == ret);
if (`spdetails == ret)
{

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages