Permalink
Browse files

QML: Update implementation

  • Loading branch information...
3unjee committed Jan 15, 2019
1 parent 8740031 commit 0ded218b6eb8e3a6d5dd59956085d6cf17482f76
Showing with 36 additions and 16 deletions.
  1. +4 −4 README.md
  2. +1 −1 build.sh
  3. +1 −1 configure.sh
  4. +26 −6 content/Gui.qml
  5. +1 −2 content/PanelCover.qml
  6. +2 −1 deploy.sh
  7. +1 −1 dist/qrc.sh
@@ -47,7 +47,7 @@ Recommended:

You can configure MotionBox with:

sh configure.sh <qt4 | qt5 | clean> <win32 | win64 | osx | linux>
sh configure.sh <qt4 | qt5 | clean> <win32 | win64 | macOS | linux>

- Edit [configure.sh](configure.sh) to check your dependencies.

@@ -59,7 +59,7 @@ You can build MotionBox with Qt Creator:

Or the build script:

sh build.sh <qt4 | qt5 | clean> <win32 | win64 | osx | linux> [deploy]
sh build.sh <qt4 | qt5 | clean> <win32 | win64 | macOS | linux> [deploy]

Or the console:

@@ -73,7 +73,7 @@ Or the console:
1\. Generate the qrc file:

cd dist
sh qrc.sh <qt4 | qt5 | clean> <win32 | win64 | osx | linux> [deploy]
sh qrc.sh <qt4 | qt5 | clean> <win32 | win64 | macOS | linux> [deploy]

2\. Build MotionBox:

@@ -82,7 +82,7 @@ Or the console:

3\. Deploy MotionBox:

sh deploy.sh <qt4 | qt5 | clean> <win32 | win64 | osx | linux>
sh deploy.sh <qt4 | qt5 | clean> <win32 | win64 | macOS | linux>

- Edit [dist/qrc.sh](dist/qrc.sh) and [deploy.sh](deploy.sh) to check your dependencies.

@@ -38,7 +38,7 @@ if [ $# != 2 -a $# != 3 ] \
|| \
[ $# = 3 -a "$3" != "deploy" ]; then

echo "Usage: build <qt4 | qt5 | clean> <win32 | win64 | osx | linux> [deploy]"
echo "Usage: build <qt4 | qt5 | clean> <win32 | win64 | macOS | linux> [deploy]"

exit 1
fi
@@ -25,7 +25,7 @@ if [ $# != 2 ] || [ $1 != "qt4" -a $1 != "qt5" -a $1 != "clean" ] || [ $2 != "wi
$2 != "macOS" -a \
$2 != "linux" ]; then

echo "Usage: configure <qt4 | qt5 | clean> <win32 | win64 | osx | linux>"
echo "Usage: configure <qt4 | qt5 | clean> <win32 | win64 | macOS | linux>"

exit 1
fi
@@ -637,7 +637,7 @@ Item
{
restoreBars();

pUpdateFeeds();
timerFeed.restart();
}

onSpeedChanged: local.speed = player.speed
@@ -651,7 +651,7 @@ Item

onCurrentTrackUpdated:
{
if (pUpdate && player.trackIsLoaded)
if (pUpdate && playerTab.isLoaded)
{
pUpdate = false;

@@ -1824,11 +1824,22 @@ Item
playlistTracks.removeTrack(playlistTracks.count - 1);
}

if (listPlaylist.playlist == playlistTracks)
var playlist = playerTab.playlist;

if (playlist)
{
listPlaylist.copyTrackFrom(playerTab.playlist, playerTab.trackIndex, 0, true);
if (listPlaylist.playlist == playlistTracks)
{
listPlaylist.copyTrackFrom(playlist, playerTab.trackIndex, 0, true);
}
else playlist.copyTrackTo(playerTab.trackIndex, playlistTracks, 0);
}
else
{
playlistTracks.insertSource(0, source);

playlistTracks.loadTrack(0);
}
else playerTab.playlist.copyTrackTo(playerTab.trackIndex, playlistTracks, 0);
}
else if (player.playlist != playlistTracks)
{
@@ -3476,7 +3487,7 @@ Item

function pUpdateFeeds()
{
if (player.trackIsLoaded)
if (playerTab.isLoaded)
{
pUpdate = false;

@@ -3608,6 +3619,15 @@ Item
}
}

Timer
{
id: timerFeed

interval: 1000

onTriggered: if (player.hasStarted) pUpdateFeeds()
}

Item
{
id: itemContent
@@ -604,8 +604,7 @@ Panel

visible: false

enabled : buttonTrack.enabled
hoverEnabled: buttonTrack.enabled
enabled: buttonTrack.enabled

cursor: Qt.PointingHandCursor

@@ -18,9 +18,10 @@ bin5="latest"

if [ $# != 2 ] || [ $1 != "qt4" -a $1 != "qt5" -a $1 != "clean" ] || [ $2 != "win32" -a \
$2 != "win64" -a \
$2 != "macOS" -a \
$2 != "linux" ]; then

echo "Usage: deploy <qt4 | qt5 | clean> <win32 | win64 | osx | linux>"
echo "Usage: deploy <qt4 | qt5 | clean> <win32 | win64 | macOS | linux>"

exit 1
fi
@@ -25,7 +25,7 @@ if [ $# != 2 -a $# != 3 ] \
|| \
[ $# = 3 -a "$3" != "deploy" ]; then

echo "Usage: qrc <qt4 | qt5 | clean> <win32 | win64 | osx | linux> [deploy]"
echo "Usage: qrc <qt4 | qt5 | clean> <win32 | win64 | macOS | linux> [deploy]"

exit 1
fi

0 comments on commit 0ded218

Please sign in to comment.