replaced with togglebutton using qtquickcontrols2

4 files changed, 28 insertions, 19 deletions

diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml

index cf67c48c..01aef4c6 100644
--- a/resources/qml/ToggleButton.qml
+++ b/resources/qml/ToggleButton.qml
@@ -1,22 +1,32 @@
 import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.12
+import QtQuick.Controls 2.12
 import im.nheko 1.0
 
 Switch {
-    style: SwitchStyle {
-        handle: Rectangle {
-            width: 20
-            height: 20
-            radius: 90
-            color: "whitesmoke"
+    id: toggleButton
+
+	indicator: Item {
+        implicitWidth: 48
+        implicitHeight: 26
+
+        Rectangle {
+            height: parent.height/2
+            radius: height/2
+            width: parent.width - height
+            x: radius
+            y: parent.height / 2 - height / 2
+            color: toggleButton.checked ? "skyblue" : "grey"
+            border.color: "#cccccc"
         }
         
-        groove: Rectangle {
-            implicitWidth: 40
-            implicitHeight: 20
-            radius: 90
-            color: checked ? "skyblue" : "grey"
+        Rectangle {
+            x: toggleButton.checked ? parent.width - width : 0
+            width: parent.height
+            height: width
+            radius: width/2
+            color: toggleButton.down ? "whitesmoke" : "whitesmoke"
+            border.color: "#999999"
         }
     }
 }
\ No newline at end of file
diff --git a/src/MainWindow.h b/src/MainWindow.h

index 5c2df8b6..4a8ea642 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -54,7 +54,6 @@ class LeaveRoom;
 class Logout;
 class MemberList;
 class ReCaptcha;
-class RoomSettingsOld;
 }
 
 class MainWindow : public QMainWindow
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h

index 29207318..df067fd4 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -11,8 +11,8 @@
 #include "CacheCryptoStructs.h"
 #include "EventStore.h"
 #include "InputBar.h"
-#include "ui/UserProfile.h"
 #include "ui/RoomSettings.h"
+#include "ui/UserProfile.h"
 
 namespace mtx::http {
 using RequestErr = const std::optional<mtx::http::ClientError> &;
diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp

index d2b5a630..b166332c 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -1,21 +1,21 @@
 #include "RoomSettings.h"
 
+#include <QApplication>
 #include <QFileDialog>
+#include <QHBoxLayout>
 #include <QImageReader>
 #include <QMimeDatabase>
 #include <QStandardPaths>
-#include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QApplication>
 #include <mtx/responses/common.hpp>
 #include <mtx/responses/media.hpp>
 
 #include "Cache.h"
-#include "Logging.h"
 #include "Config.h"
+#include "Logging.h"
 #include "MatrixClient.h"
-#include "ui/TextField.h"
 #include "Utils.h"
+#include "ui/TextField.h"
 
 using namespace mtx::events;