actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove THEME_ITEMS and THEME_TITLES. Always theme unless the OptionRowData has been marked !allowTheme

Browse Source
This commit is contained in:
Chris Danford
2005-11-30 04:32:33 +00:00
parent 557ae44dc7
commit 42f056dfdb
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
-20
View File
@@ -2465,8 +2465,6 @@ MoreExitSelectedP2Command=
MoreExitUnselectedP1Command=
MoreExitUnselectedP2Command=
ShowExplanations=1
ThemeTitles=1
ThemeItems=1
ShowOptionIcons=1
ShowUnderlines=1
IconsOnCommand=x,-30
@@ -3612,8 +3610,6 @@ PrevScreen=@ScreenTitleBranch()
# when using entries that change the screen; otherwise, the only way to
# exit the screen when in regular mode is "exit".
ThemeItems=1
ThemeTitles=1
IconsOnCommand=x,-30
Fallback=ScreenOptionsMaster
@@ -4281,7 +4277,6 @@ ItemUseRateSeconds=0
Fallback=ScreenOptions
TimerSeconds=-1
ShowExplanations=0
ThemeTitles=0
ShowExitRow=0
FrameOnCommand=
FrameOffCommand=
@@ -4311,7 +4306,6 @@ ColorNotSelected=1,1,1,1
ColorDisabled=0.5,0.5,0.5,1
CapitalizeAllOptionNames=0
TweenSeconds=0
ThemeItems=0
[ScreenMiniMenuEditHelp]
Fallback=ScreenMiniMenu
@@ -4319,20 +4313,14 @@ ColorDisabled=1,1,1,1
[ScreenMiniMenuMainMenu]
Fallback=ScreenMiniMenu
ThemeTitles=1
LabelsX=SCREEN_CENTER_X-80
ThemeItems=1
[ScreenMiniMenuAreaMenu]
Fallback=ScreenMiniMenu
ThemeTitles=1
ThemeItems=1
[ScreenMiniMenuStepsInformation]
Fallback=ScreenMiniMenu
ThemeTitles=1
[ScreenMiniMenuSongInformation]
Fallback=ScreenMiniMenu
@@ -4457,8 +4445,6 @@ EditMode=2
PrevScreen=ScreenSelectEditMode
NextScreen=ScreenOptionsEditCourse
TimerSeconds=0
ThemeTitles=0
ThemeItems=0
ShowExplanations=0
CapitalizeAllOptionNames=0
AllowRepeatingChangeValueInput=1
@@ -4470,8 +4456,6 @@ Fallback=ScreenOptionsSimple
PrevScreen=ScreenOptionsManageCourses
NextScreen=ScreenOptionsEditCourseEntry
TimerSeconds=0
ThemeTitles=0
ThemeItems=0
ShowExplanations=0
CapitalizeAllOptionNames=0
AllowRepeatingChangeValueInput=1
@@ -4483,8 +4467,6 @@ Fallback=ScreenOptionsSimple
PrevScreen=ScreenOptionsEditCourse
NextScreen=ScreenOptionsEditCourse
TimerSeconds=0
ThemeTitles=0
ThemeItems=0
ShowExplanations=0
CapitalizeAllOptionNames=0
AllowRepeatingChangeValueInput=1
@@ -4511,8 +4493,6 @@ Fallback=ScreenOptionsServiceChild
PrevScreen=ScreenOptionsManageProfiles
NextScreen=ScreenOptionsManageProfiles
TimerSeconds=0
ThemeTitles=0
ThemeItems=0
ShowExplanations=0
CapitalizeAllOptionNames=0
AllowRepeatingChangeValueInput=1
stepmania/src/OptionRow.cpp
+5 -6
View File
@@ -36,9 +36,9 @@ void OptionRow::PrepareItemText( CString &s ) const
bool bTheme = false;
// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
if( s == NEXT_ROW_NAME ) bTheme = true;
if( s == EXIT_NAME ) bTheme = true;
if( m_pParentType->THEME_ITEMS && m_RowDef.m_bAllowThemeItems ) bTheme = true;
if( s == NEXT_ROW_NAME ) bTheme = true;
if( s == EXIT_NAME ) bTheme = true;
if( m_RowDef.m_bAllowThemeItems ) bTheme = true;
if( bTheme )
s = CommonMetrics::ThemeOptionItem( s, false );
@@ -51,7 +51,8 @@ CString OptionRow::OptionTitle( CString s ) const
bool bTheme = false;
// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
if( m_pParentType->THEME_TITLES && m_RowDef.m_bAllowThemeTitles ) bTheme = true;
if( m_RowDef.m_bAllowThemeTitles )
bTheme = true;
return bTheme ? THEME->GetMetric("OptionTitles",s) : s;
}
@@ -132,8 +133,6 @@ void OptionRowType::Load( const CString &sType )
COLOR_DISABLED .Load(sType,"ColorDisabled");
CAPITALIZE_ALL_OPTION_NAMES .Load(sType,"CapitalizeAllOptionNames");
TWEEN_SECONDS .Load(sType,"TweenSeconds");
THEME_ITEMS .Load(sType,"ThemeItems");
THEME_TITLES .Load(sType,"ThemeTitles");
SHOW_BPM_IN_SPEED_TITLE .Load(sType,"ShowBpmInSpeedTitle");
SHOW_OPTION_ICONS .Load(sType,"ShowOptionIcons");
SHOW_UNDERLINES .Load(sType,"ShowUnderlines");
stepmania/src/OptionRow.h
-2
View File
@@ -120,8 +120,6 @@ private:
ThemeMetric<RageColor> COLOR_DISABLED;
ThemeMetric<bool> CAPITALIZE_ALL_OPTION_NAMES;
ThemeMetric<float> TWEEN_SECONDS;
ThemeMetric<bool> THEME_ITEMS;
ThemeMetric<bool> THEME_TITLES;
ThemeMetric<bool> SHOW_BPM_IN_SPEED_TITLE;
ThemeMetric<bool> SHOW_OPTION_ICONS;
ThemeMetric<bool> SHOW_UNDERLINES;