diff --git a/TODO b/TODO index fce6fe7..c066c5a 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,18 @@ Features: -* chumdb still trying to serialize QString? -* Windows: courier doesn't bold?? -* Transparent background +* chumdb not working great +* tab recombining gives wrong window icon * switch focus to lineedit * colors from ppl msging you not on your buddy list dont work - check chumdb * scaling icons * menubar should pass on mouse move +* tab background +* softcode conversation handle +* top box layout +* mood change image -- can't it be done already? * chat scrolls when switch theme * softcode menu names and protocol messages, menu location * eliminate "SWITCH" in profile menu +* remove highlighted text area if focus in textinput * windows text goes gray when out of focus * Logging * Block list @@ -17,18 +21,23 @@ Features: * User commands/stop user from sending commands accidentally * Hyperlinks * color tags -* /me +* /me ghostDunk's [GD'S] +* Transparent background -- release alpha * shared buddy lists - changes to the buddy list should refresh it? multiple clients share buddy list??? * User profile menu options (color...?) * System tray menu * comment history (up button) +* page up/down scrolling +* ctrl-tab should prefer new convos * Chat rooms/browser * More complex quirks * Implement TC options * spell check? +* Help menu -- release beta +* pick your own icon * time codes * theme elements define, implement * Theme checking diff --git a/logs/chums.js b/logs/chums.js new file mode 100644 index 0000000..0a49db4 --- /dev/null +++ b/logs/chums.js @@ -0,0 +1 @@ +{"gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}} \ No newline at end of file diff --git a/oyoyo/__init__.pyc b/oyoyo/__init__.pyc index be26c04..28e3e80 100644 Binary files a/oyoyo/__init__.pyc and b/oyoyo/__init__.pyc differ diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc index 08d3b01..ad7d9f7 100644 Binary files a/oyoyo/client.pyc and b/oyoyo/client.pyc differ diff --git a/oyoyo/cmdhandler.pyc b/oyoyo/cmdhandler.pyc index e9def19..d97b3d1 100644 Binary files a/oyoyo/cmdhandler.pyc and b/oyoyo/cmdhandler.pyc differ diff --git a/oyoyo/helpers.pyc b/oyoyo/helpers.pyc index c0234d2..89ddc32 100644 Binary files a/oyoyo/helpers.pyc and b/oyoyo/helpers.pyc differ diff --git a/oyoyo/ircevents.pyc b/oyoyo/ircevents.pyc index 1f1ccd6..c83999f 100644 Binary files a/oyoyo/ircevents.pyc and b/oyoyo/ircevents.pyc differ diff --git a/oyoyo/parse.pyc b/oyoyo/parse.pyc index e67f2ea..9095b24 100644 Binary files a/oyoyo/parse.pyc and b/oyoyo/parse.pyc differ diff --git a/pesterchum.js b/pesterchum.js index 0420f9f..298cc81 100644 --- a/pesterchum.js +++ b/pesterchum.js @@ -1 +1 @@ -{"tabs": true, "chums": ["aquaMarinist", "gardenGnostic", "gamblingGenocider", "schlagzeugGator", "mechanicalSpectacle", "marineAquist"], "defaultprofile": "testProfile"} \ No newline at end of file +{"tabs": true, "chums": ["aquaMarinist", "gardenGnostic", "gamblingGenocider", "schlagzeugGator", "mechanicalSpectacle", "marineAquist"], "defaultprofile": "ghostDunk"} \ No newline at end of file diff --git a/pesterchum.py b/pesterchum.py index 83a8a35..fcb77b6 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -75,7 +75,7 @@ class PesterProfileDB(dict): fp = open("logs/chums.js", 'w') json.dump(chumdict, fp) fp.close() - converted = dict([(handle, PesterProfile(handle, color=QtGui.Color(c['color']), mood=Mood(c['mood']))) for (handle, c) in chumdict.iteritems()]) + converted = dict([(handle, PesterProfile(handle, color=QtGui.QColor(c['color']), mood=Mood(c['mood']))) for (handle, c) in chumdict.iteritems()]) self.update(converted) def save(self): @@ -85,8 +85,10 @@ class PesterProfileDB(dict): fp.close() def getColor(self, handle, default=None): if not self.has_key(handle): + print "no color found for %s" % (handle) return default else: + print "pulled %s from db" % (handle) return self[handle]["color"] def setColor(self, handle, color): if self.has_key(handle): diff --git a/profiles/ghostDunk.js b/profiles/ghostDunk.js index 43ce8df..338c689 100644 --- a/profiles/ghostDunk.js +++ b/profiles/ghostDunk.js @@ -1 +1 @@ -{"color": "#ff00ff", "theme": "trollian", "quirks": [], "handle": "ghostDunk"} \ No newline at end of file +{"color": "#ff00ff", "theme": "pesterchum", "quirks": [], "handle": "ghostDunk"} \ No newline at end of file diff --git a/profiles/superGhost.js b/profiles/superGhost.js new file mode 100644 index 0000000..77e26a3 --- /dev/null +++ b/profiles/superGhost.js @@ -0,0 +1 @@ +{"color": "#aa00ff", "theme": "pesterchum", "quirks": [], "handle": "superGhost"} \ No newline at end of file diff --git a/themes/pesterchum6/Thumbs.db b/themes/pesterchum6/Thumbs.db new file mode 100644 index 0000000..8517079 Binary files /dev/null and b/themes/pesterchum6/Thumbs.db differ diff --git a/themes/pesterchum6/abouticon.png b/themes/pesterchum6/abouticon.png new file mode 100644 index 0000000..02fa887 Binary files /dev/null and b/themes/pesterchum6/abouticon.png differ diff --git a/themes/pesterchum6/alarm.wav b/themes/pesterchum6/alarm.wav new file mode 100644 index 0000000..910abdc Binary files /dev/null and b/themes/pesterchum6/alarm.wav differ diff --git a/themes/pesterchum6/chummy.gif b/themes/pesterchum6/chummy.gif new file mode 100644 index 0000000..26c9ad3 Binary files /dev/null and b/themes/pesterchum6/chummy.gif differ diff --git a/themes/pesterchum6/detestful.gif b/themes/pesterchum6/detestful.gif new file mode 100644 index 0000000..e8f3e08 Binary files /dev/null and b/themes/pesterchum6/detestful.gif differ diff --git a/themes/pesterchum6/devious.gif b/themes/pesterchum6/devious.gif new file mode 100644 index 0000000..06ba8be Binary files /dev/null and b/themes/pesterchum6/devious.gif differ diff --git a/themes/pesterchum6/discontent.gif b/themes/pesterchum6/discontent.gif new file mode 100644 index 0000000..addcf54 Binary files /dev/null and b/themes/pesterchum6/discontent.gif differ diff --git a/themes/pesterchum6/distraught.gif b/themes/pesterchum6/distraught.gif new file mode 100644 index 0000000..0103ac5 Binary files /dev/null and b/themes/pesterchum6/distraught.gif differ diff --git a/themes/pesterchum6/estatic.gif b/themes/pesterchum6/estatic.gif new file mode 100644 index 0000000..dc3ee61 Binary files /dev/null and b/themes/pesterchum6/estatic.gif differ diff --git a/themes/pesterchum6/h.gif b/themes/pesterchum6/h.gif new file mode 100644 index 0000000..184514e Binary files /dev/null and b/themes/pesterchum6/h.gif differ diff --git a/themes/pesterchum6/m.gif b/themes/pesterchum6/m.gif new file mode 100644 index 0000000..83a15f2 Binary files /dev/null and b/themes/pesterchum6/m.gif differ diff --git a/themes/pesterchum6/offline.gif b/themes/pesterchum6/offline.gif new file mode 100644 index 0000000..e3c6b53 Binary files /dev/null and b/themes/pesterchum6/offline.gif differ diff --git a/themes/pesterchum6/pc theme.zip b/themes/pesterchum6/pc theme.zip new file mode 100644 index 0000000..4cb74da Binary files /dev/null and b/themes/pesterchum6/pc theme.zip differ diff --git a/themes/pesterchum6/pcbg.png b/themes/pesterchum6/pcbg.png new file mode 100644 index 0000000..dfbb11b Binary files /dev/null and b/themes/pesterchum6/pcbg.png differ diff --git a/themes/pesterchum6/pleasant.gif b/themes/pesterchum6/pleasant.gif new file mode 100644 index 0000000..3233ff4 Binary files /dev/null and b/themes/pesterchum6/pleasant.gif differ diff --git a/themes/pesterchum6/rancorous.gif b/themes/pesterchum6/rancorous.gif new file mode 100644 index 0000000..a826c75 Binary files /dev/null and b/themes/pesterchum6/rancorous.gif differ diff --git a/themes/pesterchum6/relaxed.gif b/themes/pesterchum6/relaxed.gif new file mode 100644 index 0000000..55a31a0 Binary files /dev/null and b/themes/pesterchum6/relaxed.gif differ diff --git a/themes/pesterchum6/sleek.gif b/themes/pesterchum6/sleek.gif new file mode 100644 index 0000000..5573aa5 Binary files /dev/null and b/themes/pesterchum6/sleek.gif differ diff --git a/themes/pesterchum6/smooth.gif b/themes/pesterchum6/smooth.gif new file mode 100644 index 0000000..a261759 Binary files /dev/null and b/themes/pesterchum6/smooth.gif differ diff --git a/themes/pesterchum6/style.js b/themes/pesterchum6/style.js new file mode 100644 index 0000000..978a3b0 --- /dev/null +++ b/themes/pesterchum6/style.js @@ -0,0 +1,150 @@ +{"main": + {"style": "background-image:url($path/pcbg.png);", + "size": [232, 380], + "icon": "$path/trayicon.gif", + "newmsgicon": "$path/trayicon2.gif", + "windowtitle": "PESTERCHUM", + "close": { "image": "$path/x.gif", + "loc": [210, 2]}, + "minimize": { "image": "$path/m.gif", + "loc": [190, 2]}, + "menubar": { "style": "font-family: 'Courier'; font:bold; font-size: 12px;" }, + "menu" : { "style": "font-family: 'Courier'; font: bold; font-size: 12px; background-color: #fdb302;border:2px solid #ffff00", + "selected": "background-color: #ffff00" + }, + "sounds": { "alertsound": "$path/alarm.wav" }, + "chums": { "style": "border:2px solid yellow; background-color: black;color: white;font: bold;font-family: 'Courier';selection-background-color:#646464; ", + "loc": [12, 117], + "size": [209, 82], + "moods": { "chummy": { "icon": "$path/chummy.gif", + "color": "white" }, + "offline": { "icon": "$path/offline.gif", + "color": "#646464"}, + "rancorous": { "icon": "$path/rancorous.gif", + "color": "red" }, + "detestful": { "icon": "$path/detestful.gif", + "color": "red" }, + "devious": { "icon": "$path/devious.gif", + "color": "white" }, + "discontent": { "icon": "$path/discontent.gif", + "color": "white" }, + "distraught": { "icon": "$path/distraught.gif", + "color": "white" }, + "ecstatic": { "icon": "$path/estatic.gif", + "color": "white" }, + "pleasant": { "icon": "$path/pleasant.gif", + "color": "white" }, + "relaxed": { "icon": "$path/relaxed.gif", + "color": "white" }, + "sleek": { "icon": "$path/sleek.gif", + "color": "white" }, + "smooth": { "icon": "$path/smooth.gif", + "color": "white" }, + "unruly": { "icon": "$path/unruly.gif", + "color": "white" } + } + }, + "mychumhandle": { "label": { "text": "CHUMHANDLE:", + "loc": [19,232], + "style": "color: rgba(255, 255, 0, 0%) ; font-family: 'Courier';" }, + "handle": { "style": "background: black; padding: 3px; color:white; font-family:'Courier'; font:bold; text-align:left;", + "loc": [14,246], + "size": [190, 21] }, + "colorswatch": { "loc": [196,246], + "size": [23,21], + "text": "" } + }, + "defaultwindow": { "style": "background: #fdb302; font-family:'Courier';font:bold;selection-background-color:#919191; " + }, + "addchum": { "style": "background: rgba(255, 255, 0, 0%); border:2px solid #c48a00; font: bold; color: rgba(0, 0, 0, 0%); font-family:'Courier';", + "loc": [12,202], + "size": [71, 22], + "text": "ADD CHUM" + }, + "pester": { "style": "background: rgba(255, 255, 0, 0%); border:2px solid #c48a00; font: bold; color: rgba(255, 255, 0, 0%); font-family:'Courier';", + "loc": [150,202], + "size": [71, 22], + "text": "PESTER!" + }, + "defaultmood": "chummy", + "moodlabel": { "style": "", + "loc": [20, 4300], + "text": "MOODS" + }, + "moods": [ + { "style": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'", + "selected": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'; font:bold; font-size:9pt;", + "loc": [12, 288], + "size": [104, 22], + "text": "CHUMMY", + "icon": "$path/chummy.gif", + "mood": "chummy" + }, + { "style": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'", + "selected": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'; font: bold; font-size:9pt;", + "loc": [12, 308], + "size": [104, 22], + "text": "PALSY", + "icon": "$path/chummy.gif", + "mood": "pleasant.gif" + }, + { "style": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'", + "selected": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier';font: bold; font-size:9pt;", + "loc": [12, 328], + "size": [104, 22], + "text": "CHIPPER", + "icon": "$path/chummy.gif", + "mood": "distraught" + }, + { "style": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'", + "selected": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'; font-size:9pt; font: bold;", + "loc": [117, 288], + "size": [104, 22], + "text": "BULLY", + "icon": "$path/chummy.gif", + "mood": "unruly" + }, + { "style": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier'", + "selected": "text-align:left; background: yellow; border:2px solid #c48a00; padding: 5px;color:#000000; font-family:'Courier';font: bold; font-size:9pt;", + "loc": [117, 308], + "size": [104, 22], + "text": "PEPPY", + "icon": "$path/chummy.gif", + "mood": "smooth" + }, + { "style": "text-align:left; background: red; border:2px solid #c48a00; padding: 5px;color:#FFFFFF; font-family:'Courier'", + "selected": "text-align:left; background: red; border:2px solid #c48a00; padding: 5px;color:#FFFFFF; font-family:'Courier';font: bold; font-size:9pt;", + "loc": [117, 328], + "size": [104, 22], + "text": "RANCOROUS", + "icon": "$path/rancorous.gif", + "mood": 1 + }, + { "style": "text-align:center; background: black; border:2px solid #c48a00; padding: 5px;color:#646464; font-family:'Courier'", + "selected": "text-align:center; background: black; border:2px solid #c48a00; padding: 5px;color:#646464; font-family:'Courier';font: bold; font-size:9pt;", + "loc": [12, 348], + "size": [209, 22], + "text": "ABSCOND", + "icon": "$path/offline.gif", + "mood": 2 + } + ] + }, + "convo": + {"style": "background: #fdb302; border:2px solid yellow; font-family: 'Courier'", + "size": [295, 191], + "chumlabel": { "style": "background: rgb(196, 138, 0);" }, + "textarea": { + "style": "background: white; font:bold; border:2px solid #c48a00;" + }, + "input": { + "style": "background: white; border:2px solid #c48a00;" + }, + "tabs": { + "style": "", + "newmsgcolor": "#fdb302", + "tabstyle": 0 + } + } + +} diff --git a/themes/pesterchum6/trayicon.png b/themes/pesterchum6/trayicon.png new file mode 100644 index 0000000..817bf4b Binary files /dev/null and b/themes/pesterchum6/trayicon.png differ diff --git a/themes/pesterchum6/trayicon2.png b/themes/pesterchum6/trayicon2.png new file mode 100644 index 0000000..7b78586 Binary files /dev/null and b/themes/pesterchum6/trayicon2.png differ diff --git a/themes/pesterchum6/unruly.gif b/themes/pesterchum6/unruly.gif new file mode 100644 index 0000000..09c58ec Binary files /dev/null and b/themes/pesterchum6/unruly.gif differ diff --git a/themes/pesterchum6/x.gif b/themes/pesterchum6/x.gif new file mode 100644 index 0000000..6f29624 Binary files /dev/null and b/themes/pesterchum6/x.gif differ