Merge remote-tracking branch 'upstream/master'

Conflicts:
	memos.py

CHANGELOG.mkdn

@@ -56,6 +56,7 @@ CHANGELOG
 * Remote quirk shutoff in memos - Kiooeht [evacipatedBox]
 * Compress exit dumps into one line - Kiooeht [evacipatedBox] (Idea: Lexi [lexicalNuance])
 * Display channel mode change message - Kiooeht [evacipatedBox]
+* Disable quirks in +c memos - Lexi [lexicalNuance]
 * Bug fixes
     * Logviewer updates - Kiooeht [evacipatedBox]
     * Memo scrollbar thing - Kiooeht [evacipatedBox]
@@ -76,6 +77,9 @@ CHANGELOG
     * Don't delete random chum when blocking someone not on chumroll - Kiooeht [evacipatedBox]
     * Openning global userlist doesn't reset OP status of memo users - Kiooeht [evacipatedBox]
     * Alt characters don't break on random replace - Kiooeht [evacipatedBox]
+    * Trollian 2.5 tray icon is now Trollian icon - Kiooeht [evacipatedBox]
+* Mac Bug fixes
+    * Create all datadir stuff - Lexi [lexicalNuance]
 
 ### 3.14.1
 * Pesterchum 3.14 - illuminatedwax [ghostDunk]

dataobjs.py

@@ -280,6 +280,10 @@ class PesterProfile(object):
         else:      modeon = "no longer"
         return "<c=%s>Memo is %s <c=black>%s</c> by <c=%s>%s</c></c>" % \
             (syscolor.name(), modeon, modeverb, opchum.colorhtml(), opinit)
+    def memoquirkkillmsg(self, opchum, opgrammar, syscolor):
+        opinit = opgrammar.pcf+opchum.initials()+opgrammar.number
+        return "<c=%s><c=%s>%s</c> turned off you quirk.</c>" % \
+            (syscolor.name(), opchum.colorhtml(), opinit)
 
     @staticmethod
     def checkLength(handle):

irc.py

@@ -341,7 +341,7 @@ class PesterHandler(DefaultCommandHandler):
             handle = nick[0:nick.find("!")]
             logging.info("---> recv \"CTCP %s :%s\"" % (handle, msg[1:-1]))
             if msg[1:-1] == "VERSION":
-                helpers.ctcp_reply(self.parent.cli, handle, "VERSION", "Pesterchum %s\x01" % (_pcVersion))
+                helpers.ctcp_reply(self.parent.cli, handle, "VERSION", "Pesterchum %s" % (_pcVersion))
             elif msg[1:-1].startswith("NOQUIRKS") and chan[0] == "#":
                 op = nick[0:nick.find("!")]
                 self.parent.quirkDisable.emit(chan, msg[10:-1], op)

memos.py

@@ -374,7 +374,7 @@ class PesterMemo(PesterConvo):
         self.voiceAction = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/voiceuser"], self)
         self.connect(self.voiceAction, QtCore.SIGNAL('triggered()'),
                      self, QtCore.SLOT('voiceSelectedUser()'))
-        self.quirkDisableAction = QtGui.QAction("Kill Quirk", self)
+        self.quirkDisableAction = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/quirkkill"], self)
         self.connect(self.quirkDisableAction, QtCore.SIGNAL('triggered()'),
                      self, QtCore.SLOT('killQuirkUser()'))
         self.userlist.optionsMenu.addAction(self.addchumAction)
@@ -395,20 +395,29 @@ class PesterMemo(PesterConvo):
         self.optionsMenu.addAction(self.logchum)
         self.optionsMenu.addAction(self.invitechum)
 
+<<<<<<< HEAD
         self.chanModeMenu = QtGui.QMenu("Memo Settings", self)
         self.chanNoquirks = QtGui.QAction("Disable Quirks", self)
         self.chanNoquirks.setCheckable(True)
         self.connect(self.chanNoquirks, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('noquirksChan(bool)'))
         self.chanHide = QtGui.QAction("Hidden", self)
+=======
+        self.chanModeMenu = QtGui.QMenu(self.mainwindow.theme["main/menus/rclickchumlist/memosetting"], self)
+        self.chanNoquirks = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memonoquirk"], self)
+        self.chanNoquirks.setCheckable(True)
+        self.connect(self.chanNoquirks, QtCore.SIGNAL('toggled(bool)'),
+                     self, QtCore.SLOT('noquirksChan(bool)'))
+        self.chanHide = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memohidden"], self)
+>>>>>>> upstream/master
         self.chanHide.setCheckable(True)
         self.connect(self.chanHide, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('hideChan(bool)'))
-        self.chanInvite = QtGui.QAction("Invite-Only", self)
+        self.chanInvite = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memoinvite"], self)
         self.chanInvite.setCheckable(True)
         self.connect(self.chanInvite, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('inviteChan(bool)'))
-        self.chanMod = QtGui.QAction("Mute", self)
+        self.chanMod = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memomute"], self)
         self.chanMod.setCheckable(True)
         self.connect(self.chanMod, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('modChan(bool)'))
@@ -546,9 +555,15 @@ class PesterMemo(PesterConvo):
         self.banuserAction.setText(theme["main/menus/rclickchumlist/banuser"])
         self.opAction.setText(theme["main/menus/rclickchumlist/opuser"])
         self.voiceAction.setText(theme["main/menus/rclickchumlist/voiceuser"])
-        self.quirkDisableAction.setText("Kill Quirk")
+        self.quirkDisableAction.setText(theme["main/menus/rclickchumlist/quirkkill"])
         self.quirksOff.setText(theme["main/menus/rclickchumlist/quirksoff"])
         self.logchum.setText(theme["main/menus/rclickchumlist/viewlog"])
+        self.invitechum.setText(theme["main/menus/rclickchumlist/invitechum"])
+        self.chanModeMenu.setTitle(theme["main/menus/rclickchumlist/memosetting"])
+        self.chanNoquirks.setText(theme["main/menus/rclickchumlist/memonoquirk"])
+        self.chanHide.setText(theme["main/menus/rclickchumlist/memohidden"])
+        self.chanInvite.setText(theme["main/menus/rclickchumlist/memoinvite"])
+        self.chanMod.setText(theme["main/menus/rclickchumlist/memomute"])
 
         self.timeinput.setFixedWidth(theme["memos/time/text/width"])
         self.timeinput.setStyleSheet(theme["memos/time/text/style"])
@@ -819,7 +834,22 @@ class PesterMemo(PesterConvo):
                 if msg == self.mainwindow.profile().handle:
                     self.quirksOff.setChecked(True)
                     self.applyquirks = False
+<<<<<<< HEAD
                     # TODO: Politely notify the client
+=======
+                    systemColor = QtGui.QColor(self.mainwindow.theme["memos/systemMsgColor"])
+                    chum = self.mainwindow.profile()
+                    opchum = PesterProfile(op)
+                    if self.times.has_key(op):
+                        opgrammar = self.times[op].getGrammar()
+                    elif op == self.mainwindow.profile().handle:
+                        opgrammar = self.time.getGrammar()
+                    else:
+                        opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
+                    msg = chum.memoquirkkillmsg(opchum, opgrammar, systemColor)
+                    self.textArea.append(convertTags(msg))
+                    self.mainwindow.chatlog.log(self.channel, msg)
+>>>>>>> upstream/master
 
     @QtCore.pyqtSlot(QtCore.QString, QtCore.QString, QtCore.QString)
     def userPresentChange(self, handle, channel, update):

menus.py

@@ -1476,6 +1476,7 @@ class AboutPesterchum(QtGui.QDialog):
         self.credits = QtGui.QLabel("Programming by:\n\
   illuminatedwax (ghostDunk)\n\
   Kiooeht (evacipatedBox)\n\
+  Lexi (lexicalNuance)\n\
   alGore\n\
 \n\
 Art by:\n\
@@ -1485,7 +1486,6 @@ Art by:\n\
 Special Thanks:\n\
   ABT\n\
   gamblingGenocider\n\
-  Lexi (lexicalNuance)\n\
   Eco-Mono")
 
         self.ok = QtGui.QPushButton("OK", self)

parsetools.py

@@ -491,7 +491,10 @@ def themeChecker(theme):
     "main/chums/userlistcolor", "main/defaultwindow/style", \
     "main/chums/moods", "main/chums/moods/chummy/icon", "main/menus/help/help", \
     "main/menus/help/calsprite", "main/menus/help/nickserv", \
-    "main/menus/rclickchumlist/invitechum", "main/menus/client/randen"]
+    "main/menus/rclickchumlist/invitechum", "main/menus/client/randen", \
+    "main/menus/rclickchumlist/memosetting", "main/menus/rclickchumlist/memonoquirk", \
+    "main/menus/rclickchumlist/memohidden", "main/menus/rclickchumlist/memoinvite", \
+    "main/menus/rclickchumlist/memomute"]
 
     for n in needs:
         try:

pesterchum.py

@@ -1713,7 +1713,7 @@ class PesterWindow(MovingWindow):
     @QtCore.pyqtSlot()
     def checkPing(self):
         curtime = int(time())
-        if curtime - self.lastping > 300:
+        if curtime - self.lastping > 600:
             self.pingServer.emit()
 
     def profile(self):
@@ -1972,6 +1972,9 @@ class PesterWindow(MovingWindow):
         self.switch.setText(theme["main/menus/profile/switch"])
         self.profilemenu.setTitle(theme["main/menus/profile/_name"])
         self.aboutAction.setText(self.theme["main/menus/help/about"])
+        self.helpAction.setText(self.theme["main/menus/help/help"])
+        self.botAction.setText(self.theme["main/menus/help/calsprite"])
+        self.nickServAction.setText(self.theme["main/menus/help/nickserv"])
         self.helpmenu.setTitle(self.theme["main/menus/help/_name"])
 
         # moods
@@ -2200,7 +2203,14 @@ class PesterWindow(MovingWindow):
     def deliverNotice(self, handle, msg):
         h = unicode(handle)
         m = unicode(msg)
-        if h == self.randhandler.randNick:
+        if m.startswith("Your nickname is now being changed to"):
+            changedto = m[39:-1]
+            msgbox = QtGui.QMessageBox()
+            msgbox.setText("This chumhandle has been registered; you may not use it.")
+            msgbox.setInformativeText("Your handle is now being changed to %s." % (changedto))
+            msgbox.setStandardButtons(QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel)
+            ret = msgbox.exec_()
+        elif h == self.randhandler.randNick:
             self.randhandler.incoming(msg)
         elif self.convos.has_key(h):
             self.newMessage(h, m)

themes/FRESHjamz/style.js

@@ -23,7 +23,9 @@
                        "options": "Options",
                        "memos": "Memos",
                        "logviewer": "Pesterlogs",
+                       "randen": "Random Encounter",
                        "userlist": "Userlist",
+                       "addgroup": "Add Group",
                        "import": "Import",
                        "reconnect": "Reconnect",
                        "idle": "Idle",
@@ -37,17 +39,29 @@
             "help": { "_name": "Info",
                       "help": "Info",
                       "calsprite": "Calsprite",
+                      "nickserv": "NickServ",
                       "about": "About" },
             "rclickchumlist": {"pester": "Pester",
                                "removechum": "Remove Chum",
-                               "blockchum": "Block",
                                "report": "Report",
+                               "blockchum": "Block",
                                "addchum": "Add Chum",
                                "viewlog": "View Pesterlog",
                                "unblockchum": "Unblock",
+                               "removegroup": "Remove Group",
+                               "renamegroup": "Rename Group",
+                               "movechum": "Move To",
                                "banuser": "Ban",
                                "opuser": "Make OP",
-                               "quirksoff": "Quirks Off" }
+                               "voiceuser": "Give Voice",
+                               "quirkkill": "Kill Quirk",
+                               "quirksoff": "Quirks Off",
+                               "invitechum": "Invite Chump",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute" }
            },
   "chums": { "style": "font-size: 16px; background-image:url($path/chumbg.png); background-color: #414141; background-repeat: no-repeat; font-family: 'Arial'; border: 0px; selection-background-color: #222222; color: #ff168f;",
              "loc": [189, 162],

themes/Scratch/style.js

@@ -21,7 +21,9 @@
                        "options": "Remix",
                        "memos": "Memos",
                        "logviewer": "Pesterlogs",
+                       "randen": "Random Encounter",
                        "userlist": "Cronies",
+                       "addgroup": "New Crew",
                        "import": "Import",
                        "reconnect": "Reconnect",
                        "idle": "Idle",
@@ -35,18 +37,29 @@
             "help": { "_name": "Info",
                       "help": "Info",
                       "calsprite": "Calsprite",
+                      "nickserv": "NickServ",
                       "about": "The Deal" },
             "rclickchumlist": {"pester": "Patronize",
                                "removechum": "Forget",
                                "report": "Tell a Coppa",
                                "blockchum": "Slam",
-							   "report": "Report",
                                "addchum": "Add to Crew",
                                "viewlog": "View Pesterlog",
                                "unblockchum": "Rectify",
+                               "removegroup": "Forget Crew",
+                               "renamegroup": "Rename Crew",
+                               "movechum": "Change Crew",
                                "banuser": "Banish",
                                "opuser": "Hype",
-                               "quirksoff": "Lingo Off" }
+                               "voiceuser": "Let Rap",
+                               "quirkkill": "Kill Quirk",
+                               "quirksoff": "Lingo Off",
+                               "invitechum": "Invite Crew",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute" }
            },
   "chums": { "style": "font-size: 16px; background: black; border: 3px solid white; font-family: 'Arial';selection-background-color:rgb(100,100,100); color: white;",
              "loc": [175, 70],

themes/Teal Trollian/canonchums.txt

@@ -1 +0,0 @@
-["ectoBiologist", "tentacleTherapist", "turntechGodhead", "gardenGnostic", "carcinoGeneticist", "terminallyCapricious", "cuttlefishCuller", "apocalypseArisen", "arachnidsGrip", "gallowsCalibrator", "arsenicCatnip", "adiosToreador", "caligulasAquarium", "centaursTesticle", "grimAuxiliatrix", "twinArmageddons"]

themes/Teal Trollian/moods.txt

@@ -1,35 +0,0 @@
-chummy jade 0
-
-pleasant rose 3
-
-pranky john 5 
-
-smooth dave 6
-
-rancorous karkat 1
-
-ecstatic feferi 7 
-
-relaxed kanaya 8 
-
-discontent tavros 9
-
-devious terezi 10
-
-sleek sollux 11 
-
-detestful eridan 12 
-
-mirthful gamzee 13
-
-manipulative vriska 14
-
-vigorous equius 15
-
-perky nepeta 16
-
-acceptant aradia 17
-
-protective doc scratch 18
-
-offline 2

themes/Teal Trollian/style.js

@@ -1,4 +1,5 @@
-{"main":
+{"inherits": "trollian",
+ "main":
  {"style": "background-color:rgba(0,0,0,0); background-repeat: no-repeat;",
   "background-image": "$path/tnbg2.png",
   "size": [650, 450],
@@ -6,244 +7,14 @@
   "newmsgicon": "$path/trayicon2.png",
   "windowtitle": "TROLLIAN",
   "close": { "image": "$path/x.png",
-             "loc": [635, 2]},
+             "loc": [639, 4]},
   "minimize": { "image": "$path/m.png",
-                "loc": [621, 8]},
-  "menubar": { "style": "font-family: 'Arial'; font-size: 11px; color: rgba(0,0,0,0);" },
-  "menu" : { "style": "font-family: 'Arial'; font-size: 11px; background-color: #c2c2c2; border:1px solid #545454;",
-             "selected": "background-color: #545454",
-             "menuitem": "margin-right:14px;",
-             "loc": [14,90]
+                "loc": [625, 10]},
+  "sounds": { "alertsound": "$path/alarm.wav",
+              "memosound": "$path/alarm2.wav"},
+  "chums": { "scrollbar": { "handle": "background-color:#13cae0;height:20px;border:2px solid #12c4ff;" }
            },
-  "sounds": { "alertsound": "$path/alarm.wav" },
-  "menus": {"client": {"_name": "Trollian",
-                       "options": "Options",
-                       "memos": "Memos",
-                       "userlist": "Fresh Targets",
-                       "import": "import U2;",
-	     "idle": "Idle",
-                       "exit": "Abscond"},
-            "profile": {"_name": "View",
-                        "switch": "Trolltag",
-                        "theme": "Theme",
-                        "color": "Hemospectrum",
-                        "block": "Chumpdump",
-                        "quirks": "Annoying" },
-            "help": { "_name": "Help",
-                      "about": "About" },
-            "rclickchumlist": {"pester": "Troll",
-                               "removechum": "Trash",
-                               "blockchum": "Block",
-                               "addchum": "Add Chump",
-                               "unblockchum": "Mercy",
-                               "banuser": "Ban",
-                               "opuser": "Promote",
-                               "quirksoff": "Quirks Off" }
-           },
-  "chums": { "style": "font-size: 12px; background: white; border:0px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ",
-             "scrollbar": { "style" : "background-color:#c2c2c2;",
-                            "handle": "background-color:#13cae0;height:20px;border:2px solid #12c4ff;",
-                            "downarrow": "",
-                            "darrowstyle": "",
-                            "uparrow": "",
-                            "uarrowstyle": ""
-                          },
-             "loc": [477, 91],
-             "size": [171, 357],
-             "userlistcolor": "black",
-             "moods": {
-                 
-                 "chummy": { "icon": "$path/chummy.png", "color": "#63ea00" },
-                 
-                 "rancorous": { "icon": "$path/rancorous.png", "color": "#7f7f7f" },
-                 
-                 "offline": { "icon": "$path/offline.png", "color": "black"},
-                 
-                 
-                 "pleasant": { "icon": "$path/pleasant.png", "color": "#d69df8" },
-                 
-                 "distraught": { "icon": "$path/distraught.png", "color": "#706eba" },
-                 
-                 "pranky": { "icon": "$path/pranky.png", "color": "blue" },
-                 
-                 
-                 "smooth": { "icon": "$path/smooth.png", "color": "red" },
-                 
-                 
-                 "ecstatic": { "icon": "$path/ecstatic.png", "color": "#99004d" },
-                 
-                 "relaxed": { "icon": "$path/relaxed.png", "color": "#078446" },
-                 
-                 "discontent": { "icon": "$path/discontent.png", "color": "#a75403" },
-                 
-                 "devious": { "icon": "$path/devious.png", "color": "#008282" },
-                 
-                 "sleek": { "icon": "$path/sleek.png", "color": "#a1a100" },
-                 
-                 "detestful": { "icon": "$path/detestful.png", "color": "#6a006a" },
-                 
-                 "mirthful": { "icon": "$path/mirthful.png", "color": "#450077" },
-                 
-                 "manipulative": { "icon": "$path/manipulative.png", "color": "#004182" },
-                 
-                 "vigorous": { "icon": "$path/vigorous.png", "color": "#0021cb" },
-                 
-                 "perky": { "icon": "$path/perky.png", "color": "#406600" },
-                 
-                 "acceptant": { "icon": "$path/acceptant.png", "color": "#a10000" },
-                 
-                 "protective": { "icon": "$path/protective.png", "color": "white" },
-                 
-                 "blocked": { "icon": "$path/blocked.png", "color": "black" }
-                 
-             }
-           },
-  "trollslum": {
-      "style": "background:  rgb(190, 19, 4); font-family: 'Arial'",
-      "size": [175, 461],
-      "label": { "text": "Chumpdump",
-                 "style": "color: rgba(0, 0, 0, 100%) ;font:bold; font-family: 'Arial';border: 0px;" },
-      "chumroll": {"style": "border: 0px; background-color: white; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200); " }
-  },
-  "mychumhandle": { "label": { "text": "",
-                               "loc": [0,0],
-                               "style": "color:rgba(0,0,0,0);" },
-                    "handle": { "style": "background: rgba(0,0,0,0); color:rgba(0,0,0,0);",
-                                "loc": [0,0],
-                                "size": [0,0] },
-                    "colorswatch": { "loc": [0,0],
-                                     "size": [0,0],
-                                     "text": "" }
-                  },
-  "defaultwindow": { "style": "background: #c2c2c2; font-family:'Arial';font:bold;selection-background-color:#545454; "
-                   },
-  "addchum": { "style": "background: rgba(0,0,0,0); border:0px; color: rgba(0,0,0,0);",
-               "loc": [475, 67],
-               "size": [175, 18],
-               "text": ""
-             },
-  "pester": { "style": "background: rgba(0,0,0,0); border:0px; color: rgba(0,0,0,0);",
-              "loc": [0,0],
-              "size": [0, 0],
-              "text": ""
-            },
-  "block": { "style": "background: rgba(0,0,0,0); border:0px; color: rgba(0,0,0,0);",
-             "loc": [1500,202],
-             "size": [71, 22],
-             "text": ""
-           },
-  "defaultmood": 10,
-  "moodlabel": { "style": "",
-                 "loc": [0, 0],
-                 "text": ""
-               },
-  "moods": [
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck1.png); border:0px;",
-        "loc": [25, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 17
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck2.png); border:0px;",
-        "loc": [60, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 9
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck3.png); border:0px;",
-        "loc": [95, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 11
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck4.png); border:0px;",
-        "loc": [130, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 1
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck5.png); border:0px;",
-        "loc": [165, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 16
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck6.png); border:0px;",
-        "loc": [200, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 8
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck7.png); border:0px;",
-        "loc": [235, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 10
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck8.png); border:0px;",
-        "loc": [270, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 14
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck9.png); border:0px;",
-        "loc": [305, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 15
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck10.png); border:0px;",
-        "loc": [340, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 13
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck11.png); border:0px;",
-        "loc": [375, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 12
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck12.png); border:0px;",
-        "loc": [410, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 7
-      },
-      
-      { "style": "border:0px;color: rgba(0, 0, 0, 0%);",
-        "selected": "border:0px; color: rgba(0, 0, 0, 0%);",
-        "loc": [12, 117],
-        "size": [435, 18],
-        "text": "",
-        "icon": "",
-        "mood": 2
-      }
-  ]
+  "defaultmood": 10
  },
  "convo":
  {"style": "background: #04a6be; font-family: 'Arial';",
@@ -251,64 +22,29 @@
   "margins": {"top": 22, "bottom": 9, "left": 10, "right": 4 },
   "size": [400, 250],
   "size": [400, 250],
-  "chumlabel": { "style": "background-image:url($path/chumlabelbg.png);background-color:#12e6ff; background-repeat: no-repeat; color: white; padding: 2px; border:1px solid #c2c2c2; margin-bottom: 4px;",
-                 "align": { "h": "left", "v": "center" },
-                 "minheight": 22,
-                 "maxheight": 36,
-                 "text" : "trolling: $handle"
-               },
-  "textarea": {
-      "style": "background: white; border:2px solid #c2c2c2; font-size: 14px;"
-  },
-  "input": {
-      "style": "background: white;margin-top:5px; border:1px solid #c2c2c2; margin-right: 54px; font-size: 12px; height: 19px;"
+  "chumlabel": { "style": "background-image:url($path/chumlabelbg.png);background-color:#12e6ff; background-repeat: no-repeat; color: white; padding: 2px; border:1px solid #c2c2c2; margin-bottom: 4px;"
                },
   "tabwindow" : {
-	  "style": "background: rgb(190, 19, 4); font-family: 'Arial'"
+    "style": "background: #04a6be; font-family: 'Arial'"
   },
   "tabs": {
       "style": "",
       "selectedstyle": "",
-      "newmsgcolor": "red",
+      "newmsgcolor": "#04a6be",
       "tabstyle": 0
-  },
-  "text": {
-      "beganpester": "began trolling",
-      "ceasepester": "gave up trolling",
-      "blocked": "blocked",
-      "unblocked": "mercifully forgave",
-      "openmemo": "opened memo on board",
-      "joinmemo": "responded to memo",
-      "closememo": "ceased responding to memo",
-      "kickedmemo": "You have been banned from this memo!"
-  },
-  "systemMsgColor": "#646464"
+  }
  },
  "memos":
- {"memoicon": "$path/memo.png",
-  "style": "background-color: #04a6be; font-family: 'Arial';",
+ {"style": "background-color: #04a6be; font-family: 'Arial';",
   "size": [450,300],
   "tabs": {
       "style": "",
       "selectedstyle": "",
-      "newmsgcolor": "red",
+      "newmsgcolor": "#04a6be",
       "tabstyle": 0
   },
   "label": { "text": "Bulletin Board: $channel",
-             "style": "background-image:url($path/chumlabelbg.png);background-color:#12e6ff; background-repeat: no-repeat; color: white; padding: 2px; border:1px solid #c2c2c2; margin-bottom: 4px;",
-             "align": { "h": "left", "v": "center" },
-             "minheight": 18,
-             "maxheight": 36
-           },
-  "textarea": {
-      "style": "background: white; border:2px solid #c2c2c2; font-size: 12px;"
-  },
-  "input": {
-      "style": "background: white;margin-top:5px; border:1px solid #c2c2c2; font-size: 12px; height: 19px; margin-bottom: 5px; "
-  },
-  "margins": {"top": 22, "bottom": 10, "left": 9, "right": 4 },
-  "userlist": { "width": 125,
-                "style": "font-size: 12px; background: white; margin-left: 5px; margin-bottom: 5px; border:2px solid #c2c2c2; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200);"
+             "style": "background-image:url($path/chumlabelbg.png);background-color:#12e6ff; background-repeat: no-repeat; color: white; padding: 2px; border:1px solid #c2c2c2; margin-bottom: 4px;"
            },
   "time": { "text": { "width": 75,
                       "style": "color: black; font:bold;  border:1px solid #c2c2c2; background: white; height: 19px;"
@@ -322,8 +58,6 @@
                         "right": "$path/rightarrow.png",
                         "style": "width: 19px; height: 19px; border:0px; margin-left: 2px;"
                       }
-          },
-  "systemMsgColor": "#646464",
-  "op": { "icon": "$path/op.png" }
+          }
  }
 }

themes/Zodiac/style.js

@@ -21,7 +21,9 @@
                        "options": "Options",
                        "memos": "Memos",
                        "logviewer": "Pesterlogs",
+                       "randen": "Random Encounter",
                        "userlist": "Userlist",
+                       "addgroup": "Add Group",
                        "import": "Import",
                        "reconnect": "Reconnect",
                        "idle": "Idle",
@@ -35,18 +37,29 @@
             "help": { "_name": "Help",
                       "help": "Help",
                       "calsprite": "Calsprite",
+                      "nickserv": "NickServ",
                       "about": "About" },
             "rclickchumlist": {"pester": "Pester",
                                "removechum": "Remove",
                                "report": "Report",
                                "blockchum": "Block",
-							   "report": "Report",
                                "addchum": "Add Chum",
                                "viewlog": "View Pesterlog",
                                "unblockchum": "Unblock",
+                               "removegroup": "Remove Group",
+                               "renamegroup": "Rename Group",
+                               "movechum": "Move To",
                                "banuser": "Ban",
                                "opuser": "Promote",
-                               "quirksoff": "Quirks Off" }
+                               "voiceuser": "Give Voice",
+                               "quirkkill": "Kill Quirk",
+                               "quirksoff": "Quirks Off",
+                               "invitechum": "Invite Chump",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute" }
            },
   "chums": { "style": "font-size: 12px; background: black; border: 3px solid white; font:bold; font-family: 'Arial';selection-background-color:rgb(100,100,100); color: white;",
              "loc": [225, 150],

themes/enamel/style.js

@@ -50,8 +50,14 @@
                                "banuser": "Ban User",
                                "opuser": "Make OP",
                                "voiceuser": "Give Voice",
+                               "quirkkill": "Kill Quirk",
                                "quirksoff": "Quirks Off",
-                               "invitechum": "Invite Chum"
+                               "invitechum": "Invite Chum",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute"
                               }
            },
   "chums": { "style": "text-align: center; border:0px; background-image:url($path/chumbg.png); background-color: #ffe400; background-repeat: no-repeat; color: white; font-family: 'Century Gothic';selection-background-color:#646464; font-size:18px; ",

themes/gold/style.js

@@ -53,8 +53,14 @@
                                "banuser": "Ban User",
                                "opuser": "Make OP",
                                "voiceuser": "Give Voice",
+                               "quirkkill": "Kill Quirk",
                                "quirksoff": "Quirks Off",
-                               "invitechum": "Invite Chum"
+                               "invitechum": "Invite Chum",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute"
                               }
            },
   "chums": { "style": "border:0px; background-image:url($path/chumbg.png); background-color: rgb(110,110,110); background-repeat: no-repeat; color: white; font-family: 'Arial';selection-background-color:#646464; font-size:14px; ",

themes/pesterchum/style.js

@@ -53,8 +53,14 @@
                                "banuser": "BAN USER",
                                "opuser": "MAKE OP",
                                "voiceuser": "GIVE VOICE",
+                               "quirkkill": "KILL QUIRK",
                                "quirksoff": "QUIRKS OFF",
-                               "invitechum": "INVITE CHUM"
+                               "invitechum": "INVITE CHUM",
+                               "memosetting": "MEMO SETTINGS",
+                               "memonoquirk": "DISABLE QUIRKS",
+                               "memohidden": "HIDDEN",
+                               "memoinvite": "INVITE-ONLY",
+                               "memomute": "MUTE"
                               }
            },
   "chums": { "style": "border:2px solid yellow; background-color: black;color: white;font: bold;font-family: 'Courier';selection-background-color:#646464; ",

themes/trollian/style.js

@@ -52,8 +52,14 @@
                                "banuser": "Ban",
                                "opuser": "Promote",
                                "voiceuser": "Let Speak",
+                               "quirkkill": "Kill Quirk",
                                "quirksoff": "Quirks Off",
-                               "invitechum": "Invite Chump" }
+                               "invitechum": "Invite Chump",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute" }
            },
   "chums": { "style": "font-size: 12px; background: white; border:0px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ",
              "scrollbar": { "style" : "background-color:#c2c2c2;",

themes/typewriter/style.js

@@ -53,8 +53,14 @@
                                "banuser": "Expel User",
                                "opuser": "Promote",
                                "voiceuser": "Let Speak",
+                               "quirkkill": "Kill Quirk",
                                "quirksoff": "Quirks Off",
-                               "invitechum": "Invite User"
+                               "invitechum": "Invite User",
+                               "memosetting": "Memo Settings",
+                               "memonoquirk": "Disable Quirks",
+                               "memohidden": "Hidden",
+                               "memoinvite": "Invite-Only",
+                               "memomute": "Mute"
                               }
            },
   "chums": { "style": "border:0px; background-color: white; font: bold;font-family: 'Courier';selection-background-color: black; ",