Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-24 17:00:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed some icons for the Identity Dialog

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6676 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-09-02 19:20:47 +00:00
parent 90bac2a18e
commit 211d206038
15 changed files with 270 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -79,9 +79,9 @@ IdDialog::IdDialog(QWidget *parent)
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgHash); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgHash);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgId); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgId);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.lineEdit_GpgName);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.pushButton_Reputation); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Reputation);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.pushButton_Delete); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Delete);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.pushButton_EditId); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_EditId);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOverall); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOverall);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingImplicit); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingImplicit);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOwn); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOwn);
@ -111,9 +111,9 @@ IdDialog::IdDialog(QWidget *parent)
mStateHelper->addClear(IDDIALOG_REPLIST, ui.treeWidget_RepList); mStateHelper->addClear(IDDIALOG_REPLIST, ui.treeWidget_RepList);
/* Connect signals */ /* Connect signals */
connect(ui.pushButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity())); connect(ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity()));
connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo())); connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo()));
connect(ui.pushButton_EditId, SIGNAL(clicked()), this, SLOT(editIdentity())); connect(ui.toolButton_EditId, SIGNAL(clicked()), this, SLOT(editIdentity()));
connect( ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection())); connect( ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged())); connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged()));
@ -470,18 +470,18 @@ void IdDialog::insertIdDetails(uint32_t token)
if (isOwnId) if (isOwnId)
{ {
mStateHelper->setWidgetEnabled(ui.pushButton_Reputation, false); mStateHelper->setWidgetEnabled(ui.toolButton_Reputation, false);
// No Delete Ids yet! // No Delete Ids yet!
mStateHelper->setWidgetEnabled(ui.pushButton_Delete, /*true*/ false); mStateHelper->setWidgetEnabled(ui.toolButton_Delete, /*true*/ false);
// No Editing Ids yet! // No Editing Ids yet!
mStateHelper->setWidgetEnabled(ui.pushButton_EditId, /*true*/ false); mStateHelper->setWidgetEnabled(ui.toolButton_EditId, /*true*/ false);
} }
else else
{ {
// No Reputation yet! // No Reputation yet!
mStateHelper->setWidgetEnabled(ui.pushButton_Reputation, /*true*/ false); mStateHelper->setWidgetEnabled(ui.toolButton_Reputation, /*true*/ false);
mStateHelper->setWidgetEnabled(ui.pushButton_Delete, false); mStateHelper->setWidgetEnabled(ui.toolButton_Delete, false);
mStateHelper->setWidgetEnabled(ui.pushButton_EditId, false); mStateHelper->setWidgetEnabled(ui.toolButton_EditId, false);
} }
/* now fill in the reputation information */ /* now fill in the reputation information */

100
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -43,10 +43,10 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/groupchat.png</pixmap> <pixmap resource="../images.qrc">:/images/identity/user-identity_32.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -78,10 +78,32 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_NewId"> <widget class="QToolButton" name="toolButton_NewId">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property>
<property name="text"> <property name="text">
<string>New ID</string> <string>New ID</string>
</property> </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>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -150,24 +172,69 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="pushButton_Delete"> <widget class="QToolButton" name="toolButton_Delete">
<property name="toolTip">
<string>Delete Identity</string>
</property>
<property name="text"> <property name="text">
<string>Delete ID</string> <string>Delete ID</string>
</property> </property>
</widget> <property name="icon">
</item> <iconset resource="../images.qrc">
<item> <normaloff>:/images/identity/list-remove-user_32.png</normaloff>:/images/identity/list-remove-user_32.png</iconset>
<widget class="QPushButton" name="pushButton_EditId"> </property>
<property name="text"> <property name="iconSize">
<string>Edit ID</string> <size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_Reputation"> <widget class="QToolButton" name="toolButton_EditId">
<property name="text">
<string>Edit ID</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/identity/user-properties_32.png</normaloff>:/images/identity/user-properties_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_Reputation">
<property name="text"> <property name="text">
<string>Edit Reputation</string> <string>Edit Reputation</string>
</property> </property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_24.png</normaloff>:/images/edit_24.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -446,14 +513,14 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>pushButton_NewId</tabstop> <tabstop>toolButton_NewId</tabstop>
<tabstop>todoPushButton</tabstop> <tabstop>todoPushButton</tabstop>
<tabstop>filterComboBox</tabstop> <tabstop>filterComboBox</tabstop>
<tabstop>filterLineEdit</tabstop> <tabstop>filterLineEdit</tabstop>
<tabstop>treeWidget_IdList</tabstop> <tabstop>treeWidget_IdList</tabstop>
<tabstop>pushButton_Delete</tabstop> <tabstop>toolButton_Delete</tabstop>
<tabstop>pushButton_EditId</tabstop> <tabstop>toolButton_EditId</tabstop>
<tabstop>pushButton_Reputation</tabstop> <tabstop>toolButton_Reputation</tabstop>
<tabstop>lineEdit_Nickname</tabstop> <tabstop>lineEdit_Nickname</tabstop>
<tabstop>lineEdit_KeyId</tabstop> <tabstop>lineEdit_KeyId</tabstop>
<tabstop>lineEdit_GpgHash</tabstop> <tabstop>lineEdit_GpgHash</tabstop>
@ -471,6 +538,9 @@
</tabstops> </tabstops>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

3
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -40,6 +40,9 @@ IdEditDialog::IdEditDialog(QWidget *parent)
ui.setupUi(this); ui.setupUi(this);
ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/list-add-user_64.png"));
ui.headerFrame->setHeaderText(tr("Create New Identity"));
/* Setup UI helper */ /* Setup UI helper */
mStateHelper = new UIStateHelper(this); mStateHelper = new UIStateHelper(this);

38
retroshare-gui/src/gui/Identity/IdEditDialog.ui
View File

@ -7,9 +7,34 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>557</width> <width>557</width>
<height>179</height> <height>259</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="HeaderFrame" name="headerFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -141,6 +166,17 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>lineEdit_Nickname</tabstop> <tabstop>lineEdit_Nickname</tabstop>
<tabstop>lineEdit_KeyId</tabstop> <tabstop>lineEdit_KeyId</tabstop>

6
retroshare-gui/src/gui/images.qrc
View File

@ -2,6 +2,7 @@
<qresource prefix="/" > <qresource prefix="/" >
<file>images/add_chat24.png</file> <file>images/add_chat24.png</file>
<file>images/blue_lock.png</file> <file>images/blue_lock.png</file>
<file>images/edit_24.png</file>
<file>images/stock_signature_bad.png</file> <file>images/stock_signature_bad.png</file>
<file>images/stock_signature_ok.png</file> <file>images/stock_signature_ok.png</file>
<file>images/anonymous_128_blue.png</file> <file>images/anonymous_128_blue.png</file>
@ -520,6 +521,11 @@
<file>images/vote_down.png</file> <file>images/vote_down.png</file>
<file>images/window_fullscreen.png</file> <file>images/window_fullscreen.png</file>
<file>images/window_nofullscreen.png</file> <file>images/window_nofullscreen.png</file>
<file>images/identity/user-identity_32.png</file>
<file>images/identity/list-add-user_32.png</file>
<file>images/identity/list-add-user_64.png</file>
<file>images/identity/list-remove-user_32.png</file>
<file>images/identity/user-properties_32.png</file>
<file>qss/chat/standard/private/info.xml</file> <file>qss/chat/standard/private/info.xml</file>
<file>qss/chat/standard/private/incoming.htm</file> <file>qss/chat/standard/private/incoming.htm</file>
<file>qss/chat/standard/private/outgoing.htm</file> <file>qss/chat/standard/private/outgoing.htm</file>

BIN
retroshare-gui/src/gui/images/edit_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 826 B

BIN
retroshare-gui/src/gui/images/identity/list-add-user_22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/identity/list-add-user_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
retroshare-gui/src/gui/images/identity/list-add-user_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
retroshare-gui/src/gui/images/identity/list-remove-user_22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
retroshare-gui/src/gui/images/identity/list-remove-user_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
retroshare-gui/src/gui/images/identity/preferences-desktop-user.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
retroshare-gui/src/gui/images/identity/user-identity_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
retroshare-gui/src/gui/images/identity/user-properties_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

4
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -63,6 +63,8 @@
#define IMAGE_WIKI ":/images/wikibook_32.png" #define IMAGE_WIKI ":/images/wikibook_32.png"
#define IMAGE_POSTED ":/images/posted_32.png" #define IMAGE_POSTED ":/images/posted_32.png"
#define IMAGE_GXSCHANNELS ":/images/channels.png" #define IMAGE_GXSCHANNELS ":/images/channels.png"
#define IMAGE_IDENTITY ":/images/identity/user-identity_32.png"
/** Constructor */ /** Constructor */
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
@ -95,7 +97,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
IdDialog *idDialog = NULL; IdDialog *idDialog = NULL;
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages), ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp)); createPageAction(QIcon(IMAGE_IDENTITY), tr("Identities"), grp));
#ifdef RS_USE_CIRCLES #ifdef RS_USE_CIRCLES
CirclesDialog *circlesDialog = NULL; CirclesDialog *circlesDialog = NULL;