diff --git a/mac/Makefile b/mac/Makefile index 232c914..fbe6e2a 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -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) - \ No newline at end of file + diff --git a/settings.py b/settings.py index 4e385be..6fa4153 100644 --- a/settings.py +++ b/settings.py @@ -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(): diff --git a/taggerwindow.py b/taggerwindow.py index 6dd1a9e..d574a21 100644 --- a/taggerwindow.py +++ b/taggerwindow.py @@ -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_() - \ No newline at end of file + diff --git a/taggerwindow.ui b/taggerwindow.ui index 02a6467..9de2c79 100644 --- a/taggerwindow.ui +++ b/taggerwindow.ui @@ -6,8 +6,8 @@ 0 0 - 975 - 539 + 1030 + 559 @@ -359,13 +359,19 @@ - 390 + 380 10 - 291 + 301 351 + + -1 + + + 3 + @@ -434,12 +440,12 @@ - Month + Year - + 0 @@ -464,12 +470,12 @@ - Year + Month - + 0 @@ -489,7 +495,13 @@ - + + + QFormLayout::AllNonFixedFieldsGrow + + + -1 + @@ -507,20 +519,74 @@ + + + + Manga + + + + + + + false + + + + + + + Format + + + + + + + + 0 + 0 + + + + true + + + + + + + Black & White + + + + + + + Qt::LeftToRight + + + false + + + + + + - + Qt::Vertical - QSizePolicy::Fixed + QSizePolicy::Maximum 20 - 5 + 20 @@ -531,7 +597,14 @@ QFormLayout::AllNonFixedFieldsGrow - + + + + 0 + 0 + + + @@ -541,7 +614,14 @@ - + + + + 0 + 0 + + + @@ -552,51 +632,6 @@ - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - false - - - Black && White - - - - - - - Manga - - - - - - - false - - - - - - - Format - - - - - - - true - - - - - @@ -1012,8 +1047,8 @@ 0 0 - 975 - 28 + 1030 + 22 diff --git a/todo.txt b/todo.txt index da73b15..98f5382 100644 --- a/todo.txt +++ b/todo.txt @@ -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: