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
  • djain/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
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (6)
......@@ -41,11 +41,22 @@ FocusScope {
"properties": {}
})
property alias g_mainDisplay: root
// Properties
property bool hasMiniPlayer: miniPlayer.visible
// NOTE: The main view must be above the indexing bar and the mini player.
property int displayMargin: (loaderProgress.active) ? miniPlayer.height + loaderProgress.height
: miniPlayer.height
property bool _inhibitMiniPlayer: false
property bool _showMiniPlayer: false
property var _oldViewProperties: ({}) // saves last state of the views
// Aliases
property alias g_mainDisplay: root
onViewChanged: {
_oldViewProperties[view.name] = view.properties
loadView()
......@@ -258,7 +269,9 @@ FocusScope {
top: parent.top
left: parent.left
bottom: parent.bottom
bottomMargin: miniPlayer.height
bottomMargin: root.displayMargin
right: playlistColumn.visible ? playlistColumn.left : parent.right
rightMargin: (MainCtx.playlistDocked && MainCtx.playlistVisible)
? 0
......@@ -286,21 +299,6 @@ FocusScope {
// Enable clipping so that the effect does not sit
// on top of the source.
clip: miniPlayer.visible && miniPlayer.effectAvailable
Loader {
z: 1
anchors {
left: parent.left
right: parent.right
bottom: parent.bottom
rightMargin: VLCStyle.margin_small
leftMargin: VLCStyle.margin_small
topMargin: VLCStyle.dp(10, VLCStyle.scale)
bottomMargin: VLCStyle.dp(10, VLCStyle.scale)
}
active: MainCtx.mediaLibraryAvailable && !MainCtx.mediaLibrary.idle
source: "qrc:///widgets/ScanProgressBar.qml"
}
}
FocusScope {
......@@ -315,7 +313,7 @@ FocusScope {
playlist.minimumWidth,
root.width / 2)
width: 0
height: parent.height - miniPlayer.height
height: parent.height - root.displayMargin
visible: false
......@@ -369,7 +367,9 @@ FocusScope {
focus: true
rightPadding: VLCStyle.applicationHorizontalMargin
bottomPadding: topPadding + Math.max(VLCStyle.applicationVerticalMargin - miniPlayer.height, 0)
bottomPadding: topPadding + Math.max(VLCStyle.applicationVerticalMargin
- root.displayMargin, 0)
Navigation.parentItem: medialibId
Navigation.upItem: sourcesBanner
......@@ -428,6 +428,30 @@ FocusScope {
}
}
Loader {
id: loaderProgress
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: miniPlayer.top
active: (MainCtx.mediaLibraryAvailable && MainCtx.mediaLibrary.idle === false)
source: "qrc:///widgets/ScanProgressBar.qml"
onItemChanged: {
if (item === null) return
// NOTE: These are required for the FrostedGlassEffect.
item.source = Qt.binding(function() { return stackView })
item.sourceRect = Qt.binding(function() {
return stackView.mapFromItem(parent, x, y, width, height)
})
}
}
P.PIPPlayer {
id: playerPip
anchors {
......
......@@ -22,5 +22,5 @@ import "qrc:///widgets/" as Widgets
Widgets.ExpandGridView {
id: root
displayMarginEnd: miniPlayer.height
displayMarginEnd: g_mainDisplay.displayMargin
}
......@@ -23,5 +23,5 @@ import "qrc:///widgets/" as Widgets
Widgets.KeyNavigableTableView {
id: root
displayMarginEnd: miniPlayer.height
displayMarginEnd: g_mainDisplay.displayMargin
}
......@@ -124,7 +124,10 @@ FocusScope {
visible: artistModel.count > 0
focus: artistModel.count > 0
displayMarginEnd: miniPlayer.height // to get blur effect while scrolling in mainview
// To get blur effect while scrolling in mainview
displayMarginEnd: g_mainDisplay.displayMargin
Navigation.parentItem: root
Navigation.rightAction: function() {
......
......@@ -50,7 +50,9 @@ FocusScope {
else
tracklistdisplay_id.currentIndex = 0;
}
displayMarginEnd: miniPlayer.height // to get blur effect while scrolling in mainview
// To get blur effect while scrolling in mainview
displayMarginEnd: g_mainDisplay.displayMargin
}
EmptyLabelButton {
......
......@@ -172,7 +172,9 @@ Widgets.PageLoader {
leftMargin: VLCStyle.margin_large
rightMargin: VLCStyle.margin_large
spacing: VLCStyle.margin_xsmall
displayMarginEnd: miniPlayer.height // to get blur effect while scrolling in mainview
// To get blur effect while scrolling in mainview
displayMarginEnd: g_mainDisplay.displayMargin
delegate: Rectangle {
width: servicesView.width - VLCStyle.margin_large * 2
......
......@@ -178,7 +178,7 @@ Control {
id: trackPositionSlider
visible: false
backgroundColor: Qt.lighter(colors.playerBg, 1.6180)
backgroundColor: colors.playerSeekBar
barHeight: VLCStyle.heightBar_xxsmall
enabled: Player.playingState === Player.PLAYING_STATE_PLAYING || Player.playingState === Player.PLAYING_STATE_PAUSED
colors: root.colors
......
......@@ -145,6 +145,7 @@ Item {
property color playerFgInactive: textInactive
property color playerControlBarFg: playerFg
property color playerBg: bg
property color playerSeekBar: Qt.lighter(playerBg, 1.6180)
property color playerBorder: buttonText
property color separator: blendColors(bg, text, .95)
......
......@@ -15,113 +15,152 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Templates 2.4 as T
import QtQuick.Layouts 1.11
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///style/"
T.ProgressBar {
id: control
FrostedGlassEffect {
// Settings
from: 0
to: 100
value: MediaLib.parsingProgress
indeterminate: MediaLib.discoveryPending
visible: !MediaLib.idle
height: contentItem.implicitHeight
width: implicitWidth
height: _getHeight()
contentItem: Column {
spacing: VLCStyle.margin_normal
width: control.width
height: implicitHeight
visible: control.visible
tint: VLCStyle.colors.lowerBanner
Rectangle {
id: bg
// Functions
width: parent.width
height: VLCStyle.heightBar_xsmall
color: VLCStyle.colors.bgAlt
// Private
function fromRGB(r, g, b, a) {
return Qt.rgba( r / 255, g / 255, b / 255, a / 255)
}
function _getHeight() {
var height = column.implicitHeight + VLCStyle.margin_small * 2
// NOTE: We don't need to take the vertical safe area into consideration when the
// miniPlayer is visible.
if (g_mainDisplay.hasMiniPlayer)
return height
else
return height + VLCStyle.applicationVerticalMargin
}
// Children
ColumnLayout {
id: column
anchors.fill: parent
anchors.leftMargin: VLCStyle.margin_large + VLCStyle.applicationHorizontalMargin
anchors.rightMargin: anchors.leftMargin
anchors.topMargin: VLCStyle.margin_small
anchors.bottomMargin: (g_mainDisplay.hasMiniPlayer) ? VLCStyle.margin_small
: VLCStyle.margin_small
+ VLCStyle.applicationVerticalMargin
spacing: VLCStyle.margin_small
T.ProgressBar {
id: control
Layout.fillWidth: true
height: VLCStyle.heightBar_xxsmall
from: 0
to: 100
value: MediaLib.parsingProgress
indeterminate: MediaLib.discoveryPending
contentItem: Item {
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
Rectangle {
id: progressBar
width: parent.height
height: parent.width * control.visualPosition
rotation: -90
y: width
transformOrigin: Item.TopLeft
visible: !control.indeterminate
gradient: Gradient {
GradientStop { position: 0.00; color: bg.fromRGB(248, 154, 6, 200) }
GradientStop { position: 0.48; color: bg.fromRGB(226, 90, 1, 255) }
GradientStop { position: 0.89; color: bg.fromRGB(248, 124, 6, 255) }
GradientStop { position: 1.00; color: bg.fromRGB(255, 136, 0, 100) }
height: VLCStyle.heightBar_xxxsmall
color: VLCStyle.colors.sliderBarMiniplayerBgColor
}
}
Rectangle {
id: indeterminateBar
property real pos: 0
anchors.centerIn: parent
anchors.horizontalCenterOffset: ((bg.width - indeterminateBar.height) / 2) * pos
width: parent.height
height: parent.width * .24
rotation: 90
visible: control.indeterminate
gradient: Gradient {
GradientStop { position: 0.00; color: bg.fromRGB(248, 154, 6, 0) }
GradientStop { position: 0.09; color: bg.fromRGB(253, 136, 0, 0) }
GradientStop { position: 0.48; color: bg.fromRGB(226, 90, 1, 255) }
GradientStop { position: 0.89; color: bg.fromRGB(248, 124, 6, 255) }
GradientStop { position: 1.00; color: bg.fromRGB(255, 136, 0, 0) }
Rectangle {
anchors.verticalCenter: parent.verticalCenter
width: parent.width * control.visualPosition
height: VLCStyle.heightBar_xxsmall
// NOTE: We want round corners.
radius: height
visible: (control.indeterminate === false)
color: VLCStyle.colors.accent
}
SequentialAnimation on pos {
id: loadingAnim
Rectangle {
property real position: 0
loops: Animation.Infinite
running: control.indeterminate
anchors.verticalCenter: parent.verticalCenter
NumberAnimation {
from: - 1
to: 1
duration: VLCStyle.durationSliderBouncing
easing.type: Easing.OutBounce
}
// NOTE: Why 0.24 though ?
width: parent.width * 0.24
height: VLCStyle.heightBar_xxsmall
PauseAnimation {
duration: VLCStyle.duration_veryLong
}
x: Math.round((parent.width - width) * position)
NumberAnimation {
to: - 1
from: 1
duration: VLCStyle.durationSliderBouncing
easing.type: Easing.OutBounce
}
// NOTE: We want round corners.
radius: height
visible: control.indeterminate
PauseAnimation {
duration: VLCStyle.duration_veryLong
color: VLCStyle.colors.accent
SequentialAnimation on position {
loops: Animation.Infinite
running: visible
NumberAnimation {
from: 0
to: 1.0
duration: VLCStyle.durationSliderBouncing
easing.type: Easing.OutBounce
}
NumberAnimation {
from: 1.0
to: 0
duration: VLCStyle.durationSliderBouncing
easing.type: Easing.OutBounce
}
}
}
}
}
SubtitleLabel {
text: MediaLib.discoveryPending ? MediaLib.discoveryEntryPoint : (MediaLib.parsingProgress + "%")
Layout.fillWidth: true
text: (MediaLib.discoveryPending) ? I18n.qtr("Scanning %1")
.arg(MediaLib.discoveryEntryPoint)
: I18n.qtr("Indexing Medias (%1%)")
.arg(MediaLib.parsingProgress)
elide: Text.ElideMiddle
font.pixelSize: VLCStyle.fontSize_large
font.weight: Font.Normal
width: parent.width
}
}
}
......@@ -922,6 +922,7 @@ modules/gui/qt/widgets/native/searchlineedit.cpp
modules/gui/qt/widgets/native/searchlineedit.hpp
modules/gui/qt/widgets/qml/DragItem.qml
modules/gui/qt/widgets/qml/ListItem.qml
modules/gui/qt/widgets/qml/ScanProgressBar.qml
modules/gui/qt/widgets/qml/SearchBox.qml
modules/gui/qt/widgets/qml/SortControl.qml
modules/gui/qt/widgets/qml/TableColumns.qml
......