Author: jsmeix Date: Tue May 8 15:25:22 2012 New Revision: 68099 URL: http://svn.opensuse.org/viewcvs/yast?rev=68099&view=rev Log: - V 2.23.0 - Third party driver "epkowa" responsibility transferred from Avasys to Epson (bnc#746038). - Use ButtonBox widget in src/Scanner.ycp (bnc#701263). - Fixed typo in help text "UDB" -> "USB" (bnc#703235). - Replaced the HTTP URLs to the Style Guide with the plain text "YaST Style Guide (dated Tue, 04 Nov 2008)" (bnc#732272). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/src/dialogs.ycp trunk/scanner/src/helps.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=68099&r1=68098&r2=68099&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Tue May 8 15:25:22 2012 @@ -1 +1 @@ -2.20.2 +2.23.0 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=68099&r1=68098&r2=68099&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Tue May 8 15:25:22 2012 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue May 8 15:14:57 CEST 2012 - jsmeix@suse.de + +- V 2.23.0 +- Third party driver "epkowa" responsibility transferred + from Avasys to Epson (bnc#746038). +- Use ButtonBox widget in src/Scanner.ycp (bnc#701263). +- Fixed typo in help text "UDB" -> "USB" (bnc#703235). +- Replaced the HTTP URLs to the Style Guide with the plain text + "YaST Style Guide (dated Tue, 04 Nov 2008)" (bnc#732272). + +------------------------------------------------------------------- Thu Mar 29 15:58:34 CEST 2012 - jsuchome@suse.cz - merge proofread texts Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=68099&r1=68098&r2=68099&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Tue May 8 15:25:22 2012 @@ -390,20 +390,23 @@ { // First of all the multi-line string because such strings cannot be indented: string iscan_message = // Message of a Popup::Error for models which require - // the third-party Image Scan (IScan) driver software from Epson/Avasys. + // the third-party Image Scan (IScan) driver software from Epson + // (formerly Avasys, see https://bugzilla.novell.com/show_bug.cgi?id=746038). // Do not change or translate "Image Scan", it is a driver software name. - // Do not change or translate "Avasys, it is a manufacturer name. -_("The third-party Image Scan driver software from Avasys is required. -The Image Scan driver software is made and provided by Avasys -http://avasys.jp/eng/linux_driver/ + // Do not change or translate "Avasys", it is a manufacturer name. + // Do not change or translate "Epson", it is a manufacturer name. +_("The third-party Image Scan driver software from Epson/Avasys is required. +The Image Scan driver software is made and provided by Epson (formerly Avasys) +http://download.ebz.epson.net/dsc/search/01/search/?OSC=LXEpson +(formerly Avasys http://avasys.jp/eng/linux_driver/) where RPM packages for 32-bit (i386) and 64-bit (x86_64) architecture -can be downloaded (if you accept the Avasys and Epson license agreements). +can be downloaded (if you accept the Epson/Avasys license agreements). The Image Scan driver contains proprietary binary-only software. For some models it is only available for 32-bit (i386) architecture which does not work when you have a 64-bit system installation. Some scanners are also supported by another (free-software) driver. When your scanner model requires a DFSG non-free (proprietary) module, -you have to download and install two packages from Avasys: +you have to download and install two packages from Epson/Avasys: The 'iscan' package for the base software and an additional model dependant 'iscan-plugin' package with the proprietary module. "); @@ -414,16 +417,16 @@ && Package::Installed( "iscan" ) ) { // Each scanner which is supported by iscan-free is also supported by iscan. - // 'iscan' is the package name of the primary RPM which is provided by Avasys - // (there are also additional iscan-plugin-<model-name> provided by Avasys). + // 'iscan' is the package name of the primary RPM which is provided by Epson/Avasys + // (there are also additional iscan-plugin-<model-name> provided by Epson/Avasys). // If iscan is already installed, there is no need to switch to iscan-free. // Because iscan contains proprietary software it is not provided by openSUSE. - // Therefore the user must have had downloaded it from Avasys + // Therefore the user must have had downloaded it from Epson/Avasys // and then installed intentionally and manually. return true; } if( "iscan" == package_name ) - { y2milestone( "Third-party Image Scan driver software from Avasys required." ); + { y2milestone( "Third-party Image Scan driver software from Epson/Avasys required." ); Popup::Error( iscan_message ); return false; } @@ -793,10 +796,10 @@ `ReplacePoint( `id(`create_database_progress_replace_point), `DownloadProgress( feedback_message, database_filename, - // On my openSUSE 11.4 the size is about 891000 bytes. - // The number 921600 results exactly "900.0 KB" in the + // On my openSUSE 11.4 the size is about 930000 bytes. + // The number 1024000 results exactly "1000.0 KB" in the // YaST Gtk user inteface for a DownloadProgress: - 921600 + 1024000 ) ) ) @@ -1360,8 +1363,9 @@ // Scanner model list entry for models which require // the third-party Image Scan (IScan) driver software from Epson/Avasys. // Do not change or translate "Image Scan", it is a driver software name. - // Do not change or translate "Avasys, it is a manufacturer name. - string iscan_string = _("Third-party Image Scan driver software from Avasys required."); + // Do not change or translate "Avasys", it is a manufacturer name. + // Do not change or translate "Epson", it is a manufacturer name. + string iscan_string = _("Third-party Image Scan driver software from Epson/Avasys required."); list< term > model_items = []; foreach( map< string, string > database_entry, database, @@ -1890,7 +1894,7 @@ ) { if( ! TestAndInstallPackage( package_name ) ) { // There is already sufficient user information regarding - // the third-party Image Scan driver software from Avasys: + // the third-party Image Scan driver software from Epson/Avasys: if( package_name != "iscan" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage: _("Required Package Not Installed"), @@ -2246,9 +2250,9 @@ _("&Scanner to Test"), scanners_to_be_tested ), - `HBox( `PushButton( `id(`cancel_button), Label::CancelButton() ), - `PushButton( `id(`ok_button), `opt(`default), Label::OKButton() ) - ) + `ButtonBox( `PushButton( `id(`cancel_button), Label::CancelButton() ), + `PushButton( `id(`ok_button), `opt(`default), Label::OKButton() ) + ) ) ); if( UI::UserInput() != `ok_button ) Modified: trunk/scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=68099&r1=68098&r2=68099&view=diff ============================================================================== --- trunk/scanner/src/dialogs.ycp (original) +++ trunk/scanner/src/dialogs.ycp Tue May 8 15:25:22 2012 @@ -83,7 +83,7 @@ // Otherwise the user is asked for confirmation whether he want's to continue // despite the fact that the module might not work correctly if( ! Confirm::MustBeRoot() ) return `abort; - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the "abort" button in a single configuration dialog must now be named "cancel": Wizard::SetAbortButton( `abort, Label::CancelButton() ); // No "back" or "next" button at all makes any sense here @@ -154,12 +154,11 @@ ); WizardHW::SetContents( Scanner::OverviewContents() ); // In the Overview dialog the "next" button is used to finish the whole module. - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // According to YaST Style Guide (dated Tue, 04 Nov 2008) // the "finish" button in an Overview dialog must now be named "OK": Wizard::SetNextButton( `next, Label::OKButton() ); // In the Overview dialog it does not make sense to have a button with "back" functionality - // which is named "Cancel" according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // which is named "Cancel" according to the YaST Style Guide (dated Tue, 04 Nov 2008) // because there is nothing to "cancel" in the Overview dialog because it // only shows information about the current state of the configuration // but the Overview dialog itself does not do any change of the configuration. @@ -170,13 +169,13 @@ // If the user accepted in such a configuration sub-dialog what he changed // via the "OK" button there, the change is applied and the Overview dialog // shows the new current state of the configuration, see - // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implementa...: + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_Pr...: // so that it is not possible to "cancel" the change in the Overview dialog. // Any change of the configuration is done in sub-dialogs which are called // from the Overview dialog (even the "Confirm Deletion" popup is such a sub-dialog) // and in all those sub-dialogs there is a button with "cancel" functionality. Wizard::HideBackButton(); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -660,11 +659,11 @@ Label::BackButton(), Label::NextButton() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the button with the "back" functionality must be disabled // only when it is the first dialog of a wizard stlye dialog sequence. Wizard::HideBackButton(); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -736,12 +735,13 @@ continue; } // The epkowa backend in the package iscan-free is available for all architectures. - // In contrast the epkowa backend in the package iscan which is provided by Avasys + // In contrast the epkowa backend in the package iscan which is provided by Epson + // (formerly Avasys, see https://bugzilla.novell.com/show_bug.cgi?id=746038) // is only available for i386-compatible architectures: // True 32-bit i386 and also 64-bit x86_64. // For some models it might be only available for 32-bit i386 architecture. - // Some scanners require additionally proprietary libraries which are - // provided by Avasys as additional model dependant iscan-plugin-<model-name> RPMs. + // Some scanners require additionally proprietary libraries which are provided by + // Epson (formerly Avasys) as additional model dependant iscan-plugin-<model-name> RPMs. // For those scanners there is in the database "backend"="epkowa" and "package"="iscan". // The scanners which work with iscan-free have "backend"="epkowa" and "package"="iscan-free". // It would be possible to test for non-i386-compatible architecture in the ModelItems function @@ -818,10 +818,10 @@ // The content here is only a dummy. // The real content is what the "Progress:..." shows in ActivateBackend(). term contents = `Label( "" ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the button with the "back" functionality is unchanged // when it is not the first dialog of a wizard stlye dialog sequence. - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the last "next" button of a wizard-style dialog sequence must be named "finish": Wizard::SetContentsButtons( caption, contents, @@ -829,7 +829,7 @@ Label::BackButton(), Label::FinishButton() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module // for a wizard stlye dialog sequence. // Instead within a wizard stlye dialog sequence the button with the @@ -955,14 +955,14 @@ ), `VStretch() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) // because it reads "Cancel - Closes the window and returns to the overview." // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=68099&r1=68098&r2=68099&view=diff ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Tue May 8 15:25:22 2012 @@ -73,7 +73,7 @@ _("<p> A normal USB scanner should be detected automatically. By default, only those USB scanners are shown -for which the UDB vendor and product IDs are known. +for which the USB vendor and product IDs are known. If a USB scanner is not shown or if there are unexpected results, try <b>Other</b> and <b>Restart Detection</b>. It might happen that particular USB devices which are not scanners -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org