[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml/NetworkHomeDeviceListView: fix incorrect object reference

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
89812248 by Prince Gupta at 2021-08-08T10:49:22+00:00
qml/NetworkHomeDeviceListView: fix incorrect object reference

'model' in this scope referred to the attached property i.e
NetworkGridItem.ListView.model, replace it with the correct source model
i.e 'deviceModel'

- - - - -
dbdfd3a4 by Prince Gupta at 2021-08-08T10:49:22+00:00
qml/NetworkBrowseDisplay: fix invalid property reference

'parsingPending' property is not available with NetworkDevicesModel

- - - - -
5604c388 by Prince Gupta at 2021-08-08T10:49:22+00:00
qml/NetworkBrowseDisplay: remove unnecessary imports

- - - - -


2 changed files:

- modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
- modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml


Changes:

=====================================
modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
=====================================
@@ -16,15 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick 2.11
-import QtQuick.Controls 2.4
-import QtQml.Models 2.2
 import QtQuick.Layouts 1.11
-import QtQml 2.11
-import QtGraphicalEffects 1.0
 
 import org.videolan.vlc 0.1
 
 import "qrc:///util/" as Util
+import "qrc:///util/Helpers.js" as Helpers
 import "qrc:///widgets/" as Widgets
 import "qrc:///main/" as MainInterface
 import "qrc:///style/"
@@ -342,7 +339,7 @@ FocusScope {
         }
 
         Widgets.BusyIndicatorExt {
-            runningDelayed: providerModel.parsingPending
+            runningDelayed: Helpers.get(providerModel, "parsingPending", false) // 'parsingPending' property is not available with NetworkDevicesModel
             anchors.centerIn: parent
             z: 1
         }


=====================================
modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml
=====================================
@@ -109,7 +109,7 @@ FocusScope {
                 if (model.type === NetworkMediaModel.TYPE_NODE || model.type === NetworkMediaModel.TYPE_DIRECTORY)
                     history.push( ["mc", "network", { tree: model.tree } ])
                 else
-                    model.addAndPlay( index )
+                    deviceModel.addAndPlay( index )
             }
         }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d4ea6d025363f6cd1eb928d32733ce3a31f89ed1...5604c38850d1e15c60b306c07f6f509df6c55702

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d4ea6d025363f6cd1eb928d32733ce3a31f89ed1...5604c38850d1e15c60b306c07f6f509df6c55702
You're receiving this email because of your account on code.videolan.org.