chore(general): Move StatusSyntaxHighlighter to StatusQ, remove mock from Storybook

storybook/CMakeLists.txt

@@ -35,12 +35,14 @@ set(STATUSQ_HEADERS
     ${STATUSQ_DIR}/include/StatusQ/statuswindow.h
     ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
     ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
+    ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
 )
 
 set(STATUSQ_SOURCES
     ${STATUSQ_DIR}/src/statuswindow.cpp
     ${STATUSQ_DIR}/src/typesregistration.cpp
     ${STATUSQ_DIR}/src/QClipboardProxy.cpp
+    ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
 )
 
 if(APPLE)

storybook/mocks/DotherSide/StatusSyntaxHighlighter.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.14
-
-QtObject {
-    property var quickTextDocument
-    property color codeBackgroundColor
-    property color codeForegroundColor
-}

storybook/mocks/DotherSide/qmldir

@@ -1 +0,0 @@
-StatusSyntaxHighlighter 0.1 StatusSyntaxHighlighter.qml

ui/StatusQ/sandbox/CMakeLists.txt

@@ -16,12 +16,14 @@ set(STATUSQ_HEADERS
     ${STATUSQ_DIR}/include/StatusQ/statuswindow.h
     ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
     ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
+    ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
 )
 
 set(STATUSQ_SOURCES
     ${STATUSQ_DIR}/src/statuswindow.cpp
     ${STATUSQ_DIR}/src/typesregistration.cpp
     ${STATUSQ_DIR}/src/QClipboardProxy.cpp
+    ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
 )
 
 if(APPLE)

ui/StatusQ/src/statussyntaxhighlighter.cpp

@@ -1,4 +1,4 @@
-#include "DOtherSide/DOtherSideStatusSyntaxHighlighter.h"
+#include "StatusQ/statussyntaxhighlighter.h"
 
 #include <QQuickTextDocument>
 

ui/StatusQ/src/typesregistration.cpp

@@ -1,7 +1,8 @@
 #include "StatusQ/typesregistration.h"
 
-#include "StatusQ/statuswindow.h"
 #include "StatusQ/QClipboardProxy.h"
+#include "StatusQ/statussyntaxhighlighter.h"
+#include "StatusQ/statuswindow.h"
 
 #include <QQmlEngine>
 
@@ -10,4 +11,5 @@ void registerStatusQTypes()
 	qmlRegisterType<StatusWindow>("StatusQ", 0 , 1, "StatusWindow");
     qmlRegisterSingletonType<QClipboardProxy>("StatusQ", 0 , 1, "QClipboardProxy",
                                               &QClipboardProxy::qmlInstance);
+    qmlRegisterType<StatusSyntaxHighlighter>("StatusQ", 0 , 1, "StatusSyntaxHighlighter");
 }

ui/imports/shared/status/StatusChatInput.qml

@@ -2,9 +2,6 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import QtQuick.Layouts 1.13
 import QtQuick.Dialogs 1.3
-import DotherSide 0.1
-
-import StatusQ 0.1
 
 import utils 1.0
 
@@ -16,6 +13,7 @@ import shared.stores 1.0
 //TODO remove this dependency
 import AppLayouts.Chat.panels 1.0
 
+import StatusQ 0.1
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Core.Utils 0.1 as StatusQUtils

vendor/DOtherSide/lib/CMakeLists.txt

@@ -23,12 +23,14 @@ macro(add_target name type)
         ${STATUSQ_DIR}/include/StatusQ/statuswindow.h
         ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
         ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
+        ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
     )
 
     set(STATUSQ_SOURCES
         ${STATUSQ_DIR}/src/statuswindow.cpp
         ${STATUSQ_DIR}/src/typesregistration.cpp
         ${STATUSQ_DIR}/src/QClipboardProxy.cpp
+        ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
     )
 
     if(APPLE)

vendor/DOtherSide/lib/src/DOtherSide.cpp

@@ -64,7 +64,6 @@
 #include "DOtherSide/DosQDeclarative.h"
 #include "DOtherSide/DosQQuickImageProvider.h"
 #include "DOtherSide/DOtherSideSingleInstance.h"
-#include "DOtherSide/DOtherSideStatusSyntaxHighlighter.h"
 
 #include "DOtherSide/Status/DockShowAppEvent.h"
 #include "DOtherSide/Status/OSThemeEvent.h"
@@ -74,8 +73,9 @@
 #include "DOtherSide/Status/SoundManager.h"
 #include "DOtherSide/Status/RXValidator.h"
 
-#include "StatusQ/statuswindow.h"
 #include "StatusQ/QClipboardProxy.h"
+#include "StatusQ/statussyntaxhighlighter.h"
+#include "StatusQ/statuswindow.h"
 
 #ifdef MONITORING
 #include <QProcessEnvironment>
@@ -91,9 +91,9 @@ void register_meta_types()
     qRegisterMetaType<QVector<int>>();
 
     qmlRegisterType<StatusWindow>("StatusQ", 0 , 1, "StatusWindow");
+    qmlRegisterType<StatusSyntaxHighlighter>("StatusQ", 0 , 1, "StatusSyntaxHighlighter");
     qmlRegisterSingletonType<QClipboardProxy>("StatusQ", 0 , 1, "QClipboardProxy", &QClipboardProxy::qmlInstance);
 
-    qmlRegisterType<StatusSyntaxHighlighter>("DotherSide", 0 , 1, "StatusSyntaxHighlighter");
     qmlRegisterType<RXValidator>("DotherSide", 0, 1, "RXValidator");
 
 #ifdef MONITORING