alpha v1
This commit is contained in:
Stephen Dranger
parent
9716448ba9
commit
a2843c6951
9 changed files with 127 additions and 18 deletions
5
convo.py
5
convo.py
|
|
@ -260,7 +260,7 @@ class PesterText(QtGui.QTextEdit):
|
|||
if chum is me:
|
||||
window.chatlog.log(parent.chum.handle, lexmsg)
|
||||
else:
|
||||
if window.idleaction.isChecked():
|
||||
if window.idleaction.isChecked() and parent.chumopen:
|
||||
idlethreshhold = 60
|
||||
if (not hasattr(self, 'lastmsg')) or \
|
||||
datetime.now() - self.lastmsg > timedelta(0,idlethreshhold):
|
||||
|
|
@ -480,9 +480,6 @@ class PesterConvo(QtGui.QFrame):
|
|||
if self.parent():
|
||||
self.parent().showChat(self.title())
|
||||
self.raiseChat()
|
||||
def activateChat(self):
|
||||
if platform.system() == "Windows":
|
||||
self.activateWindow()
|
||||
def contextMenuEvent(self, event):
|
||||
if event.reason() == QtGui.QContextMenuEvent.Mouse:
|
||||
self.optionsMenu.popup(event.globalPos())
|
||||
|
|
|
|||
BIN
convo.pyc
BIN
convo.pyc
Binary file not shown.
File diff suppressed because one or more lines are too long
39
pesterchum-update.nsi
Normal file
39
pesterchum-update.nsi
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
|
||||
; The name of the installer
|
||||
Name "PESTERCHUM3.14a"
|
||||
|
||||
; The file to write
|
||||
OutFile "pesterchum3.14a0.2update.exe"
|
||||
|
||||
RequestExecutionLevel admin
|
||||
|
||||
Page components
|
||||
Page instfiles
|
||||
|
||||
; The stuff to install
|
||||
Section "Pesterchum"
|
||||
|
||||
SectionIn RO
|
||||
|
||||
ReadRegStr $INSTDIR HKLM "SOFTWARE\Pesterchum" "Install_Dir"
|
||||
|
||||
StrCmp $INSTDIR "" error
|
||||
|
||||
; Set output path to the installation directory.
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
; Put file there
|
||||
File /r themes
|
||||
File /r smilies
|
||||
File library.zip
|
||||
File pesterchum.exe
|
||||
|
||||
Delete "$SMPROGRAMS\Pesterchum\Pesterchum.lnk"
|
||||
CreateShortcut "$SMPROGRAMS\Pesterchum\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
|
||||
|
||||
Goto done
|
||||
error:
|
||||
MessageBox MB_OK "Pesterchum not found on this machine!"
|
||||
done:
|
||||
|
||||
SectionEnd
|
||||
|
|
@ -1 +1 @@
|
|||
{"tabs": true, "soundon": true, "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense"], "defaultprofile": "ghostDunk", "block": [], "server": "irc.tymoon.eu"}
|
||||
{"tabs": true, "soundon": true, "server": "irc.tymoon.eu", "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense"], "defaultprofile": "ghostDunk", "block": []}
|
||||
66
pesterchum.nsi
Normal file
66
pesterchum.nsi
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
|
||||
; The name of the installer
|
||||
Name "PESTERCHUM3.14a"
|
||||
|
||||
; The file to write
|
||||
OutFile "pesterchum3.14a.exe"
|
||||
|
||||
InstallDir $PROGRAMFILES\Pesterchum
|
||||
|
||||
InstallDirRegKey HKLM "Software\Pesterchum" "Install_Dir"
|
||||
RequestExecutionLevel admin
|
||||
|
||||
Page components
|
||||
Page directory
|
||||
Page instfiles
|
||||
|
||||
UninstPage uninstConfirm
|
||||
UninstPage instfiles
|
||||
|
||||
|
||||
; The stuff to install
|
||||
Section "Pesterchum"
|
||||
|
||||
SectionIn RO
|
||||
|
||||
; Set output path to the installation directory.
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
; Put file there
|
||||
File /r *.*
|
||||
|
||||
; Write the installation path into the registry
|
||||
WriteRegStr HKLM SOFTWARE\Pesterchum "Install_Dir" "$INSTDIR"
|
||||
|
||||
; Write the uninstall keys for Windows
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pesterchum" "DisplayName" "PESTERCHUM"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pesterchum" "UninstallString" '"$INSTDIR\uninstall.exe"'
|
||||
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pesterchum" "NoModify" 1
|
||||
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pesterchum" "NoRepair" 1
|
||||
WriteUninstaller "uninstall.exe"
|
||||
|
||||
CreateDirectory "$SMPROGRAMS\Pesterchum"
|
||||
CreateShortcut "$SMPROGRAMS\Pesterchum\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
|
||||
CreateShortcut "$SMPROGRAMS\Pesterchum\Readme.lnk" "$INSTDIR\readme.txt"
|
||||
CreateShortcut "$SMPROGRAMS\Pesterchum\Uninstall.lnk" "$INSTDIR\uninstall.exe"
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
||||
Section "Uninstall"
|
||||
|
||||
; Remove registry keys
|
||||
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pesterchum"
|
||||
DeleteRegKey HKLM SOFTWARE\Pesterchum
|
||||
|
||||
; Remove files and uninstaller
|
||||
Delete $INSTDIR\uninstall.exe
|
||||
|
||||
; Remove shortcuts, if any
|
||||
Delete "$SMPROGRAMS\Pesterchum\*.*"
|
||||
|
||||
; Remove directories used
|
||||
RMDir "$SMPROGRAMS\Pesterchum"
|
||||
RMDir /r "$INSTDIR"
|
||||
|
||||
SectionEnd
|
||||
|
|
@ -1302,6 +1302,7 @@ class PesterWindow(MovingWindow):
|
|||
sysColor = QtGui.QColor(self.theme["convo/systemMsgColor"])
|
||||
verb = self.theme["convo/text/idle"]
|
||||
for (h, convo) in self.convos.iteritems():
|
||||
if convo.chumopen:
|
||||
msg = self.profile().idlemsg(sysColor, verb)
|
||||
convo.textArea.append(convertTags(msg))
|
||||
self.chatlog.log(h, msg)
|
||||
|
|
|
|||
1
readme.txt
Normal file
1
readme.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
Welcome to Pesterchum!
|
||||
15
setup.py
15
setup.py
|
|
@ -9,24 +9,29 @@ else:
|
|||
base = "Console"
|
||||
|
||||
setup(
|
||||
name = "P3ST3RCHUM",
|
||||
name = "PESTERCHUM",
|
||||
version = "3.14",
|
||||
description = "P3ST3RCHUM",
|
||||
executables = [Executable("pesterchum.py",
|
||||
base=base,
|
||||
icon="pesterchum.ico",
|
||||
compress=True,
|
||||
icon="pesterchum.ico",
|
||||
)])
|
||||
if sys.platform == "win32":
|
||||
os.rename("build/exe.win32-2.6", "build/pesterchum")
|
||||
|
||||
shutil.copytree("themes", "build/pesterchum/themes")
|
||||
shutil.copytree("imageformats", "build/pesterchum/imageformats")
|
||||
shutil.copytree("smilies", "build/pesterchum/smilies")
|
||||
shutil.copy("pesterchum.js", "build/pesterchum/")
|
||||
shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcm90.dll", "build/pesterchum")
|
||||
shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcp90.dll", "build/pesterchum")
|
||||
shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcr90.dll", "build/pesterchum")
|
||||
shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest",
|
||||
"build/pesterchum")
|
||||
|
||||
shutil.copytree("themes", "build/pesterchum/themes")
|
||||
shutil.copy("pesterchum.js", "build/pesterchum/")
|
||||
shutil.copy("pesterchum.nsi", "build/pesterchum/")
|
||||
shutil.copy("pesterchum-update.nsi", "build/pesterchum/")
|
||||
os.mkdir("build/pesterchum/profiles")
|
||||
os.mkdir("build/pesterchum/logs")
|
||||
shutil.copy("logs/chums.js", "build/pesterchum/logs")
|
||||
shutil.copy("readme.txt", "build/pesterchum/")
|
||||
|
|
|
|||
Loading…
Reference in a new issue