changed the default identity icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7133 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/Identity/IdDialog.ui

@@ -19,8 +19,13 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_4">
+  <layout class="QGridLayout" name="gridLayout_2">
-   <item>
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="leftLayout">
        <property name="bottomMargin">
         <number>6</number>
@@ -55,7 +60,7 @@
              <string/>
             </property>
             <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/identity/user-identity_32.png</pixmap>
+             <pixmap resource="../images.qrc">:/images/identity/identities_32.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -105,7 +110,7 @@
             </property>
             <property name="icon">
              <iconset resource="../images.qrc">
-            <normaloff>:/images/identity/list-add-user_32.png</normaloff>:/images/identity/list-add-user_32.png</iconset>
+              <normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -147,6 +152,12 @@
        </item>
        <item>
         <widget class="RSTreeWidget" name="treeWidget_IdList">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="sortingEnabled">
           <bool>true</bool>
          </property>
@@ -168,8 +179,8 @@
         </widget>
        </item>
       </layout>
-   </item>
+     </widget>
-   <item>
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="rightLayout">
        <item>
         <widget class="QFrame" name="toolBarFrame">
@@ -193,7 +204,7 @@
             </property>
             <property name="icon">
              <iconset resource="../images.qrc">
-            <normaloff>:/images/identity/list-remove-user_32.png</normaloff>:/images/identity/list-remove-user_32.png</iconset>
+              <normaloff>:/images/identity/identity_delete_32.png</normaloff>:/images/identity/identity_delete_32.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -213,7 +224,7 @@
             </property>
             <property name="icon">
              <iconset resource="../images.qrc">
-            <normaloff>:/images/identity/user-properties_32.png</normaloff>:/images/identity/user-properties_32.png</iconset>
+              <normaloff>:/images/identity/identity_edit_32.png</normaloff>:/images/identity/identity_edit_32.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -622,6 +633,8 @@
         </widget>
        </item>
       </layout>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -666,6 +679,8 @@
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/Identity/IdEditDialog.cpp

@@ -40,7 +40,7 @@ IdEditDialog::IdEditDialog(QWidget *parent)
 
 	ui.setupUi(this);
 	
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/list-add-user_64.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_create_64.png"));
 	ui.headerFrame->setHeaderText(tr("Create New Identity"));
 
 	/* Setup UI helper */
@@ -140,7 +140,7 @@ void IdEditDialog::updateIdType(bool pseudo)
 void IdEditDialog::setupExistingId(std::string keyId)
 {
 	setWindowTitle(tr("Edit identity"));
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/user-properties_64.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_edit_64.png"));
 	ui.headerFrame->setHeaderText(tr("Edit identity"));
 
 	mIsNew = false;

retroshare-gui/src/gui/images.qrc

@@ -541,12 +541,12 @@
         <file>images/vote_down.png</file>
         <file>images/window_fullscreen.png</file>
         <file>images/window_nofullscreen.png</file>
-        <file>images/identity/user-identity_32.png</file>
+        <file>images/identity/identities_32.png</file>
-        <file>images/identity/list-add-user_32.png</file>
+        <file>images/identity/identity_create_32.png</file>
-        <file>images/identity/list-add-user_64.png</file>
+        <file>images/identity/identity_create_64.png</file>
-        <file>images/identity/list-remove-user_32.png</file>
+        <file>images/identity/identity_delete_32.png</file>
-        <file>images/identity/user-properties_32.png</file>
+        <file>images/identity/identity_edit_32.png</file>
-        <file>images/identity/user-properties_64.png</file>
+        <file>images/identity/identity_edit_64.png</file>
         <file>qss/chat/standard/private/info.xml</file>
         <file>qss/chat/standard/private/incoming.htm</file>
         <file>qss/chat/standard/private/outgoing.htm</file>

retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp

@@ -63,7 +63,7 @@
 #define IMAGE_WIKI              ":/images/wikibook_32.png"
 #define IMAGE_POSTED            ":/images/posted_32.png"
 #define IMAGE_GXSCHANNELS       ":/images/channels.png"
-#define IMAGE_IDENTITY          ":/images/identity/user-identity_32.png"
+#define IMAGE_IDENTITY          ":/images/identity/identities_32.png"
 #define IMAGE_CIRCLES           ":/images/user/agt_forum24.png"