From a106d380a2b76eeb5426a9269c456071ff955dfd Mon Sep 17 00:00:00 2001
From: Bumsik Kim <kbumsik@gmail.com>
Date: Thu, 31 May 2018 01:25:18 -0400
Subject: [PATCH] Moved  qml folder to assets

---
 setup.py                                        | 4 ++--
 virtscreen/{qml => assets}/AppWindow.qml        | 0
 virtscreen/{qml => assets}/DisplayPage.qml      | 0
 virtscreen/{qml => assets}/VncPage.qml          | 0
 virtscreen/{data => assets}/config.default.json | 0
 virtscreen/{qml => assets}/data.json            | 2 +-
 virtscreen/{qml => assets}/main.qml             | 0
 virtscreen/{qml => assets}/preferenceDialog.qml | 0
 virtscreen/virtscreen.py                        | 8 ++++----
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename virtscreen/{qml => assets}/AppWindow.qml (100%)
 rename virtscreen/{qml => assets}/DisplayPage.qml (100%)
 rename virtscreen/{qml => assets}/VncPage.qml (100%)
 rename virtscreen/{data => assets}/config.default.json (100%)
 rename virtscreen/{qml => assets}/data.json (94%)
 rename virtscreen/{qml => assets}/main.qml (100%)
 rename virtscreen/{qml => assets}/preferenceDialog.qml (100%)

diff --git a/setup.py b/setup.py
index e53f184..ae63654 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.1.3',  # Required
+    version='0.2.0',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:
@@ -169,7 +169,7 @@ setup(
     # If using Python 2.6 or earlier, then these have to be included in
     # MANIFEST.in as well.
     package_data={
-        'virtscreen': ['icon/*.png', 'qml/*.qml', 'data/config.default.json'],
+        'virtscreen': ['icon/*.png', 'assets/*.qml', 'assets/*.json'],
     },
 
     # Although 'package_data' is the preferred approach, in some case you may
diff --git a/virtscreen/qml/AppWindow.qml b/virtscreen/assets/AppWindow.qml
similarity index 100%
rename from virtscreen/qml/AppWindow.qml
rename to virtscreen/assets/AppWindow.qml
diff --git a/virtscreen/qml/DisplayPage.qml b/virtscreen/assets/DisplayPage.qml
similarity index 100%
rename from virtscreen/qml/DisplayPage.qml
rename to virtscreen/assets/DisplayPage.qml
diff --git a/virtscreen/qml/VncPage.qml b/virtscreen/assets/VncPage.qml
similarity index 100%
rename from virtscreen/qml/VncPage.qml
rename to virtscreen/assets/VncPage.qml
diff --git a/virtscreen/data/config.default.json b/virtscreen/assets/config.default.json
similarity index 100%
rename from virtscreen/data/config.default.json
rename to virtscreen/assets/config.default.json
diff --git a/virtscreen/qml/data.json b/virtscreen/assets/data.json
similarity index 94%
rename from virtscreen/qml/data.json
rename to virtscreen/assets/data.json
index 09cc80b..64cfe17 100644
--- a/virtscreen/qml/data.json
+++ b/virtscreen/assets/data.json
@@ -2,7 +2,7 @@
     "version": "0.2",
     "x11vncOptions": {
         "-ncache": {
-            "description": "Cache",
+            "description": "Client side caching",
             "long_description": "Enables cache"
         },
         "-multiptr": {
diff --git a/virtscreen/qml/main.qml b/virtscreen/assets/main.qml
similarity index 100%
rename from virtscreen/qml/main.qml
rename to virtscreen/assets/main.qml
diff --git a/virtscreen/qml/preferenceDialog.qml b/virtscreen/assets/preferenceDialog.qml
similarity index 100%
rename from virtscreen/qml/preferenceDialog.qml
rename to virtscreen/assets/preferenceDialog.qml
diff --git a/virtscreen/virtscreen.py b/virtscreen/virtscreen.py
index dffe1f4..a055593 100755
--- a/virtscreen/virtscreen.py
+++ b/virtscreen/virtscreen.py
@@ -45,11 +45,11 @@ X11VNC_LOG_PATH = HOME_PATH + "/x11vnc_log.txt"
 X11VNC_PASSWORD_PATH = HOME_PATH + "/x11vnc_passwd"
 CONFIG_PATH = HOME_PATH + "/config.json"
 # Path in the program path
-DEFAULT_CONFIG_PATH = BASE_PATH + "/data/config.default.json"
 ICON_PATH = BASE_PATH + "/icon/icon.png"
-QML_PATH = BASE_PATH + "/qml"
-DATA_PATH = QML_PATH + "/data.json"
-MAIN_QML_PATH = QML_PATH + "/main.qml"
+ASSETS_PATH = BASE_PATH + "/assets"
+DATA_PATH = ASSETS_PATH + "/data.json"
+DEFAULT_CONFIG_PATH = ASSETS_PATH + "/config.default.json"
+MAIN_QML_PATH = ASSETS_PATH + "/main.qml"
 
 
 # -------------------------------------------------------------------------------