vlc | branch: master | Pierre Lamot <[email protected]> | Thu Aug 27 12:12:17 2020 +0200| [a9f3fb4be99a2b1841044c9b182a5fdeb81e9125] | committer: Pierre Lamot
qt: fix naming consistency for duration critera > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9f3fb4be99a2b1841044c9b182a5fdeb81e9125 --- modules/gui/qt/medialibrary/mlalbummodel.cpp | 2 +- modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp | 2 +- modules/gui/qt/medialibrary/mlvideomodel.cpp | 2 +- modules/gui/qt/medialibrary/qml/MusicAlbums.qml | 2 +- modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml | 2 +- modules/gui/qt/medialibrary/qml/MusicArtist.qml | 2 +- modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml | 6 +++--- modules/gui/qt/medialibrary/qml/VideoListDisplay.qml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/gui/qt/medialibrary/mlalbummodel.cpp b/modules/gui/qt/medialibrary/mlalbummodel.cpp index d8a686eeda..972425205c 100644 --- a/modules/gui/qt/medialibrary/mlalbummodel.cpp +++ b/modules/gui/qt/medialibrary/mlalbummodel.cpp @@ -81,7 +81,7 @@ QHash<int, QByteArray> MLAlbumModel::roleNames() const {ALBUM_MAIN_ARTIST, "main_artist"}, {ALBUM_NB_TRACKS, "nb_tracks"}, {ALBUM_DURATION, "duration"}, - {ALBUM_DURATION_SHORT, "durationShort"}, + {ALBUM_DURATION_SHORT, "duration_short"}, {ALBUM_TITLE_FIRST_SYMBOL, "title_first_symbol"}, {ALBUM_MAIN_ARTIST_FIRST_SYMBOL, "main_artist_first_symbol"} }; diff --git a/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp b/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp index a57628c28f..ef82d86ced 100644 --- a/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp +++ b/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp @@ -103,7 +103,7 @@ QHash<int, QByteArray> MLAlbumTrackModel::roleNames() const { TRACK_NUMBER, "track_number" }, { TRACK_DISC_NUMBER, "disc_number" }, { TRACK_DURATION, "duration" }, - { TRACK_DURATION_SHORT, "durationShort" }, + { TRACK_DURATION_SHORT, "duration_short" }, { TRACK_ALBUM, "album_title"}, { TRACK_ARTIST, "main_artist"}, { TRACK_TITLE_FIRST_SYMBOL, "title_first_symbol"}, diff --git a/modules/gui/qt/medialibrary/mlvideomodel.cpp b/modules/gui/qt/medialibrary/mlvideomodel.cpp index 7115d90db2..96072f9a35 100644 --- a/modules/gui/qt/medialibrary/mlvideomodel.cpp +++ b/modules/gui/qt/medialibrary/mlvideomodel.cpp @@ -100,7 +100,7 @@ QHash<int, QByteArray> MLVideoModel::roleNames() const { VIDEO_TITLE, "title" }, { VIDEO_THUMBNAIL, "thumbnail" }, { VIDEO_DURATION, "duration" }, - { VIDEO_DURATION_SHORT, "durationShort" }, + { VIDEO_DURATION_SHORT, "duration_short" }, { VIDEO_PROGRESS, "progress" }, { VIDEO_PLAYCOUNT, "playcount" }, { VIDEO_RESOLUTION, "resolution_name" }, diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicAlbums.qml index b6b9acef10..2a2bd81eb4 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAlbums.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAlbums.qml @@ -199,7 +199,7 @@ Widgets.NavigableFocusScope { sortModel: [ { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), headerDelegate: tableColumns.titleHeaderDelegate, colDelegate: tableColumns.titleDelegate }, { criteria: "main_artist", width: VLCStyle.colWidth(Math.max(tableView_id._nbCols - 3, 1)), text: i18n.qtr("Artist") }, - { criteria: "durationShort", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate }, + { criteria: "duration_short", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate }, ] navigationCancel: function() { diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml index 04892cc9d5..63424c406c 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml @@ -203,7 +203,7 @@ Widgets.NavigableFocusScope { sortModel: [ { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(Math.max(expand_track_id._nbCols - 1, 1)), visible: true, text: i18n.qtr("Title"), showSection: "", colDelegate: titleDelegate, headerDelegate: titleHeaderDelegate }, - { criteria: "durationShort", width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, + { criteria: "duration_short", width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, ] navigationParent: root diff --git a/modules/gui/qt/medialibrary/qml/MusicArtist.qml b/modules/gui/qt/medialibrary/qml/MusicArtist.qml index 0845d59ca2..ac6762c9b0 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtist.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtist.qml @@ -326,7 +326,7 @@ Widgets.NavigableFocusScope { sortModel: [ { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), headerDelegate: tableColumns.titleHeaderDelegate, colDelegate: tableColumns.titleDelegate }, { criteria: "album_title", width: VLCStyle.colWidth(Math.max(tableView_id._nbCols - 3, 1)), text: i18n.qtr("Album") }, - { criteria: "durationShort", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate }, + { criteria: "duration_short", width:VLCStyle.colWidth(1), showSection: "", headerDelegate: tableColumns.timeHeaderDelegate, colDelegate: tableColumns.timeColDelegate }, ] navigationCancel: function() { diff --git a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml index f50f7ded1f..f9cc692387 100644 --- a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml @@ -33,21 +33,21 @@ Widgets.KeyNavigableTableView { { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(1), text: i18n.qtr("Title"), showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate }, { criteria: "album_title", width: VLCStyle.colWidth(1), text: i18n.qtr("Album"), showSection: "album_title" }, { criteria: "main_artist", width: VLCStyle.colWidth(1), text: i18n.qtr("Artist"), showSection: "main_artist" }, - { criteria: "durationShort", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, + { criteria: "duration_short", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, ] property var sortModelMedium: [ { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate }, { criteria: "album_title", width: VLCStyle.colWidth(2), text: i18n.qtr("Album"), showSection: "album_title" }, { criteria: "main_artist", width: VLCStyle.colWidth(1), text: i18n.qtr("Artist"), showSection: "main_artist" }, - { criteria: "durationShort", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, + { criteria: "duration_short", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, ] property var sortModelLarge: [ { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(2), text: i18n.qtr("Title"), showSection: "title", colDelegate: tableColumns.titleDelegate, headerDelegate: tableColumns.titleHeaderDelegate }, { criteria: "album_title", width: VLCStyle.colWidth(2), text: i18n.qtr("Album"), showSection: "album_title" }, { criteria: "main_artist", width: VLCStyle.colWidth(2), text: i18n.qtr("Artist"), showSection: "main_artist" }, - { criteria: "durationShort", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, + { criteria: "duration_short", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate }, { criteria: "track_number",width: VLCStyle.colWidth(1), text: i18n.qtr("Track"), showSection: "" }, { criteria: "disc_number", width: VLCStyle.colWidth(1), text: i18n.qtr("Disc"), showSection: "" }, ] diff --git a/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml index 9835890f96..63bc4fca34 100644 --- a/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml @@ -71,7 +71,7 @@ Widgets.KeyNavigableTableView { sortModel: [ { type: "image", criteria: "thumbnail", width: VLCStyle.colWidth(1), showSection: "", colDelegate: thumbnailColumn, headerDelegate: thumbnailHeader }, { isPrimary: true, criteria: "title", width: VLCStyle.colWidth(Math.max(listView_id._nbCols - 2, 1)), text: i18n.qtr("Title"), showSection: "title" }, - { criteria: "durationShort", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate, showContextButton: true }, + { criteria: "duration_short", width: VLCStyle.colWidth(1), showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate, showContextButton: true }, ] section.property: "title_first_symbol" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
