Fixes to last commit

sleepyhead/Graphs/gGraph.cpp

@@ -6,7 +6,7 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the Linux
  * distribution for more details. */
- 
+
 #include "Graphs/gGraph.h"
 
 #include <QLabel>
@@ -33,7 +33,7 @@ static bool globalsInitialized = false;
 
 // Graph constants.
 static const double zoom_hard_limit = 500.0;
- 
+
  // Must be called from a thread inside the application.
 bool InitGraphGlobals()
 {
@@ -123,7 +123,7 @@ void DestroyGraphGlobals()
 
     globalsInitialized = false;
 }
- 
+
 gGraph::gGraph(gGraphView *graphview, QString title, QString units, int height, short group)
     : m_graphview(graphview),
       m_title(title),

sleepyhead/SleepLib/schema.cpp

@@ -709,7 +709,9 @@ void ChannelList::add(QString group, Channel *chan)
         it->m_links.push_back(chan);
         //int i=0;
     } else {
-        qWarning() << "Linked channel must be defined first for" << chan->code();
+        if (chan->linkid()>0) {
+            qWarning() << "Linked channel must be defined first for" << chan->code();
+        }
     }
 }
 

sleepyhead/main.cpp

@@ -30,6 +30,7 @@
 #include "SleepLib/profiles.h"
 #include "profileselect.h"
 #include "newprofile.h"
+#include "translation.h"
 
 // Gah! I must add the real darn plugin system one day.
 #include "SleepLib/loader_plugins/prs1_loader.h"
@@ -190,86 +191,13 @@ int main(int argc, char *argv[])
     ////////////////////////////////////////////////////////////////////////////////////////////
     // Language Selection
     ////////////////////////////////////////////////////////////////////////////////////////////
-    QDialog langsel(nullptr, Qt::CustomizeWindowHint | Qt::WindowTitleHint);
-    langsel.setWindowTitle(QObject::tr("Language"));
-
-    QHBoxLayout lang_layout(&langsel);
-
-    QComboBox lang_combo(&langsel);
-    QPushButton lang_okbtn("->", &langsel);
-
-    lang_layout.addWidget(&lang_combo, 1);
-    lang_layout.addWidget(&lang_okbtn);
-
-#ifdef Q_OS_MAC
-    QString transdir = QDir::cleanPath(QCoreApplication::applicationDirPath() +
-                                       "/../Resources/Translations/");
-
-#else
-    const QString transdir = QCoreApplication::applicationDirPath() + "/Translations/";
-#endif
-
-    QDir dir(transdir);
-    qDebug() << "Scanning \"" << transdir << "\" for translations";
-    dir.setFilter(QDir::Files);
-    dir.setNameFilters(QStringList("*.qm"));
-
-    qDebug() << "Available Translations";
-    QFileInfoList list = dir.entryInfoList();
-    QString language = settings.value("Settings/Language").toString();
-
-    QString langfile, langname;
-
-    // Fake english for now..
-    lang_combo.addItem("English", "English.en_US.qm");
-
-    // Scan translation directory
-    for (int i = 0; i < list.size(); ++i) {
-        QFileInfo fi = list.at(i);
-        langname = fi.fileName().section('.', 0, 0);
-
-        lang_combo.addItem(langname, fi.fileName());
-        qDebug() << "Found Translation" << QDir::toNativeSeparators(fi.fileName());
-    }
-
-    for (int i = 0; i < lang_combo.count(); i++) {
-        langname = lang_combo.itemText(i);
-
-        if (langname == language) {
-            langfile = lang_combo.itemData(i).toString();
-            break;
-        }
-    }
-
-    if (language.isEmpty()) {
-        langsel.connect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close()));
-
-        langsel.exec();
-        langsel.disconnect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close()));
-        langname = lang_combo.currentText();
-        langfile = lang_combo.itemData(lang_combo.currentIndex()).toString();
-        settings.setValue("Settings/Language", langname);
-    }
-
-    qDebug() << "Loading " << langname << " Translation" << langfile << "from" << transdir;
-    QTranslator translator;
-
-    if (!translator.load(langfile, transdir)) {
-        qDebug() << "Could not load translation" << langfile << "reverting to english :(";
-
-    }
-
-
-    a.installTranslator(&translator);
+    initTranslations(settings);
     initializeStrings(); // Important, call this AFTER translator is installed.
-
     a.setApplicationName(STR_TR_SleepyHead);
 
-
     ////////////////////////////////////////////////////////////////////////////////////////////
     // Datafolder location Selection
     ////////////////////////////////////////////////////////////////////////////////////////////
-
     bool change_data_dir = force_data_dir;
 
     bool havefolder = false;

sleepyhead/sleepyhead.pro

@@ -12,8 +12,9 @@ greaterThan(QT_MAJOR_VERSION,4) {
     QT += webkit
 }
 
-CONFIG += rtti
 CONFIG += c++11
+CONFIG += rtti
+
 
 #static {
 #    CONFIG += static
@@ -122,7 +123,8 @@ SOURCES += \
     SleepLib/loader_plugins/prs1_loader.cpp \
     SleepLib/loader_plugins/resmed_loader.cpp \
     SleepLib/loader_plugins/somnopose_loader.cpp \
-    SleepLib/loader_plugins/zeo_loader.cpp
+    SleepLib/loader_plugins/zeo_loader.cpp \
+    translation.cpp
 
 HEADERS  += \
     common_gui.h \
@@ -174,7 +176,8 @@ HEADERS  += \
     SleepLib/loader_plugins/prs1_loader.h \
     SleepLib/loader_plugins/resmed_loader.h \
     SleepLib/loader_plugins/somnopose_loader.h \
-    SleepLib/loader_plugins/zeo_loader.h
+    SleepLib/loader_plugins/zeo_loader.h \
+    translation.h
 
 FORMS += \
     daily.ui \

sleepyhead/translation.cpp

@@ -0,0 +1,144 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * Multilingual Support files
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the Linux
+ * distribution for more details. */
+
+#include <QApplication>
+#include <QDebug>
+#include <QStringList>
+#include <QList>
+#include <QDialog>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QPushButton>
+#include <QDir>
+#include <QSettings>
+#include <QTranslator>
+
+#include "translation.h"
+
+void initTranslations(QSettings & settings) {
+
+    QStringList welcome={"Welcome", "Welkom", "Willkommen", "Bienvenue", u8"歡迎", u8"ようこそ！"};
+
+    // Add any special language names here
+    // Ordinary character sets will just use the name before the first '.' in the filename.
+    QHash<QString, QString> langNames={
+        { "cn", u8"漢語繁體字" },
+        { "es", u8"Español" },
+        { "bg", u8"български" },
+        { "fr", u8"Français" },
+    };
+    QHash<QString, QString> langFiles;
+
+#ifdef Q_OS_MAC
+    QString transdir = QDir::cleanPath(QCoreApplication::applicationDirPath() +
+                                   "/../Resources/Translations/");
+
+#else
+    const QString transdir = QCoreApplication::applicationDirPath() + "/Translations/";
+#endif
+
+    QDir dir(transdir);
+    qDebug() << "Scanning \"" << transdir << "\" for translations";
+    dir.setFilter(QDir::Files);
+    dir.setNameFilters(QStringList("*.qm"));
+
+    qDebug() << "Available Translations";
+    QFileInfoList list = dir.entryInfoList();
+    QString language = settings.value("Settings/Language").toString();
+
+    QString langfile, langname, langcode;
+
+    // Add default language (English)
+    const QString en="en";
+    langFiles[en]="";
+    langNames[en]="English";
+
+    // Scan translation directory
+    for (int i = 0; i < list.size(); ++i) {
+        QFileInfo fi = list.at(i);
+        QString name = fi.fileName().section('.', 0, 0);
+        QString code = fi.fileName().section('.', 1, 1);
+
+        if (langNames.contains(code)) {
+            name = langNames[code];
+        } else {
+            langNames[code]=name;
+        }
+
+        langFiles[code]=fi.fileName();
+
+        qDebug() << "Detected" << name << "Translation";
+    }
+
+    if (language.isEmpty() || !langNames.contains(language)) {
+        QDialog langsel(nullptr, Qt::CustomizeWindowHint | Qt::WindowTitleHint);
+        QFont font;
+        font.setPointSize(25);
+        langsel.setFont(font);
+        langsel.setWindowTitle(u8"Language / Taal / Sprache / Langue / 语言 / ... ");
+        QHBoxLayout lang_layout(&langsel);
+
+        QLabel img;
+        img.setPixmap(QPixmap(":/docs/sheep.png"));
+
+        // hard coded non translatable
+
+        QComboBox lang_combo(&langsel);
+        QPushButton lang_okbtn("->", &langsel);
+
+        QVBoxLayout layout1;
+        QVBoxLayout layout2;
+
+        lang_layout.addLayout(&layout1);
+        lang_layout.addLayout(&layout2);
+
+        layout1.addWidget(&img);
+
+        for (int i=0;i<welcome.size(); i++) {
+            QLabel *welcomeLabel = new QLabel(welcome[i]);
+            layout2.addWidget(welcomeLabel);
+        }
+
+        QWidget spacer;
+        layout2.addWidget(&spacer,1);
+        layout2.addWidget(&lang_combo, 1);
+        layout2.addWidget(&lang_okbtn);
+
+        for (auto it = langNames.begin(); it != langNames.end(); ++it) {
+            const QString & code = it.key();
+            const QString & name = it.value();
+            lang_combo.addItem(name, code);
+        }
+
+
+        langsel.connect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close()));
+
+        langsel.exec();
+        langsel.disconnect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close()));
+        langname = lang_combo.currentText();
+        language = lang_combo.itemData(lang_combo.currentIndex()).toString();
+        settings.setValue("Settings/Language", language);
+    }
+
+    langname=langNames[language];
+    langfile=langFiles[language];
+
+    qDebug() << "Loading " << langname << " Translation" << langfile << "from" << transdir;
+    QTranslator * translator = new QTranslator();
+
+    if (!translator->load(langfile, transdir)) {
+        qDebug() << "Could not load translation" << langfile << "reverting to english :(";
+
+    }
+
+    qApp->installTranslator(translator);
+}

sleepyhead/translation.h

@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * Multilingual Support header
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the Linux
+ * distribution for more details. */
+
+#ifndef TRANSLATION_H
+#define TRANSLATION_H
+
+#include <QSettings>
+
+void initTranslations(QSettings & settings);
+
+#endif // TRANSLATION_H