diff --git a/data.qrc b/data.qrc deleted file mode 100644 index 5a15240e..00000000 --- a/data.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - data/icons/busy-indicator.svg - - diff --git a/data/icons/busy-indicator.svg b/data/icons/busy-indicator.svg deleted file mode 100644 index b0b8d6af..00000000 --- a/data/icons/busy-indicator.svg +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mea.pro b/mea.pro index 3d816745..79d5b92f 100644 --- a/mea.pro +++ b/mea.pro @@ -15,7 +15,7 @@ wininstaller.depends = mea wininstaller.commands += rmdir /S /Q mea\release\out && mkdir mea\release\out && wininstaller.commands += copy mea\release\mea.exe mea\release\out\ && wininstaller.commands += windeployqt --qmldir mea\ui mea\release\out && -wininstaller.commands += makensis win-installer.nsi +wininstaller.commands += makensis packaging\windows\win-installer.nsi QMAKE_EXTRA_TARGETS += wininstaller target.depends += wininstaller diff --git a/guh-logo.ico b/mea/guh-logo.ico similarity index 100% rename from guh-logo.ico rename to mea/guh-logo.ico diff --git a/mea/jsonrpc/jsonrpcclient.cpp b/mea/jsonrpc/jsonrpcclient.cpp index 9a14d0c1..f1b1aba6 100644 --- a/mea/jsonrpc/jsonrpcclient.cpp +++ b/mea/jsonrpc/jsonrpcclient.cpp @@ -254,7 +254,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data) // qWarning() << "Could not parse json data from mea" << data << error.errorString(); return; } - qDebug() << "received response" << m_receiveBuffer.left(splitIndex); +// qDebug() << "received response" << m_receiveBuffer.left(splitIndex); m_receiveBuffer = m_receiveBuffer.right(m_receiveBuffer.length() - splitIndex - 1); if (!m_receiveBuffer.isEmpty()) { staticMetaObject.invokeMethod(this, "dataReceived", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray())); diff --git a/mea/mea.pro b/mea/mea.pro index befd28fb..31775d8c 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -116,7 +116,7 @@ DISTFILES += \ android/gradlew.bat \ LICENSE -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android DISTFILES += \ diff --git a/mea/rulemanager.cpp b/mea/rulemanager.cpp index a7272bbf..bae7769c 100644 --- a/mea/rulemanager.cpp +++ b/mea/rulemanager.cpp @@ -140,7 +140,7 @@ void RuleManager::getRuleDetailsReply(const QVariantMap ¶ms) qDebug() << "Got rule details for a rule we don't know"; return; } - qDebug() << "got rule details for rule" << ruleMap; +// qDebug() << "got rule details for rule" << ruleMap; parseEventDescriptors(ruleMap.value("eventDescriptors").toList(), rule); parseRuleActions(ruleMap.value("actions").toList(), rule); parseRuleExitActions(ruleMap.value("exitActions").toList(), rule); diff --git a/mea/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml similarity index 100% rename from mea/android/AndroidManifest.xml rename to packaging/android/AndroidManifest.xml diff --git a/mea/android/build.gradle b/packaging/android/build.gradle similarity index 100% rename from mea/android/build.gradle rename to packaging/android/build.gradle diff --git a/mea/android/gradle.properties b/packaging/android/gradle.properties similarity index 100% rename from mea/android/gradle.properties rename to packaging/android/gradle.properties diff --git a/mea/android/gradle/wrapper/gradle-wrapper.jar b/packaging/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from mea/android/gradle/wrapper/gradle-wrapper.jar rename to packaging/android/gradle/wrapper/gradle-wrapper.jar diff --git a/mea/android/gradle/wrapper/gradle-wrapper.properties b/packaging/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from mea/android/gradle/wrapper/gradle-wrapper.properties rename to packaging/android/gradle/wrapper/gradle-wrapper.properties diff --git a/mea/android/gradlew b/packaging/android/gradlew similarity index 100% rename from mea/android/gradlew rename to packaging/android/gradlew diff --git a/mea/android/gradlew.bat b/packaging/android/gradlew.bat similarity index 100% rename from mea/android/gradlew.bat rename to packaging/android/gradlew.bat diff --git a/mea/android/local.properties b/packaging/android/local.properties similarity index 100% rename from mea/android/local.properties rename to packaging/android/local.properties diff --git a/mea/android/res/drawable-mdpi/icon.png b/packaging/android/res/drawable-mdpi/icon.png similarity index 100% rename from mea/android/res/drawable-mdpi/icon.png rename to packaging/android/res/drawable-mdpi/icon.png diff --git a/mea/android/res/values/libs.xml b/packaging/android/res/values/libs.xml similarity index 100% rename from mea/android/res/values/libs.xml rename to packaging/android/res/values/libs.xml diff --git a/win-installer.nsi b/packaging/windows/win-installer.nsi similarity index 99% rename from win-installer.nsi rename to packaging/windows/win-installer.nsi index c0920bcc..2ee0b6f1 100644 --- a/win-installer.nsi +++ b/packaging/windows/win-installer.nsi @@ -30,7 +30,7 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}" LicenseData "LICENSE" # This will be in the installer/uninstaller's title bar Name "${COMPANYNAME} - ${APPNAME}" -Icon "guh-logo.ico" +Icon "mea\guh-logo.ico" outFile "mea-installer.exe" !include LogicLib.nsh