From 318c9c942df5ced0a351a612a020b70af74a5b93 Mon Sep 17 00:00:00 2001
From: ingvar1995 <igorn1995@yandex.ru>
Date: Tue, 7 Aug 2018 00:41:27 +0300
Subject: [PATCH] ngc bug fixes

---
 build/build.sh                  |  1 +
 toxygen/app.py                  | 12 ++++++++----
 toxygen/history/history.py      |  2 +-
 toxygen/ui/peer_screen.py       |  2 +-
 toxygen/ui/views/peer_screen.ui |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index b415054..522d6b2 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+cd ~
 git clone https://github.com/toxygen-project/toxygen.git --branch=next_gen
 cd toxygen/toxygen
 
diff --git a/toxygen/app.py b/toxygen/app.py
index 80c26ea..cfdac4f 100644
--- a/toxygen/app.py
+++ b/toxygen/app.py
@@ -123,10 +123,14 @@ class App:
         if self._settings['theme'] == 'dark':
             return
         for theme in self._settings.built_in_themes().keys():
-            if self._settings['theme'] == theme:
-                with open(util.curr_directory(__file__) + self._settings.built_in_themes()[theme]) as fl:
-                    style = fl.read()
-                self._app.setStyleSheet(style)
+            if self._settings['theme'] != theme:
+                continue
+            theme_path = self._settings.built_in_themes()[theme]
+            file_path = util.join_path(util.get_styles_directory(), theme_path)
+            with open(file_path) as fl:
+                style = fl.read()
+            self._app.setStyleSheet(style)
+            break
 
     def _load_login_screen_translations(self):
         current_language, supported_languages = self._get_languages()
diff --git a/toxygen/history/history.py b/toxygen/history/history.py
index e6f5e44..c430117 100644
--- a/toxygen/history/history.py
+++ b/toxygen/history/history.py
@@ -68,7 +68,7 @@ class History:
         messages.reverse()
         messages = messages[self._messages.count():self._messages.count() + PAGE_SIZE]
         for message in messages:
-            if message.get_type() in (MESSAGE_TYPE['NORMAL'], MESSAGE_TYPE['ACTION']):  # text message
+            if message.get_type() in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):  # text message
                 self._create_message_item(message)
             elif message.get_type() == MESSAGE_TYPE['FILE_TRANSFER']:  # file transfer
                 if message.get_status() is None:
diff --git a/toxygen/ui/peer_screen.py b/toxygen/ui/peer_screen.py
index 687c818..acc93ee 100644
--- a/toxygen/ui/peer_screen.py
+++ b/toxygen/ui/peer_screen.py
@@ -105,6 +105,6 @@ class PeerScreen(CenteredWidget):
     def _get_ban_type(self):
         if self.ipBanRadioButton.isChecked():
             return consts.TOX_GROUP_BAN_TYPE['IP_PORT']
-        elif self.nickRadioButton.isCHecked():
+        elif self.nickBanRadioButton.isChecked():
             return consts.TOX_GROUP_BAN_TYPE['NICK']
         return consts.TOX_GROUP_BAN_TYPE['PUBLIC_KEY']
diff --git a/toxygen/ui/views/peer_screen.ui b/toxygen/ui/views/peer_screen.ui
index a66ec11..e8e9e31 100644
--- a/toxygen/ui/views/peer_screen.ui
+++ b/toxygen/ui/views/peer_screen.ui
@@ -105,7 +105,7 @@
      <bool>true</bool>
     </property>
    </widget>
-   <widget class="QRadioButton" name="nickRadioButton">
+   <widget class="QRadioButton" name="nickBanRadioButton">
     <property name="geometry">
      <rect>
       <x>40</x>