From: Laszlo T. <ave...@us...> - 2011-02-26 15:43:10
|
gemrb: Infinity Engine emulator The branch master has been updated via 9d0e430a93f1a031a0b1259505db350788f83196 (commit) Summary of changes: gemrb/GUIScripts/pst/GUISAVE.py | 100 +++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 50 deletions(-) from 4ab14478dbbbaf3630028c501deebb8d96bbebaa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=9d0e430a93f1a031a0b1259505db350788f83196 commit 9d0e430a93f1a031a0b1259505db350788f83196 Author: Avenger <ave...@so...> Date: Sat Feb 26 16:42:31 2011 +0100 fixed delete confirmation window in GUISAVE diff --git a/gemrb/GUIScripts/pst/GUISAVE.py b/gemrb/GUIScripts/pst/GUISAVE.py index 1ccc863..07c6fd8 100644 --- a/gemrb/GUIScripts/pst/GUISAVE.py +++ b/gemrb/GUIScripts/pst/GUISAVE.py @@ -9,7 +9,7 @@ # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -42,7 +42,7 @@ def OpenSaveWindow (): GemRB.HideGUI () if SaveDetailWindow: OpenSaveDetailWindow () - + if SaveWindow: SaveWindow.Unload () SaveWindow = None @@ -55,7 +55,7 @@ def OpenSaveWindow (): GemRB.HideGUI () GemRB.LoadWindowPack ("GUISAVE", 640, 480) SaveWindow = Window = GemRB.LoadWindow (0) - OptionsWindow = GUIClasses.GWindow( GemRB.GetVar ("OtherWindow") ) + OptionsWindow = GUIClasses.GWindow ( GemRB.GetVar ("OtherWindow") ) GemRB.SetVar ("OtherWindow", SaveWindow.ID) # Cancel button @@ -87,8 +87,8 @@ def OpenSaveWindow (): Button = Window.GetControl (22 + i*6 + j) Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE, OP_SET) - ScrollBar = Window.GetControl(13) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, ScrollBarPress) + ScrollBar = Window.GetControl (13) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, ScrollBarPress) Games = GemRB.GetSaveGames() TopIndex = max (0, len(Games) - 4 + 1) #one more for the 'new game' @@ -109,23 +109,23 @@ def ScrollBarPress(): Button1 = Window.GetControl (14 + i) Button2 = Window.GetControl (18 + i) if ActPos <= len(Games): - Button1.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) if ActPos < len(Games): - Slotname = Games[ActPos].GetName() - Slottime = Games[ActPos].GetDate() - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Slotname = Games[ActPos].GetName () + Slottime = Games[ActPos].GetDate () + Button2.SetState (IE_GUI_BUTTON_ENABLED) elif ActPos == len(Games): - Slotname = 28647 # "Empty" + Slotname = 28647 # "Empty" Slottime = "" - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) else: Slotname = "" Slottime = "" - Button2.SetState(IE_GUI_BUTTON_DISABLED) - + Button2.SetState (IE_GUI_BUTTON_DISABLED) + Label = Window.GetControl (0x10000004+i) Label.SetText (Slotname) @@ -137,7 +137,7 @@ def ScrollBarPress(): Button.SetSprite2D(Games[ActPos].GetPreview()) else: Button.SetPicture ("") - + for j in range (6): Button = Window.GetControl (22 + i*6 + j) if ActPos < len(Games): @@ -155,65 +155,66 @@ def DeleteGameConfirm(): TopIndex = GemRB.GetVar("TopIndex") Pos = TopIndex +GemRB.GetVar("SaveIdx") - GemRB.DeleteSaveGame(Games[Pos]) + GemRB.DeleteSaveGame (Games[Pos]) if TopIndex>0: GemRB.SetVar("TopIndex",TopIndex-1) - del Games[pos] + Games = GemRB.GetSaveGames() + #del Games[pos] ScrollBar.SetVarAssoc("TopIndex", len(Games)) ScrollBarPress() if ConfirmWindow: ConfirmWindow.Unload() - SaveWindow.SetVisible(WINDOW_VISIBLE) + SaveWindow.SetVisible (WINDOW_VISIBLE) return def DeleteGameCancel(): if ConfirmWindow: ConfirmWindow.Unload() - SaveWindow.SetVisible(WINDOW_VISIBLE) + SaveWindow.SetVisible (WINDOW_VISIBLE) return def DeleteGamePress(): global ConfirmWindow - SaveWindow.SetVisible(WINDOW_INVISIBLE) - ConfirmWindow=GemRB.LoadWindow(1) + SaveWindow.SetVisible (WINDOW_INVISIBLE) + ConfirmWindow=GemRB.LoadWindow (3) - Text=ConfirmWindow.GetControl(0) - Text.SetText(15305) + Text=ConfirmWindow.GetControl (0) + Text.SetText (28639) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(13957) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, DeleteGameConfirm) + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (28640) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, DeleteGameConfirm) DeleteButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(4196) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, DeleteGameCancel) + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (4196) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, DeleteGameCancel) CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - ConfirmWindow.SetVisible(WINDOW_VISIBLE) + ConfirmWindow.SetVisible (WINDOW_VISIBLE) return - + def CancelPress(): OpenSaveWindow () - + return def OpenSaveDetailWindow (): global SaveDetailWindow GemRB.HideGUI () - + if SaveDetailWindow != None: if SaveDetailWindow: SaveDetailWindow.Unload () SaveDetailWindow = None GemRB.SetVar ("FloatWindow", -1) - + GemRB.UnhideGUI () return - + SaveDetailWindow = Window = GemRB.LoadWindow (1) - GemRB.SetVar ("FloatWindow", SaveDetailWindow.ID) + GemRB.SetVar ("FloatWindow", SaveDetailWindow.ID) Pos = GemRB.GetVar ("TopIndex") + GemRB.GetVar ("SaveIdx") @@ -222,9 +223,9 @@ def OpenSaveDetailWindow (): # Save/Overwrite Button = Window.GetControl (4) if Pos < len(Games): - Button.SetText (28644) # Overwrite + Button.SetText (28644) # Overwrite else: - Button.SetText (28645) # Save + Button.SetText (28645) # Save Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, ConfirmedSaveGame) Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) @@ -236,12 +237,12 @@ def OpenSaveDetailWindow (): # Slot name and time if Pos < len(Games): - Slotname = Games[Pos].GetName() - Slottime = Games[Pos].GetGameDate() + Slotname = Games[Pos].GetName () + Slottime = Games[Pos].GetGameDate () else: Slotname = "" Slottime = "" - + Edit = Window.GetControl (1) Edit.SetText (Slotname) Edit.SetEvent (IE_GUI_EDIT_ON_CHANGE, CheckSaveName) @@ -249,7 +250,7 @@ def OpenSaveDetailWindow (): Label = Window.GetControl (0x10000002) Label.SetText (Slottime) - + # Areapreview Button = Window.GetControl (0) @@ -268,7 +269,7 @@ def OpenSaveDetailWindow (): # Disable Save/Overwrite button if the save slotname is empty, -# else enable it +# else enable it def CheckSaveName (): Window = SaveDetailWindow Button = Window.GetControl (4) @@ -279,14 +280,14 @@ def CheckSaveName (): Button.SetState (IE_GUI_BUTTON_DISABLED) else: Button.SetState (IE_GUI_BUTTON_ENABLED) - - + + # User entered save name and pressed save/overwrite. # Display progress bar screen and save the game, close the save windows def ConfirmedSaveGame (): Window = SaveDetailWindow - + Pos = GemRB.GetVar ("TopIndex") + GemRB.GetVar ("SaveIdx") Label = Window.GetControl (1) Slotname = Label.QueryText () @@ -299,9 +300,9 @@ def ConfirmedSaveGame (): OpenSaveDetailWindow () LoadScreen.StartLoadScreen (LoadScreen.LS_TYPE_SAVING) if Pos < len(Games): - GemRB.SaveGame(Games[Pos], Slotname) + GemRB.SaveGame (Games[Pos], Slotname) else: - GemRB.SaveGame(None, Slotname) + GemRB.SaveGame (None, Slotname) CloseSaveWindow () @@ -313,5 +314,4 @@ def CloseSaveWindow (): GemRB.SetNextScript ("Start") return - GUIOPT.OpenOptionsWindow() - + GUIOPT.OpenOptionsWindow () ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |