From 68f27e88b6ece86c4378ceccce68ce8b260587f5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 11 Mar 2013 22:31:49 +0100
Subject: [PATCH] Dialogs/Replay: use RowFormWidget

---
 Data/Dialogs/dlgLoggerReplay.xml |  17 -----
 Data/XCSoar.rc                   |   1 -
 src/Dialogs/ReplayDialog.cpp     | 137 +++++++++++++++++++++++++--------------
 3 files changed, 87 insertions(+), 68 deletions(-)
 delete mode 100644 Data/Dialogs/dlgLoggerReplay.xml

diff --git a/Data/Dialogs/dlgLoggerReplay.xml b/Data/Dialogs/dlgLoggerReplay.xml
deleted file mode 100644
index 8c9165da0..000000000
--- a/Data/Dialogs/dlgLoggerReplay.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<Form X="5" Y="5" Width="240" Height="127" Caption="Replay">
-  <CloseButton X="2" Y="2" Width="66" Height="35"/>
-
-  <Edit Name="prpFile" Caption="File" X="2" Y="39" Width="235" Height="22" CaptionWidth="60" Help="Name of file to replay.  Can be an IGC file (.igc), a raw NMEA log file (.nmea), or if blank, runs the demo.">
-    <DataField DataType="filereader"/>
-  </Edit>
-
-  <Button Caption="Start" X="2" Y="63" Width="68" Height="35" OnClick="OnStartClicked" />
-
-  <Button Caption="Stop" X="72" Y="63" Width="68" Height="35" OnClick="OnStopClicked" />
-
-  <Edit Name="prpRate" Caption="Rate" X="140" Y="63" Width="90" Height="22" CaptionWidth="45" Help="Time acceleration of replay. Set to 0 for pause, 1 for normal real-time replay.">
-    <DataField DataType="double" DisplayFormat="%.0f x" EditFormat="%.0f" Min="0" Max="10" Step="1" OnDataAccess="OnRateData"/>
-  </Edit>
-</Form>
diff --git a/Data/XCSoar.rc b/Data/XCSoar.rc
index 2b37df4e3..dd4cf9fe9 100644
--- a/Data/XCSoar.rc
+++ b/Data/XCSoar.rc
@@ -254,7 +254,6 @@ XMLDIALOG(IDR_XML_CREDITS, "dlgCredits")
 XMLDIALOG(IDR_XML_CREDITS_L, "dlgCredits_L")
 XMLDIALOG(IDR_XML_FLARMTRAFFICDETAILS, "dlgFlarmTrafficDetails")
 XMLDIALOG(IDR_XML_FLARMTRAFFICDETAILS_L, "dlgFlarmTrafficDetails_L")
-XMLDIALOG(IDR_XML_LOGGERREPLAY, "dlgLoggerReplay")
 XMLDIALOG(IDR_XML_NOAA_DETAILS_L, "dlgNOAADetails_L")
 XMLDIALOG(IDR_XML_NOAA_DETAILS, "dlgNOAADetails")
 XMLDIALOG(IDR_XML_PLANE_DETAILS, "dlgPlaneDetails")
diff --git a/src/Dialogs/ReplayDialog.cpp b/src/Dialogs/ReplayDialog.cpp
index 7ab465c25..05cb8f438 100644
--- a/src/Dialogs/ReplayDialog.cpp
+++ b/src/Dialogs/ReplayDialog.cpp
@@ -22,83 +22,120 @@ Copyright_License {
 */
 
 #include "ReplayDialog.hpp"
-#include "Dialogs/CallBackTable.hpp"
-#include "Dialogs/XML.hpp"
 #include "Dialogs/Message.hpp"
-#include "Form/Form.hpp"
-#include "Form/Button.hpp"
-#include "Form/Edit.hpp"
-#include "Form/Util.hpp"
+#include "Dialogs/WidgetDialog.hpp"
+#include "Widget/RowFormWidget.hpp"
+#include "Form/ActionListener.hpp"
+#include "Form/DataField/Listener.hpp"
 #include "UIGlobals.hpp"
-#include "Units/Units.hpp"
 #include "Components.hpp"
 #include "Replay/Replay.hpp"
 #include "Form/DataField/FileReader.hpp"
 #include "Form/DataField/Float.hpp"
 #include "Language/Language.hpp"
 
-static WndForm *wf = NULL;
+enum Buttons {
+  START,
+  STOP,
+};
+
+class ReplayControlWidget final
+  : public RowFormWidget, public ActionListener, DataFieldListener {
+  enum Controls {
+    FILE,
+    RATE,
+  };
+
+public:
+  ReplayControlWidget(const DialogLook &look)
+    :RowFormWidget(look) {}
+
+private:
+  void OnStopClicked();
+  void OnStartClicked();
+
+public:
+  /* virtual methods from class Widget */
+  virtual void Prepare(ContainerWindow &parent,
+                       const PixelRect &rc) override;
+
+  /* virtual methods from ActionListener */
+  virtual void OnAction(int id) override;
+
+private:
+  /* methods from DataFieldListener */
+  virtual void OnModified(DataField &df) override;
+};
+
+void
+ReplayControlWidget::Prepare(ContainerWindow &parent, const PixelRect &rc)
+{
+  auto *file =
+    AddFileReader(_("File"),
+                  _("Name of file to replay.  Can be an IGC file (.igc), a raw NMEA log file (.nmea), or if blank, runs the demo."),
+                  nullptr,
+                  _T("*.nmea\0*.igc\0"),
+                  true);
+  ((DataFieldFileReader *)file->GetDataField())->Lookup(replay->GetFilename());
+  file->RefreshDisplay();
+
+  AddFloat(_("Rate"),
+           _("Time acceleration of replay. Set to 0 for pause, 1 for normal real-time replay."),
+           _("%.0f x"), _T("%.0f"),
+           fixed(0), fixed(10), fixed(1), false,
+           replay->GetTimeScale(),
+           this);
+}
 
-static void
-OnStopClicked()
+inline void
+ReplayControlWidget::OnStopClicked()
 {
   replay->Stop();
 }
 
-static void
-OnStartClicked()
+inline void
+ReplayControlWidget::OnStartClicked()
 {
-  const TCHAR *path = GetFormValueFile(*wf, _T("prpFile"));
+  const DataFieldFileReader &df = (const DataFieldFileReader &)
+    GetDataField(FILE);
+  const TCHAR *path = df.GetPathFile();
   if (!replay->Start(path))
     ShowMessageBox(_("Could not open IGC file!"),
                    _("Replay"), MB_OK | MB_ICONINFORMATION);
 }
 
-static void
-OnRateData(DataField *Sender, DataField::DataAccessMode Mode)
+void
+ReplayControlWidget::OnAction(int id)
 {
-  DataFieldFloat &df = *(DataFieldFloat *)Sender;
-
-  switch (Mode) {
-  case DataField::daChange:
-    replay->SetTimeScale(df.GetAsFixed());
+  switch (id) {
+  case START:
+    OnStartClicked();
     break;
 
-  case DataField::daSpecial:
-    return;
+  case STOP:
+    OnStopClicked();
+    break;
   }
 }
 
-static constexpr CallBackTableEntry CallBackTable[] = {
-  DeclareCallBackEntry(OnStopClicked),
-  DeclareCallBackEntry(OnStartClicked),
-  DeclareCallBackEntry(OnRateData),
-  DeclareCallBackEntry(NULL)
-};
-
 void
-ShowReplayDialog()
+ReplayControlWidget::OnModified(DataField &_df)
 {
-  wf = LoadDialog(CallBackTable, UIGlobals::GetMainWindow(),
-                  _T("IDR_XML_LOGGERREPLAY"));
-  if (!wf)
-    return;
-
-  WndProperty* wp;
-
-  wp = (WndProperty*)wf->FindByName(_T("prpFile"));
-  if (wp) {
-    DataFieldFileReader* dfe;
-    dfe = (DataFieldFileReader*)wp->GetDataField();
-    dfe->ScanDirectoryTop(_T("*.nmea"));
-    dfe->ScanDirectoryTop(_T("*.igc"));
-    dfe->Lookup(replay->GetFilename());
-    wp->RefreshDisplay();
-  }
-
-  LoadFormProperty(*wf, _T("prpRate"), replay->GetTimeScale());
+  const DataFieldFloat &df = (const DataFieldFloat &)_df;
 
-  wf->ShowModal();
+  replay->SetTimeScale(df.GetAsFixed());
+}
 
-  delete wf;
+void
+ShowReplayDialog()
+{
+  const DialogLook &look = UIGlobals::GetDialogLook();
+  ReplayControlWidget *widget = new ReplayControlWidget(look);
+  WidgetDialog dialog(look);
+  dialog.CreateAuto(UIGlobals::GetMainWindow(), _("Replay"), widget);
+  dialog.AddButton(_("Start"), *widget, START);
+  dialog.AddButton(_("Stop"), *widget, STOP);
+  dialog.AddButton(_("Close"), mrOK);
+
+  dialog.ShowModal();
 }
-- 
2.11.4.GIT