Exposed toolbar icon size option.

data/images/toolbar/human/info.txt

@@ -0,0 +1,3 @@
+Human icon set - https://launchpad.net/human-icon-theme/
+
+Some icons modified to fit PySolFC.  Icon set is used under a CC-BY-SA license.

po/de_pysol.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2022-01-20 21:43-0500\n"
+"PO-Revision-Date: 2022-02-08 22:31-0500\n"
 "Last-Translator: H. Schaekel <Holger.Schaekel@web.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -4519,6 +4519,18 @@ msgstr "Karte suchen"
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr ""
+
+msgid "Large icons"
+msgstr ""
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr ""

po/fr_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1.02\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2022-01-20 21:43-0500\n"
+"PO-Revision-Date: 2022-02-08 22:31-0500\n"
 "Last-Translator: Eric Rausch <neelix570@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -4571,6 +4571,18 @@ msgstr "Trouver carte"
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr ""
+
+msgid "Large icons"
+msgstr ""
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr "Affichage"

po/it_pysol.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: it_pysol\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2022-01-20 21:42-0500\n"
+"PO-Revision-Date: 2022-02-08 22:30-0500\n"
 "Last-Translator: Giuliano Colla <giuliano.colla@gmail.com>\n"
 "Language-Team: Italiano <it@li.org>\n"
 "Language: it\n"
@@ -4636,6 +4636,18 @@ msgstr "Trova carta"
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr ""
+
+msgid "Large icons"
+msgstr ""
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr "Composto"

po/pl_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2022-01-20 21:42-0500\n"
+"PO-Revision-Date: 2022-02-08 22:32-0500\n"
 "Last-Translator: Jerzy Trzeciak <artusek@wp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
@@ -4694,6 +4694,18 @@ msgstr "znajdź kartę"
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr ""
+
+msgid "Large icons"
+msgstr ""
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr "Układ"

po/pysol.pot

@@ -4326,6 +4326,18 @@ msgstr ""
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr ""
+
+msgid "Large icons"
+msgstr ""
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr ""

po/ru_pysol.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2022-01-20 21:42-0500\n"
+"PO-Revision-Date: 2022-02-08 22:29-0500\n"
 "Last-Translator: Skomoroh <skomoroh@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
@@ -4660,6 +4660,18 @@ msgstr "Найти карту"
 msgid "Icon Style"
 msgstr ""
 
+msgid "Icon Size"
+msgstr ""
+
+msgid "Small icons"
+msgstr "Маленькие пиктограммы"
+
+msgid "Large icons"
+msgstr "Большие пиктограммы"
+
+msgid "Extra large icons"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:35
 msgid "Compound"
 msgstr "Компоновка"
@@ -5384,9 +5396,3 @@ msgstr "Настроить шрифт"
 
 #~ msgid "Style"
 #~ msgstr "Стиль"
-
-#~ msgid "Small icons"
-#~ msgstr "Маленькие пиктограммы"
-
-#~ msgid "Large icons"
-#~ msgstr "Большие пиктограммы"

pysollib/app.py

@@ -585,7 +585,9 @@ class Application:
         return self._getImagesDir('cards')
 
     def getToolbarImagesDir(self):
-        if self.opt.toolbar_size:
+        if self.opt.toolbar_size == 2:
+            size = 'xlarge'
+        elif self.opt.toolbar_size == 1:
             size = 'large'
         else:
             size = 'small'

pysollib/options.py

@@ -96,7 +96,7 @@ toolbar = integer(0, 4)
 toolbar_style = string
 toolbar_relief = string
 toolbar_compound = string
-toolbar_size = integer(0, 1)
+toolbar_size = integer(0, 2)
 statusbar = boolean
 statusbar_game_number = boolean
 statusbar_stuck = boolean

pysollib/ui/tktile/menubar.py

@@ -32,6 +32,16 @@ def createToolbarMenu(menubar, menu):
               label=name,
               variable=menubar.tkopt.toolbar_style,
               value=f, command=menubar.mOptToolbarStyle)
+    submenu = MfxMenu(menu, label=n_('Icon Size'), tearoff=tearoff)
+    submenu.add_radiobutton(label=n_("Small icons"),
+                            variable=menubar.tkopt.toolbar_size, value=0,
+                            command=menubar.mOptToolbarSize)
+    submenu.add_radiobutton(label=n_("Large icons"),
+                            variable=menubar.tkopt.toolbar_size, value=1,
+                            command=menubar.mOptToolbarSize)
+    # submenu.add_radiobutton(label=n_("Extra large icons"),
+    #                         variable=menubar.tkopt.toolbar_size, value=2,
+    #                         command=menubar.mOptToolbarSize)
     submenu = MfxMenu(menu, label=n_('Compound'), tearoff=tearoff)
     for comp, label in COMPOUNDS:
         submenu.add_radiobutton(
@@ -59,13 +69,6 @@ def createToolbarMenu(menubar, menu):
     menu.add_radiobutton(label=n_("Right"),
                          variable=menubar.tkopt.toolbar, value=4,
                          command=menubar.mOptToolbar)
-    #  menu.add_separator()
-    #  menu.add_radiobutton(label=n_("Small icons"),
-    #                       variable=menubar.tkopt.toolbar_size, value=0,
-    #                       command=menubar.mOptToolbarSize)
-    #  menu.add_radiobutton(label=n_("Large icons"),
-    #                       variable=menubar.tkopt.toolbar_size, value=1,
-    #                       command=menubar.mOptToolbarSize)
 
 
 # ************************************************************************