Skip to content

Commit

Permalink
First working version of the app
Browse files Browse the repository at this point in the history
  • Loading branch information
Scharel Clemens committed Jan 2, 2017
1 parent b3a67c1 commit 1bfbff1
Show file tree
Hide file tree
Showing 28 changed files with 1,041 additions and 422 deletions.
25 changes: 25 additions & 0 deletions datalocation.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#ifndef DATALOCATION_H
#define DATALOCATION_H

#include <QStandardPaths>
#include <QQmlEngine>
#include <QQmlContext>
#include <QDir>

class DataLocation : public QObject
{
Q_OBJECT
Q_PROPERTY(QString path READ path)
public:
DataLocation(QObject* parent = 0) {
QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
if (!dir.exists()) {
dir.mkpath(".");
}
}
QString path() const {
return QStandardPaths::writableLocation(QStandardPaths::DataLocation);
}
};

#endif // DATALOCATION_H
5 changes: 2 additions & 3 deletions harbour-lidderbuch.desktop
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ Type=Application
X-Nemo-Application-Type=silica-qt5
Icon=harbour-lidderbuch
Exec=harbour-lidderbuch
Name=harbour-lidderbuch
Name=Lidderbuch
# translation example:
# your app name in German locale (de)
#
# Remember to comment out the following line, if you do not want to use
# a different app name in German locale (de).
Name[de]=harbour-lidderbuch

#Name[de]=Liederbuch
13 changes: 7 additions & 6 deletions harbour-lidderbuch.pro
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ TARGET = harbour-lidderbuch

CONFIG += sailfishapp

SOURCES += src/harbour-lidderbuch.cpp \
src/acelapi.cpp
SOURCES += src/harbour-lidderbuch.cpp

OTHER_FILES += qml/harbour-lidderbuch.qml \
qml/cover/CoverPage.qml \
Expand All @@ -38,9 +37,11 @@ CONFIG += sailfishapp_i18n
# modify the localized app name in the the .desktop file.
TRANSLATIONS += translations/harbour-lidderbuch-de.ts

HEADERS += \
src/acelapi.h

DISTFILES += \
qml/pages/SongList.qml
qml/pages/AboutPage.qml \
qml/pages/SettingsPage.qml \
qml/pages/SongModel.qml \
qml/pages/SongPage.qml

HEADERS += \
datalocation.h
Binary file modified icons/108x108/harbour-lidderbuch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/128x128/harbour-lidderbuch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/256x256/harbour-lidderbuch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/86x86/harbour-lidderbuch.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/86x86/harbout-lidderbuch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
441 changes: 441 additions & 0 deletions icons/acel_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 170 additions & 0 deletions icons/icon-launcher-lidderbuch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions jsonpath.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

.pragma library

function func() {

}
64 changes: 23 additions & 41 deletions qml/cover/CoverPage.qml
Original file line number Diff line number Diff line change
@@ -1,54 +1,36 @@
/*
Copyright (C) 2013 Jolla Ltd.
Contact: Thomas Perl <[email protected]>
All rights reserved.
You may use this file under the terms of BSD license as follows:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Jolla Ltd nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import QtQuick 2.0
import Sailfish.Silica 1.0

CoverBackground {
Label {
id: label
anchors.centerIn: parent
text: qsTr("My Cover")
Column {
width: parent.width
spacing: Theme.paddingLarge
Image {
source: "acel_logo.png"
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width - 2*Theme.horizontalPageMargin
fillMode: Image.PreserveAspectFit
}
Label {
text: qsTr("ACEL")
width: parent.width
horizontalAlignment: Text.AlignHCenter
}
Label {
text: qsTr("Lidderbuch")
width: parent.width
horizontalAlignment: Text.AlignHCenter
}

}

CoverActionList {
/*CoverActionList {
id: coverAction
CoverAction {
iconSource: "image://theme/icon-cover-next"
}

CoverAction {
iconSource: "image://theme/icon-cover-pause"
iconSource: "image://theme/icon-cover-search"
}
}
}*/
}


Binary file added qml/cover/acel_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 1 addition & 33 deletions qml/harbour-lidderbuch.qml
Original file line number Diff line number Diff line change
@@ -1,43 +1,11 @@
/*
Copyright (C) 2013 Jolla Ltd.
Contact: Thomas Perl <[email protected]>
All rights reserved.
You may use this file under the terms of BSD license as follows:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Jolla Ltd nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import QtQuick 2.0
import Sailfish.Silica 1.0
import "pages"

ApplicationWindow
{
initialPage: Component { SongList{ } }
initialPage: Component { FirstPage{ } }
cover: Qt.resolvedUrl("cover/CoverPage.qml")
allowedOrientations: Orientation.All
_defaultPageOrientations: Orientation.All
}


Loading

0 comments on commit 1bfbff1

Please sign in to comment.