Browse Source

Followup to CrealityUI cleanup

Followup to #22586
Scott Lahteine 4 years ago
parent
commit
193205a40d
1 changed files with 14 additions and 10 deletions
  1. 14
    10
      Marlin/src/lcd/e3v2/creality/dwin.cpp

+ 14
- 10
Marlin/src/lcd/e3v2/creality/dwin.cpp View File

856
   #define CLINE(L) MBASE(CSCROL(L))
856
   #define CLINE(L) MBASE(CSCROL(L))
857
   #define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
857
   #define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
858
 
858
 
859
-  // "Control" Title
860
   if (HMI_IsChinese())
859
   if (HMI_IsChinese())
861
-    DWIN_Frame_TitleCopy(103, 1, 28, 14);
860
+    DWIN_Frame_TitleCopy(103, 1, 28, 14);     // "Control"
862
   else {
861
   else {
863
     #ifdef USE_STRING_HEADINGS
862
     #ifdef USE_STRING_HEADINGS
864
       Draw_Title(GET_TEXT_F(MSG_CONTROL));
863
       Draw_Title(GET_TEXT_F(MSG_CONTROL));
2028
     DWIN_Frame_TitleCopy(30, 17, 28, 13);                   // "Info"
2027
     DWIN_Frame_TitleCopy(30, 17, 28, 13);                   // "Info"
2029
 
2028
 
2030
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
2029
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
2031
-    DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);      // "Firmware Version"
2032
-    DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);    // "Contact Details"
2030
+    DWIN_Frame_AreaCopy(1,   1, 164,  56, 176, 108, 175);   // "Firmware Version"
2031
+    DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
2033
   }
2032
   }
2034
   else {
2033
   else {
2035
     #ifdef USE_STRING_HEADINGS
2034
     #ifdef USE_STRING_HEADINGS
2432
     }
2431
     }
2433
     else {
2432
     else {
2434
       #ifdef USE_STRING_TITLES
2433
       #ifdef USE_STRING_TITLES
2435
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
2434
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
2436
       #else
2435
       #else
2437
         say_probe_offs_en(row);
2436
         say_probe_offs_en(row);
2438
       #endif
2437
       #endif
2502
   #define ASCROL(L) (scroll + (L))
2501
   #define ASCROL(L) (scroll + (L))
2503
   #define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
2502
   #define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
2504
 
2503
 
2505
-  #ifdef USE_STRING_HEADINGS
2506
-    Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
2507
-  #else
2508
-    DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
2509
-  #endif
2504
+  if (false && HMI_IsChinese()) {
2505
+    // TODO: Chinese "Advanced Settings"
2506
+  }
2507
+  else {
2508
+    #ifdef USE_STRING_HEADINGS
2509
+      Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
2510
+    #else
2511
+      DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
2512
+    #endif
2513
+  }
2510
 
2514
 
2511
   if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
2515
   if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
2512
   if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >
2516
   if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >

Loading…
Cancel
Save