diff --git a/TODO b/TODO index 7c56be3..711f2c0 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,13 @@ Features: -* Turn quirks off -* User commands/stop user from sending commands accidentally * Hyperlinks * /me ghostDunk's [GD'S] * Transparent background * tab recombining gives wrong window icon * help menu -- about and forum * new sound on CEASE and BEGIN? --- release alpha * Chat rooms/browser +-- release alpha +* User commands/stop user from sending commands accidentally * shared buddy lists - changes to the buddy list should refresh it? multiple clients share buddy list??? * System tray menu diff --git a/pesterchum.py b/pesterchum.py index 8628fca..f8de3be 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -97,7 +97,10 @@ def escapeBrackets(string): for i in range(0, btlen-etlen): retval += "" return retval - + +#_urlre = re.compile() +#def findURLs(string): + class waitingMessageHolder(object): def __init__(self, mainwindow, **msgfuncs): @@ -320,7 +323,7 @@ class userProfile(object): def save(self): handle = self.chat.handle try: - jsonoutput = json.dumps(self.userprofile, fp) + jsonoutput = json.dumps(self.userprofile) except ValueError, e: raise e fp = open("profiles/%s.js" % (handle), 'w') @@ -862,6 +865,7 @@ class PesterText(QtGui.QTextEdit): msg = "%s: %s" % (color, initials, msg) msg = escapeBrackets(msg) + #msg = findURLs(msg) self.append(convertColorTags(msg)) if chum is me: window.chatlog.log(parent.chum.handle, convertColorTags(msg, "bbcode")) diff --git a/pestermenus.py b/pestermenus.py index c3d46e5..c9441b5 100644 --- a/pestermenus.py +++ b/pestermenus.py @@ -371,11 +371,13 @@ class PesterUserlist(QtGui.QDialog): self.userarea.takeItem(self.userarea.row(m)) def changeTheme(self, theme): + self.theme = theme self.setStyleSheet(theme["main/defaultwindow/style"]) self.userarea.setStyleSheet(theme["main/chums/style"]) self.addChumAction.setText(theme["main/menus/rclickchumlist/addchum"]) - for item in [self.userarea.row(i) for i in range(0, self.userarea.count())]: - item.setTextColor(QtGui.QColor(self.theme["main/chums/moods/chummy/color"])) + for item in [self.userarea.item(i) for i in range(0, self.userarea.count())]: + print item.text() + item.setTextColor(QtGui.QColor(theme["main/chums/moods/chummy/color"])) @QtCore.pyqtSlot() def addChumSlot(self): diff --git a/pestermenus.pyc b/pestermenus.pyc index 93bfb16..90b58ce 100644 Binary files a/pestermenus.pyc and b/pestermenus.pyc differ 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/themes/oldpesterchum/Thumbs.db b/themes/oldpesterchum/Thumbs.db deleted file mode 100644 index 8517079..0000000 Binary files a/themes/oldpesterchum/Thumbs.db and /dev/null differ diff --git a/themes/oldpesterchum/abouticon.png b/themes/oldpesterchum/abouticon.png deleted file mode 100644 index 02fa887..0000000 Binary files a/themes/oldpesterchum/abouticon.png and /dev/null differ diff --git a/themes/oldpesterchum/alarm.wav b/themes/oldpesterchum/alarm.wav deleted file mode 100644 index 910abdc..0000000 Binary files a/themes/oldpesterchum/alarm.wav and /dev/null differ diff --git a/themes/oldpesterchum/chummy.gif b/themes/oldpesterchum/chummy.gif deleted file mode 100644 index 26c9ad3..0000000 Binary files a/themes/oldpesterchum/chummy.gif and /dev/null differ diff --git a/themes/oldpesterchum/detestful.gif b/themes/oldpesterchum/detestful.gif deleted file mode 100644 index e8f3e08..0000000 Binary files a/themes/oldpesterchum/detestful.gif and /dev/null differ diff --git a/themes/oldpesterchum/discontent.gif b/themes/oldpesterchum/discontent.gif deleted file mode 100644 index addcf54..0000000 Binary files a/themes/oldpesterchum/discontent.gif and /dev/null differ diff --git a/themes/oldpesterchum/distraught.gif b/themes/oldpesterchum/distraught.gif deleted file mode 100644 index 0103ac5..0000000 Binary files a/themes/oldpesterchum/distraught.gif and /dev/null differ diff --git a/themes/oldpesterchum/h.gif b/themes/oldpesterchum/h.gif deleted file mode 100644 index 184514e..0000000 Binary files a/themes/oldpesterchum/h.gif and /dev/null differ diff --git a/themes/oldpesterchum/m.gif b/themes/oldpesterchum/m.gif deleted file mode 100644 index 83a15f2..0000000 Binary files a/themes/oldpesterchum/m.gif and /dev/null differ diff --git a/themes/oldpesterchum/offline.gif b/themes/oldpesterchum/offline.gif deleted file mode 100644 index e3c6b53..0000000 Binary files a/themes/oldpesterchum/offline.gif and /dev/null differ diff --git a/themes/oldpesterchum/pcbg.png b/themes/oldpesterchum/pcbg.png deleted file mode 100644 index 1f93fa9..0000000 Binary files a/themes/oldpesterchum/pcbg.png and /dev/null differ diff --git a/themes/oldpesterchum/pleasant.gif b/themes/oldpesterchum/pleasant.gif deleted file mode 100644 index 3233ff4..0000000 Binary files a/themes/oldpesterchum/pleasant.gif and /dev/null differ diff --git a/themes/oldpesterchum/rancorous.gif b/themes/oldpesterchum/rancorous.gif deleted file mode 100644 index a826c75..0000000 Binary files a/themes/oldpesterchum/rancorous.gif and /dev/null differ diff --git a/themes/oldpesterchum/sleek.gif b/themes/oldpesterchum/sleek.gif deleted file mode 100644 index 5573aa5..0000000 Binary files a/themes/oldpesterchum/sleek.gif and /dev/null differ diff --git a/themes/oldpesterchum/smooth.gif b/themes/oldpesterchum/smooth.gif deleted file mode 100644 index a261759..0000000 Binary files a/themes/oldpesterchum/smooth.gif and /dev/null differ diff --git a/themes/oldpesterchum/style.js b/themes/oldpesterchum/style.js deleted file mode 100644 index 3ed7014..0000000 --- a/themes/oldpesterchum/style.js +++ /dev/null @@ -1,172 +0,0 @@ -{"main": - {"style": "background-image:url($path/pcbg.png);", - "size": [300, 620], - "icon": "$path/trayicon.gif", - "newmsgicon": "$path/trayicon2.png", - "windowtitle": "P3ST3RCHUM", - "close": { "image": "$path/x.gif", - "loc": [275, 0]}, - "minimize": { "image": "$path/m.gif", - "loc": [255, 0]}, - "menubar": { "style": "font-family: 'Courier New'; font-weight: bold; font-size: 12px;" }, - "menu" : { "style": "font-family: 'Courier New'; font-weight: bold; font-size: 12px; background-color: #fdb302;border:2px solid #ffff00", - "selected": "background-color: #ffff00", - "menuitem": "margin-right:10px;", - "loc": [7,3] - }, - "sounds": { "alertsound": "$path/alarm.wav" }, - "menus": {"client": {"_name": "CLIENT", - "options": "OPTIONS", - "exit": "EXIT"}, - "profile": {"_name": "PROFILE", - "switch": "SWITCH", - "theme": "THEME", - "quirks": "QUIRKS"}, - "rclickchumlist": {"pester": "PESTER", - "removechum": "REMOVE CHUM"} - }, - "chums": { "style": "background-color: black;color: white;font: bold;font-family: 'Courier New';selection-background-color:#919191; ", - "loc": [20, 65], - "size": [266, 270], - "moods": { "chummy": { "icon": "$path/chummy.gif", - "color": "white" }, - "offline": { "icon": "$path/offline.gif", - "color": "#919191"}, - "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": "MYCHUMHANDLE", - "loc": [70,380], - "style": "color:black;font:bold;" }, - "handle": { "style": "border:3px solid yellow; background: black; color:white;", - "loc": [20,400], - "size": [220,30] }, - "colorswatch": { "loc": [243,400], - "size": [40,30], - "text": "" } - }, - "defaultwindow": { "style": "background: #fdb302; font-family:'Courier New';font:bold;selection-background-color:#919191; " - }, - "addchum": { "style": "background: #fdb302; border:5px solid yellow; font: bold;", - "loc": [20,340], - "size": [100, 40], - "text": "ADD CHUM" - }, - "pester": { "style": "background: #fdb302; border:5px solid yellow; font: bold;", - "loc": [130,340], - "size": [100, 40], - "text": "PESTER!" - }, - "defaultmood": 0, - "moodlabel": { "style": "", - "loc": [20, 430], - "text": "MOODS" - }, - "moods": [ - { "style": "text-align:left; background: white; border:3px solid black; padding: 5px;color:#919191;", - "selected": "text-align:left; background: white; border:3px solid black; padding: 5px;font: bold;", - "loc": [20, 470], - "size": [133, 30], - "text": "CHUMMY", - "icon": "$path/chummy.gif", - "mood": 0 - }, - { "style": "text-align:left; background: white; border:3px solid black; padding: 5px;color: #919191", - "selected": "text-align:left; background: white; border:3px solid black; padding: 5px;font: bold;", - "loc": [20, 497], - "size": [133, 30], - "text": "PLEASANT", - "icon": "$path/pleasant.gif", - "mood": 3 - }, - { "style": "text-align:left; background: white; border:3px solid black; padding: 5px;color:#919191;", - "selected": "text-align:left; background: white; border:3px solid black; padding: 5px;font: bold;", - "loc": [20, 524], - "size": [133, 30], - "text": "DISTRAUGHT", - "icon": "$path/distraught.gif", - "mood": 4 - }, - { "style": "text-align:left; background: white; border:3px solid black; padding: 5px;color:#919191;", - "selected": "text-align:left; background: white; border:3px solid black; padding: 5px;font: bold;", - "loc": [150, 470], - "size": [133, 30], - "text": "UNRULY", - "icon": "$path/unruly.gif", - "mood": 5 - }, - { "style": "text-align:left; background: white; border:3px solid black; padding: 5px;color:#919191;", - "selected": "text-align:left; background: white; border:3px solid black; padding: 5px;font: bold;", - "loc": [150, 497], - "size": [133, 30], - "text": "SMOOTH", - "icon": "$path/smooth.gif", - "mood": 6 - }, - { "style": "text-align:left; background: red; border:3px solid black; padding: 5px;", - "selected": "text-align:left; background: red; border:3px solid black; padding: 5px;font: bold;", - "loc": [150, 524], - "size": [133, 30], - "text": "RANCOROUS", - "icon": "$path/rancorous.gif", - "mood": 1 - }, - { "style": "text-align:center; background: #919191; border:3px solid black; padding: 5px;", - "selected": "text-align:center; background: #919191; border:3px solid black; padding: 5px;font: bold;", - "loc": [20, 551], - "size": [263, 30], - "text": "ABSCOND", - "icon": "$path/offline.gif", - "mood": 2 - } - ] - }, - "convo": - {"style": "background: #fdb302; font-family: 'Courier New'", - "size": [600, 500], - "chumlabel": { "style": "background: rgba(255, 255, 255, 25%);", - "align": { "h": "center", "v": "center" }, - "minheight": 30, - "maxheight": 50, - "text" : ":: $handle ::" - }, - "textarea": { - "style": "background: white;font:bold;" - }, - "input": { - "style": "background: white;" - }, - "tabs": { - "style": "", - "selectedstyle": "", - "newmsgcolor": "#fdb302", - "tabstyle": 0 - }, - "text": { - "beganpester": "began pestering", - "ceasepester": "ceased pestering" - } - } - -} diff --git a/themes/oldpesterchum/trayicon2.png b/themes/oldpesterchum/trayicon2.png deleted file mode 100644 index 817bf4b..0000000 Binary files a/themes/oldpesterchum/trayicon2.png and /dev/null differ diff --git a/themes/oldpesterchum/unruly.gif b/themes/oldpesterchum/unruly.gif deleted file mode 100644 index 09c58ec..0000000 Binary files a/themes/oldpesterchum/unruly.gif and /dev/null differ diff --git a/themes/oldpesterchum/x.gif b/themes/oldpesterchum/x.gif deleted file mode 100644 index 1c679ca..0000000 Binary files a/themes/oldpesterchum/x.gif and /dev/null differ diff --git a/themes/pesterchum/acceptant.gif b/themes/pesterchum/acceptant.gif new file mode 100644 index 0000000..f549f70 Binary files /dev/null and b/themes/pesterchum/acceptant.gif differ diff --git a/themes/pesterchum/detestful.gif b/themes/pesterchum/detestful.gif index e8f3e08..c050d31 100644 Binary files a/themes/pesterchum/detestful.gif and b/themes/pesterchum/detestful.gif differ diff --git a/themes/oldpesterchum/estatic.gif b/themes/pesterchum/ecstatic.gif similarity index 100% rename from themes/oldpesterchum/estatic.gif rename to themes/pesterchum/ecstatic.gif diff --git a/themes/pesterchum/estatic.gif b/themes/pesterchum/estatic.gif deleted file mode 100644 index dc3ee61..0000000 Binary files a/themes/pesterchum/estatic.gif and /dev/null differ diff --git a/themes/pesterchum/manipulative.gif b/themes/pesterchum/manipulative.gif new file mode 100644 index 0000000..642d988 Binary files /dev/null and b/themes/pesterchum/manipulative.gif differ diff --git a/themes/oldpesterchum/relaxed.gif b/themes/pesterchum/mirthful.gif similarity index 51% rename from themes/oldpesterchum/relaxed.gif rename to themes/pesterchum/mirthful.gif index 55a31a0..cbf895c 100644 Binary files a/themes/oldpesterchum/relaxed.gif and b/themes/pesterchum/mirthful.gif differ diff --git a/themes/oldpesterchum/devious.gif b/themes/pesterchum/perky.gif similarity index 50% rename from themes/oldpesterchum/devious.gif rename to themes/pesterchum/perky.gif index 06ba8be..1d19661 100644 Binary files a/themes/oldpesterchum/devious.gif and b/themes/pesterchum/perky.gif differ diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js index 5657a8b..4ab5825 100644 --- a/themes/pesterchum/style.js +++ b/themes/pesterchum/style.js @@ -28,41 +28,58 @@ "rclickchumlist": {"pester": "PESTER", "removechum": "REMOVE CHUM", "blockchum": "BLOCK", - "unblockchum": "UNBLOCK", - "addchum": "Add Chump" + "addchum": "ADD CHUM", + "unblockchum": "UNBLOCK" } }, "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" }, - "blocked": { "icon": "$path/blocked.gif", - "color": "black" } + "moods": { + +"chummy": { "icon": "$path/chummy.gif", "color": "white" }, + +"rancorous": { "icon": "$path/rancorous.gif", "color": "red" }, + +"offline": { "icon": "$path/offline.gif", "color": "#646464"}, + + +"pleasant": { "icon": "$path/pleasant.gif", "color": "white" }, + +"distraught": { "icon": "$path/distraught.gif", "color": "white" }, + +"unruly": { "icon": "$path/unruly.gif", "color": "white" }, + + +"smooth": { "icon": "$path/smooth.gif", "color": "white" }, + + +"ecstatic": { "icon": "$path/ecstatic.gif", "color": "red" }, + +"relaxed": { "icon": "$path/relaxed.gif", "color": "red" }, + +"discontent": { "icon": "$path/discontent.gif", "color": "red" }, + +"devious": { "icon": "$path/devious.gif", "color": "red" }, + +"sleek": { "icon": "$path/sleek.gif", "color": "red" }, + +"detestful": { "icon": "$path/detestful.gif", "color": "red" }, + +"mirthful": { "icon": "$path/mirthful.gif", "color": "red" }, + +"manipulative": { "icon": "$path/manipulative.gif", "color": "red" }, + +"vigorous": { "icon": "$path/vigorous.gif", "color": "red" }, + +"perky": { "icon": "$path/perky.gif", "color": "red" }, + +"acceptant": { "icon": "$path/acceptant.gif", "color": "red" }, + +"protective": { "icon": "$path/protective.gif", "color": "#00ff00" }, + +"blocked": { "icon": "$path/blocked.gif", "color": "black" } + } }, "trollslum": { @@ -87,17 +104,17 @@ "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" + "text": "" }, "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!" + "text": "" }, "block": { "style": "background: rgba(255, 255, 0, 0%); border:2px solid #c48a00; font: bold; color: rgba(255, 255, 0, 0%); font-family:'Courier';", "loc": [1500,202], "size": [0, 0], - "text": "BLOCK" + "text": "" }, "defaultmood": 0, "moodlabel": { "style": "", @@ -158,7 +175,7 @@ "loc": [12, 348], "size": [209, 22], "text": "ABSCOND", - "icon": "$path/x.gif", + "icon": "", "mood": 2 } ] diff --git a/themes/oldpesterchum/trayicon.gif b/themes/pesterchum/trayicon.gif similarity index 100% rename from themes/oldpesterchum/trayicon.gif rename to themes/pesterchum/trayicon.gif diff --git a/themes/pesterchum/vigorous.gif b/themes/pesterchum/vigorous.gif new file mode 100644 index 0000000..2408814 Binary files /dev/null and b/themes/pesterchum/vigorous.gif differ diff --git a/themes/trollian/Thumbs.db b/themes/trollian/Thumbs.db deleted file mode 100644 index 40ac244..0000000 Binary files a/themes/trollian/Thumbs.db and /dev/null differ diff --git a/themes/trollian/blocked.gif b/themes/trollian/blocked.gif deleted file mode 100644 index 5031b07..0000000 Binary files a/themes/trollian/blocked.gif and /dev/null differ diff --git a/themes/trollian/nothing.png b/themes/trollian/blocked.png similarity index 86% rename from themes/trollian/nothing.png rename to themes/trollian/blocked.png index 95007b9..7acb9f2 100644 Binary files a/themes/trollian/nothing.png and b/themes/trollian/blocked.png differ diff --git a/themes/trollian/h.gif b/themes/trollian/h.gif index 0d0c9cc..b62246b 100644 Binary files a/themes/trollian/h.gif and b/themes/trollian/h.gif differ diff --git a/themes/trollian/chummy.psd b/themes/trollian/moodicon.psd similarity index 100% rename from themes/trollian/chummy.psd rename to themes/trollian/moodicon.psd diff --git a/themes/trollian/style.js b/themes/trollian/style.js index c492853..97c0ac4 100644 --- a/themes/trollian/style.js +++ b/themes/trollian/style.js @@ -1,270 +1,262 @@ -{"main": - {"style": "background-image:url($path/tnbg.png);background-color:rgba(255,255,255,0);", - "size": [650, 450], - "icon": "$path/trayicon2.png", - "newmsgicon": "$path/trayicon3.png", - "windowtitle": "TROLLIAN", - "close": { "image": "$path/x.gif", - "loc": [635, 2]}, - "minimize": { "image": "$path/m.gif", - "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] - }, - - "sounds": { "alertsound": "$path/alarm.wav" }, - "menus": {"client": {"_name": "Trollian", - "options": "Options", - "userlist": "Target List", - "exit": "Abscond"}, - "profile": {"_name": "View", - "switch": "Trolltag", - "theme": "Theme", - "color": "Hemospectrum", - "block": "Chumpdump", - "quirks": "Annoying"}, - "rclickchumlist": {"pester": "Troll", - "removechum": "Trash", - "blockchum": "Block", - "unblockchum": "Mercy", - "addchum": "Add Chump"} - }, - "chums": { "style": "border: 0px; background-color: white; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ", - "loc": [476, 90], - "size": [175, 361], - - "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" }, - -"unruly": { "icon": "$path/unruly.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.gif", "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": [85,410], - "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": 7, - "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 - } - ] - }, - "convo": - {"style": "background: rgb(190, 19, 4); font-family: 'Arial'", - "size": [308, 194], - "chumlabel": { "style": "background: rgb(255, 38, 18); color: white;", - "align": { "h": "center", "v": "center" }, - "minheight": 30, - "maxheight": 50, - "text" : "trolling: $handle" - }, - "textarea": { - "style": "background: white; border:0px;" - }, - "input": { - "style": "background: white; border:0px solid #c48a00;margin-top:5px;" - }, - "tabs": { - "style": "", - "selectedstyle": "", - "newmsgcolor": "red", - "tabstyle": 0 - }, - "text": { - "beganpester": "began trolling", - "ceasepester": "gave up trolling", - "blocked": "blocked", - "unblocked": "mercifully forgave" - }, - "systemMsgColor": "#646464" - } - +{"main": + {"style": "background-image:url($path/tnbg.png);background-color:rgba(255,255,255,0);", + "size": [650, 450], + "icon": "$path/trayicon.png", + "newmsgicon": "$path/trayicon2.png", + "windowtitle": "TROLLIAN", + "close": { "image": "$path/x.gif", + "loc": [635, 2]}, + "minimize": { "image": "$path/m.gif", + "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] + }, + "sounds": { "alertsound": "$path/alarm.wav" }, + "menus": {"client": {"_name": "Trollian", + "options": "Options", + "userlist": "Fresh Targets", + "exit": "Abscond"}, + "profile": {"_name": "View", + "switch": "Trolltag", + "theme": "Theme", + "color": "Hemospectrum", + "block": "Chumpdump", + "quirks": "Annoying"}, + "rclickchumlist": {"pester": "Troll", + "removechum": "Trash", + "blockchum": "Block", + "addchum": "Add Chump", + "unblockchum": "Mercy"} + }, + "chums": { "style": "border: 0px; background-color: white; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ", + "loc": [476, 90], + "size": [175, 361], + + "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" }, + +"unruly": { "icon": "$path/unruly.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": [85,410], + "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": 7, + "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 + } + ] + }, + "convo": + {"style": "background: rgb(190, 19, 4); font-family: 'Arial'", + "size": [308, 194], + "chumlabel": { "style": "background: rgb(255, 38, 18); color: white;", + "align": { "h": "center", "v": "center" }, + "minheight": 30, + "maxheight": 50, + "text" : "trolling: $handle" + }, + "textarea": { + "style": "background: white; border:0px;" + }, + "input": { + "style": "background: white; border:0px solid #c48a00;margin-top:5px;" + }, + "tabs": { + "style": "", + "selectedstyle": "", + "newmsgcolor": "red", + "tabstyle": 0 + }, + "text": { + "beganpester": "began trolling", + "ceasepester": "gave up trolling", + "blocked": "blocked", + "unblocked": "mercifully forgave" + }, + "systemMsgColor": "#646464" + } + } \ No newline at end of file diff --git a/themes/trollian/trayicon.gif b/themes/trollian/trayicon.gif deleted file mode 100644 index 55a31a0..0000000 Binary files a/themes/trollian/trayicon.gif and /dev/null differ diff --git a/themes/trollian/trayicon3.png b/themes/trollian/trayicon.png similarity index 66% rename from themes/trollian/trayicon3.png rename to themes/trollian/trayicon.png index 84d1156..31f7d29 100644 Binary files a/themes/trollian/trayicon3.png and b/themes/trollian/trayicon.png differ diff --git a/themes/trollian/trayicon2.png b/themes/trollian/trayicon2.png index 31f7d29..84d1156 100644 Binary files a/themes/trollian/trayicon2.png and b/themes/trollian/trayicon2.png differ diff --git a/themes/trollian/tnbgomg.psd b/themes/trollian/trollian.psd similarity index 100% rename from themes/trollian/tnbgomg.psd rename to themes/trollian/trollian.psd diff --git a/tmp/new pc themes.zip b/tmp/new pc themes.zip new file mode 100644 index 0000000..44447b1 Binary files /dev/null and b/tmp/new pc themes.zip differ