From 9c3ca20ad3b2467447cc7dbf730361cf1e5a0fdd Mon Sep 17 00:00:00 2001 From: Dpeta <69427753+Dpeta@users.noreply.github.com> Date: Tue, 14 Mar 2023 15:23:53 +0100 Subject: [PATCH] Remove console, not a lot of people used this. --- TODO.md | 9 - console.py.disabled | 554 -------------------------------------------- pesterchum.py | 147 ------------ start.sh | 1 - 4 files changed, 711 deletions(-) delete mode 100644 console.py.disabled delete mode 100644 start.sh diff --git a/TODO.md b/TODO.md index 0ecff04..f71306d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,17 +1,8 @@ # TODO LIST : ) -## ADD - - ~~Memoserv support.~~ - - ~~Use memopermabanmsg function?~~ <--- Permabans just give a KICK server response, there's no way to check for this. - ## FIX - - Mask & target not being passed to ``_max_msg_len``. - - Is this even possible to keep updated reliably? - - ~~No error message when Pesterchum fails to join a channel. (For example, when the channel name length is over CHANNELLEN)~~ - Choose memo window doesn't get updated on theme change. - Right click menu's color doesn't get updated on theme change in memos. - - help() causes console to crash...? - - Console is hopelessly broken, it'd be easier to make a list of what commands *don't* cause it to crash. Does anyone use this? ## CHANGE - When everything has been tested and more people have compatible versions, switch Pesterchum over to using metadata and message tags by default instead of wrapping its protocol in PRIVMSG. The current method should stay available for compatibility. diff --git a/console.py.disabled b/console.py.disabled deleted file mode 100644 index 68a37fd..0000000 --- a/console.py.disabled +++ /dev/null @@ -1,554 +0,0 @@ -""" -# vim: set autoindent ts=4 sts=4 sw=4 textwidth=79 expandtab: -# -*- coding=UTF-8; tab-width: 4 -*- -# import os -# from os import remove -import sys -import traceback -import time -import datetime -import logging - -try: - from PyQt6 import QtCore, QtGui, QtWidgets - from PyQt6.QtGui import QAction -except ImportError: - print("PyQt5 fallback (console.py)") - from PyQt5 import QtCore, QtGui, QtWidgets - from PyQt5.QtWidgets import QAction - -import dataobjs - -# import generic -# import memos -# import parsetools -import ostools - -# from version import _pcVersion -from pnc.dep.attrdict import AttrDict - -PchumLog = logging.getLogger("pchumLogger") - - -class ConsoleWindow(QtWidgets.QDialog): - # ~class ConsoleWindow(styler.PesterBaseWindow): - # A simple console class, cobbled together from the corpse of another. - - stylesheet_path = "main/defaultwindow/style" - # This is a holder for our text inputs. - text = AttrDict() - # I should probably put up constants for 'direction' if this is going to - # get this complicated. TODO! - incoming_prefix = "<<<" - miscinfo_prefix = "==>" - outgoing_prefix = ">>>" - neutral_prefix = "!!!" - waiting_prefix = "..." - - selected_widget = None - show_info_on_select = True - - _CUSTOM_ENV = {} - - def __init__(self, parent): - super(ConsoleWindow, self).__init__(parent) - self.prnt = parent - try: - self.mainwindow = parent.mainwindow - except: - self.mainwindow = parent - theme = self.mainwindow.theme - # This won't initialize the sub-objects, because they don't exist yet. - self.initTheme(theme) - - self.text = AttrDict() - self.text.area = ConsoleText(theme, self) - self.text.input = ConsoleInput(theme, self) - self.text.input.setFocus() - - self.text.input.returnPressed.connect(self.sentMessage) - - self.text.history = dataobjs.PesterHistory() - - # For backing these up - self.stdout = self.stderr = None - - layout_0 = QtWidgets.QVBoxLayout() - layout_0.addWidget(self.text.area) - layout_0.addWidget(self.text.input) - self.setLayout(layout_0) - - def parent(self): - return self.prnt - - def clearNewMessage(self): - pass - - @QtCore.pyqtSlot() - def sentMessage(self): - text = self.text.input.text() - # TODO: Make this deal with unicode text, it'll crash and burn as-is. - text = str(text) - text = text.rstrip() - - self.text.history.add(text) - self.text.input.setText("") - - self.execInConsole(text) - # Scroll down to the bottom so we can see the results. - sb = self.text.area.verticalScrollBar() - sb.setValue(sb.maximum()) - - def addTraceback(self, tb=None): - # We should do the formatting here, but eventually pass it to text.area - # to addMessage whatever output we produced. - # If we're called by addMessage - and we should be - then sys.stdout is - # still being redirected into the console. - # TODO: Just make an object for setting contexts (and thus optionally - # redirecting prints). Use 'with', of course. - # TODO: Make this exclude *our* processing from the traceback stack. - try: - self.addMessage(traceback.format_exc(), direction=0) - except Exception as err: - PchumLog.error("Failed to display error message (???): %s" % err) - - def addMessage(self, msg, direction): - # Redirect to where these things belong. - self.text.area.addMessage(msg, direction=direction) - - def closeEvent(self, event): - # TODO: Set up ESC to close the console...or refer to hiding it as - # closing it. Not sure which is preferable. - parent = self.parent() - parent.console.is_open = False - parent.console.window = None - return super(ConsoleWindow, self).closeEvent(event) - - def hideEvent(self, event): - parent = self.parent() - parent.console.is_open = False - - def initTheme(self, theme): - # Set up our style/window specifics - self.changeTheme(theme) - self.resize(400, 600) - - def changeTheme(self, theme): - self.setStyleSheet(theme[self.stylesheet_path]) - self.setWindowTitle("==> Console") - if "area" in self.text and "input" in self.text: - self.text.area.changeTheme(theme) - self.text.input.changeTheme(theme) - - @QtCore.pyqtSlot() - def designateCurrentWidget(self): - # Display and save the current widget! - # TODO: Consider (reversible) highlighting or selection or something - # fancy. It'd help people write styles, wouldn't it? - # ...just remember to use mouseRelease() if you work with hovering. - - # Direction: Misc. Info - direction = 2 - - pos = QtGui.QCursor.pos() - wgt = QtWidgets.QApplication.widgetAt(pos) - if wgt is None: - # Don't set None, for now. May change this later. - self.addMessage( - "You need to have your cursor over something " - + "in Pesterchum to use that.", - direction=direction, - ) - return - - self.selected_widget = wgt - nchild = len(wgt.children()) - output = [] - output.append("CONSOLE.selected_widget = {0!r}".format(wgt)) - output.append("{0: <4}Parent: {1!r}".format("", wgt.parent())) - output.append( - "{0: <4}{1:4d} child{2}".format( - "", nchild, ("ren" if abs(nchild) != 1 else "") - ) - ) - if self.show_info_on_select: - qtss = None - uses_ss = None - try: - qtss = wgt.styleSheet() - except: - pass - else: - if str(qtss) == str(""): - uses_ss, ss_msg = False, "No" - elif qtss is not None: - uses_ss, ss_msg = True, "Yes" - else: - uses_ss, ss_msg = None, "Invalid" - - ss_par, ss_par_msg = None, "" - if uses_ss is False: - # TODO: Split this into a sub-function or integrate it into - # Styler or *something*. - # The stylesheet was probably defined on a parent higher up. - # Rungs above the start - i = 0 - # qtss is still "" from earlier - while not qtss: - try: - ss_par = wgt.parent() - qtss = ss_par.styleSheet() - except: - # Can't ascend...and we're still in loop, so we don't - # have what we came for. - # Either that, or it's incompatible, which means the - # ones above are anyway. - ss_par = False - break - else: - # Indicate that we got this from a parent - i += 1 - - if not qtss: - # There are no stylesheets here. - if ss_par is False: - # We had parent issues. - # TODO: Specifically indicate invalid parent. - uses_ss, ss_msg = None, "Invalid" - else: - uses_ss, ss_msg = False, "No" - else: - # We got a stylesheet out of this! - uses_ss, ss_msg = True, "Yes" - # ~ss_par_msg = "{0: <4}...on parent ↑{1:d}: {2!r}".format('', - ss_par_msg = "{0: <4}...on parent #{1:d}: {2!r}".format( - "", i, ss_par - ) - - msg = [] - msg.append("{0: <4}QtSS?: {1}".format("", ss_msg)) - # A stylesheet analyzer would be wonderful here. Perhaps something - # that tells us how many parent classes define stylesheets? - if uses_ss: - if ss_par_msg: - # We got this stylesheet from a parent object somewhere. - msg.append(ss_par_msg) - msg.append("{0: <4}".format("Stylesheet:")) - for ln in qtss.split("\n"): - msg.append("{0: <8}".format(ln)) - - # Actually add this stuff to the result we're constructing - output.extend(msg) - - output = "\n".join(output) - self.addMessage(output, direction=direction) - - # Actual console stuff. - def execInConsole(self, scriptstr, env=None): - # Since that's what imports *us*, this should be okay - # Tab completion could be set up in ConsoleInput, and would be nice - import pesterchum as pchum - - if env is None: - env = pchum._retrieveGlobals() - - # Modify the environment the script will execute in. - # Fetch from the class/instance first. - _CUSTOM_ENV = self._CUSTOM_ENV.copy() - # Modify with some hard-coded environmental additions. - _CUSTOM_ENV.update( - { - "CONSOLE": self, - "MAINWIN": self.mainwindow, - "PCONFIG": self.mainwindow.config, - "exit": lambda: self.mainwindow.exitaction.trigger(), - } - ) - # Aliases. - _CUSTOM_ENV.update({"quit": _CUSTOM_ENV["exit"]}) - # Add whatever additions were set in the main pesterchum file. - _CUSTOM_ENV.update(pchum._CONSOLE_ENV) - - _CUSTOM_ENV_USED = [] - cenv = pchum.__dict__ - # Display the input we provided - # We do this here, *before* we do our variable injection, so that it - # doesn't have to be part of the try statement, where it could - # potentially complicate matters/give false positives. - self.addMessage(scriptstr, 1) - for k in _CUSTOM_ENV: - if k not in cenv: - # Inject the variable for ease of use. - cenv[k] = _CUSTOM_ENV[k] - # Record that we injected it. - _CUSTOM_ENV_USED.append(k) - else: - # Don't overwrite anything! - warn = "Console environment item {0!r} already exists in CENV." - warn.format(k) - PchumLog.warning(warn) - # Because all we did was change a linked AttrDict, we should be fine - # here. - try: - # Replace the old writer (for now) - sysout, sys.stdout = sys.stdout, self - try: - code = compile(scriptstr + "\n", "", "single") - # Will using cenv instead of env cause problems?... - result = eval(code, cenv) - except: - # Something went wrong. - self.addTraceback(sys.exc_info()[2]) - else: - # No errors. - if result is not None: - PchumLog.info(repr(result)) - finally: - # Restore system output. - sys.stdout = sysout - finally: - # Try to clean us out of globals - this might be disabled - # later. - for k in _CUSTOM_ENV_USED: - # Remove the key we added. - cenv.pop(k, None) - - def write(self, data): - # Replaces sys.stdout briefly - # We only ever use this for receiving, so it's safe to assume the - # direction is always -1. - if not isinstance(data, list): - data = data.split("\n") - for line in data: - if len(line): - self.addMessage(line, -1) - - -class ConsoleText(QtWidgets.QTextEdit): - stylesheet_template = """ - QScrollBar:vertical {{ {style[convo/scrollbar/style]} }} - QScrollBar::handle:vertical {{ {style[convo/scrollbar/handle]} }} - QScrollBar::add-line:vertical {{ {style[convo/scrollbar/downarrow]} }} - QScrollBar::sub-line:vertical {{ {style[convo/scrollbar/uparrow]} }} - QScrollBar:up-arrow:vertical {{ {style[convo/scrollbar/uarrowstyle]} }} - QScrollBar:down-arrow:vertical {{ {style[convo/scrollbar/darrowstyle]} }} - """ - stylesheet_path = "convo/textarea/style" - # NOTE: Qt applies stylesheets like switching CSS files. They are NOT - # applied piecemeal. - # TODO: Consider parsing the themes out into stylesheets with pieces that - # we can hand to each widget. - - def __init__(self, theme, parent=None): - super(ConsoleText, self).__init__(parent) - if hasattr(self.window(), "mainwindow"): - self.mainwindow = self.window().mainwindow - else: - self.mainwindow = self.window() - - self.hasTabs = False - self.initTheme(theme) - self.setReadOnly(True) - self.setMouseTracking(True) - self.textSelected = False - - self.copyAvailable[bool].connect(self.textReady) - self.urls = {} - - # Stripped out animation init - it's all cruft to us. - - @QtCore.pyqtSlot(bool) - def textReady(self, ready): - self.textSelected = ready - - def initTheme(self, theme): - # The basic style... - stylesheet = "QTextEdit {{ {style[convo/textarea/style]} }}" - if "convo/scrollbar" in theme: - # TODO: Make all of this into a Styler mixin, so we can just feed - # it a theme whenever we want to change. - # We'd have to define the keys we're affecting, but that shouldn't - # be too hard - it's what dicts are for. - - # Add the rest. - stylesheet += "\n" + self.stylesheet_template - stylesheet = stylesheet.format(style=theme) - self.setStyleSheet(stylesheet) - - def addMessage(self, msg, direction): - # Display a message we've received. - # Direction > 0 == out (sent by us); < 0 == in (sent by script). - if len(msg) == 0: - return - # ~color = chum.colorcmd() - # ~initials = chum.initials() - parent = self.window() - mwindow = parent.mainwindow - - # systemColor = QtGui.QColor(mwindow.theme["convo/systemMsgColor"]) - - if mwindow.config.showTimeStamps(): - if mwindow.config.time12Format(): - timestamp = time.strftime("[%I:%M") - else: - timestamp = time.strftime("[%H:%M") - if mwindow.config.showSeconds(): - timestamp += time.strftime(":%S] ") - else: - timestamp += "] " - else: - timestamp = "" - - # Figure out what prefix to use. - if direction > 1: - # Misc. Info - prefix = parent.miscinfo_prefix - elif direction > 0: - # Outgoing. - prefix = parent.outgoing_prefix - elif direction < 0: - # Incoming. - prefix = parent.incoming_prefix - elif direction == 0: - # We could just 'else' here, but there might be some oddness later. - prefix = parent.neutral_prefix - - # Later, this will have to escape things so we don't parse them, - # likely...hm. - # ~result = "{} {} {!r}" - # The input we get is already repr'd...we pass it via print, and thus - # do that there. - result = "{}{} {}\n" - result = result.format(timestamp, prefix, msg) - self.appendPlainText(result) - - # Direction doesn't matter here - it's the console. - self.lastmsg = datetime.datetime.now() - # This needs to finish being rewritten.... - - def appendPlainText(self, text): - """Add plain text to the end of the document, a la insertPlainText.""" - # Save the old cursor - oldcur = self.textCursor() - # Move the cursor to the end of the document for insertion - self.moveCursor(QtGui.QTextCursor.MoveOperation.End) - # Insert the text - self.insertPlainText(text) - # Return the cursor to wherever it was prior - self.setTextCursor(oldcur) - - def changeTheme(self, theme): - self.initTheme(theme) - sb = self.verticalScrollBar() - sb.setValue(sb.maximum()) - - def focusInEvent(self, event): - self.window().clearNewMessage() - super(ConsoleText, self).focusInEvent(event) - - def keyPressEvent(self, event): - # NOTE: This doesn't give focus to the input bar, which it probably - # should. - # karxi: Test for tab changing? - if self.window().text.input: - if event.key() not in ( - QtCore.Qt.Key.Key_PageUp, - QtCore.Qt.Key.Key_PageDown, - QtCore.Qt.Key.Key_Up, - QtCore.Qt.Key.Key_Down, - ): - self.window().text.input.keyPressEvent(event) - - super(ConsoleText, self).keyPressEvent(event) - - def mousePressEvent(self, event): - if event.button() == QtCore.Qt.MouseButton.LeftButton: - try: - # PyQt6 - url = self.anchorAt(event.position().toPoint()) - except AttributeError: - # PyQt5 - url = self.anchorAt(event.pos()) - if url != "": - # Skip memo/handle recognition - # NOTE: Ctrl+Click copies the URL. Maybe it should select it? - if event.modifiers() == QtCore.Qt.KeyboardModifier.ControlModifier: - QtWidgets.QApplication.clipboard().setText(url) - else: - # This'll probably be removed. May change the lexer out. - QtGui.QDesktopServices.openUrl( - QtCore.QUrl(url, QtCore.QUrl.ParsingMode.TolerantMode) - ) - - super(ConsoleText, self).mousePressEvent(event) - - def mouseMoveEvent(self, event): - # Change our cursor when we roll over links (anchors). - super(ConsoleText, self).mouseMoveEvent(event) - try: - # PyQt6 - pos = event.position().toPoint() - except AttributeError: - # PyQt5 - pos = event.pos() - if self.anchorAt(pos): - if ( - self.viewport().cursor().shape - != QtCore.Qt.CursorShape.PointingHandCursor - ): - self.viewport().setCursor( - QtGui.QCursor(QtCore.Qt.CursorShape.PointingHandCursor) - ) - else: - self.viewport().setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.IBeamCursor)) - - def contextMenuEvent(self, event): - textMenu = self.createStandardContextMenu() - textMenu.exec(event.globalPos()) - - -class ConsoleInput(QtWidgets.QLineEdit): - """The actual text entry box on a ConsoleWindow.""" - - # I honestly feel like this could just be made a private class of - # ConsoleWindow, but...best not to overcomplicate things. - stylesheet_path = "convo/input/style" - - def __init__(self, theme, parent=None): - super(ConsoleInput, self).__init__(parent) - - self.changeTheme(theme) - - def changeTheme(self, theme): - self.setStyleSheet(theme[self.stylesheet_path]) - - def focusInEvent(self, event): - # We gained focus. Notify the parent window that this happened. - self.window().clearNewMessage() - self.window().text.area.textCursor().clearSelection() - - super(ConsoleInput, self).focusInEvent(event) - - def keyPressEvent(self, event): - evtkey = event.key() - parent = self.window() - - # If a key is pressed here, we're not idle.... - # NOTE: Do we really want everyone knowing we're around if we're - # messing around in the console? Hm. - parent.mainwindow.idler.time = 0 - - if evtkey == QtCore.Qt.Key.Key_Up: - text = str(self.text()) - next = parent.text.history.next(text) - if next is not None: - self.setText(next) - elif evtkey == QtCore.Qt.Key.Key_Down: - prev = parent.text.history.prev() - if prev is not None: - self.setText(prev) - elif evtkey in (QtCore.Qt.Key.Key_PageUp, QtCore.Qt.Key.Key_PageDown): - parent.text.area.keyPressEvent(event) - else: - super(ConsoleInput, self).keyPressEvent(event) -""" diff --git a/pesterchum.py b/pesterchum.py index c1c6a05..ce215e3 100755 --- a/pesterchum.py +++ b/pesterchum.py @@ -19,7 +19,6 @@ import ostools import nickservmsgs import pytwmn -# import console from user_profile import ( userConfig, userProfile, @@ -140,11 +139,6 @@ SERVICES = [ ] BOTNAMES.extend(CUSTOMBOTS) BOTNAMES.extend(SERVICES) -# Save the main app. From here, we should be able to get everything else in -# order, for console use. -_CONSOLE = False -_CONSOLE_ENV = {} -_CONSOLE_ENV["PAPP"] = None # Command line arguments _ARGUMENTS = parser.parse_args() @@ -1290,8 +1284,6 @@ class PesterWindow(MovingWindow): | QtCore.Qt.WindowType.FramelessWindowHint ), ) - # For debugging - _CONSOLE_ENV["PAPP"] = self # TODO: karxi: SO! At the end of this function it seems like that # object is just made into None or.../something/. Somehow, it just # DIES, and I haven't the slightest idea why. I've tried multiple ways @@ -1446,46 +1438,6 @@ class PesterWindow(MovingWindow): self.menu.setNativeMenuBar(False) self.menu.setObjectName("mainmenu") - """ - if self.theme.has_key("main/menus/client/console"): - self.console = AttrDict( - dict( - window=None, - action=QAction(self.theme["main/menus/client/console"], self), - is_open=False, - ) - ) - else: - self.console = AttrDict( - dict(window=None, action=QAction("Console", self), is_open=False) - ) - self.console.shortcuts = AttrDict( - dict( - conkey=QShortcut( - QtGui.QKeySequence("Ctrl+`"), - self, - context=QtCore.Qt.ShortcutContext.ApplicationShortcut, - ), - curwgt=QShortcut( - QtGui.QKeySequence("Ctrl+Alt+w"), - self, - context=QtCore.Qt.ShortcutContext.ApplicationShortcut, - ), - ) - ) - self.console.action.triggered.connect(self.toggleConsole) - # Make sure the shortcut works anywhere. - # karxi: There's something wrong with the inheritance scheme here. - # ~self.console.shortcuts.conkey.setContext(QtCore.Qt.ShortcutContext.ApplicationShortcut) - self.console.shortcuts.conkey.activated.connect(self.toggleConsole) - # ~# Use new-style connections - # ~self.console.shortcut.activated.connect(self.toggleConsole) - # Apparently those can crash sometimes...c'est la vie. Can't use 'em. - # ~self.connect(self.console.shortcuts.curwgt, - # ~ QtCore.SIGNAL('activate()'), self.console. - self.console.is_open = False - """ - filemenu = self.menu.addMenu(self.theme["main/menus/client/_name"]) self.filemenu = filemenu filemenu.addAction(opts) @@ -1498,8 +1450,6 @@ class PesterWindow(MovingWindow): filemenu.addAction(talk) filemenu.addAction(self.idleaction) filemenu.addAction(grps) - if _CONSOLE: - filemenu.addAction(self.console.action) filemenu.addAction(self.importaction) filemenu.addAction(self.reconnectAction) filemenu.addAction(exitaction) @@ -2018,76 +1968,6 @@ class PesterWindow(MovingWindow): self.tabmemo = MemoTabWindow(self) self.tabmemo.windowClosed.connect(self.memoTabsClosed) - """ - @QtCore.pyqtSlot() - def toggleConsole(self): - if not _CONSOLE: - # We don't have the module file for this at the moment. - return - win = self.console.window - if win is None: - # We have no console window; make one. - PchumLog.info("Making a console....") - self.console.window = win = console.ConsoleWindow(parent=self) - PchumLog.info("Console made.") - # 'ConsoleWindow' object has no attribute 'windowClosed' - win.finished.connect(self.consoleWindowClosed) - self.console.shortcuts.curwgt.activated.connect(win.designateCurrentWidget) - - if self.console.is_open: - for wgt in win.findChildren(QtWidgets.QWidget): - try: - focused = wgt.hasFocus() - except AttributeError: - # The widget doesn't have a hasFocus method. - # Just to reduce ambiguity - focused = False - # Try the next one. - continue - # No error, let's see if we're actually focused. - if focused: - PchumLog.debug( - "{0!r} is in focus (parent: {1!r}); hiding".format( - wgt, wgt.parent() - ) - ) - # This widget, a child of our console, has focus. - # So...the console has focus. - # Set focus to the text input just for good measure. - win.text.input.setFocus() - # ...then hide it all. - win.hide() - self.console.is_open = False - break - else: - # The console is open, but not in focus. Bring it to the fore. - # NOTE: This is a bit of a kludgy method - it may not work - # properly on Windows. Need to look into workarounds. - # - # karxi: I *think* that Windows doesn't mind if the - # process/window that 'owns' this one changes our focus, since - # the application ultimately already *has* our focus - but I'm - # not sure. - PchumLog.debug("Console isn't in focus; fixing") - win.raise_() - win.show() - win.activateWindow() - - win.text.input.setFocus() - # No need to explicitly set it as open; it already is. - else: - PchumLog.debug("Console not visible; showing") - # Console isn't visible - show it. - win.show() - self.console.is_open = True - - @QtCore.pyqtSlot() - def consoleWindowClosed(self): - self.console.is_open = False - self.console.window = None - PchumLog.info("Console closed.") - """ - def newMemo(self, channel, timestr, secret=False, invite=False): if channel == "#pesterchum": return @@ -2222,17 +2102,6 @@ class PesterWindow(MovingWindow): self.nickServAction.setText(self.theme["main/menus/help/nickserv"]) self.helpmenu.setTitle(self.theme["main/menus/help/_name"]) - # Console - ## if self.theme.has_key("main/menus/client/console"): - ## self.console.action.setText(self.theme["main/menus/client/console"]) - ## else: - ## self.console.action.setText("Console") - # has_key doesn't work out here for some reason, possibly because of inherits? - # try: - # self.console.action.setText(self.theme["main/menus/client/console"]) - # except: - # self.console.action.setText("Console") - try: self.reportBugAction.setText(self.theme["main/menus/help/reportbug"]) except: @@ -2333,11 +2202,6 @@ class PesterWindow(MovingWindow): self.mychumhandleLabel.adjustSize() # Required so "CHUMHANDLE:" regardless of style-sheet. self.moodsLabel.adjustSize() # Required so "MOOD:" regardless of style-sheet. - if _CONSOLE: - if self.console.window: - # A bit of an ugly hack.... - self.console.window.changeTheme(theme) - # sounds self._setup_sounds() self.setVolume(self.config.volume()) @@ -4609,17 +4473,6 @@ class MainProgram(QtCore.QObject): def run(self): sys.exit(self.app.exec()) - -def _retrieveGlobals(): - # NOTE: Yes, this is a terrible kludge so that the console can work - # properly. I'm open to alternatives. - return globals() - - -# def main(): -# pesterchum = MainProgram() -# pesterchum.run() - if __name__ == "__main__": # We're being run as a script - not being imported. try: diff --git a/start.sh b/start.sh deleted file mode 100644 index 78439b7..0000000 --- a/start.sh +++ /dev/null @@ -1 +0,0 @@ -python3 pesterchum.py