Enum-ified Scan Type constants, looks nicer.

qt/me/preferences.py

@@ -6,8 +6,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
-    SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
+from core.scanner import ScanType
 
 from base.preferences import Preferences as PreferencesBase
 
@@ -47,7 +46,7 @@ class Preferences(PreferencesBase):
     
     def _reset_specific(self):
         self.filter_hardness = 80
-        self.scan_type = SCAN_TYPE_TAG
+        self.scan_type = ScanType.Tag
         self.word_weighting = True
         self.match_similar = False
         self.scan_tag_track = False

qt/me/preferences_dialog.py

@@ -9,19 +9,18 @@
 from PyQt4.QtCore import SIGNAL, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 
-from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
-    SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
+from core.scanner import ScanType
 
 from preferences_dialog_ui import Ui_PreferencesDialog
 import preferences
 
 SCAN_TYPE_ORDER = [
-    SCAN_TYPE_FILENAME,
-    SCAN_TYPE_FIELDS,
-    SCAN_TYPE_FIELDS_NO_ORDER,
-    SCAN_TYPE_TAG,
-    SCAN_TYPE_CONTENT,
-    SCAN_TYPE_CONTENT_AUDIO,
+    ScanType.Filename,
+    ScanType.Fields,
+    ScanType.FieldsNoOrder,
+    ScanType.Tag,
+    ScanType.Contents,
+    ScanType.ContentsAudio,
 ]
 
 class PreferencesDialog(QDialog, Ui_PreferencesDialog):
@@ -89,9 +88,9 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog):
     
     def scanTypeChanged(self, index):
         scan_type = SCAN_TYPE_ORDER[self.scanTypeComboBox.currentIndex()]
-        word_based = scan_type in [SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
-            SCAN_TYPE_TAG]
-        tag_based = scan_type == SCAN_TYPE_TAG
+        word_based = scan_type in (ScanType.Filename, ScanType.Fields, ScanType.FieldsNoOrder,
+            ScanType.Tag)
+        tag_based = scan_type == ScanType.Tag
         self.filterHardnessSlider.setEnabled(word_based)
         self.matchSimilarBox.setEnabled(word_based)
         self.wordWeightingBox.setEnabled(word_based)