qt: move scan_type preference to main window

It leads to better discoverability of dupeguru's options and will make
more sense after the big merge of all editions.

qt/me/preferences.py

@@ -1,9 +1,7 @@
-# Created By: Virgil Dupras
-# Created On: 2009-05-17
-# Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-# which should be included with this package. The terms are also available at 
+# Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
+#
+# This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
+# which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from core.scanner import ScanType
@@ -11,9 +9,10 @@ from core.scanner import ScanType
 from ..base.preferences import Preferences as PreferencesBase
 
 class Preferences(PreferencesBase):
+    DEFAULT_SCAN_TYPE = ScanType.Tag
+
     def _load_specific(self, settings):
         get = self.get_value
-        self.scan_type = get('ScanType', self.scan_type)
         self.word_weighting = get('WordWeighting', self.word_weighting)
         self.match_similar = get('MatchSimilar', self.match_similar)
         self.scan_tag_track = get('ScanTagTrack', self.scan_tag_track)
@@ -22,10 +21,9 @@ class Preferences(PreferencesBase):
         self.scan_tag_title = get('ScanTagTitle', self.scan_tag_title)
         self.scan_tag_genre = get('ScanTagGenre', self.scan_tag_genre)
         self.scan_tag_year = get('ScanTagYear', self.scan_tag_year)
-    
+
     def _reset_specific(self):
         self.filter_hardness = 80
-        self.scan_type = ScanType.Tag
         self.word_weighting = True
         self.match_similar = False
         self.scan_tag_track = False
@@ -34,10 +32,9 @@ class Preferences(PreferencesBase):
         self.scan_tag_title = True
         self.scan_tag_genre = False
         self.scan_tag_year = False
-    
+
     def _save_specific(self, settings):
         set_ = self.set_value
-        set_('ScanType', self.scan_type)
         set_('WordWeighting', self.word_weighting)
         set_('MatchSimilar', self.match_similar)
         set_('ScanTagTrack', self.scan_tag_track)
@@ -46,4 +43,4 @@ class Preferences(PreferencesBase):
         set_('ScanTagTitle', self.scan_tag_title)
         set_('ScanTagGenre', self.scan_tag_genre)
         set_('ScanTagYear', self.scan_tag_year)
-    
+

qt/me/preferences_dialog.py

@@ -1,5 +1,3 @@
-# Created By: Virgil Dupras
-# Created On: 2009-04-29
 # Copyright 2016 Hardcoded Software (http://www.hardcoded.net)
 #
 # This software is licensed under the "GPLv3" License as described in the "LICENSE" file,
@@ -20,13 +18,7 @@ from . import preferences
 tr = trget('ui')
 
 class PreferencesDialog(PreferencesDialogBase):
-    def __init__(self, parent, app):
-        PreferencesDialogBase.__init__(self, parent, app)
-
-        self.scanTypeComboBox.currentIndexChanged[int].connect(self.scanTypeChanged)
-
     def _setupPreferenceWidgets(self):
-        self._setupScanTypeBox()
         self._setupFilterHardnessBox()
         self.widgetsVLayout.addLayout(self.filterHardnessHLayout)
         self.widget = QWidget(self)
@@ -72,7 +64,6 @@ class PreferencesDialog(PreferencesDialogBase):
         self._setupBottomPart()
 
     def _load(self, prefs, setchecked):
-        self._load_scan_type(prefs)
         setchecked(self.tagTrackBox, prefs.scan_tag_track)
         setchecked(self.tagArtistBox, prefs.scan_tag_artist)
         setchecked(self.tagAlbumBox, prefs.scan_tag_album)
@@ -82,24 +73,8 @@ class PreferencesDialog(PreferencesDialogBase):
         setchecked(self.matchSimilarBox, prefs.match_similar)
         setchecked(self.wordWeightingBox, prefs.word_weighting)
 
-    def _save(self, prefs, ischecked):
-        self._save_scan_type(prefs)
-        prefs.scan_tag_track = ischecked(self.tagTrackBox)
-        prefs.scan_tag_artist = ischecked(self.tagArtistBox)
-        prefs.scan_tag_album = ischecked(self.tagAlbumBox)
-        prefs.scan_tag_title = ischecked(self.tagTitleBox)
-        prefs.scan_tag_genre = ischecked(self.tagGenreBox)
-        prefs.scan_tag_year = ischecked(self.tagYearBox)
-        prefs.match_similar = ischecked(self.matchSimilarBox)
-        prefs.word_weighting = ischecked(self.wordWeightingBox)
-
-    def resetToDefaults(self):
-        self.load(preferences.Preferences())
-
-    #--- Events
-    def scanTypeChanged(self, index):
-        scan_options = self.app.model.scanner.get_scan_options()
-        scan_type = scan_options[self.scanTypeComboBox.currentIndex()].scan_type
+        # Update UI state based on selected scan type
+        scan_type = prefs.scan_type
         word_based = scan_type in (
             ScanType.Filename, ScanType.Fields, ScanType.FieldsNoOrder,
             ScanType.Tag
@@ -115,3 +90,16 @@ class PreferencesDialog(PreferencesDialogBase):
         self.tagGenreBox.setEnabled(tag_based)
         self.tagYearBox.setEnabled(tag_based)
 
+    def _save(self, prefs, ischecked):
+        prefs.scan_tag_track = ischecked(self.tagTrackBox)
+        prefs.scan_tag_artist = ischecked(self.tagArtistBox)
+        prefs.scan_tag_album = ischecked(self.tagAlbumBox)
+        prefs.scan_tag_title = ischecked(self.tagTitleBox)
+        prefs.scan_tag_genre = ischecked(self.tagGenreBox)
+        prefs.scan_tag_year = ischecked(self.tagYearBox)
+        prefs.match_similar = ischecked(self.matchSimilarBox)
+        prefs.word_weighting = ischecked(self.wordWeightingBox)
+
+    def resetToDefaults(self):
+        self.load(preferences.Preferences())
+