[UTF8] NavigatorWidget - dont't use _T() and co. -> removing

src/Dialogs/Settings/Panels/GaugesConfigPanel.cpp

@@ -135,8 +135,8 @@ GaugesConfigPanel::Prepare(ContainerWindow &parent,
       "This widget is set under the settings menu: Look / Pages / Top Area\n"
       "Warning: an unsuitable height of the navigator widget could lead to a bad presentation of its included flight informations (e.g. name of waypoint, times, ...).\n"
       "to be setted accordingly to the size of the screen device.\n"),
-    _T("%u %%"), _T("%u"), 1, 40, 1,
-    (unsigned)ui_settings.navigator.navigator_height); //settings.min_frequency
+    "%u %%", "%u", 1, 40, 1,
+    (unsigned)ui_settings.navigator.navigator_height);
   SetExpertRow(NavigatorWidgetHeight);
 }
 

src/Dialogs/Settings/Panels/PagesConfigPanel.cpp

@@ -408,7 +408,7 @@ PageListWidget::OnPaintItem(Canvas &canvas, const PixelRect rc,
     break;
 
   case PageLayout::Top::NAVIGATOR:
-    buffer.AppendFormat(_T(", %s"), _("Navigator"));
+    buffer.AppendFormat(", %s", _("Navigator"));
     break;
 
   case PageLayout::Top::MAX:

src/Gauge/CMakeSource.cmake

@@ -13,6 +13,8 @@ set(_SOURCES
         Gauge/ThermalAssistantWindow.cpp
         Gauge/TrafficSettings.cpp
         Gauge/VarioSettings.cpp
+        Gauge/NavigatorWidget.cpp
+        Gauge/NavigatorSettings.cpp
 )
 
 set(SCRIPT_FILES

src/Gauge/NavigatorWidget.cpp

@@ -14,6 +14,8 @@
 #include "Task/ProtectedTaskManager.hpp"
 #include "UIGlobals.hpp"
 
+#include "ui/canvas/Canvas.hpp"
+
 NavigatorWindow::NavigatorWindow(const NavigatorLook &_look, const TaskLook &_look_task,
                                  const InfoBoxLook &_look_infobox, const bool _inverse) noexcept
   :look(_look), look_task(_look_task), look_infobox(_look_infobox),
@@ -106,37 +108,37 @@ NavigatorWindow::StopDragging()
 
 
 bool
-NavigatorWindow::OnGesture(const TCHAR *gesture) 
+NavigatorWindow::OnGesture(const char *gesture) 
 {
-  if (StringIsEqual(gesture, _T("U"))) {
+  if (StringIsEqual(gesture, "U")) {
     InputEvents::ShowMenu();
     return true;
   }
-  if (StringIsEqual(gesture, _T("D"))) {
+  if (StringIsEqual(gesture, "D")) {
     InputEvents::ShowMenu();
     return true;
   }
-  if (StringIsEqual(gesture, _T("L"))) {
+  if (StringIsEqual(gesture, "L")) {
     InputEvents::eventAdjustWaypoint("previouswrap");
     return true;
   }
-  if (StringIsEqual(gesture, _T("R"))) {
+  if (StringIsEqual(gesture, "R")) {
     InputEvents::eventAdjustWaypoint("nextwrap");
     return true;
   }
-  if (StringIsEqual(gesture, _T("UD"))) {
+  if (StringIsEqual(gesture, "UD")) {
     InputEvents::ShowMenu();
     return true;
   }
-  if (StringIsEqual(gesture, _T("DR"))) {
+  if (StringIsEqual(gesture, "DR")) {
     InputEvents::ShowMenu();
     return true;
   }
-  if (StringIsEqual(gesture, _T("RL"))) {
+  if (StringIsEqual(gesture, "RL")) {
     InputEvents::eventSetup("Target");
     return true;
   }
-  if (StringIsEqual(gesture, _T("LR"))) {
+  if (StringIsEqual(gesture, "LR")) {
     InputEvents::eventSetup("Alternates");
     return true;
   }
@@ -190,7 +192,7 @@ NavigatorWindow::OnMouseUp([[maybe_unused]] PixelPoint p) noexcept
   if (dragging) {
     StopDragging();
 
-    const TCHAR *gesture = gestures.Finish();
+    const char *gesture = gestures.Finish();
     if (gesture && OnGesture(gesture))
       return true;
 

src/Gauge/NavigatorWidget.hpp

@@ -47,7 +47,7 @@ class NavigatorWindow : public PaintWindow {
   void StopDragging();
 
 public:
-  bool OnGesture(const TCHAR *gesture);
+  bool OnGesture(const char *gesture);
   bool OnMouseDouble([[maybe_unused]] PixelPoint p) noexcept override;
   bool OnMouseDown(PixelPoint p) noexcept override;
   bool OnMouseUp([[maybe_unused]] PixelPoint p) noexcept override;

src/Input/InputEventsActions.cpp

@@ -337,31 +337,31 @@ InputEvents::eventAnalysis([[maybe_unused]] const char *misc)
 {
   AnalysisPage analysis_page;
 
-  if (StringIsEqual(misc, _T("AnalysisPage::BAROGRAPH"))) {
+  if (StringIsEqual(misc, "AnalysisPage::BAROGRAPH")) {
     analysis_page = AnalysisPage::BAROGRAPH;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::COUNT"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::COUNT")) {
     analysis_page = AnalysisPage::COUNT;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::CLIMB"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::CLIMB")) {
     analysis_page = AnalysisPage::CLIMB;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::VARIO_HISTOGRAM"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::VARIO_HISTOGRAM")) {
     analysis_page = AnalysisPage::VARIO_HISTOGRAM;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::THERMAL_BAND"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::THERMAL_BAND")) {
     analysis_page = AnalysisPage::THERMAL_BAND;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::WIND"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::WIND")) {
     analysis_page = AnalysisPage::WIND;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::POLAR"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::POLAR")) {
     analysis_page = AnalysisPage::POLAR;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::MACCREADY"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::MACCREADY")) {
     analysis_page = AnalysisPage::MACCREADY;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::TEMPTRACE"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::TEMPTRACE")) {
     analysis_page = AnalysisPage::TEMPTRACE;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::TASK"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::TASK")) {
     analysis_page = AnalysisPage::TASK;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::CONTEST"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::CONTEST")) {
     analysis_page = AnalysisPage::CONTEST;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::TASK_SPEED"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::TASK_SPEED")) {
     analysis_page = AnalysisPage::TASK_SPEED;
-  } else if (StringIsEqual(misc, _T("AnalysisPage::AIRSPACE"))) {
+  } else if (StringIsEqual(misc, "AnalysisPage::AIRSPACE")) {
     analysis_page = AnalysisPage::AIRSPACE;
   } else {
     analysis_page = AnalysisPage::CONTEST;
@@ -706,6 +706,7 @@ InputEvents::eventKeyPressed(const char *misc)
 //  std::map<unsigned, const char> keys;
     for (auto *p = misc; *p != 0; p++) {
       if (*p != ' ') {
+      // std::string_view sv(p);
       char c[2] = {*p, 0};
       if (!strncmp(p, "LEFT", strlen("LEFT"))) {
         c[0] = (char) KEY_LEFT;

src/Language/Language.hpp

@@ -22,8 +22,6 @@ static inline void DisallowLanguage() {}
 
 #else // !USE_LIBINTL
 
-#include <tchar.h>
-
 class MOFile;
 extern const MOFile *mo_file;
 

src/Renderer/NavigatorRenderer.cpp

@@ -19,24 +19,24 @@
 #include "Look/NavigatorLook.hpp"
 #include "Look/WaypointLook.hpp"
 #include "Math/Angle.hpp"
-#include "NextArrowRenderer.hpp"
-#include "ProgressBarRenderer.hpp"
+#include "Renderer/NextArrowRenderer.hpp"
+#include "Renderer/ProgressBarRenderer.hpp"
 #include "Renderer/TextRenderer.hpp"
 #include "Screen/Layout.hpp"
 #include "UIGlobals.hpp"
-#include "UnitSymbolRenderer.hpp"
-#include "Waypoint/Waypoint.hpp"
-#include "WaypointIconRenderer.hpp"
-#include "WaypointRenderer.hpp"
-#include "WindArrowRenderer.hpp"
+#include "Renderer/UnitSymbolRenderer.hpp"
+#include "Renderer/WaypointIconRenderer.hpp"
+#include "Renderer/WaypointRenderer.hpp"
+#include "Renderer/WindArrowRenderer.hpp"
 #include "time/RoughTime.hpp"
 #include "time/Stamp.hpp"
 #include "ui/canvas/Canvas.hpp"
 #include "util/StaticString.hxx"
+#include "Waypoint/Waypoint.hpp"
 #include "BackendComponents.hpp"
 #include "DataComponents.hpp"
 
-// standard
+// standard includes
 #include <cmath>
 #include <iostream>
 #include <ostream>
@@ -101,7 +101,7 @@ NavigatorRenderer::DrawText(
     time_elapsed_s.Format("%s", time_elapsed_s_tmp.c_str());
   } else
     time_elapsed_s.Format("%s", "--:--");
-  // TCHAR time_elapsed_s[10];
+  // char time_elapsed_s[10];
   // const auto time_elapsed_s_tmp =
   //   FormatLocalTimeHHMM(time_elapsed, utc_offset1).c_str();
   // if (has_started)
@@ -116,7 +116,7 @@ NavigatorRenderer::DrawText(
     time_start_s.Format("%s", FormatLocalTimeHHMM(time_start, utc_offset1).c_str());
   else
     time_start_s.Format("%s", "--:--");
-  // TCHAR time_start_s[10];
+  // char time_start_s[10];
   // const auto time_start = calculated.ordered_task_stats.start.time;
   // if (has_started)
   //   snprintf(time_start_s, ARRAY_SIZE(time_start_s), _T("%s"),
@@ -127,14 +127,14 @@ NavigatorRenderer::DrawText(
   static StaticString<8> time_local_s;
   time_local_s.clear();
   if (basic.time_available) {
-    const BasicStringBuffer<TCHAR, 8> time =
+    const BasicStringBuffer<char, 8> time =
       FormatLocalTimeHHMM(basic.time, utc_offset1);
     time_local_s.AppendFormat("%s", time.c_str());
   } else {
     time_local_s.Format("%s", "--:--");
   }
 
-  // TCHAR time_local_s[10];
+  // char time_local_s[10];
   // snprintf(time_local_s, ARRAY_SIZE(time_local_s), _T("%s"),
   //          FormatLocalTimeHHMM(time, utc_offset1).c_str());
 
@@ -152,7 +152,7 @@ NavigatorRenderer::DrawText(
       "%s", FormatLocalTimeHHMM(time_planned, utc_no_offset).c_str());
   } else
     time_planned_s.Format("%s", "--:--");
-  // TCHAR time_planned_s[10];
+  // char time_planned_s[10];
   // const auto time_planned =
   //   TimeStamp{FloatDuration{calculated.ordered_task_stats.total.time_planned}};
   // if (has_started)
@@ -175,7 +175,7 @@ NavigatorRenderer::DrawText(
       "%s", FormatLocalTimeHHMM(arrival_planned, utc_offset1).c_str());
   } else
     arrival_planned_s.Format("%s", "--:--");
-  // TCHAR arrival_planned_s[10];
+  // char arrival_planned_s[10];
   // const auto arrival_planned = TimeStamp{
   //   FloatDuration{time_start.ToDuration() + time_planned.ToDuration()}};
   // if (has_started)
@@ -187,7 +187,7 @@ NavigatorRenderer::DrawText(
   // e_WP_Name
   static StaticString<50> waypoint_name_s;
   waypoint_name_s.Format("%s", wp_current.name.c_str());
-  // TCHAR waypoint_name_s[40];
+  // char waypoint_name_s[40];
   // snprintf(waypoint_name_s, ARRAY_SIZE(waypoint_name_s), _T("%s"), wp_current.name.c_str());
 
   // e_WP_Distance
@@ -209,7 +209,7 @@ NavigatorRenderer::DrawText(
 
 
 
-  // TCHAR waypoint_distance_s[20];
+  // char waypoint_distance_s[20];
   // auto precision_waypoint_distance{0};
   // const auto waypoint_distance{
   //   calculated.ordered_task_stats.current_leg.vector_remaining.distance};
@@ -232,7 +232,7 @@ NavigatorRenderer::DrawText(
   }
   FormatAltitude(waypoint_altitude_diff_s.data(), waypoint_altitude_diff,
                  Units::GetUserAltitudeUnit(), false);
-  // TCHAR waypoint_altitude_diff_s[20];
+  // char waypoint_altitude_diff_s[20];
   // FormatAltitude(
   //   waypoint_altitude_diff_s,
   //   calculated.ordered_task_stats.current_leg.solution_remaining.GetRequiredAltitude(),
@@ -246,7 +246,7 @@ NavigatorRenderer::DrawText(
   } else {
     waypoint_average_speed_s.Format("%s", "---");
   }
-  // TCHAR waypoint_average_speed_s[20];
+  // char waypoint_average_speed_s[20];
   // FormatUserSpeed(calculated.task_stats.total.travelled.GetSpeed(),
   //                 waypoint_average_speed_s, true, 0);
   // if (!has_started) {
@@ -263,26 +263,26 @@ NavigatorRenderer::DrawText(
     waypoint_GR = std::round(calculated.task_stats.current_leg.gradient);
   }
   waypoint_GR_s.Format("%d", waypoint_GR);
-  // TCHAR waypoint_GR_s[20];
+  // char waypoint_GR_s[20];
   // const int waypoint_GR =
   //   std::round(calculated.ordered_task_stats.current_leg.gradient);
   // _stprintf(waypoint_GR_s, _T("%d:1"), waypoint_GR);
 
   // e_Speed_GPS
   static StaticString<20> current_speed_s;
   FormatUserSpeed(basic.ground_speed, current_speed_s.data(), false, 0);
-  // TCHAR current_speed_s[20];
+  // char current_speed_s[20];
   // FormatUserSpeed(basic.ground_speed, current_speed_s, true, 0);
 
   // e_HeightGPS
   static StaticString<20> current_altitude_s;
   FormatUserAltitude(basic.gps_altitude, current_altitude_s.data(), false);
-  // TCHAR current_altitude_s[20];
+  // char current_altitude_s[20];
   // FormatUserAltitude(basic.gps_altitude, current_altitude_s, true);
 
   // e_WP_BearingDiff
   static StaticString<20> waypoint_direction_s;
-  // TCHAR waypoint_direction_s[20];
+  // char waypoint_direction_s[20];
   Angle bearing_diff{};
 
   if (!basic.track_available)
@@ -323,7 +323,7 @@ NavigatorRenderer::DrawText(
     "%s   %s  %s", waypoint_distance_s.c_str(),
     waypoint_altitude_diff_s.c_str(), waypoint_GR_s.c_str());
 
-  // TCHAR informations_next_waypoint1_s[100];
+  // char informations_next_waypoint1_s[100];
   // if (canvas.GetWidth() < canvas.GetHeight() * 4)
   //   _stprintf(informations_next_waypoint1_s, _T("%s  %s"), waypoint_distance_s,
   //             waypoint_altitude_diff_s);
@@ -334,7 +334,7 @@ NavigatorRenderer::DrawText(
   static StaticString<20> times_local_elapsed_s;
   times_local_elapsed_s.Format(
     "%s (%s)", time_local_s.c_str(), time_elapsed_s.c_str());
-  // TCHAR times_local_elapsed_s[20];
+  // char times_local_elapsed_s[20];
   // snprintf(times_local_elapsed_s, ARRAY_SIZE(times_local_elapsed_s),
   //          _T("%s (%s)"), time_local_s, time_elapsed_s);
 
@@ -344,7 +344,7 @@ NavigatorRenderer::DrawText(
       "%s (%s)", arrival_planned_s.c_str(), time_planned_s.c_str());
   else
     times_arrival_planned_s.Format("%s", arrival_planned_s.c_str());
-  // TCHAR times_arrival_planned_s[50];
+  // char times_arrival_planned_s[50];
   // if (canvas.GetWidth() > canvas.GetHeight() * 5)
   //   _stprintf(times_arrival_planned_s, _T("%s (%s)"), arrival_planned_s,
   //             time_planned_s);

src/Renderer/NavigatorRenderer.hpp

@@ -3,11 +3,15 @@
 
 #pragma once
 
-
 #include "Engine/Waypoint/Ptr.hpp"
 #include "Engine/Task/TaskType.hpp"
 #include "Look/InfoBoxLook.hpp"
 
+#ifdef _WIN32
+// in Windows DrawText is defined as DrawTextA
+# include "WinUser.h"
+#endif
+
 struct PixelRect;
 struct PixelPoint;
 struct NavigatorLook;
@@ -38,7 +42,7 @@ DrawText(Canvas &canvas, TaskType tp, const Waypoint &wp_current, const PixelRec
          const NavigatorLook &look, const InfoBoxLook &iblook, bool inverse) noexcept;
 
 /**
-* Draw the progress of the current task with presntation of each taskpoint
+* Draw the progress of the current task with presentation of each taskpoint
 */
 void
 DrawProgressTask(const TaskSummary &summary, Canvas &canvas,