From b760f821467fb2b4eaa03d83ec2e1c0c808b6282 Mon Sep 17 00:00:00 2001
From: Jari Jarvi <t7jaja00@students.oamk.fi>
Date: Thu, 8 Jul 2010 09:48:45 +0300
Subject: [PATCH] Remote mfg is saved to settings and it is visible
 immediately in the gui. Previously mfg name was visible in
 gui only after getting update from server.

---
 src/advsettingsdlg.cpp |    1 +
 src/remote.cpp         |    1 +
 src/settingsdlg.cpp    |   14 ++++++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
index 1e7c18b..98a43b6 100644
--- a/src/advsettingsdlg.cpp
+++ b/src/advsettingsdlg.cpp
@@ -72,6 +72,7 @@ void AdvSettingsDlg::setDefaults()
 {
     settings->setValue("lircPort", 8765);
     settings->setValue("remoteName", "");
+    settings->setValue("remoteMfg", "");
     settings->setValue("lircConf", "/home/user/.config/irwi/lirc.conf");
     settings->setValue("cmd0", "VOLUP");
     settings->setValue("cmd1", "VOLDOWN");
diff --git a/src/remote.cpp b/src/remote.cpp
index 967a99c..f87c6c0 100644
--- a/src/remote.cpp
+++ b/src/remote.cpp
@@ -85,6 +85,7 @@ void Remote::saveToFile()
             + m_name;
         m_remoteNAM->get(QNetworkRequest(QUrl(url)));
         settings.setValue("remoteName", m_name);
+        settings.setValue("remoteMfg", m_mfg);
     }
 }
 
diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index e596a66..443c37b 100644
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -65,15 +65,16 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     m_layout->addLayout(m_btnLayout);
     this->setLayout(m_layout);
 
-    QString selectedRemote = settings.value("remoteName", "").toString();
-    if (selectedRemote == "") {
+    QString remoteName = settings.value("remoteName", "").toString();
+    if (remoteName == "") {
         m_remoteNameLabel->setText(tr("No remote selected"));
     } else {
         // Create remote by name and update it's info if online
-        m_remote = Remote(selectedRemote);
+        m_remote = Remote(remoteName);
         connect(&m_remote, SIGNAL(infoUpdated()),
                 this, SLOT(updateRemoteInfo()));
-        m_remoteNameLabel->setText(selectedRemote);
+        m_remoteNameLabel->setText(settings.value("remoteMfg", "").toString()
+                + " " + remoteName);
     }
     m_netConfMan = new QTM_PREPEND_NAMESPACE(
             QNetworkConfigurationManager)(this);
@@ -108,6 +109,11 @@ void SettingsDlg::showAdvSettingsDlg()
 {
     AdvSettingsDlg dlg;
     dlg.exec();
+    if (QSettings(this).value("remoteName", "").toString() == "") {
+        m_remoteNameLabel->setText(tr("No remote selected"));
+        m_ratingLabel->setText("");
+        enableRateBtns(false);
+    }
 }
 
 void SettingsDlg::showSelectRemoteDlg()
-- 
1.7.9.5