From c445cdddd98434d9df62284902d081352411bae3 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Fri, 30 Nov 2012 02:14:06 +0000 Subject: [PATCH] Lots of lil fixes git-svn-id: http://comictagger.googlecode.com/svn/trunk@166 6c5673fe-1810-88d6-992b-cd32ca31540c --- comictagger.py | 4 ++-- comicvinetalker.py | 2 +- ctversion.py | 2 +- genericmetadata.py | 2 +- mac/Makefile | 1 + options.py | 2 +- settingswindow.py | 12 ++++++++++-- settingswindow.ui | 4 ++-- taggerwindow.py | 18 ++++++++++-------- todo.txt | 15 ++++++++------- volumeselectionwindow.py | 1 + 11 files changed, 38 insertions(+), 25 deletions(-) diff --git a/comictagger.py b/comictagger.py index 962274c..c4fdc23 100755 --- a/comictagger.py +++ b/comictagger.py @@ -33,9 +33,9 @@ try: qt_available = True from PyQt4 import QtCore, QtGui from taggerwindow import TaggerWindow -except ImportError: +except ImportError as e: qt_available = False - + print e from settings import ComicTaggerSettings from options import Options, MetaDataStyle diff --git a/comicvinetalker.py b/comicvinetalker.py index 203078c..9d3ae79 100644 --- a/comicvinetalker.py +++ b/comicvinetalker.py @@ -220,7 +220,7 @@ class ComicVineTalker(QObject): metadata.notes = "Tagged with ComicTagger app using info from Comic Vine." #metadata.notes += issue_results['site_detail_url'] - metadata.webLink = issue_results['site_detail_url'] + metadata.webLink = issue_results['site_detail_url'] person_credits = issue_results['person_credits'] for person in person_credits: diff --git a/ctversion.py b/ctversion.py index 09d629e..d04db5b 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.0.1" \ No newline at end of file +version="0.9.0-beta" \ No newline at end of file diff --git a/genericmetadata.py b/genericmetadata.py index 332e6a8..b5ae4e4 100644 --- a/genericmetadata.py +++ b/genericmetadata.py @@ -130,7 +130,7 @@ class GenericMetadata: assign( "alternateNumber", new_md.alternateNumber ) assign( "alternateCount", new_md.alternateCount ) assign( "imprint", new_md.imprint ) - assign( "web", new_md.webLink ) + assign( "webLink", new_md.webLink ) assign( "format", new_md.format ) assign( "manga", new_md.manga ) assign( "blackAndWhite", new_md.blackAndWhite ) diff --git a/mac/Makefile b/mac/Makefile index abc4529..d7978b4 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -26,6 +26,7 @@ clean: rm -f $(MAC_BASE)/*.spec rm -f logdict*.log rm -f *~ *.pyc *.pyo + rm -f raw*.dmg echo $(VERSION_STR) diskimage: #Set up disk image staging folder diff --git a/options.py b/options.py index 15c9b36..1967e16 100644 --- a/options.py +++ b/options.py @@ -39,7 +39,7 @@ class MetaDataStyle: class Options: help_text = """ -Usage: {0} [OPTION]... [FILE] +Usage: {0} [OPTION]... [FILE LIST] A utility for reading and writing metadata to comic archives. diff --git a/settingswindow.py b/settingswindow.py index 2161d6e..c441ea4 100644 --- a/settingswindow.py +++ b/settingswindow.py @@ -58,6 +58,8 @@ class SettingsWindow(QtGui.QDialog): self.settings = settings + self.name = "Settings" + if platform.system() == "Windows": self.lblUnrar.hide() self.leUnrarExePath.hide() @@ -69,6 +71,12 @@ class SettingsWindow(QtGui.QDialog): elif platform.system() == "Darwin": self.lblRarHelp.setText( macRarHelp ) + self.name = "Preferences" + + self.setWindowTitle("ComicTagger " + self.name) + self.lblDefaultSettings.setText( "Revert to default " + self.name.lower()) + self.btnResetSettings.setText( "Default " + self.name) + nldtTip = ( """ The Name Length Delta Threshold is for eliminating automatic @@ -132,13 +140,13 @@ class SettingsWindow(QtGui.QDialog): def clearCache( self ): ImageFetcher().clearCache() ComicVineCacher( ).clearCache() - QtGui.QMessageBox.information(self, "Settings", "Cache has been cleared.") + QtGui.QMessageBox.information(self, self.name, "Cache has been cleared.") def resetSettings( self ): self.settings.reset() self.settingsToForm() - QtGui.QMessageBox.information(self,"Settings", "Settings have been returned to default values.") + QtGui.QMessageBox.information(self, self.name, self.name + " have been returned to default values.") def selectFile( self, control, name ): diff --git a/settingswindow.ui b/settingswindow.ui index fd4ef3f..37f50ca 100644 --- a/settingswindow.ui +++ b/settingswindow.ui @@ -49,7 +49,7 @@ - + 0 @@ -238,7 +238,7 @@ - <html><head/><body><p>These settings are for the automatic issue identifier which searches online for matches. They will not affect &quot;manual&quot; searching.</p><p>Hover the mouse over the entry field for more info.</p></body></html> + <html><head/><body><p>These settings are for the automatic issue identifier which searches online for matches. They will not affect &quot;manual&quot; searching.</p><p>Hover the mouse over an entry field for more info.</p></body></html> true diff --git a/taggerwindow.py b/taggerwindow.py index bf72b0e..52cf092 100644 --- a/taggerwindow.py +++ b/taggerwindow.py @@ -388,8 +388,12 @@ class TaggerWindow( QtGui.QMainWindow): if ( self.comic_archive is not None and self.comic_archive.isWritable( ) ): + self.actionRemoveCRTags.setEnabled( True ) + self.actionRemoveCBLTags.setEnabled( True ) self.actionWrite_Tags.setEnabled( True ) else: + self.actionRemoveCRTags.setEnabled( False ) + self.actionRemoveCBLTags.setEnabled( False ) self.actionWrite_Tags.setEnabled( False ) @@ -799,22 +803,20 @@ class TaggerWindow( QtGui.QMainWindow): if self.comic_archive.isRar() and self.data_style == MetaDataStyle.CBI: if self.settings.ask_about_cbi_in_rar: - answered_yes, checked = OptionalMessageDialog.question( self, "RAR and ComicBookLover", + checked = OptionalMessageDialog.msg( self, "RAR and ComicBookLover", """ - You are about to write a CBL tag block to a RAR archive!

+ You are about to write a CBL tag block to a RAR archive! While technically possible, no known reader can read those tags from RAR - yet. If you would like this feature in ComicBookLover, please go to their - forums and add your voice to a feature request!

+ yet.

+ If you would like this feature in the ComicBookLover apps, please go to their + forums and add your voice to a feature request! http://forums.comicbooklover.com/categories/ipad-features
- http://forums.comicbooklover.com/categories/mac-features

- Do you want to continue with the save? + http://forums.comicbooklover.com/categories/mac-features """, ) self.settings.ask_about_cbi_in_rar = not checked - if not answered_yes: - return reply = QtGui.QMessageBox.question(self, diff --git a/todo.txt b/todo.txt index 9245b48..522aa87 100644 --- a/todo.txt +++ b/todo.txt @@ -4,22 +4,23 @@ Features Release notes -WIki for CLI +Wiki for CLI Wiki for basic usage +Wiki Feature Roadmap + Add license file to OSX package/Win Package -Config Dialog layout -- help stuff? - +Better volume icon for Mac ----------------------------------------------------- Bugs ----------------------------------------------------- -Mac Build needs Quartz?? +Enable write and rename on command-line +Rename - check for existence, and add (#) +Fix QT not available message +Add abort/not abort -Size/Position memory Win vs Lin vs Mac - -Lots of error checking ----------------------------------------------------- Future ----------------------------------------------------- diff --git a/volumeselectionwindow.py b/volumeselectionwindow.py index 78a1516..c877213 100644 --- a/volumeselectionwindow.py +++ b/volumeselectionwindow.py @@ -318,6 +318,7 @@ class VolumeSelectionWindow(QtGui.QDialog): if self.immediate_autoselect: # defer the immediate autoselect so this dialog has time to pop up + QtCore.QCoreApplication.processEvents() QtCore.QTimer.singleShot(10, self.doImmediateAutoselect) def doImmediateAutoselect( self ):