Commit 284fe6c8 authored by Camilo Higuita's avatar Camilo Higuita

move to new name vvave close T8270

parent f40bc56c
[Global]
IconName=preferences-system-bluetooth
Comment=Tiny Music Player
Name=Babe
Name=vvave
[Event/Notify]
Name=Babe...
Name=vvave...
Comment=Connection to device failed
Icon=babe-qt
Icon=vvave
Action=Popup
linux:unix:!android
{
QT += dbus
......@@ -6,11 +5,11 @@ linux:unix:!android
QT += KNotifications
QT += KI18n
HEADERS += \ kde/notify.h \
kde/mpris2.h \
kde/kdeconnect.h
HEADERS += $$PWD/notify.h \
$$PWD/mpris2.h \
$$PWD/kdeconnect.h
SOURCES += kde/notify.cpp \
kde/mpris2.cpp \
kde/kdeconnect.cpp
SOURCES += $$PWD/notify.cpp \
$$PWD/mpris2.cpp \
$$PWD/kdeconnect.cpp
}
......@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
app.setApplicationName(BAE::App);
app.setApplicationVersion(BAE::Version);
app.setWindowIcon(QIcon("qrc:/assets/babe.png"));
app.setWindowIcon(QIcon("qrc:/assets/vvave.png"));
app.setDesktopFileName(BAE::App);
/*needed for mobile*/
......@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
}
QCommandLineParser parser;
parser.setApplicationDescription("Babe music player");
parser.setApplicationDescription("vvave music player");
const QCommandLineOption versionOption = parser.addVersionOption();
parser.process(app);
......
......@@ -144,9 +144,9 @@ Kirigami.ApplicationWindow {
property int toolBarIconSize: bae.loadSetting("ICON_SIZE", "BABE",
iconSizes.medium)
property int toolBarHeight: isMobile ? 48 : toolBarIconSize * 2
property int miniArtSize: isMobile ? 36 : 30
property int miniArtSize: 40
property int columnWidth: Kirigami.Units.gridUnit * 19
property int columnWidth: Kirigami.Units.gridUnit * 17
property int coverSize: isMobile ? Math.sqrt(
root.width * root.height) * 0.4 : columnWidth * 0.6
property int currentView: viewsIndex.tracks
......@@ -308,8 +308,7 @@ Kirigami.ApplicationWindow {
height: 10
width: parent.width
z: 999
anchors.left: parent.left
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
padding: 0
......@@ -349,11 +348,10 @@ Kirigami.ApplicationWindow {
}
GridLayout {
id: playbackControlsLayout
anchors.fill: parent
height: parent.height
width: parent.width
rowSpacing: 0
columnSpacing: 0
rows: 2
columns: 2
......@@ -369,13 +367,18 @@ Kirigami.ApplicationWindow {
Layout.rowSpan: 2
Layout.column: 1
anchors.verticalCenter: parent.top
z: progressBar.z+1
Rectangle {
visible: miniArtwork.visible
anchors.centerIn: parent
height: miniArtSize + 4
width: miniArtSize + 4
color: darkForegroundColor
color: darkDarkColor
opacity: opacityLevel
z: -999
radius: Math.min(width, height)
}
......
[Desktop Entry]
Name=vvave
Comment=Play your music collection
TryExec=vvave
Exec=vvave %U
Terminal=false
Type=Application
Categories=Qt;Audio;Music;Player;AudioVideo;
StartupNotify=true
Icon=vvave
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;audio/x-flac;audio/x-vorbis+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/flac;audio/mp4;
# Generic name with translations
GenericName=Audio Player
GenericName[be]=Аўдыёпрайгравальнік
GenericName[bg]=Аудио плеър
GenericName[bs]=Audio plejer
GenericName[ca]=Reproductor d'àudio
GenericName[ca@valencia]=Reproductor d'àudio
GenericName[cs]=Zvukový přehrávač
GenericName[csb]=Grôcz aùdio
GenericName[da]=Lydafspiller
GenericName[de]=Audio-Wiedergabe
GenericName[el]=Αναπαραγωγή ήχου
GenericName[en_GB]=Audio Player
GenericName[eo]=Sonludilo
GenericName[es]=Reproductor de audio
GenericName[et]=Helifailide mängija
GenericName[eu]=Audio erreproduzigailua
GenericName[fi]=Musiikkisoitin
GenericName[fr]=Lecteur audio
GenericName[ga]=Seinnteoir Fuaime
GenericName[gl]=Reprodutor de audio
GenericName[he]=נגן שמע
GenericName[hne]=आडियो प्लेयर
GenericName[hu]=Zenelejátszó
GenericName[is]=Tónlistarspilari
GenericName[it]=Lettore audio
GenericName[ja]=オーディオプレーヤー
GenericName[km]=កម្មវិធី​ចាក់​អូឌីយ៉ូ
GenericName[ko]=오디오 재생기
GenericName[ku]=Lêdarê Muzîkê
GenericName[lt]=Muzikos grotuvas
GenericName[lv]=Audio atskaņotājs
GenericName[mai]=आडियो प्लेयर
GenericName[ms]=Pemain Audio
GenericName[nb]=Lydavspiller
GenericName[nds]=Klangafspeler
GenericName[ne]=अडियो प्लेयर
GenericName[nl]=Audiospeler
GenericName[nn]=Musikkspelar
GenericName[pa]=ਆਡੀਓ ਪਲੇਅਰ
GenericName[pl]=Odtwarzacz dźwięku
GenericName[pt]=Leitor de Áudio
GenericName[pt_BR]=Reprodutor de áudio
GenericName[ro]=Redare audio
GenericName[ru]=Аудиопроигрыватель
GenericName[sk]=Audio prehrávač
GenericName[sl]=Predvajalnik glasbe
GenericName[sq]=Lexues audio
GenericName[sr]=Аудио плејер
GenericName[sr@ijekavian]=Аудио плејер
GenericName[sr@ijekavianlatin]=Audio plejer
GenericName[sr@latin]=Audio plejer
GenericName[sv]=Musikspelare
GenericName[th]=เครื่องเล่นเสียง
GenericName[tr]=Müzik Çalar
GenericName[ug]=ئۈن قويغۇچ
GenericName[uk]=Аудіопрогравач
GenericName[wa]=Djouweu d' son
......@@ -15,7 +15,6 @@
<file>view_models/BabeHolder.qml</file>
<file>db/Queries.js</file>
<file>utils/Help.js</file>
<file>assets/Babe.notifyrc</file>
<file>utils/BabeIcon.qml</file>
<file>view_models/BabeScrollBar.qml</file>
<file>assets/bars.gif</file>
......@@ -36,14 +35,12 @@
<file>widgets/PlaylistsView/AddPlaylistDialog.qml</file>
<file>view_models/BabeButton.qml</file>
<file>utils/Props.js</file>
<file>assets/babe.png</file>
<file>assets/face-sleeping.svg</file>
<file>assets/face-laughing.svg</file>
<file>assets/face-hug-left.svg</file>
<file>assets/face-crying.svg</file>
<file>assets/face-sleeping.png</file>
<file>assets/face-hug.png</file>
<file>org.kde.babe.desktop</file>
<file>widgets/SettingsView/SettingsView.qml</file>
<file>widgets/MyBeatView/LogginForm.qml</file>
<file>assets/music_img.jpg</file>
......@@ -67,7 +64,6 @@
<file>view_models/BabeTable/HeaderMenu.qml</file>
<file>view_models/BabeNotify.qml</file>
<file>widgets/MyBeatView/BabeitView.qml</file>
<file>widgets/PlaybackBar.qml</file>
<file>assets/banner-yellow.png</file>
<file>widgets/SettingsView/BabeConsole.qml</file>
<file>widgets/SearchView/SearchTable.qml</file>
......@@ -82,5 +78,7 @@
<file>services/local/LinkingDialog.qml</file>
<file>services/local/LinkingView.qml</file>
<file>services/local/LinkingListModel.qml</file>
<file>assets/vvave.notifyrc</file>
<file>assets/vvave.png</file>
</qresource>
</RCC>
......@@ -39,12 +39,12 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
#if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID))
const auto notifyDir = BAE::NotifyDir;
if(!BAE::fileExists(notifyDir+"/Babe.notifyrc"))
if(!BAE::fileExists(notifyDir+"/vvave.notifyrc"))
{
bDebug::Instance()->msg("The Knotify file does not exists, going to create it");
QFile knotify(":/assets/Babe.notifyrc");
QFile knotify(":/assets/vvave.notifyrc");
if(knotify.copy(notifyDir+"/Babe.notifyrc"))
if(knotify.copy(notifyDir+"/vvave.notifyrc"))
bDebug::Instance()->msg("the knotify file got copied");
}
#endif
......
......@@ -264,18 +264,18 @@ inline QString getNameFromLocation(const QString &str)
const QString MusicPath = QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
const QStringList MusicPaths = QStandardPaths::standardLocations(QStandardPaths::MusicLocation);
const QString HomePath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
const QString SettingPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)+"/babe/";
const QString ArtworkPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)+"/babe/artwork/";
const QString CollectionDBPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)+"/babe/";
const QString CachePath = BAE::isMobile() ? BAE::ArtworkPath : QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)+"/babe/";
const QString YoutubeCachePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)+"/babe/youtube/";
const QString SettingPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)+"/vvave/";
const QString ArtworkPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)+"/vvave/artwork/";
const QString CollectionDBPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)+"/vvave/";
const QString CachePath = BAE::isMobile() ? BAE::ArtworkPath : QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)+"/vvave/";
const QString YoutubeCachePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)+"/vvave/youtube/";
const QString DownloadsPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
const QStringList DownloadsPaths = QStandardPaths::standardLocations(QStandardPaths::DownloadLocation);
const QString NotifyDir = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
const QString BabePort = "8483";
const QString LinkPort = "3333";
const QString App = "Babe";
const QString App = "vvave";
const QString Version = BABE_VERSION_STR;
const QString DBName = "collection.db";
......@@ -396,7 +396,7 @@ inline void saveArt(DB &track, const QByteArray &array, const QString &path)
inline void saveSettings(const QString &key, const QVariant &value, const QString &group)
{
QSettings setting("Babe","babe");
QSettings setting("vvave","vvave");
setting.beginGroup(group);
setting.setValue(key,value);
setting.endGroup();
......@@ -405,7 +405,7 @@ inline void saveSettings(const QString &key, const QVariant &value, const QStrin
inline QVariant loadSettings(const QString &key, const QString &group, const QVariant &defaultValue)
{
QVariant variant;
QSettings setting("Babe","babe");
QSettings setting("vvave","vvave");
setting.beginGroup(group);
variant = setting.value(key,defaultValue);
setting.endGroup();
......
vvave.png

1.6 KB

This diff is collapsed.
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.1
import org.kde.kirigami 2.2 as Kirigami
import "../utils/Player.js" as Player
ApplicationWindow
{
id: root
visible: true
width: 500
height: 600
property string trackUrl : "/home/camilo/Music/Aimee-Mann-I'm With-Stupid/07-Aimee-Mann-All-Over-Now.mp3"
property var currentTrack : ({})
Button
{
anchors.centerIn: parent
width: 60
height: 48
text: "Play"
onClicked: Player.playTrack({url: trackUrl})
}
}
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