Merge lp:~unity-api-team/indicator-network/modeminfo into lp:indicator-network/14.10

[Antti Kaijanmäki]

Handle NetworkRegistration::Status::unknown better.
Improve the panel modemTechIcon handling a bit on dual sim.
Update translation tempate.

Leftover commits from previously merged MP:

https://code.launchpad.net/~unity-api-team/indicator-network/modeminfo/+merge/225160

these have been reviewed and approved here:
https://code.launchpad.net/~unity-api-team/indicator-network/modeminfo/+merge/225160/comments/558117

silo: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-001

[Antti Kaijanmäki (kaijanmaki)]

This MP offers a small visual improvement on dual-sim.

[Antti Kaijanmäki (kaijanmaki)]

rationale:
https://code.launchpad.net/~unity-api-team/indicator-network/modeminfo/+merge/225160/comments/558106

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'network/root-state.cpp'
--- network/root-state.cpp	2014-08-07 01:31:06 +0000
+++ network/root-state.cpp	2014-08-08 12:37:59 +0000
@@ -38,9 +38,8 @@
     /// @todo multiple adapters etc..
     std::string m_networkingIcon;
 
-    std::string m_modemTechIcon;
-
     std::map<Modem::Ptr, std::string> m_cellularIcons;
+    std::map<int, std::string>        m_modemTechIcons;
 
     Private() = delete;
     Private(std::shared_ptr<networking::Manager> manager, ModemManager::Ptr modemManager);
@@ -109,7 +108,7 @@
         return;
     }
 
-    m_modemTechIcon.clear();
+    m_modemTechIcons.erase(modem->index());
     m_cellularIcons[modem] = "";
 
     if (!modem->online().get()) {
@@ -145,9 +144,7 @@
         case org::ofono::Interface::NetworkRegistration::Status::roaming:
             if (modem->strength().get() != 0) {
                 m_cellularIcons[modem] = Modem::strengthIcon(modem->strength().get());
-                /// @todo need to revise this once the modems are part of the connectivity-api
-                ///       this might get us wrong results on dual-sim
-                m_modemTechIcon = Modem::technologyIcon(modem->technology().get());
+                m_modemTechIcons[modem->index()] = Modem::technologyIcon(modem->technology().get());
             } else {
                 m_cellularIcons[modem] = "gsm-3g-no-service";
 
@@ -220,10 +217,11 @@
         }
 
         if (m_networkingIcon.empty()) {
-            /// @todo fix this once modems are part of connectivity-api
             // seems we don't have an active wifi connection..
             // it must be a cellular one then.
-            m_networkingIcon = m_modemTechIcon;
+            /// @todo need to revise this once the modems are part of the connectivity-api
+            ///       this might get us wrong results on dual-sim
+            m_networkingIcon = m_modemTechIcons[1];
         }
         break;
     }

=== modified file 'network/wwan-link-item.cpp'
--- network/wwan-link-item.cpp	2014-08-07 00:19:35 +0000
+++ network/wwan-link-item.cpp	2014-08-08 12:37:59 +0000
@@ -78,19 +78,19 @@
     } else {
         m_infoItem->setSimIdentifierText("");
     }
+    /// @todo implement me.
+    m_infoItem->setConnectivityIcon("");
 
     switch(m_modem->simStatus().get()) {
     case Modem::SimStatus::missing:
         m_infoItem->setStatusIcon("no-simcard");
         m_infoItem->setStatusText(_("No SIM"));
-        m_infoItem->setConnectivityIcon("");
         m_infoItem->setLocked(false);
         m_infoItem->setRoaming(false);
         break;
     case Modem::SimStatus::error:
         m_infoItem->setStatusIcon("simcard-error");
         m_infoItem->setStatusText(_("SIM Error"));
-        m_infoItem->setConnectivityIcon("");
         m_infoItem->setLocked(false);
         m_infoItem->setRoaming(false);
         break;
@@ -98,7 +98,6 @@
     case Modem::SimStatus::permanentlyLocked:
         m_infoItem->setStatusIcon("simcard-locked");
         m_infoItem->setStatusText(_("SIM Locked"));
-        m_infoItem->setConnectivityIcon("");
         m_infoItem->setLocked(true);
         m_infoItem->setRoaming(false);
         break;
@@ -112,6 +111,10 @@
                 m_infoItem->setStatusIcon("gsm-3g-disabled");
                 m_infoItem->setStatusText(_("Unregistered"));
                 break;
+            case org::ofono::Interface::NetworkRegistration::Status::unknown:
+                m_infoItem->setStatusIcon("gsm-3g-disabled");
+                m_infoItem->setStatusText(_("Unknown"));
+                break;
             case org::ofono::Interface::NetworkRegistration::Status::denied:
                 m_infoItem->setStatusIcon("gsm-3g-disabled");
                 m_infoItem->setStatusText(_("Denied"));
@@ -132,10 +135,6 @@
                     m_infoItem->setStatusText(_("No Signal"));
                 }
                 break;
-            case org::ofono::Interface::NetworkRegistration::Status::unknown:
-                m_infoItem->setConnectivityIcon("");
-                m_infoItem->setStatusText("");
-                break;
             }
         } else {
             m_infoItem->setStatusIcon("gsm-3g-disabled");

=== modified file 'po/indicator-network.pot'
--- po/indicator-network.pot	2014-05-22 08:32:45 +0000
+++ po/indicator-network.pot	2014-08-08 12:37:59 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: indicator-network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-22 11:31+0300\n"
+"POT-Creation-Date: 2014-08-08 15:33+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,46 +17,30 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: network/quick-access-section.cpp:50
+#: network/quick-access-section.cpp:48
 msgid "Flight Mode"
 msgstr ""
 
-#: network/root-state.cpp:145
-msgid "No SIM"
-msgstr ""
-
-#: network/root-state.cpp:148
-msgid "SIM Error"
-msgstr ""
-
-#: network/root-state.cpp:153
-msgid "SIM Locked"
-msgstr ""
-
-#: network/root-state.cpp:163
-msgid "No Signal"
-msgstr ""
-
 #. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
-#: network/root-state.cpp:337
+#: network/root-state.cpp:307
 msgid "Network"
 msgstr ""
 
-#. TRANSLATORS: this string is not currently being shown on the screen. Please do not translate yet.
+#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
 #: network/sim-unlock-dialog.cpp:85
 msgid ""
 "This will be the last attempt.<br><br>If the SIM PIN is entered incorrectly, "
 "your SIM will be blocked and would require the PUK Code to unlock."
 msgstr ""
 
-#. TRANSLATORS: this string is not currently being shown on the screen. Please do not translate yet.
+#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
 #: network/sim-unlock-dialog.cpp:95
 msgid ""
 "Your SIM is now blocked.<br><br>Enter the PUK Code to unlock.<br><br>You may "
 "contact your network provider for PUK Code."
 msgstr ""
 
-#. TRANSLATORS: this string is not currently being shown on the screen. Please do not translate yet.
+#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
 #: network/sim-unlock-dialog.cpp:106
 msgid ""
 "This will be the last attempt.<br><br>If the PUK code is entered "
@@ -64,7 +48,7 @@
 "network provider."
 msgstr ""
 
-#. TRANSLATORS: this string is not currently being shown on the screen. Please do not translate yet.
+#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
 #: network/sim-unlock-dialog.cpp:117
 msgid ""
 "Your SIM is now permanently blocked and needs to be replaced.<br><br>Please "
@@ -122,31 +106,63 @@
 msgid "Wi-Fi settings…"
 msgstr ""
 
-#: network/wwan-link-item.cpp:55
-msgid "Unlock SIM…"
+#: network/wwan-link-item.cpp:87
+msgid "No SIM"
+msgstr ""
+
+#: network/wwan-link-item.cpp:93
+msgid "SIM Error"
+msgstr ""
+
+#: network/wwan-link-item.cpp:100
+msgid "SIM Locked"
+msgstr ""
+
+#: network/wwan-link-item.cpp:112
+msgid "Unregistered"
+msgstr ""
+
+#: network/wwan-link-item.cpp:116
+msgid "Unknown"
+msgstr ""
+
+#: network/wwan-link-item.cpp:120
+msgid "Denied"
+msgstr ""
+
+#: network/wwan-link-item.cpp:124
+msgid "Searching"
+msgstr ""
+
+#: network/wwan-link-item.cpp:135
+msgid "No Signal"
+msgstr ""
+
+#: network/wwan-link-item.cpp:141
+msgid "Offline"
 msgstr ""
 
 #: network/wwan-section.cpp:79
 msgid "Cellular settings…"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:60
+#: secret-agent/SecretRequest.cpp:62
 #, qt-format
 msgid "Connect to “%1”"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:65
+#: secret-agent/SecretRequest.cpp:67
 msgid "WPA"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:67
+#: secret-agent/SecretRequest.cpp:69
 msgid "WEP"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:73
+#: secret-agent/SecretRequest.cpp:75
 msgid "Connect"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:74
+#: secret-agent/SecretRequest.cpp:76
 msgid "Cancel"
 msgstr ""