From 393de563a7e48d82dcb7a30f2dbe596ab2f43c64 Mon Sep 17 00:00:00 2001 From: Joe R Date: Mon, 20 Dec 2021 19:27:19 -0500 Subject: [PATCH] Some minor menubar cleanup. --- po/de_pysol.po | 12 ++++++------ po/fr_pysol.po | 16 ++++++++-------- po/it_pysol.po | 16 ++++++++-------- po/pl_pysol.po | 16 ++++++++-------- po/pysol.pot | 8 ++++---- po/ru_pysol.po | 16 ++++++++-------- pysollib/kivy/menubar.py | 8 ++++---- pysollib/ui/tktile/menubar.py | 21 +++++++++++---------- 8 files changed, 57 insertions(+), 56 deletions(-) diff --git a/po/de_pysol.po b/po/de_pysol.po index 2fcc0c73..315c1872 100644 --- a/po/de_pysol.po +++ b/po/de_pysol.po @@ -4620,8 +4620,8 @@ msgid "&Clear bookmarks" msgstr "Lesezeichen löschen (&C)" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" -msgstr "S&olitär Assistent" +msgid "Solitaire &Wizard..." +msgstr "S&olitär Assistent..." #: pysollib/ui/tktile/menubar.py:393 msgid "&Edit current game" @@ -4669,8 +4669,8 @@ msgid "Log..." msgstr "" #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" -msgstr "D&emo Statistiken" +msgid "D&emo statistics..." +msgstr "D&emo Statistiken..." #: pysollib/ui/tktile/menubar.py:430 msgid "&Assist" @@ -4685,7 +4685,7 @@ msgid "Highlight p&iles" msgstr "Sp&ielfeldstapel hervorheben:" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" +msgid "&Find card..." msgstr "Karte suchen (&F)" #: pysollib/ui/tktile/menubar.py:442 @@ -4697,7 +4697,7 @@ msgid "Demo (&all games)" msgstr "Spieledemo" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 -msgid "&Solver" +msgid "&Solver..." msgstr "" #: pysollib/ui/tktile/menubar.py:453 diff --git a/po/fr_pysol.po b/po/fr_pysol.po index 32d5d1d1..5cd96968 100644 --- a/po/fr_pysol.po +++ b/po/fr_pysol.po @@ -4672,8 +4672,8 @@ msgid "&Clear bookmarks" msgstr "&Vider les signets" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" -msgstr "&Assistant solitaire" +msgid "Solitaire &Wizard..." +msgstr "&Assistant solitaire..." #: pysollib/ui/tktile/menubar.py:393 msgid "&Edit current game" @@ -4721,8 +4721,8 @@ msgid "Log..." msgstr "Journal..." #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" -msgstr "Statistiques d&émo" +msgid "D&emo statistics..." +msgstr "Statistiques d&émo..." #: pysollib/ui/tktile/menubar.py:430 msgid "&Assist" @@ -4737,8 +4737,8 @@ msgid "Highlight p&iles" msgstr "Surbrillance p&iles" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" -msgstr "&Trouver carte" +msgid "&Find card..." +msgstr "&Trouver carte..." #: pysollib/ui/tktile/menubar.py:442 msgid "&Demo" @@ -4749,8 +4749,8 @@ msgid "Demo (&all games)" msgstr "Démo (&tous les jeux)" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 -msgid "&Solver" -msgstr "&Solveur" +msgid "&Solver..." +msgstr "&Solveur..." #: pysollib/ui/tktile/menubar.py:453 msgid "&Piles description" diff --git a/po/it_pysol.po b/po/it_pysol.po index 24c3e226..38651954 100644 --- a/po/it_pysol.po +++ b/po/it_pysol.po @@ -4737,8 +4737,8 @@ msgid "&Clear bookmarks" msgstr "Ri&pulisci i segnalibri" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" -msgstr "Costruzione &guidata" +msgid "Solitaire &Wizard..." +msgstr "Costruzione &guidata..." #: pysollib/ui/tktile/menubar.py:393 msgid "&Edit current game" @@ -4786,8 +4786,8 @@ msgid "Log..." msgstr "Log..." #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" -msgstr "Statistiche d&emo" +msgid "D&emo statistics..." +msgstr "Statistiche d&emo..." #: pysollib/ui/tktile/menubar.py:430 #, fuzzy @@ -4803,8 +4803,8 @@ msgid "Highlight p&iles" msgstr "Evidenzia p&ile" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" -msgstr "&Trova carta" +msgid "&Find card..." +msgstr "&Trova carta..." #: pysollib/ui/tktile/menubar.py:442 msgid "&Demo" @@ -4815,8 +4815,8 @@ msgid "Demo (&all games)" msgstr "Demo (&tutti i giochi)" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 -msgid "&Solver" -msgstr "&Solutore" +msgid "&Solver..." +msgstr "&Solutore..." #: pysollib/ui/tktile/menubar.py:453 msgid "&Piles description" diff --git a/po/pl_pysol.po b/po/pl_pysol.po index 6ac59c51..bd7ec140 100644 --- a/po/pl_pysol.po +++ b/po/pl_pysol.po @@ -4795,8 +4795,8 @@ msgid "&Clear bookmarks" msgstr "Wy&czyść zakładki" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" -msgstr "Kreator gier Solitaire" +msgid "Solitaire &Wizard..." +msgstr "Kreator gier Solitaire..." #: pysollib/ui/tktile/menubar.py:393 msgid "&Edit current game" @@ -4844,8 +4844,8 @@ msgid "Log..." msgstr "Log..." #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" -msgstr "D&emo statystyk" +msgid "D&emo statistics..." +msgstr "D&emo statystyk..." #: pysollib/ui/tktile/menubar.py:430 #, fuzzy @@ -4861,8 +4861,8 @@ msgid "Highlight p&iles" msgstr "Podśw&ietl stosy" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" -msgstr "Znajdź kartę" +msgid "&Find card..." +msgstr "Znajdź kartę..." #: pysollib/ui/tktile/menubar.py:442 msgid "&Demo" @@ -4874,8 +4874,8 @@ msgstr "Demo (wszystkie gry)" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #, fuzzy -msgid "&Solver" -msgstr "Srebro" +msgid "&Solver..." +msgstr "Srebro..." #: pysollib/ui/tktile/menubar.py:453 msgid "&Piles description" diff --git a/po/pysol.pot b/po/pysol.pot index fb3af3dc..b7e3ff3e 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -4427,7 +4427,7 @@ msgid "&Clear bookmarks" msgstr "" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" +msgid "Solitaire &Wizard..." msgstr "" #: pysollib/ui/tktile/menubar.py:393 @@ -4476,7 +4476,7 @@ msgid "Log..." msgstr "" #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" +msgid "D&emo statistics..." msgstr "" #: pysollib/ui/tktile/menubar.py:430 @@ -4492,7 +4492,7 @@ msgid "Highlight p&iles" msgstr "" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" +msgid "&Find card..." msgstr "" #: pysollib/ui/tktile/menubar.py:442 @@ -4504,7 +4504,7 @@ msgid "Demo (&all games)" msgstr "" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 -msgid "&Solver" +msgid "&Solver..." msgstr "" #: pysollib/ui/tktile/menubar.py:453 diff --git a/po/ru_pysol.po b/po/ru_pysol.po index f7283a7f..fc37e558 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -4761,8 +4761,8 @@ msgid "&Clear bookmarks" msgstr "О&чистить закладки" #: pysollib/ui/tktile/menubar.py:391 -msgid "Solitaire &Wizard" -msgstr "Конструктор пасьянсов" +msgid "Solitaire &Wizard..." +msgstr "Конструктор пасьянсов..." #: pysollib/ui/tktile/menubar.py:393 msgid "&Edit current game" @@ -4810,8 +4810,8 @@ msgid "Log..." msgstr "Лог..." #: pysollib/ui/tktile/menubar.py:427 -msgid "D&emo statistics" -msgstr "Статистика демо" +msgid "D&emo statistics..." +msgstr "Статистика демо..." #: pysollib/ui/tktile/menubar.py:430 msgid "&Assist" @@ -4826,8 +4826,8 @@ msgid "Highlight p&iles" msgstr "П&оказать группы" #: pysollib/ui/tktile/menubar.py:438 -msgid "&Find card" -msgstr "&Найти карту" +msgid "&Find card..." +msgstr "&Найти карту..." #: pysollib/ui/tktile/menubar.py:442 msgid "&Demo" @@ -4839,8 +4839,8 @@ msgstr "Демо (&все игры)" #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #, fuzzy -msgid "&Solver" -msgstr "Серебро" +msgid "&Solver..." +msgstr "Серебро..." #: pysollib/ui/tktile/menubar.py:453 msgid "&Piles description" diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py index 2835bebf..e96b511e 100644 --- a/pysollib/kivy/menubar.py +++ b/pysollib/kivy/menubar.py @@ -344,7 +344,7 @@ class EditMenuDialog(LMenuDialog): # Tools # und solitär wizard (-> custom games). ''' tv.add_node(LTreeNode( - text='Solitaire &Wizard', command=self.menubar.mWizard)) + text='Solitaire &Wizard...', command=self.menubar.mWizard)) tv.add_node(LTreeNode( text='Edit current game', command=self.menubar.mWizardEdit)) ''' @@ -410,7 +410,7 @@ class GameMenuDialog(LMenuDialog): submenu.add_command( label=n_("Progression..."), command=lambda x: self.mPlayerStats(mode=107)) - submenu = MfxMenu(menu, label=n_("D&emo statistics")) + submenu = MfxMenu(menu, label=n_("D&emo statistics...")) submenu.add_command( label=n_("Current game..."), command=lambda x: self.mPlayerStats(mode=1101)) @@ -450,9 +450,9 @@ class AssistMenuDialog(LMenuDialog): menu.add_command( label=n_("Demo (&all games)"), command=self.mMixedDemo) if USE_FREECELL_SOLVER: - menu.add_command(label=n_("&Solver"), command=self.mSolver) + menu.add_command(label=n_("&Solver..."), command=self.mSolver) else: - menu.add_command(label=n_("&Solver"), state='disabled') + menu.add_command(label=n_("&Solver..."), state='disabled') menu.add_separator() menu.add_command( label=n_("&Piles description"), diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py index 75174cbc..d63fe99b 100644 --- a/pysollib/ui/tktile/menubar.py +++ b/pysollib/ui/tktile/menubar.py @@ -397,7 +397,9 @@ class PysolMenubarTkCommon: command=self.mRestart, accelerator=m+"G") menu.add_separator() - menu.add_command(label=n_("Solitaire &Wizard"), command=self.mWizard) + menu.add_command( + label=n_("Solitaire &Wizard..."), + command=self.mWizard) menu.add_command( label=n_("&Edit current game"), command=self.mWizardEdit) @@ -436,7 +438,7 @@ class PysolMenubarTkCommon: command=lambda: self.mPlayerStats(mode=103)) menu.add_separator() menu.add_command( - label=n_("D&emo statistics"), + label=n_("D&emo statistics..."), command=lambda: self.mPlayerStats(mode=1101)) menu = MfxMenu(self.menubar, label=n_("&Assist")) @@ -447,7 +449,7 @@ class PysolMenubarTkCommon: label=n_("Highlight p&iles"), command=self.mHighlightPiles, accelerator="I") menu.add_command( - label=n_("&Find card"), + label=n_("&Find card..."), command=self.mFindCard, accelerator="F3") menu.add_separator() menu.add_command( @@ -457,9 +459,9 @@ class PysolMenubarTkCommon: label=n_("Demo (&all games)"), command=self.mMixedDemo) if USE_FREECELL_SOLVER: - menu.add_command(label=n_("&Solver"), command=self.mSolver) + menu.add_command(label=n_("&Solver..."), command=self.mSolver) else: - menu.add_command(label=n_("&Solver"), state='disabled') + menu.add_command(label=n_("&Solver..."), state='disabled') menu.add_separator() menu.add_command( label=n_("&Piles description"), @@ -563,6 +565,10 @@ class PysolMenubarTkCommon: submenu.add_checkbutton( label=n_("&Center layout"), variable=self.tkopt.center_layout, command=self.mOptCenterLayout) + submenu.add_checkbutton( + label=n_("Save games &geometry"), + variable=self.tkopt.save_games_geometry, + command=self.mOptSaveGamesGeometry) # manager = self.app.cardset_manager # n = manager.len() menu.add_command( @@ -657,11 +663,6 @@ class PysolMenubarTkCommon: submenu.add_checkbutton( label=n_("Show &help bar"), variable=self.tkopt.helpbar, command=self.mOptHelpbar) - # if not USE_PIL: - menu.add_checkbutton( - label=n_("Save games &geometry"), - variable=self.tkopt.save_games_geometry, - command=self.mOptSaveGamesGeometry) menu.add_checkbutton( label=n_("&Demo logo"), variable=self.tkopt.demo_logo, command=self.mOptDemoLogo)