Lots of lil fixes
git-svn-id: http://comictagger.googlecode.com/svn/trunk@166 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville@gmail.com
parent
4c031d86d3
commit
c445cdddd9
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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"
|
||||
version="0.9.0-beta"
|
||||
@ -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 )
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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 = (
|
||||
""" <html>The <b>Name Length Delta Threshold</b> 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 ):
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<widget class="QLabel" name="lblDefaultSettings">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
@ -238,7 +238,7 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@ -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!<br><br>
|
||||
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!<br><br>
|
||||
yet.<br><br>
|
||||
If you would like this feature in the ComicBookLover apps, please go to their
|
||||
forums and add your voice to a feature request!
|
||||
<a href=http://forums.comicbooklover.com/categories/ipad-features>
|
||||
http://forums.comicbooklover.com/categories/ipad-features</a><br>
|
||||
<a href=http://forums.comicbooklover.com/categories/mac-features>
|
||||
http://forums.comicbooklover.com/categories/mac-features</a><br><br>
|
||||
Do you want to continue with the save?
|
||||
http://forums.comicbooklover.com/categories/mac-features</a>
|
||||
""",
|
||||
)
|
||||
self.settings.ask_about_cbi_in_rar = not checked
|
||||
if not answered_yes:
|
||||
return
|
||||
|
||||
|
||||
reply = QtGui.QMessageBox.question(self,
|
||||
|
||||
15
todo.txt
15
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
|
||||
-----------------------------------------------------
|
||||
|
||||
@ -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 ):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user