From 5ef740b39f9957960a59c8506ad65833e23ab518 Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 26 May 2015 20:24:03 -0400 Subject: [PATCH 1/8] Create GroupInvsionPage.py --- toontown/shtiker/GroupInvsionPage.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 toontown/shtiker/GroupInvsionPage.py diff --git a/toontown/shtiker/GroupInvsionPage.py b/toontown/shtiker/GroupInvsionPage.py new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/toontown/shtiker/GroupInvsionPage.py @@ -0,0 +1 @@ + From 48f2d47cb0a4d7f4993de93f6e530dd66a32c216 Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 26 May 2015 20:45:06 -0400 Subject: [PATCH 2/8] Rename --- toontown/shtiker/{GroupInvsionPage.py => InvsionPage.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename toontown/shtiker/{GroupInvsionPage.py => InvsionPage.py} (100%) diff --git a/toontown/shtiker/GroupInvsionPage.py b/toontown/shtiker/InvsionPage.py similarity index 100% rename from toontown/shtiker/GroupInvsionPage.py rename to toontown/shtiker/InvsionPage.py From 5819f89fb9bb3f4484df5e479afb859a10493715 Mon Sep 17 00:00:00 2001 From: Osnapman Date: Tue, 26 May 2015 20:45:58 -0400 Subject: [PATCH 3/8] Create BoardingPage.py --- toontown/shtiker/BoardingPage.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 toontown/shtiker/BoardingPage.py diff --git a/toontown/shtiker/BoardingPage.py b/toontown/shtiker/BoardingPage.py new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/toontown/shtiker/BoardingPage.py @@ -0,0 +1 @@ + From aaf8b849d8cca93f9755bd20d0b8d76d5e538027 Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 26 May 2015 20:48:01 -0400 Subject: [PATCH 4/8] Delete InvsionPage.py --- toontown/shtiker/InvsionPage.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 toontown/shtiker/InvsionPage.py diff --git a/toontown/shtiker/InvsionPage.py b/toontown/shtiker/InvsionPage.py deleted file mode 100644 index 8b137891..00000000 --- a/toontown/shtiker/InvsionPage.py +++ /dev/null @@ -1 +0,0 @@ - From 50a5fd545e460ddb52d5c077e6c8a90dfb2540e2 Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 26 May 2015 20:50:33 -0400 Subject: [PATCH 5/8] Rename BoardingPage.py to GroupPage.py --- toontown/shtiker/{BoardingPage.py => GroupPage.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename toontown/shtiker/{BoardingPage.py => GroupPage.py} (100%) diff --git a/toontown/shtiker/BoardingPage.py b/toontown/shtiker/GroupPage.py similarity index 100% rename from toontown/shtiker/BoardingPage.py rename to toontown/shtiker/GroupPage.py From 7613aaee7999a628b0ed93d17b65377ebd8dac4b Mon Sep 17 00:00:00 2001 From: Osnapman Date: Tue, 26 May 2015 21:03:14 -0400 Subject: [PATCH 6/8] zach c0de --- toontown/shtiker/GroupPage.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/toontown/shtiker/GroupPage.py b/toontown/shtiker/GroupPage.py index 8b137891..05238289 100644 --- a/toontown/shtiker/GroupPage.py +++ b/toontown/shtiker/GroupPage.py @@ -1 +1,28 @@ +from ShtikerPage import ShtikerPage +from direct.gui.DirectGui import * +from direct.directnotify import DirectNotifyGlobal +from pandac.PandaModules import * +from toontown.toonbase import ToontownGlobals +from toontown.toonbase import TTLocalizer +from toontown.toonbase import TTLocalizerEnglish +class GroupPage(ShtikerPage): + notify = DirectNotifyGlobal.directNotify.newCategory('GroupPage') + + def __init__(self): + ShtikerPage.__init__(self) + + def load(self): + ShtikerPage.load(self) + + def unload(self): + SktikerPage.unload(self) + + def enter(self): + ShtikerPage.enter(self) + + def exit(self): + ShtikerPage.exit(self) + + def destroy(self): + DirectFrame.destroy(self) From 12d80e79e7e29405e0b06c789f909e479cec427f Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 26 May 2015 21:37:20 -0400 Subject: [PATCH 7/8] Update for Zach --- toontown/shtiker/GroupPage.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/toontown/shtiker/GroupPage.py b/toontown/shtiker/GroupPage.py index 05238289..a6b469f7 100644 --- a/toontown/shtiker/GroupPage.py +++ b/toontown/shtiker/GroupPage.py @@ -26,3 +26,10 @@ class GroupPage(ShtikerPage): def destroy(self): DirectFrame.destroy(self) + + + def cleanupDialog(self, value=0): + self.confirmDialog.cleanup() + + def create(self): + self.background = OnscreenImage(parent = render2d, image="phase_3.5/map/toontown_central_tutorial_palette_4amla_1.jpg") From f86261ac97ea7332e8f11fc24b98dc44bc3e7c75 Mon Sep 17 00:00:00 2001 From: John Cote Date: Tue, 26 May 2015 22:21:38 -0400 Subject: [PATCH 8/8] Cleanup GroupPage.py --- toontown/shtiker/GroupPage.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/toontown/shtiker/GroupPage.py b/toontown/shtiker/GroupPage.py index a6b469f7..c76696df 100644 --- a/toontown/shtiker/GroupPage.py +++ b/toontown/shtiker/GroupPage.py @@ -1,35 +1,34 @@ -from ShtikerPage import ShtikerPage -from direct.gui.DirectGui import * +from panda3d.core import * from direct.directnotify import DirectNotifyGlobal -from pandac.PandaModules import * +from direct.gui.DirectGui import * from toontown.toonbase import ToontownGlobals from toontown.toonbase import TTLocalizer from toontown.toonbase import TTLocalizerEnglish +from ShtikerPage import ShtikerPage class GroupPage(ShtikerPage): notify = DirectNotifyGlobal.directNotify.newCategory('GroupPage') - + def __init__(self): ShtikerPage.__init__(self) - + def load(self): ShtikerPage.load(self) - + def unload(self): SktikerPage.unload(self) - + def enter(self): ShtikerPage.enter(self) - + def exit(self): ShtikerPage.exit(self) - + def destroy(self): DirectFrame.destroy(self) - - def cleanupDialog(self, value=0): - self.confirmDialog.cleanup() + def cleanupDialog(self, value=0): + self.confirmDialog.cleanup() - def create(self): - self.background = OnscreenImage(parent = render2d, image="phase_3.5/map/toontown_central_tutorial_palette_4amla_1.jpg") + def create(self): + self.background = OnscreenImage(parent = render2d, image="phase_3.5/map/toontown_central_tutorial_palette_4amla_1.jpg")