Skip to content

Commit

Permalink
Added options to change/select other graphics.
Browse files Browse the repository at this point in the history
  • Loading branch information
joeraz committed Nov 11, 2023
1 parent 3483bd1 commit c8ea09c
Show file tree
Hide file tree
Showing 44 changed files with 263 additions and 19 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added data/images/demo/gold/demo01.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/demo/gold/demo01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added data/images/pause/gold/pause01.gif
Binary file added data/images/pause/gold/pause01.png
File renamed without changes
Binary file added data/images/redealicons/classic/redeal.png
File renamed without changes
Binary file added data/images/redealicons/classic/stopsign.png
File renamed without changes
File renamed without changes
17 changes: 16 additions & 1 deletion po/de_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-11-05 12:49-0500\n"
"PO-Revision-Date: 2023-11-11 18:27-0500\n"
"Last-Translator: H. Schaekel <[email protected]>\n"
"Language-Team: German\n"
"Language: de\n"
Expand Down Expand Up @@ -5363,10 +5363,25 @@ msgstr ""
msgid "Save games &geometry"
msgstr "Spielgeometrie speichern"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "&Demo logo"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr ""
Expand Down
17 changes: 16 additions & 1 deletion po/fr_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-11-05 12:49-0500\n"
"PO-Revision-Date: 2023-11-11 18:27-0500\n"
"Last-Translator: Eric Rausch <[email protected]>\n"
"Language-Team: French\n"
"Language: fr\n"
Expand Down Expand Up @@ -5408,10 +5408,25 @@ msgstr "Barre d'&aide"
msgid "Save games &geometry"
msgstr "Enregistrer la &géométrie du jeu"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "Logo de &démo"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr "Éc&ran de démarrage"
Expand Down
17 changes: 16 additions & 1 deletion po/it_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-11-05 12:49-0500\n"
"PO-Revision-Date: 2023-11-11 18:26-0500\n"
"Last-Translator: Giuliano Colla <[email protected]>\n"
"Language-Team: Italiano <[email protected]>\n"
"Language: it\n"
Expand Down Expand Up @@ -5472,10 +5472,25 @@ msgstr "Mostra barra di a&iuto"
msgid "Save games &geometry"
msgstr "Salva gioco e &geometria"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "&Demo logo"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr "Splash sc&reen all'avvio"
Expand Down
17 changes: 16 additions & 1 deletion po/pl_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PySolFC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2023-11-05 12:49-0500\n"
"PO-Revision-Date: 2023-11-11 18:26-0500\n"
"Last-Translator: Jerzy Trzeciak <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
"Language: pl\n"
Expand Down Expand Up @@ -5424,10 +5424,25 @@ msgstr "Pokaż pasek pomocy"
msgid "Save games &geometry"
msgstr "Zapisz układ &gier"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "&Demo logo"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr "Ek&ran powitalny"
Expand Down
17 changes: 16 additions & 1 deletion po/pt_BR_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-11-05 12:50-0500\n"
"PO-Revision-Date: 2023-11-11 18:25-0500\n"
"Last-Translator: Matheus Knack <[email protected]>\n"
"Language-Team: \n"
"Language: pt_BR\n"
Expand Down Expand Up @@ -5430,10 +5430,25 @@ msgstr "Mostra &barra de ajuda"
msgid "Save games &geometry"
msgstr "Salvar jogos &geometria"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "&Logo da demo"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr "Tela inicial de iniciali&zação"
Expand Down
15 changes: 15 additions & 0 deletions po/pysol.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5157,10 +5157,25 @@ msgstr ""
msgid "Save games &geometry"
msgstr ""

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr ""

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr ""
Expand Down
17 changes: 16 additions & 1 deletion po/ru_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-11-05 12:50-0500\n"
"PO-Revision-Date: 2023-11-11 18:25-0500\n"
"Last-Translator: Skomoroh <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
Expand Down Expand Up @@ -5498,10 +5498,25 @@ msgstr "Показывать панель помощи"
msgid "Save games &geometry"
msgstr "Сохранение &геометрии игры"

msgid "Othe&r graphics"
msgstr ""

#: pysollib/ui/tktile/menubar.py:637
msgid "&Demo logo"
msgstr "Д&емо лого"

msgid "D&ialog icons"
msgstr ""

msgid "&Show demo logo"
msgstr ""

msgid "&Pause text"
msgstr ""

msgid "&Redeal iconso"
msgstr ""

#: pysollib/ui/tktile/menubar.py:640
msgid "Startup splash sc&reen"
msgstr "О&кно запуска"
Expand Down
28 changes: 18 additions & 10 deletions pysollib/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,18 +508,15 @@ def wm_withdraw(self):
def loadImages1(self):
# load dialog images
dirname = os.path.join("images", "logos")
self.gimages.logos = []
for f in ("joker07_40_774",
"joker08_40_774",
"joker07_50_774",
"joker08_50_774",
"joker11_100_774",
"joker10_100",):
self.gimages.logos.append(self.dataloader.findImage(f, dirname))
# if WIN_SYSTEM == 'win32':
# dirname = os.path.join('images', 'dialog', 'default')
# else:
# dirname = os.path.join('images', 'dialog', 'bluecurve')
dirname = os.path.join('images', 'dialog', 'remix')
dirname = os.path.join('images', 'dialog', self.opt.dialog_icon_style)
for f in ('error', 'info', 'question', 'warning'):
fn = self.dataloader.findImage(f, dirname)
im = loadImage(fn)
Expand All @@ -539,16 +536,27 @@ def loadImages1(self):

def loadImages2(self):
# load canvas images
dirname = "images"
dirname = os.path.join("images", "redealicons",
self.opt.redeal_icon_style)
# for f in ("noredeal", "redeal",):
self.gimages.redeal = []
for f in ("stopsign", "redeal",):
self.gimages.redeal.append(self.dataloader.findImage(f, dirname))
dirname = os.path.join("images", "demo")
dirname = os.path.join("images", "demo", self.opt.demo_logo_style)
self.gimages.demo = []
for f in ("demo01", "demo02", "demo03", "demo04", "demo05",):
self.gimages.demo.append(self.dataloader.findImage(f, dirname))
dirname = os.path.join("images", "pause")
try:
self.gimages.demo.append(self.dataloader.findImage(f, dirname))
except OSError:
pass
dirname = os.path.join("images", "pause", self.opt.pause_text_style)
self.gimages.pause = []
for f in ("pause01", "pause02", "pause03",):
self.gimages.pause.append(self.dataloader.findImage(f, dirname))
try:
self.gimages.pause.append(self.dataloader.findImage(f,
dirname))
except OSError:
pass
# dirname = os.path.join("images", "stats")
# for f in ("barchart",):
# self.gimages.stats.append(self.dataloader.findImage(f, dirname))
Expand Down
12 changes: 12 additions & 0 deletions pysollib/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ def calcCustomMouseButtonsBinding(binding_format):
shrink_face_down = boolean
shade_filled_stacks = boolean
demo_logo = boolean
demo_logo_style = string
pause_text_style = string
redeal_icon_style = string
dialog_icon_style = string
tile_theme = string
default_tile_theme = string
toolbar = integer(0, 4)
Expand Down Expand Up @@ -258,6 +262,10 @@ class Options:
('shrink_face_down', 'bool'),
('shade_filled_stacks', 'bool'),
('demo_logo', 'bool'),
('demo_logo_style', 'str'),
('pause_text_style', 'str'),
('redeal_icon_style', 'str'),
('dialog_icon_style', 'str'),
('tile_theme', 'str'),
('default_tile_theme', 'str'),
('toolbar', 'int'),
Expand Down Expand Up @@ -357,6 +365,10 @@ def __init__(self):
self.shrink_face_down = True
self.shade_filled_stacks = True
self.demo_logo = True
self.demo_logo_style = 'classic'
self.pause_text_style = 'classic'
self.redeal_icon_style = 'modern'
self.dialog_icon_style = 'remix'
self.tile_theme = 'default'
self.default_tile_theme = 'default'
self.toolbar = 1 # 0 == hide, 1,2,3,4 == top, bottom, lef, right
Expand Down
Loading

0 comments on commit c8ea09c

Please sign in to comment.