From bed5581187b6c3f50ba64b2fb1a5c3de2daf28a6 Mon Sep 17 00:00:00 2001
From: BuildTools <Jasprose@protonmail.com>
Date: Fri, 9 Apr 2021 01:14:54 +0200
Subject: [PATCH] Theme changes, mostly.

---
 CHANGELOG.md                  |  5 +++++
 TODO.md                       |  1 -
 oyoyo/client.py               |  6 +++---
 pesterchum.py                 | 38 +++++++++++++++++++++++++++--------
 profile.py                    |  6 +++---
 themes/gold/style.js          |  3 ++-
 themes/pesterchum/style.js    |  3 ++-
 themes/pesterchum2.5/style.js |  2 +-
 themes/trollian/style.js      |  3 ++-
 9 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb1f66..f834085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 
 ## [v2.1.0] - 2021-4-4
 
+### Fixed
+- Fixed current mood icon not showing up.
+- Fixed "CHUMHANDLE:" not fitting on some themes.
+- Fixed console capitalization.
+
 ### Added
 - Server prompt
 
diff --git a/TODO.md b/TODO.md
index ddcd270..58f3b94 100644
--- a/TODO.md
+++ b/TODO.md
@@ -8,7 +8,6 @@
 - Any remaining unicode-related crashes.
 - Exclude unnecessary imports for builds.
 - Icon is crusty...?
-- Mood doesn't show up next to handle
 - "CHUMHANDLE" is cut off on pchum2.5 theme.
 - Mask & target not being passed to ``_max_msg_len``.
 - No error message when Pesterchum fails to join a channel. (For example, when the channel name length is over CHANNELLEN)
diff --git a/oyoyo/client.py b/oyoyo/client.py
index 0fa2a62..33832eb 100644
--- a/oyoyo/client.py
+++ b/oyoyo/client.py
@@ -92,7 +92,7 @@ class IRCClient:
                 server_file.close()
                 server_obj = json.loads(read_file)
             TLS = server_obj['TLS']
-            print("TLS-status is: " + str(TLS))
+            #print("TLS-status is: " + str(TLS))
             if TLS == False:
                 #print("false")
                 self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -103,7 +103,7 @@ class IRCClient:
                 self.bare_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 self.socket = self.context.wrap_socket(self.bare_socket)
         except:
-            print("TLS except.")
+            #print("TLS except.")
             self.context = ssl.create_default_context()
             self.context.check_hostname = False
             self.context.verify_mode = ssl.CERT_NONE
@@ -258,7 +258,7 @@ class IRCClient:
         # Why does this only work 33% of the time </3
 
         # Somehow, kinda fixed :')
-        print("QUIT")
+        logging.info("QUIT")
         self.socket.send(bytes(msg + "\n", "UTF-8"))
         
 class IRCApp:
diff --git a/pesterchum.py b/pesterchum.py
index 5f775a5..1cc38e7 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -1156,11 +1156,18 @@ class PesterWindow(MovingWindow):
         self.menu.setNativeMenuBar(False)
         self.menu.setObjectName("mainmenu")
 
-        self.console = AttrDict(dict(
-            window = None,
-            action = QtWidgets.QAction("Console".upper(), self),
-            is_open = False
-            ))
+        if self.theme.has_key("main/menus/client/console"):
+            self.console = AttrDict(dict(
+                window = None,
+                action = QtWidgets.QAction(self.theme["main/menus/client/console"], self),
+                is_open = False
+                ))
+        else:
+            self.console = AttrDict(dict(
+                window = None,
+                action = QtWidgets.QAction("Console", self),
+                is_open = False
+                ))
         self.console.shortcuts = AttrDict(dict(
             conkey = QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+`"), self,
                 context=QtCore.Qt.ApplicationShortcut),
@@ -1266,8 +1273,8 @@ class PesterWindow(MovingWindow):
 
         self.moodsLabel = QtWidgets.QLabel(self.theme["main/moodlabel/text"], self)
         self.moodsLabel.setObjectName("moodlabel")
-
-        self.mychumhandleLabel = QtWidgets.QLabel(self.theme["main/mychumhandle/label/text"], self)
+        # Padding so it fits. I, don't know how to fix this properly :/
+        self.mychumhandleLabel = QtWidgets.QLabel(self.theme["main/mychumhandle/label/text"] + "     ", self)
         self.mychumhandleLabel.setObjectName("myhandlelabel")
         self.mychumhandle = QtWidgets.QPushButton(self.profile().handle, self)
         self.mychumhandle.setFlat(True)
@@ -1282,6 +1289,8 @@ class PesterWindow(MovingWindow):
 
         self.initTheme(self.theme)
 
+        #self.mychumhandleLabel.setStyleSheet("QLabel {);};")
+
         self.hide()
         
         self.waitingMessages = waitingMessageHolder(self)
@@ -1710,6 +1719,17 @@ class PesterWindow(MovingWindow):
         self.nickServAction.setText(self.theme["main/menus/help/nickserv"])
         self.helpmenu.setTitle(self.theme["main/menus/help/_name"])
 
+        # Console
+##        if self.theme.has_key("main/menus/client/console"):
+##            self.console.action.setText(self.theme["main/menus/client/console"])
+##        else:
+##            self.console.action.setText("Console")
+        # has_key doesn't work out here for some reason, possibly because of inherits?
+        try:
+            self.console.action.setText(self.theme["main/menus/client/console"])
+        except:
+            self.console.action.setText("Console")
+
         # moods
         self.moodsLabel.setText(theme["main/moodlabel/text"])
         self.moodsLabel.move(*theme["main/moodlabel/loc"])
@@ -1755,7 +1775,9 @@ class PesterWindow(MovingWindow):
         self.mychumcolor.resize(*theme["main/mychumhandle/colorswatch/size"])
         self.mychumcolor.move(*theme["main/mychumhandle/colorswatch/loc"])
         self.mychumcolor.setStyleSheet("background: %s" % (self.profile().colorhtml()))
-        if "main/mychumhandle/currentMood" in self.theme:
+        # I don't know why "if "main/mychumhandle/currentMood" in self.theme:" doesn't work,
+        # But this seems to work just as well :3c
+        if self.theme.has_key("main/mychumhandle/currentMood"):
             moodicon = self.profile().mood.icon(theme)
             if hasattr(self, 'currentMoodIcon') and self.currentMoodIcon:
                 self.currentMoodIcon.hide()
diff --git a/profile.py b/profile.py
index 0202850..fd2f41e 100644
--- a/profile.py
+++ b/profile.py
@@ -299,7 +299,7 @@ class userConfig(object):
                 server_file.close()
                 server_obj = json.loads(read_file)
             server = str(server_obj['server'])
-            print("Server is: " + server)
+            #print("Server is: " + server)
             return server
         except:
             try:
@@ -312,7 +312,7 @@ class userConfig(object):
                     server_file.write(json.dumps(json_server_file, indent = 4) )
                     server_file.close()
                 server = "irc.pesterchum.xyz"
-                print("Failed to read server, defaulting to irc.pesterchum.xyz")
+                #print("Failed to read server, defaulting to irc.pesterchum.xyz")
             except:
                 return self.config.get('server', "irc.pesterchum.xyz")
     def port(self):
@@ -324,7 +324,7 @@ class userConfig(object):
                 server_file.close()
                 server_obj = json.loads(read_file)
             port = str(server_obj['port'])
-            print("Port is: " + port)
+            #print("Port is: " + port)
             return port
         except:
             return self.config.get('port', '6697')
diff --git a/themes/gold/style.js b/themes/gold/style.js
index cd17bc0..88d8633 100755
--- a/themes/gold/style.js
+++ b/themes/gold/style.js
@@ -29,7 +29,8 @@
                        "import": "Import",
                        "reconnect": "Reconnect",
                        "idle": "Idle",
-                       "exit": "Exit"},
+                       "exit": "Exit",
+					   "console": "Console"},
             "profile": {"_name": "Profile",
                         "switch": "Switch",
                         "color": "Color",
diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js
index 33ff6f3..5360ab3 100755
--- a/themes/pesterchum/style.js
+++ b/themes/pesterchum/style.js
@@ -30,7 +30,8 @@
                        "import": "IMPORT",
                        "reconnect": "RECONNECT",
                        "idle": "IDLE",
-                       "exit": "EXIT"},
+                       "exit": "EXIT",
+					   "console": "CONSOLE"},
             "profile": {"_name": "PROFILE",
                         "switch": "SWITCH",
                         "color": "COLOR",
diff --git a/themes/pesterchum2.5/style.js b/themes/pesterchum2.5/style.js
index 83c3863..2406676 100755
--- a/themes/pesterchum2.5/style.js
+++ b/themes/pesterchum2.5/style.js
@@ -20,7 +20,7 @@
   "mychumhandle": { "label":
                     { "text": "CHUMHANDLE:",
                       "loc": [12,415],
-                      "style": "color: black ;font:bold; font-family: 'Courier';"
+                      "style": "color: black; font:bold; font-family: 'Courier';"
                     },
                     "handle": { "loc": [15,435],
                                 "size": [240, 25],
diff --git a/themes/trollian/style.js b/themes/trollian/style.js
index 7e72a0b..ae7c9e9 100755
--- a/themes/trollian/style.js
+++ b/themes/trollian/style.js
@@ -28,7 +28,8 @@
                        "import": "import U2;",
                        "reconnect": "Reconnect",
                        "idle": "Idle",
-                       "exit": "Abscond"},
+                       "exit": "Abscond",
+					   "console": "Console"},
             "profile": {"_name": "View",
                         "switch": "Trolltag",
                         "theme": "Theme",