Author: jsmeix Date: Tue Nov 4 13:52:27 2008 New Revision: 52883 URL: http://svn.opensuse.org/viewcvs/yast?rev=52883&view=rev Log: - Dialog layout fixes for the Share Printers dialog (see Novell/Suse Bugzilla bnc#438225). - Removed the "Nothing changed" Popup everywhere (see Novell/Suse Bugzilla bnc#440605). - 2.17.31 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/autoconfig.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/driveradd.ycp trunk/printer/src/policies.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Nov 4 13:52:27 2008 @@ -1 +1 @@ -2.17.30 +2.17.31 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Nov 4 13:52:27 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Nov 4 13:30:59 CET 2008 - jsmeix@suse.de + +- Dialog layout fixes for the Share Printers dialog + (see Novell/Suse Bugzilla bnc#438225). +- Removed the "Nothing changed" Popup everywhere + (see Novell/Suse Bugzilla bnc#440605). +- 2.17.31 + +------------------------------------------------------------------- Fri Oct 31 14:51:29 CET 2008 - jsmeix@suse.de - Added a test if a local cupsd does not listen on the Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Tue Nov 4 13:52:27 2008 @@ -221,13 +221,6 @@ && current_cups_autoconfig_DefaultCUPSPolicy == initial_cups_autoconfig_DefaultCUPSPolicy ) { y2milestone( "Nothing changed in 'Autoconfig Settings' dialog." ); - Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); y2milestone( "leaving storeAutoconfig" ); return nil; } Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Tue Nov 4 13:52:27 2008 @@ -512,13 +512,7 @@ Wizard::EnableNextButton(); } else - { Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); + { y2milestone( "Nothing changed in 'Modify' dialog." ); } // Exit this dialog in any case: break; Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Tue Nov 4 13:52:27 2008 @@ -207,13 +207,6 @@ && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) { y2milestone( "Nothing changed in AddDriverDialog." ); - Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); // Exit this dialog: break; } Modified: trunk/printer/src/policies.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/policies.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/policies.ycp (original) +++ trunk/printer/src/policies.ycp Tue Nov 4 13:52:27 2008 @@ -227,13 +227,6 @@ && ! apply_error_policy ) { y2milestone( "Nothing changed in 'Policies' dialog." ); - Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); y2milestone( "leaving storePolicies" ); return nil; } Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Tue Nov 4 13:52:27 2008 @@ -884,7 +884,7 @@ // CheckBox whether or not the Suse Firewall allows // incomming printer information (CUPS Browsing packages) // from the internal network zone (INT zone): - _("Allow printer information from the internal network zone"), + _("Allow printer information from the &internal network zone"), Printer::firewall_config["browsing_from_int"]:true ) ); @@ -910,7 +910,7 @@ // CheckBox whether or not the Suse Firewall denies // incomming printer information from the external network zone. // This is done by denying any access from the EXT zone. - _("Deny access and printer information from the external network zone"), + _("Deny access and printer information from the &external network zone"), false ) ); @@ -999,13 +999,6 @@ } if( ! printing_via_network_has_changed ) { y2milestone( "Nothing changed in 'Printing via Network' dialog." ); - Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); } else { // Regardles of the ApplyNetworkPrintingSettings result, Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=52883&r1=52882&r2=52883&view=diff ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Tue Nov 4 13:52:27 2008 @@ -53,8 +53,7 @@ boolean firewall_second_sharing_widget_is_checkbox = false; term widgetSharing = `VBox - ( `VSpacing( 1 ), - `RadioButtonGroup + ( `RadioButtonGroup ( `id(`deny_or_allow_remote_access), `VBox ( `Left @@ -66,7 +65,6 @@ initial_deny_remote_access ) ), - `VSpacing( 2 ), `Left ( `RadioButton ( `id(`allow_remote_access_radio_button), @@ -78,7 +76,6 @@ ) ) ), - `VSpacing( 1 ), `HBox ( `HSpacing( 3 ), `VBox @@ -104,7 +101,6 @@ ) ) ), - `VSpacing( 1 ), `Left ( `Label ( `id(`interface_table_label), @@ -148,27 +144,23 @@ ) ) ), - `VSpacing( 1 ), - `Frame - ( `id(`specific_addresses_frame), - // A caption to allow remote access to local print queues - // for hosts and/or networks specified in two TextEntries below: - _("For Experts: Optional Specific IP Addresses or Networks"), + `Left + ( `Label + ( `id(`specific_addresses_label), + // A caption to allow remote access to local print queues + // for hosts and/or networks specified in two TextEntries below: + _("For Experts: Optional Specific IP Addresses or Networks") + ) + ), + `HBox + ( `HSpacing( 2 ), `VBox ( `Left ( `TextEntry ( `id(`allow_input), // TextEntry to allow remote access to local print queues // for hosts and/or networks: - _("Allow remote access from those IP addresses or &network/netmask") - ) - ), - `Left - ( `Label - ( `id(`allow_input_label), - // Label to show the syntax for the TextEntry to allow remote access - // to local print queues from IP addresses and/or networks: - _("(each nnn.nnn.nnn.nnn or nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm separated by one space)") + _("Allow remote access from those IP addresses or &network/netmask (separated by space)") ) ), `Left @@ -178,18 +170,7 @@ ( `id(`browse_address_input), // TextEntry to publish local print queues // to IP addresses and/or network broadcast addresses: - _("Publish to those IP addresses or network &broadcast addresses") - ) - ) - ), - `Left - ( `HBox - ( `HSpacing( 2 ), - `Label - ( `id(`browse_address_input_label), - // Label to show the syntax for the TextEntry to to publish - // local print queues to hosts and/or networks: - _("(each nnn.nnn.nnn.nnn or nnn.nnn.nnn.255 separated by one space)") + _("Publish to those IP addresses or network &broadcast addresses (separated by space)") ) ) ) @@ -197,7 +178,6 @@ ) ) ), - `VSpacing( 1 ), `Left ( `Label ( `id(`firewall_sharing_settings_label), @@ -225,8 +205,7 @@ ) ) ) - ), - `VSpacing( 1 ) + ) ); map< string, string > showInterfacePopup( string interface_name, boolean is_published ) @@ -592,11 +571,9 @@ UI::ChangeWidget( `add_interface, `Enabled, false ); UI::ChangeWidget( `edit_interface, `Enabled, false ); UI::ChangeWidget( `delete_interface, `Enabled, false ); - UI::ChangeWidget( `specific_addresses_frame, `Enabled, false ); + UI::ChangeWidget( `specific_addresses_label, `Enabled, false ); UI::ChangeWidget( `allow_input, `Enabled, false ); - UI::ChangeWidget( `allow_input_label, `Enabled, false ); UI::ChangeWidget( `browse_address_input, `Enabled, false ); - UI::ChangeWidget( `browse_address_input_label, `Enabled, false ); UI::ChangeWidget( `firewall_sharing_settings_label, `Enabled, false ); UI::ChangeWidget( `firewall_first_sharing_widget, `Enabled, false ); UI::ChangeWidget( `firewall_second_sharing_widget, `Enabled, false ); @@ -852,7 +829,7 @@ `CheckBox ( `id(`firewall_first_sharing_widget), // CheckBox whether or not the Suse Firewall allows CUPS access from the INT zone: - _("Allow access from the internal network zone"), + _("Allow access from the &internal network zone"), Printer::firewall_config["access_from_int"]:true ) ); @@ -876,7 +853,7 @@ `CheckBox ( `id(`firewall_second_sharing_widget), // CheckBox whether or not the Suse Firewall denies CUPS access from the EXT zone: - _("Deny access from the external network zone"), + _("Deny access from the &external network zone"), false ) ); @@ -1049,11 +1026,9 @@ UI::ChangeWidget(`add_interface, `Enabled, remote_access); UI::ChangeWidget(`edit_interface, `Enabled, remote_access); UI::ChangeWidget(`delete_interface, `Enabled, remote_access); - UI::ChangeWidget(`specific_addresses_frame, `Enabled, remote_access); + UI::ChangeWidget(`specific_addresses_label, `Enabled, remote_access); UI::ChangeWidget(`allow_input, `Enabled, remote_access); - UI::ChangeWidget(`allow_input_label, `Enabled, remote_access); UI::ChangeWidget(`browse_address_input, `Enabled, remote_access); - UI::ChangeWidget(`browse_address_input_label, `Enabled, remote_access); if( remote_access ) { boolean interface_modify_buttons = true; if( 0 == size((list)UI::QueryWidget(`interface_table, `Items)) ) interface_modify_buttons = false; @@ -1073,13 +1048,6 @@ } if( ! sharing_has_changed ) { y2milestone( "Nothing changed in 'Share Printers' dialog." ); - Popup::ShowFeedback( // No title for such a simple feedback message: - "", - // Message of a Popup::ShowFeedback when nothing was changed: - _("Nothing changed.") - ); - sleep( 1000 ); - Popup::ClearFeedback(); } y2milestone( "leaving storeSharing" ); return nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org