move to sp qt

selfdrive/ui/SConscript

@@ -22,7 +22,7 @@ if not GetOption('stock_ui'):
 qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
 
 qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"] + sp_qt_util, LIBS=base_libs)
-widgets_src = ["qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/prime_state.cc", "qt/widgets/external_storage.cc",
+widgets_src = ["qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/prime_state.cc",
                "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
                "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
                "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc",

selfdrive/ui/qt/offroad/developer_panel.cc

@@ -1,6 +1,5 @@
 #include "selfdrive/ui/qt/offroad/developer_panel.h"
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
-#include "selfdrive/ui/qt/widgets/external_storage.h"
 
 #ifdef SUNNYPILOT
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
@@ -17,8 +16,6 @@ DeveloperPanel::DeveloperPanel(SettingsWindow *parent) : ListWidget(parent) {
   addItem(new SshToggle());
   addItem(new SshControl());
 
-  addItem(new ExternalStorageControl());
-
   joystickToggle = new ParamControl("JoystickDebugMode", tr("Joystick Debug Mode"), "", "");
   QObject::connect(joystickToggle, &ParamControl::toggleFlipped, [=](bool state) {
     params.putBool("LongitudinalManeuverMode", false);

selfdrive/ui/sunnypilot/SConscript

@@ -7,6 +7,7 @@ widgets_src = [
   "sunnypilot/qt/widgets/prime.cc",
   "sunnypilot/qt/widgets/scrollview.cc",
   "sunnypilot/qt/network/networking.cc",
+  "sunnypilot/qt/widgets/external_storage.cc",
 ]
 
 qt_util = [

selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc

@@ -5,9 +5,14 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/external_storage.h"
 
 DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(parent) {
 
+  #ifndef __APPLE__
+  addItem(new ExternalStorageControl());
+  #endif
+
   // Advanced Controls Toggle
   showAdvancedControls = new ParamControlSP("ShowAdvancedControls", tr("Show Advanced Controls"), tr("Toggle visibility of advanced sunnypilot controls.\nThis only toggles the visibility of the controls; it does not toggle the actual control enabled/disabled state."), "");
   addItem(showAdvancedControls);

selfdrive/ui/sunnypilot/qt/widgets/external_storage.cc

@@ -1,4 +1,11 @@
-#include "selfdrive/ui/qt/widgets/external_storage.h"
+/**
+ * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
+ *
+ * This file is part of sunnypilot and is licensed under the MIT License.
+ * See the LICENSE.md file in the root directory for more details.
+ */
+
+#include "selfdrive/ui/sunnypilot/qt/widgets/external_storage.h"
 
 #include <QProcess>
 #include <QCoreApplication>

selfdrive/ui/sunnypilot/qt/widgets/external_storage.h

@@ -1,15 +1,14 @@
+/**
+ * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
+ *
+ * This file is part of sunnypilot and is licensed under the MIT License.
+ * See the LICENSE.md file in the root directory for more details.
+ */
+
 #pragma once
 
-#include <QPushButton>
-
 #include "system/hardware/hw.h"
-
-#ifdef SUNNYPILOT
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#define ButtonControl ButtonControlSP
-#else
-#include "selfdrive/ui/qt/widgets/controls.h"
-#endif
 
 class ExternalStorageControl : public ButtonControl {
   Q_OBJECT
@@ -24,9 +23,6 @@ private:
   Params params;
 
   void refresh();
-  bool isStorageMounted();
-  bool isFilesystemPresent();
-  bool isDriveInitialized();
   void mountStorage();
   void unmountStorage();
   void formatStorage();