From 87dcb3358292c26765c1654b13d3d572a84f5cc1 Mon Sep 17 00:00:00 2001 From: arkpar Date: Wed, 18 Mar 2015 18:02:08 +0100 Subject: [PATCH] separate resource file for qml (faster build) common splitter style --- mix/CMakeLists.txt | 2 +- mix/qml.qrc | 65 +++++++++++++++++++ mix/qml/Debugger.qml | 8 +-- mix/qml/MainContent.qml | 14 +---- mix/qml/Splitter.qml | 14 +++++ mix/qml/TransactionLog.qml | 4 ++ mix/qml/WebPreview.qml | 2 +- mix/res.qrc | 124 ++++++++++--------------------------- 8 files changed, 121 insertions(+), 112 deletions(-) create mode 100644 mix/qml.qrc create mode 100644 mix/qml/Splitter.qml diff --git a/mix/CMakeLists.txt b/mix/CMakeLists.txt index 0ef9c6274..d57dafcac 100644 --- a/mix/CMakeLists.txt +++ b/mix/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories(${Boost_INCLUDE_DIRS}) include_directories(BEFORE ..) find_package (Qt5WebEngine QUIET) -qt5_add_resources(UI_RESOURCES res.qrc) +qt5_add_resources(UI_RESOURCES res.qrc qml.qrc) file(GLOB HEADERS "*.h") diff --git a/mix/qml.qrc b/mix/qml.qrc new file mode 100644 index 000000000..bed954741 --- /dev/null +++ b/mix/qml.qrc @@ -0,0 +1,65 @@ + + + qml/AlertMessageDialog.qml + qml/BasicMessage.qml + qml/BigIntValue.qml + qml/CallStack.qml + qml/CodeEditorStyle.qml + qml/CodeEditorView.qml + qml/CommonSeparator.qml + qml/ContractLibrary.qml + qml/DebugBasicInfo.qml + qml/DebugInfoList.qml + qml/Debugger.qml + qml/DebuggerPaneStyle.qml + qml/DefaultLabel.qml + qml/DefaultTextField.qml + qml/DeploymentDialog.qml + qml/Ether.qml + qml/EtherValue.qml + qml/FilesSection.qml + qml/ItemDelegateDataDump.qml + qml/LogsPane.qml + qml/LogsPaneStyle.qml + qml/MainContent.qml + qml/ModalDialog.qml + qml/NewProjectDialog.qml + qml/ProjectFilesStyle.qml + qml/ProjectList.qml + qml/ProjectModel.qml + qml/QBoolTypeView.qml + qml/QHashTypeView.qml + qml/QIntTypeView.qml + qml/QRealTypeView.qml + qml/QStringTypeView.qml + qml/QVariableDeclaration.qml + qml/QVariableDefinition.qml + qml/SourceSansProBold.qml + qml/SourceSansProLight.qml + qml/SourceSansProRegular.qml + qml/Splitter.qml + qml/StateDialog.qml + qml/StateDialogStyle.qml + qml/StateList.qml + qml/StateListModel.qml + qml/StateStyle.qml + qml/StatusPane.qml + qml/StatusPaneStyle.qml + qml/StepActionImage.qml + qml/StorageView.qml + qml/StructView.qml + qml/Style.qml + qml/TabStyle.qml + qml/TransactionDialog.qml + qml/TransactionLog.qml + qml/VariablesView.qml + qml/WebPreviewStyle.qml + qml/js/Debugger.js + qml/js/ErrorLocationFormater.js + qml/js/ProjectModel.js + qml/js/QEtherHelper.js + qml/js/TransactionHelper.js + qml/main.qml + qml/qmldir + + diff --git a/mix/qml/Debugger.qml b/mix/qml/Debugger.qml index c4b6502b0..b3b67aa5c 100644 --- a/mix/qml/Debugger.qml +++ b/mix/qml/Debugger.qml @@ -158,19 +158,15 @@ Rectangle { } } - SplitView { + Splitter { id: debugScrollArea anchors.fill: parent orientation: Qt.Vertical - handleDelegate: Rectangle { - height: machineStates.sideMargin - color: "transparent" - } TransactionLog { id: transactionLog Layout.fillWidth: true - Layout.minimumHeight: 120 + Layout.minimumHeight: 130 height: 250 anchors.top: parent.top anchors.left: parent.left diff --git a/mix/qml/MainContent.qml b/mix/qml/MainContent.qml index c9495b81f..9be44ccae 100644 --- a/mix/qml/MainContent.qml +++ b/mix/qml/MainContent.qml @@ -158,14 +158,9 @@ Rectangle { property alias rightViewWidth: rightView.width } - SplitView + Splitter { anchors.fill: parent - handleDelegate: Rectangle { - width: 1 - height: 1 - color: "#8c8c8c" - } orientation: Qt.Horizontal ProjectList { @@ -183,12 +178,7 @@ Rectangle { Layout.fillHeight: true Layout.fillWidth: true - SplitView { - handleDelegate: Rectangle { - width: 1 - height: 1 - color: "#8c8c8c" - } + Splitter { id: codeWebSplitter anchors.fill: parent orientation: Qt.Vertical diff --git a/mix/qml/Splitter.qml b/mix/qml/Splitter.qml new file mode 100644 index 000000000..96e823795 --- /dev/null +++ b/mix/qml/Splitter.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 +import QtQuick.Controls 1.3 + +SplitView +{ + handleDelegate: Rectangle { + width: 4 + height: 4 + color: "#cccccc" + } +} + + + diff --git a/mix/qml/TransactionLog.qml b/mix/qml/TransactionLog.qml index 315028c74..887a14c07 100644 --- a/mix/qml/TransactionLog.qml +++ b/mix/qml/TransactionLog.qml @@ -167,6 +167,10 @@ Item { } } } + Rectangle { + height: 6 + color: "transparent" + } } Connections { diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml index bff4be66f..d72d0a886 100644 --- a/mix/qml/WebPreview.qml +++ b/mix/qml/WebPreview.qml @@ -292,7 +292,7 @@ Item { color: WebPreviewStyle.general.separatorColor } - SplitView + Splitter { Layout.preferredWidth: parent.width Layout.fillHeight: true diff --git a/mix/res.qrc b/mix/res.qrc index fa50d6dd8..e509bdcc2 100644 --- a/mix/res.qrc +++ b/mix/res.qrc @@ -1,65 +1,5 @@ - qml/main.qml - qml/AlertMessageDialog.qml - qml/BasicMessage.qml - qml/Debugger.qml - qml/MainContent.qml - qml/ModalDialog.qml - qml/ProjectList.qml - qml/StateDialog.qml - qml/StateList.qml - qml/StateListModel.qml - qml/img/dappProjectIcon.png - qml/img/jumpintoback.png - qml/img/jumpintoforward.png - qml/img/jumpoutback.png - qml/img/jumpoutforward.png - qml/img/jumpoverback.png - qml/img/jumpoverforward.png - qml/img/jumpoverforwarddisabled.png - qml/StepActionImage.qml - qml/img/jumpintobackdisabled.png - qml/img/jumpintoforwarddisabled.png - qml/img/jumpoutbackdisabled.png - qml/img/jumpoutforwarddisabled.png - qml/img/jumpoverbackdisabled.png - qml/DebugBasicInfo.qml - qml/js/ErrorLocationFormater.js - qml/img/closedtriangleindicator.png - qml/img/opentriangleindicator.png - qml/img/bugiconactive.png - qml/img/bugiconinactive.png - qml/DebugInfoList.qml - qml/ItemDelegateDataDump.qml - qml/StatusPane.qml - qml/TabStyle.qml - qml/TransactionDialog.qml - qml/js/Debugger.js - qml/NewProjectDialog.qml - qml/ProjectModel.qml - qml/CodeEditorView.qml - qml/js/ProjectModel.js - qml/Ether.qml - qml/EtherValue.qml - qml/BigIntValue.qml - qml/QVariableDefinition.qml - qml/js/QEtherHelper.js - qml/js/TransactionHelper.js - qml/QBoolTypeView.qml - qml/QIntTypeView.qml - qml/QRealTypeView.qml - qml/QStringTypeView.qml - qml/QHashTypeView.qml - qml/ContractLibrary.qml - stdc/config.sol - stdc/namereg.sol - stdc/std.sol - qml/TransactionLog.qml - res/mix_256x256x32.png - qml/QVariableDeclaration.qml - qml/qmldir - qml/FilesSection.qml qml/fonts/SourceSansPro-Black.ttf qml/fonts/SourceSansPro-BlackIt.ttf qml/fonts/SourceSansPro-Bold.ttf @@ -75,43 +15,43 @@ qml/fonts/SourceSerifPro-Bold.ttf qml/fonts/SourceSerifPro-Regular.ttf qml/fonts/SourceSerifPro-Semibold.ttf + qml/img/available_updates.png + qml/img/b64.png + qml/img/broom.png + qml/img/bugiconactive.png + qml/img/bugiconinactive.png + qml/img/closedtriangleindicator.png qml/img/closedtriangleindicator_filesproject.png - qml/img/opentriangleindicator_filesproject.png - qml/img/projecticon.png - qml/SourceSansProRegular.qml - qml/SourceSansProBold.qml - qml/SourceSansProLight.qml - qml/StateDialogStyle.qml - qml/ProjectFilesStyle.qml - qml/DebuggerPaneStyle.qml - qml/CodeEditorStyle.qml - qml/StatusPaneStyle.qml - qml/StateStyle.qml - qml/img/plus.png + qml/img/console.png + qml/img/copy.png + qml/img/dappProjectIcon.png qml/img/delete_sign.png qml/img/edit.png - qml/DefaultLabel.qml - qml/DefaultTextField.qml - qml/CommonSeparator.qml - qml/Style.qml - qml/WebPreviewStyle.qml - qml/img/available_updates.png - qml/DeploymentDialog.qml - qml/img/search_filled.png - qml/StorageView.qml - qml/CallStack.qml + qml/img/exit.png qml/img/help.png + qml/img/jumpintoback.png + qml/img/jumpintobackdisabled.png + qml/img/jumpintoforward.png + qml/img/jumpintoforwarddisabled.png + qml/img/jumpoutback.png + qml/img/jumpoutbackdisabled.png + qml/img/jumpoutforward.png + qml/img/jumpoutforwarddisabled.png + qml/img/jumpoverback.png + qml/img/jumpoverbackdisabled.png + qml/img/jumpoverforward.png + qml/img/jumpoverforwarddisabled.png + qml/img/note.png qml/img/openedfolder.png - qml/img/b64.png - qml/img/exit.png + qml/img/opentriangleindicator.png + qml/img/opentriangleindicator_filesproject.png + qml/img/plus.png + qml/img/projecticon.png qml/img/run.png - qml/img/note.png - qml/LogsPane.qml - qml/img/copy.png - qml/img/broom.png - qml/LogsPaneStyle.qml - qml/StructView.qml - qml/img/console.png - qml/VariablesView.qml + qml/img/search_filled.png + res/mix_256x256x32.png + stdc/config.sol + stdc/namereg.sol + stdc/std.sol