+ PREFIX: ":33 < " + You type: "*ac twitches her friendly whiskers at ct*" + Result: + AC: :33 < *ac twitches her friendly whiskers at ct* ++ +
+ PREFIX: "D --> " + You type: "Hi" + Result: + CT: D --> Hi ++ + Suffixes work the same way, but at the end of the message: + +
+ SUFFIX: "!!!" + You type: hey there + Result: + GD: hey there!!! ++ + Remember that it doesn't automatically add a space! You'll need to add + it in (see CT and AC examples again!) + +* Simple Replace: +This will simply take a set of characters and replace them with other +characters. + * Let's add a quirk to our Nepeta: +
+ Replace: "ee" With: "33" + You type: "*ac saunters from her dark cave a little bit sleepy from + the recent kill*" + Result: + AC: :33 < *ac saunters from her dark cave a little bit sl33py from the + recent kill* ++ + * Let's add two to Equius: +
+ Replace: "loo" With: "100" + Replace: "x" With "%" + You type: "look" + Result: + CT: D --> 100k + + You type: "What are you expecting to accomplish with this" + Result: + CT: D --> What are you e%pecting to accomplish with this ++ + * Aradia: +
+ Replace: "o" With: "0" + You type: "and the reward would be within our reach" + Result: + AA: and the reward w0uld be within 0ur reach ++ + Notice that it is CASE SENSITIVE. So in the above case, if you typed + "ABSCOND", it would not replace the "O". + + * Sollux: +
+ Replace: "i" With: "ii" + Replace: "s" With: "2" ++ + * Eridan: +
+ Replace: "v" With: "vv" + Replace: "w" With: "ww" ++ + * Feferi: +
+ Replace: "h" with: ")("
+ Replace: "H" with: ")("
+ Replace: "E" with: "-E"
+
+
+* Regexp Replace:
+This is a more complex kind of replacement. Regexp stands for "regular
+expression", a kind of programming language (yes, it is a language)
+used to find and replace text. PC 3.14 also includes a function to
+handle capitalization (upper()). If you want to learn it on your own,
+I suggest you start with the Python tutorial
+(http://docs.python.org/howto/regex.html) since PC 3.14 uses Python's
+regexps. Check out V2.5's tutorial too, as that is a pretty good start
+as well.
+
+ * Let's start with Karkat. Regexps are just like your every day find and
+ replace: they search for a string that matches what you want to
+ replace, and replaces it with... the replacement.
+ Regexp: "(.)" Replace with: "upper(\1)"+ + Three concepts here. Let's look at the regexp. "(.)" has two things + going on. The first is that ".". In regexp speak, "." is the wildcard: + it will match *any* character -- and just one. + + The parentheses tell the regexp to *save* what's inside them so you + can put it back when you replace. That's what the "\1" is for -- it + means, "put the match inside parentheses #1 here". You can have any + number of parentheses. + + * "upper()" is a function special to PC 3.14 -- it will uppercase + anything inside the parentheses. So in this case, upper will uppercase + "\1" -- which, as you recall is what we found inside the + parentheses. Which was *every* character. So to sum up, it replaces + every character with an uppercase version of that character. WHICH + MAKES YOU TALK LIKE THIS. + + * Let's look at Terezi next. +
+ Regexp: "[aA]" Replace with: "4" + Regexp: "[iI]" Replace with: "1" + Regexp: "[eE]" Replace with: "3" + Regexp: "(.)" Replace with: "upper(\1)" ++ + We already know what the last line does. But what's up with those + brackets? What's their deal? Basically, in regular expressions, + brackets indicate a list of matching characters. So, basically any + single character within the brackets will be matched. In this case, + either "a" or "A" will be matched and replaced with "4," and likewise, + "i" and "I" will be replaced with "1", and "e" and "E" will be + replaced with "3." + + Just like there is an "upper()" function, there is also a "lower()" + function. It acts just like "upper()" but instead makes everything + inside the parentheses lowercase. This allows you to do things like: +
+ Regexp: "(.)" Replace with: "lower(\1)" + You type: "I AM YELLING" + Result: + GD: i am yelling ++ + Along with the upper and lower functions is a "scramble()" function. + The purpose of this function is to randomly scramble anything inside + the parentheses. +
+ Regexp: "(\w)(\w*)(\w)" Replace with: "\1scramble(\2)\3" + You type: "hello there" + Result: + GD: hlelo trhee ++ + This particular regular expression scrambles all of the letters in + the middle of a word. Notice that the "h" and "o" at the beginning + and end of hello remain in place while the other letters are scrambled. + + You should also know that "^" is a special character in brackets. If + placed immediately after the opening bracket (like "[^"), then the + brackets instead match every character *except* the ones in the + brackets. So, for example, if you wanted to have a quirk where you + capitalized all your letters *except* o, you'd do this: +
+ Regexp: "([^o])" Replace with: "upper(\1)" + You type: "hello there" + Result: + GD: HELLo THERE ++ + You can also specify a *range* of characters inside the brackets, by + using the "-" character. [a-z] will match any lowercase letter. You + can combine them, too: [a-z0-9] will match any digit and lowercase letter. + + There are also different shortcuts for character types: +
+ \d matches any digit; same as [0-9] + \D matches any non-digit; same as [^0-9] + \s matches any spaces + \S matches any non-space + \w matches any alphanumeric character; same as [a-zA-Z0-9_] + \W matches any non-alphanumeric character; same as [^a-zA-Z0-9_] ++ + You can include this inside brackets, too. + + There's also a special character, \\b. What \\b does is make sure that + you are at the beginning or end of a word. + * So with that knowledge, let's try Kanaya: +
+ Regexp: \b(\w) Replace with: upper(\1) + You type: "i suggest you come to terms with it" + Result: + GA: I Suggest You Come To Terms With It ++ + Another feature of regular expressions is the ability to match + *repeated* characters. There are three repeat characters: the "\*", the + "+", "?", and "{m,n}". They work by playing them after the character, + or character type you want to match. (So, you could say "\s+" or ".*") + + The "\*" character matches ZERO or more of that character. So, for + example, "f\*" would match "f" and "ff" -- and any other character! + That's right, every character counts as matching it zero times. Yeah, + it's weird. I suggest you use... + + The "+" character matches ONE or more of that character. So, if we + wanted to have a character that wanted to elongate their s's so that + they used four 's's every time, like sssso, but didn't want to have + eight s's when using words with double s's, like pass, we'd do this: +
+ Regexp: "s+" Replace with: "ssss" + You type: "you shall not pass" + Result: + UU: you sssshall not passss ++ + As for the other two, I can't really think of any useful quirks to be + made with them. But to let you know, "?" matches either 0 or 1 of that + character, so "trolls?" would match "troll" and "trolls". "{m,n}" + matches between m and n characters. (If you leave out 'n', any number + of characters more than m will be matched.) So "s{2,4}" will match + "ss", "sss", and "ssss" and that's it. + + Now with repeating expressions, we can do something like make EVERY + other WORD capitalized: +
+ Regexp: "(\w+) (\w+)" Replace with: "upper(\1) \2" + You type: "this is pretty annoying i bet" + Result: + GD: THIS is PRETTY annoying I bet ++ + The \1 matches the first word -- which has been matched because the + word is alphanumeric characters, repeated once or more -- and \2 + matches the second word. + + Another operator to use is the "|", which will match more than one set + of characters. For example, "black|red" will match "black" or + "red". If you want to match something in the middle of words, you have + to use parentheses: "(black|red) romance" will match "black romance" + and "red romance". + + Finally, there are the "^" and "$" characters. Yes, we already did the + "^" character, but this is OUTSIDE of brackets, not INSIDE. "^" + matches the beginning of a message, and "$" matches the end of it. You + can use this to make more sophisticated prefix and suffix + behaviors. For example, if we have a quirk that adds "..." to the end + of all our messages, we can set it up so it doesn't do that if we put + punctuation [?!.] at the end. So: +
+ Regexp: "([^?!.])$" Replace with: "\1..." ++ + This will match the end of any message as long as it doesn't have + "?", "!", or "." at the end. Then it will replace it with whatever the + last character of the sentence was (remember we're replacing it, so we + have to put it back!) and add "..." at the end. + + Careful with the beginning and ending replaces -- if you use more than + one, you may not get what you expect because they will ALL be applied, + one after the other! This is a bug in my opinion, that I plan to fix! + +* Random replace: +Just like the regexp replace, except that instead of just one thing to +replace it with, you give it a list. PC will then choose from that +list randomly. So let's say I want to randomly end my sentences with +either "bro" or "dog": +
+ Regexp: "$" Replace with: "bro" and "dog" ++ + * You can also imitate Araida's random "ribbits" in between words: +
+ Regexp: "\s" Replace with: " ribbit ", " ", " ", " ", " ", " ", etc.... ++ + where " " is just a blank space added a bunch of times. (You can see + how many blank spaces you've added by clicking on the list.) You have + to add the spaces because each entry has the same chance of being + selected. (Yes, I know this could be improved.) If you add " ribbit " + and 9 spaces, " ribbit " will have a 1/10 chance of being picked. + + Also note that if you add more than one prefix or more than one + suffix, it will pick randomly from them instead of adding them both! + +* Mispeller: +Be careful with thsi one. The mispeller will randomly mispell x% of +the words you type -- where x is the percentage you set the slider +to. I have attempted to mimic SBaHJ mispelling style but whoof knows +what will happen oh god ive created a mosnter + + +SMILIES +------- +Here's a list of smilies: + +* :rancorous: +* :apple: +* :bathearst: +* :cathearst: +* :woeful: +* :pleasant: +* :blueghost: +* :slimer: +* :candycorn: +* :cheer: +* :duhjohn: +* :datrump: +* :facepalm: +* :bonk: +* :mspa: +* :gun: +* :cal: +* :amazedfirman: +* :amazed: +* :chummy: +* :cool: +* :smooth: +* :distraughtfirman +* :distraught: +* :insolent: +* :bemused: +* :3: +* :mystified: +* :pranky: +* :tense: +* :record: +* :squiddle: +* :tab: +* :beetip: +* :flipout: +* :befuddled: +* :pumpkin: +* :trollcool: +* :jadecry: +* :ecstatic: +* :relaxed: +* :discontent: +* :devious: +* :sleek: +* :detestful: +* :mirthful: +* :manipulative: +* :vigorous: +* :perky: +* :acceptant: diff --git a/TODO b/TODO deleted file mode 100644 index 1a89703..0000000 --- a/TODO +++ /dev/null @@ -1,26 +0,0 @@ -Bugs: -* weird memo time bug -* Windows doesn't show style sheet sometimes?? Maybe related to themes. -* Issues with connecting? Client not closing connection right? People keep getting "nick taken" messages -* Windows XP SP2: sometimes mouse clicks dont register? must be some kinda crash -* enamel doesnt have time arrows - -Features: -* different sound for memos/pesters -* OOC -* log viewer needs to have BBCode/HTML/Text copy modes -* random pesters -* copy quirks between profiles? -* chum list groups -* More complex quirks: by-sound -* Theme checking -* Spy mode -* Animated - -Mac Bugs: -* Mac doesn't show tabs right, display gifs, highlighting thing? -SS: also the background image is broken -SS: in the one-on-one pester it resizes with the window -SS: but the memo one doesn't resize -SS: and the arrows next to the time thing overlap the CLOSE button - diff --git a/TODO.mkdn b/TODO.mkdn new file mode 100644 index 0000000..01264a5 --- /dev/null +++ b/TODO.mkdn @@ -0,0 +1,40 @@ +Todo +=============== + +Features +-------- +* OOC +* log viewer needs to have BBCode/HTML/Text copy modes +* copy quirks between profiles? +* More complex quirks: by-sound +* Spy mode +* Turn @ and # links on/off? +* "someone has friended you" notifier +* Show true bans? +* Colour saving boxes things? +* Chum notes? + +Bugs +---- +* weird memo time bug +* Windows doesn't show style sheet sometimes?? Maybe related to themes. +* Issues with connecting? Client not closing connection right? People keep getting "nick taken" messages +* When using mood sort, scroll position jumps to last selected chum +* When left for a really long time, animations slow down pesterchum +* Openning userlist resets appearance of OP/voice for anyone that become OP/voice after you joined a memo +* If pesterchum is open but offline due to a network failure and you open the memos screen, it connects you but doesn't fetch the memo list when it finishes connecting +* right clicking an offline chum and choosing remove asks you why you're reporting someone, and if you hit cancel the menus stop working +* Closing a timeclone doesn't actually cease for everyone else + +Windows Bugs +------------ +* XP SP2: sometimes mouse clicks dont register? must be some kinda crash +* On reconnect and nick change, momentary theme change causes menu items to stop working + +Mac Bugs +-------- +* Mac doesn't show tabs right, display gifs, highlighting thing? +* SS: also the background image is broken +* SS: in the one-on-one pester it resizes with the window +* SS: but the memo one doesn't resize +* SS: and the arrows next to the time thing overlap the CLOSE button diff --git a/bugreport.py b/bugreport.py new file mode 100644 index 0000000..bdf7561 --- /dev/null +++ b/bugreport.py @@ -0,0 +1,74 @@ +from PyQt4 import QtGui, QtCore +import urllib +import version + +class BugReporter(QtGui.QDialog): + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.mainwindow = parent + self.setStyleSheet(self.mainwindow.theme["main/defaultwindow/style"]) + self.setWindowTitle("Report a Bug") + self.setModal(False) + + self.title = QtGui.QLabel("Bug Report:") + + layout_0 = QtGui.QVBoxLayout() + layout_0.addWidget(self.title) + + layout_0.addWidget(QtGui.QLabel("Operating System (ex. Windows 7, Ubuntu 10.10):")) + self.os = QtGui.QLineEdit(self) + self.os.setStyleSheet("background:white; font-weight:bold; color:black; font-size: 10pt;") + layout_0.addWidget(self.os) + + layout_0.addWidget(QtGui.QLabel("Description of bug:")) + descLabel = QtGui.QLabel("Include as much information as possible\n(theme, related options, what you were doing at the time, etc.)") + font = descLabel.font() + font.setPointSize(8) + descLabel.setFont(font) + layout_0.addWidget(descLabel) + + self.textarea = QtGui.QTextEdit(self) + self.textarea.setStyleSheet("background:white; font-weight:normal; color:black; font-size: 10pt;") + + layout_0.addWidget(self.textarea) + + self.ok = QtGui.QPushButton("SEND", self) + self.ok.setDefault(True) + self.connect(self.ok, QtCore.SIGNAL('clicked()'), + self, QtCore.SLOT('sendReport()')) + self.cancel = QtGui.QPushButton("CANCEL", self) + self.connect(self.cancel, QtCore.SIGNAL('clicked()'), + self, QtCore.SLOT('reject()')) + layout_2 = QtGui.QHBoxLayout() + layout_2.addWidget(self.cancel) + layout_2.addWidget(self.ok) + + layout_0.addLayout(layout_2) + + self.setLayout(layout_0) + + @QtCore.pyqtSlot() + def sendReport(self): + name = unicode(self.mainwindow.profile().handle) + os = unicode(self.os.text()) + msg = unicode(self.textarea.toPlainText()) + + if len(os) <= 0 or len(msg) <= 0: + msgbox = QtGui.QMessageBox() + msgbox.setStyleSheet(self.mainwindow.theme["main/defaultwindow/style"]) + msgbox.setText("You must fill out all fields first!") + msgbox.setStandardButtons(QtGui.QMessageBox.Ok) + ret = msgbox.exec_() + return + + QtGui.QDialog.accept(self) + data = urllib.urlencode({"name":name, "version": version._pcVersion, "os":os, "msg":msg}) + print "Sending..." + f = urllib.urlopen("http://distantsphere.com/pc/reporter.php", data) + text = f.read() + print text + if text == "success!": + print "Sent!" + else: + print "Problems ):" + diff --git a/convo.py b/convo.py index fab1ed6..030cdf4 100644 --- a/convo.py +++ b/convo.py @@ -9,7 +9,7 @@ from PyQt4 import QtGui, QtCore from dataobjs import PesterProfile, Mood, PesterHistory from generic import PesterIcon -from parsetools import convertTags, lexMessage, splitMessage, mecmd, colorBegin, colorEnd, img2smiley +from parsetools import convertTags, lexMessage, splitMessage, mecmd, colorBegin, colorEnd, img2smiley, smiledict class PesterTabWindow(QtGui.QFrame): def __init__(self, mainwindow, parent=None, convo="convo"): @@ -19,11 +19,14 @@ class PesterTabWindow(QtGui.QFrame): self.mainwindow = mainwindow self.tabs = QtGui.QTabBar(self) + self.tabs.setMovable(True) self.tabs.setTabsClosable(True) self.connect(self.tabs, QtCore.SIGNAL('currentChanged(int)'), self, QtCore.SLOT('changeTab(int)')) self.connect(self.tabs, QtCore.SIGNAL('tabCloseRequested(int)'), self, QtCore.SLOT('tabClose(int)')) + self.connect(self.tabs, QtCore.SIGNAL('tabMoved(int, int)'), + self, QtCore.SLOT('tabMoved(int, int)')) self.initTheme(self.mainwindow.theme) self.layout = QtGui.QVBoxLayout() @@ -194,17 +197,77 @@ class PesterTabWindow(QtGui.QFrame): self.raise_() convo.raiseChat() + @QtCore.pyqtSlot(int, int) + def tabMoved(self, to, fr): + l = self.tabIndices + for i in l: + if l[i] == fr: + oldpos = i + if l[i] == to: + newpos = i + l[oldpos] = to + l[newpos] = fr + windowClosed = QtCore.pyqtSignal() class PesterText(QtGui.QTextEdit): def __init__(self, theme, parent=None): QtGui.QTextEdit.__init__(self, parent) + if hasattr(self.parent(), 'mainwindow'): + self.mainwindow = self.parent().mainwindow + else: + self.mainwindow = self.parent() self.initTheme(theme) self.setReadOnly(True) self.setMouseTracking(True) self.textSelected = False self.connect(self, QtCore.SIGNAL('copyAvailable(bool)'), self, QtCore.SLOT('textReady(bool)')) + self.urls = {} + for k in smiledict: + self.addAnimation(QtCore.QUrl("smilies/%s" % (smiledict[k])), "smilies/%s" % (smiledict[k])) + self.connect(self.mainwindow, QtCore.SIGNAL('animationSetting(bool)'), + self, QtCore.SLOT('animateChanged(bool)')) + def addAnimation(self, url, fileName): + movie = QtGui.QMovie(self) + movie.setFileName(fileName) + if movie.frameCount() > 1: + self.urls[movie] = url + self.connect(movie, QtCore.SIGNAL('frameChanged(int)'), + self, QtCore.SLOT('animate(int)')) + #movie.start() + @QtCore.pyqtSlot(int) + def animate(self, frame): + if self.mainwindow.config.animations(): + movie = self.sender() + url = self.urls[movie].toString() + html = unicode(self.toHtml()) + if html.find(url) != -1: + if self.parent().parent(): + i = self.parent().parent().tabIndices[self.parent().title()] + if self.parent().parent().tabs.currentIndex() == i: + self.document().addResource(QtGui.QTextDocument.ImageResource, + self.urls[movie], movie.currentPixmap()) + self.setLineWrapColumnOrWidth(self.lineWrapColumnOrWidth()) + else: + self.document().addResource(QtGui.QTextDocument.ImageResource, + self.urls[movie], movie.currentPixmap()) + self.setLineWrapColumnOrWidth(self.lineWrapColumnOrWidth()) + @QtCore.pyqtSlot(bool) + def animateChanged(self, animate): + if animate: + for m in self.urls: + html = unicode(self.toHtml()) + if html.find(self.urls[m].toString()) != -1: + if m.frameCount() > 1: + m.start() + else: + for m in self.urls: + html = unicode(self.toHtml()) + if html.find(self.urls[m].toString()) != -1: + if m.frameCount() > 1: + m.stop() + @QtCore.pyqtSlot(bool) def textReady(self, ready): self.textSelected = ready @@ -222,6 +285,11 @@ class PesterText(QtGui.QTextEdit): parent = self.parent() window = parent.mainwindow me = window.profile() + if self.mainwindow.config.animations(): + for m in self.urls: + if convertTags(lexmsg).find(self.urls[m].toString()) != -1: + if m.state() == QtGui.QMovie.NotRunning: + m.start() if self.parent().mainwindow.config.showTimeStamps(): if self.parent().mainwindow.config.time12Format(): time = strftime("[%I:%M") @@ -276,7 +344,7 @@ class PesterText(QtGui.QTextEdit): lexmsg[0:0] = [colorBegin("
, tag='pre', attrs=[('class', 'screen')]
+ if _debug: sys.stderr.write('_BaseHTMLProcessor, unknown_starttag, tag=%s\n' % tag)
+ uattrs = []
+ # thanks to Kevin Marks for this breathtaking hack to deal with (valid) high-bit attribute values in UTF-8 feeds
+ for key, value in attrs:
+ if type(value) != type(u''):
+ value = unicode(value, self.encoding)
+ uattrs.append((unicode(key, self.encoding), value))
+ strattrs = u''.join([u' %s="%s"' % (key, value) for key, value in uattrs]).encode(self.encoding)
+ if tag in self.elements_no_end_tag:
+ self.pieces.append('<%(tag)s%(strattrs)s />' % locals())
+ else:
+ self.pieces.append('<%(tag)s%(strattrs)s>' % locals())
+
+ def unknown_endtag(self, tag):
+ # called for each end tag, e.g. for , tag will be 'pre'
+ # Reconstruct the original end tag.
+ if tag not in self.elements_no_end_tag:
+ self.pieces.append("" % locals())
+
+ def handle_charref(self, ref):
+ # called for each character reference, e.g. for ' ', ref will be '160'
+ # Reconstruct the original character reference.
+ self.pieces.append('&#%(ref)s;' % locals())
+
+ def handle_entityref(self, ref):
+ # called for each entity reference, e.g. for '©', ref will be 'copy'
+ # Reconstruct the original entity reference.
+ self.pieces.append('&%(ref)s;' % locals())
+
+ def handle_data(self, text):
+ # called for each block of plain text, i.e. outside of any tag and
+ # not containing any character or entity references
+ # Store the original text verbatim.
+ if _debug: sys.stderr.write('_BaseHTMLProcessor, handle_text, text=%s\n' % text)
+ self.pieces.append(text)
+
+ def handle_comment(self, text):
+ # called for each HTML comment, e.g.
+ # Reconstruct the original comment.
+ self.pieces.append('' % locals())
+
+ def handle_pi(self, text):
+ # called for each processing instruction, e.g.
+ # Reconstruct original processing instruction.
+ self.pieces.append('' % locals())
+
+ def handle_decl(self, text):
+ # called for the DOCTYPE, if present, e.g.
+ #
+ # Reconstruct original DOCTYPE
+ self.pieces.append('' % locals())
+
+ _new_declname_match = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9:]*\s*').match
+ def _scan_name(self, i, declstartpos):
+ rawdata = self.rawdata
+ n = len(rawdata)
+ if i == n:
+ return None, -1
+ m = self._new_declname_match(rawdata, i)
+ if m:
+ s = m.group()
+ name = s.strip()
+ if (i + len(s)) == n:
+ return None, -1 # end of buffer
+ return name.lower(), m.end()
+ else:
+ self.handle_data(rawdata)
+# self.updatepos(declstartpos, i)
+ return None, -1
+
+ def output(self):
+ '''Return processed HTML as a single string'''
+ return ''.join([str(p) for p in self.pieces])
+
+class _LooseFeedParser(_FeedParserMixin, _BaseHTMLProcessor):
+ def __init__(self, baseuri, baselang, encoding):
+ sgmllib.SGMLParser.__init__(self)
+ _FeedParserMixin.__init__(self, baseuri, baselang, encoding)
+
+ def decodeEntities(self, element, data):
+ data = data.replace('<', '<')
+ data = data.replace('<', '<')
+ data = data.replace('>', '>')
+ data = data.replace('>', '>')
+ data = data.replace('&', '&')
+ data = data.replace('&', '&')
+ data = data.replace('"', '"')
+ data = data.replace('"', '"')
+ data = data.replace(''', ''')
+ data = data.replace(''', ''')
+ if self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'):
+ data = data.replace('<', '<')
+ data = data.replace('>', '>')
+ data = data.replace('&', '&')
+ data = data.replace('"', '"')
+ data = data.replace(''', "'")
+ return data
+
+class _RelativeURIResolver(_BaseHTMLProcessor):
+ relative_uris = [('a', 'href'),
+ ('applet', 'codebase'),
+ ('area', 'href'),
+ ('blockquote', 'cite'),
+ ('body', 'background'),
+ ('del', 'cite'),
+ ('form', 'action'),
+ ('frame', 'longdesc'),
+ ('frame', 'src'),
+ ('iframe', 'longdesc'),
+ ('iframe', 'src'),
+ ('head', 'profile'),
+ ('img', 'longdesc'),
+ ('img', 'src'),
+ ('img', 'usemap'),
+ ('input', 'src'),
+ ('input', 'usemap'),
+ ('ins', 'cite'),
+ ('link', 'href'),
+ ('object', 'classid'),
+ ('object', 'codebase'),
+ ('object', 'data'),
+ ('object', 'usemap'),
+ ('q', 'cite'),
+ ('script', 'src')]
+
+ def __init__(self, baseuri, encoding):
+ _BaseHTMLProcessor.__init__(self, encoding)
+ self.baseuri = baseuri
+
+ def resolveURI(self, uri):
+ return _urljoin(self.baseuri, uri)
+
+ def unknown_starttag(self, tag, attrs):
+ attrs = self.normalize_attrs(attrs)
+ attrs = [(key, ((tag, key) in self.relative_uris) and self.resolveURI(value) or value) for key, value in attrs]
+ _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+
+def _resolveRelativeURIs(htmlSource, baseURI, encoding):
+ if _debug: sys.stderr.write('entering _resolveRelativeURIs\n')
+ p = _RelativeURIResolver(baseURI, encoding)
+ p.feed(htmlSource)
+ return p.output()
+
+class _HTMLSanitizer(_BaseHTMLProcessor):
+ acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b', 'big',
+ 'blockquote', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col',
+ 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'fieldset',
+ 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input',
+ 'ins', 'kbd', 'label', 'legend', 'li', 'map', 'menu', 'ol', 'optgroup',
+ 'option', 'p', 'pre', 'q', 's', 'samp', 'select', 'small', 'span', 'strike',
+ 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th',
+ 'thead', 'tr', 'tt', 'u', 'ul', 'var']
+
+ acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+ 'action', 'align', 'alt', 'axis', 'border', 'cellpadding', 'cellspacing',
+ 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'clear', 'cols',
+ 'colspan', 'color', 'compact', 'coords', 'datetime', 'dir', 'disabled',
+ 'enctype', 'for', 'frame', 'headers', 'height', 'href', 'hreflang', 'hspace',
+ 'id', 'ismap', 'label', 'lang', 'longdesc', 'maxlength', 'media', 'method',
+ 'multiple', 'name', 'nohref', 'noshade', 'nowrap', 'prompt', 'readonly',
+ 'rel', 'rev', 'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size',
+ 'span', 'src', 'start', 'summary', 'tabindex', 'target', 'title', 'type',
+ 'usemap', 'valign', 'value', 'vspace', 'width']
+
+ unacceptable_elements_with_end_tag = ['script', 'applet']
+
+ def reset(self):
+ _BaseHTMLProcessor.reset(self)
+ self.unacceptablestack = 0
+
+ def unknown_starttag(self, tag, attrs):
+ if not tag in self.acceptable_elements:
+ if tag in self.unacceptable_elements_with_end_tag:
+ self.unacceptablestack += 1
+ return
+ attrs = self.normalize_attrs(attrs)
+ attrs = [(key, value) for key, value in attrs if key in self.acceptable_attributes]
+ _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+
+ def unknown_endtag(self, tag):
+ if not tag in self.acceptable_elements:
+ if tag in self.unacceptable_elements_with_end_tag:
+ self.unacceptablestack -= 1
+ return
+ _BaseHTMLProcessor.unknown_endtag(self, tag)
+
+ def handle_pi(self, text):
+ pass
+
+ def handle_decl(self, text):
+ pass
+
+ def handle_data(self, text):
+ if not self.unacceptablestack:
+ _BaseHTMLProcessor.handle_data(self, text)
+
+def _sanitizeHTML(htmlSource, encoding):
+ p = _HTMLSanitizer(encoding)
+ p.feed(htmlSource)
+ data = p.output()
+ if TIDY_MARKUP:
+ # loop through list of preferred Tidy interfaces looking for one that's installed,
+ # then set up a common _tidy function to wrap the interface-specific API.
+ _tidy = None
+ for tidy_interface in PREFERRED_TIDY_INTERFACES:
+ try:
+ if tidy_interface == "uTidy":
+ from tidy import parseString as _utidy
+ def _tidy(data, **kwargs):
+ return str(_utidy(data, **kwargs))
+ break
+ elif tidy_interface == "mxTidy":
+ from mx.Tidy import Tidy as _mxtidy
+ def _tidy(data, **kwargs):
+ nerrors, nwarnings, data, errordata = _mxtidy.tidy(data, **kwargs)
+ return data
+ break
+ except:
+ pass
+ if _tidy:
+ utf8 = type(data) == type(u'')
+ if utf8:
+ data = data.encode('utf-8')
+ data = _tidy(data, output_xhtml=1, numeric_entities=1, wrap=0, char_encoding="utf8")
+ if utf8:
+ data = unicode(data, 'utf-8')
+ if data.count('tags in +# encoded HTML (skadz); fixed unicode handling in normalize_attrs (ChrisL); +# fixed relative URI processing for guid (skadz); added ICBM support; added +# base64 support +#2.7.5 - 1/15/2004 - MAP - added workaround for malformed DOCTYPE (seen on many +# blogspot.com sites); added _debug variable +#2.7.6 - 1/16/2004 - MAP - fixed bug with StringIO importing +#3.0b3 - 1/23/2004 - MAP - parse entire feed with real XML parser (if available); +# added several new supported namespaces; fixed bug tracking naked markup in +# description; added support for enclosure; added support for source; re-added +# support for cloud which got dropped somehow; added support for expirationDate +#3.0b4 - 1/26/2004 - MAP - fixed xml:lang inheritance; fixed multiple bugs tracking +# xml:base URI, one for documents that don't define one explicitly and one for +# documents that define an outer and an inner xml:base that goes out of scope +# before the end of the document +#3.0b5 - 1/26/2004 - MAP - fixed bug parsing multiple links at feed level +#3.0b6 - 1/27/2004 - MAP - added feed type and version detection, result['version'] +# will be one of SUPPORTED_VERSIONS.keys() or empty string if unrecognized; +# added support for creativeCommons:license and cc:license; added support for +# full Atom content model in title, tagline, info, copyright, summary; fixed bug +# with gzip encoding (not always telling server we support it when we do) +#3.0b7 - 1/28/2004 - MAP - support Atom-style author element in author_detail +# (dictionary of 'name', 'url', 'email'); map author to author_detail if author +# contains name + email address +#3.0b8 - 1/28/2004 - MAP - added support for contributor +#3.0b9 - 1/29/2004 - MAP - fixed check for presence of dict function; added +# support for summary +#3.0b10 - 1/31/2004 - MAP - incorporated ISO-8601 date parsing routines from +# xml.util.iso8601 +#3.0b11 - 2/2/2004 - MAP - added 'rights' to list of elements that can contain +# dangerous markup; fiddled with decodeEntities (not right); liberalized +# date parsing even further +#3.0b12 - 2/6/2004 - MAP - fiddled with decodeEntities (still not right); +# added support to Atom 0.2 subtitle; added support for Atom content model +# in copyright; better sanitizing of dangerous HTML elements with end tags +# (script, frameset) +#3.0b13 - 2/8/2004 - MAP - better handling of empty HTML tags (br, hr, img, +# etc.) in embedded markup, in either HTML or XHTML form (
,
,
) +#3.0b14 - 2/8/2004 - MAP - fixed CDATA handling in non-wellformed feeds under +# Python 2.1 +#3.0b15 - 2/11/2004 - MAP - fixed bug resolving relative links in wfw:commentRSS; +# fixed bug capturing author and contributor URL; fixed bug resolving relative +# links in author and contributor URL; fixed bug resolvin relative links in +# generator URL; added support for recognizing RSS 1.0; passed Simon Fell's +# namespace tests, and included them permanently in the test suite with his +# permission; fixed namespace handling under Python 2.1 +#3.0b16 - 2/12/2004 - MAP - fixed support for RSS 0.90 (broken in b15) +#3.0b17 - 2/13/2004 - MAP - determine character encoding as per RFC 3023 +#3.0b18 - 2/17/2004 - MAP - always map description to summary_detail (Andrei); +# use libxml2 (if available) +#3.0b19 - 3/15/2004 - MAP - fixed bug exploding author information when author +# name was in parentheses; removed ultra-problematic mxTidy support; patch to +# workaround crash in PyXML/expat when encountering invalid entities +# (MarkMoraes); support for textinput/textInput +#3.0b20 - 4/7/2004 - MAP - added CDF support +#3.0b21 - 4/14/2004 - MAP - added Hot RSS support +#3.0b22 - 4/19/2004 - MAP - changed 'channel' to 'feed', 'item' to 'entries' in +# results dict; changed results dict to allow getting values with results.key +# as well as results[key]; work around embedded illformed HTML with half +# a DOCTYPE; work around malformed Content-Type header; if character encoding +# is wrong, try several common ones before falling back to regexes (if this +# works, bozo_exception is set to CharacterEncodingOverride); fixed character +# encoding issues in BaseHTMLProcessor by tracking encoding and converting +# from Unicode to raw strings before feeding data to sgmllib.SGMLParser; +# convert each value in results to Unicode (if possible), even if using +# regex-based parsing +#3.0b23 - 4/21/2004 - MAP - fixed UnicodeDecodeError for feeds that contain +# high-bit characters in attributes in embedded HTML in description (thanks +# Thijs van de Vossen); moved guid, date, and date_parsed to mapped keys in +# FeedParserDict; tweaked FeedParserDict.has_key to return True if asking +# about a mapped key +#3.0fc1 - 4/23/2004 - MAP - made results.entries[0].links[0] and +# results.entries[0].enclosures[0] into FeedParserDict; fixed typo that could +# cause the same encoding to be tried twice (even if it failed the first time); +# fixed DOCTYPE stripping when DOCTYPE contained entity declarations; +# better textinput and image tracking in illformed RSS 1.0 feeds +#3.0fc2 - 5/10/2004 - MAP - added and passed Sam's amp tests; added and passed +# my blink tag tests +#3.0fc3 - 6/18/2004 - MAP - fixed bug in _changeEncodingDeclaration that +# failed to parse utf-16 encoded feeds; made source into a FeedParserDict; +# duplicate admin:generatorAgent/@rdf:resource in generator_detail.url; +# added support for image; refactored parse() fallback logic to try other +# encodings if SAX parsing fails (previously it would only try other encodings +# if re-encoding failed); remove unichr madness in normalize_attrs now that +# we're properly tracking encoding in and out of BaseHTMLProcessor; set +# feed.language from root-level xml:lang; set entry.id from rdf:about; +# send Accept header +#3.0 - 6/21/2004 - MAP - don't try iso-8859-1 (can't distinguish between +# iso-8859-1 and windows-1252 anyway, and most incorrectly marked feeds are +# windows-1252); fixed regression that could cause the same encoding to be +# tried twice (even if it failed the first time) +#3.0.1 - 6/22/2004 - MAP - default to us-ascii for all text/* content types; +# recover from malformed content-type header parameter with no equals sign +# ('text/xml; charset:iso-8859-1') +#3.1 - 6/28/2004 - MAP - added and passed tests for converting HTML entities +# to Unicode equivalents in illformed feeds (aaronsw); added and +# passed tests for converting character entities to Unicode equivalents +# in illformed feeds (aaronsw); test for valid parsers when setting +# XML_AVAILABLE; make version and encoding available when server returns +# a 304; add handlers parameter to pass arbitrary urllib2 handlers (like +# digest auth or proxy support); add code to parse username/password +# out of url and send as basic authentication; expose downloading-related +# exceptions in bozo_exception (aaronsw); added __contains__ method to +# FeedParserDict (aaronsw); added publisher_detail (aaronsw) +#3.2 - 7/3/2004 - MAP - use cjkcodecs and iconv_codec if available; always +# convert feed to UTF-8 before passing to XML parser; completely revamped +# logic for determining character encoding and attempting XML parsing +# (much faster); increased default timeout to 20 seconds; test for presence +# of Location header on redirects; added tests for many alternate character +# encodings; support various EBCDIC encodings; support UTF-16BE and +# UTF16-LE with or without a BOM; support UTF-8 with a BOM; support +# UTF-32BE and UTF-32LE with or without a BOM; fixed crashing bug if no +# XML parsers are available; added support for 'Content-encoding: deflate'; +# send blank 'Accept-encoding: ' header if neither gzip nor zlib modules +# are available +#3.3 - 7/15/2004 - MAP - optimize EBCDIC to ASCII conversion; fix obscure +# problem tracking xml:base and xml:lang if element declares it, child +# doesn't, first grandchild redeclares it, and second grandchild doesn't; +# refactored date parsing; defined public registerDateHandler so callers +# can add support for additional date formats at runtime; added support +# for OnBlog, Nate, MSSQL, Greek, and Hungarian dates (ytrewq1); added +# zopeCompatibilityHack() which turns FeedParserDict into a regular +# dictionary, required for Zope compatibility, and also makes command- +# line debugging easier because pprint module formats real dictionaries +# better than dictionary-like objects; added NonXMLContentType exception, +# which is stored in bozo_exception when a feed is served with a non-XML +# media type such as 'text/plain'; respect Content-Language as default +# language if not xml:lang is present; cloud dict is now FeedParserDict; +# generator dict is now FeedParserDict; better tracking of xml:lang, +# including support for xml:lang='' to unset the current language; +# recognize RSS 1.0 feeds even when RSS 1.0 namespace is not the default +# namespace; don't overwrite final status on redirects (scenarios: +# redirecting to a URL that returns 304, redirecting to a URL that +# redirects to another URL with a different type of redirect); add +# support for HTTP 303 redirects +#4.0 - MAP - support for relative URIs in xml:base attribute; fixed +# encoding issue with mxTidy (phopkins); preliminary support for RFC 3229; +# support for Atom 1.0; support for iTunes extensions; new 'tags' for +# categories/keywords/etc. as array of dict +# {'term': term, 'scheme': scheme, 'label': label} to match Atom 1.0 +# terminology; parse RFC 822-style dates with no time; lots of other +# bug fixes +#4.1 - MAP - removed socket timeout; added support for chardet library diff --git a/generic.py b/generic.py index 9d9d170..b1aa414 100644 --- a/generic.py +++ b/generic.py @@ -26,7 +26,7 @@ class PesterList(list): class PesterIcon(QtGui.QIcon): def __init__(self, *x, **y): - QtGui.QIcon.__init__(self, *x, **y) + QtGui.QIcon.__init__(self, x[0]) if type(x[0]) in [str, unicode]: self.icon_pixmap = QtGui.QPixmap(x[0]) else: @@ -50,6 +50,15 @@ class RightClickList(QtGui.QListWidget): def getOptionsMenu(self): return self.optionsMenu +class RightClickTree(QtGui.QTreeWidget): + def contextMenuEvent(self, event): + if event.reason() == QtGui.QContextMenuEvent.Mouse: + listing = self.itemAt(event.pos()) + self.setCurrentItem(listing) + self.getOptionsMenu().popup(event.globalPos()) + def getOptionsMenu(self): + return self.optionsMenu + class MultiTextDialog(QtGui.QDialog): def __init__(self, title, parent, *queries): QtGui.QDialog.__init__(self, parent) diff --git a/irc.py b/irc.py index b0087cc..b74eac5 100644 --- a/irc.py +++ b/irc.py @@ -5,9 +5,11 @@ from oyoyo import helpers import logging import random import socket +from time import time from dataobjs import Mood, PesterProfile from generic import PesterList +from version import _pcVersion logging.basicConfig(level=logging.INFO) @@ -53,7 +55,7 @@ class PesterIRC(QtCore.QThread): if not res: logging.debug("false Yield: %s, returning" % res) return - + def setConnected(self): self.registeredIRC = True self.connected.emit() @@ -87,18 +89,49 @@ class PesterIRC(QtCore.QThread): self.cli.command_handler.getMood(*chums) @QtCore.pyqtSlot(PesterList) def getMoods(self, chums): - self.cli.command_handler.getMood(*chums) + self.cli.command_handler.getMood(*chums) + @QtCore.pyqtSlot(QtCore.QString, QtCore.QString) + def sendNotice(self, text, handle): + h = unicode(handle) + t = unicode(text) + try: + helpers.notice(self.cli, h, t) + except socket.error: + self.setConnectionBroken() @QtCore.pyqtSlot(QtCore.QString, QtCore.QString) def sendMessage(self, text, handle): h = unicode(handle) textl = [unicode(text)] def splittext(l): if len(l[0]) > 450: - space = l[0].rfind(" ", 0,450) + space = l[0].rfind(" ", 0,430) if space == -1: space = 450 + elif l[0][space+1:space+5] == "": + space = space+4 a = l[0][0:space+1] b = l[0][space+1:] + if a.count("
" - msg = convertTags(msg, "text") + bbcodemsg = time + convertTags(msg, "bbcode") + html = time + convertTags(msg, "html")+"
" + msg = time +convertTags(msg, "text") modes = {"bbcode": bbcodemsg, "html": html, "text": msg} if not self.convos.has_key(handle): time = datetime.now().strftime("%Y-%m-%d.%H.%M") @@ -120,6 +180,8 @@ class PesterProfileDB(dict): else: self.logpath = _datadir+"logs" + if not os.path.exists(self.logpath): + os.makedirs(self.logpath) try: fp = open("%s/chums.js" % (self.logpath), 'r') chumdict = json.load(fp) @@ -135,7 +197,14 @@ class PesterProfileDB(dict): json.dump(chumdict, fp) fp.close() - converted = dict([(handle, PesterProfile(handle, color=QtGui.QColor(c['color']), mood=Mood(c['mood']))) for (handle, c) in chumdict.iteritems()]) + u = [] + for (handle, c) in chumdict.iteritems(): + try: + g = c['group'] + u.append((handle, PesterProfile(handle, color=QtGui.QColor(c['color']), mood=Mood(c['mood']), group=g))) + except KeyError: + u.append((handle, PesterProfile(handle, color=QtGui.QColor(c['color']), mood=Mood(c['mood'])))) + converted = dict(u) self.update(converted) def save(self): @@ -156,6 +225,17 @@ class PesterProfileDB(dict): self[handle].color = color else: self[handle] = PesterProfile(handle, color) + def getGroup(self, handle, default="Chums"): + if not self.has_key(handle): + return default + else: + return self[handle].group + def setGroup(self, handle, theGroup): + if self.has_key(handle): + self[handle].group = theGroup + else: + self[handle] = PesterProfile(handle, group=theGroup) + self.save() def __setitem__(self, key, val): dict.__setitem__(self, key, val) self.save() @@ -231,7 +311,11 @@ class pesterTheme(dict): return False class userConfig(object): - def __init__(self): + def __init__(self, parent): + self.parent = parent + # Use for bit flag log setting + self.LOG = 1 + self.STAMP = 2 if sys.platform != "darwin": self.filename = "pesterchum.js" else: @@ -243,6 +327,29 @@ class userConfig(object): self.userprofile = userProfile(self.config["defaultprofile"]) else: self.userprofile = None + + if sys.platform != "darwin": + self.logpath = "logs" + else: + self.logpath = _datadir+"logs" + + if not os.path.exists(self.logpath): + os.makedirs(self.logpath) + try: + fp = open("%s/groups.js" % (self.logpath), 'r') + self.groups = json.load(fp) + fp.close() + except IOError: + self.groups = {} + fp = open("%s/groups.js" % (self.logpath), 'w') + json.dump(self.groups, fp) + fp.close() + except ValueError: + self.groups = {} + fp = open("%s/groups.js" % (self.logpath), 'w') + json.dump(self.groups, fp) + fp.close() + def chums(self): if not self.config.has_key('chums'): self.set("chums", []) @@ -268,6 +375,54 @@ class userConfig(object): if not self.config.has_key('showSeconds'): self.set("showSeconds", False) return self.config.get('showSeconds', False) + def sortMethod(self): + return self.config.get('sortMethod', 0) + def useGroups(self): + return self.config.get('useGroups', False) + def openDefaultGroup(self): + groups = self.getGroups() + for g in groups: + if g[0] == "Chums": + return g[1] + return True + def showEmptyGroups(self): + if not self.config.has_key('emptyGroups'): + self.set("emptyGroups", False) + return self.config.get('emptyGroups', False) + def showOnlineNumbers(self): + if not self.config.has_key('onlineNumbers'): + self.set("onlineNumbers", False) + return self.config.get('onlineNumbers', False) + def logPesters(self): + return self.config.get('logPesters', self.LOG | self.STAMP) + def logMemos(self): + return self.config.get('logMemos', self.LOG) + def disableUserLinks(self): + return not self.config.get('userLinks', True) + def idleTime(self): + return self.config.get('idleTime', 10) + def minimizeAction(self): + return self.config.get('miniAction', 0) + def closeAction(self): + return self.config.get('closeAction', 1) + def opvoiceMessages(self): + return self.config.get('opvMessages', True) + def animations(self): + return self.config.get('animations', True) + def checkForUpdates(self): + u = self.config.get('checkUpdates', 0) + if type(u) == type(bool()): + if u: u = 2 + else: u = 3 + return u + # Once a day + # Once a week + # Only on start + # Never + def lastUCheck(self): + return self.config.get('lastUCheck', 0) + def checkMSPA(self): + return self.config.get('mspa', False) def addChum(self, chum): if chum.handle not in self.chums(): fp = open(self.filename) # what if we have two clients open?? @@ -295,14 +450,67 @@ class userConfig(object): l = self.getBlocklist() l.pop(l.index(handle)) self.set('block', l) + def getGroups(self): + if not self.groups.has_key('groups'): + self.saveGroups([["Chums", True]]) + return self.groups.get('groups', [["Chums", True]]) + def addGroup(self, group, open=True): + l = self.getGroups() + exists = False + for g in l: + if g[0] == group: + exists = True + break + if not exists: + l.append([group,open]) + l.sort() + self.saveGroups(l) + def delGroup(self, group): + l = self.getGroups() + i = 0 + for g in l: + if g[0] == group: break + i = i+1 + l.pop(i) + l.sort() + self.saveGroups(l) + def expandGroup(self, group, open=True): + l = self.getGroups() + for g in l: + if g[0] == group: + g[1] = open + break + self.saveGroups(l) + def saveGroups(self, groups): + self.groups['groups'] = groups + try: + jsonoutput = json.dumps(self.groups) + except ValueError, e: + raise e + fp = open("%s/groups.js" % (self.logpath), 'w') + fp.write(jsonoutput) + fp.close() + def server(self): + if hasattr(self.parent, 'serverOverride'): + return self.parent.serverOverride return self.config.get('server', 'irc.mindfang.org') def port(self): + if hasattr(self.parent, 'portOverride'): + return self.parent.portOverride return self.config.get('port', '6667') def soundOn(self): if not self.config.has_key('soundon'): self.set('soundon', True) return self.config['soundon'] + def chatSound(self): + return self.config.get('chatSound', True) + def memoSound(self): + return self.config.get('memoSound', True) + def nameSound(self): + return self.config.get('nameSound', True) + def volume(self): + return self.config.get('volume', 100) def set(self, item, setting): self.config[item] = setting try: @@ -345,6 +553,7 @@ class userProfile(object): self.chat.mood = Mood(self.theme["main/defaultmood"]) self.lastmood = self.chat.mood.value() self.quirks = pesterQuirks([]) + self.randoms = False else: fp = open("%s/%s.js" % (self.profiledir, user)) self.userprofile = json.load(fp) @@ -358,6 +567,9 @@ class userProfile(object): QtGui.QColor(self.userprofile["color"]), Mood(self.lastmood)) self.quirks = pesterQuirks(self.userprofile["quirks"]) + if "randoms" not in self.userprofile: + self.userprofile["randoms"] = False + self.randoms = self.userprofile["randoms"] def setMood(self, mood): self.chat.mood = mood @@ -373,6 +585,10 @@ class userProfile(object): self.quirks = quirks self.userprofile["quirks"] = self.quirks.plainList() self.save() + def setRandom(self, random): + self.randoms = random + self.userprofile["randoms"] = random + self.save() def getLastMood(self): return self.lastmood def setLastMood(self, mood): @@ -407,13 +623,14 @@ class WMButton(QtGui.QPushButton): def __init__(self, icon, parent=None): QtGui.QPushButton.__init__(self, icon, "", parent) self.setIconSize(icon.realsize()) + self.resize(icon.realsize()) self.setFlat(True) self.setStyleSheet("QPushButton { padding: 0px; }") self.setAutoDefault(False) -class chumListing(QtGui.QListWidgetItem): +class chumListing(QtGui.QTreeWidgetItem): def __init__(self, chum, window): - QtGui.QListWidgetItem.__init__(self, chum.handle) + QtGui.QTreeWidgetItem.__init__(self, [chum.handle]) self.mainwindow = window self.chum = chum self.handle = chum.handle @@ -427,33 +644,40 @@ class chumListing(QtGui.QListWidgetItem): mood = self.chum.mood self.mood = mood icon = self.mood.icon(self.mainwindow.theme) - self.setIcon(icon) + self.setIcon(0, icon) try: - self.setTextColor(QtGui.QColor(self.mainwindow.theme["main/chums/moods"][self.mood.name()]["color"])) + self.setTextColor(0, QtGui.QColor(self.mainwindow.theme["main/chums/moods"][self.mood.name()]["color"])) except KeyError: - self.setTextColor(QtGui.QColor(self.mainwindow.theme["main/chums/moods/chummy/color"])) + self.setTextColor(0, QtGui.QColor(self.mainwindow.theme["main/chums/moods/chummy/color"])) def changeTheme(self, theme): icon = self.mood.icon(theme) - self.setIcon(icon) + self.setIcon(0, icon) try: - self.setTextColor(QtGui.QColor(self.mainwindow.theme["main/chums/moods"][self.mood.name()]["color"])) + self.setTextColor(0, QtGui.QColor(self.mainwindow.theme["main/chums/moods"][self.mood.name()]["color"])) except KeyError: - self.setTextColor(QtGui.QColor(self.mainwindow.theme["main/chums/moods/chummy/color"])) + self.setTextColor(0, QtGui.QColor(self.mainwindow.theme["main/chums/moods/chummy/color"])) def __lt__(self, cl): h1 = self.handle.lower() h2 = cl.handle.lower() return (h1 < h2) -class chumArea(RightClickList): +class chumArea(RightClickTree): def __init__(self, chums, parent=None): - QtGui.QListWidget.__init__(self, parent) + QtGui.QTreeWidget.__init__(self, parent) self.mainwindow = parent theme = self.mainwindow.theme self.chums = chums + gTemp = self.mainwindow.config.getGroups() + self.groups = [g[0] for g in gTemp] + self.openGroups = [g[1] for g in gTemp] + self.showAllGroups(True) if not self.mainwindow.config.hideOfflineChums(): self.showAllChums() - self.optionsMenu = QtGui.QMenu(self) + if not self.mainwindow.config.showEmptyGroups(): + self.hideEmptyGroups() + self.groupMenu = QtGui.QMenu(self) self.canonMenu = QtGui.QMenu(self) + self.optionsMenu = QtGui.QMenu(self) self.pester = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/pester"], self) self.connect(self.pester, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('activateChum()')) @@ -472,29 +696,158 @@ class chumArea(RightClickList): self.findalts = QtGui.QAction("Find Alts", self) self.connect(self.findalts, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('findAlts()')) + self.removegroup = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/removegroup"], self) + self.connect(self.removegroup, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('removeGroup()')) + self.renamegroup = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/renamegroup"], self) + self.connect(self.renamegroup, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('renameGroup()')) self.optionsMenu.addAction(self.pester) self.optionsMenu.addAction(self.logchum) self.optionsMenu.addAction(self.blockchum) self.optionsMenu.addAction(self.removechum) + self.moveMenu = QtGui.QMenu(self.mainwindow.theme["main/menus/rclickchumlist/movechum"], self) + self.optionsMenu.addMenu(self.moveMenu) self.optionsMenu.addAction(self.reportchum) + self.moveGroupMenu() + + self.groupMenu.addAction(self.renamegroup) + self.groupMenu.addAction(self.removegroup) - self.canonMenu.addAction(self.pester) self.canonMenu.addAction(self.logchum) self.canonMenu.addAction(self.blockchum) self.canonMenu.addAction(self.removechum) + self.canonMenu.addMenu(self.moveMenu) self.canonMenu.addAction(self.reportchum) self.canonMenu.addAction(self.findalts) self.initTheme(theme) - self.sortItems() + #self.sortItems() + #self.sortItems(1, QtCore.Qt.AscendingOrder) + self.setSortingEnabled(False) + self.header().hide() + self.setDropIndicatorShown(True) + self.setIndentation(4) + self.setDragEnabled(True) + self.setDragDropMode(QtGui.QAbstractItemView.InternalMove) + self.setAnimated(True) + self.setRootIsDecorated(False) + + self.connect(self, QtCore.SIGNAL('itemDoubleClicked(QTreeWidgetItem *, int)'), + self, QtCore.SLOT('expandGroup()')) + def getOptionsMenu(self): - currenthandle = self.currentItem().chum.handle - if currenthandle in canon_handles: - return self.canonMenu + text = str(self.currentItem().text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + if text == "Chums": + return None + elif text in self.groups: + return self.groupMenu else: - return self.optionsMenu + currenthandle = self.currentItem().chum.handle + if currenthandle in canon_handles: + return self.canonMenu + else: + return self.optionsMenu + + def startDrag(self, dropAction): + # create mime data object + mime = QtCore.QMimeData() + mime.setData('application/x-item', '???') + # start drag + drag = QtGui.QDrag(self) + drag.setMimeData(mime) + drag.start(QtCore.Qt.MoveAction) + + def dragMoveEvent(self, event): + if event.mimeData().hasFormat("application/x-item"): + event.setDropAction(QtCore.Qt.MoveAction) + event.accept() + else: + event.ignore() + + def dragEnterEvent(self, event): + if (event.mimeData().hasFormat('application/x-item')): + event.accept() + else: + event.ignore() + + def dropEvent(self, event): + if (event.mimeData().hasFormat('application/x-item')): + event.acceptProposedAction() + else: + event.ignore() + return + thisitem = str(event.source().currentItem().text(0)) + if thisitem.rfind(" ") != -1: + thisitem = thisitem[0:thisitem.rfind(" ")] + if thisitem == "Chums" or thisitem in self.groups: + droppos = self.itemAt(event.pos()) + if not droppos: return + droppos = str(droppos.text(0)) + if droppos.rfind(" ") != -1: + droppos = droppos[0:droppos.rfind(" ")] + if droppos == "Chums" or droppos in self.groups: + saveOpen = event.source().currentItem().isExpanded() + saveDrop = self.itemAt(event.pos()) + saveItem = self.takeTopLevelItem(self.indexOfTopLevelItem(event.source().currentItem())) + self.insertTopLevelItems(self.indexOfTopLevelItem(saveDrop)+1, [saveItem]) + if saveOpen: + saveItem.setExpanded(True) + + gTemp = [] + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + gTemp.append([unicode(text), self.topLevelItem(i).isExpanded()]) + self.mainwindow.config.saveGroups(gTemp) + else: + item = self.itemAt(event.pos()) + if item: + text = str(item.text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + if text == "Chums" or text in self.groups: + group = text + else: + ptext = str(item.parent().text(0)) + if ptext.rfind(" ") != -1: + ptext = ptext[0:ptext.rfind(" ")] + group = ptext + chumLabel = event.source().currentItem() + chumLabel.chum.group = group + self.mainwindow.chumdb.setGroup(chumLabel.chum.handle, group) + self.takeItem(chumLabel) + self.addItem(chumLabel) + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() + + def moveGroupMenu(self): + currentGroup = self.currentItem() + if currentGroup: + if currentGroup.parent(): + text = str(currentGroup.parent().text(0)) + else: + text = str(currentGroup.text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + currentGroup = text + self.moveMenu.clear() + actGroup = QtGui.QActionGroup(self) + + groups = self.groups[:] + for gtext in groups: + if gtext == currentGroup: + continue + movegroup = self.moveMenu.addAction(gtext) + actGroup.addAction(movegroup) + self.connect(actGroup, QtCore.SIGNAL('triggered(QAction *)'), + self, QtCore.SLOT('moveToGroup(QAction *)')) + def addChum(self, chum): if len([c for c in self.chums if c.handle == chum.handle]) != 0: return @@ -503,29 +856,163 @@ class chumArea(RightClickList): chum.mood.name() == "offline"): chumLabel = chumListing(chum, self.mainwindow) self.addItem(chumLabel) - self.sortItems() + #self.topLevelItem(0).addChild(chumLabel) + #self.topLevelItem(0).sortChildren(0, QtCore.Qt.AscendingOrder) def getChums(self, handle): - chums = self.findItems(handle, QtCore.Qt.MatchFlags(0)) + chums = self.findItems(handle, QtCore.Qt.MatchExactly | QtCore.Qt.MatchRecursive) return chums def showAllChums(self): for c in self.chums: chandle = c.handle - if not self.findItems(chandle, QtCore.Qt.MatchFlags(0)): + if not len(self.findItems(chandle, QtCore.Qt.MatchContains | QtCore.Qt.MatchRecursive)): chumLabel = chumListing(c, self.mainwindow) self.addItem(chumLabel) - self.sortItems() + self.sort() def hideOfflineChums(self): + for j in range(self.topLevelItemCount()): + i = 0 + listing = self.topLevelItem(j).child(i) + while listing is not None: + if listing.chum.mood.name() == "offline": + self.topLevelItem(j).takeChild(i) + else: + i += 1 + listing = self.topLevelItem(j).child(i) + self.sort() + def showAllGroups(self, first=False): + if first: + for i,g in enumerate(self.groups): + child_1 = QtGui.QTreeWidgetItem(["%s" % (g)]) + self.addTopLevelItem(child_1) + if self.openGroups[i]: + child_1.setExpanded(True) + return + curgroups = [] + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + curgroups.append(text) + for i,g in enumerate(self.groups): + if g not in curgroups: + child_1 = QtGui.QTreeWidgetItem(["%s" % (g)]) + j = 0 + for h in self.groups: + if h == g: + self.insertTopLevelItem(j, child_1) + break + if h in curgroups: + j += 1 + if self.openGroups[i]: + child_1.setExpanded(True) + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() + def showOnlineNumbers(self): + if hasattr(self, 'groups'): + self.hideOnlineNumbers() + totals = {'Chums': 0} + online = {'Chums': 0} + for g in self.groups: + totals[str(g)] = 0 + online[str(g)] = 0 + for c in self.chums: + yes = c.mood.name() != "offline" + if c.group == "Chums": + totals[str(c.group)] = totals[str(c.group)]+1 + if yes: + online[str(c.group)] = online[str(c.group)]+1 + elif c.group in totals: + totals[str(c.group)] = totals[str(c.group)]+1 + if yes: + online[str(c.group)] = online[str(c.group)]+1 + else: + totals["Chums"] = totals["Chums"]+1 + if yes: + online["Chums"] = online["Chums"]+1 + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + self.topLevelItem(i).setText(0, "%s (%i/%i)" % (text, online[text], totals[text])) + def hideOnlineNumbers(self): + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + self.topLevelItem(i).setText(0, "%s" % (text)) + def hideEmptyGroups(self): i = 0 - listing = self.item(i) + listing = self.topLevelItem(i) while listing is not None: - if listing.chum.mood.name() == "offline": - self.takeItem(i) + if listing.childCount() == 0: + self.takeTopLevelItem(i) else: i += 1 - listing = self.item(i) - self.sortItems() + listing = self.topLevelItem(i) + @QtCore.pyqtSlot() + def expandGroup(self): + item = self.currentItem() + text = str(item.text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + + if text in self.groups: + expand = item.isExpanded() + self.mainwindow.config.expandGroup(text, not expand) + def addItem(self, chumLabel): + if hasattr(self, 'groups'): + if chumLabel.chum.group not in self.groups: + chumLabel.chum.group = "Chums" + if "Chums" not in self.groups: + self.mainwindow.config.addGroup("Chums") + curgroups = [] + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + curgroups.append(text) + if not self.findItems(chumLabel.handle, QtCore.Qt.MatchContains | QtCore.Qt.MatchRecursive): + if chumLabel.chum.group not in curgroups: + child_1 = QtGui.QTreeWidgetItem(["%s" % (chumLabel.chum.group)]) + i = 0 + for g in self.groups: + if g == chumLabel.chum.group: + self.insertTopLevelItem(i, child_1) + break + if g in curgroups: + i += 1 + if self.openGroups[self.groups.index("%s" % (chumLabel.chum.group))]: + child_1.setExpanded(True) + for i in range(self.topLevelItemCount()): + text = str(self.topLevelItem(i).text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + if text == chumLabel.chum.group: + break + self.topLevelItem(i).addChild(chumLabel) + self.sort() + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() + else: # usually means this is now the trollslum + if not self.findItems(chumLabel.handle, QtCore.Qt.MatchContains | QtCore.Qt.MatchRecursive): + self.topLevelItem(0).addChild(chumLabel) + self.topLevelItem(0).sortChildren(0, QtCore.Qt.AscendingOrder) + def takeItem(self, chumLabel): + r = None + if not hasattr(chumLabel, 'chum'): + return r + for i in range(self.topLevelItemCount()): + for j in range(self.topLevelItem(i).childCount()): + if self.topLevelItem(i).child(j).text(0) == chumLabel.chum.handle: + r = self.topLevelItem(i).takeChild(j) + break + if not self.mainwindow.config.showEmptyGroups(): + self.hideEmptyGroups() + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() + return r def updateMood(self, handle, mood): hideoff = self.mainwindow.config.hideOfflineChums() chums = self.getChums(handle) @@ -536,16 +1023,26 @@ class chumArea(RightClickList): handle in [p.handle for p in self.chums]: newLabel = chumListing([p for p in self.chums if p.handle == handle][0], self.mainwindow) self.addItem(newLabel) - self.sortItems() + #self.sortItems() chums = [newLabel] elif mood.name() == "offline" and \ len(chums) > 0: for c in chums: - self.takeItem(self.row(c)) + if (hasattr(c, 'mood')): + c.setMood(mood) + self.takeItem(c) chums = [] for c in chums: - oldmood = c.mood - c.setMood(mood) + if (hasattr(c, 'mood')): + oldmood = c.mood + c.setMood(mood) + if self.mainwindow.config.sortMethod() == 1: + for i in range(self.topLevelItemCount()): + saveCurrent = self.currentItem() + self.moodSort(i) + self.setCurrentItem(saveCurrent) + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() return oldmood def updateColor(self, handle, color): chums = self.findItems(handle, QtCore.Qt.MatchFlags(0)) @@ -562,14 +1059,47 @@ class chumArea(RightClickList): self.removechum.setText(theme["main/menus/rclickchumlist/removechum"]) self.blockchum.setText(theme["main/menus/rclickchumlist/blockchum"]) self.logchum.setText(theme["main/menus/rclickchumlist/viewlog"]) + self.removegroup.setText(theme["main/menus/rclickchumlist/removegroup"]) + self.renamegroup.setText(theme["main/menus/rclickchumlist/renamegroup"]) + self.moveMenu.setTitle(theme["main/menus/rclickchumlist/movechum"]) def changeTheme(self, theme): self.initTheme(theme) - chumlistings = [self.item(i) for i in range(0, self.count())] + chumlistings = [] + for i in range(self.topLevelItemCount()): + for j in range(self.topLevelItem(i).childCount()): + chumlistings.append(self.topLevelItem(i).child(j)) + #chumlistings = [self.item(i) for i in range(0, self.count())] for c in chumlistings: c.changeTheme(theme) + + def count(self): + c = 0 + for i in range(self.topLevelItemCount()): + c = c + self.topLevelItem(i).childCount() + return c + + def sort(self): + if self.mainwindow.config.sortMethod() == 1: + for i in range(self.topLevelItemCount()): + self.moodSort(i) + else: + for i in range(self.topLevelItemCount()): + self.topLevelItem(i).sortChildren(0, QtCore.Qt.AscendingOrder) + def moodSort(self, group): + scrollPos = self.verticalScrollBar().sliderPosition() + chums = [] + listing = self.topLevelItem(group).child(0) + while listing is not None: + chums.append(self.topLevelItem(group).takeChild(0)) + listing = self.topLevelItem(group).child(0) + chums.sort(key=lambda x: ((999 if x.chum.mood.value() == 2 else x.chum.mood.value()), x.chum.handle), reverse=False) + for c in chums: + self.topLevelItem(group).addChild(c) + self.verticalScrollBar().setSliderPosition(scrollPos) + @QtCore.pyqtSlot() def activateChum(self): - self.itemActivated.emit(self.currentItem()) + self.itemActivated.emit(self.currentItem(), 0) @QtCore.pyqtSlot() def removeChum(self, handle = None): if handle: @@ -581,7 +1111,7 @@ class chumArea(RightClickList): currentChum = self.currentItem().chum self.chums = [c for c in self.chums if c.handle != currentChum.handle] self.removeChumSignal.emit(self.currentItem().chum.handle) - oldlist = self.takeItem(self.currentRow()) + oldlist = self.takeItem(self.currentItem()) del oldlist @QtCore.pyqtSlot() def blockChum(self): @@ -603,7 +1133,7 @@ class chumArea(RightClickList): self.mainwindow.sendMessage.emit("ALT %s" % (currentChum.chum.handle) , "calSprite") @QtCore.pyqtSlot() def openChumLogs(self): - currentChum = self.currentItem().text() + currentChum = self.currentItem().text(0) if not currentChum: return self.pesterlogviewer = PesterLogViewer(currentChum, self.mainwindow.config, self.mainwindow.theme, self.mainwindow) @@ -618,20 +1148,67 @@ class chumArea(RightClickList): self.pesterlogviewer = None @QtCore.pyqtSlot() def renameGroup(self): - (gname, ok) = QtGui.QInputDialog.getText(self, "Rename Group", "Enter a new name for the group:") - if ok: - pass - #rename group - + if not hasattr(self, 'renamegroupdialog'): + self.renamegroupdialog = None + if not self.renamegroupdialog: + (gname, ok) = QtGui.QInputDialog.getText(self, "Rename Group", "Enter a new name for the group:") + if ok: + gname = unicode(gname) + currentGroup = self.currentItem() + if not currentGroup: + return + index = self.indexOfTopLevelItem(currentGroup) + if index != -1: + expanded = currentGroup.isExpanded() + text = str(currentGroup.text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + self.mainwindow.config.delGroup(text) + self.mainwindow.config.addGroup(gname, expanded) + gTemp = self.mainwindow.config.getGroups() + self.groups = [g[0] for g in gTemp] + self.openGroups = [g[1] for g in gTemp] + for i in range(currentGroup.childCount()): + currentGroup.child(i).chum.group = gname + self.mainwindow.chumdb.setGroup(currentGroup.child(i).chum.handle, gname) + currentGroup.setText(0, gname) + if self.mainwindow.config.showOnlineNumbers(): + self.showOnlineNumbers() + self.renamegroupdialog = None @QtCore.pyqtSlot() def removeGroup(self): - pass - #remove group - + currentGroup = self.currentItem() + if not currentGroup: + return + text = str(currentGroup.text(0)) + if text.rfind(" (") != -1: + text = text[0:text.rfind(" (")] + self.mainwindow.config.delGroup(text) + gTemp = self.mainwindow.config.getGroups() + self.groups = [g[0] for g in gTemp] + self.openGroups = [g[1] for g in gTemp] + for i in range(self.topLevelItemCount()): + if self.topLevelItem(i).text(0) == currentGroup.text(0): + break + while self.topLevelItem(i) and self.topLevelItem(i).child(0): + chumLabel = self.topLevelItem(i).child(0) + chumLabel.chum.group = "Chums" + self.mainwindow.chumdb.setGroup(chumLabel.chum.handle, "Chums") + self.takeItem(chumLabel) + self.addItem(chumLabel) + self.takeTopLevelItem(i) @QtCore.pyqtSlot(QtGui.QAction) def moveToGroup(self, item): - pass - #move to group + if not item: + return + group = str(item.text()) + chumLabel = self.currentItem() + if not chumLabel: + return + chumLabel.chum.group = group + self.mainwindow.chumdb.setGroup(chumLabel.chum.handle, group) + self.takeItem(chumLabel) + self.addItem(chumLabel) removeChumSignal = QtCore.pyqtSignal(QtCore.QString) blockChumSignal = QtCore.pyqtSignal(QtCore.QString) @@ -643,19 +1220,34 @@ class trollSlum(chumArea): theme = self.mainwindow.theme self.setStyleSheet(theme["main/trollslum/chumroll/style"]) self.chums = trolls + child_1 = QtGui.QTreeWidgetItem([""]) + self.addTopLevelItem(child_1) + child_1.setExpanded(True) for c in self.chums: chandle = c.handle if not self.findItems(chandle, QtCore.Qt.MatchFlags(0)): chumLabel = chumListing(c, self.mainwindow) self.addItem(chumLabel) + self.setSortingEnabled(False) + self.header().hide() + self.setDropIndicatorShown(False) + self.setIndentation(0) + self.optionsMenu = QtGui.QMenu(self) self.unblockchum = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/unblockchum"], self) self.connect(self.unblockchum, QtCore.SIGNAL('triggered()'), self, QtCore.SIGNAL('unblockChumSignal()')) self.optionsMenu.addAction(self.unblockchum) - self.sortItems() + #self.sortItems() + def contextMenuEvent(self, event): + #fuckin Qt + if event.reason() == QtGui.QContextMenuEvent.Mouse: + listing = self.itemAt(event.pos()) + self.setCurrentItem(listing) + if self.currentItem().text(0) != "": + self.optionsMenu.popup(event.globalPos()) def changeTheme(self, theme): self.setStyleSheet(theme["main/trollslum/chumroll/style"]) self.removechum.setText(theme["main/menus/rclickchumlist/removechum"]) @@ -718,7 +1310,7 @@ class TrollSlumWindow(QtGui.QFrame): @QtCore.pyqtSlot() def removeCurrentTroll(self): currentListing = self.trollslum.currentItem() - if not currentListing: + if not currentListing or not hasattr(currentListing, 'chum'): return self.unblockChumSignal.emit(currentListing.chum.handle) @QtCore.pyqtSlot() @@ -845,26 +1437,45 @@ class MovingWindow(QtGui.QFrame): class PesterWindow(MovingWindow): - def __init__(self, parent=None): - MovingWindow.__init__(self, parent, - (QtCore.Qt.CustomizeWindowHint | + def __init__(self, options, parent=None): + MovingWindow.__init__(self, parent, + (QtCore.Qt.CustomizeWindowHint | QtCore.Qt.FramelessWindowHint)) self.convos = CaseInsensitiveDict() self.memos = CaseInsensitiveDict() self.tabconvo = None self.tabmemo = None + if "advanced" in options: + self.advanced = options["advanced"] + else: self.advanced = False + if "server" in options: + self.serverOverride = options["server"] + if "port" in options: + self.portOverride = options["port"] self.setAutoFillBackground(True) self.setObjectName("main") - self.config = userConfig() + self.config = userConfig(self) if self.config.defaultprofile(): self.userprofile = userProfile(self.config.defaultprofile()) self.theme = self.userprofile.getTheme() else: self.userprofile = userProfile(PesterProfile("pesterClient%d" % (random.randint(100,999)), QtGui.QColor("black"), Mood(0))) self.theme = self.userprofile.getTheme() + self.modes = "" - self.chatlog = PesterLog(self.profile().handle) + self.randhandler = RandomHandler(self) + + try: + themeChecker(self.theme) + except ThemeException, (inst): + print "Caught: "+inst.parameter + themeWarning = QtGui.QMessageBox(self) + themeWarning.setText("Theme Error: %s" % (inst)) + themeWarning.exec_() + self.theme = pesterTheme("pesterchum") + + self.chatlog = PesterLog(self.profile().handle, self) self.move(100, 100) @@ -872,6 +1483,13 @@ class PesterWindow(MovingWindow): self.logv = logv self.connect(logv, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('openLogv()')) + grps = QtGui.QAction(self.theme["main/menus/client/addgroup"], self) + self.grps = grps + self.connect(grps, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('addGroupWindow()')) + self.rand = QtGui.QAction(self.theme["main/menus/client/randen"], self) + self.connect(self.rand, QtCore.SIGNAL('triggered()'), + self.randhandler, QtCore.SLOT('getEncounter()')) opts = QtGui.QAction(self.theme["main/menus/client/options"], self) self.opts = opts self.connect(opts, QtCore.SIGNAL('triggered()'), @@ -900,22 +1518,22 @@ class PesterWindow(MovingWindow): self, QtCore.SIGNAL('reconnectIRC()')) self.menu = QtGui.QMenuBar(self) + self.menu.setNativeMenuBar(False) filemenu = self.menu.addMenu(self.theme["main/menus/client/_name"]) self.filemenu = filemenu filemenu.addAction(opts) filemenu.addAction(memoaction) filemenu.addAction(logv) + if self.randhandler.running: + filemenu.addAction(self.rand) filemenu.addAction(userlistaction) filemenu.addAction(self.idleaction) + filemenu.addAction(grps) filemenu.addAction(self.importaction) filemenu.addAction(self.reconnectAction) filemenu.addAction(exitaction) - changetheme = QtGui.QAction(self.theme["main/menus/profile/theme"], self) - self.changetheme = changetheme - self.connect(changetheme, QtCore.SIGNAL('triggered()'), - self, QtCore.SLOT('pickTheme()')) changequirks = QtGui.QAction(self.theme["main/menus/profile/quirks"], self) self.changequirks = changequirks self.connect(changequirks, QtCore.SIGNAL('triggered()'), @@ -937,33 +1555,38 @@ class PesterWindow(MovingWindow): profilemenu = self.menu.addMenu(self.theme["main/menus/profile/_name"]) self.profilemenu = profilemenu - profilemenu.addAction(changetheme) profilemenu.addAction(changequirks) profilemenu.addAction(loadslum) profilemenu.addAction(changecoloraction) profilemenu.addAction(switch) + self.helpAction = QtGui.QAction(self.theme["main/menus/help/help"], self) + self.connect(self.helpAction, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('launchHelp()')) + self.botAction = QtGui.QAction(self.theme["main/menus/help/calsprite"], self) + self.connect(self.botAction, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('loadCalsprite()')) + self.nickServAction = QtGui.QAction(self.theme["main/menus/help/nickserv"], self) + self.connect(self.nickServAction, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('loadNickServ()')) self.aboutAction = QtGui.QAction(self.theme["main/menus/help/about"], self) self.connect(self.aboutAction, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('aboutPesterchum()')) - self.botAction = QtGui.QAction("CALSPRITE", self) - self.connect(self.botAction, QtCore.SIGNAL('triggered()'), - self, QtCore.SLOT('loadCalsprite()')) - self.helpAction = QtGui.QAction("HELP", self) - self.connect(self.helpAction, QtCore.SIGNAL('triggered()'), - self, QtCore.SLOT('launchHelp()')) + self.reportBugAction = QtGui.QAction("REPORT BUG", self) + self.connect(self.reportBugAction, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('reportBug()')) helpmenu = self.menu.addMenu(self.theme["main/menus/help/_name"]) self.helpmenu = helpmenu self.helpmenu.addAction(self.helpAction) self.helpmenu.addAction(self.botAction) + self.helpmenu.addAction(self.nickServAction) self.helpmenu.addAction(self.aboutAction) + self.helpmenu.addAction(self.reportBugAction) self.closeButton = WMButton(PesterIcon(self.theme["main/close/image"]), self) - self.connect(self.closeButton, QtCore.SIGNAL('clicked()'), - self, QtCore.SLOT('closeToTray()')) + self.setButtonAction(self.closeButton, self.config.closeAction(), -1) self.miniButton = WMButton(PesterIcon(self.theme["main/minimize/image"]), self) - self.connect(self.miniButton, QtCore.SIGNAL('clicked()'), - self, QtCore.SLOT('showMinimized()')) + self.setButtonAction(self.miniButton, self.config.minimizeAction(), -1) self.namesdb = CaseInsensitiveDict() self.chumdb = PesterProfileDB() @@ -971,7 +1594,7 @@ class PesterWindow(MovingWindow): chums = [PesterProfile(c, chumdb=self.chumdb) for c in set(self.config.chums())] self.chumList = chumArea(chums, self) self.connect(self.chumList, - QtCore.SIGNAL('itemActivated(QListWidgetItem *)'), + QtCore.SIGNAL('itemActivated(QTreeWidgetItem *, int)'), self, QtCore.SLOT('pesterSelectedChum()')) self.connect(self.chumList, @@ -1010,7 +1633,7 @@ class PesterWindow(MovingWindow): self.waitingMessages = waitingMessageHolder(self) self.autoidle = False - self.idlethreshold = 600 + self.idlethreshold = 60*self.config.idleTime() self.idletimer = QtCore.QTimer(self) self.idleposition = QtGui.QCursor.pos() self.idletime = 0 @@ -1021,9 +1644,52 @@ class PesterWindow(MovingWindow): if not self.config.defaultprofile(): self.changeProfile() + QtCore.QTimer.singleShot(1000, self, QtCore.SLOT('mspacheck()')) + + self.connect(self, QtCore.SIGNAL('pcUpdate(QString, QString)'), + self, QtCore.SLOT('updateMsg(QString, QString)')) + + self.pingtimer = QtCore.QTimer() + self.connect(self.pingtimer, QtCore.SIGNAL('timeout()'), + self, QtCore.SLOT('checkPing()')) + self.lastping = int(time()) + self.pingtimer.start(1000*10) + + @QtCore.pyqtSlot() + def mspacheck(self): + checker = MSPAChecker(self) + + @QtCore.pyqtSlot(QtCore.QString, QtCore.QString) + def updateMsg(self, ver, url): + if not hasattr(self, 'updatemenu'): + self.updatemenu = None + if not self.updatemenu: + self.updatemenu = UpdatePesterchum(ver, url, self) + self.connect(self.updatemenu, QtCore.SIGNAL('accepted()'), + self, QtCore.SLOT('updatePC()')) + self.connect(self.updatemenu, QtCore.SIGNAL('rejected()'), + self, QtCore.SLOT('noUpdatePC()')) + self.updatemenu.show() + self.updatemenu.raise_() + self.updatemenu.activateWindow() + + @QtCore.pyqtSlot() + def updatePC(self): + QtGui.QDesktopServices.openUrl(QtCore.QUrl(self.updatemenu.url, QtCore.QUrl.TolerantMode)) + self.updatemenu = None + @QtCore.pyqtSlot() + def noUpdatePC(self): + self.updatemenu = None + + @QtCore.pyqtSlot() + def checkPing(self): + curtime = int(time()) + if curtime - self.lastping > 300: + self.pingServer.emit() + def profile(self): return self.userprofile.chat - def closeConversations(self): + def closeConversations(self, switch=False): if not hasattr(self, 'tabconvo'): self.tabconvo = None if self.tabconvo: @@ -1032,10 +1698,17 @@ class PesterWindow(MovingWindow): for c in self.convos.values(): c.close() if self.tabmemo: - self.tabmemo.close() + if not switch: + self.tabmemo.close() + else: + for m in self.tabmemo.convos: + self.tabmemo.convos[m].sendtime() else: for m in self.memos.values(): - m.close() + if not switch: + m.close() + else: + m.sendtime() def paintEvent(self, event): palette = QtGui.QPalette() palette.setBrush(QtGui.QPalette.Window, QtGui.QBrush(self.backgroundImage)) @@ -1072,10 +1745,11 @@ class PesterWindow(MovingWindow): convo.addMessage(msg, False) # play sound here if self.config.soundOn(): - if msg in ["PESTERCHUM:CEASE", "PESTERCHUM:BLOCK"]: - self.ceasesound.play() - else: - self.alarm.play() + if self.config.chatSound(): + if msg in ["PESTERCHUM:CEASE", "PESTERCHUM:BLOCK"]: + self.ceasesound.play() + else: + self.alarm.play() def newMemoMsg(self, chan, handle, msg): if not self.memos.has_key(chan): # silently ignore in case we forgot to /part @@ -1089,9 +1763,22 @@ class PesterWindow(MovingWindow): memo.times[handle] = time if msg[0:3] != "/me" and msg[0:13] != "PESTERCHUM:ME": msg = addTimeInitial(msg, memo.times[handle].getGrammar()) + if handle == "ChanServ": + systemColor = QtGui.QColor(self.theme["memos/systemMsgColor"]) + msg = "
+REGEXP: "(.)" +REPLACED WITH: "upper(\1)" ++ +Aradia +------ +
+REGEXP: "[oO]" +REPLACE WITH: "0" ++ +#####After Prototyping +
+RANDOM REGEXP: "\s" +REPLACED WITH: " ribbit ", " ", " ", " ", " ", " ", etc.... ++ +Tavros +------ +
+REGEXP: "\b(\w)(\w*)" +REPLACED WITH: "lower(\1)upper(\2)" ++
+REGEXP: "\.?" +WITH: "," ++ +Sollux +------ +#####Pre-blind +
+REGEXP: "[iI]" +REPLACE WITH: "\1\1" ++
+REGEXP: "[sS]" +REPLACE WITH: "2" ++
+REGEXP: "\btoo?\b" +REPLACE WITH: "two" ++ +#####Blind +
+REGEXP: "[oO]" +REPLACE WITH: "0" ++ +Nepeta +------ +
+PREFIX: ":33 < " ++
+REGEXP: "[eE][eE]" +REPLACE WITH: "33" ++ +Kanaya +------ +
+REGEXP: "\b(\w)" +REPLACE WITH: "upper(\1) ++ +Terezi +------ +
+REGEXP: "[aA]" +REPLACE WITH: "4" ++
+REGEXP: "[iI]" +REPLACE WITH: "1" ++
+REGEXP: "[eE]" +REPLACE WITH: "3" ++
+REGEXP: "(.)" +REPLACE WITH: "upper(\1)" ++ +Vriska +------ +
+REGEXP: "[bB]" +REPLACE WITH: "8" ++
+RANDOM REGEXP: "([aeiouAEIOU])" +REPLACE WITH: "\1\1\1\1\1\1\1\1", "\1", "\1", "\1", "\1", "\1", etc........ ++
+RANDOM REGEXP: "([\.\?,!]$)" +REPLACE WITH: "\1\1\1\1\1\1\1\1", "\1", "\1", "\1", "\1", "\1", etc........ ++
+REPLACE: ":" +WITH: "::::" ++ +Keep in mind that the RANDOM REGEXP ones require the extra "\\1"s to be added in order to not happen all the time. If you want those quirks to happen less often, add more "\\1". + +Equius +------ +
+PREFIX: "D --> " ++
+REGEXP: "[lL][oO][oO]" +REPLACE WITH: "100" ++
+REGEXP: "[xX]" +REPLACE WITH: "%" ++
+REGEXP: "(\b[sS][tT][rR][oO][nN][gG]\w*)" +REPLACE WITH: "upper(\1)" ++
+REGEXP: "[oO][oO]" +REPLACE WITH: "00" ++ +Gamzee +------ +#####Version 1: "HoNk HoNk" +
+REGEXP: "([a-zA-Z])([a-zA-Z]?)" +REPLACED WITH: "upper(\1)\2" ++ +#####Version 2: "HoNk hOnK" +
+REGEXP: "([\w\s])([\w\s]?)" +REPLACED WITH: "upper(\1)\2" ++ +Eridan +------ +
+REGEXP: "([vVwW])" +REPLACE WITH: "\1\1" ++
+REGEXP: "ing\b" +REPLACE WITH: "in" ++ +Feferi +------ +
+REGEXP: [hH]
+REPLACE WITH: ")("
+
++REPLACE: "E" +WITH: "-E" +\ No newline at end of file diff --git a/tutorial/convo_1.png b/tutorial/convo_1.png deleted file mode 100644 index a367e21..0000000 Binary files a/tutorial/convo_1.png and /dev/null differ diff --git a/tutorial/convo_2.png b/tutorial/convo_2.png deleted file mode 100644 index 7821c72..0000000 Binary files a/tutorial/convo_2.png and /dev/null differ diff --git a/tutorial/enamel_ss.png b/tutorial/enamel_ss.png deleted file mode 100644 index 37d6b14..0000000 Binary files a/tutorial/enamel_ss.png and /dev/null differ diff --git a/tutorial/gold_ss.png b/tutorial/gold_ss.png deleted file mode 100644 index 04d0222..0000000 Binary files a/tutorial/gold_ss.png and /dev/null differ diff --git a/tutorial/gold_xl_ss.png b/tutorial/gold_xl_ss.png deleted file mode 100644 index 4ade5ac..0000000 Binary files a/tutorial/gold_xl_ss.png and /dev/null differ diff --git a/tutorial/mainmenu.png b/tutorial/mainmenu.png deleted file mode 100644 index 5cc705b..0000000 Binary files a/tutorial/mainmenu.png and /dev/null differ diff --git a/tutorial/memo.png b/tutorial/memo.png deleted file mode 100644 index 3670287..0000000 Binary files a/tutorial/memo.png and /dev/null differ diff --git a/tutorial/memo_1.png b/tutorial/memo_1.png deleted file mode 100644 index d9d5f82..0000000 Binary files a/tutorial/memo_1.png and /dev/null differ diff --git a/tutorial/memo_10.png b/tutorial/memo_10.png deleted file mode 100644 index 71b21c9..0000000 Binary files a/tutorial/memo_10.png and /dev/null differ diff --git a/tutorial/memo_11.png b/tutorial/memo_11.png deleted file mode 100644 index 7930dbf..0000000 Binary files a/tutorial/memo_11.png and /dev/null differ diff --git a/tutorial/memo_12.png b/tutorial/memo_12.png deleted file mode 100644 index bf12b26..0000000 Binary files a/tutorial/memo_12.png and /dev/null differ diff --git a/tutorial/memo_13.png b/tutorial/memo_13.png deleted file mode 100644 index bbd10b8..0000000 Binary files a/tutorial/memo_13.png and /dev/null differ diff --git a/tutorial/memo_2.png b/tutorial/memo_2.png deleted file mode 100644 index b033505..0000000 Binary files a/tutorial/memo_2.png and /dev/null differ diff --git a/tutorial/memo_3.png b/tutorial/memo_3.png deleted file mode 100644 index 4e3d03a..0000000 Binary files a/tutorial/memo_3.png and /dev/null differ diff --git a/tutorial/memo_4.png b/tutorial/memo_4.png deleted file mode 100644 index c2328fb..0000000 Binary files a/tutorial/memo_4.png and /dev/null differ diff --git a/tutorial/memo_5.png b/tutorial/memo_5.png deleted file mode 100644 index e5cb332..0000000 Binary files a/tutorial/memo_5.png and /dev/null differ diff --git a/tutorial/memo_6.png b/tutorial/memo_6.png deleted file mode 100644 index 5d50208..0000000 Binary files a/tutorial/memo_6.png and /dev/null differ diff --git a/tutorial/memo_7.png b/tutorial/memo_7.png deleted file mode 100644 index 5e61b48..0000000 Binary files a/tutorial/memo_7.png and /dev/null differ diff --git a/tutorial/memo_8.png b/tutorial/memo_8.png deleted file mode 100644 index f5eaf4b..0000000 Binary files a/tutorial/memo_8.png and /dev/null differ diff --git a/tutorial/memo_useroptions.png b/tutorial/memo_useroptions.png deleted file mode 100644 index a2ae819..0000000 Binary files a/tutorial/memo_useroptions.png and /dev/null differ diff --git a/tutorial/mispeller.png b/tutorial/mispeller.png deleted file mode 100644 index 01e2099..0000000 Binary files a/tutorial/mispeller.png and /dev/null differ diff --git a/tutorial/options.png b/tutorial/options.png deleted file mode 100644 index 0de05de..0000000 Binary files a/tutorial/options.png and /dev/null differ diff --git a/tutorial/pesterchum2.5_ss.png b/tutorial/pesterchum2.5_ss.png deleted file mode 100644 index ac2e94b..0000000 Binary files a/tutorial/pesterchum2.5_ss.png and /dev/null differ diff --git a/tutorial/pesterchum_ss.png b/tutorial/pesterchum_ss.png deleted file mode 100644 index 319ccde..0000000 Binary files a/tutorial/pesterchum_ss.png and /dev/null differ diff --git a/tutorial/prefix.png b/tutorial/prefix.png deleted file mode 100644 index c327527..0000000 Binary files a/tutorial/prefix.png and /dev/null differ diff --git a/tutorial/quirkmenu.png b/tutorial/quirkmenu.png deleted file mode 100644 index e3afc28..0000000 Binary files a/tutorial/quirkmenu.png and /dev/null differ diff --git a/tutorial/quirks_terezi.png b/tutorial/quirks_terezi.png deleted file mode 100644 index cd46be6..0000000 Binary files a/tutorial/quirks_terezi.png and /dev/null differ diff --git a/tutorial/random_replace_caps.png b/tutorial/random_replace_caps.png deleted file mode 100644 index 6f6afc1..0000000 Binary files a/tutorial/random_replace_caps.png and /dev/null differ diff --git a/tutorial/random_replace_simple.png b/tutorial/random_replace_simple.png deleted file mode 100644 index cd1c578..0000000 Binary files a/tutorial/random_replace_simple.png and /dev/null differ diff --git a/tutorial/regexp_a4.png b/tutorial/regexp_a4.png deleted file mode 100644 index ac364b2..0000000 Binary files a/tutorial/regexp_a4.png and /dev/null differ diff --git a/tutorial/regexp_caps.png b/tutorial/regexp_caps.png deleted file mode 100644 index d5b807a..0000000 Binary files a/tutorial/regexp_caps.png and /dev/null differ diff --git a/tutorial/simple_ee33.png b/tutorial/simple_ee33.png deleted file mode 100644 index 817d444..0000000 Binary files a/tutorial/simple_ee33.png and /dev/null differ diff --git a/tutorial/switch_profile.png b/tutorial/switch_profile.png deleted file mode 100644 index baecf42..0000000 Binary files a/tutorial/switch_profile.png and /dev/null differ diff --git a/tutorial/trollian2.5_ss.png b/tutorial/trollian2.5_ss.png deleted file mode 100644 index 60b2e74..0000000 Binary files a/tutorial/trollian2.5_ss.png and /dev/null differ diff --git a/tutorial/trollian_ss.png b/tutorial/trollian_ss.png deleted file mode 100644 index 6713db5..0000000 Binary files a/tutorial/trollian_ss.png and /dev/null differ diff --git a/tutorial/trollslum.png b/tutorial/trollslum.png deleted file mode 100644 index 514071b..0000000 Binary files a/tutorial/trollslum.png and /dev/null differ diff --git a/tutorial/typewriter_ss.png b/tutorial/typewriter_ss.png deleted file mode 100644 index abdc242..0000000 Binary files a/tutorial/typewriter_ss.png and /dev/null differ diff --git a/tutorial/userlist.png b/tutorial/userlist.png deleted file mode 100644 index 6d38da3..0000000 Binary files a/tutorial/userlist.png and /dev/null differ diff --git a/updatecheck.py b/updatecheck.py new file mode 100644 index 0000000..73e014b --- /dev/null +++ b/updatecheck.py @@ -0,0 +1,118 @@ +# Adapted from Eco-Mono's F5Stuck RSS Client + +import feedparser +import pickle +import os +from time import mktime +from PyQt4 import QtCore, QtGui + +class MSPAChecker(QtGui.QWidget): + def __init__(self, parent=None): + QtCore.QObject.__init__(self, parent) + self.mainwindow = parent + self.refreshRate = 30 # seconds + self.status = None + self.timer = QtCore.QTimer(self) + self.connect(self.timer, QtCore.SIGNAL('timeout()'), + self, QtCore.SLOT('check_site()')) + self.check_site() + self.timer.start(1000*self.refreshRate) + + def save_state(self): + try: + current_status = open("status_new.pkl","w") + pickle.dump(self.status, current_status) + current_status.close() + try: + os.rename("status.pkl","status_old.pkl") + except: + pass + try: + os.rename("status_new.pkl","status.pkl") + except: + if os.path.exists("status_old.pkl"): + os.rename("status_old.pkl","status.pkl") + raise + if os.path.exists("status_old.pkl"): + os.remove("status_old.pkl") + except Exception, e: + print e + msg = QtGui.QMessageBox(self) + msg.setText("Problems writing save file.") + msg.show() + + @QtCore.pyqtSlot() + def check_site(self): + if not self.mainwindow.config.checkMSPA(): + return + rss = None + must_save = False + try: + rss = feedparser.parse("http://www.mspaintadventures.com/rss/rss.xml") + except: + return + if len(rss.entries) == 0: + return + entries = sorted(rss.entries,key=(lambda x: mktime(x.updated_parsed))) + if self.status == None: + self.status = {} + self.status['last_visited'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link} + self.status['last_seen'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link} + must_save = True + elif mktime(entries[-1].updated_parsed) > self.status['last_seen']['pubdate']: + #This is the first time the app itself has noticed this update. + self.status['last_seen'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link} + must_save = True + if self.status['last_seen']['pubdate'] > self.status['last_visited']['pubdate']: + self.mspa = MSPAUpdateWindow(self.parent()) + self.connect(self.mspa, QtCore.SIGNAL('accepted()'), + self, QtCore.SLOT('visit_site()')) + self.connect(self.mspa, QtCore.SIGNAL('rejected()'), + self, QtCore.SLOT('nothing()')) + self.mspa.show() + else: + #print "No new updates :(" + pass + if must_save: + self.save_state() + + @QtCore.pyqtSlot() + def visit_site(self): + print self.status['last_visited']['link'] + QtGui.QDesktopServices.openUrl(QtCore.QUrl(self.status['last_visited']['link'], QtCore.QUrl.TolerantMode)) + if self.status['last_seen']['pubdate'] > self.status['last_visited']['pubdate']: + #Visited for the first time. Untrip the icon and remember that we saw it. + self.status['last_visited'] = self.status['last_seen'] + self.save_state() + self.mspa = None + @QtCore.pyqtSlot() + def nothing(self): + self.mspa = None + +class MSPAUpdateWindow(QtGui.QDialog): + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.mainwindow = parent + self.setStyleSheet(self.mainwindow.theme["main/defaultwindow/style"]) + self.setWindowTitle("MSPA Update!") + self.setModal(False) + + self.title = QtGui.QLabel("You have an unread MSPA update! :o)") + + layout_0 = QtGui.QVBoxLayout() + layout_0.addWidget(self.title) + + self.ok = QtGui.QPushButton("GO READ NOW!", self) + self.ok.setDefault(True) + self.connect(self.ok, QtCore.SIGNAL('clicked()'), + self, QtCore.SLOT('accept()')) + self.cancel = QtGui.QPushButton("LATER", self) + self.connect(self.cancel, QtCore.SIGNAL('clicked()'), + self, QtCore.SLOT('reject()')) + layout_2 = QtGui.QHBoxLayout() + layout_2.addWidget(self.cancel) + layout_2.addWidget(self.ok) + + layout_0.addLayout(layout_2) + + self.setLayout(layout_0) diff --git a/version.py b/version.py new file mode 100644 index 0000000..dc790ee --- /dev/null +++ b/version.py @@ -0,0 +1,57 @@ +import urllib +import re +import time + +USER_TYPE = "dev" + +_pcMajor = "3.41" +_pcMinor = "0" +_pcStatus = "B" # A = alpha + # B = beta + # RC = release candidate + # None = public release +_pcRevision = "5" +_pcVersion = "" + +def pcVerCalc(): + global _pcVersion + if _pcStatus: + _pcVersion = "%s.%s-%s%s" % (_pcMajor, _pcMinor, _pcStatus, _pcRevision) + else: + _pcVersion = "%s.%s.%s" % (_pcMajor, _pcMinor, _pcRevision) + +def verStrToNum(ver): + w = re.match("(\d+\.?\d+)\.(\d+)-?([A-Za-z]{0,2})\.?(\d*):(\S+)", ver) + if not w: + print "Update check Failure: 3"; return + full = ver[:ver.find(":")] + return full,w.group(1),w.group(2),w.group(3),w.group(4),w.group(5) + +def updateCheck(q,num): + time.sleep(3) + data = urllib.urlencode({"type" : USER_TYPE}) + try: + f = urllib.urlopen("http://distantsphere.com/pesterchum.php?" + data) + except: + print "Update check Failure: 1"; return q.put((False,1)) + newest = f.read() + f.close() + if not newest or newest[0] == "<": + print "Update check Failure: 2"; return q.put((False,2)) + try: + (full, major, minor, status, revision, url) = verStrToNum(newest) + except TypeError: + return q.put((False,3)) + print full + if major <= _pcMajor: + if minor <= _pcMinor: + if status: + if status <= _pcStatus: + if revision <= _pcRevision: + return q.put((False,0)) + else: + if not _pcStatus: + if revision <= _pcRevision: + return q.put((False,0)) + print "A new version of Pesterchum is avaliable!" + q.put((full,url))