Commit d1fdcbbe authored by Camilo higuita's avatar Camilo higuita

push changes newly cause of hooks audit stuff again argh

parent e80b44e6
......@@ -17,7 +17,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTORCC ON)
add_executable(vvave
mauikit
qml.qrc
main.cpp
babe.cpp
......@@ -67,19 +66,19 @@ if (ANDROID)
else()
find_package(Taglib REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS WebEngine)
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config)
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO)
target_sources(vvave PRIVATE
kde/mpris2.cpp
kde/notify.cpp
)
target_link_libraries(vvave Qt5::WebEngine KF5::ConfigCore KF5::Notifications KF5::I18n Qt5::DBus)
target_link_libraries(vvave Qt5::WebEngine KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n Qt5::DBus)
endif()
target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS})
target_link_libraries(vvave Qt5::Network Qt5::Sql Qt5::WebSockets Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::Widgets ${TAGLIB_LIBRARIES})
install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.vvave.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES assets/vvave.png DESTINATION /usr/share/icons/hicolor/scalable/apps)
# install(FILES org.kde.vvave.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES assets/vvave.svg DESTINATION /usr/share/icons/hicolor/scalable/apps)
install(FILES org.kde.vvave.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -15,6 +15,7 @@ Comment[sk]=Malý hudobný prehrávač
Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Comment[zh_CN]=简洁的音乐播放器
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
......@@ -28,6 +29,7 @@ Name[pt]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
Name[zh_CN]=vvave
[Event/Notify]
Name=vvave...
......@@ -43,6 +45,7 @@ Name[pt]=vvave...
Name[sv]=vvave...
Name[uk]=vvave…
Name[x-test]=xxvvave...xx
Name[zh_CN]=vvave...
Comment=Connection to device failed
Comment[ast]=Falló la conexón col preséu
Comment[ca]=Ha fallat la connexió amb el dispositiu
......
# Default rules for deployment.
isEmpty(PREFIX){
PREFIX = /usr
}
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = $${PREFIX}/bin/
!isEmpty(target.path): INSTALLS += target
desktop_files.path = $${PREFIX}/share/applications/
desktop_files.files = $$PWD/*.desktop
meta_files.path = $${PREFIX}/share/metainfo/
meta_files.files = $$PWD/*appdata.xml
#services.path = $${PREFIX}/share/dbus-1/services
#services.files = $$PWD/data/*.service
#dman.path = $${PREFIX}/share/dman/
#dman.files = $$PWD/dman/*
#translations.path = $${PREFIX}/share/$${TARGET}/translations
#translations.files = $$PWD/translations/*.qm
hicolor.path = $${PREFIX}/share/icons/hicolor/scalable/apps
hicolor.files = $$PWD/assets/vvave.svg
INSTALLS += target desktop_files meta_files hicolor
#GitVersion = $$system(git rev-parse HEAD)
#DEFINES += GIT_VERSION=\\\"$$GitVersion\\\"
......@@ -113,7 +113,6 @@ int main(int argc, char *argv[])
#endif
#ifdef Q_OS_ANDROID
QIcon::setThemeName("Luv");
QtWebView::initialize();
#else
// if(QQuickStyle::availableStyles().contains("nomad"))
......
......@@ -179,12 +179,12 @@ Maui.ApplicationWindow
/* UI */
property bool accent : pageStack.wideMode || (!pageStack.wideMode && pageStack.currentIndex === 1)
altToolBars: false
accentColor: "#212121"
// altToolBars: false
accentColor: bae.babeColor()
headBarFGColor: altColorText
headBarBGColor: currentView === viewsIndex.vvave ? "#7e57c2" : accentColor
headBarBGColor: currentView === viewsIndex.vvave ? "#7e57c2" : "#212121"
colorSchemeName: "vvave"
altColorText: darkTextColor
altColorText: darkTextColor
headBar.middleContent : [
......@@ -192,8 +192,6 @@ Maui.ApplicationWindow
{
iconName: "headphones"
iconColor: !accent ? babeColor : altColorText
display: pageStack.wideMode ? AbstractButton.TextBesideIcon : AbstractButton.IconOnly
onClicked: pageStack.currentIndex = 0
text: qsTr("Now")
......@@ -203,8 +201,6 @@ Maui.ApplicationWindow
{
iconName: "view-media-track"
iconColor: accent && currentView === viewsIndex.tracks ? babeColor : altColorText
display: pageStack.wideMode ? AbstractButton.TextBesideIcon : AbstractButton.IconOnly
onClicked:
{
pageStack.currentIndex = 1
......@@ -212,6 +208,7 @@ Maui.ApplicationWindow
}
text: qsTr("Tracks")
tooltipText: pageStack.wideMode ? "" : text
},
Maui.ToolButton
......@@ -219,14 +216,13 @@ Maui.ApplicationWindow
text: qsTr("Albums")
iconName: /*"album"*/ "view-media-album-cover"
iconColor: accent && currentView === viewsIndex.albums ? babeColor : altColorText
display: pageStack.wideMode ? AbstractButton.TextBesideIcon : AbstractButton.IconOnly
onClicked:
{
pageStack.currentIndex = 1
albumsView.currentIndex = 0
currentView = viewsIndex.albums
}
tooltipText: pageStack.wideMode ? "" : text
},
Maui.ToolButton
......@@ -234,14 +230,13 @@ Maui.ApplicationWindow
text: qsTr("Artists")
iconName: "view-media-artist"
iconColor: accent && currentView === viewsIndex.artists ? babeColor : altColorText
display: pageStack.wideMode ? AbstractButton.TextBesideIcon : AbstractButton.IconOnly
onClicked:
{
pageStack.currentIndex = 1
artistsView.currentIndex = 0
currentView = viewsIndex.artists
}
tooltipText: pageStack.wideMode ? "" : text
},
Maui.ToolButton
......@@ -249,13 +244,12 @@ Maui.ApplicationWindow
text: qsTr("Playlists")
iconName: "view-media-playlist"
iconColor: accent && currentView === viewsIndex.playlists ? babeColor : altColorText
display: pageStack.wideMode ? AbstractButton.TextBesideIcon : AbstractButton.IconOnly
onClicked:
{
pageStack.currentIndex = 1
currentView = viewsIndex.playlists
}
tooltipText: pageStack.wideMode ? "" : text
}
]
......@@ -805,6 +799,7 @@ Maui.ApplicationWindow
grid.holder.title : "No Albums!"
grid.holder.body: "Add new music sources"
grid.holder.emojiSize: iconSizes.huge
grid.headBarTitle: grid.grid.count + qsTr(" abums")
Connections
{
......@@ -852,6 +847,7 @@ Maui.ApplicationWindow
grid.holder.title : "No Artists!"
grid.holder.body: "Add new music sources"
grid.holder.emojiSize: iconSizes.huge
grid.headBarTitle: grid.grid.count + qsTr(" artists")
Connections
{
......
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
<id>org.kde.vvave.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL-3.0</project_license>
<name>Vvave</name>
<name xml:lang="ast">Vvave</name>
<name xml:lang="ca">Vvave</name>
<name xml:lang="ca@valencia">Vvave</name>
<name xml:lang="cs">Vvave</name>
<name xml:lang="de">Vvave</name>
<name xml:lang="en_GB">Vvave</name>
<name xml:lang="fr">Vvave</name>
<name xml:lang="gl">Vvave</name>
<name xml:lang="nl">Vvave</name>
<name xml:lang="pt">Vvave</name>
<name xml:lang="sk">Vvave</name>
<name xml:lang="sv">Vvave</name>
<name xml:lang="uk">Vvave</name>
<name xml:lang="x-test">xxVvavexx</name>
<name xml:lang="zh-CN">Vvave</name>
<summary>Play your music collection</summary>
<summary xml:lang="ast">Reproduz la to coleición de música</summary>
<summary xml:lang="ca">Reprodueix la vostra col·lecció de música</summary>
<summary xml:lang="ca@valencia">Reprodueix la vostra col·lecció de música</summary>
<summary xml:lang="cs">Přehrávejte svou hudební sbírku</summary>
<summary xml:lang="de">Wiedergabe Ihrer Musik-Sammlung</summary>
<summary xml:lang="en_GB">Play your music collection</summary>
<summary xml:lang="fr">Jouez votre collection musicale</summary>
<summary xml:lang="gl">Reproduza a súa colección de música.</summary>
<summary xml:lang="nl">Uw muziekcollectie afspelen</summary>
<summary xml:lang="pt">Tocar a sua colecção de música</summary>
<summary xml:lang="sk">Prehrať vašu hudobnú kolekciu</summary>
<summary xml:lang="sv">Spela din musiksamling</summary>
<summary xml:lang="uk">Відтворення вашої музичної збірки</summary>
<summary xml:lang="x-test">xxPlay your music collectionxx</summary>
<summary xml:lang="zh-CN">简洁的音乐播放器</summary>
<description>
<p> Tiny Qt Music Player to keep your favorite songs at hand. </p>
<p xml:lang="ast">Un reproductor cenciellu de música que debería ser fácil d'usar. Nun rique configuración dala enantes que puea usase.</p>
<p xml:lang="ca">Un reproductor de música senzill que hauria de ser fàcil d'utilitzar. No requereix cap configuració abans de poder utilitzar-lo.</p>
<p xml:lang="ca-valencia">Un reproductor de música senzill que hauria de ser fàcil d'utilitzar. No requereix cap configuració abans de poder utilitzar-lo.</p>
<p xml:lang="cs">Jednoduchý snadno použitelný přehrávač hudby, Před použitím nevyžaduje jakékoliv nastavovaní.</p>
<p xml:lang="de">Ein einfacher Medienspieler, der leicht zu benutzen sein sollte. Er kann ganz ohne vorherige Konfiguration verwendet werden.</p>
<p xml:lang="en-GB">A simple music player that should be easy to use. It does not require any configuration before one can use it.</p>
<p xml:lang="fr">Un lecteur de musique simple qui se veut facile à utiliser. Il ne requiert aucune configuration pour pouvoir être utilisé.</p>
<p xml:lang="gl">Un reprodutor de música simple e fácil de usar. Non require ningún tipo de configuración inicial.</p>
<p xml:lang="nl">Eenvoudige muziekspeler die gemakkelijk te gebruiken is. Het vereist geen enkele configuratie om te gebruiken.</p>
<p xml:lang="pt">Um leitor de música simples que deveria ser simples de usar. Não necessita de nenhuma configuração antes de poder ser usado.</p>
<p xml:lang="pt-BR">Um reprodutor de músicas simples que deve ser fácil de usar. Não requer qualquer configuração antes de usá-lo.</p>
<p xml:lang="sk">Jednoduchý hudobný prehliadač, ktorý by malo byť jednoduché používať. Nevyžaduje žiadne nastavenie pred použitím.</p>
<p xml:lang="sv">En enkel musikspelare som ska vara lättanvänd. Den kräver inga inställningar innan man kan använda den.</p>
<p xml:lang="uk">Простий у користуванні музичний програвач. Не потребує налаштовування перед користуванням.</p>
<p xml:lang="x-test">xxA simple music player that should be easy to use. It does not require any configuration before one can use it.xx</p>
<p xml:lang="zh-CN">一个让你随时享受喜爱的音乐的简洁音乐播放器。</p>
</description>
<url type="homepage">https://vvave.kde.org/</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?product=vvave</url>
<url type="donation">https://www.kde.org/community/donations</url>
<url type="help">https://docs.kde.org/trunk5/en/extragear-multimedia/vvave/</url>
<screenshots>
<screenshot type="default">
<caption>The Vvave music player</caption>
<caption xml:lang="ast">Reproductor d'audiu</caption>
<caption xml:lang="ca">Reproductor d'àudio Vvave</caption>
<caption xml:lang="ca@valencia">Reproductor d'àudio Vvave</caption>
<caption xml:lang="cs">Zvukový přehrávač</caption>
<caption xml:lang="de">Vvave-Audio-Wiedergabe</caption>
<caption xml:lang="en_GB">The Vvave Audio Player</caption>
<caption xml:lang="es">Reproductor de sonido Vvave</caption>
<caption xml:lang="fr">Lecteur audio Vvave</caption>
<caption xml:lang="gl">Reprodutor de son Vvave</caption>
<caption xml:lang="nl">Audiospeler Vvave</caption>
<caption xml:lang="pt">Leitor de Áudio Vvave</caption>
<caption xml:lang="sk">Audio prehrávač</caption>
<caption xml:lang="sv">Vvave Ljudspelare</caption>
<caption xml:lang="uk">Аудіопрогравач Vvave</caption>
<caption xml:lang="x-test">xxAudio Playerxx</caption>
<caption xml:lang="zh-CN">Vvave 音乐播放器</caption>
<image type="source" width="1366" height="744">
https://github.com/KDE/vvave/blob/master/screenshots/exm.png
</image>
</screenshot>
</screenshots>
<provides>
<binary>elisa</binary>
</provides>
<project_group>KDE</project_group>
<releases>
<release version="0.1.0" date="2018-09-06"/>
</releases>
</component>
[Desktop Entry]
Name=vvave
Name[ast]=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[cs]=vvave
......@@ -9,6 +10,7 @@ Name[fr]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sk]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
......
# Package
Package for some distributions
## Archlinux Distributions
archlinux, manjaro ...
My packaging configuration is done on Manjaro KDE, which provides two options for Qmake and CMake. The version number is more casual, after all, not officially released. For different scenarios, simply run makepkg -p PKGBUILD.qmake or makepkg -p PKGBUILD.cmake
## Debian Distributions
debian, ubuntu, KDE neon ...
My packaging configuration is done on KDE neon User Edition, using the default configuration CMake build package, first create an initial configuration through dh_make, then modify debian/control, and finally package with dpkg-buildpackage -rfakeroot.
Please note: Place the debian directory in the root directory of the vvave source code, such as vvave/, and run it here dpkg-buildpackage -rfakeroot
\ No newline at end of file
# Maintainer: kaiman <kaisfm at sohu dot com>
pkgname=vvave
pkgver=git
pkgrel=0
pkgdesc='Tiny Qt Music Player to keep your favorite songs at hand'
arch=(x86_64)
url='https://vvave.kde.org/'
license=(GPL3)
depends=(ki18n knotifications qt5-webengine qt5-websockets taglib)
makedepends=(extra-cmake-modules git python)
optdepends=('youtube-dl: youtube support')
provides=("${pkgname%-*}")
conflicts=("${pkgname%-*}" 'babe-qt')
replaces=('babe-qt')
source=('git://anongit.kde.org/vvave.git')
sha256sums=('SKIP')
#pkgver() {
# cd $pkgname
# git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/v//g'
#}
prepare() {
rm -rf $pkgname
git clone --recurse-submodules $source
mkdir -p build
}
build() {
cd build
cmake ../$pkgname -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
cd build
make DESTDIR="$pkgdir" install
}
# Maintainer: kaiman <kaisfm at sohu dot com>
pkgname=vvave
pkgver=git
pkgrel=0
pkgdesc='Tiny Qt Music Player to keep your favorite songs at hand'
arch=(x86_64)
url='https://vvave.kde.org/'
license=(GPL3)
depends=(ki18n knotifications qt5-webengine qt5-websockets taglib)
makedepends=(git python)
optdepends=('youtube-dl: youtube support')
provides=("${pkgname%-*}")
conflicts=("${pkgname%-*}" 'babe-qt')
replaces=('babe-qt')
source=('git://anongit.kde.org/vvave.git')
sha256sums=('SKIP')
#pkgver() {
# cd $pkgname
# git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/v//g'
#}
prepare() {
rm -rf $pkgname
git clone --recurse-submodules $source
mkdir -p $pkgname/build
}
build() {
cd $pkgname/build
qmake -o Makefile ../vvave.pro
make
}
package() {
cd $pkgname/build
make INSTALL_ROOT="$pkgdir" install
}
vvave-git (0-1) unstable; urgency=medium
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
-- kaimam <kaisfm@sohu.com> Tue, 04 Sep 2018 17:59:28 +0800
Source: vvave-git
Section: sound
Priority: optional
Build-Depends: cmake (>= 3.5),
debhelper (>= 9),
extra-cmake-modules,
qtbase5-dev,
qtdeclarative5-dev,
libqt5websockets5-dev,
libqt5svg5-dev,
libkf5i18n-dev,
libkf5notifications-dev,
libkf5config-dev,
libkf5service-dev,
libkf5kio-dev,
qttools5-dev,
qtwebengine5-dev,
libtag1-dev,
qtquickcontrols2-5-dev
Maintainer: kaimam <kaisfm@sohu.com>
Standards-Version: 3.9.6
Homepage: https://vvave.kde.org/
#Vcs-Git: https://anongit.neon.kde.org/extras/vvave
#Vcs-Browser: https://packaging.neon.kde.org/extras/vvave.git
Package: vvave-git
Architecture: any
Depends: libkf5i18n5,
libkf5notifications5,
qml-module-qtquick2,
libqt5websockets5,
libqt5webengine5,
${misc:Depends},
${shlibs:Depends}
Description: Tiny Qt Music Player to keep your favorite songs at hand
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: vvave-git
Source: https://cgit.kde.org/vvave.git/
Files: *
Copyright: 2018 Camilo Higuita
<years> <likewise for another author>
License: GPL-3.0+
Files: debian/*
Copyright: 2018 kaimam <kaisfm@sohu.com>
License: GPL-3.0+
License: GPL-3.0+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
# Please avoid picking licenses with terms that are more restrictive than the
# packaged work, as it may make Debian's contributions unacceptable upstream.
#!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
# see FEATURE AREAS in dpkg-buildflags(1)
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh $@
# dh_make generated override targets
# This is example for Cmake (See https://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
shlibs:Depends=libc6 (>= 2.14), libkf5configcore5, libkf5i18n5, libkf5kiocore5, libkf5kiowidgets5, libkf5notifications5, libkf5service5, libqt5core5a (>= 5.11.1+dfsg), libqt5dbus5 (>= 5.11.1+dfsg), libqt5gui5 (>= 5.11.1+dfsg), libqt5multimedia5, libqt5network5 (>= 5.11.1+dfsg), libqt5qml5 (>= 5.11.1), libqt5sql5 (>= 5.11.1+dfsg), libqt5webengine5, libqt5websockets5, libqt5widgets5 (>= 5.11.1+dfsg), libqt5xml5 (>= 5.11.1+dfsg), libstdc++6 (>= 5.2), libtag1v5-vanilla
misc:Depends=
misc:Pre-Depends=
# Example watch control file for uscan
# Rename this file to "watch" and then you can run the "uscan" command
# to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 4 file
version=4
# PGP signature mangle, so foo.tar.gz has foo.tar.gz.sig
#opts="pgpsigurlmangle=s%$%.sig%"
# GitHub hosted projects
#opts="filenamemangle="s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%<project>-$1.tar.gz%" \
# https://github.com/<user>/vvave-git/tags \
# (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
# Direct Git
# opts="mode=git" git://anongit.kde.org/vvave.git \
# refs/tags/v([\d\.]+) debian uupdate
# Uncomment to find new files on GooglePages
# http://example.googlepages.com/foo.html vvave-git-(.*)\.tar\.gz
......@@ -77,8 +77,8 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
if(size > 0)
this->startBrainz(true, BAE::SEG::HALF);
else
this->startBrainz(BAE::loadSettings("AUTO", "BRAINZ", true).toBool(), BAE::SEG::TWO);
// else
// this->startBrainz(BAE::loadSettings("AUTO", "BRAINZ", true).toBool(), BAE::SEG::TWO);
emit refreshTables(size);
});
......
......@@ -31,8 +31,8 @@ function playTrack(index)
bae.notifySong(currentTrack.url)
}
if(currentTrack.lyrics.length < 1)
bae.trackLyrics(currentTrack.url)
// if(currentTrack.lyrics.length < 1)
// bae.trackLyrics(currentTrack.url)
// root.mainPlaylist.infoView.wikiAlbum = bae.albumWiki(root.mainPlaylist.currentTrack.album,root.mainPlaylist.currentTrack.artist)
// root.mainPlaylist.infoView.wikiArtist = bae.artistWiki(root.mainPlaylist.currentTrack.artist)
......
......@@ -7,7 +7,6 @@ import org.kde.mauikit 1.0 as Maui
Maui.Page
{
id: gridPage
headBarVisible: false
// readonly property int screenSize : bae.screenGeometry("width")*bae.screenGeometry("height");
// property int hintSize : Math.sqrt(root.width*root.height)*0.3
......
......@@ -17,15 +17,16 @@ CONFIG += c++11
linux:unix:!android {
message(Building for Linux KDE)
include(kde/kde.pri)
unix:!macx: LIBS += -lMauiKit
LIBS += -lMauiKit
} else:android {
message(Building helpers for Android)
include($$PWD/3rdparty/kirigami/kirigami.pri)
include($$PWD/3rdparty/taglib.pri)
QT += androidextras webview
include($$PWD/3rdparty/taglib.pri)
include($$PWD/mauikit/mauikit.pri)
include($$PWD/android/android.pri)
include($$PWD/3rdparty/kirigami/kirigami.pri)
include($$PWD/android-openssl.pri)
DEFINES += STATIC_KIRIGAMI
......@@ -73,10 +74,6 @@ QML_IMPORT_PATH =
# Additional import path used to resolve QML modules just for Qt Quick Designer
QML_DESIGNER_IMPORT_PATH =
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
DISTFILES += \
......@@ -103,6 +100,7 @@ HEADERS += \
services/local/linking.h \
services/web/Spotify/spotify.h
include(install.pri)
#TAGLIB
......
......@@ -42,9 +42,38 @@ Kirigami.PageRow
{
id: albumsViewGrid
visible: true
topPadding: space.large
// topPadding: space.large
onAlbumCoverClicked: albumsPageRoot.albumCoverClicked(album, artist)
onAlbumCoverPressed: albumCoverPressedAndHold(album, artist)
headBarVisible: true
headBarExit: false
headBar.leftContent: Maui.ToolButton
{
id : playAllBtn
visible : headBarVisible && count > 0
anim : true
iconName : "media-playlist-play"
onClicked : playAll()
}
headBar.rightContent: [
Maui.ToolButton
{
id: appendBtn
visible: headBarVisible && count > 0
anim : true
iconName : "media-playlist-append"//"media-repeat-track-amarok"
onClicked: appendAll()
},
Maui.ToolButton
{
id: menuBtn
iconName: /*"application-menu"*/ "overflow-menu"
// onClicked: isMobile ? headerMenu.open() : headerMenu.popup()
}
]
}
......
......@@ -102,8 +102,7 @@ Maui.Page
{
id: footerBg
clip : true
implicitHeight: mainPlaylist.floatingBar ? toolBarHeight * 0.8 : toolBarHeight
height: implicitHeight
height: footBar.implicitHeight
color: darkViewBackgroundColor
radius: mainPlaylist.floatingBar ? unit * 6 : 0
border.color: mainPlaylist.floatingBar ? Qt.lighter(borderColor, 1.2) : "transparent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment