mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hopefully final theme fix + Rules tab

Browse source
This commit is contained in:
Dpeta 2021-08-09 06:06:00 +02:00
parent b4ddd2cc51
commit 3962403321
24 changed files with 83 additions and 43 deletions
pesterchum.py
themes
BettyBother
style.js
FRESHjamz
style.js
MSChum
style.js
Scratch
style.js
TrueMSChum
style.js
TrueTrollian
style.js
TrueTrollian2.5
style.js
Zodiac
style.js
battlefield
style.js
crosbytop
style.js
danceofthorns
style.js
enamel
style.js
enoirmel
style.js
gold
style.js
jadeenamel
style.js
niccage
style.js
paperchum
style.js
pesterchum
style.js
squiddlechum
style.js
steamchum
style.js
trollian
style.js
typewriter
style.js
win95chum
style.js

16
pesterchum.py
View file

@ -1324,11 +1324,17 @@ class PesterWindow(MovingWindow):
self.reportBugAction = QtWidgets.QAction(self.theme["main/menus/help/reportbug"], self)
except:
self.reportBugAction = QtWidgets.QAction("REPORT BUG", self)
try:
self.xyzRulesAction = QtWidgets.QAction(self.theme["main/menus/help/rules"], self)
except:
self.xyzRulesAction = QtWidgets.QAction("RULES", self)
self.reportBugAction.triggered.connect(self.reportBug)
self.xyzRulesAction.triggered.connect(self.xyzRules)
helpmenu = self.menu.addMenu(self.theme["main/menus/help/_name"])
self.helpmenu = helpmenu
self.helpmenu.addAction(self.helpAction)
self.helpmenu.addAction(self.xyzRulesAction)
self.helpmenu.addAction(self.botAction)
self.helpmenu.addAction(self.chanServAction)
self.helpmenu.addAction(self.nickServAction)
@ -1851,6 +1857,11 @@ class PesterWindow(MovingWindow):
except:
self.reportBugAction.setText("REPORT BUG")
try:
self.xyzRulesAction.setText(self.theme["main/menus/help/rules"])
except:
self.xyzRulesAction.setText("RULES")
# moods
self.moodsLabel.setText(theme["main/moodlabel/text"])
self.moodsLabel.move(*theme["main/moodlabel/loc"])
@ -3038,7 +3049,10 @@ class PesterWindow(MovingWindow):
@QtCore.pyqtSlot()
def reportBug(self):
QtGui.QDesktopServices.openUrl(QtCore.QUrl("https://github.com/Dpeta/pesterchum-alt-servers/issues", QtCore.QUrl.TolerantMode))
return
@QtCore.pyqtSlot()
def xyzRules(self):
QtGui.QDesktopServices.openUrl(QtCore.QUrl("https://www.pesterchum.xyz/pesterchum-rules", QtCore.QUrl.TolerantMode))
@QtCore.pyqtSlot(QString, QString)
def nickCollision(self, handle, tmphandle):

1
themes/BettyBother/style.js
View file

@ -38,6 +38,7 @@
"help": { "_name": "HELP",
"about": "ABOUT",
"help": "HELP",
"rules": "Rules",
"calsprite": "CALSPRITE",
"nickserv": "NICKSERV" },
"rclickchumlist": {"pester": "PESTER",

1
themes/FRESHjamz/style.js
View file

@ -40,6 +40,7 @@
"quirks": "Quirks"},
"help": { "_name": "Info",
"help": "Info",
"rules": "Rules",
"calsprite": "Calsprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

2
themes/MSChum/style.js
View file

@ -231,7 +231,7 @@
"style": "background: white; border:2px solid #000000;margin-top:5px; margin-right:10px; margin-left:10px; font-size: 12px;font-family: 'Courier'"
},
"tabwindow" : {
"style": "background-color:#f2f2f2;border:0px"
"style": "background-color:#f2f2f2;border:0px;"
},
"tabs": {
"style": "background-color: #f2f2f2; font-family: 'Courier';font:bold;font-size:12px;min-height:25px;",

1
themes/Scratch/style.js
View file

@ -38,6 +38,7 @@
"quirks": "Lingo" },
"help": { "_name": "Info",
"help": "Info",
"rules": "Rules",
"calsprite": "Calsprite",
"nickserv": "NickServ",
"about": "The Deal",

18
themes/TrueMSChum/style.js
View file

@ -123,7 +123,7 @@
"text": "" },
"currentMood": [18, 249]
},
"defaultwindow": { "style": "background: #222222; font-family:'Courier';font:bold;selection-background-color:#F1F1F1; "
"defaultwindow": { "style": "background: #F1F1F1; font-family:'Courier';font:bold;selection-background-color:#F1F1F1; "
},
"addchum": { "style": "background: rgba(255, 255, 0, 0%); border:2px solid #000000; font: bold; color: rgba(0, 0, 0, 0%); font-family:'Courier';",
"pressed" : "background: rgb(255, 255, 255, 30%);",
@ -210,7 +210,7 @@
"convo":
{"style": "background-color: #f2f2f2;background-image:url($path/convobg.png);background-repeat: no-repeat; border:2px solid black; font-family: 'Courier'",
"scrollbar": { "style" : "padding-top:17px; padding-bottom:17px;width: 18px; background: white; border:2px solid #000000;",
"handle": "background-color:#FFFFFF;min-height:20px;",
"handle": "background-color:#000000;min-height:20px;",
"downarrow": "height:17px;border:0px solid #000000;",
"darrowstyle": "image:url($path/downarrow.png);",
"uparrow": "height:17px;border:0px solid #000000;",
@ -218,7 +218,7 @@
},
"margins": {"top": 0, "bottom": 6, "left": 0, "right": 0 },
"size": [500, 325],
"chumlabel": { "style": "margin-bottom: 21px;background: rgb(256, 256, 256); color: white; border:0px; font-size: 14px;font-family: 'Courier'",
"chumlabel": { "style": "margin-bottom: 21px;background: rgb(255, 255, 255); color: white; border:0px; font-size: 14px;font-family: 'Courier'",
"align": { "h": "center", "v": "center" },
"minheight": 47,
"maxheight": 47,
@ -231,12 +231,12 @@
"style": "background: white; border:2px solid #000000;margin-top:5px; margin-right:10px; margin-left:10px; font-size: 12px;font-family: 'Courier'"
},
"tabwindow" : {
"style": "background-color:#f2f2f2;border:0px"
"style": "background-color:#f2f2f2;border:0px;"
},
"tabs": {
"style": "background-color: #f2f2f2; font-family: 'Courier';font:bold;font-size:12px;min-height:25px;",
"selectedstyle": "border:0px;background-color:#f2f2f2;border-top:2px solid black; border-left:2px solid black;border-right:2px solid black; border-top-left-radius: 4px; border-top-right-radius: 4px;",
"newmsgcolor": "#FFFFFF",
"newmsgcolor": "#fdb302",
"tabstyle": 0
},
"text": {
@ -255,23 +255,23 @@
},
"memos":
{"memoicon": "$path/memo.png",
"style": "background-color: #FFFFFF; background-image:url($path/convobg.png); background-repeat: no-repeat; border:2px solid black; font-family: 'Courier'; font: bold; selection-background-color:#919191; ",
"style": "background-color: #fdb302; background-image:url($path/convobg.png); background-repeat: no-repeat; border:2px solid black; font-family: 'Courier'; font: bold; selection-background-color:#919191; ",
"size": [500,325],
"tabs": {
"style": "",
"selectedstyle": "",
"newmsgcolor": "#FFFFFF",
"newmsgcolor": "#fdb302",
"tabstyle": 0
},
"scrollbar": { "style" : "padding-top:17px; padding-bottom:17px;width: 18px; background: rgba(255, 255, 0, 0%); border:0px;",
"handle": "background-color:#FFFFFF;min-height:20px;",
"handle": "background-color:#000000;min-height:20px;",
"downarrow": "height:17px;border:0px solid #000000;",
"darrowstyle": "image:url($path/downarrow.png);",
"uparrow": "height:17px;border:0px solid #000000;",
"uarrowstyle": "image:url($path/uparrow.png);"
},
"label": { "text": "Bulletin Board: $channel",
"style": "margin-bottom: 21px;background: rgb(0, 0, 0); color: white; border:0px; font-size: 14px;",
"style": "margin-bottom: 21px;background: rgb(196, 138, 0); color: white; border:0px; font-size: 14px;",
"align": { "h": "center", "v": "center" },
"minheight": 47,
"maxheight": 47

15
themes/TrueTrollian/style.js
View file

@ -28,7 +28,8 @@
"import": "import U2;",
"reconnect": "Reconnect",
"idle": "Idle",
"exit": "Abscond"},
"exit": "Abscond",
"console": "Console"},
"profile": {"_name": "View",
"switch": "Trolltag",
"theme": "Theme",
@ -40,7 +41,9 @@
"help": "Help",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ" },
"nickserv": "NickServ",
"rules": "Rules",
"reportbug": "Report Bug" },
"rclickchumlist": {"pester": "Troll",
"removechum": "Trash",
"report": "Tattle",
@ -62,7 +65,10 @@
"memonoquirk": "Disable Quirks",
"memohidden": "Hidden",
"memoinvite": "Invite-Only",
"memomute": "Mute" }
"memomute": "Mute",
"beeponmessage": "Beep on Message",
"flashonmessage": "Flash on Message",
"mutenotifications": "Mute Notifications" }
},
"chums": { "style": "font-size: 12px; background: white; border:0px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ",
"scrollbar": { "style" : "background-color:#c2c2c2;",
@ -137,7 +143,8 @@
"size": [0,0] },
"colorswatch": { "loc": [0,0],
"size": [0,0],
"text": "" }
"text": "" },
"currentMood": []
},
"defaultwindow": { "style": "background: #c2c2c2; font-family:'Arial';font:bold;selection-background-color:#545454; "
},

2
themes/TrueTrollian2.5/style.js
View file

@ -158,7 +158,7 @@
},
"input": { "style": "background: white; border:2px solid #ffa4a4;margin-top:5px; margin-right:10px; margin-left:10px; font-size: 12px;" },
"tabwindow" : {
"style": ""
"style": "background-color: #e5000f;border:2px solid #780000;"
},
"text": {
"beganpester": "began trolling",

3
themes/Zodiac/style.js
View file

@ -42,7 +42,8 @@
"nickserv": "NickServ",
"about": "About",
"reportbug": "Report Bug",
"chanserv": "ChanServ"},
"chanserv": "ChanServ",
"rules": "Rules"},
"rclickchumlist": {"pester": "Pester",
"removechum": "Remove",
"report": "Report",

1
themes/battlefield/style.js
View file

@ -37,6 +37,7 @@
"help": { "_name": "Cavalry",
"about": "Creators",
"help": "Help",
"rules": "Rules",
"calsprite": "Calsprite",
"nickserv": "NickServ",
"reportbug": "Report Bug",

1
themes/crosbytop/style.js
View file

@ -39,6 +39,7 @@
"help": { "_name": "MSPA",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

1
themes/danceofthorns/style.js
View file

@ -32,6 +32,7 @@
"help": { "_name": "Help",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

15
themes/enamel/style.js
View file

@ -9,8 +9,8 @@
"loc": [315, 26]},
"minimize": { "image": "$path/m.gif",
"loc": [300, 32]},
"menubar": { "style": "font-family: 'Century Gothic'; font-size: 14px; color:#9d9d9d" },
"menu" : { "style": "font-family: 'Century Gothic'; font-size: 14px; color: #000000; background-color: #fdb302;border:2px solid #ffff00",
"menubar": { "style": "font-family: 'Century Gothic'; font-size: 14px; color:#9d9d9d;" },
"menu" : { "style": "font-family: 'Century Gothic'; font-size: 14px; color: #000000; background-color: #fdb302;border:2px solid #ffff00;",
"menuitem": "margin-right:25px;",
"selected": "background-color: #ffff00",
"loc": [480,30]
@ -37,7 +37,7 @@
"help": { "_name": "Help",
"about": "About",
"help": "Help",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",
@ -66,8 +66,7 @@
"memomute": "Mute",
"beeponmessage": "Beep on Message",
"flashonmessage": "Flash on Message",
"mutenotifications": "Mute Notifications"
}
"mutenotifications": "Mute Notifications" }
},
"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; ",
"scrollbar": { "style" : "background-image:url($path/chumbg.png); background-color: #ffe400;",
@ -263,7 +262,7 @@
},
"margins": {"top": 35, "bottom": 35, "left": 32, "right": 20 },
"size": [480, 348],
"chumlabel": { "style": " background: rgba(255, 255, 0, 0%); color: white; border:0px; font-size: 0px;",
"chumlabel": { "style": " background: rgba(255, 255, 0, 0%); color: white; border:0px; font-size: 14px;",
"align": { "h": "center", "v": "center" },
"minheight": 0,
"maxheight": 0,
@ -272,7 +271,7 @@
"textarea": {
"style": "background-color: white; background-image: url(); font: bold; font-size: 14px; font-family: 'Century Gothic'; border:2px solid yellow;text-align:center;"
},
"input": { "style": "background: white; border:2px solid yellow;margin-top:10px; font: bold; font-size: 14px; font-family: 'Century Gothic'" },
"input": { "style": "background: white; border:2px solid yellow;margin-top:10px; font: bold; font-size: 14px; font-family: 'Century Gothic';" },
"tabs": {
"style": "",
"selectedstyle": "",
@ -310,7 +309,7 @@
"uarrowstyle": "image:url();"
},
"label": { "text": "Bulletin Board: $channel",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba (0,0,0,0) ; background-image:url($path/nothing.png); color: white; border:0px; font-size: 16px;",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba(0,0,0,0); background-image:url($path/nothing.png); color: white; border:0px; font-size: 16px;",
"align": { "h": "center", "v": "center" },
"minheight": 47,
"maxheight": 47

1
themes/enoirmel/style.js
View file

@ -37,6 +37,7 @@
"help": { "_name": "Assistance",
"about": "About!",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

1
themes/gold/style.js
View file

@ -40,6 +40,7 @@
"help": { "_name": "Help",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

5
themes/jadeenamel/style.js
View file

@ -36,6 +36,7 @@
"quirks": "Quirks"},
"help": { "_name": "Help??",
"about": "About!",
"rules": "Rules!",
"help": "Help!!",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
@ -258,7 +259,7 @@
},
"margins": {"top": 35, "bottom": 35, "left": 32, "right": 20 },
"size": [480, 348],
"chumlabel": { "style": " background: rgba(130, 230, 80, 0%); color: #C6FFA9; border:0px; font-size: 0px;",
"chumlabel": { "style": " background: rgba(130, 230, 80, 0%); color: #C6FFA9; border:0px; ",
"align": { "h": "center", "v": "center" },
"minheight": 0,
"maxheight": 0,
@ -308,7 +309,7 @@
"uarrowstyle": "image:url();"
},
"label": { "text": "Bulletin Board: $channel",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba (0,0,0,0) ; background-image:url($path/nothing.png); color: #C6FFA9; border:0px; font-size: 16px;",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba(0,0,0,0) ; background-image:url($path/nothing.png); color: #C6FFA9; border:0px; font-size: 16px;",
"align": { "h": "center", "v": "center" },
"minheight": 47,
"maxheight": 47

7
themes/niccage/style.js
View file

@ -37,6 +37,7 @@
"help": { "_name": "Help",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",
@ -258,7 +259,7 @@
},
"margins": {"top": 35, "bottom": 35, "left": 32, "right": 20 },
"size": [480, 348],
"chumlabel": { "style": " background: rgba(255, 255, 0, 0%); color: #FFFCBD; border:0px; font-size: 0px;",
"chumlabel": { "style": " background: rgba(255, 255, 0, 0%); color: #FFFCBD; border:0px;",
"align": { "h": "center", "v": "center" },
"minheight": 0,
"maxheight": 0,
@ -308,7 +309,7 @@
"uarrowstyle": "image:url();"
},
"label": { "text": "Bulletin Board: $channel",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba (0,0,0,0) ; background-image:url($path/nothing.png); color: #FFFCBD; border:0px; font-size: 16px;",
"style": "margin-bottom: 7px; margin-top: 10px; background-color: rgba(0,0,0,0) ; background-image:url($path/nothing.png); color: #FFFCBD; border:0px; font-size: 16px;",
"align": { "h": "center", "v": "center" },
"minheight": 47,
"maxheight": 47
@ -317,7 +318,7 @@
"textarea": { "style": " background-color: #FFFCBD; background-image:url(); font: bold; font-size: 14px; font-family: 'Arial'; border:2px solid #F7B53D;text-align:center; margin-right:10px; margin-left:10px;" },
"margins": {"top": 0, "bottom": 6, "left": 0, "right": 0 },
"userlist": { "width": 150,
"style": "border:2px solid #F7B53D; background: #FFFCBD; font-family: 'Arial';selection-background-color:#646464; font-size: 14px; margin-left:0px; margin-right:10px;"
"style": "border:2px solid #F7B53D; background: #FFFCBD; font-family: 'Arial';selection-background-color:#646464; font-size: 14px; margin-right:10px;"
},
"time": { "text": { "width": 75,
"style": " border: 2px solid #FFD47C; background: #FFFCBD; font-size: 12px; margin-top: 5px; margin-right: 5px; margin-left: 5px; font-family:'Arial';font:bold;"

1
themes/paperchum/style.js
View file

@ -34,6 +34,7 @@
"help": { "_name": " ",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

1
themes/pesterchum/style.js
View file

@ -39,6 +39,7 @@
"block": "TROLLSLUM",
"quirks": "QUIRKS"},
"help": { "_name": "HELP",
"rules": "RULES",
"about": "ABOUT",
"help": "HELP",
"calsprite": "CALSPRITE",

3
themes/squiddlechum/style.js
View file

@ -42,7 +42,8 @@
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",
"reportbug": "Report Bug" },
"reportbug": "Report Bug",
"rules": "Rules" },
"rclickchumlist": {"pester": "Pester",
"removechum": "Remove Chum",
"report": "Report",

1
themes/steamchum/style.js
View file

@ -34,6 +34,7 @@
"help": { "_name": " ",
"about": "About",
"help": "Help",
"rules": "Rules",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",

3
themes/trollian/style.js
View file

@ -37,12 +37,13 @@
"block": "Chumpdump",
"quirks": "Annoying" },
"help": { "_name": "Help",
"rules": "Rules",
"about": "About",
"help": "Help",
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",
"reportbug": "Report Bug"},
"reportbug": "Report Bug" },
"rclickchumlist": {"pester": "Troll",
"removechum": "Trash",
"report": "Tattle",

3
themes/typewriter/style.js
View file

@ -43,7 +43,8 @@
"calsprite": "CalSprite",
"chanserv": "ChanServ",
"nickserv": "NickServ",
"reportbug": "Report Bug" },
"reportbug": "Report Bug",
"rules": "Rules" },
"rclickchumlist": {"pester": "Converse",
"removechum": "Erase User",
"report": "Report User",

3
themes/win95chum/style.js
View file

@ -21,6 +21,7 @@
"logviewer": "Message Logs",
"randen": "Random Messaging",
"userlist": "Users Online",
"console": "Console",
"talk": "Send Message",
"addgroup": "Add Group",
"import": "Import",
@ -37,6 +38,8 @@
"about": "About",
"help": "Help",
"calsprite": "Lil' Cal Buddy",
"rules": "Rules",
"reportbug": "Report Bug",
"chanserv": "Group Moderation",
"nickserv": "Nickserv" },
"rclickchumlist": {"pester": "Message",