models: Move QML Connections to separate objects

common/GPodderEpisodeListModel.qml

@@ -110,37 +110,4 @@ ListModel {
             }
         });
     }
-
-    property var connections: Connections {
-        target: py
-
-        onDownloadProgress: {
-            Util.updateModelWith(episodeListModel, 'id', episode_id,
-                {'progress': progress});
-        }
-        onPlaybackProgress: {
-            Util.updateModelWith(episodeListModel, 'id', episode_id,
-                {'playbackProgress': progress});
-        }
-        onUpdatedEpisode: {
-            for (var i=0; i<episodeListModel.count; i++) {
-                if (episodeListModel.get(i).id == episode.id) {
-                    episodeListModel.set(i, episode);
-                    break;
-                }
-            }
-        }
-        onEpisodeListChanged: {
-            if (episodeListModel.podcast_id == podcast_id) {
-                episodeListModel.reload();
-            }
-        }
-
-        onConfigChanged: {
-            if (key === 'ui.qml.episode_list.filter_eql') {
-                setQuery(value);
-                reload();
-            }
-        }
-    }
 }

common/GPodderEpisodeListModelConnections.qml

@@ -0,0 +1,56 @@
+
+/**
+ *
+ * gPodder QML UI Reference Implementation
+ * Copyright (c) 2014, Thomas Perl <m@thp.io>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+import QtQuick 2.0
+
+import 'util.js' as Util
+
+Connections {
+    target: py
+
+    onDownloadProgress: {
+        Util.updateModelWith(episodeListModel, 'id', episode_id,
+            {'progress': progress});
+    }
+    onPlaybackProgress: {
+        Util.updateModelWith(episodeListModel, 'id', episode_id,
+            {'playbackProgress': progress});
+    }
+    onUpdatedEpisode: {
+        for (var i=0; i<episodeListModel.count; i++) {
+            if (episodeListModel.get(i).id == episode.id) {
+                episodeListModel.set(i, episode);
+                break;
+            }
+        }
+    }
+    onEpisodeListChanged: {
+        if (episodeListModel.podcast_id == podcast_id) {
+            episodeListModel.reload();
+        }
+    }
+
+    onConfigChanged: {
+        if (key === 'ui.qml.episode_list.filter_eql') {
+            episodeListModel.setQuery(value);
+            episodeListModel.reload();
+        }
+    }
+}

common/GPodderPodcastListModel.qml

@@ -30,31 +30,4 @@ ListModel {
             Util.updateModelFrom(podcastListModel, podcasts);
         });
     }
-
-    property var connections: Connections {
-        target: py
-
-        onPodcastListChanged: {
-            podcastListModel.reload();
-        }
-
-        onUpdatingPodcast: {
-            for (var i=0; i<podcastListModel.count; i++) {
-                var podcast = podcastListModel.get(i);
-                if (podcast.id == podcast_id) {
-                    podcastListModel.setProperty(i, 'updating', true);
-                    break;
-                }
-            }
-        }
-
-        onUpdatedPodcast: {
-            for (var i=0; i<podcastListModel.count; i++) {
-                if (podcastListModel.get(i).id == podcast.id) {
-                    podcastListModel.set(i, podcast);
-                    break;
-                }
-            }
-        }
-    }
 }

common/GPodderPodcastListModelConnections.qml

@@ -0,0 +1,48 @@
+
+/**
+ *
+ * gPodder QML UI Reference Implementation
+ * Copyright (c) 2014, Thomas Perl <m@thp.io>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+import QtQuick 2.0
+
+Connections {
+    target: py
+
+    onPodcastListChanged: {
+        podcastListModel.reload();
+    }
+
+    onUpdatingPodcast: {
+        for (var i=0; i<podcastListModel.count; i++) {
+            var podcast = podcastListModel.get(i);
+            if (podcast.id == podcast_id) {
+                podcastListModel.setProperty(i, 'updating', true);
+                break;
+            }
+        }
+    }
+
+    onUpdatedPodcast: {
+        for (var i=0; i<podcastListModel.count; i++) {
+            if (podcastListModel.get(i).id == podcast.id) {
+                podcastListModel.set(i, podcast);
+                break;
+            }
+        }
+    }
+}

desktop/gpodder.qml

@@ -25,6 +25,7 @@ ApplicationWindow {
         TableView {
             width: 200
             model: GPodderPodcastListModel { id: podcastListModel }
+            GPodderPodcastListModelConnections {}
             headerVisible: false
             alternatingRowColors: false
 
@@ -71,6 +72,7 @@ ApplicationWindow {
         TableView {
             Layout.fillWidth: true
             model: GPodderEpisodeListModel { id: episodeListModel }
+            GPodderEpisodeListModelConnections {}
 
             TableViewColumn { role: 'title'; title: 'Title' }
         }

touch/EpisodeListView.qml

@@ -37,6 +37,7 @@ PListView {
     }
 
     model: GPodderEpisodeListModel { id: episodeListModel }
+    GPodderEpisodeListModelConnections {}
 
     PBusyIndicator {
         visible: !episodeListModel.ready

touch/Main.qml

@@ -31,6 +31,7 @@ Item {
     GPodderPlayback { id: player }
 
     GPodderPodcastListModel { id: podcastListModel }
+    GPodderPodcastListModelConnections {}
 
     property real scalef: (width < height) ? (width / 480) : (height / 480)
     property int shorterSide: (width < height) ? width : height