From 342105302b9870d4a80b96fab83a195d4596a60f Mon Sep 17 00:00:00 2001 From: Loudrob Date: Tue, 21 Apr 2015 18:20:07 -0400 Subject: [PATCH] I like the name extra better. --- toontown/shtiker/OptionsPage.py | 42 +++++++++---------- toontown/toonbase/TTLocalizerEnglish.py | 2 +- .../toonbase/TTLocalizerEnglishProperty.py | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/toontown/shtiker/OptionsPage.py b/toontown/shtiker/OptionsPage.py index e7b01e6d..8046aaff 100644 --- a/toontown/shtiker/OptionsPage.py +++ b/toontown/shtiker/OptionsPage.py @@ -117,7 +117,7 @@ speedChatStyles = ( (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): @@ -128,11 +128,11 @@ class OptionsPage(ShtikerPage.ShtikerPage): self.optionsTabPage = None self.codesTabPage = None - self.moreOptionsTabPage = None + self.extraOptionsTabPage = None self.title = None self.optionsTab = None self.codesTab = None - self.moreOptionsTab = None + self.extraOptionsTab = None def load(self): ShtikerPage.ShtikerPage.load(self) @@ -141,8 +141,8 @@ class OptionsPage(ShtikerPage.ShtikerPage): self.optionsTabPage.hide() self.codesTabPage = CodesTabPage(self) self.codesTabPage.hide() - self.moreOptionsTabPage = MoreOptionsTabPage(self) - self.moreOptionsTabPage.hide() + self.extraOptionsTabPage = ExtraOptionsTabPage(self) + self.extraOptionsTabPage.hide() self.title = DirectLabel( parent=self, relief=None, text=TTLocalizer.OptionsPageTitle, @@ -173,16 +173,16 @@ class OptionsPage(ShtikerPage.ShtikerPage): image2_color=rolloverColor, image3_color=diabledColor, text_fg=Vec4(0.2, 0.1, 0, 1), command=self.setMode, extraArgs=[PageMode.Codes], pos=(-0.12, 0, 0.77)) - self.moreOptionsTab = DirectButton( - parent=self, relief=None, text=TTLocalizer.MoreOptionsPageTitle, - text_scale=TTLocalizer.OPmoreOptionsTab, text_align=TextNode.ALeft, - text_pos=(-0.035, 0.0, 0.0), + self.extraOptionsTab = DirectButton( + parent=self, relief=None, text=TTLocalizer.ExtraOptionsPageTitle, + text_scale=TTLocalizer.OPextraOptionsTab, text_align=TextNode.ALeft, + text_pos=(0.027, 0.0, 0.0), 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_color=normalColor, image1_color=clickColor, image2_color=rolloverColor, image3_color=diabledColor, 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() def enter(self): @@ -234,24 +234,24 @@ class OptionsPage(ShtikerPage.ShtikerPage): self.optionsTabPage.enter() self.codesTab['state'] = DGG.NORMAL self.codesTabPage.exit() - self.moreOptionsTab['state'] = DGG.NORMAL - self.moreOptionsTabPage.exit() + self.extraOptionsTab['state'] = DGG.NORMAL + self.extraOptionsTabPage.exit() elif mode == PageMode.Codes: self.title['text'] = TTLocalizer.CdrPageTitle self.optionsTab['state'] = DGG.NORMAL self.optionsTabPage.exit() - self.moreOptionsTab['state'] = DGG.NORMAL - self.moreOptionsTabPage.exit() + self.extraOptionsTab['state'] = DGG.NORMAL + self.extraOptionsTabPage.exit() self.codesTab['state'] = DGG.DISABLED self.codesTabPage.enter() - elif mode == PageMode.MoreOptions: - self.title['text'] = TTLocalizer.MoreOptionsPageTitle + elif mode == PageMode.Extra: + self.title['text'] = TTLocalizer.ExtraOptionsPageTitle self.optionsTab['state'] = DGG.NORMAL self.optionsTabPage.exit() self.codesTab['state'] = DGG.NORMAL self.codesTabPage.exit() - self.moreOptionsTab['state'] = DGG.DISABLED - self.moreOptionsTabPage.enter() + self.extraOptionsTab['state'] = DGG.DISABLED + self.extraOptionsTabPage.enter() class OptionsTabPage(DirectFrame): notify = directNotify.newCategory('OptionsTabPage') @@ -700,8 +700,8 @@ class CodesTabPage(DirectFrame): self.codeInput['focus'] = 1 self.submitButton['state'] = DGG.NORMAL -class MoreOptionsTabPage(DirectFrame): - notify = directNotify.newCategory('MoreOptionsTabPage') +class ExtraOptionsTabPage(DirectFrame): + notify = directNotify.newCategory('ExtraOptionsTabPage') def __init__(self, parent = aspect2d): self.parent = parent @@ -758,4 +758,4 @@ class MoreOptionsTabPage(DirectFrame): def __setCogLevelGuiButton(self): self.cogLevel_label['text'] = TTLocalizer.CogLevelLabelOn if settings['cogLevel'] else TTLocalizer.CogLevelLabelOff - self.cogLevel_toggleButton['text'] = TTLocalizer.OptionsPageToggleOff if settings['cogLevel'] else TTLocalizer.OptionsPageToggleOn \ No newline at end of file + self.cogLevel_toggleButton['text'] = TTLocalizer.OptionsPageToggleOff if settings['cogLevel'] else TTLocalizer.OptionsPageToggleOn diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index cee2515c..f2f43e0d 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -3847,7 +3847,7 @@ MapPageYouAreAtHome = 'You are at\nyour estate' MapPageYouAreAtSomeonesHome = 'You are at %s estate' MapPageGoTo = 'Go To\n%s' OptionsPageTitle = 'Options' -MoreOptionsPageTitle = 'More Options' +ExtraOptionsPageTitle = 'Extra' OptionsTabTitle = 'Options\n& Codes' OptionsPageExitToontown = 'Exit Toontown' OptionsPageMusicOnLabel = 'Music is on.' diff --git a/toontown/toonbase/TTLocalizerEnglishProperty.py b/toontown/toonbase/TTLocalizerEnglishProperty.py index cb88bd5a..feddcfa6 100644 --- a/toontown/toonbase/TTLocalizerEnglishProperty.py +++ b/toontown/toonbase/TTLocalizerEnglishProperty.py @@ -236,7 +236,7 @@ TPstartFrame = 0.12 TPendFrame = 0.12 SBpageTab = 0.75 OPoptionsTab = 0.07 -OPmoreOptionsTab = 0.06 +OPextraOptionsTab = 0.075 OPCodesInstructionPanelTextPos = (0, -0.01) OPCodesInstructionPanelTextWordWrap = 6 OPCodesResultPanelTextPos = (0, 0.35)