Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • Thrillseekr/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
400 results
Show changes
Commits on Source (9)
......@@ -218,18 +218,24 @@ FocusScope {
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(tableView_id.availableRowWidth)
model: albumModelId
selectionDelegateModel: selectionModel
headerColor: VLCStyle.colors.bg
onActionForSelection: _actionAtIndex(selection[0]);
Navigation.parentItem: root
section.property: "title_first_symbol"
header: root.header
dragItem: albumDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
property var _modelSmall: [{
size: Math.max(2, tableView_id._nbCols),
model: ({
criteria: "title",
subCriterias: [ "main_artist", "duration" ],
text: I18n.qtr("Title"),
headerDelegate: tableColumns.titleHeaderDelegate,
colDelegate: tableColumns.titleDelegate,
sortModel: [{
placeHolder: VLCStyle.noArtAlbumCover
})
}]
property var _modelMedium: [{
size: 2,
model: {
......@@ -243,7 +249,7 @@ FocusScope {
placeHolder: VLCStyle.noArtAlbumCover
}
}, {
size: Math.max(tableView_id._nbCols - 3, 1),
size: Math.max(1, tableView_id._nbCols - 3),
model: {
criteria: "main_artist",
......@@ -263,6 +269,20 @@ FocusScope {
}
}]
model: albumModelId
selectionDelegateModel: selectionModel
headerColor: VLCStyle.colors.bg
onActionForSelection: _actionAtIndex(selection[0]);
Navigation.parentItem: root
section.property: "title_first_symbol"
header: root.header
dragItem: albumDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
Navigation.cancelAction: root._onNavigationCancel
onContextMenuButtonClicked: contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
......@@ -271,6 +291,8 @@ FocusScope {
Widgets.TableColumns {
id: tableColumns
showCriterias: (tableView_id.sortModel === tableView_id._modelSmall)
}
Connections {
......
......@@ -174,29 +174,25 @@ FocusScope {
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(artistTable.availableRowWidth)
anchors.fill: parent
selectionDelegateModel: selectionModel
model: artistModel
focus: true
headerColor: VLCStyle.colors.bg
dragItem: artistsDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
property var _modelSmall: [{
size: Math.max(2, artistTable._nbCols),
Navigation.parentItem: root
Navigation.cancelAction: root._onNavigationCancel
model: ({
criteria: "name",
onActionForSelection: {
if (selection.length > 1) {
MediaLib.addAndPlay( artistModel.getIdsForIndexes( selection ) )
} else if ( selection.length === 1) {
requestArtistAlbumView(Qt.TabFocusReason)
MediaLib.addAndPlay( artistModel.getIdForIndex( selection[0] ) )
}
}
subCriterias: [ "nb_tracks" ],
text: I18n.qtr("Name"),
headerDelegate: tableColumns.titleHeaderDelegate,
colDelegate: tableColumns.titleDelegate,
placeHolder: VLCStyle.noArtArtistSmall
})
}]
sortModel: [{
size: Math.max(artistTable._nbCols - 1, 1),
property var _modelMedium: [{
size: Math.max(1, artistTable._nbCols - 1),
model: {
criteria: "name",
......@@ -218,6 +214,30 @@ FocusScope {
}
}]
anchors.fill: parent
selectionDelegateModel: selectionModel
model: artistModel
focus: true
headerColor: VLCStyle.colors.bg
dragItem: artistsDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
Navigation.parentItem: root
Navigation.cancelAction: root._onNavigationCancel
onActionForSelection: {
if (selection.length > 1) {
MediaLib.addAndPlay( artistModel.getIdsForIndexes( selection ) )
} else if ( selection.length === 1) {
requestArtistAlbumView(Qt.TabFocusReason)
MediaLib.addAndPlay( artistModel.getIdForIndex( selection[0] ) )
}
}
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
onItemDoubleClicked: root.requestArtistAlbumView(Qt.MouseFocusReason)
onContextMenuButtonClicked: contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
......@@ -225,6 +245,8 @@ FocusScope {
Widgets.TableColumns {
id: tableColumns
showCriterias: (artistTable.sortModel === artistTable._modelSmall)
}
}
}
......
......@@ -408,7 +408,22 @@ FocusScope {
headerPositioning: ListView.InlineHeader
rowHeight: VLCStyle.tableCoverRow_height
sortModel: [{
property var _modelSmall: [{
size: Math.max(2, tableView_id._nbCols),
model: {
criteria: "title",
subCriterias: [ "duration", "album_title" ],
text: I18n.qtr("Title"),
headerDelegate: tableColumns.titleHeaderDelegate,
colDelegate: tableColumns.titleDelegate
}
}]
property var _modelMedium: [{
size: 2,
model: {
......@@ -420,7 +435,7 @@ FocusScope {
colDelegate: tableColumns.titleDelegate
}
}, {
size: Math.max(tableView_id._nbCols - 3, 1),
size: Math.max(1, tableView_id._nbCols - 3),
model: {
criteria: "album_title",
......@@ -440,6 +455,9 @@ FocusScope {
}
}]
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
Navigation.parentItem: root
Navigation.upAction: function() {
......@@ -464,6 +482,8 @@ FocusScope {
Widgets.TableColumns {
id: tableColumns
showCriterias: (tableView_id.sortModel === tableView_id._modelSmall)
}
Util.SelectableDelegateModel {
......
......@@ -236,25 +236,24 @@ FocusScope {
MainInterface.MainTableView {
id: tableView_id
property int _nameColSpan: Math.max(1, VLCStyle.gridColumnsForWidth(availableRowWidth) - 2)
property int _nbCols: VLCStyle.gridColumnsForWidth(availableRowWidth)
model: genreModel
selectionDelegateModel: selectionModel
headerColor: VLCStyle.colors.bg
focus: true
onActionForSelection: _actionAtIndex(selection)
Navigation.parentItem: root
Navigation.cancelAction: function() {
if (_currentView.currentIndex <= 0)
root.Navigation.defaultNavigationCancel()
else
_currentView.currentIndex = 0;
}
dragItem: genreDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
property var _modelSmall: [{
size: Math.max(2, tableView_id._nbCols),
model: {
criteria: "name",
subCriterias: [ "nb_tracks" ],
text: I18n.qtr("Name"),
headerDelegate: tableColumns.titleHeaderDelegate,
colDelegate: tableColumns.titleDelegate
}
}]
sortModel: [{
property var _modelMedium: [{
size: 1,
model: {
......@@ -264,7 +263,7 @@ FocusScope {
colDelegate: tableColumns.titleDelegate
}
}, {
size: _nameColSpan,
size: Math.max(1, _nbCols - 2),
model: {
criteria: "name",
......@@ -281,6 +280,26 @@ FocusScope {
}
}]
model: genreModel
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
selectionDelegateModel: selectionModel
headerColor: VLCStyle.colors.bg
focus: true
onActionForSelection: _actionAtIndex(selection)
Navigation.parentItem: root
Navigation.cancelAction: function() {
if (_currentView.currentIndex <= 0)
root.Navigation.defaultNavigationCancel()
else
_currentView.currentIndex = 0;
}
dragItem: genreDragItem
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
onItemDoubleClicked: {
root.showAlbumView(model.id, model.name, Qt.MouseFocusReason)
}
......@@ -291,7 +310,9 @@ FocusScope {
Widgets.TableColumns {
id: tableColumns
showTitleText: false
showTitleText: (tableView_id.sortModel === tableView_id._modelSmall)
showCriterias: showTitleText
titleCover_height: VLCStyle.listAlbumCover_height
titleCover_width: VLCStyle.listAlbumCover_width
titleCover_radius: VLCStyle.listAlbumCover_radius
......
......@@ -32,9 +32,10 @@ Widgets.KeyNavigableTableView {
// Properties
readonly property int _expandingColsSpan: Math.floor((VLCStyle.gridColumnsForWidth(root.availableRowWidth) - 3 /* static cols (track_number, etc)*/) / 3)
property int _nbCols: VLCStyle.gridColumnsForWidth(availableRowWidth)
property alias parentId: rootmodel.parentId
readonly property int _sizeA: Math.floor((_nbCols - 3) / 3)
readonly property int _sizeB: Math.floor((_nbCols - 2) / 2)
// Private
......@@ -95,15 +96,15 @@ Widgets.KeyNavigableTableView {
})
property var _modelLarge: [{
size: _expandingColsSpan,
size: _sizeA,
model: _lineTitle
}, {
size: _expandingColsSpan,
size: _sizeA,
model: _lineAlbum
}, {
size: _expandingColsSpan,
size: _sizeA,
model: _lineArtist
}, {
......@@ -121,11 +122,11 @@ Widgets.KeyNavigableTableView {
}]
property var _modelMedium: [{
size: 2,
size: _sizeB,
model: _lineTitle
}, {
size: 2,
size: _sizeB,
model: _lineAlbum
}, {
......@@ -139,25 +140,32 @@ Widgets.KeyNavigableTableView {
}]
property var _modelSmall: [{
size: 1,
size: Math.max(2, _nbCols),
model: _lineTitle
}, {
size: 1,
model: ({
criteria: "title",
model: _lineAlbum
}, {
size: 1,
subCriterias: [ "duration", "album_title" ],
model: _lineArtist
}, {
size: 1,
text: I18n.qtr("Title"),
model: _lineDuration
showSection: "title",
colDelegate: tableColumns.titleDelegate,
headerDelegate: tableColumns.titleHeaderDelegate,
placeHolder: VLCStyle.noArtAlbumCover
})
}]
// Aliases
property alias parentId: rootmodel.parentId
// Settings
sortModel: {
if (availableRowWidth < VLCStyle.colWidth(6))
if (availableRowWidth < VLCStyle.colWidth(4))
return _modelSmall
else if (availableRowWidth < VLCStyle.colWidth(9))
return _modelMedium
......@@ -186,6 +194,8 @@ Widgets.KeyNavigableTableView {
Widgets.TableColumns {
id: tableColumns
showCriterias: (root.sortModel === root._modelSmall)
}
MLAlbumTrackModel {
......
......@@ -44,17 +44,24 @@ MainInterface.MainTableView {
property bool _before: true
//---------------------------------------------------------------------------------------------
// Settings
//---------------------------------------------------------------------------------------------
property var _modelSmall: [{
size: Math.max(2, columns),
rowHeight: VLCStyle.tableCoverRow_height
model: {
criteria: "title",
headerColor: VLCStyle.colors.bg
subCriterias: [ "duration" ],
acceptDrop: true
text: I18n.qtr("Title"),
headerDelegate: table.titleHeaderDelegate,
colDelegate : table.titleDelegate,
placeHolder: VLCStyle.noArtAlbumCover
}
}]
sortModel: [{
property var _modelMedium: [{
size: 1,
model: {
......@@ -68,7 +75,7 @@ MainInterface.MainTableView {
placeHolder: VLCStyle.noArtAlbumCover
}
}, {
size: Math.max(columns - 2, 1),
size: Math.max(1, columns - 2),
model: {
criteria: "title",
......@@ -86,6 +93,19 @@ MainInterface.MainTableView {
}
}]
//---------------------------------------------------------------------------------------------
// Settings
//---------------------------------------------------------------------------------------------
rowHeight: VLCStyle.tableCoverRow_height
headerColor: VLCStyle.colors.bg
acceptDrop: true
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
//---------------------------------------------------------------------------------------------
// Events
//---------------------------------------------------------------------------------------------
......@@ -196,7 +216,8 @@ MainInterface.MainTableView {
titleCover_height: VLCStyle.listAlbumCover_height
titleCover_radius: VLCStyle.listAlbumCover_radius
showTitleText: false
showTitleText: (root.sortModel === root._modelSmall)
showCriterias: showTitleText
criteriaCover: "thumbnail"
......
......@@ -329,22 +329,22 @@ FocusScope {
property int _columns: Math.max(1, VLCStyle.gridColumnsForWidth(availableRowWidth) - 2)
//-------------------------------------------------------------------------------------
// Settings
rowHeight: VLCStyle.tableCoverRow_height
property var _modelSmall: [{
size: Math.max(2, _columns),
headerTopPadding: VLCStyle.margin_normal
model: root.model
model: {
criteria: "name",
selectionDelegateModel: modelSelect
subCriterias: [ "count" ],
dragItem: dragItemPlaylist
text: I18n.qtr("Name"),
headerColor: VLCStyle.colors.bg
headerDelegate: columns.titleHeaderDelegate,
colDelegate : columns.titleDelegate
}
}]
sortModel: [{
property var _modelMedium: [{
size: 1,
model: {
......@@ -371,6 +371,24 @@ FocusScope {
}
}]
//-------------------------------------------------------------------------------------
// Settings
rowHeight: VLCStyle.tableCoverRow_height
headerTopPadding: VLCStyle.margin_normal
model: root.model
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
selectionDelegateModel: modelSelect
dragItem: dragItemPlaylist
headerColor: VLCStyle.colors.bg
Navigation.parentItem: root
Navigation.cancelAction: root._onNavigationCancel
......@@ -392,7 +410,8 @@ FocusScope {
Widgets.TableColumns {
id: columns
showTitleText: false
showTitleText: (tableView.sortModel === tableView._modelSmall)
showCriterias: showTitleText
criteriaCover: "thumbnail"
......
......@@ -49,6 +49,9 @@ Item {
}
function getCriterias(colModel, rowModel) {
if (colModel === null || rowModel === null)
return ""
var criterias = colModel.subCriterias
if (criterias === undefined || criterias.length === 0)
......@@ -59,13 +62,20 @@ Item {
for (var i = 0; i < criterias.length; i++) {
if (i) string += ""
var criteria = rowModel[criterias[i]]
var criteria = criterias[i]
var value = rowModel[criteria]
// NOTE: We can't use 'instanceof' because VLCTick is uncreatable.
if (criteria.toString().indexOf("VLCTick(") === 0)
string += criteria.formatShort()
else
string += criteria
if (value.toString().indexOf("VLCTick(") === 0) {
string += value.formatShort()
} else if (criteria === "nb_tracks") {
string += I18n.qtr("%1 tracks").arg(value)
} else {
string += value
}
}
return string
......@@ -173,8 +183,7 @@ Item {
visible: root.showCriterias
text: (visible && titleDel.rowModel) ? root.getCriterias(titleDel.model,
titleDel.rowModel) : ""
text: (visible) ? root.getCriterias(titleDel.model, titleDel.rowModel) : ""
}
}
}
......