diff --git a/autotagprogresswindow.py b/autotagprogresswindow.py index ad0b36b..fbf5075 100644 --- a/autotagprogresswindow.py +++ b/autotagprogresswindow.py @@ -35,6 +35,13 @@ class AutoTagProgressWindow(QtGui.QDialog): self.lblArchive.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' ))) self.isdone = False + # we can't specify relative font sizes in the UI designer, so + # make font for scroll window a smidge smaller + f = self.textEdit.font() + if f.pointSize() > 10: + f.setPointSize( f.pointSize() - 2 ) + self.textEdit.setFont( f ) + def setArchiveImage( self, img_data): self.setCoverImage( img_data, self.lblArchive ) diff --git a/autotagprogresswindow.ui b/autotagprogresswindow.ui index 13cf566..dc08f8c 100644 --- a/autotagprogresswindow.ui +++ b/autotagprogresswindow.ui @@ -6,7 +6,7 @@ 0 0 - 865 + 900 413 @@ -43,9 +43,7 @@ - Courier New - 75 - true + Courier diff --git a/ctversion.py b/ctversion.py index 565304b..fa46283 100644 --- a/ctversion.py +++ b/ctversion.py @@ -1,3 +1,3 @@ # This file should contan only these comments, and the line below. # Used by packaging makefiles and app -version="0.9.6-beta-pre" +version="1.0.0-beta" diff --git a/graphics/longbox.png b/graphics/longbox.png new file mode 100644 index 0000000..8ee13c3 Binary files /dev/null and b/graphics/longbox.png differ diff --git a/issueidentifier.py b/issueidentifier.py index 42e7874..fe03ffa 100644 --- a/issueidentifier.py +++ b/issueidentifier.py @@ -256,7 +256,7 @@ class IssueIdentifier: if keys['month'] is not None: self.log_msg( "\tMonth : " + str(keys['month']) ) - self.log_msg("Publisher Blacklist: " + str(self.publisher_blacklist)) + #self.log_msg("Publisher Blacklist: " + str(self.publisher_blacklist)) comicVine = ComicVineTalker( ) @@ -424,7 +424,7 @@ class IssueIdentifier: if len(self.match_list) == 1: self.search_result = self.ResultOneGoodMatch if best_score > self.min_score_thresh: - self.log_msg( "!!!! Very weak score for the cover. Maybe it's not the cover?" ) + self.log_msg( "Very weak score for the cover. Maybe it's not the cover..." ) self.log_msg( "Comparing to some other archive pages now..." ) found = False @@ -433,11 +433,11 @@ class IssueIdentifier: page_hash = self.calculateHash( image_data ) distance = ImageHasher.hamming_distance(page_hash, self.match_list[0]['url_image_hash']) if distance <= self.strong_score_thresh: - self.log_msg( "Found a great match d={0} on page {1}!".format(distance, i+1) ) + self.log_msg( "Found a great match (distance = {0}) on page {1}!".format(distance, i+1) ) found = True break elif distance < self.min_score_thresh: - self.log_msg( "Found a good match d={0} on page {1}".format(distance, i) ) + self.log_msg( "Found a good match (distance = {0}) on page {1}".format(distance, i) ) found = True self.log_msg( ".", newline=False ) self.log_msg( "" ) @@ -445,7 +445,9 @@ class IssueIdentifier: self.log_msg( "No matching pages in the issue. Bummer" ) self.search_result = self.ResultFoundMatchButBadCoverScore + self.log_msg( u"--------------------------------------------------") print_match(self.match_list[0]) + self.log_msg( u"--------------------------------------------------") return self.match_list elif best_score > self.min_score_thresh and len(self.match_list) > 1: @@ -460,7 +462,9 @@ class IssueIdentifier: self.match_list.remove(item) if len(self.match_list) == 1: + self.log_msg( u"--------------------------------------------------") print_match(self.match_list[0]) + self.log_msg( u"--------------------------------------------------") self.search_result = self.ResultOneGoodMatch elif len(self.match_list) == 0: @@ -470,8 +474,10 @@ class IssueIdentifier: print self.log_msg( "More than one likley candiate." ) self.search_result = self.ResultMultipleGoodMatches + self.log_msg( u"--------------------------------------------------") for item in self.match_list: print_match(item) + self.log_msg( u"--------------------------------------------------") return self.match_list diff --git a/progresswindow.py b/progresswindow.py index 7296788..7ebf631 100644 --- a/progresswindow.py +++ b/progresswindow.py @@ -32,7 +32,12 @@ class IDProgressWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'progresswindow.ui' ), self) - + # we can't specify relative font sizes in the UI designer, so + # make font for scroll window a smidge smaller + f = self.textEdit.font() + if f.pointSize() > 10: + f.setPointSize( f.pointSize() - 2 ) + self.textEdit.setFont( f ) \ No newline at end of file diff --git a/progresswindow.ui b/progresswindow.ui index 3ffcb05..4e54eb6 100644 --- a/progresswindow.ui +++ b/progresswindow.ui @@ -6,7 +6,7 @@ 0 0 - 556 + 650 287 @@ -28,7 +28,11 @@ - + + + Courier + + true diff --git a/taggerwindow.py b/taggerwindow.py index f3937f2..2575eb4 100644 --- a/taggerwindow.py +++ b/taggerwindow.py @@ -354,18 +354,21 @@ class TaggerWindow( QtGui.QMainWindow): # ToolBar self.actionLoad.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/open.png')) ) + self.actionLoadFolder.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/longbox.png')) ) self.actionWrite_Tags.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/save.png')) ) self.actionParse_Filename.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/parse.png')) ) self.actionSearchOnline.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/search.png')) ) self.actionAutoIdentify.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/auto.png')) ) + self.actionAutoTag.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/autotag.png')) ) self.actionClearEntryForm.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/clear.png')) ) self.actionPageBrowser.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/browse.png') )) self.toolBar.addAction( self.actionLoad ) + self.toolBar.addAction( self.actionLoadFolder ) self.toolBar.addAction( self.actionWrite_Tags ) - self.toolBar.addAction( self.actionParse_Filename ) self.toolBar.addAction( self.actionSearchOnline ) self.toolBar.addAction( self.actionAutoIdentify ) + self.toolBar.addAction( self.actionAutoTag ) self.toolBar.addAction( self.actionClearEntryForm ) self.toolBar.addAction( self.actionPageBrowser ) @@ -514,11 +517,13 @@ class TaggerWindow( QtGui.QMainWindow): def updateMenus( self ): # First just disable all the questionable items - self.actionRemoveAuto.setEnabled( True ) - self.actionRemoveCRTags.setEnabled( True ) - self.actionRemoveCBLTags.setEnabled( True ) + self.actionAutoTag.setEnabled( False ) + self.actionCopyTags.setEnabled( False ) + self.actionRemoveAuto.setEnabled( False ) + self.actionRemoveCRTags.setEnabled( False ) + self.actionRemoveCBLTags.setEnabled( False ) self.actionWrite_Tags.setEnabled( False ) - #self.actionRepackage.setEnabled(False) + self.actionRepackage.setEnabled(False) self.actionViewRawCBLTags.setEnabled( False ) self.actionViewRawCRTags.setEnabled( False ) self.actionParse_Filename.setEnabled( False ) @@ -533,11 +538,14 @@ class TaggerWindow( QtGui.QMainWindow): self.actionParse_Filename.setEnabled( True ) self.actionAutoIdentify.setEnabled( True ) + self.actionAutoTag.setEnabled( True ) self.actionRename.setEnabled( True ) self.actionApplyCBLTransform.setEnabled( True ) - - if not self.comic_archive.isZip(): - self.actionRepackage.setEnabled(True) + self.actionRepackage.setEnabled(True) + self.actionRemoveAuto.setEnabled( True ) + self.actionRemoveCRTags.setEnabled( True ) + self.actionRemoveCBLTags.setEnabled( True ) + self.actionCopyTags.setEnabled( True ) if has_cix: self.actionViewRawCRTags.setEnabled( True ) @@ -546,12 +554,7 @@ class TaggerWindow( QtGui.QMainWindow): if self.comic_archive.isWritable(): self.actionWrite_Tags.setEnabled( True ) - if has_cix or has_cbi: - self.actionRemoveAuto.setEnabled( True ) - if has_cix: - self.actionRemoveCRTags.setEnabled( True ) - if has_cbi: - self.actionRemoveCBLTags.setEnabled( True ) + def updateInfoBox( self ): diff --git a/todo.txt b/todo.txt index 2fa4a37..996421c 100644 --- a/todo.txt +++ b/todo.txt @@ -2,11 +2,8 @@ Features ----------------------------------------------------- -Re-arrange main form layout - New menu graphics - auto tag open folder vs file Multi-file: @@ -14,7 +11,7 @@ Multi-file: Batch Functions: Auto-Tag Interactive dialog at end - Change cover image on left?? + Manually change cover image on left?? Rename check-box for rows? @@ -26,6 +23,7 @@ Docs: Define Manual Search - Manual vs Auto-Identify - Uses form, doesn't save vs Auto-Tag - Doesn't use form, saves + Screen shots -----------------------------------------------------