From d3594d806367c03589c70ba9d7c937c18cfe2fa1 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Wed, 24 Sep 2014 20:48:16 +0000
Subject: [PATCH] improved naming and layout in Identities

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/Identity/IdDialog.cpp |  66 ++++--
 retroshare-gui/src/gui/Identity/IdDialog.ui  | 235 ++++++-------------
 2 files changed, 118 insertions(+), 183 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index ae374bdac..c6b0a4f95 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -86,6 +86,7 @@ IdDialog::IdDialog(QWidget *parent)
 //	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgHash);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgId);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName);
+	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_Type);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Reputation);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Delete);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_EditId);
@@ -106,6 +107,7 @@ IdDialog::IdDialog(QWidget *parent)
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.lineEdit_KeyId);
 //	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.lineEdit_GpgHash);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.lineEdit_GpgId);
+	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.lineEdit_Type);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.line_RatingOverall);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.line_RatingImplicit);
@@ -113,10 +115,10 @@ IdDialog::IdDialog(QWidget *parent)
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui.line_RatingPeers);
 
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_Nickname);
-	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_KeyId);
 //	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_GpgHash);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_GpgId);
+	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_Type);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.line_RatingOverall);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui.line_RatingImplicit);
@@ -148,10 +150,10 @@ IdDialog::IdDialog(QWidget *parent)
 
 	/* Add filter types */
 	ui.filterComboBox->addItem(tr("All"), RSID_FILTER_ALL);
-	ui.filterComboBox->addItem(tr("Yourself"), RSID_FILTER_YOURSELF);
-	ui.filterComboBox->addItem(tr("Friends / Friends of Friends"), RSID_FILTER_FRIENDS);
-	ui.filterComboBox->addItem(tr("Others"), RSID_FILTER_OTHERS);
-	ui.filterComboBox->addItem(tr("Pseudonyms"), RSID_FILTER_PSEUDONYMS);
+	ui.filterComboBox->addItem(tr("Owned by you"), RSID_FILTER_YOURSELF);
+	ui.filterComboBox->addItem(tr("Owned by friend nodes / friends of friends"), RSID_FILTER_FRIENDS);
+	ui.filterComboBox->addItem(tr("Owned by distant nodes"), RSID_FILTER_OTHERS);
+	ui.filterComboBox->addItem(tr("Anonymous"), RSID_FILTER_PSEUDONYMS);
 	ui.filterComboBox->setCurrentIndex(0);
 
 	/* Add filter actions */
@@ -541,32 +543,50 @@ void IdDialog::insertIdDetails(uint32_t token)
 
 	bool isOwnId = (data.mPgpKnown && (data.mPgpId == ownPgpId)) || (data.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN);
 
-	if (isOwnId)
-	{
-		ui.radioButton_IdYourself->setChecked(true);
-	}
+	if(isOwnId)
+		if (data.mPgpKnown)
+			ui.lineEdit_Type->setText(tr("Identity owned by you, linked to your Retroshare node")) ;
+		else
+			ui.lineEdit_Type->setText(tr("Anonymous identity, owned by you")) ;
 	else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
 	{
 		if (data.mPgpKnown)
-		{
 			if (rsPeers->isGPGAccepted(data.mPgpId))
-			{
-				ui.radioButton_IdFriend->setChecked(true);
-			}
+				ui.lineEdit_Type->setText(tr("Owned by a friend Retroshare node")) ;
 			else
-			{
-				ui.radioButton_IdFOF->setChecked(true);
-			}
-		}
+				ui.lineEdit_Type->setText(tr("Owned by 2-hops Retroshare node")) ;
 		else
-		{
-			ui.radioButton_IdOther->setChecked(true);
-		}
+			ui.lineEdit_Type->setText(tr("Owned by unknown Retroshare node")) ;
 	}
 	else
-	{
-		ui.radioButton_IdPseudo->setChecked(true);
-	}
+		ui.lineEdit_Type->setText(tr("Anonymous identity")) ;
+
+//	if (isOwnId)
+//	{
+//		ui.radioButton_IdYourself->setChecked(true);
+//	}
+//	else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
+//	{
+//		if (data.mPgpKnown)
+//		{
+//			if (rsPeers->isGPGAccepted(data.mPgpId))
+//			{
+//				ui.radioButton_IdFriend->setChecked(true);
+//			}
+//			else
+//			{
+//				ui.radioButton_IdFOF->setChecked(true);
+//			}
+//		}
+//		else
+//		{
+//			ui.radioButton_IdOther->setChecked(true);
+//		}
+//	}
+//	else
+//	{
+//		ui.radioButton_IdPseudo->setChecked(true);
+//	}
 
 	if (isOwnId)
 	{
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 2150349cc..0b6aa16fa 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -263,7 +263,7 @@
          </column>
          <column>
           <property name="text">
-           <string>Linked to Retroshare node...</string>
+           <string>Owned by node...</string>
           </property>
          </column>
         </widget>
@@ -291,170 +291,19 @@
           <property name="margin">
            <number>6</number>
           </property>
-          <item row="0" column="1">
-           <widget class="QGroupBox" name="groupBox">
-            <property name="title">
-             <string>Identity Type</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_3">
-             <property name="margin">
-              <number>9</number>
-             </property>
-             <item>
-              <widget class="QRadioButton" name="radioButton_IdYourself">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="text">
-                <string>Yourself</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButton_IdFriend">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="text">
-                <string>Friend</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButton_IdFOF">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="text">
-                <string>Friend of Friend</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButton_IdOther">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="text">
-                <string>Other</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="Line" name="line_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButton_IdPseudo">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="mouseTracking">
-                <bool>false</bool>
-               </property>
-               <property name="text">
-                <string>Pseudonym</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="autoExclusive">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
           <item row="0" column="0">
            <layout class="QGridLayout" name="gridLayout">
             <property name="margin">
              <number>6</number>
             </property>
-            <item row="2" column="0">
+            <item row="4" column="0">
              <widget class="QLabel" name="PgpId_LB">
               <property name="text">
-               <string>Owner node ID</string>
+               <string>Owner node ID :</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="lineEdit_Nickname">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="readOnly">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Identity name</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QLineEdit" name="lineEdit_KeyId">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="readOnly">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>Identity ID</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="PgpName_LB">
-              <property name="text">
-               <string>Owner node name</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QLineEdit" name="lineEdit_GpgName">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="readOnly">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QLineEdit" name="lineEdit_GpgId">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="readOnly">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
+            <item row="6" column="1">
              <spacer name="verticalSpacer_2">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
@@ -467,6 +316,77 @@
               </property>
              </spacer>
             </item>
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="lineEdit_Nickname">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Identity name :</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLineEdit" name="lineEdit_KeyId">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Identity ID :</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="PgpName_LB">
+              <property name="text">
+               <string>Owner node name :</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QLineEdit" name="lineEdit_GpgName">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QLineEdit" name="lineEdit_GpgId">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>Type:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLineEdit" name="lineEdit_Type"/>
+            </item>
            </layout>
           </item>
          </layout>
@@ -734,11 +654,6 @@
   <tabstop>lineEdit_KeyId</tabstop>
   <tabstop>lineEdit_GpgId</tabstop>
   <tabstop>lineEdit_GpgName</tabstop>
-  <tabstop>radioButton_IdYourself</tabstop>
-  <tabstop>radioButton_IdFriend</tabstop>
-  <tabstop>radioButton_IdFOF</tabstop>
-  <tabstop>radioButton_IdOther</tabstop>
-  <tabstop>radioButton_IdPseudo</tabstop>
   <tabstop>line_RatingOverall</tabstop>
   <tabstop>line_RatingImplicit</tabstop>
   <tabstop>line_RatingOwn</tabstop>