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

+ 1 new game

* misc improvements


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@87 39dd0a4e-7c14-0410-91b3-c4f2d318f732
This commit is contained in:
skomoroh 2006-11-06 22:10:44 +00:00
parent 4c7c9ce7f9
commit ea95db2200
13 changed files with 198 additions and 272 deletions

View file

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Tue Oct 31 19:32:40 2006\n" "POT-Creation-Date: Mon Nov 6 09:46:50 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -2742,6 +2742,9 @@ msgstr ""
msgid "Quadruple Alliance" msgid "Quadruple Alliance"
msgstr "" msgstr ""
msgid "Quads"
msgstr ""
msgid "Quartets" msgid "Quartets"
msgstr "" msgstr ""
@ -3510,9 +3513,6 @@ msgstr ""
msgid "Troika" msgid "Troika"
msgstr "" msgstr ""
msgid "Troika +"
msgstr ""
msgid "Trusty Twelve" msgid "Trusty Twelve"
msgstr "" msgstr ""

View file

@ -14,7 +14,7 @@ msgid ""
msgstr "" msgstr ""
"#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" "POT-Creation-Date: Mon Nov 6 09:47:42 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -24,7 +24,7 @@ msgstr ""
"Generated-By: pygettext.py 1.5\n" "Generated-By: pygettext.py 1.5\n"
"#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2006-10-31 19:33+0300\n" "POT-Creation-Date: 2006-11-06 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -70,7 +70,7 @@ msgstr ""
#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865
#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
#: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
#: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:85
@ -81,8 +81,8 @@ msgstr ""
#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512
#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594
#: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708
#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 #: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:159
#: pysollib/tk/tkwidget.py:325 #: pysollib/tk/tkwidget.py:324
msgid "&OK" msgid "&OK"
msgstr "" msgstr ""
@ -95,7 +95,7 @@ msgstr ""
#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241
#: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407
#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170
#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324
msgid "&Cancel" msgid "&Cancel"
msgstr "" msgstr ""
@ -1227,7 +1227,7 @@ msgstr ""
msgid " Help" msgid " Help"
msgstr "" msgstr ""
#: pysollib/main.py:67 pysollib/main.py:282 #: pysollib/main.py:67 pysollib/main.py:284
msgid " installation error" msgid " installation error"
msgstr "" msgstr ""
@ -1241,7 +1241,7 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 #: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382
msgid "&Quit" msgid "&Quit"
msgstr "" msgstr ""
@ -1281,7 +1281,7 @@ msgid ""
"try %s --help for more information" "try %s --help for more information"
msgstr "" msgstr ""
#: pysollib/main.py:283 #: pysollib/main.py:285
msgid "" msgid ""
"\n" "\n"
"No games were found !!!\n" "No games were found !!!\n"
@ -1292,293 +1292,293 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:369 pysollib/main.py:377 #: pysollib/main.py:371 pysollib/main.py:379
msgid " installation problem" msgid " installation problem"
msgstr "" msgstr ""
#: pysollib/main.py:370 #: pysollib/main.py:372
msgid "" msgid ""
"Your Python installation is compiled without thread support.\n" "Your Python installation is compiled without thread support.\n"
"\n" "\n"
"Sounds and background music will be disabled." "Sounds and background music will be disabled."
msgstr "" msgstr ""
#: pysollib/main.py:378 #: pysollib/main.py:380
msgid "" msgid ""
"The pysolsoundserver module was not found.\n" "The pysolsoundserver module was not found.\n"
"\n" "\n"
"Sounds and background music will be disabled." "Sounds and background music will be disabled."
msgstr "" msgstr ""
#: pysollib/main.py:385 #: pysollib/main.py:387
msgid "Welcome to " msgid "Welcome to "
msgstr "" msgstr ""
#: pysollib/resource.py:242 #: pysollib/resource.py:192
msgid "French type (52 cards)" msgid "French type (52 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:243 #: pysollib/resource.py:193
msgid "Hanafuda type (48 cards)" msgid "Hanafuda type (48 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:244 #: pysollib/resource.py:194
msgid "Tarock type (78 cards)" msgid "Tarock type (78 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:245 #: pysollib/resource.py:195
msgid "Mahjongg type (42 tiles)" msgid "Mahjongg type (42 tiles)"
msgstr "" msgstr ""
#: pysollib/resource.py:246 #: pysollib/resource.py:196
msgid "Hex A Deck type (68 cards)" msgid "Hex A Deck type (68 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:247 #: pysollib/resource.py:197
msgid "Mughal Ganjifa type (96 cards)" msgid "Mughal Ganjifa type (96 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:248 #: pysollib/resource.py:198
msgid "Navagraha Ganjifa type (108 cards)" msgid "Navagraha Ganjifa type (108 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:249 #: pysollib/resource.py:199
msgid "Dashavatara Ganjifa type (120 cards)" msgid "Dashavatara Ganjifa type (120 cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:250 #: pysollib/resource.py:200
msgid "Trumps only type (variable cards)" msgid "Trumps only type (variable cards)"
msgstr "" msgstr ""
#: pysollib/resource.py:254 #: pysollib/resource.py:204
msgid "French" msgid "French"
msgstr "" msgstr ""
#: pysollib/resource.py:255 pysollib/resource.py:279 #: pysollib/resource.py:205 pysollib/resource.py:229
msgid "Hanafuda" msgid "Hanafuda"
msgstr "" msgstr ""
#: pysollib/resource.py:256 pysollib/resource.py:295 #: pysollib/resource.py:206 pysollib/resource.py:245
msgid "Tarock" msgid "Tarock"
msgstr "" msgstr ""
#: pysollib/resource.py:257 pysollib/resource.py:282 #: pysollib/resource.py:207 pysollib/resource.py:232
msgid "Mahjongg" msgid "Mahjongg"
msgstr "" msgstr ""
#: pysollib/resource.py:258 pysollib/resource.py:280 #: pysollib/resource.py:208 pysollib/resource.py:230
msgid "Hex A Deck" msgid "Hex A Deck"
msgstr "" msgstr ""
#: pysollib/resource.py:259 #: pysollib/resource.py:209
msgid "Mughal Ganjifa" msgid "Mughal Ganjifa"
msgstr "" msgstr ""
#: pysollib/resource.py:260 #: pysollib/resource.py:210
msgid "Navagraha Ganjifa" msgid "Navagraha Ganjifa"
msgstr "" msgstr ""
#: pysollib/resource.py:261 #: pysollib/resource.py:211
msgid "Dashavatara Ganjifa" msgid "Dashavatara Ganjifa"
msgstr "" msgstr ""
#: pysollib/resource.py:262 #: pysollib/resource.py:212
msgid "Trumps only" msgid "Trumps only"
msgstr "" msgstr ""
#: pysollib/resource.py:267 #: pysollib/resource.py:217
msgid "Adult" msgid "Adult"
msgstr "" msgstr ""
#: pysollib/resource.py:268 #: pysollib/resource.py:218
msgid "Animals" msgid "Animals"
msgstr "" msgstr ""
#: pysollib/resource.py:269 #: pysollib/resource.py:219
msgid "Anime" msgid "Anime"
msgstr "" msgstr ""
#: pysollib/resource.py:270 #: pysollib/resource.py:220
msgid "Art" msgid "Art"
msgstr "" msgstr ""
#: pysollib/resource.py:271 #: pysollib/resource.py:221
msgid "Cartoons" msgid "Cartoons"
msgstr "" msgstr ""
#: pysollib/resource.py:272 #: pysollib/resource.py:222
msgid "Children" msgid "Children"
msgstr "" msgstr ""
#: pysollib/resource.py:273 #: pysollib/resource.py:223
msgid "Classic look" msgid "Classic look"
msgstr "" msgstr ""
#: pysollib/resource.py:274 #: pysollib/resource.py:224
msgid "Collectors" msgid "Collectors"
msgstr "" msgstr ""
#: pysollib/resource.py:275 #: pysollib/resource.py:225
msgid "Computers" msgid "Computers"
msgstr "" msgstr ""
#: pysollib/resource.py:276 #: pysollib/resource.py:226
msgid "Engines" msgid "Engines"
msgstr "" msgstr ""
#: pysollib/resource.py:277 #: pysollib/resource.py:227
msgid "Fantasy" msgid "Fantasy"
msgstr "" msgstr ""
#: pysollib/resource.py:278 #: pysollib/resource.py:228
msgid "Ganjifa" msgid "Ganjifa"
msgstr "" msgstr ""
#: pysollib/resource.py:281 #: pysollib/resource.py:231
msgid "Holiday" msgid "Holiday"
msgstr "" msgstr ""
#: pysollib/resource.py:283 #: pysollib/resource.py:233
msgid "Movies" msgid "Movies"
msgstr "" msgstr ""
#: pysollib/resource.py:284 #: pysollib/resource.py:234
msgid "Matrix" msgid "Matrix"
msgstr "" msgstr ""
#: pysollib/resource.py:285 #: pysollib/resource.py:235
msgid "Music" msgid "Music"
msgstr "" msgstr ""
#: pysollib/resource.py:286 #: pysollib/resource.py:236
msgid "Nature" msgid "Nature"
msgstr "" msgstr ""
#: pysollib/resource.py:287 #: pysollib/resource.py:237
msgid "Operating Systems" msgid "Operating Systems"
msgstr "" msgstr ""
#: pysollib/resource.py:288 #: pysollib/resource.py:238
msgid "People" msgid "People"
msgstr "" msgstr ""
#: pysollib/resource.py:289 #: pysollib/resource.py:239
msgid "Places" msgid "Places"
msgstr "" msgstr ""
#: pysollib/resource.py:290 #: pysollib/resource.py:240
msgid "Plain" msgid "Plain"
msgstr "" msgstr ""
#: pysollib/resource.py:291 #: pysollib/resource.py:241
msgid "Products" msgid "Products"
msgstr "" msgstr ""
#: pysollib/resource.py:292 #: pysollib/resource.py:242
msgid "Round cardsets" msgid "Round cardsets"
msgstr "" msgstr ""
#: pysollib/resource.py:293 #: pysollib/resource.py:243
msgid "Science Fiction" msgid "Science Fiction"
msgstr "" msgstr ""
#: pysollib/resource.py:294 #: pysollib/resource.py:244
msgid "Sports" msgid "Sports"
msgstr "" msgstr ""
#: pysollib/resource.py:296 #: pysollib/resource.py:246
msgid "Vehicels" msgid "Vehicels"
msgstr "" msgstr ""
#: pysollib/resource.py:297 #: pysollib/resource.py:247
msgid "Video Games" msgid "Video Games"
msgstr "" msgstr ""
#: pysollib/resource.py:302 #: pysollib/resource.py:252
msgid "Australia" msgid "Australia"
msgstr "" msgstr ""
#: pysollib/resource.py:303 #: pysollib/resource.py:253
msgid "Austria" msgid "Austria"
msgstr "" msgstr ""
#: pysollib/resource.py:304 #: pysollib/resource.py:254
msgid "Belgium" msgid "Belgium"
msgstr "" msgstr ""
#: pysollib/resource.py:305 #: pysollib/resource.py:255
msgid "Canada" msgid "Canada"
msgstr "" msgstr ""
#: pysollib/resource.py:306 #: pysollib/resource.py:256
msgid "China" msgid "China"
msgstr "" msgstr ""
#: pysollib/resource.py:307 #: pysollib/resource.py:257
msgid "Czech Republic" msgid "Czech Republic"
msgstr "" msgstr ""
#: pysollib/resource.py:308 #: pysollib/resource.py:258
msgid "Denmark" msgid "Denmark"
msgstr "" msgstr ""
#: pysollib/resource.py:309 #: pysollib/resource.py:259
msgid "England" msgid "England"
msgstr "" msgstr ""
#: pysollib/resource.py:310 #: pysollib/resource.py:260
msgid "France" msgid "France"
msgstr "" msgstr ""
#: pysollib/resource.py:311 #: pysollib/resource.py:261
msgid "Germany" msgid "Germany"
msgstr "" msgstr ""
#: pysollib/resource.py:312 #: pysollib/resource.py:262
msgid "Great Britain" msgid "Great Britain"
msgstr "" msgstr ""
#: pysollib/resource.py:313 #: pysollib/resource.py:263
msgid "Hungary" msgid "Hungary"
msgstr "" msgstr ""
#: pysollib/resource.py:314 #: pysollib/resource.py:264
msgid "India" msgid "India"
msgstr "" msgstr ""
#: pysollib/resource.py:315 #: pysollib/resource.py:265
msgid "Italy" msgid "Italy"
msgstr "" msgstr ""
#: pysollib/resource.py:316 #: pysollib/resource.py:266
msgid "Japan" msgid "Japan"
msgstr "" msgstr ""
#: pysollib/resource.py:317 #: pysollib/resource.py:267
msgid "Netherlands" msgid "Netherlands"
msgstr "" msgstr ""
#: pysollib/resource.py:318 #: pysollib/resource.py:268
msgid "Russia" msgid "Russia"
msgstr "" msgstr ""
#: pysollib/resource.py:319 #: pysollib/resource.py:269
msgid "Spain" msgid "Spain"
msgstr "" msgstr ""
#: pysollib/resource.py:320 #: pysollib/resource.py:270
msgid "Sweden" msgid "Sweden"
msgstr "" msgstr ""
#: pysollib/resource.py:321 #: pysollib/resource.py:271
msgid "Switzerland" msgid "Switzerland"
msgstr "" msgstr ""
#: pysollib/resource.py:322 #: pysollib/resource.py:272
msgid "USA" msgid "USA"
msgstr "" msgstr ""
#: pysollib/settings.py:55 data/glade-translations:29 #: pysollib/settings.py:58 data/glade-translations:29
msgid "Top 10" msgid "Top 10"
msgstr "" msgstr ""
@ -2472,7 +2472,7 @@ msgid ""
msgstr "" msgstr ""
#: pysollib/tk/playeroptionsdialog.py:120 #: pysollib/tk/playeroptionsdialog.py:120
msgid "Select..." msgid "Choose..."
msgstr "" msgstr ""
#: pysollib/tk/playeroptionsdialog.py:124 #: pysollib/tk/playeroptionsdialog.py:124

View file

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Tue Oct 31 19:32:40 2006\n" "POT-Creation-Date: Mon Nov 6 09:46:50 2006\n"
"PO-Revision-Date: 2006-10-31 19:57+0300\n" "PO-Revision-Date: 2006-10-31 19:57+0300\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n" "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
@ -2790,6 +2790,10 @@ msgstr "Четырёхугольник"
msgid "Quadruple Alliance" msgid "Quadruple Alliance"
msgstr "Четырёхсторонний альянс" msgstr "Четырёхсторонний альянс"
#, fuzzy
msgid "Quads"
msgstr "Четвёрка"
msgid "Quartets" msgid "Quartets"
msgstr "Квартеты" msgstr "Квартеты"
@ -3577,9 +3581,6 @@ msgstr "Тройной Юкон"
msgid "Troika" msgid "Troika"
msgstr "Тройка" msgstr "Тройка"
msgid "Troika +"
msgstr "Тройка +"
msgid "Trusty Twelve" msgid "Trusty Twelve"
msgstr "Верные двенадцать" msgstr "Верные двенадцать"
@ -3781,3 +3782,6 @@ msgstr ""
msgid "Zodiac" msgid "Zodiac"
msgstr "Зодиак" msgstr "Зодиак"
#~ msgid "Troika +"
#~ msgstr "Тройка +"

View file

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" "POT-Creation-Date: Mon Nov 6 09:47:42 2006\n"
"PO-Revision-Date: 2006-10-31 19:57+0300\n" "PO-Revision-Date: 2006-11-06 09:53+0300\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n" "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -55,7 +55,7 @@ msgstr "&Следующий номер"
#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865
#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
#: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
#: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:85
@ -66,8 +66,8 @@ msgstr "&Следующий номер"
#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512
#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594
#: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708
#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 #: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:159
#: pysollib/tk/tkwidget.py:325 #: pysollib/tk/tkwidget.py:324
msgid "&OK" msgid "&OK"
msgstr "&ОК" msgstr "&ОК"
@ -80,7 +80,7 @@ msgstr "&ОК"
#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241
#: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407
#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170
#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324
msgid "&Cancel" msgid "&Cancel"
msgstr "От&мена" msgstr "От&мена"
@ -1331,7 +1331,7 @@ msgstr "Не найден файл помощи\n"
msgid " Help" msgid " Help"
msgstr " Помощь" msgstr " Помощь"
#: pysollib/main.py:67 pysollib/main.py:282 #: pysollib/main.py:67 pysollib/main.py:284
msgid " installation error" msgid " installation error"
msgstr " проблема с установкой" msgstr " проблема с установкой"
@ -1345,7 +1345,7 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 #: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382
msgid "&Quit" msgid "&Quit"
msgstr "В&ыход" msgstr "В&ыход"
@ -1405,7 +1405,7 @@ msgstr ""
"%s: неправильное имя файла\n" "%s: неправильное имя файла\n"
"попробуйте %s --help для получения более подробной информации" "попробуйте %s --help для получения более подробной информации"
#: pysollib/main.py:283 #: pysollib/main.py:285
msgid "" msgid ""
"\n" "\n"
"No games were found !!!\n" "No games were found !!!\n"
@ -1416,18 +1416,18 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:369 pysollib/main.py:377 #: pysollib/main.py:371 pysollib/main.py:379
msgid " installation problem" msgid " installation problem"
msgstr "" msgstr ""
#: pysollib/main.py:370 #: pysollib/main.py:372
msgid "" msgid ""
"Your Python installation is compiled without thread support.\n" "Your Python installation is compiled without thread support.\n"
"\n" "\n"
"Sounds and background music will be disabled." "Sounds and background music will be disabled."
msgstr "" msgstr ""
#: pysollib/main.py:378 #: pysollib/main.py:380
msgid "" msgid ""
"The pysolsoundserver module was not found.\n" "The pysolsoundserver module was not found.\n"
"\n" "\n"
@ -1437,275 +1437,275 @@ msgstr ""
"\n" "\n"
"Звук и фоновая музыка будут недоступны" "Звук и фоновая музыка будут недоступны"
#: pysollib/main.py:385 #: pysollib/main.py:387
msgid "Welcome to " msgid "Welcome to "
msgstr "Добро пожаловать в " msgstr "Добро пожаловать в "
#: pysollib/resource.py:242 #: pysollib/resource.py:192
msgid "French type (52 cards)" msgid "French type (52 cards)"
msgstr "Классические (52 карты)" msgstr "Классические (52 карты)"
#: pysollib/resource.py:243 #: pysollib/resource.py:193
msgid "Hanafuda type (48 cards)" msgid "Hanafuda type (48 cards)"
msgstr "Ханафуда (48 карт)" msgstr "Ханафуда (48 карт)"
#: pysollib/resource.py:244 #: pysollib/resource.py:194
msgid "Tarock type (78 cards)" msgid "Tarock type (78 cards)"
msgstr "Таро (78 карт)" msgstr "Таро (78 карт)"
#: pysollib/resource.py:245 #: pysollib/resource.py:195
msgid "Mahjongg type (42 tiles)" msgid "Mahjongg type (42 tiles)"
msgstr "Маджонг (42 фишки)" msgstr "Маджонг (42 фишки)"
#: pysollib/resource.py:246 #: pysollib/resource.py:196
msgid "Hex A Deck type (68 cards)" msgid "Hex A Deck type (68 cards)"
msgstr "Hex A Deck (68 карт)" msgstr "Hex A Deck (68 карт)"
#: pysollib/resource.py:247 #: pysollib/resource.py:197
msgid "Mughal Ganjifa type (96 cards)" msgid "Mughal Ganjifa type (96 cards)"
msgstr "Мугал Ганджифа (96 карт)" msgstr "Мугал Ганджифа (96 карт)"
#: pysollib/resource.py:248 #: pysollib/resource.py:198
msgid "Navagraha Ganjifa type (108 cards)" msgid "Navagraha Ganjifa type (108 cards)"
msgstr "Наваграха Ганджифа (108 карт)" msgstr "Наваграха Ганджифа (108 карт)"
#: pysollib/resource.py:249 #: pysollib/resource.py:199
msgid "Dashavatara Ganjifa type (120 cards)" msgid "Dashavatara Ganjifa type (120 cards)"
msgstr "Дашаватара Ганджифа (120 карт)" msgstr "Дашаватара Ганджифа (120 карт)"
#: pysollib/resource.py:250 #: pysollib/resource.py:200
msgid "Trumps only type (variable cards)" msgid "Trumps only type (variable cards)"
msgstr "Без мастей (переменное количество карт)" msgstr "Без мастей (переменное количество карт)"
#: pysollib/resource.py:254 #: pysollib/resource.py:204
msgid "French" msgid "French"
msgstr "Классические" msgstr "Классические"
#: pysollib/resource.py:255 pysollib/resource.py:279 #: pysollib/resource.py:205 pysollib/resource.py:229
msgid "Hanafuda" msgid "Hanafuda"
msgstr "Ханафуда" msgstr "Ханафуда"
#: pysollib/resource.py:256 pysollib/resource.py:295 #: pysollib/resource.py:206 pysollib/resource.py:245
msgid "Tarock" msgid "Tarock"
msgstr "Таро" msgstr "Таро"
#: pysollib/resource.py:257 pysollib/resource.py:282 #: pysollib/resource.py:207 pysollib/resource.py:232
msgid "Mahjongg" msgid "Mahjongg"
msgstr "Маджонг" msgstr "Маджонг"
#: pysollib/resource.py:258 pysollib/resource.py:280 #: pysollib/resource.py:208 pysollib/resource.py:230
msgid "Hex A Deck" msgid "Hex A Deck"
msgstr "Hex A Deck" msgstr "Hex A Deck"
#: pysollib/resource.py:259 #: pysollib/resource.py:209
msgid "Mughal Ganjifa" msgid "Mughal Ganjifa"
msgstr "Мугал Ганджифа" msgstr "Мугал Ганджифа"
#: pysollib/resource.py:260 #: pysollib/resource.py:210
msgid "Navagraha Ganjifa" msgid "Navagraha Ganjifa"
msgstr "Наваграха Ганджифа" msgstr "Наваграха Ганджифа"
#: pysollib/resource.py:261 #: pysollib/resource.py:211
msgid "Dashavatara Ganjifa" msgid "Dashavatara Ganjifa"
msgstr "Дашаватара Ганджифа" msgstr "Дашаватара Ганджифа"
#: pysollib/resource.py:262 #: pysollib/resource.py:212
msgid "Trumps only" msgid "Trumps only"
msgstr "Без мастей" msgstr "Без мастей"
#: pysollib/resource.py:267 #: pysollib/resource.py:217
msgid "Adult" msgid "Adult"
msgstr "Для взрослых" msgstr "Для взрослых"
#: pysollib/resource.py:268 #: pysollib/resource.py:218
msgid "Animals" msgid "Animals"
msgstr "Животные" msgstr "Животные"
#: pysollib/resource.py:269 #: pysollib/resource.py:219
msgid "Anime" msgid "Anime"
msgstr "Мультфильмы" msgstr "Мультфильмы"
#: pysollib/resource.py:270 #: pysollib/resource.py:220
msgid "Art" msgid "Art"
msgstr "Искусство" msgstr "Искусство"
#: pysollib/resource.py:271 #: pysollib/resource.py:221
msgid "Cartoons" msgid "Cartoons"
msgstr "Комиксы" msgstr "Комиксы"
#: pysollib/resource.py:272 #: pysollib/resource.py:222
msgid "Children" msgid "Children"
msgstr "Дети" msgstr "Дети"
#: pysollib/resource.py:273 #: pysollib/resource.py:223
msgid "Classic look" msgid "Classic look"
msgstr "Классический вид" msgstr "Классический вид"
#: pysollib/resource.py:274 #: pysollib/resource.py:224
msgid "Collectors" msgid "Collectors"
msgstr "Коллекционные" msgstr "Коллекционные"
#: pysollib/resource.py:275 #: pysollib/resource.py:225
msgid "Computers" msgid "Computers"
msgstr "Компьютеры" msgstr "Компьютеры"
#: pysollib/resource.py:276 #: pysollib/resource.py:226
msgid "Engines" msgid "Engines"
msgstr "Машины" msgstr "Машины"
#: pysollib/resource.py:277 #: pysollib/resource.py:227
msgid "Fantasy" msgid "Fantasy"
msgstr "Фентези" msgstr "Фентези"
#: pysollib/resource.py:278 #: pysollib/resource.py:228
msgid "Ganjifa" msgid "Ganjifa"
msgstr "Ганджифа" msgstr "Ганджифа"
#: pysollib/resource.py:281 #: pysollib/resource.py:231
msgid "Holiday" msgid "Holiday"
msgstr "Праздники" msgstr "Праздники"
#: pysollib/resource.py:283 #: pysollib/resource.py:233
msgid "Movies" msgid "Movies"
msgstr "Фильмы" msgstr "Фильмы"
#: pysollib/resource.py:284 #: pysollib/resource.py:234
msgid "Matrix" msgid "Matrix"
msgstr "Мозаика" msgstr "Мозаика"
#: pysollib/resource.py:285 #: pysollib/resource.py:235
msgid "Music" msgid "Music"
msgstr "Музыка" msgstr "Музыка"
#: pysollib/resource.py:286 #: pysollib/resource.py:236
msgid "Nature" msgid "Nature"
msgstr "Природа" msgstr "Природа"
#: pysollib/resource.py:287 #: pysollib/resource.py:237
msgid "Operating Systems" msgid "Operating Systems"
msgstr "Операционные системы" msgstr "Операционные системы"
#: pysollib/resource.py:288 #: pysollib/resource.py:238
msgid "People" msgid "People"
msgstr "Люди" msgstr "Люди"
#: pysollib/resource.py:289 #: pysollib/resource.py:239
msgid "Places" msgid "Places"
msgstr "Дома" msgstr "Дома"
#: pysollib/resource.py:290 #: pysollib/resource.py:240
msgid "Plain" msgid "Plain"
msgstr "Простые" msgstr "Простые"
#: pysollib/resource.py:291 #: pysollib/resource.py:241
msgid "Products" msgid "Products"
msgstr "Продукты" msgstr "Продукты"
#: pysollib/resource.py:292 #: pysollib/resource.py:242
msgid "Round cardsets" msgid "Round cardsets"
msgstr "Закруглённые" msgstr "Закруглённые"
#: pysollib/resource.py:293 #: pysollib/resource.py:243
msgid "Science Fiction" msgid "Science Fiction"
msgstr "Научная фантастика" msgstr "Научная фантастика"
#: pysollib/resource.py:294 #: pysollib/resource.py:244
msgid "Sports" msgid "Sports"
msgstr "Спорт" msgstr "Спорт"
#: pysollib/resource.py:296 #: pysollib/resource.py:246
msgid "Vehicels" msgid "Vehicels"
msgstr "Транспортные средства" msgstr "Транспортные средства"
#: pysollib/resource.py:297 #: pysollib/resource.py:247
msgid "Video Games" msgid "Video Games"
msgstr "Видеоигры" msgstr "Видеоигры"
#: pysollib/resource.py:302 #: pysollib/resource.py:252
msgid "Australia" msgid "Australia"
msgstr "Австралия" msgstr "Австралия"
#: pysollib/resource.py:303 #: pysollib/resource.py:253
msgid "Austria" msgid "Austria"
msgstr "Австрия" msgstr "Австрия"
#: pysollib/resource.py:304 #: pysollib/resource.py:254
msgid "Belgium" msgid "Belgium"
msgstr "Бельгия" msgstr "Бельгия"
#: pysollib/resource.py:305 #: pysollib/resource.py:255
msgid "Canada" msgid "Canada"
msgstr "Канада" msgstr "Канада"
#: pysollib/resource.py:306 #: pysollib/resource.py:256
msgid "China" msgid "China"
msgstr "Китай" msgstr "Китай"
#: pysollib/resource.py:307 #: pysollib/resource.py:257
msgid "Czech Republic" msgid "Czech Republic"
msgstr "Чехия" msgstr "Чехия"
#: pysollib/resource.py:308 #: pysollib/resource.py:258
msgid "Denmark" msgid "Denmark"
msgstr "Дания" msgstr "Дания"
#: pysollib/resource.py:309 #: pysollib/resource.py:259
msgid "England" msgid "England"
msgstr "Англия" msgstr "Англия"
#: pysollib/resource.py:310 #: pysollib/resource.py:260
msgid "France" msgid "France"
msgstr "Франция" msgstr "Франция"
#: pysollib/resource.py:311 #: pysollib/resource.py:261
msgid "Germany" msgid "Germany"
msgstr "Германия" msgstr "Германия"
#: pysollib/resource.py:312 #: pysollib/resource.py:262
msgid "Great Britain" msgid "Great Britain"
msgstr "Великобритания" msgstr "Великобритания"
#: pysollib/resource.py:313 #: pysollib/resource.py:263
msgid "Hungary" msgid "Hungary"
msgstr "Венгрия" msgstr "Венгрия"
#: pysollib/resource.py:314 #: pysollib/resource.py:264
msgid "India" msgid "India"
msgstr "Индия" msgstr "Индия"
#: pysollib/resource.py:315 #: pysollib/resource.py:265
msgid "Italy" msgid "Italy"
msgstr "Италия" msgstr "Италия"
#: pysollib/resource.py:316 #: pysollib/resource.py:266
msgid "Japan" msgid "Japan"
msgstr "Япония" msgstr "Япония"
#: pysollib/resource.py:317 #: pysollib/resource.py:267
msgid "Netherlands" msgid "Netherlands"
msgstr "Голландия" msgstr "Голландия"
#: pysollib/resource.py:318 #: pysollib/resource.py:268
msgid "Russia" msgid "Russia"
msgstr "Россия" msgstr "Россия"
#: pysollib/resource.py:319 #: pysollib/resource.py:269
msgid "Spain" msgid "Spain"
msgstr "Испания" msgstr "Испания"
#: pysollib/resource.py:320 #: pysollib/resource.py:270
msgid "Sweden" msgid "Sweden"
msgstr "Швеция" msgstr "Швеция"
#: pysollib/resource.py:321 #: pysollib/resource.py:271
msgid "Switzerland" msgid "Switzerland"
msgstr "Швейцария" msgstr "Швейцария"
#: pysollib/resource.py:322 #: pysollib/resource.py:272
msgid "USA" msgid "USA"
msgstr "США" msgstr "США"
#: pysollib/settings.py:55 data/glade-translations:29 #: pysollib/settings.py:58 data/glade-translations:29
msgid "Top 10" msgid "Top 10"
msgstr "Top 10" msgstr "Top 10"
@ -2622,7 +2622,7 @@ msgstr ""
"Пожалуйста введите Ваше имя" "Пожалуйста введите Ваше имя"
#: pysollib/tk/playeroptionsdialog.py:120 #: pysollib/tk/playeroptionsdialog.py:120
msgid "Select..." msgid "Choose..."
msgstr "Выбрать..." msgstr "Выбрать..."
#: pysollib/tk/playeroptionsdialog.py:124 #: pysollib/tk/playeroptionsdialog.py:124

View file

@ -421,6 +421,7 @@ class PysolMenubarActions:
def mRedoAll(self, *args): def mRedoAll(self, *args):
if self._cancelDrag(): return if self._cancelDrag(): return
if self.menustate.redo: if self.menustate.redo:
self.app.top.busyUpdate()
self.game.playSample("redo", loop=1) self.game.playSample("redo", loop=1)
while self.game.moves.index < len(self.game.moves.history): while self.game.moves.index < len(self.game.moves.history):
self.game.redo() self.game.redo()

View file

@ -1505,10 +1505,6 @@ Please select a %s type %s.
dirs = manager.getSearchDirs(self, ("cardsets", ""), "PYSOL_CARDSETS") dirs = manager.getSearchDirs(self, ("cardsets", ""), "PYSOL_CARDSETS")
if self.debug: if self.debug:
dirs = dirs + manager.getSearchDirs(self, "cardsets-*") dirs = dirs + manager.getSearchDirs(self, "cardsets-*")
try:
dirs = dirs + manager.getRegistryDirs(self, ("PySol_Cardsets", "Cardsets"))
except:
pass
##print dirs ##print dirs
found, t = [], {} found, t = [], {}
for dir in dirs: for dir in dirs:
@ -1564,10 +1560,6 @@ Please select a %s type %s.
dirs = manager.getSearchDirs(self, dirs = manager.getSearchDirs(self,
("tiles-*", os.path.join("tiles", 'stretch')), ("tiles-*", os.path.join("tiles", 'stretch')),
"PYSOL_TILES") "PYSOL_TILES")
try:
dirs = dirs + manager.getRegistryDirs(self, "Tiles")
except:
pass
##print dirs ##print dirs
s = "((\\" + ")|(\\".join(IMAGE_EXTENSIONS) + "))$" s = "((\\" + ")|(\\".join(IMAGE_EXTENSIONS) + "))$"
ext_re = re.compile(s, re.I) ext_re = re.compile(s, re.I)
@ -1675,10 +1667,6 @@ Please select a %s type %s.
manager = self.music_manager manager = self.music_manager
# find all available music songs # find all available music songs
dirs = manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC") dirs = manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC")
try:
dirs = dirs + manager.getRegistryDirs(self, "Music")
except:
pass
##print dirs ##print dirs
ext_re = re.compile(self.audio.EXTENTIONS) ext_re = re.compile(self.audio.EXTENTIONS)
self.initResource(manager, dirs, ext_re, Music) self.initResource(manager, dirs, ext_re, Music)

View file

@ -1018,8 +1018,7 @@ class Game:
return return
if self.app.debug and not self.top.winfo_ismapped(): if self.app.debug and not self.top.winfo_ismapped():
return return
##self.top.busyUpdate() self.top.busyUpdate()
##self.canvas.after(200)
self.canvas.update_idletasks() self.canvas.update_idletasks()
old_a = self.app.opt.animations old_a = self.app.opt.animations
if old_a == 0: if old_a == 0:

View file

@ -864,6 +864,7 @@ class Applegate(Game):
# // Big Divorce # // Big Divorce
# // Spider (4 decks) # // Spider (4 decks)
# // Very Big Divorce # // Very Big Divorce
# // Chinese Spider
# ************************************************************************/ # ************************************************************************/
class BigSpider(Spider): class BigSpider(Spider):
@ -939,6 +940,16 @@ class GroundForADivorce4Decks(Spider4Decks):
shallHighlightMatch = Game._shallHighlightMatch_RKW shallHighlightMatch = Game._shallHighlightMatch_RKW
class ChineseSpider(Spider):
def createGame(self):
Spider.createGame(self, rows=12, playcards=28)
def startGame(self):
for l in range(5):
self.s.talon.dealRow(frames=0, flip=0)
self.startDealSample()
self.s.talon.dealRow()
# /*********************************************************************** # /***********************************************************************
# // York # // York
# ************************************************************************/ # ************************************************************************/
@ -1179,4 +1190,7 @@ registerGame(GameInfo(570, LongTail, "Long Tail",
GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(571, ShortTail, "Short Tail", registerGame(GameInfo(571, ShortTail, "Short Tail",
GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(670, ChineseSpider, "Chinese Spider",
GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL,
suits=(0, 1, 2),))

View file

@ -52,14 +52,6 @@ if os.name == "mac":
# macfs module is deprecated, consider using Carbon.File or Carbon.Folder # macfs module is deprecated, consider using Carbon.File or Carbon.Folder
import macfs, MACFS import macfs, MACFS
win32api = shell = shellcon = None
if sys.platform.startswith('win'):
try:
import win32api
#from win32com.shell import shell, shellcon
except ImportError:
pass
# /*********************************************************************** # /***********************************************************************
# // exceptions # // exceptions
# ************************************************************************/ # ************************************************************************/
@ -183,24 +175,11 @@ if os.name == "posix":
def win32_getusername(): def win32_getusername():
user = os.environ.get('USERNAME','').strip() user = os.environ.get('USERNAME','').strip()
try:
user = win32api.GetUserName().strip()
except AttributeError:
pass
return user return user
def win32_getprefdir(package): def win32_getprefdir(package):
hd = win32_gethomedir() hd = win32_gethomedir()
return os.path.join(hd, 'PySolFC') return os.path.join(hd, 'PySolFC')
## dname = os.path.expanduser("~\\.pysol")
## if not os.path.isdir(dname):
## try:
## dname = os.path.join(
## shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0),
## package, package)
## except AttributeError:
## pass
## return os.path.abspath(dname)
def win32_gethomedir(): def win32_gethomedir():
# %USERPROFILE%, %APPDATA% # %USERPROFILE%, %APPDATA%

View file

@ -39,7 +39,6 @@ import sys, os, glob, operator, types
#import traceback #import traceback
# PySol imports # PySol imports
from mfxutil import win32api
from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii
from settings import PACKAGE, VERSION from settings import PACKAGE, VERSION
@ -134,28 +133,6 @@ class ResourceManager:
except EnvError, ex: except EnvError, ex:
pass pass
def _addRegistryKey(self, result, hkey, subkey):
k = None
try:
k = win32api.RegOpenKeyEx(hkey, subkey, 0, KEY_READ)
nsubkeys, nvalues, t = win32api.RegQueryInfoKey(k)
for i in range(nvalues):
try:
key, value, vtype = win32api.RegEnumValue(k, i)
except:
break
if not key or not value:
continue
if vtype == 1 and type(value) is types.StringType:
for d in value.split(os.pathsep):
self._addDir(result, d.strip())
finally:
if k is not None:
try:
win32api.RegCloseKey(k)
except:
pass
def getSearchDirs(self, app, search, env=None): def getSearchDirs(self, app, search, env=None):
if type(search) is types.StringType: if type(search) is types.StringType:
search = (search,) search = (search,)
@ -186,33 +163,6 @@ class ResourceManager:
print "getSearchDirs", env, search, "->", result print "getSearchDirs", env, search, "->", result
return result return result
def getRegistryDirs(self, app, categories):
if not win32api:
return []
#
vendors = ("Markus Oberhumer", "",)
versions = (VERSION, "",)
if type(categories) is types.StringType:
categories = (categories,)
#
result = []
for version in versions:
for vendor in vendors:
for category in categories:
t = ("Software", vendor, PACKAGE, version, category)
t = filter(None, t)
subkey = '\\'.join(t)
##print "getRegistryDirs subkey", subkey
for hkey in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE):
try:
self._addRegistryKey(result, hkey, subkey)
except:
pass
#
if app.debug >= 5:
print "getRegistryDirs", category, "->", result
return result
# /*********************************************************************** # /***********************************************************************
# // Cardset # // Cardset

View file

@ -426,13 +426,13 @@ def load_theme(app, top, theme):
if os.path.isdir(d): if os.path.isdir(d):
top.tk.call('lappend', 'auto_path', d) top.tk.call('lappend', 'auto_path', d)
for t in os.listdir(d): for t in os.listdir(d):
#top.tk.call('tile::setTheme', t) if os.path.exists(os.path.join(d, t, 'pkgIndex.tcl')):
try: try:
top.tk.call('package', 'require', 'tile::theme::'+t) top.tk.call('package', 'require', 'tile::theme::'+t)
##print 'load theme:', t #print 'load theme:', t
except: except:
traceback.print_exc() traceback.print_exc()
pass pass
# set theme # set theme
all_themes = top.tk.call('style', 'theme', 'names') all_themes = top.tk.call('style', 'theme', 'names')
if theme not in all_themes: if theme not in all_themes:

View file

@ -50,7 +50,6 @@ import traceback
# PySol imports # PySol imports
from pysollib.mfxutil import destruct, kwdefault, KwStruct from pysollib.mfxutil import destruct, kwdefault, KwStruct
from pysollib.mfxutil import win32api
# Toolkit imports # Toolkit imports
from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
@ -104,6 +103,7 @@ class MfxDialog: # ex. _ToplevelDialog
after_cancel(self.timer) after_cancel(self.timer)
unbind_destroy(self.top) unbind_destroy(self.top)
self.top.destroy() self.top.destroy()
self.top.update_idletasks()
self.top = None self.top = None
self.parent = None self.parent = None
@ -430,8 +430,6 @@ class MfxScrolledCanvas:
if hbar: if hbar:
if hbar == 3: if hbar == 3:
w = 21 w = 21
if win32api:
w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL
self.frame.grid_rowconfigure(1, minsize=w) self.frame.grid_rowconfigure(1, minsize=w)
self.createHbar() self.createHbar()
if not vbar: if not vbar:
@ -440,8 +438,6 @@ class MfxScrolledCanvas:
if vbar: if vbar:
if vbar == 3: if vbar == 3:
w = 21 w = 21
if win32api:
w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL
self.frame.grid_columnconfigure(1, minsize=w) self.frame.grid_columnconfigure(1, minsize=w)
self.createVbar() self.createVbar()
bind(self.vbar, "<Map>", self._mapBar) bind(self.vbar, "<Map>", self._mapBar)

View file

@ -49,7 +49,6 @@ import traceback
# PySol imports # PySol imports
from pysollib.mfxutil import destruct, kwdefault, KwStruct from pysollib.mfxutil import destruct, kwdefault, KwStruct
from pysollib.mfxutil import win32api
# Toolkit imports # Toolkit imports
from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
@ -449,8 +448,6 @@ class MfxScrolledCanvas:
if hbar: if hbar:
if hbar == 3: if hbar == 3:
w = 21 w = 21
if win32api:
w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL
self.frame.grid_rowconfigure(1, minsize=w) self.frame.grid_rowconfigure(1, minsize=w)
self.createHbar() self.createHbar()
if not vbar: if not vbar:
@ -459,8 +456,6 @@ class MfxScrolledCanvas:
if vbar: if vbar:
if vbar == 3: if vbar == 3:
w = 21 w = 21
if win32api:
w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL
self.frame.grid_columnconfigure(1, minsize=w) self.frame.grid_columnconfigure(1, minsize=w)
self.createVbar() self.createVbar()
bind(self.vbar, "<Map>", self._mapBar) bind(self.vbar, "<Map>", self._mapBar)