diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
new file mode 100644
--- /dev/null
+++ b/CMakeLists.txt.user
@@ -0,0 +1,629 @@
+
+
+
+
+
+ EnvironmentId
+ {61a32f19-14e9-4cba-b52e-c68063962c9c}
+
+
+ ProjectExplorer.Project.ActiveTarget
+ 0
+
+
+ ProjectExplorer.Project.EditorSettings
+
+ true
+ false
+ true
+
+ Cpp
+
+ CppGlobal
+
+
+
+ QmlJS
+
+ QmlJSGlobal
+
+
+ 2
+ UTF-8
+ false
+ 4
+ false
+ 80
+ true
+ true
+ 1
+ true
+ false
+ 0
+ true
+ true
+ 0
+ 8
+ true
+ 1
+ true
+ true
+ true
+ false
+
+
+
+ ProjectExplorer.Project.PluginSettings
+
+
+
+ ProjectExplorer.Project.Target.0
+
+ Desktop Qt 5.7.1 GCC 64bit2
+ Desktop Qt 5.7.1 GCC 64bit2
+ qt.57.gcc_64_kit
+ 0
+ 0
+ 0
+
+
+ CMAKE_CXX_COMPILER:STRING=/usr/bin/g++
+ CMAKE_C_COMPILER:STRING=/usr/bin/cc
+ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}
+ QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Default
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Default
+ Default
+ CMakeProjectManager.CMakeBuildConfiguration
+
+
+
+ CMAKE_BUILD_TYPE:STRING=Debug
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Debug
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+ Debug
+ CMakeProjectManager.CMakeBuildConfiguration
+
+
+
+ CMAKE_BUILD_TYPE:STRING=Release
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Release
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release
+ Release
+ CMakeProjectManager.CMakeBuildConfiguration
+
+
+
+ CMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Release with Debug Information
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release with Debug Information
+ Release with Debug Information
+ CMakeProjectManager.CMakeBuildConfiguration
+
+
+
+ CMAKE_BUILD_TYPE:STRING=MinSizeRel
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Minimum Size Release
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Minimum Size Release
+ Minimum Size Release
+ CMakeProjectManager.CMakeBuildConfiguration
+
+ 5
+
+
+ 0
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy locally
+
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ minuet
+
+
+ /home/raphael/Development/build-minuet-Desktop_Qt_5_7_1_GCC_64bit2-Default/src/app
+ 2
+
+ minuet
+
+ CMakeProjectManager.CMakeRunConfiguration.minuet
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+ 1
+
+
+
+ ProjectExplorer.Project.Target.1
+
+ Imported Kit
+ Imported Kit
+ {f87102f2-20bf-4d96-9d0a-8f3570377cde}
+ 0
+ 0
+ 0
+
+
+ CMAKE_BUILD_TYPE:STRING=Debug
+
+ /home/raphael/Development/buil_MINUET
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+ Debug
+ CMakeProjectManager.CMakeBuildConfiguration
+
+ 1
+
+
+ 0
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy locally
+
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ 2
+
+
+
+ %{buildDir}
+ Custom Executable
+
+ ProjectExplorer.CustomExecutableRunConfiguration
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+ 1
+
+
+
+ ProjectExplorer.Project.Target.2
+
+ Imported Kit
+ Imported Kit
+ {e67019f5-1e70-45ee-876c-7d7597247a57}
+ 0
+ 0
+ 0
+
+
+ CMAKE_BUILD_TYPE:STRING=Debug
+
+ /home/raphael/Development/build_minuet
+
+
+
+
+ all
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Build
+
+ ProjectExplorer.BuildSteps.Build
+
+
+
+
+
+ clean
+
+ true
+ CMake Build
+
+ CMakeProjectManager.MakeStep
+
+ 1
+ Clean
+
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+ Debug
+ CMakeProjectManager.CMakeBuildConfiguration
+
+ 1
+
+
+ 0
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy locally
+
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ -1
+
+
+
+ %{buildDir}
+ Custom Executable
+
+ ProjectExplorer.CustomExecutableRunConfiguration
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 3
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 18
+
+
+ Version
+ 18
+
+
diff --git a/src/app/main.cpp b/src/app/main.cpp
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -70,5 +70,7 @@
Minuet::Core::initialize();
+
+
return application.exec();
}
diff --git a/src/app/plugincontroller.cpp b/src/app/plugincontroller.cpp
--- a/src/app/plugincontroller.cpp
+++ b/src/app/plugincontroller.cpp
@@ -85,7 +85,7 @@
}
if (!soundController) {
m_errorString = QStringLiteral("Could not find a suitable SoundController plugin!");
- return false;
+ //return false;
}
#else
ISoundController *soundController = 0;
diff --git a/src/app/plugins/rect1.json b/src/app/plugins/rect1.json
new file mode 100644
--- /dev/null
+++ b/src/app/plugins/rect1.json
@@ -0,0 +1,5 @@
+{
+ "menuName": "Rectangle1",
+ "iconName": "group",
+ "mainPage": "rect1.qml"
+}
diff --git a/src/app/plugins/rect1/rect1.qml b/src/app/plugins/rect1/rect1.qml
new file mode 100644
--- /dev/null
+++ b/src/app/plugins/rect1/rect1.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+
+Rectangle {
+ anchors.centerIn: parent
+ color: "blue"
+ width: 20
+ height: 20
+ //Label {
+ // anchors.centerIn: parent
+ // text: "Ola do plugin de assistant"
+ //}
+}
diff --git a/src/app/plugins/rect2.json b/src/app/plugins/rect2.json
new file mode 100644
--- /dev/null
+++ b/src/app/plugins/rect2.json
@@ -0,0 +1,5 @@
+{
+ "menuName": "Rectangle2",
+ "iconName": "group",
+ "mainPage": "rect2.qml"
+}
diff --git a/src/app/plugins/rect2/rect2.qml b/src/app/plugins/rect2/rect2.qml
new file mode 100644
--- /dev/null
+++ b/src/app/plugins/rect2/rect2.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+
+Rectangle {
+ anchors.centerIn: parent
+ color: "red"
+ width: 20
+ height: 20
+ }
+/*Item {
+ Label {
+ anchors.centerIn: parent
+ text: "Ola do plugin de student"
+ }
+}
+*/
\ No newline at end of file
diff --git a/src/app/plugins/rect2/students.qmlc b/src/app/plugins/rect2/students.qmlc
new file mode 100644
index 0000000000000000000000000000000000000000..7824093bd51b90a8984915f2828b91d5c73c0e82
GIT binary patch
literal 1636
zc$}S6&ubG=5T1=qo5t4eL9~KM4uKw|t%V{YB8ghu#SKg>70
zKSGDP;M)Vd_YvVwC30n^PCu{HL2~&K)Y}D}QL6i8$vNV8bxzv5rPe%JVW_knnU(oo
zNV}y$J|WFCtJKFTo_+D$x>?&5pUfwEQKU^ZTBW<#SOH9*JF_brERFi8pR;0{KvT`k
zE#z(3PlF6%-p=ayJoY`AOGtp%YS*n?^$AcWzx4R1D$UqyCe_o{|IJy==dMbPPgN@K
zstK*N0b#%Zt^q0F0WbqB11rEm9LNIj3E1ne<`VDj0$D(wMkzsK(ywmu_t0sYpfr40
z=#;#j;+%E(k~Ge?NNrG@hT%!c{BcAj=q94Fn|E5AYXY1!$7Ycu&HnvBlBOvGUlQyb
zs*9>28sYd*!zi~8iz6+zJAw1)AdUzVks)MEVU`=nmu6oQYYyx@Kc{6}3>X0?1>bS%
z<)7$$9Cj~HV)Fc>(A^w4#gq1O^&GF=tX*y#Y{AUn$wH5fy!b41yD6*}76Z}3s?t&Xj!Pf2y)3=3rp26nG3TNh
zvxftQlP?=ia$PGdMy|iA(!MRr&t)g|ga52=*gvBiPsMz?eI`7I2BL3Hoe-au*7sKH
lTbdW2k^aaE&$-MHm;=sbb)dM^QS2faraNLOtPO5=fWMe!29W>&
literal 0
Hc$@GD6o0e1f3!8{5M>at!IDs@2@(-OZY9msY*}EJ3>kOUvetEVM==PBHV?y4
zbcpESp;KoM9mKk2MAS*V)uG4^#S#l0@|69)H=oY9ZlJx{-}m;t@Av+F^Udf)XT~yZ
zGfI$Hn4a%{`sRv4lnfJ{|5A?MIg$Jtc{zFTKyT`79F#^N{<-=6$9uOPS`%l^9r~5n
z*8<-T;6sQAKYC1_Ojqe=Rl0#Zei!O(gDxokenoN)hdo`C_I9bYfL0hPZANBfz8BJt
z*2pI$LNiKrtPwK!R`mXBG
zS{z6M2G9rOfcwBSum~&xdvPGIfKR~Au%Ao3yNhH4<1|DWx+(qY27eo!q7ll&HwK-P
zw^N+64qujr*%qk{GHC#woXl?`Dnr*1HMVxA#kpp{$#d)&a^%^+8_3cm72wN)T|{+J
zH9>EE7CwJLf9$+REDFnqUiN0sm}dDuNm8q$nf(E^2w&XcQfY^K9gE
z8<8g7*VWa*`{mUefg-AiiP
z8HgF~c*StD%UWr^>*{Nt_I*))E?cSJ@Xz{&^E8@Bx<(|zB@E4Qc0|fv8
literal 0
Hc$@
+#include
#ifdef Q_OS_ANDROID
#include
@@ -61,6 +62,7 @@
~UiController() override;
bool initialize(Core *core);
+ bool initialize2(QQmlApplicationEngine *engine);
virtual QString errorString() const;
private:
diff --git a/src/app/uicontroller.cpp b/src/app/uicontroller.cpp
--- a/src/app/uicontroller.cpp
+++ b/src/app/uicontroller.cpp
@@ -29,6 +29,17 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
#ifndef Q_OS_ANDROID
#include
#endif
@@ -45,6 +56,28 @@
{
}
+bool UiController::initialize2(QQmlApplicationEngine *engine)
+{
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+ QDir dir(qApp->applicationDirPath());
+ dir.cd("plugins");
+ qDebug()<applicationDirPath();
+ QString contents;
+ QJsonArray mergedArray;
+ foreach(const QString &fileName, dir.entryList(QStringList() << "*.json")) {
+ QFile dfile(dir.absoluteFilePath(fileName));
+ dfile.open(QIODevice::ReadOnly);
+ QJsonObject jsonObject = QJsonDocument::fromJson(dfile.readAll()).object();
+ QDir pluginDir(dir);
+ pluginDir.cd(fileName.split('.').first());
+ jsonObject["pluginName"] = pluginDir.absolutePath();
+ mergedArray.append(jsonObject);
+ dfile.close();
+ }
+ engine->rootContext()->setContextProperty("contents", mergedArray);
+}
+
bool UiController::initialize(Core *core)
{
m_errorString.clear();
@@ -56,6 +89,8 @@
#else
rootContext->setContextObject(new DummyAndroidLocalizer(engine));
#endif
+
+ initialize2(engine);
engine->load(QUrl("qrc:/Main.qml"));
return true;