lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some visual tweaks

Browse Source 
git-svn-id: http://comictagger.googlecode.com/svn/trunk@69 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville@gmail.com 2012-11-20 17:26:15 +00:00
parent 8e32f3c755
commit 8202c97ad3
5 changed files with 136 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mac/Makefile
View File

@ -24,6 +24,7 @@ dist:
clean:
rm -rf $(DIST_DIR) $(MAC_BASE)/build
rm -f $(MAC_BASE)/*.spec
rm -f /logdict*.log
rm -f "*~" *.pyc *.pyo
echo $(VERSION_STR)
diskimage:
@ -55,4 +56,4 @@ diskimage:
rm -f $(DMG_FILE)
hdiutil convert raw-$(DMG_FILE) -format UDZO -o $(DMG_FILE)
rm -f raw-$(DMG_FILE)

2
settings.py
View File

@ -45,7 +45,7 @@ class ComicTaggerSettings:
# identifier settings
id_length_delta_thresh = 5
id_publisher_blacklist = "panini comics, abril, scholastic book services"
id_publisher_blacklist = "Panini Comics, Abril, Scholastic Book Services"
@staticmethod
def getSettingsFolder():

38
taggerwindow.py
View File

@ -87,15 +87,6 @@ class TaggerWindow( QtGui.QMainWindow):
self.settings = settings
self.data_style = settings.last_selected_data_style
if self.settings.last_main_window_width != 0:
geo = QtCore.QRect( self.settings.last_main_window_x,
self.settings.last_main_window_y,
self.settings.last_main_window_width,
self.settings.last_main_window_height )
self.setGeometry( geo )
else:
self.center()
#set up a default metadata object
self.metadata = GenericMetadata()
self.comic_archive = None
@ -122,6 +113,11 @@ class TaggerWindow( QtGui.QMainWindow):
self.updateStyleTweaks()
# The show/hide/show is on purpose, to let the layout manager figure
# do some calculations first
self.show()
self.hide()
self.setAppPosition()
self.show()
self.raise_()
@ -953,10 +949,20 @@ class TaggerWindow( QtGui.QMainWindow):
if settingswin.result():
pass
def center(self):
screen = QtGui.QDesktopWidget().screenGeometry()
size = self.geometry()
self.move((screen.width()-size.width())/2, (screen.height()-size.height())/2)
def setAppPosition( self ):
if self.settings.last_main_window_width != 0:
geo = QtCore.QRect( self.settings.last_main_window_x,
self.settings.last_main_window_y,
self.settings.last_main_window_width,
self.settings.last_main_window_height )
self.setGeometry( geo )
print "ATB ", self.settings.last_main_window_x, self.settings.last_main_window_y
self.move( self.settings.last_main_window_x, self.settings.last_main_window_y )
else:
screen = QtGui.QDesktopWidget().screenGeometry()
size = self.frameGeometry()
self.move((screen.width()-size.width())/2, (screen.height()-size.height())/2)
def adjustStyleCombo( self ):
# select the current style
@ -1119,8 +1125,8 @@ class TaggerWindow( QtGui.QMainWindow):
geo = self.geometry()
self.settings.last_main_window_width = geo.width()
self.settings.last_main_window_height = geo.height()
self.settings.last_main_window_x = geo.x()
self.settings.last_main_window_y = geo.y()
self.settings.last_main_window_x = self.x()
self.settings.last_main_window_y = self.y()
self.settings.save()
event.accept()
else:
@ -1152,4 +1158,4 @@ class TaggerWindow( QtGui.QMainWindow):
dlg.setWindowTitle( "Raw ComicBookLover Tag View" )
dlg.exec_()

157
taggerwindow.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>975</width>
<height>539</height>
<width>1030</width>
<height>559</height>
</rect>
</property>
<property name="sizePolicy">
@ -359,13 +359,19 @@
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>390</x>
<x>380</x>
<y>10</y>
<width>291</width>
<width>301</width>
<height>351</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>-1</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
@ -434,12 +440,12 @@
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Month</string>
<string>Year</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lePubMonth">
<widget class="QLineEdit" name="lePubYear">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -464,12 +470,12 @@
<item row="0" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>Year</string>
<string>Month</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lePubYear">
<widget class="QLineEdit" name="lePubMonth">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -489,7 +495,13 @@
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_17">
<layout class="QFormLayout" name="formLayout_10">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="verticalSpacing">
<number>-1</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
@ -507,20 +519,74 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>Manga</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cbManga">
<property name="autoFillBackground">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_26">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cbFormat">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Black &amp; White</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cbBW">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_4">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
<height>20</height>
</size>
</property>
</spacer>
@ -531,7 +597,14 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="cbLanguage"/>
<widget class="QComboBox" name="cbLanguage">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
@ -541,7 +614,14 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cbCountry"/>
<widget class="QComboBox" name="cbCountry">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_13">
@ -552,51 +632,6 @@
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_10">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="1">
<widget class="QCheckBox" name="cbBW">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Black &amp;&amp; White</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>Manga</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cbManga">
<property name="autoFillBackground">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_26">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="cbFormat">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget_2">
@ -1012,8 +1047,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>975</width>
<height>28</height>
<width>1030</width>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuComicTagger">

41
todo.txt
View File

@ -1,23 +1,23 @@
-----------------
-----------------------------------------------------
Features
----------------
-----------------------------------------------------
Add class for warning/info messages with "Don't show again" checkbox.
Add list of these flags to settings
Style sheets for windows/mac/linux
Add setting to allow writing CBI to RAR, and ask them to contact CBL ! :-)
warning about writing Rars
Disclaimer pop up at start, modifies file, changes hash, etc
app tour?
Better stripping of html from CV text
Add warning message to allow writing CBI to RAR, and ask them to contact CBL ! :-)
Move RAR/CBL test into ComicArchive class, isWriteable
-----------------
Style sheets for windows/mac/linux
-----------------------------------------------------
Bugs
----------------
-----------------------------------------------------
Windows zip and rar: set proper path for writing to archive
SERIOUS BUG: rebuilding zips!
@ -26,10 +26,8 @@ SERIOUS BUG: rebuilding zips!
Frozen apps better finding of resource files
OSX
toolbar
weird unrar complaints
Page browser sizing
Override cursor is not beachball
Filename parsing:
Rework how series name is separated from issue
@ -39,11 +37,9 @@ Form type validation Ints vs strings for month, year. etc
Check all HTTP responses for errors
Lots of error checking
-------------
-----------------------------------------------------
Future
------------
-----------------------------------------------------
File rename
-Dialog??
@ -57,9 +53,7 @@ CLI
explicit metadata settings option format
-- figure out how to add credits,tags
interactive for choices option?
--- or defer choices to end, by keeping special log of those files
Add warning message to allow writing CBI to RAR, and ask them to contact CBL ! :-)
--- or defer choices to end, by keeping special log of match option for each file
Scrape alternate Covers from ComicVine issue pages
@ -77,14 +71,9 @@ Wizard for converting between tag styles
App option to covert RAR to ZIP
Archive function to detect tag blocks out of sync
Idea: Support only CBI or CIX for any given file, and not both
If user selects different one, warn about potential loss/re-arranging of data
Longer term:
Think about mass tagging and (semi) automatic volume selection
----------------------------------------------
COMIC RACK Questions
Missing from XML as enterable in ComicRack: