changed to one plus button for Create ID/Circle with menu.

retroshare-gui/src/gui/Circles/CreateCircleDialog.ui

@@ -373,6 +373,16 @@
                 <property name="text">
                  <string>Public</string>
                 </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/png/network-puplic.png</normaloff>:/icons/png/network-puplic.png</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
                </widget>
               </item>
               <item row="0" column="1">
@@ -383,6 +393,16 @@
                 <property name="text">
                  <string>Private</string>
                 </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/png/person.png</normaloff>:/icons/png/person.png</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
                </widget>
               </item>
               <item row="0" column="2">
@@ -393,6 +413,16 @@
                 <property name="text">
                  <string>Only visible to members of:</string>
                 </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/png/circles.png</normaloff>:/icons/png/circles.png</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
                </widget>
               </item>
               <item row="0" column="3">
@@ -459,6 +489,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>

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

@@ -194,8 +194,6 @@ IdDialog::IdDialog(QWidget *parent) :
 	//mStateHelper->addClear(IDDIALOG_REPLIST, ui->treeWidget_RepList);
 
 	/* Connect signals */
-	connect(ui->toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity()));
-	connect(ui->toolButton_NewCircle, SIGNAL(clicked()), this, SLOT(createExternalCircle()));
 
 	connect(ui->removeIdentity, SIGNAL(triggered()), this, SLOT(removeIdentity()));
 	connect(ui->editIdentity, SIGNAL(triggered()), this, SLOT(editIdentity()));
@@ -281,6 +279,17 @@ IdDialog::IdDialog(QWidget *parent) :
 	connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
 	idTWHMenu->addAction(idTWHAction);
 	
+	QAction *CreateIDAction = new QAction(QIcon(":/icons/png/person.png"),tr("Create new Identity"), this);
+	connect(CreateIDAction, SIGNAL(triggered()), this, SLOT(addIdentity()));
+	
+	QAction *CreateCircleAction = new QAction(QIcon(":/icons/png/circles.png"),tr("Create new circle"), this);
+	connect(CreateCircleAction, SIGNAL(triggered()), this, SLOT(createExternalCircle()));
+	
+	QMenu *menu = new QMenu();
+	menu->addAction(CreateIDAction);
+	menu->addAction(CreateCircleAction);
+	ui->toolButton_New->setMenu(menu);
+	
 	/* Add filter actions */
 	QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem();
 	QString headerText = headerItem->text(RSID_COL_NICKNAME);

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

@@ -163,9 +163,9 @@
            <widget class="LineEditClear" name="filterLineEdit"/>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButton_NewId">
+           <widget class="QToolButton" name="toolButton_New">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -174,46 +174,11 @@
              <enum>Qt::NoFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Create new Identity</string>
+             <string>Create new...</string>
-            </property>
-            <property name="text">
-             <string>New ID</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>24</width>
-              <height>24</height>
-             </size>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="toolButton_NewCircle">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Create new circle</string>
-            </property>
-            <property name="text">
-             <string>New ID</string>
             </property>
             <property name="icon">
              <iconset resource="../icons.qrc">
-              <normaloff>:/icons/circles_new_128.png</normaloff>:/icons/circles_new_128.png</iconset>
+              <normaloff>:/icons/png/add.png</normaloff>:/icons/png/add.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -221,6 +186,9 @@
               <height>24</height>
              </size>
             </property>
+            <property name="popupMode">
+             <enum>QToolButton::InstantPopup</enum>
+            </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
@@ -772,6 +740,16 @@ p, li { white-space: pre-wrap; }
   </action>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>LineEditClear</class>
+   <extends>QLineEdit</extends>
+   <header location="global">gui/common/LineEditClear.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSTreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>gui/common/RSTreeWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>StyledElidedLabel</class>
    <extends>QLabel</extends>
@@ -782,16 +760,6 @@ p, li { white-space: pre-wrap; }
    <extends>QLabel</extends>
    <header>gui/common/StyledLabel.h</header>
   </customwidget>
-  <customwidget>
-   <class>RSTreeWidget</class>
-   <extends>QTreeWidget</extends>
-   <header>gui/common/RSTreeWidget.h</header>
-  </customwidget>
-  <customwidget>
-   <class>LineEditClear</class>
-   <extends>QLineEdit</extends>
-   <header location="global">gui/common/LineEditClear.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>idTreeWidget</tabstop>