Author: jsmeix Date: Thu May 6 13:48:22 2010 New Revision: 61963 URL: http://svn.opensuse.org/viewcvs/yast?rev=61963&view=rev Log: In basicadd.ycp call Printerlib::WaitForUpdatedConfigFiles after hp-setup finished, see bnc#603247. Modified: trunk/printer/VERSION trunk/printer/src/basicadd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=61963&r1=61962&r2=61963&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu May 6 13:48:22 2010 @@ -1 +1 @@ -2.19.9 +2.19.10 Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=61963&r1=61962&r2=61963&view=diff ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Thu May 6 13:48:22 2010 @@ -697,6 +697,8 @@ // (always zero even in case of error). // The hp-setup exit code does not matter because the printer autodetection in the Overview dialog // will show an appropriate result (e.g. no new print queue if hp-setup failed): + Wizard::DisableBackButton(); + Wizard::DisableNextButton(); if( ! Printer::RunHpsetup() ) { Popup::Error( // Message of a Popup::Error. // Only a simple message because before the RunHpsetup function was called @@ -704,10 +706,29 @@ // Do not change or translate "hp-setup", it is a program name: _("Failed to run hp-setup.") ); + Wizard::EnableBackButton(); + Wizard::EnableNextButton(); continue; } - // Exit this dialog and run go back to the Overview dialog via the sequencer in wizards.ycp + // When hp-setup has finished, it is likely that a new print queue was created by it. + // After a local queue was added, enforce to show also local queues + // in particular when no local queues were shown before: + Printer::queue_filter_show_local = true; + // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files: + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Creating New Printer Setup") ) ) + { // It returns false if the user had interrupted the waiting for updated config files: + Popup::ErrorDetails( // Message of a Popup::ErrorDetails: + _("New Printer Configuration not yet Stored in the System"), + // Explanation details of a Popup::ErrorDetails. + // The 'next dialog' is the overview dialog where the printer configurations are shown + // which has a 'Refresh List' button to update the shown printer configurations: + _("If the next dialog does not show the new printer configuration as expected, wait some time and use the 'Refresh List' button.") + ); + } + // Exit this dialog and go back to the Overview dialog via the sequencer in wizards.ycp // to show the new printer autodetection results: + Wizard::EnableBackButton(); + Wizard::EnableNextButton(); break; } y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", user_input ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org