From d859c9acd633b66f6e0d42ec6a2b1030c62ce1fb Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 24 Jan 2013 08:04:06 +0000
Subject: [PATCH] [X9D] Problem with Phase/Mix/Expo Name

---
 src/model_menus.cpp   | 14 +++++++-------
 src/translations.cpp  |  7 +++++++
 src/translations.h    | 12 ++++++++++++
 src/translations/en.h |  6 +++++-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 5bc88003b..16fcd81f9 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -653,11 +653,11 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, boo
 }
 
 #if defined(CPUM64)
-#define editSingleName editName
+#define editSingleName(x, y, label, name, size, event, active) editName(x, y, name, size, event, active)
 #else
-void editSingleName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, bool active)
+void editSingleName(uint8_t x, uint8_t y, const pm_char *label, char *name, uint8_t size, uint8_t event, bool active)
 {
-  lcd_putsLeft(y, STR_NAME);
+  lcd_putsLeft(y, label);
   editName(x, y, name, size, event, active);
 }
 #endif
@@ -727,7 +727,7 @@ void menuModelSetup(uint8_t event)
 
     switch(k) {
       case ITEM_MODEL_NAME:
-        editSingleName(MODEL_SETUP_2ND_COLUMN, y, g_model.name, sizeof(g_model.name), event, attr);
+        editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_MODELNAME, g_model.name, sizeof(g_model.name), event, attr);
 #if defined(CPUARM)
         memcpy(modelNames[g_eeGeneral.currModel], g_model.name, sizeof(g_model.name));
 #endif
@@ -1116,7 +1116,7 @@ void menuModelPhaseOne(uint8_t event)
 #endif
     switch(i) {
       case ITEM_MODEL_PHASE_NAME:
-        editSingleName(MIXES_2ND_COLUMN, y, phase->name, sizeof(phase->name), event, attr);
+        editSingleName(MIXES_2ND_COLUMN, y, STR_PHASENAME, phase->name, sizeof(phase->name), event, attr);
         break;
       case ITEM_MODEL_PHASE_SWITCH:
         phase->swtch = switchMenuItem(MIXES_2ND_COLUMN, y, phase->swtch, attr, event);
@@ -1799,7 +1799,7 @@ void menuModelExpoOne(uint8_t event)
     {
 #if defined(CPUARM)
       case EXPO_FIELD_NAME:
-        editSingleName(EXPO_ONE_2ND_COLUMN+3*FW-sizeof(ed->name)*FW, y, ed->name, sizeof(ed->name), event, attr);
+        editSingleName(EXPO_ONE_2ND_COLUMN+3*FW-sizeof(ed->name)*FW, y, STR_EXPONAME, ed->name, sizeof(ed->name), event, attr);
         break;
 #endif
       case EXPO_FIELD_WIDTH:
@@ -1920,7 +1920,7 @@ void menuModelMixOne(uint8_t event)
     switch(i) {
 #if defined(CPUARM)
       case MIX_FIELD_NAME:
-        editSingleName(MIXES_2ND_COLUMN, y, md2->name, sizeof(md2->name), event, attr);
+        editSingleName(MIXES_2ND_COLUMN, y, STR_MIXNAME, md2->name, sizeof(md2->name), event, attr);
         break;
 #endif
       case MIX_FIELD_SOURCE:
diff --git a/src/translations.cpp b/src/translations.cpp
index b298680ec..9fa072749 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -377,6 +377,13 @@ const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER;
 const pm_char STR_DATE[] PROGMEM = TR_DATE;
 const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR;
 
+#if LCD_W >= 212
+const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME;
+const pm_char STR_PHASENAME[] PROGMEM = TR_PHASENAME;
+const pm_char STR_MIXNAME[] PROGMEM = TR_MIXNAME;
+const pm_char STR_EXPONAME[] PROGMEM = TR_EXPONAME;
+#endif
+
 const pm_uchar font_5x7[] PROGMEM = {
 #include "font.lbm"
 #if defined(TRANSLATIONS_SE)
diff --git a/src/translations.h b/src/translations.h
index c348e426b..344007c43 100644
--- a/src/translations.h
+++ b/src/translations.h
@@ -494,4 +494,16 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att);
 PLAY_FUNCTION(playDuration, int16_t seconds);
 #endif
 
+#if LCD_W >= 212
+extern const pm_char STR_MODELNAME[];
+extern const pm_char STR_PHASENAME[];
+extern const pm_char STR_MIXNAME[];
+extern const pm_char STR_EXPONAME[];
+#else
+#define STR_MODELNAME STR_NAME
+#define STR_PHASENAME STR_NAME
+#define STR_MIXNAME   STR_NAME
+#define STR_EXPONAME  STR_NAME
+#endif
+
 #endif
diff --git a/src/translations/en.h b/src/translations/en.h
index 11668eea4..e933595b6 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -291,7 +291,11 @@
 #define TR_COPYINGMODEL        "Copying model..."
 #define TR_MOVINGMODEL         "Moving model..."
 #define TR_LOADINGMODEL        "Loading model..."
-#define TR_NAME                TR("Name","Model Name")
+#define TR_NAME                "Name"
+#define TR_MODELNAME           "Model Name"
+#define TR_PHASENAME           "Phase Name"
+#define TR_MIXNAME             "Mix Name"
+#define TR_EXPONAME            "Expo Name"
 #define TR_BITMAP              "Model Image"
 #define TR_TIMER               TR("Timer","Timer ")
 #define TR_ELIMITS             TR("E.Limits","Extended Limits")