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 (4)
......@@ -261,31 +261,44 @@ FocusScope {
Widgets.KeyNavigableTableView {
id: listView
// Properties
readonly property int maximumCount: root.maximumRows
readonly property int nbItemPerRow: 1
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(listView.availableRowWidth)
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(availableRowWidth)
readonly property int _nameColSpan: Math.max((_nbCols - 1) / 2, 1)
readonly property int _size: (_nbCols - 1) / 2
rowHeight: VLCStyle.tableCoverRow_height
property var _modelSmall: [{
size: Math.max(2, _nbCols),
displayMarginEnd: root.displayMarginEnd
model: ({
criteria: "name",
model: modelFilter
title: "name",
subCriterias: [ "mrl" ],
text: I18n.qtr("Name"),
headerDelegate: artworkHeader,
colDelegate: artworkColumn
})
}]
sortModel: [{
property var _modelMedium: [{
size: 1,
model: {
criteria: "artwork",
headerDelegate: artworkHeader,
colDelegate : artworkColumn
colDelegate: artworkColumn
}
}, {
size: listView._nameColSpan,
size: _size,
model: {
criteria: "name",
......@@ -293,7 +306,7 @@ FocusScope {
text: I18n.qtr("Name")
}
}, {
size: Math.max(listView._nbCols - listView._nameColSpan - 1, 1),
size: Math.max(_nbCols - _size - 1, 1),
model: {
criteria: "mrl",
......@@ -304,6 +317,17 @@ FocusScope {
}
}]
// Settings
rowHeight: VLCStyle.tableCoverRow_height
displayMarginEnd: root.displayMarginEnd
model: modelFilter
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
header: root.header
headerColor: VLCStyle.colors.bg
......@@ -327,8 +351,6 @@ FocusScope {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pixelSize: VLCStyle.icon_tableHeader
color: parent.foregroundColor
}
}
......
......@@ -259,10 +259,61 @@ FocusScope {
onPlayClicked: playAt(index)
}
property var _modelSmall: [{
size: Math.max(2, _nbCols),
model: ({
criteria: "name",
title: "name",
subCriterias: [ "mrl" ],
text: I18n.qtr("Name"),
headerDelegate: thumbnailHeader,
colDelegate: thumbnailColumn
})
}]
property var _modelMedium: [{
size: 1,
model: {
criteria: "thumbnail",
headerDelegate: thumbnailHeader,
colDelegate: thumbnailColumn
}
}, {
size: tableView._nameColSpan,
model: {
criteria: "name",
text: I18n.qtr("Name")
}
}, {
size: Math.max(_nbCols - _nameColSpan - 1, 1),
model: {
criteria: "mrl",
text: I18n.qtr("Url"),
showContextButton: true
}
}]
dragItem: networkDragItem
height: view.height
width: view.width
model: filterModel
sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
: _modelMedium
selectionDelegateModel: selectionModel
focus: true
headerColor: VLCStyle.colors.bg
......@@ -315,35 +366,6 @@ FocusScope {
}
}
sortModel: [{
size: 1,
model: {
criteria: "thumbnail",
headerDelegate: tableView.thumbnailHeader,
colDelegate: tableView.thumbnailColumn
}
}, {
size: tableView._nameColSpan,
model: {
criteria: "name",
text: I18n.qtr("Name")
}
}, {
size: Math.max(tableView._nbCols - tableView._nameColSpan - 1, 1),
model: {
criteria: "mrl",
text: I18n.qtr("Url"),
showContextButton: true
}
}]
onActionForSelection: _actionAtIndex(selection[0].row)
onItemDoubleClicked: _actionAtIndex(index)
onContextMenuButtonClicked: contextMenu.popup(filterModel.mapIndexesToSource(selectionModel.selectedIndexes), globalMousePos)
......
......@@ -26,53 +26,154 @@ import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
Item {
id: item
Row {
id: root
// Properties
readonly property bool containsMouse: parent.containsMouse
readonly property bool currentlyFocused: parent.currentlyFocused
property var rowModel: parent.rowModel
property var model: parent.colModel
readonly property bool currentlyFocused: parent.currentlyFocused
readonly property bool containsMouse: parent.containsMouse
readonly property int index: parent.index
readonly property string artworkSource: !!rowModel ? rowModel.artwork : ""
readonly property color foregroundColor: parent.foregroundColor
// Private
readonly property bool _showPlayCover: (currentlyFocused || containsMouse)
&& !!rowModel
&& (rowModel.type !== NetworkMediaModel.TYPE_NODE)
&& (rowModel.type !== NetworkMediaModel.TYPE_DIRECTORY)
readonly property bool _showCustomCover: (!artworkSource) || (artwork.status != Image.Ready)
readonly property bool _showCustomCover: (!artworkSource) || (artwork.status !== Image.Ready)
// Signals
signal playClicked(int index)
Widgets.ListCoverShadow {
x: artwork.x
y: artwork.y
// Settings
spacing: VLCStyle.margin_normal
// Functions
function getCriterias(colModel, rowModel) {
if (colModel === null || rowModel === null)
return ""
var criterias = colModel.subCriterias
if (criterias === undefined || criterias.length === 0)
return ""
var string = ""
for (var i = 0; i < criterias.length; i++) {
var criteria = criterias[i]
var value = rowModel[criteria]
if (value.toString() === "vlc://nop")
continue
if (i) string += ""
string += value
}
return string
}
// Children
Item {
id: itemCover
anchors.verticalCenter: parent.verticalCenter
width: artwork.width
height: artwork.height
Widgets.ListCoverShadow { anchors.fill: parent }
NetworkCustomCover {
id: artwork
width: VLCStyle.listAlbumCover_width
height: VLCStyle.listAlbumCover_height
//radius: VLCStyle.listAlbumCover_radius
networkModel: rowModel
bgColor: VLCStyle.colors.bg
Widgets.PlayCover {
x: Math.round((artwork.width - width) / 2)
y: Math.round((artwork.height - height) / 2)
width: VLCStyle.play_cover_small
visible: root._showPlayCover
onClicked: playClicked(root.index)
}
}
}
NetworkCustomCover {
id: artwork
Column {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.verticalCenter: parent.verticalCenter
bgColor: VLCStyle.colors.bg
width: VLCStyle.listAlbumCover_width
height: VLCStyle.listAlbumCover_height
anchors.topMargin: VLCStyle.margin_xxsmall
anchors.bottomMargin: VLCStyle.margin_xxsmall
width: Math.max(0, parent.width - x)
Widgets.ScrollingText {
id: itemText
anchors.left: parent.left
anchors.right: parent.right
height: (itemCriterias.visible) ? Math.round(parent.height / 2)
: parent.height
visible: (listLabel.text)
clip: scrolling
label: listLabel
forceScroll: root.currentlyFocused
Widgets.ListLabel {
id: listLabel
anchors.verticalCenter: parent.verticalCenter
text: (root.rowModel && model.title) ? root.rowModel[model.title] : ""
color: root.foregroundColor
}
}
networkModel: rowModel
//radius: VLCStyle.listAlbumCover_radius
Widgets.MenuCaption {
id: itemCriterias
Widgets.PlayCover {
x: Math.round((artwork.width - width) / 2)
y: Math.round((artwork.height - height) / 2)
anchors.left: parent.left
anchors.right: parent.right
width: VLCStyle.play_cover_small
height: itemText.height
visible: item._showPlayCover
visible: (text)
onClicked: playClicked(item.index)
text: root.getCriterias(root.model, root.rowModel)
}
}
}