Merge pull request #550 from subutai-io/dev

Dev
subutai-io · Jan 19, 2018 · 8bb2fa7 · 8bb2fa7
2 parents abf3fd0 + b8d8d9e
commit 8bb2fa7
Show file tree

Hide file tree

Showing 21 changed files with 2,180 additions and 1,076 deletions.
diff --git a/SubutaiTray.pro b/SubutaiTray.pro
@@ -56,7 +56,8 @@ SOURCES += \
     hub/src/DlgEnvironment.cpp \
     hub/src/P2PController.cpp \
     hub/src/X2GoClient.cpp \
-    hub/src/DlgPeer.cpp
+    hub/src/DlgPeer.cpp \
+    hub/src/TraySkinController.cpp
 
 
 
@@ -99,7 +100,8 @@ HEADERS  += \
     hub/include/DlgEnvironment.h \
     hub/include/P2PController.h \
     hub/include/X2GoClient.h \
-    hub/include/DlgPeer.h
+    hub/include/DlgPeer.h \
+    hub/include/TraySkinController.h
 
 TRANSLATIONS = SubutaiTray_en_US.ts \
                SubutaiTray_ru_RU.ts \
@@ -117,7 +119,8 @@ FORMS    += \
     hub/forms/DlgPeer.ui
 
 RESOURCES += \
-    resources/resources.qrc
+    resources/resources.qrc \
+    skins/skins.qrc
 
 unix: {
   TRAY_VERSION = $$system(cat version)