status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Michał Cieślak 2023-02-06 13:52:03 +01:00 committed by Michał
parent 8f25b93f96
commit f43c3e2f2b
10 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storybook/CMakeLists.txt
View File

@ -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)

7
storybook/mocks/DotherSide/StatusSyntaxHighlighter.qml
View File

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

1
storybook/mocks/DotherSide/qmldir
View File

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

0
vendor/DOtherSide/lib/include/DOtherSide/DOtherSideStatusSyntaxHighlighter.h → ui/StatusQ/include/StatusQ/statussyntaxhighlighter.h
View File

2
ui/StatusQ/sandbox/CMakeLists.txt
View File

@ -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)

2
vendor/DOtherSide/lib/src/DOtherSideStatusSyntaxHighlighter.cpp → ui/StatusQ/src/statussyntaxhighlighter.cpp
View File

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

4
ui/StatusQ/src/typesregistration.cpp
View File

@ -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");
}

4
ui/imports/shared/status/StatusChatInput.qml
View File

@ -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

2
vendor/DOtherSide/lib/CMakeLists.txt vendored
View File

@ -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)

6
vendor/DOtherSide/lib/src/DOtherSide.cpp vendored
View File

@ -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