From 59296dd22c4863335d58788419fc0674f5b6c95d Mon Sep 17 00:00:00 2001 From: miruka Date: Tue, 10 Mar 2020 10:31:26 -0400 Subject: [PATCH] Change name and bump version --- .gitignore | 4 ++-- .gitmodules | 4 ++++ README.md | 8 ++++---- TODO.md | 3 +-- live-reload.sh | 6 +++--- harmonyqml.pro => mirage.pro | 2 +- src/backend/__init__.py | 6 +++--- src/main.cpp | 8 ++++---- 8 files changed, 22 insertions(+), 19 deletions(-) rename harmonyqml.pro => mirage.pro (98%) diff --git a/.gitignore b/.gitignore index 0cc4b4dc..890a3cbf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ build dist .qmake.stash Makefile -harmonyqml -harmonyqml.pro.user +mirage +mirage.pro.user tags diff --git a/.gitmodules b/.gitmodules index 4c6e05fb..7b00531f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,19 @@ [submodule "submodules/qsyncable"] path = submodules/qsyncable url = https://github.com/benlau/qsyncable + [submodule "submodules/RadialBarDemo"] path = submodules/RadialBarDemo url = https://github.com/mirukan/RadialBarDemo/ + [submodule "submodules/hsluv-c"] path = submodules/hsluv-c url = https://github.com/hsluv/hsluv-c + [submodule "submodules/gel"] path = submodules/gel url = https://github.com/Cutehacks/gel + [submodule "submodules/SortFilterProxyModel"] path = submodules/SortFilterProxyModel url = https://github.com/oKcerG/SortFilterProxyModel diff --git a/README.md b/README.md index 81cc651e..40950490 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# harmonyqml +# Mirage ## Dependencies setup @@ -50,10 +50,10 @@ Optional dependency for performance improvements: ## Building git clone --recursive - cd harmonyqml - qmake harmonyqml.pro && make && sudo make install + cd mirage + qmake mirage.pro && make && sudo make install -After this if no errors happened, run `harmonyqml`. +After this if no errors happened, run `mirage`. If you get a version mismatch error related to cffi, try: diff --git a/TODO.md b/TODO.md index 969622ef..bb52b3ec 100644 --- a/TODO.md +++ b/TODO.md @@ -3,8 +3,7 @@ ## Before release - nio ClientTimeout -- Default theme? -- Name +- Config file format? - Update docstrings - Update TODO.md - Update README.md diff --git a/live-reload.sh b/live-reload.sh index c09da742..3039d176 100755 --- a/live-reload.sh +++ b/live-reload.sh @@ -9,12 +9,12 @@ export QT_QPA_PLATFORM=xcb make clean -qmake harmonyqml.pro CONFIG+=dev && make +qmake mirage.pro CONFIG+=dev && make while true; do - find src harmonyqml.pro -type f | + find src mirage.pro -type f | # -name affects the first part of the WM_CLASS returned by xprop on Linux entr -cdnr sh -c \ - "qmake harmonyqml.pro CONFIG+=dev && make && ./harmonyqml -name dev $*" + "qmake mirage.pro CONFIG+=dev && make && ./mirage -name dev $*" sleep 0.2 done diff --git a/harmonyqml.pro b/mirage.pro similarity index 98% rename from harmonyqml.pro rename to mirage.pro index 21290de6..7646f47e 100644 --- a/harmonyqml.pro +++ b/mirage.pro @@ -18,7 +18,7 @@ HEADERS += src/utils.h src/clipboard.h \ SOURCES += src/main.cpp src/utils.cpp src/clipboard.cpp \ submodules/RadialBarDemo/radialbar.cpp \ submodules/hsluv-c/src/hsluv.c -TARGET = harmonyqml +TARGET = mirage # Custom CONFIG options diff --git a/src/backend/__init__.py b/src/backend/__init__.py index 31a4c35c..92f9bf58 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -2,6 +2,6 @@ """This package provides a Python backend accessible from the QML UI side.""" -__app_name__ = "harmonyqml" -__display_name__ = "Harmony QML" -__version__ = "0.3.0" +__app_name__ = "mirage" +__display_name__ = "Mirage" +__version__ = "0.4.0" diff --git a/src/main.cpp b/src/main.cpp index 12004440..3c1aae8f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,10 +17,10 @@ int main(int argc, char *argv[]) { // Define some basic info about the app before creating the QApplication - QApplication::setOrganizationName("harmonyqml"); - QApplication::setApplicationName("harmonyqml"); - QApplication::setApplicationDisplayName("HarmonyQML"); - QApplication::setApplicationVersion("0.3.0"); + QApplication::setOrganizationName("mirage"); + QApplication::setApplicationName("mirage"); + QApplication::setApplicationDisplayName("Mirage"); + QApplication::setApplicationVersion("0.4.0"); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv);