Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:ToontownUnited/src

Browse source
This commit is contained in:
Zach 2015-04-21 22:33:18 -05:00
commit 4b5c0e29be
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
toontown/shtiker/OptionsPage.py
View file

@ -117,7 +117,7 @@ speedChatStyles = (
(210 / 255.0, 200 / 255.0, 180 / 255.0) (210 / 255.0, 200 / 255.0, 180 / 255.0)
) )
) )
PageMode = PythonUtil.Enum('Options, Codes, MoreOptions') PageMode = PythonUtil.Enum('Options, Codes, Extra')
class OptionsPage(ShtikerPage.ShtikerPage): class OptionsPage(ShtikerPage.ShtikerPage):
@ -128,11 +128,11 @@ class OptionsPage(ShtikerPage.ShtikerPage):
self.optionsTabPage = None self.optionsTabPage = None
self.codesTabPage = None self.codesTabPage = None
self.moreOptionsTabPage = None self.extraOptionsTabPage = None
self.title = None self.title = None
self.optionsTab = None self.optionsTab = None
self.codesTab = None self.codesTab = None
self.moreOptionsTab = None self.extraOptionsTab = None
def load(self): def load(self):
ShtikerPage.ShtikerPage.load(self) ShtikerPage.ShtikerPage.load(self)
@ -141,8 +141,8 @@ class OptionsPage(ShtikerPage.ShtikerPage):
self.optionsTabPage.hide() self.optionsTabPage.hide()
self.codesTabPage = CodesTabPage(self) self.codesTabPage = CodesTabPage(self)
self.codesTabPage.hide() self.codesTabPage.hide()
self.moreOptionsTabPage = MoreOptionsTabPage(self) self.extraOptionsTabPage = ExtraOptionsTabPage(self)
self.moreOptionsTabPage.hide() self.extraOptionsTabPage.hide()
self.title = DirectLabel( self.title = DirectLabel(
parent=self, relief=None, text=TTLocalizer.OptionsPageTitle, parent=self, relief=None, text=TTLocalizer.OptionsPageTitle,
@ -173,16 +173,16 @@ class OptionsPage(ShtikerPage.ShtikerPage):
image2_color=rolloverColor, image3_color=diabledColor, image2_color=rolloverColor, image3_color=diabledColor,
text_fg=Vec4(0.2, 0.1, 0, 1), command=self.setMode, text_fg=Vec4(0.2, 0.1, 0, 1), command=self.setMode,
extraArgs=[PageMode.Codes], pos=(-0.12, 0, 0.77)) extraArgs=[PageMode.Codes], pos=(-0.12, 0, 0.77))
self.moreOptionsTab = DirectButton( self.extraOptionsTab = DirectButton(
parent=self, relief=None, text=TTLocalizer.MoreOptionsPageTitle, parent=self, relief=None, text=TTLocalizer.ExtraOptionsPageTitle,
text_scale=TTLocalizer.OPmoreOptionsTab, text_align=TextNode.ALeft, text_scale=TTLocalizer.OPextraOptionsTab, text_align=TextNode.ALeft,
text_pos=(-0.035, 0.0, 0.0), text_pos=(0.027, 0.0, 0.0),
image=gui.find('**/tabs/polySurface2'), image_pos=(0.12, 1, -0.91), image=gui.find('**/tabs/polySurface2'), image_pos=(0.12, 1, -0.91),
image_hpr=(0, 0, -90), image_scale=(0.033, 0.033, 0.035), image_hpr=(0, 0, -90), image_scale=(0.033, 0.033, 0.035),
image_color=normalColor, image1_color=clickColor, image_color=normalColor, image1_color=clickColor,
image2_color=rolloverColor, image3_color=diabledColor, image2_color=rolloverColor, image3_color=diabledColor,
text_fg=Vec4(0.2, 0.1, 0, 1), command=self.setMode, text_fg=Vec4(0.2, 0.1, 0, 1), command=self.setMode,
extraArgs=[PageMode.MoreOptions], pos=(0.42, 0, 0.77)) extraArgs=[PageMode.Extra], pos=(0.42, 0, 0.77))
gui.removeNode() gui.removeNode()
def enter(self): def enter(self):
@ -234,24 +234,24 @@ class OptionsPage(ShtikerPage.ShtikerPage):
self.optionsTabPage.enter() self.optionsTabPage.enter()
self.codesTab['state'] = DGG.NORMAL self.codesTab['state'] = DGG.NORMAL
self.codesTabPage.exit() self.codesTabPage.exit()
self.moreOptionsTab['state'] = DGG.NORMAL self.extraOptionsTab['state'] = DGG.NORMAL
self.moreOptionsTabPage.exit() self.extraOptionsTabPage.exit()
elif mode == PageMode.Codes: elif mode == PageMode.Codes:
self.title['text'] = TTLocalizer.CdrPageTitle self.title['text'] = TTLocalizer.CdrPageTitle
self.optionsTab['state'] = DGG.NORMAL self.optionsTab['state'] = DGG.NORMAL
self.optionsTabPage.exit() self.optionsTabPage.exit()
self.moreOptionsTab['state'] = DGG.NORMAL self.extraOptionsTab['state'] = DGG.NORMAL
self.moreOptionsTabPage.exit() self.extraOptionsTabPage.exit()
self.codesTab['state'] = DGG.DISABLED self.codesTab['state'] = DGG.DISABLED
self.codesTabPage.enter() self.codesTabPage.enter()
elif mode == PageMode.MoreOptions: elif mode == PageMode.Extra:
self.title['text'] = TTLocalizer.MoreOptionsPageTitle self.title['text'] = TTLocalizer.ExtraOptionsPageTitle
self.optionsTab['state'] = DGG.NORMAL self.optionsTab['state'] = DGG.NORMAL
self.optionsTabPage.exit() self.optionsTabPage.exit()
self.codesTab['state'] = DGG.NORMAL self.codesTab['state'] = DGG.NORMAL
self.codesTabPage.exit() self.codesTabPage.exit()
self.moreOptionsTab['state'] = DGG.DISABLED self.extraOptionsTab['state'] = DGG.DISABLED
self.moreOptionsTabPage.enter() self.extraOptionsTabPage.enter()
class OptionsTabPage(DirectFrame): class OptionsTabPage(DirectFrame):
notify = directNotify.newCategory('OptionsTabPage') notify = directNotify.newCategory('OptionsTabPage')
@ -700,8 +700,8 @@ class CodesTabPage(DirectFrame):
self.codeInput['focus'] = 1 self.codeInput['focus'] = 1
self.submitButton['state'] = DGG.NORMAL self.submitButton['state'] = DGG.NORMAL
class MoreOptionsTabPage(DirectFrame): class ExtraOptionsTabPage(DirectFrame):
notify = directNotify.newCategory('MoreOptionsTabPage') notify = directNotify.newCategory('ExtraOptionsTabPage')
def __init__(self, parent = aspect2d): def __init__(self, parent = aspect2d):
self.parent = parent self.parent = parent

2
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -3847,7 +3847,7 @@ MapPageYouAreAtHome = 'You are at\nyour estate'
MapPageYouAreAtSomeonesHome = 'You are at %s estate' MapPageYouAreAtSomeonesHome = 'You are at %s estate'
MapPageGoTo = 'Go To\n%s' MapPageGoTo = 'Go To\n%s'
OptionsPageTitle = 'Options' OptionsPageTitle = 'Options'
MoreOptionsPageTitle = 'More Options' ExtraOptionsPageTitle = 'Extra'
OptionsTabTitle = 'Options\n& Codes' OptionsTabTitle = 'Options\n& Codes'
OptionsPageExitToontown = 'Exit Toontown' OptionsPageExitToontown = 'Exit Toontown'
OptionsPageMusicOnLabel = 'Music is on.' OptionsPageMusicOnLabel = 'Music is on.'

2
toontown/toonbase/TTLocalizerEnglishProperty.py
View file

@ -236,7 +236,7 @@ TPstartFrame = 0.12
TPendFrame = 0.12 TPendFrame = 0.12
SBpageTab = 0.75 SBpageTab = 0.75
OPoptionsTab = 0.07 OPoptionsTab = 0.07
OPmoreOptionsTab = 0.06 OPextraOptionsTab = 0.075
OPCodesInstructionPanelTextPos = (0, -0.01) OPCodesInstructionPanelTextPos = (0, -0.01)
OPCodesInstructionPanelTextWordWrap = 6 OPCodesInstructionPanelTextWordWrap = 6
OPCodesResultPanelTextPos = (0, 0.35) OPCodesResultPanelTextPos = (0, 0.35)