From c44c240eeff46c4850274f56a45e92e37084d0f9 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Wed, 23 Jan 2013 22:05:38 +0000 Subject: [PATCH] UI tweaks New icons bumped version number git-svn-id: http://comictagger.googlecode.com/svn/trunk@332 6c5673fe-1810-88d6-992b-cd32ca31540c --- autotagprogresswindow.py | 7 +++++++ autotagprogresswindow.ui | 6 ++---- ctversion.py | 2 +- graphics/longbox.png | Bin 0 -> 20364 bytes issueidentifier.py | 14 ++++++++++---- progresswindow.py | 7 ++++++- progresswindow.ui | 8 ++++++-- taggerwindow.py | 31 +++++++++++++++++-------------- todo.txt | 6 ++---- 9 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 graphics/longbox.png 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 0000000000000000000000000000000000000000..8ee13c3ee9cad7c582d3fabd6728dbfed3daf9c3 GIT binary patch literal 20364 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

6!rF>{fGn=6Dv1x` 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 U`x)6b>LKuV)W#A0%*rS6f2B#sG5`Po literal 0 HcmV?d00001 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 -----------------------------------------------------