From 138135b9e9e871fd46be06cafd6593100be32345 Mon Sep 17 00:00:00 2001
From: SHooZ <SHooZ@ex.ua>
Date: Tue, 2 May 2017 02:59:24 +0300
Subject: [PATCH 1/4] Add ability to change theme

---
 MANIFEST.in                                  |  4 ++--
 toxygen/main.py                              | 15 ++++++++++-----
 toxygen/menu.py                              | 15 +++++++++++----
 toxygen/settings.py                          |  9 ++++++++-
 toxygen/styles/{style.qss => dark_style.qss} |  0
 toxygen/styles/style.qrc                     |  2 +-
 6 files changed, 32 insertions(+), 13 deletions(-)
 rename toxygen/styles/{style.qss => dark_style.qss} (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9bf65b8..a4e17a3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,9 +12,9 @@ include toxygen/smileys/starwars/*.png
 include toxygen/smileys/starwars/config.json
 include toxygen/smileys/ksk/*.png
 include toxygen/smileys/ksk/config.json
-include toxygen/styles/style.qss
+include toxygen/styles/*.qss
 include toxygen/translations/*.qm
 include toxygen/libs/libtox.dll
 include toxygen/libs/libsodium.a
 include toxygen/libs/libtox64.dll
-include toxygen/libs/libsodium64.a
\ No newline at end of file
+include toxygen/libs/libsodium64.a
diff --git a/toxygen/main.py b/toxygen/main.py
index c9ab9cf..ea858d4 100644
--- a/toxygen/main.py
+++ b/toxygen/main.py
@@ -59,11 +59,6 @@ class Toxygen:
         if platform.system() == 'Linux':
             QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
 
-        # application color scheme
-        with open(curr_directory() + '/styles/style.qss') as fl:
-            dark_style = fl.read()
-        app.setStyleSheet(dark_style)
-
         encrypt_save = toxes.ToxES()
 
         if self.path is not None:
@@ -185,6 +180,16 @@ class Toxygen:
         else:
             settings.set_active_profile()
 
+        # application color scheme
+        for theme in settings.built_in_themes().keys():
+            if settings['theme'] == theme:
+                try:
+                    with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
+                        style = fl.read()
+                    app.setStyleSheet(style)
+                except IsADirectoryError:
+                    app.setStyleSheet('') # for default style
+
         lang = Settings.supported_languages()[settings['language']]
         translator = QtCore.QTranslator()
         translator.load(curr_directory() + '/translations/' + lang)
diff --git a/toxygen/menu.py b/toxygen/menu.py
index 1fe22cb..8488578 100644
--- a/toxygen/menu.py
+++ b/toxygen/menu.py
@@ -581,11 +581,10 @@ class InterfaceSettings(CenteredWidget):
         self.label.setFont(font)
         self.themeSelect = QtGui.QComboBox(self)
         self.themeSelect.setGeometry(QtCore.QRect(30, 40, 120, 30))
-        list_of_themes = ['dark']
-        self.themeSelect.addItems(list_of_themes)
+        self.themeSelect.addItems(list(settings.built_in_themes().keys()))
         theme = settings['theme']
-        if theme in list_of_themes:
-            index = list_of_themes.index(theme)
+        if theme in settings.built_in_themes().keys():
+            index = list(settings.built_in_themes().keys()).index(theme)
         else:
             index = 0
         self.themeSelect.setCurrentIndex(index)
@@ -726,6 +725,14 @@ class InterfaceSettings(CenteredWidget):
     def closeEvent(self, event):
         settings = Settings.get_instance()
         settings['theme'] = str(self.themeSelect.currentText())
+        try:
+            theme = settings['theme']
+            app = QtGui.QApplication.instance()
+            with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
+                style = fl.read()
+            app.setStyleSheet(style)
+        except IsADirectoryError:
+            app.setStyleSheet('') # for default style
         settings['smileys'] = self.smileys.isChecked()
         restart = False
         if settings['mirror_mode'] != self.mirror_mode.isChecked():
diff --git a/toxygen/settings.py b/toxygen/settings.py
index 5fdca64..ca15d3e 100644
--- a/toxygen/settings.py
+++ b/toxygen/settings.py
@@ -99,7 +99,7 @@ class Settings(dict, Singleton):
         Default profile settings
         """
         return {
-            'theme': 'default',
+            'theme': 'dark',
             'ipv6_enabled': True,
             'udp_enabled': True,
             'proxy_type': 0,
@@ -152,6 +152,13 @@ class Settings(dict, Singleton):
             'Ukrainian': 'uk_UA'
         }
 
+    @staticmethod
+    def built_in_themes():
+        return {
+            'dark': '/styles/dark_style.qss',
+            'default': ''
+        }
+
     def upgrade(self):
         default = Settings.get_default_settings()
         for key in default:
diff --git a/toxygen/styles/style.qss b/toxygen/styles/dark_style.qss
similarity index 100%
rename from toxygen/styles/style.qss
rename to toxygen/styles/dark_style.qss
diff --git a/toxygen/styles/style.qrc b/toxygen/styles/style.qrc
index ac14bc5..9759a62 100644
--- a/toxygen/styles/style.qrc
+++ b/toxygen/styles/style.qrc
@@ -41,6 +41,6 @@
     <file>rc/radio_unchecked.png</file>
   </qresource>
   <qresource prefix="qdarkstyle">
-      <file>style.qss</file>
+      <file>dark_style.qss</file>
   </qresource>
 </RCC>

From 9118e0177541b4b7f63386ea4ff8512f81c6746b Mon Sep 17 00:00:00 2001
From: SHooZ <SHooZ@ex.ua>
Date: Tue, 2 May 2017 20:59:27 +0300
Subject: [PATCH 2/4] Set dark style as default in load screen

---
 toxygen/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toxygen/main.py b/toxygen/main.py
index ea858d4..8d2cee9 100644
--- a/toxygen/main.py
+++ b/toxygen/main.py
@@ -59,6 +59,10 @@ class Toxygen:
         if platform.system() == 'Linux':
             QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
 
+        with open(curr_directory() + '/styles/dark_style.qss') as fl:
+            style = fl.read()
+        app.setStyleSheet(style)
+
         encrypt_save = toxes.ToxES()
 
         if self.path is not None:

From 89caef69056ef52545bf92da2888609eecf52d6a Mon Sep 17 00:00:00 2001
From: SHooZ <SHooZ@ex.ua>
Date: Wed, 3 May 2017 18:43:22 +0300
Subject: [PATCH 3/4] Edit default avatar image for light themes compatibility

---
 toxygen/images/avatar.png | Bin 4013 -> 5848 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/toxygen/images/avatar.png b/toxygen/images/avatar.png
index 91d12009d026a8eed973cf9c82e7f951b452842c..83ac75787a06d910f1180218eecfd2125ffa70d4 100755
GIT binary patch
delta 5827
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
N002ovPDHLkV1mQP3#0%5

literal 4013
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
TFB}w{00000NkvXXu0mjf`-5!P


From 124decc34ab724528e6ac4d081c19c3b4738a68f Mon Sep 17 00:00:00 2001
From: SHooZ <SHooZ@ex.ua>
Date: Wed, 3 May 2017 19:42:37 +0300
Subject: [PATCH 4/4] Add padding for search field and contacts nicknames in
 default theme

---
 toxygen/main.py          | 9 +++------
 toxygen/settings.py      | 2 +-
 toxygen/styles/style.qrc | 3 +++
 toxygen/styles/style.qss | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 toxygen/styles/style.qss

diff --git a/toxygen/main.py b/toxygen/main.py
index 8d2cee9..44e6cbe 100644
--- a/toxygen/main.py
+++ b/toxygen/main.py
@@ -187,12 +187,9 @@ class Toxygen:
         # application color scheme
         for theme in settings.built_in_themes().keys():
             if settings['theme'] == theme:
-                try:
-                    with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
-                        style = fl.read()
-                    app.setStyleSheet(style)
-                except IsADirectoryError:
-                    app.setStyleSheet('') # for default style
+                with open(curr_directory() + settings.built_in_themes()[theme]) as fl:
+                    style = fl.read()
+                app.setStyleSheet(style)
 
         lang = Settings.supported_languages()[settings['language']]
         translator = QtCore.QTranslator()
diff --git a/toxygen/settings.py b/toxygen/settings.py
index ca15d3e..6edce36 100644
--- a/toxygen/settings.py
+++ b/toxygen/settings.py
@@ -156,7 +156,7 @@ class Settings(dict, Singleton):
     def built_in_themes():
         return {
             'dark': '/styles/dark_style.qss',
-            'default': ''
+            'default': '/styles/style.qss'
         }
 
     def upgrade(self):
diff --git a/toxygen/styles/style.qrc b/toxygen/styles/style.qrc
index 9759a62..7ceed90 100644
--- a/toxygen/styles/style.qrc
+++ b/toxygen/styles/style.qrc
@@ -43,4 +43,7 @@
   <qresource prefix="qdarkstyle">
       <file>dark_style.qss</file>
   </qresource>
+  <qresource prefix="defaultstyle">
+      <file>style.qss</file>
+  </qresource>
 </RCC>
diff --git a/toxygen/styles/style.qss b/toxygen/styles/style.qss
new file mode 100644
index 0000000..11beeb5
--- /dev/null
+++ b/toxygen/styles/style.qss
@@ -0,0 +1,4 @@
+#contact_name
+{
+    padding-left: 22px;
+}