Reset channel names properly on language change

sleepyhead/Graphs/gXAxis.cpp

@@ -482,6 +482,6 @@ int gXAxisPressure::minimumHeight()
 #endif
 }
 
-void gXAxisPressure::paint(QPainter &painter, gGraph &graph, const QRegion &region)
+void gXAxisPressure::paint(QPainter & /*painter*/, gGraph &/*graph*/, const QRegion &/*region*/)
 {
 }

sleepyhead/SleepLib/common.h

@@ -123,7 +123,6 @@ const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck";
 const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency";
 const QString STR_GEN_DataFolder = "DataFolder";
 
-const QString STR_PREF_ResetChannelNames = "ResetChannelNames";
 const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates";
 const QString STR_PREF_ReimportBackup = "ReimportBackup";
 const QString STR_PREF_LastCPAPPath = "LastCPAPPath";

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -2102,6 +2102,7 @@ bool PRS1Import::ParseSummaryF5V2()
 
     CPAPMode cpapmode = MODE_UNKNOWN;
     summary_duration = data[0x18] | data[0x19] << 8;
+    return true;
 }
 
 bool PRS1Import::ParseSummaryF0V6()

sleepyhead/SleepLib/schema.cpp

@@ -993,17 +993,6 @@ bool ChannelList::Load(QString filename)
     return true;
 }
 
-void ChannelList::resetStrings()
-{
-    QHash<ChannelID, Channel *>::iterator it;
-    QHash<ChannelID, Channel *>::iterator it_end = channels.end();
-    for (it = channels.begin(); it != it_end; ++it) {
-        Channel * chan = it.value();
-        chan->resetStrings();
-    }
-}
-
-
 void ChannelList::add(QString group, Channel *chan)
 {
     Q_ASSERT(chan != nullptr);

sleepyhead/SleepLib/schema.h

@@ -129,11 +129,6 @@ class Channel
     void setOrder(short order) { m_order = order; }
 
     void setShowInOverview(bool b) { m_showInOverview = b; }
-    void resetStrings() {
-        m_fullname = default_fullname;
-        m_label = default_label;
-        m_description = default_description;
-    }
 
     QString option(int i) {
         if (m_options.contains(i)) {
@@ -226,8 +221,6 @@ class ChannelList
         }
     }
 
-    void resetStrings();
-
     //! \brief Channel List indexed by integer ID
     QHash<ChannelID, Channel *> channels;
 

sleepyhead/main.cpp

@@ -224,10 +224,12 @@ int main(int argc, char *argv[])
     initializeStrings(); // Important, call this AFTER translator is installed.
     a.setApplicationName(STR_TR_SleepyHead);
 
-    if (settings.value(LangSetting, "").toString() == lastlanguage) {
-        // don't reset if they selected the same language again
-        changing_language = false;
-    }
+
+    // Do reset strings if they selected the same langauge again..
+//    if (settings.value(LangSetting, "").toString() == lastlanguage) {
+//        // don't reset if they selected the same language again
+//        changing_language = false;
+//    }
 
     ////////////////////////////////////////////////////////////////////////////////////////////
     // OpenGL Detection
@@ -402,8 +404,6 @@ retry_directory:
     PREF.init(STR_GEN_UpdateCheckFrequency, 7);    // days
     PREF.init(STR_PREF_AllowEarlyUpdates, false);
 
-    PREF.init(STR_PREF_ResetChannelNames, false);
-
     ////////////////////////////////////////////////////////////////////////////////////////////
     // Check when last checked for updates..
     ////////////////////////////////////////////////////////////////////////////////////////////
@@ -502,13 +502,7 @@ retry_directory:
     MainWindow w;
     mainwin = &w;
 
-    loadChannels();
-
-    if (changing_language) {
-        qDebug() << "Resetting Channel strings to defaults for language change";
-        schema::channel.resetStrings();
-    }
-
+    loadChannels(changing_language);
 
  //   if (check_updates) { mainwin->CheckForUpdates(); }
 

sleepyhead/mainwindow.cpp

@@ -403,7 +403,7 @@ void saveChannels()
 }
 
 
-void loadChannels()
+void loadChannels(bool changing_language)
 {
     QString filename = p_profile->Get("{DataFolder}/") + "channels.dat";
     QFile f(filename);
@@ -478,12 +478,13 @@ void loadChannels()
         chan->setDefaultColor(color);
 
         // Don't import channel descriptions if event renaming is turned off. (helps pick up new translations)
-        if (!PREF[STR_PREF_ResetChannelNames].toBool()) {
+        if (changing_language) {
+            // Nothing
+        } else {
             chan->setFullname(fullname);
             chan->setLabel(label);
             chan->setDescription(description);
         }
-        PREF[STR_PREF_ResetChannelNames]=false;
 
         chan->setLowerThreshold(lowerThreshold);
         chan->setLowerThresholdColor(lowerThresholdColor);
@@ -2573,7 +2574,6 @@ void MainWindow::on_actionChange_Language_triggered()
     if (QMessageBox::question(this,STR_MessageBox_Warning,tr("Changing the language will reset custom Event and Waveform names/labels/descriptions.")+"\n\n"+tr("Are you sure you want to do this?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
         return;
     }
-    PREF[STR_PREF_ResetChannelNames]=true;
 
     p_profile->Save();
     PREF.Save();

sleepyhead/mainwindow.h

@@ -66,7 +66,7 @@ class Daily;
 class Report;
 class Overview;
 
-void loadChannels();
+void loadChannels(bool changing_language=false);
 void saveChannels();