From b31c078688b56b2bcac463ec163d1b9ad94d9e25 Mon Sep 17 00:00:00 2001
From: Stephen Dranger <dranger@gmail.com>
Date: Mon, 24 Jan 2011 12:02:00 -0600
Subject: [PATCH] small changes

---
 pesterchum.py              | 22 ++++++++++++++++++----
 themes/pesterchum/style.js |  3 +--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pesterchum.py b/pesterchum.py
index 011c42a..c05ae9a 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -19,7 +19,11 @@ class Mood(object):
     def value(self):
         return self.mood
     def name(self):
-        return self.moods[self.mood]
+        try:
+            name = self.moods[self.mood]
+        except IndexError:
+            name = "chummy"
+        return name
     def icon(self, theme):
         f = theme["main/chums/moods"][self.name()]["icon"]
         return QtGui.QIcon(f)
@@ -196,6 +200,10 @@ class PesterConvo(QtGui.QFrame):
         else:
             chum = self.chum
         self.textArea.addMessage(text, chum)
+    def showChat(self):
+        self.activateWindow()
+        self.raise_()
+        self.textInput.setFocus()
 
     @QtCore.pyqtSlot()
     def sentMessage(self):
@@ -216,9 +224,8 @@ class PesterWindow(MovingWindow):
         self.config = userConfig()
         self.theme = self.config.getTheme()
         main = self.theme["main"]
-        width = int(main['width'])
-        height = int(main['height'])
-        self.setGeometry(100, 100, width, height)
+        size = main['size']
+        self.setGeometry(100, 100, size[0], size[1])
         self.setWindowIcon(QtGui.QIcon(main["icon"]))
         self.setStyleSheet("QFrame#main { "+main["style"]+" }")
 
@@ -254,6 +261,13 @@ class PesterWindow(MovingWindow):
         if self.convos.has_key(handle):
             self.convos[handle].updateMood(mood)
     def newConversation(self, chum, initiated=True):
+        if self.convos.has_key(chum.handle):
+            self.convos[chum.handle].showChat()
+            if not initiated:
+                # self.convos[chum.handle]
+                # add pesterchum:begin
+                pass
+            return
         convoWindow = PesterConvo(chum, initiated, self)
         self.connect(convoWindow, QtCore.SIGNAL('messageSent(QString, PyQt_PyObject)'),
                      self, QtCore.SIGNAL('sendMessage(QString, PyQt_PyObject)'))
diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js
index d3ad024..139f238 100644
--- a/themes/pesterchum/style.js
+++ b/themes/pesterchum/style.js
@@ -1,7 +1,6 @@
 {"main":
  {"style": "background-image:url($path/pcbg.png);",
-  "width": 300,
-  "height": 620,
+  "size": [300, 620],
   "icon": "$path/trayicon.gif",
   "close": { "image": "$path/x.gif",
              "loc": [275, 0]},