1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

Some minor menubar cleanup.

This commit is contained in:
Joe R 2021-12-20 19:27:19 -05:00
parent a8c94d1d11
commit 393de563a7
8 changed files with 57 additions and 56 deletions

View file

@ -4620,8 +4620,8 @@ msgid "&Clear bookmarks"
msgstr "Lesezeichen löschen (&C)" msgstr "Lesezeichen löschen (&C)"
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "S&olitär Assistent" msgstr "S&olitär Assistent..."
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
msgid "&Edit current game" msgid "&Edit current game"
@ -4669,8 +4669,8 @@ msgid "Log..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "D&emo Statistiken" msgstr "D&emo Statistiken..."
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
msgid "&Assist" msgid "&Assist"
@ -4685,7 +4685,7 @@ msgid "Highlight p&iles"
msgstr "Sp&ielfeldstapel hervorheben:" msgstr "Sp&ielfeldstapel hervorheben:"
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "Karte suchen (&F)" msgstr "Karte suchen (&F)"
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
@ -4697,7 +4697,7 @@ msgid "Demo (&all games)"
msgstr "Spieledemo" msgstr "Spieledemo"
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
msgid "&Solver" msgid "&Solver..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453

View file

@ -4672,8 +4672,8 @@ msgid "&Clear bookmarks"
msgstr "&Vider les signets" msgstr "&Vider les signets"
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "&Assistant solitaire" msgstr "&Assistant solitaire..."
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
msgid "&Edit current game" msgid "&Edit current game"
@ -4721,8 +4721,8 @@ msgid "Log..."
msgstr "Journal..." msgstr "Journal..."
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "Statistiques d&émo" msgstr "Statistiques d&émo..."
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
msgid "&Assist" msgid "&Assist"
@ -4737,8 +4737,8 @@ msgid "Highlight p&iles"
msgstr "Surbrillance p&iles" msgstr "Surbrillance p&iles"
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "&Trouver carte" msgstr "&Trouver carte..."
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
msgid "&Demo" msgid "&Demo"
@ -4749,8 +4749,8 @@ msgid "Demo (&all games)"
msgstr "Démo (&tous les jeux)" msgstr "Démo (&tous les jeux)"
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
msgid "&Solver" msgid "&Solver..."
msgstr "&Solveur" msgstr "&Solveur..."
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453
msgid "&Piles description" msgid "&Piles description"

View file

@ -4737,8 +4737,8 @@ msgid "&Clear bookmarks"
msgstr "Ri&pulisci i segnalibri" msgstr "Ri&pulisci i segnalibri"
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "Costruzione &guidata" msgstr "Costruzione &guidata..."
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
msgid "&Edit current game" msgid "&Edit current game"
@ -4786,8 +4786,8 @@ msgid "Log..."
msgstr "Log..." msgstr "Log..."
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "Statistiche d&emo" msgstr "Statistiche d&emo..."
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
#, fuzzy #, fuzzy
@ -4803,8 +4803,8 @@ msgid "Highlight p&iles"
msgstr "Evidenzia p&ile" msgstr "Evidenzia p&ile"
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "&Trova carta" msgstr "&Trova carta..."
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
msgid "&Demo" msgid "&Demo"
@ -4815,8 +4815,8 @@ msgid "Demo (&all games)"
msgstr "Demo (&tutti i giochi)" msgstr "Demo (&tutti i giochi)"
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
msgid "&Solver" msgid "&Solver..."
msgstr "&Solutore" msgstr "&Solutore..."
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453
msgid "&Piles description" msgid "&Piles description"

View file

@ -4795,8 +4795,8 @@ msgid "&Clear bookmarks"
msgstr "Wy&czyść zakładki" msgstr "Wy&czyść zakładki"
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "Kreator gier Solitaire" msgstr "Kreator gier Solitaire..."
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
msgid "&Edit current game" msgid "&Edit current game"
@ -4844,8 +4844,8 @@ msgid "Log..."
msgstr "Log..." msgstr "Log..."
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "D&emo statystyk" msgstr "D&emo statystyk..."
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
#, fuzzy #, fuzzy
@ -4861,8 +4861,8 @@ msgid "Highlight p&iles"
msgstr "Podśw&ietl stosy" msgstr "Podśw&ietl stosy"
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "Znajdź kartę" msgstr "Znajdź kartę..."
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
msgid "&Demo" msgid "&Demo"
@ -4874,8 +4874,8 @@ msgstr "Demo (wszystkie gry)"
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
#, fuzzy #, fuzzy
msgid "&Solver" msgid "&Solver..."
msgstr "Srebro" msgstr "Srebro..."
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453
msgid "&Piles description" msgid "&Piles description"

View file

@ -4427,7 +4427,7 @@ msgid "&Clear bookmarks"
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
@ -4476,7 +4476,7 @@ msgid "Log..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
@ -4492,7 +4492,7 @@ msgid "Highlight p&iles"
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
@ -4504,7 +4504,7 @@ msgid "Demo (&all games)"
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
msgid "&Solver" msgid "&Solver..."
msgstr "" msgstr ""
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453

View file

@ -4761,8 +4761,8 @@ msgid "&Clear bookmarks"
msgstr "О&чистить закладки" msgstr "О&чистить закладки"
#: pysollib/ui/tktile/menubar.py:391 #: pysollib/ui/tktile/menubar.py:391
msgid "Solitaire &Wizard" msgid "Solitaire &Wizard..."
msgstr "Конструктор пасьянсов" msgstr "Конструктор пасьянсов..."
#: pysollib/ui/tktile/menubar.py:393 #: pysollib/ui/tktile/menubar.py:393
msgid "&Edit current game" msgid "&Edit current game"
@ -4810,8 +4810,8 @@ msgid "Log..."
msgstr "Лог..." msgstr "Лог..."
#: pysollib/ui/tktile/menubar.py:427 #: pysollib/ui/tktile/menubar.py:427
msgid "D&emo statistics" msgid "D&emo statistics..."
msgstr "Статистика демо" msgstr "Статистика демо..."
#: pysollib/ui/tktile/menubar.py:430 #: pysollib/ui/tktile/menubar.py:430
msgid "&Assist" msgid "&Assist"
@ -4826,8 +4826,8 @@ msgid "Highlight p&iles"
msgstr "П&оказать группы" msgstr "П&оказать группы"
#: pysollib/ui/tktile/menubar.py:438 #: pysollib/ui/tktile/menubar.py:438
msgid "&Find card" msgid "&Find card..."
msgstr "&Найти карту" msgstr "&Найти карту..."
#: pysollib/ui/tktile/menubar.py:442 #: pysollib/ui/tktile/menubar.py:442
msgid "&Demo" msgid "&Demo"
@ -4839,8 +4839,8 @@ msgstr "Демо (&все игры)"
#: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450 #: pysollib/ui/tktile/menubar.py:448 pysollib/ui/tktile/menubar.py:450
#, fuzzy #, fuzzy
msgid "&Solver" msgid "&Solver..."
msgstr "Серебро" msgstr "Серебро..."
#: pysollib/ui/tktile/menubar.py:453 #: pysollib/ui/tktile/menubar.py:453
msgid "&Piles description" msgid "&Piles description"

View file

@ -344,7 +344,7 @@ class EditMenuDialog(LMenuDialog): # Tools
# und solitär wizard (-> custom games). # und solitär wizard (-> custom games).
''' '''
tv.add_node(LTreeNode( tv.add_node(LTreeNode(
text='Solitaire &Wizard', command=self.menubar.mWizard)) text='Solitaire &Wizard...', command=self.menubar.mWizard))
tv.add_node(LTreeNode( tv.add_node(LTreeNode(
text='Edit current game', command=self.menubar.mWizardEdit)) text='Edit current game', command=self.menubar.mWizardEdit))
''' '''
@ -410,7 +410,7 @@ class GameMenuDialog(LMenuDialog):
submenu.add_command( submenu.add_command(
label=n_("Progression..."), label=n_("Progression..."),
command=lambda x: self.mPlayerStats(mode=107)) 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( submenu.add_command(
label=n_("Current game..."), label=n_("Current game..."),
command=lambda x: self.mPlayerStats(mode=1101)) command=lambda x: self.mPlayerStats(mode=1101))
@ -450,9 +450,9 @@ class AssistMenuDialog(LMenuDialog):
menu.add_command( menu.add_command(
label=n_("Demo (&all games)"), command=self.mMixedDemo) label=n_("Demo (&all games)"), command=self.mMixedDemo)
if USE_FREECELL_SOLVER: if USE_FREECELL_SOLVER:
menu.add_command(label=n_("&Solver"), command=self.mSolver) menu.add_command(label=n_("&Solver..."), command=self.mSolver)
else: else:
menu.add_command(label=n_("&Solver"), state='disabled') menu.add_command(label=n_("&Solver..."), state='disabled')
menu.add_separator() menu.add_separator()
menu.add_command( menu.add_command(
label=n_("&Piles description"), label=n_("&Piles description"),

View file

@ -397,7 +397,9 @@ class PysolMenubarTkCommon:
command=self.mRestart, accelerator=m+"G") command=self.mRestart, accelerator=m+"G")
menu.add_separator() 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( menu.add_command(
label=n_("&Edit current game"), label=n_("&Edit current game"),
command=self.mWizardEdit) command=self.mWizardEdit)
@ -436,7 +438,7 @@ class PysolMenubarTkCommon:
command=lambda: self.mPlayerStats(mode=103)) command=lambda: self.mPlayerStats(mode=103))
menu.add_separator() menu.add_separator()
menu.add_command( menu.add_command(
label=n_("D&emo statistics"), label=n_("D&emo statistics..."),
command=lambda: self.mPlayerStats(mode=1101)) command=lambda: self.mPlayerStats(mode=1101))
menu = MfxMenu(self.menubar, label=n_("&Assist")) menu = MfxMenu(self.menubar, label=n_("&Assist"))
@ -447,7 +449,7 @@ class PysolMenubarTkCommon:
label=n_("Highlight p&iles"), label=n_("Highlight p&iles"),
command=self.mHighlightPiles, accelerator="I") command=self.mHighlightPiles, accelerator="I")
menu.add_command( menu.add_command(
label=n_("&Find card"), label=n_("&Find card..."),
command=self.mFindCard, accelerator="F3") command=self.mFindCard, accelerator="F3")
menu.add_separator() menu.add_separator()
menu.add_command( menu.add_command(
@ -457,9 +459,9 @@ class PysolMenubarTkCommon:
label=n_("Demo (&all games)"), label=n_("Demo (&all games)"),
command=self.mMixedDemo) command=self.mMixedDemo)
if USE_FREECELL_SOLVER: if USE_FREECELL_SOLVER:
menu.add_command(label=n_("&Solver"), command=self.mSolver) menu.add_command(label=n_("&Solver..."), command=self.mSolver)
else: else:
menu.add_command(label=n_("&Solver"), state='disabled') menu.add_command(label=n_("&Solver..."), state='disabled')
menu.add_separator() menu.add_separator()
menu.add_command( menu.add_command(
label=n_("&Piles description"), label=n_("&Piles description"),
@ -563,6 +565,10 @@ class PysolMenubarTkCommon:
submenu.add_checkbutton( submenu.add_checkbutton(
label=n_("&Center layout"), variable=self.tkopt.center_layout, label=n_("&Center layout"), variable=self.tkopt.center_layout,
command=self.mOptCenterLayout) 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 # manager = self.app.cardset_manager
# n = manager.len() # n = manager.len()
menu.add_command( menu.add_command(
@ -657,11 +663,6 @@ class PysolMenubarTkCommon:
submenu.add_checkbutton( submenu.add_checkbutton(
label=n_("Show &help bar"), variable=self.tkopt.helpbar, label=n_("Show &help bar"), variable=self.tkopt.helpbar,
command=self.mOptHelpbar) 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( menu.add_checkbutton(
label=n_("&Demo logo"), variable=self.tkopt.demo_logo, label=n_("&Demo logo"), variable=self.tkopt.demo_logo,
command=self.mOptDemoLogo) command=self.mOptDemoLogo)