From 453be19356d9854784e83476dc92d55ba60ef16f Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Fri, 1 Oct 2021 12:14:17 -0400 Subject: [PATCH] ui: make about and quit buttons more translatable --- lib/solaar/ui/action.py | 8 -------- lib/solaar/ui/tray.py | 9 +++++---- lib/solaar/ui/window.py | 8 +++----- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/solaar/ui/action.py b/lib/solaar/ui/action.py index 8d2ae84f..78bc5484 100644 --- a/lib/solaar/ui/action.py +++ b/lib/solaar/ui/action.py @@ -20,12 +20,10 @@ from __future__ import absolute_import, division, print_function, unicode_literals from gi.repository import Gdk, Gtk -from solaar import NAME from solaar.i18n import _ from ..ui import error_dialog from . import pair_window -from .about import show_window as _show_about_window # from logging import getLogger # _log = getLogger(__name__) @@ -67,12 +65,6 @@ def make_toggle(name, label, function, stock_id=None, *args): # action.set_sensitive(notify.available) # toggle_notifications = make_toggle('notifications', 'Notifications', _toggle_notifications) -about = make('help-about', _('About') + ' ' + NAME, _show_about_window, stock_id='help-about') - -# -# -# - def pair(window, receiver): assert receiver diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py index b0a46d2c..0d8abc66 100644 --- a/lib/solaar/ui/tray.py +++ b/lib/solaar/ui/tray.py @@ -34,6 +34,7 @@ from solaar import NAME from solaar.i18n import _ from . import icons as _icons +from .about import show_window as _show_about_window from .window import popup as _window_popup from .window import toggle as _window_toggle @@ -63,10 +64,10 @@ def _create_menu(quit_handler): menu.append(no_receiver) menu.append(Gtk.SeparatorMenuItem.new()) - from .action import about, make - menu.append(about.create_menu_item()) - menu.append(make('application-exit', _('Quit') + ' ' + NAME, quit_handler, stock_id='application-exit').create_menu_item()) - del about, make + from .action import make + menu.append(make('help-about', _('About %s') % NAME, _show_about_window, stock_id='help-about').create_menu_item()) + menu.append(make('application-exit', _('Quit %s') % NAME, quit_handler, stock_id='application-exit').create_menu_item()) + del make menu.show_all() diff --git a/lib/solaar/ui/window.py b/lib/solaar/ui/window.py index dafd9ed8..eac98392 100644 --- a/lib/solaar/ui/window.py +++ b/lib/solaar/ui/window.py @@ -322,13 +322,11 @@ def _create_window_layout(): bottom_buttons_box = Gtk.ButtonBox(Gtk.Orientation.HORIZONTAL) bottom_buttons_box.set_layout(Gtk.ButtonBoxStyle.START) bottom_buttons_box.set_spacing(20) - quit_button = _new_button(_('Quit') + ' ' + NAME, 'application-exit', icon_size=_SMALL_BUTTON_ICON_SIZE, clicked=destroy) + quit_button = _new_button(_('Quit %s') % NAME, 'application-exit', _SMALL_BUTTON_ICON_SIZE, clicked=destroy) bottom_buttons_box.add(quit_button) - about_button = _new_button( - _('About') + ' ' + NAME, 'help-about', icon_size=_SMALL_BUTTON_ICON_SIZE, clicked=_show_about_window - ) + about_button = _new_button(_('About %s') % NAME, 'help-about', _SMALL_BUTTON_ICON_SIZE, clicked=_show_about_window) bottom_buttons_box.add(about_button) - diversion_button = _new_button(_('Rule Editor'), '', icon_size=_SMALL_BUTTON_ICON_SIZE, clicked=_show_diversion_window) + diversion_button = _new_button(_('Rule Editor'), '', _SMALL_BUTTON_ICON_SIZE, clicked=_show_diversion_window) bottom_buttons_box.add(diversion_button) bottom_buttons_box.set_child_secondary(diversion_button, True)