Merge lp:~marcus-lundgren/noise/improve-readability-in-SPE into lp:~elementary-apps/noise/trunk

[Marcus Lundgren]

[lp:~marcus-lundgren/noise/improve-readability-in-SPE]

917. By Marcus Lundgren on 2012-07-30

Shortened the lines in certain functions.

918. By Marcus Lundgren on 2012-07-30

Clean up.

=== modified file 'src/Dialogs/SmartPlaylistEditor.vala'
--- src/Dialogs/SmartPlaylistEditor.vala	2012-07-26 17:29:26 +0000
+++ src/Dialogs/SmartPlaylistEditor.vala	2012-07-30 22:27:17 +0000
@@ -340,11 +340,19 @@
             comparators.insert (0, SmartQuery.ComparatorType.IS);
             comparators.insert (1, SmartQuery.ComparatorType.CONTAINS);
             comparators.insert (2, SmartQuery.ComparatorType.NOT_CONTAINS);
-            
-            if ((_q.comparator == SmartQuery.ComparatorType.IS) || ((int)_q.comparator-1 > 2))
-                _comparator.set_active(0);
-            else
-                _comparator.set_active((int)_q.comparator-1);
+
+            switch (_q.comparator)
+            {
+                case SmartQuery.ComparatorType.CONTAINS:
+                    _comparator.set_active(1);
+                    break;
+                case SmartQuery.ComparatorType.NOT_CONTAINS:
+                    _comparator.set_active(2);
+                    break;
+                default: // SmartQuery.ComparatorType.IS or unset
+                    _comparator.set_active(0);
+                    break;
+            }
         }
         else if(_field.get_active () == SmartQuery.FieldType.MEDIA_TYPE) {
             _value.hide();
@@ -366,10 +374,16 @@
             _comparator.append_text(_("is not"));
             comparators.insert (0, SmartQuery.ComparatorType.IS);
             comparators.insert (1, SmartQuery.ComparatorType.IS_NOT);
-            
-            _comparator.set_active((int)_q.comparator);
-            if ((int)_q.comparator > 1)
-                _comparator.set_active(0);
+
+            switch (_q.comparator)
+            {
+                case SmartQuery.ComparatorType.IS_NOT:
+                    _comparator.set_active(1);
+                    break;
+                default: // SmartQuery.ComparatorType.IS or unset
+                    _comparator.set_active(0);
+                    break;
+            }
         }
         else {
             if(is_rating ((SmartQuery.FieldType)_field.get_active ())) {
@@ -405,11 +419,19 @@
                 comparators.insert (0, SmartQuery.ComparatorType.IS_EXACTLY);
                 comparators.insert (1, SmartQuery.ComparatorType.IS_WITHIN);
                 comparators.insert (2, SmartQuery.ComparatorType.IS_BEFORE);
-                
-                if ((_q.comparator == SmartQuery.ComparatorType.IS_EXACTLY) || ((int)_q.comparator-6 < 0))
-                    _comparator.set_active(0);
-                else
-                    _comparator.set_active((int)_q.comparator-6);
+
+                switch (_q.comparator)
+                {
+                    case SmartQuery.ComparatorType.IS_WITHIN:
+                        _comparator.set_active (1);
+                        break;
+                    case SmartQuery.ComparatorType.IS_BEFORE:
+                        _comparator.set_active (2);
+                        break;
+                    default: // SmartQuery.ComparatorType.IS_EXACTLY or unset
+                        _comparator.set_active (0);
+                        break;
+                }
             }
         }
         
@@ -438,15 +460,17 @@
     }
     
     public bool needs_value (SmartQuery.FieldType compared) {
-        return (compared == SmartQuery.FieldType.ALBUM || compared == SmartQuery.FieldType.ARTIST || compared == SmartQuery.FieldType.COMMENT || 
-                compared == SmartQuery.FieldType.COMPOSER || compared == SmartQuery.FieldType.GENRE || compared == SmartQuery.FieldType.GROUPING || 
-                compared == SmartQuery.FieldType.TITLE);
+        return (compared == SmartQuery.FieldType.ALBUM || compared == SmartQuery.FieldType.ARTIST
+                || compared == SmartQuery.FieldType.COMMENT || compared == SmartQuery.FieldType.COMPOSER
+                || compared == SmartQuery.FieldType.GENRE || compared == SmartQuery.FieldType.GROUPING
+                || compared == SmartQuery.FieldType.TITLE);
     }
     
     public bool needs_value_2 (SmartQuery.FieldType compared) {
-        return (compared == SmartQuery.FieldType.BITRATE || compared == SmartQuery.FieldType.YEAR || compared == SmartQuery.FieldType.RATING || 
-                compared == SmartQuery.FieldType.PLAYCOUNT || compared == SmartQuery.FieldType.SKIPCOUNT || compared == SmartQuery.FieldType.LENGTH || 
-                compared == SmartQuery.FieldType.TITLE);
+        return (compared == SmartQuery.FieldType.BITRATE || compared == SmartQuery.FieldType.YEAR
+                || compared == SmartQuery.FieldType.RATING || compared == SmartQuery.FieldType.PLAYCOUNT
+                || compared == SmartQuery.FieldType.SKIPCOUNT || compared == SmartQuery.FieldType.LENGTH
+                || compared == SmartQuery.FieldType.TITLE);
     }
 
     public bool is_rating (SmartQuery.FieldType compared) {
@@ -454,7 +478,8 @@
     }
     
     public bool is_date (SmartQuery.FieldType compared) {
-        return (compared == SmartQuery.FieldType.LAST_PLAYED || compared == SmartQuery.FieldType.DATE_ADDED || compared == SmartQuery.FieldType.DATE_RELEASED);
+        return (compared == SmartQuery.FieldType.LAST_PLAYED || compared == SmartQuery.FieldType.DATE_ADDED
+                || compared == SmartQuery.FieldType.DATE_RELEASED);
     }
 }