[ekiga] Use simpler dialog boxes when editing Ekiga.net and DiamondCard accounts

[Eugen Dedu <ededu src gnome org>]

commit ef302d877ad950546687e433da53fcd285686226
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Fri Jan 30 00:29:54 2015 +0100

    Use simpler dialog boxes when editing Ekiga.net and DiamondCard accounts
    
    Homogeneise also some translatable strings.

 lib/engine/components/opal/opal-account.cpp |   67 ++++++++++++++++++++-------
 lib/engine/components/opal/opal-bank.cpp    |    2 +-
 plugins/loudmouth/loudmouth-account.cpp     |    2 +-
 plugins/loudmouth/loudmouth-bank.cpp        |    8 ++--
 4 files changed, 56 insertions(+), 23 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index a392dd9..363e94c 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -648,29 +648,60 @@ Opal::Account::edit ()
   request->title (title);
   g_free (title);
 
-  request->text ("name", _("Name"), get_name (), _("Ekiga.Net Account"),
-                 Ekiga::FormVisitor::STANDARD, false, false);
-  if (get_protocol_name () != "H323")
-    request->text ("host", _("Registrar"), get_host (), _("ekiga.net"),
+  switch (type) {
+  case Opal::Account::Ekiga:
+    request->hidden ("name", get_name ());
+    request->hidden ("host", get_host ());
+    request->text ("user", _("_User"), get_aor (), _("jon"),
+                   Ekiga::FormVisitor::EKIGA_URI, false, false);
+    request->hidden ("authentication_user", get_authentication_username ());
+    request->text ("password", _("_Password"), get_password (), _("1234"),
+                   Ekiga::FormVisitor::PASSWORD, false, false);
+    request->hidden ("timeout", "3600");
+    break;
+  case Opal::Account::DiamondCard:
+    request->hidden ("name", get_name ());
+    request->hidden ("host", get_host ());
+    request->text ("user", _("_Account ID"), get_username (), _("jon"),
+                   Ekiga::FormVisitor::NUMBER, false, false);
+    request->hidden ("authentication_user", get_authentication_username ());
+    request->text ("password", _("_PIN Code"), get_password (), _("1234"),
+                   Ekiga::FormVisitor::NUMBER, false, false);
+    request->hidden ("timeout", "3600");
+    break;
+  case Opal::Account::H323:
+    request->text ("name", _("_Name"), get_name (), _("Ekiga.Net Account"),
                    Ekiga::FormVisitor::STANDARD, false, false);
-  else
-    request->text ("host", _("Gatekeeper"), get_host (), _("ekiga.net"),
+    request->text ("host", _("_Gatekeeper"), get_host (), _("ekiga.net"),
+                   Ekiga::FormVisitor::STANDARD, false, false);
+    request->text ("user", _("_User"), get_username (), _("jon"),
+                   Ekiga::FormVisitor::STANDARD, false, false);
+    request->text ("password", _("_Password"), get_password (), _("1234"),
+                   Ekiga::FormVisitor::PASSWORD, false, false);
+    request->text ("timeout", _("_Timeout"), "3600", "3600",
+                   Ekiga::FormVisitor::NUMBER, false, false);
+    break;
+  case Opal::Account::SIP:
+  default:
+    request->text ("name", _("_Name"), get_name (), _("Ekiga.Net Account"),
+                   Ekiga::FormVisitor::STANDARD, false, false);
+    request->text ("host", _("_Registrar"), get_host (), _("ekiga.net"),
+                   Ekiga::FormVisitor::STANDARD, false, false);
+    request->text ("user", _("_User"), get_username (), _("jon"),
                    Ekiga::FormVisitor::STANDARD, false, false);
-  request->text ("user", _("User"), get_username (), _("jon"),
-                 Ekiga::FormVisitor::STANDARD, false, false);
-  if (get_protocol_name () == "SIP")
     /* Translators:
      * SIP knows two usernames: The name for the client ("User") and the name
      * for the authentication procedure ("Authentication user"), aka Login
      * to make it understandable
      */
-    request->text ("authentication_user", _("Login"), get_authentication_username (), _("jon.doe"),
+    request->text ("authentication_user", _("_Login"), get_authentication_username (), _("jon.doe"),
                    Ekiga::FormVisitor::STANDARD, false, false);
-  request->text ("password", _("Password"), get_password (), _("1234"),
-                 Ekiga::FormVisitor::PASSWORD, false, false);
-  request->text ("timeout", _("Timeout"), "3600", "3600",
-                 Ekiga::FormVisitor::NUMBER, false, false);
-  request->boolean ("enabled", _("Enable Account"), is_enabled ());
+    request->text ("password", _("_Password"), get_password (), _("1234"),
+                   Ekiga::FormVisitor::PASSWORD, false, false);
+    request->text ("timeout", _("_Timeout"), "3600", "3600",
+                   Ekiga::FormVisitor::NUMBER, false, false);
+  }
+  request->boolean ("enabled", _("_Enable Account"), is_enabled ());
 
   Ekiga::Account::questions (request);
 }
@@ -688,7 +719,9 @@ Opal::Account::on_edit_form_submitted (bool submitted,
   std::string new_host = result.text ("host");
   std::string new_user = result.text ("user");
   std::string new_authentication_user;
-  if (get_protocol_name () == "SIP")
+  if (type == Account::Ekiga || type == Account::DiamondCard)
+    new_authentication_user = new_user;
+  else if (get_protocol_name () == "SIP")
     new_authentication_user = result.text ("authentication_user");
   if (new_authentication_user.empty ())
     new_authentication_user = new_user;
@@ -723,7 +756,7 @@ Opal::Account::on_edit_form_submitted (bool submitted,
     else if (new_enabled) {
       // Some critical setting just changed
       if (get_host () != new_host
-         || get_username () != new_user
+          || get_username () != new_user
           || get_authentication_username () != new_authentication_user
           || get_password () != new_password
           || get_timeout () != new_timeout
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index a5656e6..5d0e1a3 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -202,7 +202,7 @@ Opal::Bank::new_account (Account::Type acc_type,
                    Ekiga::FormVisitor::NUMBER, false, false);
     break;
   }
-  request->boolean ("enabled", _("Enable account"), true);
+  request->boolean ("enabled", _("_Enable account"), true);
 
   questions (request);
 }
diff --git a/plugins/loudmouth/loudmouth-account.cpp b/plugins/loudmouth/loudmouth-account.cpp
index cf8c139..d402d30 100644
--- a/plugins/loudmouth/loudmouth-account.cpp
+++ b/plugins/loudmouth/loudmouth-account.cpp
@@ -373,7 +373,7 @@ LM::Account::edit ()
 
   }
   xmlFree (xml_str);
-  request->boolean ("enabled", _("Enable account"), enable_on_startup);
+  request->boolean ("enabled", _("_Enable account"), enable_on_startup);
 
   questions (request);
 }
diff --git a/plugins/loudmouth/loudmouth-bank.cpp b/plugins/loudmouth/loudmouth-bank.cpp
index df1c0e2..fd8d99e 100644
--- a/plugins/loudmouth/loudmouth-bank.cpp
+++ b/plugins/loudmouth/loudmouth-bank.cpp
@@ -117,12 +117,12 @@ LM::Bank::new_account ()
 
   request->instructions (_("Please fill in the following fields:"));
 
-  request->text ("name", _("Name:"), "", _("Account name, e.g. MyAccount"));
-  request->text ("user", _("User:"), "", _("The user name, e.g. jim"));
+  request->text ("name", _("_Name:"), "", _("Account name, e.g. MyAccount"));
+  request->text ("user", _("_User:"), "", _("The user name, e.g. jim"));
   request->text ("server", _("Server:"), "", _("The server, e.g. jabber.org"));
   request->text ("resource", _("Resource:"), "", _("The resource, such as home or work, allowing to 
distinguish among several terminals registered to the same account; leave empty if you do not know what it 
is"));
-  request->text ("password", _("Password:"), "", _("Password associated to the user"), 
Ekiga::FormVisitor::PASSWORD);
-  request->boolean ("enabled", _("Enable account"), true);
+  request->text ("password", _("_Password:"), "", _("Password associated to the user"), 
Ekiga::FormVisitor::PASSWORD);
+  request->boolean ("enabled", _("_Enable account"), true);
 
   questions (request);
 }