diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb58509cdb617a28dd1f1c0dfabe4ea7119ed15..115c2fdc05f80197fae85021a2a557184f122180 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,16 @@
########################################################################
# MAIN CMAKE FILE FOR Nootka
########################################################################
-
+
cmake_minimum_required(VERSION 3.1.0)
+cmake_policy(SET CMP0071 NEW)
+
project(nootka)
set(Nootka_VERSION_MAJOR "1")
set(Nootka_VERSION_MINOR "5")
-set(Nootka_VERSION_PATCH "1-alpha2")
+set(Nootka_VERSION_PATCH "2-alpha3")
set(Nootka_VERSION "${Nootka_VERSION_MAJOR}.${Nootka_VERSION_MINOR}")
@@ -32,8 +34,6 @@ if (APPLE)
")
endif (APPLE)
-add_subdirectory(src)
-
###########################################################################
#INSTALLATION
###########################################################################
@@ -75,6 +75,8 @@ if (NOT DPKG_CMD)
unset(DPKG_CMD)
endif (NOT DPKG_CMD)
+add_subdirectory(src)
+
if(WIN32)
set(INS_PREF ".")
else(WIN32)
@@ -117,11 +119,9 @@ if(APPLE OR WIN32)
"${QT_TRANSLATIONS_DIR}/qtbase_de.qm"
"${QT_TRANSLATIONS_DIR}/qtbase_es.qm"
"${QT_TRANSLATIONS_DIR}/qtbase_fr.qm"
+ "${QT_TRANSLATIONS_DIR}/qtbase_hu.qm"
"${QT_TRANSLATIONS_DIR}/qtbase_pl.qm"
"${QT_TRANSLATIONS_DIR}/qtbase_ru.qm"
- # So far not provided by Qt
- #"${CMAKE_CURRENT_SOURCE_DIR}/lang/qtbase/qtbase_es.qm"
-
)
endif(APPLE OR WIN32)
diff --git a/README b/README
index ef0be3d6df495df9cc177231027a98f00dff6d64..120580b6a4a2f4b5f5ed36aa2278deabcd06d10c 100644
--- a/README
+++ b/README
@@ -24,13 +24,13 @@ and helps with developing skills of playing and singing notes from a score.
- c++11 capable compiler (tested with gcc >=4.9 and clang)
- cmake at least version 3.1.0 (http://cmake.org)
- Qt libraries (at least version 5.9)
- In particular: Qt5Core, Qt5Gui, Qt5Widgets, Qt5PrintSupport, Qt5Network, Qt5Qml, Qt5QtQuick, Qt5QuickControls2
+ In particular: Qt5Core, Qt5Gui, Qt5Widgets, Qt5PrintSupport, Qt5Network, Qt5Qml, Qt5QtQuick, Qt5QuickControls2
- Ogg Vorbis (http://www.xiph.org/downloads/)
both ogg and vorbis. Dll libraries are on mentioned site in vorbis-tools archive
and headers are in libogg and libvorbis archives.
Under Linux: libvorbis-dev & libogg-dev (or similar)
- FFTW libraries (http://www.fftw.org/)
- Under Linux: libfftw3-dev (or similar)
+ Under Linux: libfftw3-dev (or similar)
- under Linux and MacOs only
SoundTouch library (http://www.surina.net/soundtouch/)
(libsoundtouch and libsoundtouch-dev)
@@ -49,11 +49,11 @@ In details:
4. go into created dir (i.e. cd build)
---------------------------------------------------------------------------------------------------------
5. Launch:
- cmake ../
- or
- ccmake ../
- or
- launch graphical cmake-gui and select source and build directories there
+ cmake ../
+ or
+ ccmake ../
+ or
+ launch graphical cmake-gui and select source and build directories there
---------------------------------------------------------------------------------------------------------
if you get error about not found libfftw or libvorbis
put them manually as a cmake launch parameter:
@@ -70,7 +70,7 @@ In details:
or do the same with GUI
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- NOTE for Windows build:
+ NOTE for Windows build:
If you put unpacked archives of fftw and ogg-vorbis in the 'build' directory,
and you remove the versions numbers from their names, to have:
libogg, libvorbis, fftw and vorbis-tools directories,
@@ -84,20 +84,20 @@ In details:
- PulseAudio (requires libpulse-dev)
When those headers/libs are found - options are selected automatically
but they can be controlled by:
- -DENABLE_JACK=OFF -DENABLE_PULSEAUDIO=OFF (OFF or ON)
- ---------------------------------------------------------------------------------------------------------
+ -DENABLE_JACK=OFF -DENABLE_PULSEAUDIO=OFF (OFF or ON)
+ ---------------------------------------------------------------------------------------------------------
6. then call
make
or
make -j[number of CPU cores], f.e.: make -j4
---------------------------------------------------------------------------------------------------------
- If you want to launch Nootka without installing - in a place where it is compiled
- call
- make runinplace
- it will copy or link all necessary staff next to build executable
- then invoke
- ./src/nootka
- or just hit a file called 'nootka'
+ call
+ make runinplace
+ it will copy or link all necessary stuff next to build executable
+ then invoke
+ ./src/nootka
+ or just hit a file called 'nootka'
---------------------------------------------------------------------------------------------------------
7. make install (usually as root)
alternatively you can invoke
@@ -111,8 +111,8 @@ In details:
- make uninstall (usually as root)
+++++++++++++++++++++++++++++ Qt Creator +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- Steps from 2 to 8 can be achieved also in Qt Creator - development IDE.
- Just open CMakeLists.txt file, placed in main Nootka archive folder and follow the instructions
+ Steps from 2 to 8 can be achieved also in Qt Creator - development IDE.
+ Just open CMakeLists.txt file, placed in main Nootka archive folder and follow the instructions
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
!!!!!!!!!!!! GOOD LUCK !!!!!!!!!
@@ -137,8 +137,8 @@ has to be called before!
######################################################################################
1. Install Xcode & X11 (from MacOs install DVD or App Store). XCode SDK is not required
2. Install MacPorts
- http://www.macports.org/install.php
- and in terminal type:
+ http://www.macports.org/install.php
+ and in terminal type:
sudo port install pkgconfig cmake mercurial fftw-3-single libvorbis soundtouch
Alternatively you can use Fink or another MacOs packaging system
diff --git a/changes b/changes
index 51f7ee0d59be8159bf576ea93df8ca140bab96f5..22903b8d49d936b3e950f544e8df832e3f52ec09 100644
--- a/changes
+++ b/changes
@@ -1,4 +1,5 @@
1.5.2 alpha3
+ - score supports bowing symbols, read them from XML
- improved level creator
1.5.1 alpha2
@@ -17,6 +18,16 @@
- many improvements of user interface
- option for enable/disable animations
+1.4.5
+ Nootka says: I speak Hungarian
+ - added Hungarian translations
+ - Stylus support on touch screens (Requires Qt 5.9/Android 4.2 and above)
+ - using secure SSL connections when possible (update check, links)
+ BUGS FIXES
+ - Don't stop pitch detection when question and answer are a sound
+ ANDROID
+ - Removed memory leaks, fixed two issues causing random crashes
+
1.4.4
- German translation is complete
- support for marking more frets on the fingerboard
diff --git a/lang/nootka_hu.qm b/lang/nootka_hu.qm
index c60ec25eb9c7b8af37e49ca432cf879fc1d9c726..9cc8e9458a3d16e4634eef485eee48eb8b0b6f3d 100644
Binary files a/lang/nootka_hu.qm and b/lang/nootka_hu.qm differ
diff --git a/lang/nootka_hu.ts b/lang/nootka_hu.ts
index be33d51ccfa16d855202b50c21bce03b1f9aedda..5fcc0ff6a4963307269c8a9cdb696e849703b938 100644
--- a/lang/nootka_hu.ts
+++ b/lang/nootka_hu.ts
@@ -84,7 +84,7 @@
</message>
</context>
<context>
- <name>AudioInSettings</name>
+ <name>SoundPage</name>
<message>
<source>input device</source>
<translation>bemeneti eszköz</translation>
@@ -227,9 +227,6 @@
<source>It is rather necessary for mic input but may be switched off for instrument line-in plugged with less noise.</source>
<translation>Mikrofonhoz valószÃnűleg szükséges, de bemenethez csatlakoztatott hangszerekhez, kevés zaj esetén valószÃnűleg nem indokolt.</translation>
</message>
-</context>
-<context>
- <name>AudioOutSettings</name>
<message>
<source>play sound</source>
<translation>hang lejátszása</translation>
@@ -302,6 +299,9 @@
<source>no midi ports</source>
<translation>midi port nem található</translation>
</message>
+</context>
+<context>
+ <name>AudioOutSettings</name>
<message>
<source>no devices found</source>
<translation>eszköz nem található</translation>
@@ -316,7 +316,7 @@
</message>
</context>
<context>
- <name>Einstrument</name>
+ <name>Tinstrument</name>
<message>
<source>other instrument</source>
<translation>más hangszer</translation>
@@ -639,7 +639,7 @@
</message>
</context>
<context>
- <name>Tcanvas</name>
+ <name>TtipHandler</name>
<message>
<source>%1 was detected</source>
<comment>note name</comment>
@@ -1364,7 +1364,7 @@
</message>
</context>
<context>
- <name>TguitarSettings</name>
+ <name>InstrumentPage</name>
<message>
<source>tuning of the guitar</source>
<translation>gitár hangolása</translation>
@@ -1459,6 +1459,10 @@
<source>always show this help window</source>
<translation>mindig mutassa ezt a súgó ablakot</translation>
</message>
+ <message>
+ <source>Open online documentation</source>
+ <translation>Online dokumentáció megnyitása</translation>
+ </message>
</context>
<context>
<name>TintonationCombo</name>
@@ -1642,7 +1646,7 @@
</message>
</context>
<context>
- <name>TlevelCreatorDlg</name>
+ <name>LevelCreator</name>
<message>
<source>Questions</source>
<translation>Kérdések</translation>
@@ -1753,7 +1757,7 @@ jelek</translation>
</message>
</context>
<context>
- <name>TlevelPreview</name>
+ <name>TlevelPreviewItem</name>
<message>
<source>Level summary:</source>
<translation>Szint összegzése:</translation>
@@ -1790,14 +1794,6 @@ jelek</translation>
<source>octave does no matter</source>
<translation>számÃt az oktáv</translation>
</message>
- <message>
- <source>note range:</source>
- <translation>hangtartomány:</translation>
- </message>
- <message>
- <source>fret range:</source>
- <translation>bund tartomány:</translation>
- </message>
</context>
<context>
<name>TlevelSelector</name>
@@ -2086,7 +2082,7 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>TnotationRadioGroup</name>
+ <name>NameStyleSelector</name>
<message>
<source>Naming style</source>
<translation>Nevezéktan</translation>
@@ -2160,7 +2156,7 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>TnoteName</name>
+ <name>TnameItem</name>
<message>
<source>Sub</source>
<translation>Szub</translation>
@@ -2244,7 +2240,7 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>TnoteNameSettings</name>
+ <name>ScorePage</name>
<message>
<source>names highlight color</source>
<translation>nevek kiemelÅ‘ szÃne</translation>
@@ -2772,13 +2768,6 @@ nem Nootka fájl!</translation>
<translation>lejátszás</translation>
</message>
</context>
-<context>
- <name>TsettingsDialogBase</name>
- <message>
- <source>Open online documentation</source>
- <translation>Online dokumentáció megnyitása</translation>
- </message>
-</context>
<context>
<name>TstartExamDlg</name>
<message>
@@ -2897,7 +2886,7 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>TsupportNootka</name>
+ <name>SupportPage</name>
<message>
<source>You also can help with making Nootka better.</source>
<translation>Ön is segÃthet a Nootka fejlesztésében.</translation>
@@ -3206,7 +3195,7 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>accidSettings</name>
+ <name>AccidsPage</name>
<message>
<source># - sharps</source>
<translation># - keresztek</translation>
@@ -3272,8 +3261,8 @@ nem Nootka fájl!</translation>
<translation>teljes vizsgára csak egy kiválasztott hangnem.</translation>
</message>
<message>
- <source>Select a key signature. Appropriate accidentals used in exam will be automatically selected!</source>
- <translation>Válasszon egy hangnemet. A megfelelÅ‘ módosÃtó jelzÅ‘k automatikusan a vizsgához rendelÅ‘dnek!</translation>
+ <source>Select a key signature. Appropriate accidentals used in this level will be selected automatically.</source>
+ <translation>Válasszon egy hangnemet. A megfelelÅ‘ módosÃtó jelzÅ‘k automatikusan a vizsgához rendelÅ‘dnek.</translation>
</message>
<message>
<source>if checked, in exam user have to select a key signature, otherwise it is shown by application.</source>
@@ -3389,7 +3378,15 @@ nem Nootka fájl!</translation>
</message>
</context>
<context>
- <name>rangeSettings</name>
+ <name>RangePage</name>
+ <message>
+ <source>note range:</source>
+ <translation>hangtartomány:</translation>
+ </message>
+ <message>
+ <source>fret range:</source>
+ <translation>bund tartomány:</translation>
+ </message>
<message>
<source>adjust fret range</source>
<translation>bund távolság beállÃtása</translation>
diff --git a/packaging/appimage/make-appimage.sh b/packaging/appimage/make-appimage.sh
index dcdfc0960a164fbddb3baa2c9d8fbb48e9bb32d5..4ddb7b5d1d31eb135d2291a880668ced8167cace 100755
--- a/packaging/appimage/make-appimage.sh
+++ b/packaging/appimage/make-appimage.sh
@@ -4,7 +4,7 @@
# creates directory structure with all stuff (libraries, icons, etc.), #
# then creates AppImage #
# #
-# Copyright (C) 2011-2017 by Tomasz Bojczuk <seelook@gmail.com> #
+# Copyright (C) 2011-2018 by Tomasz Bojczuk <seelook@gmail.com> #
# #
# Arguments: #
# - source directory #
@@ -63,6 +63,7 @@ cp $TRANS_PATH/qtbase_cs.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_de.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_es.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_fr.qm AppDir/usr/share/nootka/lang
+cp $TRANS_PATH/qtbase_hu.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_pl.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_ru.qm AppDir/usr/share/nootka/lang
diff --git a/src/libs/core/nootkaconfig.h b/src/libs/core/nootkaconfig.h
index 4532e6775c3ba524c170d57eebe23c760f37d176..2db565e194a0b3eff5993fa6089aa271553c3e04 100644
--- a/src/libs/core/nootkaconfig.h
+++ b/src/libs/core/nootkaconfig.h
@@ -1,3 +1,3 @@
-#define NOOTKA_VERSION "1.5.1-alpha2"
+#define NOOTKA_VERSION "1.5.2-alpha3"
diff --git a/src/main/tnameitem.cpp b/src/main/tnameitem.cpp
index 7c27af49b1fde4b0bb153e0847a63c26a483df70..235d1c45abb5dfd5e972fa45aaef379488e30b4d 100644
--- a/src/main/tnameitem.cpp
+++ b/src/main/tnameitem.cpp
@@ -186,7 +186,7 @@ QString TnameItem::nameText() const {
QString TnameItem::octaveName(int oNr) const {
- return oNr > -4 && oNr < 5 ? shortOctaveNames[oNr + 3] : QString();
+ return oNr > -4 && oNr < 5 ? tr(shortOctaveNames[oNr + 3]) : QString();
}