Merge remote-tracking branch 'origin/3.41rc'

README.mkdn

@@ -1,29 +1,19 @@
-Welcome to Pesterchum 3.14.1!
+Welcome to Pesterchum 3.41!
 =============================
 
 WHAT'S NEW?
 -----------
-* Quirks now have a lower(), scramble(), and reverse() function!
-* Timestamps - check your Config!
-* Logviewer - View logs right in Pesterchum!
-* Quirk ordering - order your quirks so they work right!
-* # of users in a memo - You can now see how many users are in a memo.
-* @links to users - typing @ before user's name creates a link
-  that will pester them!
-* Support for REPORT and ALT to calSprite built in -
-  If someone is bothering you, or a canon handle is idle, or
-  for whatever reason, right click their name and go to "Report"
-  to report them to a moderator.
-  If you want to talk to an alt canon handle, just right click
-  the username!
-  if you have an alt handle, register it with calSprite!
+* Check out the CHANGELOG file to see what's changed!
+
+What do I do now?
+-----------------
+
+Most questions can be answered by visiting the forums! Go to HELP->HELP
+and you'll be transported to the proper thread!
 
 Here's some tips to help you get started:
 -----------------------------------------
 
-- You can import your old Pesterchum contacts by going to
-CLIENT->IMPORT and opening your pesterchum.cfg file. This is usually
-in the 2.5 base directory or in Tinychum's data folder.
 - Some themes can be confusing if you haven't used the program
 already! Some hints:
     * Trollian: Moods are set by clicking the timelines, and you
@@ -44,8 +34,6 @@ online userlist, or the list of memo browsers.
 Cool features:
 --------------
 
-- Importing from old PC. It can already do your chumlist, soon it will
-import your quirks from 2.5 and TC as well!
 - Profile switching. Instantly switch profiles, loading your color and
 quirks with it.
 - Theme switching and creation. So far this comes with a few official
@@ -782,3 +770,4 @@ Here's a list of smilies:
 * :olliesouty:
 * :billiards:
 * :billiardslarge:
+* :whatdidyoudo:

parsetools.py

@@ -428,6 +428,7 @@ smiledict = {
     ":olliesouty:": "olliesouty.gif",
     ":billiards:": "poolballS.gif",
     ":billiardslarge:": "poolballL.gif",
+    ":whatdidyoudo:": "whatdidyoudo.gif",    
     }
 
 if ostools.isOSXBundle():

pesterchum-update-from3.14.nsi

@@ -0,0 +1,104 @@
+
+; The name of the installer
+Name "PESTERCHUM3.14 to 3.41"
+
+; The file to write
+OutFile "pesterchum3.14to3.41.exe"
+
+RequestExecutionLevel admin
+
+Page components
+Page instfiles
+
+UninstPage uninstConfirm
+UninstPage 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
+
+  ; Check and see if this is really 3.14
+  IfFileExists library.zip 0 error
+
+  ClearErrors
+  CreateDirectory $TEMP\pesterchum_backup
+  IfErrors backuperror 0
+  CopyFiles $INSTDIR\pesterchum.js $TEMP\pesterchum_backup
+  CopyFiles $INSTDIR\profiles $TEMP\pesterchum_backup
+  CopyFiles $INSTDIR\logs $TEMP\pesterchum_backup
+  IfErrors cantcopy 0
+
+  Delete $INSTDIR\uninstall.exe
+
+  ; Remove shortcuts, if any
+  Delete "$SMPROGRAMS\Pesterchum\*.*"
+
+  ; Remove directories used
+  RMDir "$SMPROGRAMS\Pesterchum"
+  RMDir /r "$INSTDIR"
+
+  ; Put file there
+  File /r *.*
+  Rename $INSTDIR\README.mkdn $INSTDIR\readme.txt
+  Rename $INSTDIR\CHANGELOG.mkdn $INSTDIR\changelog.txt
+
+  ; Copy backup files
+  ClearErrors
+  CopyFiles $TEMP\pesterchum_backup\*.* $INSTDIR
+  IfErrors brokeinstall 0
+  RMDIR /r "$TEMP\pesterchum_backup"
+
+  WriteUninstaller "uninstall.exe"
+
+  CreateDirectory "$SMPROGRAMS\Pesterchum"
+  CreateShortcut "$SMPROGRAMS\Pesterchum\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
+  CreateShortcut "$DESKTOP\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
+  CreateShortcut "$SMPROGRAMS\Pesterchum\Readme.lnk" "$INSTDIR\readme.txt"
+  CreateShortcut "$SMPROGRAMS\Pesterchum\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+  CreateShortcut "$SMPROGRAMS\Pesterchum\Logs.lnk" "$LOCALAPPDATA\pesterchum\logs"
+
+  Goto done
+
+  error:
+    MessageBox MB_OK "Pesterchum 3.14 (or 3.41 beta) not found on this machine!"
+    Goto done
+  backuperror:
+    IfFileExists $TEMP\pesterchum_backup brokeinstall cantmaketmp
+  cantmaketmp:
+    MessageBox MB_OK "Error! Can't make temporary directory (to save your files) for some raisin. Check your privileges?? i dunno tbqh, soryr *sorry"
+    Goto done
+  brokeinstall:
+    MessageBox MB_OK "Broken install detected. Please copy the files in $TEMP\pesterchum_backup to some place safe and then delete that folder."
+    Goto done
+  cantcopy:
+    MessageBox MB_OK "Can't seem to copy Pesterchum backup files to temp directory."
+    Goto done
+  done:
+
+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

pesterchum-update.nsi

@@ -1,9 +1,9 @@
 
 ; The name of the installer
-Name "PESTERCHUM3.418"
+Name "PESTERCHUM3.41"
 
 ; The file to write
-OutFile "pesterchum3.418.update.exe"
+OutFile "pesterchum3.41.update.exe"
 
 RequestExecutionLevel admin
 
@@ -25,13 +25,19 @@ Section "Pesterchum"
   ; Put file there
   File /r themes
   File /r smilies
-  File library.zip
+  File /r quirks
+  File README.mkdn
+  File CHANGELOG.mkdn
+  File version.py
   File pesterchum.exe
+  File pesterchum.exe.manifest
+
+
+  Rename $INSTDIR\README.mkdn $INSTDIR\readme.txt
+  Rename $INSTDIR\CHANGELOG.mkdn $INSTDIR\changelog.txt
   
   Delete "$SMPROGRAMS\Pesterchum\Pesterchum.lnk"
-  Delete "$SMPROGRAMS\Pesterchum\PesterChumDebug.lnk"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
-  CreateShortcut "$SMPROGRAMS\Pesterchum\PesterchumDebug.lnk" "$INSTDIR\pesterchum_debug.exe"
    
   Goto done
   error:

pesterchum.nsi

@@ -1,9 +1,9 @@
 
 ; The name of the installer
-Name "PESTERCHUM3.418"
+Name "PESTERCHUM3.41"
 
 ; The file to write
-OutFile "pesterchum3.418.exe"
+OutFile "pesterchum3.41.exe"
 
 InstallDir C:\Pesterchum
 
@@ -28,6 +28,8 @@ Section "Pesterchum"
   
   ; Put file there
   File /r *.*
+  Rename $INSTDIR\README.mkdn $INSTDIR\readme.txt
+  Rename $INSTDIR\CHANGELOG.mkdn $INSTDIR\changelog.txt
 
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\Pesterchum "Install_Dir" "$INSTDIR"
@@ -41,16 +43,13 @@ Section "Pesterchum"
 
   CreateDirectory "$SMPROGRAMS\Pesterchum"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
-  CreateShortcut "$SMPROGRAMS\Pesterchum\PesterchumDebug.lnk" "$INSTDIR\pesterchum_debug.exe"
   CreateShortcut "$DESKTOP\Pesterchum.lnk" "$INSTDIR\pesterchum.exe"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Readme.lnk" "$INSTDIR\readme.txt"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-  CreateShortcut "$SMPROGRAMS\Pesterchum\Logs.lnk" "$INSTDIR\logs"
-
+  CreateShortcut "$SMPROGRAMS\Pesterchum\Logs.lnk" "$LOCALAPPDATA\pesterchum\logs"
 
 SectionEnd
 
-
 Section "Uninstall"
   
   ; Remove registry keys

profile.py

@@ -54,7 +54,14 @@ class PesterLog(object):
             for (format, t) in modes.iteritems():
                 if not os.path.exists("%s/%s/%s/%s" % (self.logpath, self.handle, handle, format)):
                     os.makedirs("%s/%s/%s/%s" % (self.logpath, self.handle, handle, format))
+                try:
                     fp = codecs.open("%s/%s/%s/%s/%s.%s.txt" % (self.logpath, self.handle, handle, format, handle, time), encoding='utf-8', mode='a')
+                except IOError:
+                    msg = QtGui.QMessageBox(self)
+                    msg.setText("Warning: Pesterchum could not open the log file for %s!" % (handle))
+                    msg.setInformativeText("Your log for %s will not be saved because something went wrong. We suggest restarting Pesterchum. Sorry :(" % (handle))
+                    msg.show()
+                    continue
                 self.convos[handle][format] = fp
         for (format, t) in modes.iteritems():
             f = self.convos[handle][format]

version.py

@@ -8,13 +8,13 @@ except:
 import zipfile
 import os, sys, shutil
 
-USER_TYPE = "edge"
+USER_TYPE = "user"
                   # user - for normal people
                   # beta - for the original beta testers
                   # dev  - used to be for git users, now it's anyone with the 3.41 beta
                   # edge - new git stuff. bleeding edge, do not try at home (kiooeht version)
 
-INSTALL_TYPE = "source"
+INSTALL_TYPE = "installer"
                   # installer - Windows/Mac installer     (exe/dmg)
                   # zip       - Windows zip               (zip)
                   # source    - Win/Linux/Mac source code (zip/tar)
@@ -26,12 +26,12 @@ elif OS_TYPE == "darwin":
     OS_TYPE = "mac"
 
 _pcMajor = "3.41"
-_pcMinor = "2"
-_pcStatus = "B" # A  = alpha
+_pcMinor = "3"
+_pcStatus = "RC" # A  = alpha
                 # B  = beta
                 # RC = release candidate
                 # None = public release
-_pcRevision = "6"
+_pcRevision = "1"
 _pcVersion = ""
 
 def pcVerCalc():