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

Fix SelectGameDialog in the menubar.

More of the fact the imports were lost and are 'tk' or 'tile'-specific.
This commit is contained in:
Shlomi Fish 2016-03-14 22:44:44 +02:00
parent e7090f8f4b
commit c3a8a52543
3 changed files with 7 additions and 2 deletions

View file

@ -42,7 +42,6 @@ from pysollib.ui.tktile.tkutil import bind, after_idle
from tkwidget import MfxMessageDialog from tkwidget import MfxMessageDialog
from selectgame import SelectGameDialog, SelectGameDialogWithPreview from selectgame import SelectGameDialog, SelectGameDialogWithPreview
from soundoptionsdialog import SoundOptionsDialog from soundoptionsdialog import SoundOptionsDialog
from selectcardset import SelectCardsetDialogWithPreview
from selecttile import SelectTileDialogWithPreview from selecttile import SelectTileDialogWithPreview
from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
from solverdialog import connect_game_solver_dialog from solverdialog import connect_game_solver_dialog
@ -78,6 +77,9 @@ class PysolMenubarTk(PysolMenubarTkCommon):
from wizarddialog import WizardDialog from wizarddialog import WizardDialog
return WizardDialog return WizardDialog
def _calcSelectGameDialog(self):
return SelectGameDialog
def _calcSoundOptionsDialog(self): def _calcSoundOptionsDialog(self):
return SoundOptionsDialog return SoundOptionsDialog

View file

@ -68,6 +68,9 @@ class PysolMenubarTk(PysolMenubarTkCommon):
from wizarddialog import WizardDialog from wizarddialog import WizardDialog
return WizardDialog return WizardDialog
def _calcSelectGameDialog(self):
return SelectGameDialog
def _calcSoundOptionsDialog(self): def _calcSoundOptionsDialog(self):
return SoundOptionsDialog return SoundOptionsDialog

View file

@ -794,7 +794,7 @@ class PysolMenubarTkCommon:
if self._cancelDrag(break_pause=False): return if self._cancelDrag(break_pause=False): return
self.game.setCursor(cursor=CURSOR_WATCH) self.game.setCursor(cursor=CURSOR_WATCH)
after_idle(self.top, self.__restoreCursor) after_idle(self.top, self.__restoreCursor)
d = SelectGameDialog(self.top, title=_("Select game"), d = self._calcSelectGameDialog()(self.top, title=_("Select game"),
app=self.app, gameid=self.game.id) app=self.app, gameid=self.game.id)
return self._mSelectGameDialog(d) return self._mSelectGameDialog(d)