Skip to content

Commit

Permalink
renamed app Mooshimeter->VoltFish, bumped to version 0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sigurg committed Sep 21, 2018
1 parent f420bed commit 374dbc0
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mooshimeter.pro.user
*.pro.user*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# sailfishos-mooshimeter
[SailfishOS](https://sailfishos.org/) app for the [Mooshimeter](https://moosh.im/mooshimeter/) BluetoothLE Multimeter
# VoltFish
[SailfishOS](https://sailfishos.org/) app for the [Mooshimeter](https://moosh.im/mooshimeter/) BluetoothLE Multimeter based on [pk8's mooshimeter lib](https://github.com/pk8/mooshimeter-lib).

This app is in early alpha stage, and has only been tested in my phone (Aquafish) with my meter, so expect plenty of bugs :)

Expand Down
8 changes: 4 additions & 4 deletions Mooshimeter.desktop → VoltFish.desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Application
X-Nemo-Application-Type=silica-qt5
Icon=Mooshimeter
Exec=invoker -s --type=silica-qt5 /usr/bin/Mooshimeter
Name=Mooshimeter
Icon=VoltFish
Exec=invoker -s --type=silica-qt5 /usr/bin/VoltFish
Name=VoltFish
# 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]=Mooshimeter
Name[de]=VoltFish
21 changes: 11 additions & 10 deletions Mooshimeter.pro → VoltFish.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# - translation filenames have to be changed

# The name of your application
TARGET = Mooshimeter
TARGET = VoltFish

CONFIG += sailfishapp
CONFIG += c++11
Expand All @@ -29,20 +29,21 @@ SOURCES += src/main.cpp \
src/lib/util.cc \
src/lib/writer.cc

DISTFILES += qml/Mooshimeter.qml \
DISTFILES += \
qml/cover/CoverPage.qml \
rpm/Mooshimeter.changes.in \
rpm/Mooshimeter.changes.run.in \
rpm/Mooshimeter.spec \
rpm/Mooshimeter.yaml \
rpm/VoltFish.changes.in \
rpm/VoltFish.changes.run.in \
rpm/VoltFish.spec \
rpm/VoltFish.yaml \
translations/*.ts \
Mooshimeter.desktop \
VoltFish.desktop \
qml/pages/MainPage.qml \
qml/pages/Settings.qml \
qml/cover/util.js \
qml/lib/ScreenBlank.qml \
qml/pages/About.qml \
qml/pages/Graph.qml
qml/pages/Graph.qml \
qml/VoltFish.qml

SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256

Expand All @@ -54,8 +55,8 @@ CONFIG += sailfishapp_i18n
# planning to localize your app, remember to comment out the
# following TRANSLATIONS line. And also do not forget to
# modify the localized app name in the the .desktop file.
TRANSLATIONS += translations/Mooshimeter-de.ts
TRANSLATIONS += translations/Mooshimeter-es.ts
TRANSLATIONS += translations/VoltFish-de.ts
TRANSLATIONS += translations/VoltFish-es.ts

HEADERS += \
src/qmooshimeter.h \
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
2 changes: 1 addition & 1 deletion icons/gen_icons.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

APP_NAME=Mooshimeter
APP_NAME=VoltFish
cd "$(dirname "$(readlink -f "$0")")"

for i in 86x86 108x108 128x128
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions rpm/Mooshimeter.spec → rpm/VoltFish.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Generated by: spectacle version 0.27
#

Name: Mooshimeter
Name: VoltFish

# >> macros
# << macros
Expand All @@ -12,14 +12,14 @@ Name: Mooshimeter
%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Mooshimeter
Version: 0.1
Summary: inofficial app for the Mooshimeter BluetoothLE multimeter
Version: 0.1.1
Release: 1
Group: Qt/Qt
License: LICENSE
URL: http://example.org/
Source0: %{name}-%{version}.tar.bz2
Source100: Mooshimeter.yaml
Source100: VoltFish.yaml
Requires: sailfishsilica-qt5 >= 0.10.9
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
BuildRequires: pkgconfig(Qt5Core)
Expand All @@ -28,7 +28,7 @@ BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: desktop-file-utils

%description
Short description of my Sailfish OS Application
Get readings from your Mooshimeter


%prep
Expand Down
8 changes: 4 additions & 4 deletions rpm/Mooshimeter.yaml → rpm/VoltFish.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: Mooshimeter
Summary: Mooshimeter
Version: 0.1
Name: VoltFish
Summary: inofficial app for the Mooshimeter BluetoothLE multimeter
Version: 0.1.1
Release: 1
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
Expand All @@ -12,7 +12,7 @@ License: LICENSE
Sources:
- '%{name}-%{version}.tar.bz2'
Description: |
Short description of my Sailfish OS Application
Get readings from your Mooshimeter
Configure: none
# The qtc5 builder inserts macros to allow QtCreator to have fine
# control over qmake/make execution
Expand Down
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <sailfishapp.h>
#include "qmooshimeter.h"

#define APP_VERSION "0.1"
#define APP_VERSION "0.1.1"

int main(int argc, char *argv[])
{
Expand All @@ -12,12 +12,12 @@ int main(int argc, char *argv[])

QMooshimeter mm;
ctx->setContextProperty("mooshimeter", &mm);
ctx->setContextProperty("appName", "Mooshimeter");
ctx->setContextProperty("appName", "VoltFish");
ctx->setContextProperty("appVersion", APP_VERSION);

app->setQuitOnLastWindowClosed(true);

view->setSource(SailfishApp::pathTo("/qml/Mooshimeter.qml"));
view->setSource(SailfishApp::pathTo("/qml/VoltFish.qml"));
view->showFullScreen();

return app->exec();
Expand Down
2 changes: 1 addition & 1 deletion src/qmooshimeter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ QDebug& operator<<(QDebug stream, const std::string &s) {

QMooshimeter::QMooshimeter(QObject *parent) :
QObject(parent),
settings("sie.gl", "Mooshimeter", this),
settings("VoltFish", "VoltFish", this),
mm(nullptr),
ch1_value(NAN),
ch2_value(NAN),
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 374dbc0

Please sign in to comment.