From 6fcbf3aaf03bbaae702744d8b24510dd123e17ba Mon Sep 17 00:00:00 2001
From: Stephen Dranger <dranger@gmail.com>
Date: Sun, 6 Feb 2011 19:11:10 -0600
Subject: [PATCH] 0.1.0

---
 TODO                     |   1 +
 convo.py                 |   2 +-
 convo.pyc                | Bin 22466 -> 22492 bytes
 mash                     | 109 ---------------------------------------
 profiles/testProfile.js  |   2 +-
 themes/trollian/style.js |   6 +--
 6 files changed, 6 insertions(+), 114 deletions(-)
 delete mode 100644 mash

diff --git a/TODO b/TODO
index 36817fd..82c0394 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,7 @@ Features:
 * color text is not being translated to server?
 * convo backgrounds -- make them more like http://www.mspaintadventures.com/storyfiles/hs2/02546_2.gif
 * PESTERLOG: in convo window
+* make other ppl ops
 * help button on quirks menu?
 * tab recombining gives wrong window icon
 * help menu -- about and forum
diff --git a/convo.py b/convo.py
index d5ffe33..6fb530f 100644
--- a/convo.py
+++ b/convo.py
@@ -425,7 +425,7 @@ class PesterConvo(QtGui.QFrame):
         self.chumopen = o
     def changeTheme(self, theme):
         self.resize(*theme["convo/size"])
-        self.setStyleSheet("QFrame { %s } QScrollBar:vertical { %s } QScrollBar::handle:vertical { %s }" % (convo["style"], convo["scrollbar"]["style"], convo["scrollbar"]["handle"]))
+        self.setStyleSheet("QFrame { %s } QScrollBar:vertical { %s } QScrollBar::handle:vertical { %s }" % (theme["convo/style"], theme["convo/scrollbar"]["style"], theme["convo/scrollbar"]["handle"]))
         margins = theme["convo/margins"]
         self.layout.setContentsMargins(margins["left"], margins["top"],
                                        margins["right"], margins["bottom"])
diff --git a/convo.pyc b/convo.pyc
index d509eefcb854b235c4c7908850c780b5940534c3..c86928642de224249e59c9599b0a502161b19ee9 100644
GIT binary patch
delta 539
zcmY*U%SyvQ6g`uqN!v6{-*wcr*p>evE?oG43N8ihC=5gcZ4ktiEb<9{NRj@5_yg|!
z3UMvonOG;;+}C;Bd*4><bH&_`ub}yS^y*GdvXnvC;3_%bqGn1L{LaQGXJ88Tz?T+M
zKw6MCQVXI^WJ--9HH+kf=MG7T=xBNkIiOq;SN9%d9il}vhGj-h#B4w|k=l?xM8Rrl
z6_{RMFc{Pwffj0iQUzMxhG^4vq7~*LxbA4)DbKq!KP)+h$c(60G47OZ?N^X4k{)FL
zFUrBD7$UdypUQHiANoINU>wF3<X8+1v{iw`$RHeYTYbN|eW%n5;9`IL@_jnnTlfHG
p@xx<$ut=Vw+eK*l**uP-o9p>huCLB6nZHZWG*aPy{eJ%A{Q`#zVJ`px

delta 513
zcmY*UJ5Iwu5PfSqcH+c|^D``;o?L>0ih_?6Brd=TX(i}f+H&C|aF7T^T!0(UBW^&0
zs1Y+`g4fM_-kbMk=6$1HH!6JlO5)Gc=WumV<sOU=%_)F(%O3Q-kE~Wug@Os8OAiHL
zeb@j62_k4t{U!~X6hqemNocSq;~{E*UGhl!KI{NyNMj0R<qH<W4pETt2&PdbqJon3
z<V6z-e8)(H;!oIE<P(^Lw$oT+K8BW#@QI73gr7N%DXLa9?HEs;TW1|+hI|gY_=|SA
zD>Brc{K=Mk^3eZ5^VVU%!<?H%OX&_}mMwDtd&uAKZa;E*1KgZsPv4h!(b@u7zii8^
TTa_Mj{lMXoL%jXC{)v78sdZP4

diff --git a/mash b/mash
deleted file mode 100644
index 449e112..0000000
--- a/mash
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/memos.py b/memos.py
-index 239947e..af7ab32 100644
---- a/memos.py
-+++ b/memos.py
-@@ -236,7 +236,9 @@ class MemoText(PesterText):
-                 time = TimeTracker(newtime)
-                 parent.times[chum.handle] = time
-                 timeGrammar = time.getGrammar()
--                self.append(convertTags(chum.memojoinmsg(systemColor, time.getTime(), timeGrammar, window.theme["convo/text/joinmemo"])))
-+                msg = chum.memojoinmsg(systemColor, time.getTime(), timeGrammar, window.theme["convo/text/joinmemo"])
-+                self.append(convertTags(msg))
-+                window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-         else:
-             time = parent.time
- 
-@@ -356,7 +358,9 @@ class PesterMemo(PesterConvo):
-         p = self.mainwindow.profile()
-         timeGrammar = self.time.getGrammar()
-         systemColor = QtGui.QColor(self.mainwindow.theme["memos/systemMsgColor"])
--        self.textArea.append(convertTags(p.memoopenmsg(systemColor, self.time.getTime(), timeGrammar, self.mainwindow.theme["convo/text/openmemo"], self.channel)))
-+        msg = p.memoopenmsg(systemColor, self.time.getTime(), timeGrammar, self.mainwindow.theme["convo/text/openmemo"], self.channel)
-+        self.textArea.append(convertTags(msg))
-+        window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
- 
-         self.op = False
-         self.newmessage = False
-@@ -482,18 +486,24 @@ class PesterMemo(PesterConvo):
-                     self.times[handle].setCurrent(close)
-                     grammar = self.times[handle].getGrammar()
-                     self.times[handle].removeTime(close)
--                    self.textArea.append(convertTags(chum.memoclosemsg(systemColor, grammar, window.theme["convo/text/closememo"])))
-+                    msg = chum.memoclosemsg(systemColor, grammar, window.theme["convo/text/closememo"])
-+                    self.textArea.append(convertTags(msg))
-+                    window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-             elif timed not in self.times[handle]:
-                 self.times[handle].addTime(timed)
-                 grammar = self.times[handle].getGrammar()
--                self.textArea.append(convertTags(chum.memojoinmsg(systemColor, timed, grammar, window.theme["convo/text/joinmemo"])))
-+                msg = chum.memojoinmsg(systemColor, timed, grammar, window.theme["convo/text/joinmemo"])
-+                self.textArea.append(convertTags(msg))
-+                window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-             else:
-                 self.times[handle].setCurrent(timed)
-         else:
-             if timed is not None:
-                 ttracker = TimeTracker(timed)
-                 grammar = ttracker.getGrammar()
--                self.textArea.append(convertTags(chum.memojoinmsg(systemColor, timed, grammar, window.theme["convo/text/joinmemo"])))
-+                msg = chum.memojoinmsg(systemColor, timed, grammar, window.theme["convo/text/joinmemo"])
-+                self.textArea.append(convertTags(msg))
-+                window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-                 self.times[handle] = ttracker
- 
-     @QtCore.pyqtSlot()
-@@ -556,7 +566,9 @@ class PesterMemo(PesterConvo):
-                 while self.times[h].getTime() is not None:
-                     t = self.times[h]
-                     grammar = t.getGrammar()
--                    self.textArea.append(convertTags(chum.memoclosemsg(systemColor, grammar, self.mainwindow.theme["convo/text/closememo"])))
-+                    msg = chum.memoclosemsg(systemColor, grammar, self.mainwindow.theme["convo/text/closememo"])
-+                    self.textArea.append(convertTags(msg))
-+                    window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-                     self.times[h].removeTime(t.getTime())
-                 if update == "nick":
-                     self.addUser(newnick)
-@@ -583,7 +595,9 @@ class PesterMemo(PesterConvo):
-                     opgrammar = self.time.getGrammar()
-                 else:
-                     opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
--                self.textArea.append(convertTags(chum.memobanmsg(opchum, opgrammar, systemColor, grammar)))
-+                msg = chum.memobanmsg(opchum, opgrammar, systemColor, grammar)
-+                self.textArea.append(convertTags(msg))
-+                window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-                 ttracker.removeTime(ttracker.getTime())
- 
-             if chum is self.mainwindow.profile():
-@@ -599,7 +613,9 @@ class PesterMemo(PesterConvo):
-                     self.resetSlider(curtime)
-                     self.mainwindow.joinChannel.emit(self.channel)
-                     me = self.mainwindow.profile()
--                    self.textArea.append(convertTags(me.memoopenmsg(systemColor, self.time.getTime(), self.time.getGrammar(), self.mainwindow.theme["convo/text/openmemo"], self.channel)))
-+                    msg = me.memoopenmsg(systemColor, self.time.getTime(), self.time.getGrammar(), self.mainwindow.theme["convo/text/openmemo"], self.channel)
-+                    self.textArea.append(convertTags(msg))
-+                    window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
-                 elif ret == QtGui.QMessageBox.Cancel:
-                     if self.parent():
-                         i = self.parent().tabIndices[self.channel]
-@@ -639,7 +655,9 @@ class PesterMemo(PesterConvo):
-         time = txt2delta(self.timeinput.text())
-         present = self.time.addTime(time)
-         if not present:
--            self.textArea.append(convertTags(me.memojoinmsg(systemColor, time, self.time.getGrammar(), self.mainwindow.theme["convo/text/joinmemo"])))
-+            msg = me.memojoinmsg(systemColor, time, self.time.getGrammar(), self.mainwindow.theme["convo/text/joinmemo"])
-+            self.textArea.append(convertTags(msg))
-+            window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
- 
-         serverText = "PESTERCHUM:TIME>"+delta2txt(time, "server")
-         self.messageSent.emit(serverText, self.title())
-@@ -651,7 +669,9 @@ class PesterMemo(PesterConvo):
-         if removed:
-             grammar = self.time.getGrammarTime(time)
-             systemColor = QtGui.QColor(self.mainwindow.theme["memos/systemMsgColor"])
--            self.textArea.append(convertTags(me.memoclosemsg(systemColor, grammar, self.mainwindow.theme["convo/text/closememo"])))
-+                             
-+            self.textArea.append(convertTags(
-+            window.chatlog.log(parent.channel, convertTags(msg, "bbcode"))
- 
-         newtime = self.time.getTime()
-         if newtime is None:
diff --git a/profiles/testProfile.js b/profiles/testProfile.js
index e63a331..223100d 100644
--- a/profiles/testProfile.js
+++ b/profiles/testProfile.js
@@ -1 +1 @@
-{"color": "#aa00ff", "theme": "pesterchum", "quirks": [], "handle": "testProfile"}
\ No newline at end of file
+{"color": "#aa00ff", "theme": "trollian", "quirks": [], "handle": "testProfile"}
\ No newline at end of file
diff --git a/themes/trollian/style.js b/themes/trollian/style.js
index c650963..3074757 100644
--- a/themes/trollian/style.js
+++ b/themes/trollian/style.js
@@ -27,14 +27,14 @@
                         "theme": "Theme",
                         "color": "Hemospectrum",
                         "block": "Chumpdump",
-                        "quirks": "Annoying"},
+                        "quirks": "Annoying" },
             "rclickchumlist": {"pester": "Troll",
                                "removechum": "Trash",
                                "blockchum": "Block",
                                "addchum": "Add Chump",
                                "unblockchum": "Mercy",
                                "banuser": "Ban",
-                               "quirksoff": "Quirks Off"
+                               "quirksoff": "Quirks Off" }
            },
   "chums": { "style": "font-size: 12px; background: white; border:2px solid #c2c2c2; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ",
              "loc": [475, 89],
@@ -246,7 +246,7 @@
                  "text" : "trolling: $handle"
                },
   "textarea": {
-      "style": "background: white; border:2px solid #c2c2c2; font-size: 12px; margin-top: 4px;"
+      "style": "background: white; border:2px solid #c2c2c2; font-size: 14px; margin-top: 4px;"
   },
   "input": {
       "style": "background: white;margin-top:5px; border:1px solid #c2c2c2; margin-right: 54px; font-size: 12px; height: 19px;"