diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
| commit | dcef13a23c06398c0c9b3145c08b28d1110bc169 (patch) | |
| tree | df8d3227b3d71fdd356b3c1e69c62533d1759f72 /app/bin/misc.c | |
| parent | 3e11d9c0e6173fce8a482efed8d7f965e8bd6dfa (diff) | |
| parent | 16e9630b79f0a7a90c6cedb6781175bb8b337dc1 (diff) | |
Merge tag 'upstream/4.3.0'
Upstream version 4.3.0
Diffstat (limited to 'app/bin/misc.c')
| -rw-r--r-- | app/bin/misc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/bin/misc.c b/app/bin/misc.c index 77b46a2..b506f98 100644 --- a/app/bin/misc.c +++ b/app/bin/misc.c @@ -713,8 +713,8 @@ EXPORT void SelectFont( void ) * */ -#define COMMAND_MAX (160) -#define BUTTON_MAX (160) +#define COMMAND_MAX (170) +#define BUTTON_MAX (170) #define NUM_CMDMENUS (4) #ifdef LATER @@ -2210,8 +2210,11 @@ static void CreateMenus( void ) cmdGroup = BG_CONTROL; InitCmdBlock( addM ); - InitCmdSwitchMotor( addM ); - + InitCmdSwitchMotor( addM ); + InitCmdSignal( addM ); + InitCmdControl( addM ); + InitCmdSensor( addM ); + /* * CHANGE MENU */ @@ -2321,7 +2324,8 @@ static void CreateMenus( void ) InitNewTurn( wMenuMenuCreate( manageM, "cmdTurnoutNew", _("Tur&nout Designer...") ) ); - MiscMenuItemCreate( manageM, NULL, "cmdGroup", _("&Group"), ACCL_GROUP, (void*)(wMenuCallBack_p)DoGroup, IC_SELECTED, (void *)0 ); + MiscMenuItemCreate( manageM, NULL, "smdContmgm", _("Layout &Control Elements"), ACCL_CONTMGM,(void*)ControlMgrInit(),0,(void*) 0); + MiscMenuItemCreate( manageM, NULL, "cmdGroup", _("&Group"), ACCL_GROUP, (void*)(wMenuCallBack_p)DoGroup, IC_SELECTED, (void *)0 ); MiscMenuItemCreate( manageM, NULL, "cmdUngroup", _("&Ungroup"), ACCL_UNGROUP, (void*)(wMenuCallBack_p)DoUngroup, IC_SELECTED, (void *)0 ); MiscMenuItemCreate( manageM, NULL, "cmdCustmgm", _("Custom defined parts..."), ACCL_CUSTMGM, (void*)CustomMgrInit(), 0, (void *)0 ); |