dos-ified release_notes file

git-svn-id: http://comictagger.googlecode.com/svn/trunk@728 6c5673fe-1810-88d6-992b-cd32ca31540c

Makefile

@@ -52,7 +52,7 @@ upload:
 	#$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-$(VERSION_STR).zip"
 	#$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Mac OS X" -l Featured,Type-Archive -u beville -w $(PASSWORD) "release/ComicTagger-$(VERSION_STR).dmg"
 	#$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Windows" -l Featured,Type-Installer -u beville -w $(PASSWORD) "release/ComicTagger v$(VERSION_STR).exe"
-	#python setup.py register
+	python setup.py register
 	python setup.py sdist --formats=zip upload
  
 svn_tag:

comictaggerlib/ctversion.py

@@ -1,3 +1,3 @@
 # This file should contan only these comments, and the line below.  
 # Used by packaging makefiles and app
-version="1.1.13-beta"
+version="1.1.14-beta"

comictaggerlib/fileselectionlist.py

@@ -31,7 +31,10 @@ from settings import ComicTaggerSettings
 from comicarchive import ComicArchive
 from comicarchive import MetaDataStyle
 from genericmetadata import GenericMetadata, PageType
+from optionalmsgdialog import OptionalMessageDialog
 import utils
+import platform
+import os
 
 class FileTableWidget( QTableWidget ):
 
@@ -172,7 +175,6 @@ class FileSelectionList(QWidget):
 	def addPathList( self, pathlist ):
 		
 		filelist = utils.get_recursive_filelist( pathlist )
-			
 		# we now have a list of files to add
 
 		progdialog = QProgressDialog("", "Cancel", 0, len(filelist), self)
@@ -196,6 +198,24 @@ class FileSelectionList(QWidget):
 				firstAdded = row
 			
 		progdialog.close()
+		if ( self.settings.show_no_unrar_warning and
+			 self.settings.unrar_exe_path == "" and
+			 self.settings.rar_exe_path == "" and
+			 platform.system() != "Windows"):
+			for f in filelist:
+				ext = os.path.splitext(f)[1].lower()
+				if ext == ".rar" or ext ==".cbr":
+					checked = OptionalMessageDialog.msg(  self, "No unrar tool",
+							"""
+							It looks like you've tried to open at least one CBR or RAR file.<br><br>
+							In order for ComicTagger to read this kind of file, you will have to configure
+							the location of the unrar tool in the settings.  Until then, ComicTagger
+							will not be able recognize these kind of files.
+							"""
+							)
+					self.settings.show_no_unrar_warning = not checked
+					break
+			
 		if firstAdded is not None:
 			self.twList.selectRow(firstAdded)
 		else:
@@ -226,7 +246,17 @@ class FileSelectionList(QWidget):
 				return True
 			r = r + 1
 			
-		return False		
+		return False
+
+	def getCurrentListRow( self, path ):
+		r = 0
+		while r < self.twList.rowCount():
+			ca = self.getArchiveByRow( r )
+			if ca.path == path:
+				return r
+			r = r + 1
+			
+		return -1		
 		
 	def addPathItem( self, path):
 		path = unicode( path )
@@ -234,7 +264,7 @@ class FileSelectionList(QWidget):
 		#print "processing", path
 		
 		if self.isListDupe(path):
-			return None
+			return self.getCurrentListRow(path)
 		
 		ca = ComicArchive( path, self.settings.rar_exe_path )
 			

comictaggerlib/optionalmsgdialog.py

@@ -60,7 +60,7 @@ class OptionalMessageDialog(QDialog):
 			if style == StyleQuestion:
 				check_text = "Remember this answer"
 			else:
-				check_text = "Don't show this dialog again"
+				check_text = "Don't show this message again"
 				
 		self.theCheckBox = QCheckBox(check_text)
 		

comictaggerlib/settings.py

@@ -98,6 +98,7 @@ class ComicTaggerSettings:
 		self.show_disclaimer = True
 		self.dont_notify_about_this_version = ""
 		self.ask_about_usage_stats = True
+		self.show_no_unrar_warning = True
 		
 		#filename parsing settings
 		self.parse_scan_info = True
@@ -242,6 +243,8 @@ class ComicTaggerSettings:
 			self.dont_notify_about_this_version = self.config.get( 'dialogflags', 'dont_notify_about_this_version' )
 		if self.config.has_option('dialogflags', 'ask_about_usage_stats'):
 			self.ask_about_usage_stats =        self.config.getboolean( 'dialogflags', 'ask_about_usage_stats' )		
+		if self.config.has_option('dialogflags', 'show_no_unrar_warning'):
+			self.show_no_unrar_warning =        self.config.getboolean( 'dialogflags', 'show_no_unrar_warning' )		
 						
 		if self.config.has_option('comicvine', 'use_series_start_as_volume'):
 			self.use_series_start_as_volume =        self.config.getboolean( 'comicvine', 'use_series_start_as_volume' )		
@@ -329,6 +332,7 @@ class ComicTaggerSettings:
 		self.config.set( 'dialogflags', 'show_disclaimer', self.show_disclaimer )
 		self.config.set( 'dialogflags', 'dont_notify_about_this_version', self.dont_notify_about_this_version )
 		self.config.set( 'dialogflags', 'ask_about_usage_stats', self.ask_about_usage_stats )
+		self.config.set( 'dialogflags', 'show_no_unrar_warning', self.show_no_unrar_warning )
 
 		if not self.config.has_section( 'filenameparser' ):
 			self.config.add_section( 'filenameparser' )

comictaggerlib/taggerwindow.py

@@ -1923,12 +1923,47 @@ class TaggerWindow( QtGui.QMainWindow):
 		# read in the file list if they're giving it,
 		# and add to our own list
 		localSocket = self.socketServer.nextPendingConnection()
-		if not localSocket.waitForReadyRead(3000):
-			print localSocket.errorString().toLatin1()
-			return
-		byteArray = localSocket.readAll()
-		if len(byteArray) > 0:
-			obj = pickle.loads(byteArray)
-			localSocket.disconnectFromServer()
-			if type(obj) is list:
-				self.fileSelectionList.addPathList( obj )
+		if localSocket.waitForReadyRead(3000):
+			byteArray = localSocket.readAll()
+			if len(byteArray) > 0:
+				obj = pickle.loads(byteArray)
+				localSocket.disconnectFromServer()
+				if type(obj) is list:
+					self.fileSelectionList.addPathList( obj )
+		else:
+			#print localSocket.errorString().toLatin1()
+			pass
+
+		self.bringToTop()
+
+	def bringToTop(self):
+		if platform.system() == "Windows":
+			self.showNormal()
+			self.raise_()
+			self.activateWindow()
+			try:
+				import win32con
+				import win32gui
+				hwnd = self.effectiveWinId()
+				rect = win32gui.GetWindowRect(hwnd)
+				x = rect[0]
+				y = rect[1]
+				w = rect[2] - x
+				h = rect[3] - y
+				# mark it "always on top", just for a moment, to force it to the top
+				win32gui.SetWindowPos(hwnd,win32con.HWND_TOPMOST,   x, y, w, h, 0)
+				win32gui.SetWindowPos(hwnd,win32con.HWND_NOTOPMOST, x, y, w, h, 0)
+			except Exception as e:
+				print "Whoops", e
+		elif platform.system() == "Darwin":
+			self.raise_()
+			self.showNormal()
+			self.activateWindow()
+		else:
+			flags = self.windowFlags() 
+			self.setWindowFlags( flags |  QtCore.Qt.WindowStaysOnTopHint | QtCore.Qt.X11BypassWindowManagerHint)
+			QtCore.QCoreApplication.processEvents()
+			#self.show()
+			self.setWindowFlags( flags )
+			self.show()
+		

release_notes.txt

@@ -1,3 +1,10 @@
+---------------------------------  
+1.1.14-beta - 13-Apr-2014
+---------------------------------
+ * Make sure app gets raised when enforcing single instance
+ * Added warning dialog for when opening rar files, and no (un)rar tool 
+ * remove pil from python package requirements
+
 ---------------------------------  
 1.1.13-beta - 9-Apr-2014
 ---------------------------------
@@ -5,9 +12,9 @@
  * better parsing of html table in summary text, and optional removal
  * Python package should auto-install requirements
  * Specify default GUI tag style on command-line
- * enforce single GUI instance
- * new CBL tranform to copy story arcs to generic tags
- * Persist some auto-tag settings
+ * enforce single GUI instance
+ * new CBL tranform to copy story arcs to generic tags
+ * Persist some auto-tag settings
 
 ---------------------------------  
 1.1.12-beta - 23-Mar-2014

requirements.txt

@@ -1,3 +1,2 @@
 configparser
 beautifulsoup4 >= 4.1
-PIL >= 1.1.6