Mailinglist Archive: yast-commit (62 mails)

< Previous Next >
[yast-commit] r62502 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/dialogs.ycp tools/determine_active_scanner_backends
  • From: jsmeix@xxxxxxxxxxxxxxxxx
  • Date: Thu, 23 Sep 2010 13:50:39 -0000
  • Message-id: <20100923135040.3F519322E1@xxxxxxxxxxxxxxxxx>
Author: jsmeix
Date: Thu Sep 23 15:50:39 2010
New Revision: 62502

URL: http://svn.opensuse.org/viewcvs/yast?rev=62502&view=rev
Log:

- V 2.20.0
- Let the ConfigureBackendDialog automatically proceed to the next
dialog (i.e. to the overview dialog) after successful backend
activation (see openSUSE/Novell Bugzilla bnc#636083).
- Fix determine_active_scanner_backends so that it also detects
active backends with '_' or '-' characters in the backend name
(see openSUSE/Novell Bugzilla bnc#641111).


Modified:
trunk/scanner/VERSION
trunk/scanner/package/yast2-scanner.changes
trunk/scanner/src/dialogs.ycp
trunk/scanner/tools/determine_active_scanner_backends

Modified: trunk/scanner/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=62502&r1=62501&r2=62502&view=diff
==============================================================================
--- trunk/scanner/VERSION (original)
+++ trunk/scanner/VERSION Thu Sep 23 15:50:39 2010
@@ -1 +1 @@
-2.19.2
+2.20.0

Modified: trunk/scanner/package/yast2-scanner.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=62502&r1=62501&r2=62502&view=diff
==============================================================================
--- trunk/scanner/package/yast2-scanner.changes (original)
+++ trunk/scanner/package/yast2-scanner.changes Thu Sep 23 15:50:39 2010
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Thu Sep 23 15:27:40 CEST 2010 - jsmeix@xxxxxxx
+
+- V 2.20.0
+- Let the ConfigureBackendDialog automatically proceed to the next
+ dialog (i.e. to the overview dialog) after successful backend
+ activation (see openSUSE/Novell Bugzilla bnc#636083).
+- Fix determine_active_scanner_backends so that it also detects
+ active backends with '_' or '-' characters in the backend name
+ (see openSUSE/Novell Bugzilla bnc#641111).
+
+-------------------------------------------------------------------
Tue Apr 6 17:43:24 CEST 2010 - jsmeix@xxxxxxx

- V 2.19.2

Modified: trunk/scanner/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=62502&r1=62501&r2=62502&view=diff
==============================================================================
--- trunk/scanner/src/dialogs.ycp (original)
+++ trunk/scanner/src/dialogs.ycp Thu Sep 23 15:50:39 2010
@@ -848,9 +848,20 @@
// Only a simple message because before the
function Scanner::ActivateBackend
// was called and this function would have shown
more specific messages.
_("Failed to activate %1."), backend_name ) );
+ Wizard::EnableBackButton();
+ Wizard::EnableNextButton();
+ }
+ else
+ { // Wait two seconds so that the user can notice that
Scanner::ActivateBackend(...) was successful
+ // and then automatically proceed to the 'next' dialog which is the
overview dialog.
+ // Therefore there is no way 'back' when Scanner::ActivateBackend(...) was
successful
+ // (which makes sense because why should the user undo right now what was
successful)
+ // so that 'back' is only possible if Scanner::ActivateBackend(...) failed
or when it
+ // was aborted by the user (e.g. when the user aborted to install a
required package):
+ Wizard::EnableNextButton();
+ sleep( 2000 );
+ UI::FakeUserInput( `next );
}
- Wizard::EnableBackButton();
- Wizard::EnableNextButton();
any ret = nil;
while(true)
{ ret = UI::UserInput();

Modified: trunk/scanner/tools/determine_active_scanner_backends
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/determine_active_scanner_backends?rev=62502&r1=62501&r2=62502&view=diff
==============================================================================
--- trunk/scanner/tools/determine_active_scanner_backends (original)
+++ trunk/scanner/tools/determine_active_scanner_backends Thu Sep 23 15:50:39
2010
@@ -40,7 +40,7 @@
# Get the raw data
# The 'sort -u' is crucial because the YaST scanner module requires
# a list of unique backend names (e.g. in Scanner::Overview ):
-grep '^[[:alnum:]][[:alnum:]]*$' /etc/sane.d/dll.conf | sort -u >$TMP_DATA
+grep '^[[:alnum:]][[:alnum:]_-]*$' /etc/sane.d/dll.conf | sort -u >$TMP_DATA

# Output:


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

< Previous Next >
This Thread
  • No further messages