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

move OptionRowDefinition into OptionRowHandler

Browse Source 
(want OptionRowHandler to be easily usable without OptionRow; ORH is
really part of ORD, not OptionRow)
This commit is contained in:
Glenn Maynard
2006-09-01 04:37:39 +00:00
parent 3f468cb30a
commit e6d1712c27
4 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+1 -15
View File
@@ -11,21 +11,6 @@
#include "Style.h"
#include "ActorUtil.h"
static const char *SelectTypeNames[] = {
"SelectOne",
"SelectMultiple",
"SelectNone",
};
XToString( SelectType, NUM_SELECT_TYPES );
StringToX( SelectType );
static const char *LayoutTypeNames[] = {
"ShowAllInRow",
"ShowOneInRow",
};
XToString( LayoutType, NUM_LAYOUT_TYPES );
StringToX( LayoutType );
const RString NEXT_ROW_NAME = "NextRow";
const RString EXIT_NAME = "Exit";
@@ -804,6 +789,7 @@ void OptionRow::SetChoiceInRowWithFocus( PlayerNumber pn, int iChoice )
m_iChoiceInRowWithFocus[pn] = iChoice;
UpdateText( pn );
//PositionUnderlines( pn );
}
void OptionRow::ResetFocusFromSelection( PlayerNumber pn )
stepmania/src/OptionRow.h
+1 -71
View File
@@ -12,77 +12,7 @@
class OptionRowHandler;
class GameCommand;
enum SelectType
{
SELECT_ONE,
SELECT_MULTIPLE,
SELECT_NONE,
NUM_SELECT_TYPES,
SELECT_INVALID
};
const RString& SelectTypeToString( SelectType pm );
SelectType StringToSelectType( const RString& s );
enum LayoutType
{
LAYOUT_SHOW_ALL_IN_ROW,
LAYOUT_SHOW_ONE_IN_ROW,
NUM_LAYOUT_TYPES,
LAYOUT_INVALID
};
const RString& LayoutTypeToString( LayoutType pm );
LayoutType StringToLayoutType( const RString& s );
struct OptionRowDefinition
{
RString m_sName;
RString m_sExplanationName;
bool m_bOneChoiceForAllPlayers;
SelectType m_selectType;
LayoutType m_layoutType;
vector<RString> m_vsChoices;
set<PlayerNumber> m_vEnabledForPlayers; // only players in this set may change focus to this row
bool m_bExportOnChange;
bool m_bAllowThemeItems; // Should be true for dynamic strings.
bool m_bAllowThemeTitle; // Should be true for dynamic strings.
bool m_bAllowExplanation; // if false, ignores ScreenOptions::SHOW_EXPLANATIONS. Should be true for dynamic strings.
bool m_bShowChoicesListOnSelect;
bool IsEnabledForPlayer( PlayerNumber pn ) const
{
return m_vEnabledForPlayers.find(pn) != m_vEnabledForPlayers.end();
}
OptionRowDefinition() { Init(); }
void Init()
{
m_sName = "";
m_sExplanationName = "";
m_bOneChoiceForAllPlayers = false;
m_selectType = SELECT_ONE;
m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
m_vsChoices.clear();
m_vEnabledForPlayers.clear();
FOREACH_PlayerNumber( pn )
m_vEnabledForPlayers.insert( pn );
m_bExportOnChange = false;
m_bAllowThemeItems = true;
m_bAllowThemeTitle = true;
m_bAllowExplanation = true;
m_bShowChoicesListOnSelect = false;
}
OptionRowDefinition( const char *n, bool b, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL )
{
Init();
m_sName=n;
m_bOneChoiceForAllPlayers=b;
#define PUSH( c ) if(c) m_vsChoices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
#undef PUSH
}
};
struct OptionRowDefinition;
class OptionRowType
{
stepmania/src/OptionRowHandler.cpp
+15
View File
@@ -28,6 +28,21 @@
#define ENTRY_MODE(s,i) THEME->GetMetric ("ScreenOptionsMaster",ssprintf("%s,%i",(s).c_str(),(i+1)))
#define ENTRY_DEFAULT(s) THEME->GetMetric ("ScreenOptionsMaster",(s) + "Default")
static const char *SelectTypeNames[] = {
"SelectOne",
"SelectMultiple",
"SelectNone",
};
XToString( SelectType, NUM_SELECT_TYPES );
StringToX( SelectType );
static const char *LayoutTypeNames[] = {
"ShowAllInRow",
"ShowOneInRow",
};
XToString( LayoutType, NUM_LAYOUT_TYPES );
StringToX( LayoutType );
RString OptionRowHandler::OptionTitle() const
{
bool bTheme = false;
stepmania/src/OptionRowHandler.h
+72 -1
View File
@@ -3,14 +3,85 @@
#ifndef OptionRowHandler_H
#define OptionRowHandler_H
#include "OptionRow.h"
#include "GameCommand.h"
#include "LuaReference.h"
#include "RageUtil.h"
#include <set>
struct MenuRowDef;
struct ConfOption;
enum SelectType
{
SELECT_ONE,
SELECT_MULTIPLE,
SELECT_NONE,
NUM_SELECT_TYPES,
SELECT_INVALID
};
const RString& SelectTypeToString( SelectType pm );
SelectType StringToSelectType( const RString& s );
enum LayoutType
{
LAYOUT_SHOW_ALL_IN_ROW,
LAYOUT_SHOW_ONE_IN_ROW,
NUM_LAYOUT_TYPES,
LAYOUT_INVALID
};
const RString& LayoutTypeToString( LayoutType pm );
LayoutType StringToLayoutType( const RString& s );
struct OptionRowDefinition
{
RString m_sName;
RString m_sExplanationName;
bool m_bOneChoiceForAllPlayers;
SelectType m_selectType;
LayoutType m_layoutType;
vector<RString> m_vsChoices;
set<PlayerNumber> m_vEnabledForPlayers; // only players in this set may change focus to this row
bool m_bExportOnChange;
bool m_bAllowThemeItems; // Should be true for dynamic strings.
bool m_bAllowThemeTitle; // Should be true for dynamic strings.
bool m_bAllowExplanation; // if false, ignores ScreenOptions::SHOW_EXPLANATIONS. Should be true for dynamic strings.
bool m_bShowChoicesListOnSelect;
bool IsEnabledForPlayer( PlayerNumber pn ) const
{
return m_vEnabledForPlayers.find(pn) != m_vEnabledForPlayers.end();
}
OptionRowDefinition() { Init(); }
void Init()
{
m_sName = "";
m_sExplanationName = "";
m_bOneChoiceForAllPlayers = false;
m_selectType = SELECT_ONE;
m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
m_vsChoices.clear();
m_vEnabledForPlayers.clear();
FOREACH_PlayerNumber( pn )
m_vEnabledForPlayers.insert( pn );
m_bExportOnChange = false;
m_bAllowThemeItems = true;
m_bAllowThemeTitle = true;
m_bAllowExplanation = true;
m_bShowChoicesListOnSelect = false;
}
OptionRowDefinition( const char *n, bool b, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL )
{
Init();
m_sName=n;
m_bOneChoiceForAllPlayers=b;
#define PUSH( c ) if(c) m_vsChoices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
#undef PUSH
}
};
class OptionRowHandler
{
public: