Code cleanup

mltframework · Nov 10, 2014 · a2c5973 · a2c5973
1 parent 1afeeb2
commit a2c5973
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/src/qml/views/filter/AttachedFilters.qml b/src/qml/views/filter/AttachedFilters.qml
@@ -97,7 +97,8 @@ Rectangle {
         signal itemAdded(int index)
 
         function getModelIndex(visualIndex) {
-            if(visualIndex < 0 || visualIndex >= count) return -1
+            if (visualIndex < 0 || visualIndex >= count)
+                return -1
             var item = items.get(visualIndex)
             if (item) {
                 return item.model.index

diff --git a/src/qml/views/filter/FilterMenu.js b/src/qml/views/filter/FilterMenu.js
@@ -21,29 +21,29 @@ var visibility = {
     GPU: 1,
     VIDEO: 2,
     AUDIO: 3
-};
+}
 
 var ITEM_HEIGHT = 30
 
 function isVisible(meta, showType) {
-    if(meta.isHidden) return false
-    if(meta.needsGPU && !settings.playerGPU) return false
-    if(!meta.needsGPU && settings.playerGPU && meta.gpuAlt != "") return false
-    if(showType == visibility.FAVORITE && !meta.isFavorite) return false
-    if(showType == visibility.GPU && !meta.needsGPU) return false
-    if(showType == visibility.AUDIO && !meta.isAudio) return false
-    if(showType == visibility.VIDEO && meta.isAudio ) return false
-    if(showType == visibility.VIDEO && meta.needsGPU ) return false
+    if (meta.isHidden) return false
+    if (meta.needsGPU && !settings.playerGPU) return false
+    if (!meta.needsGPU && settings.playerGPU && meta.gpuAlt !== "") return false
+    if (showType == visibility.FAVORITE && !meta.isFavorite) return false
+    if (showType == visibility.GPU && !meta.needsGPU) return false
+    if (showType == visibility.AUDIO && !meta.isAudio) return false
+    if (showType == visibility.VIDEO && meta.isAudio ) return false
+    if (showType == visibility.VIDEO && meta.needsGPU ) return false
     return true
 }
 
 function maxMenuHeight(showType, pad) {
     // Calculate the max possible height of the menu
     var i = 0
     var visibleItems = 0;
-    for( i = 0; i < metadatamodel.rowCount(); i++ ) {
+    for (i = 0; i < metadatamodel.rowCount(); i++) {
         var meta = metadatamodel.get(i)
-        if(Logic.isVisible(meta, showType)) {
+        if (Logic.isVisible(meta, showType)) {
             visibleItems++
         }
     }
@@ -60,10 +60,10 @@ function calcMenuRect(triggerItem, showType, pad) {
 
     // Calculate the y position
     result.y = triggerPos.y - result.height / 2 // Ideal position is centered
-    if( result.y < mainWinRect.y ) {
+    if (result.y < mainWinRect.y) {
         // Window would be higher than the application window. Move it down
         result.y = mainWinRect.y
-    } else if( result.y + result.height > mainWinRect.y + mainWinRect.height ) {
+    } else if (result.y + result.height > mainWinRect.y + mainWinRect.height) {
         // Window would be lower than the application window. Move it up
         result.y =  mainWinRect.y + mainWinRect.height - result.height
     }
@@ -72,4 +72,4 @@ function calcMenuRect(triggerItem, showType, pad) {
     result.x = triggerPos.x
 
     return result
-}
+}
diff --git a/src/qml/views/filter/FilterMenu.qml b/src/qml/views/filter/FilterMenu.qml
@@ -37,7 +37,8 @@ Loader {
             sourceComponent = null
         }
         onHasFocusChanged: {
-            if (!item.hasFocus) sourceComponent = null
+            if (!item.hasFocus)
+                sourceComponent = null
         }
     }
 
@@ -128,7 +129,7 @@ Loader {
                             tooltip: qsTr('Show Favorite Filters')
                             exclusiveGroup: typeGroup
                             onCheckedChanged: {
-                                if(checked) {
+                                if (checked) {
                                     menuListView.showType = Logic.visibility.FAVORITE
                                 }
                             }
@@ -145,7 +146,7 @@ Loader {
                             tooltip: qsTr('Show GPU Filters')
                             exclusiveGroup: typeGroup
                             onCheckedChanged: {
-                                if(checked) {
+                                if (checked) {
                                     menuListView.showType = Logic.visibility.GPU
                                 }
                             }
@@ -160,7 +161,7 @@ Loader {
                             tooltip: qsTr('Show Video Filters')
                             exclusiveGroup: typeGroup
                             onCheckedChanged: {
-                                if(checked) {
+                                if (checked) {
                                     menuListView.showType = Logic.visibility.VIDEO
                                 }
                             }
@@ -175,7 +176,7 @@ Loader {
                             tooltip: qsTr('Show Audio Filters')
                             exclusiveGroup: typeGroup
                             onCheckedChanged: {
-                                if(checked) {
+                                if (checked) {
                                     menuListView.showType = Logic.visibility.AUDIO
                                 }
                             }

diff --git a/src/qml/views/filter/filterview.qml b/src/qml/views/filter/filterview.qml
@@ -35,7 +35,7 @@ Rectangle {
     onHeightChanged: _setLayout()
 
     function _setLayout() {
-        if( height > width - 200 ) {
+        if (height > width - 200) {
             root.state = "portrait"
         } else {
             root.state = "landscape"