From 211d20603895a59d778b141da4d4bb61977e4ce1 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 2 Sep 2013 19:20:47 +0000 Subject: [PATCH] Changed some icons for the Identity Dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6676 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/Identity/IdDialog.cpp | 22 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 100 +++++- .../src/gui/Identity/IdEditDialog.cpp | 3 + .../src/gui/Identity/IdEditDialog.ui | 286 ++++++++++-------- retroshare-gui/src/gui/images.qrc | 8 +- retroshare-gui/src/gui/images/edit_24.png | Bin 0 -> 826 bytes .../gui/images/identity/list-add-user_22.png | Bin 0 -> 1203 bytes .../gui/images/identity/list-add-user_32.png | Bin 0 -> 1715 bytes .../gui/images/identity/list-add-user_64.png | Bin 0 -> 4468 bytes .../images/identity/list-remove-user_22.png | Bin 0 -> 1058 bytes .../images/identity/list-remove-user_32.png | Bin 0 -> 1661 bytes .../identity/preferences-desktop-user.png | Bin 0 -> 2032 bytes .../gui/images/identity/user-identity_32.png | Bin 0 -> 1356 bytes .../images/identity/user-properties_32.png | Bin 0 -> 2078 bytes .../src/gui/unfinished/ApplicationWindow.cpp | 4 +- 15 files changed, 270 insertions(+), 153 deletions(-) create mode 100644 retroshare-gui/src/gui/images/edit_24.png create mode 100644 retroshare-gui/src/gui/images/identity/list-add-user_22.png create mode 100644 retroshare-gui/src/gui/images/identity/list-add-user_32.png create mode 100644 retroshare-gui/src/gui/images/identity/list-add-user_64.png create mode 100644 retroshare-gui/src/gui/images/identity/list-remove-user_22.png create mode 100644 retroshare-gui/src/gui/images/identity/list-remove-user_32.png create mode 100644 retroshare-gui/src/gui/images/identity/preferences-desktop-user.png create mode 100644 retroshare-gui/src/gui/images/identity/user-identity_32.png create mode 100644 retroshare-gui/src/gui/images/identity/user-properties_32.png diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 541615d9e..dc8f049ba 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -79,9 +79,9 @@ 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.pushButton_Reputation); - mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.pushButton_Delete); - mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.pushButton_EditId); + mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Reputation); + mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_Delete); + mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.toolButton_EditId); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOverall); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingImplicit); mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui.line_RatingOwn); @@ -111,9 +111,9 @@ IdDialog::IdDialog(QWidget *parent) mStateHelper->addClear(IDDIALOG_REPLIST, ui.treeWidget_RepList); /* 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.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.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged())); @@ -470,18 +470,18 @@ void IdDialog::insertIdDetails(uint32_t token) if (isOwnId) { - mStateHelper->setWidgetEnabled(ui.pushButton_Reputation, false); + mStateHelper->setWidgetEnabled(ui.toolButton_Reputation, false); // No Delete Ids yet! - mStateHelper->setWidgetEnabled(ui.pushButton_Delete, /*true*/ false); + mStateHelper->setWidgetEnabled(ui.toolButton_Delete, /*true*/ false); // No Editing Ids yet! - mStateHelper->setWidgetEnabled(ui.pushButton_EditId, /*true*/ false); + mStateHelper->setWidgetEnabled(ui.toolButton_EditId, /*true*/ false); } else { // No Reputation yet! - mStateHelper->setWidgetEnabled(ui.pushButton_Reputation, /*true*/ false); - mStateHelper->setWidgetEnabled(ui.pushButton_Delete, false); - mStateHelper->setWidgetEnabled(ui.pushButton_EditId, false); + mStateHelper->setWidgetEnabled(ui.toolButton_Reputation, /*true*/ false); + mStateHelper->setWidgetEnabled(ui.toolButton_Delete, false); + mStateHelper->setWidgetEnabled(ui.toolButton_EditId, false); } /* now fill in the reputation information */ diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 6767b49b0..3c09199a9 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -43,10 +43,10 @@ - :/images/groupchat.png + :/images/identity/user-identity_32.png - false + true @@ -78,10 +78,32 @@ - + + + + 0 + 0 + + + + Create new Identity + New ID + + + :/images/identity/list-add-user_32.png:/images/identity/list-add-user_32.png + + + + 24 + 24 + + + + true + @@ -150,24 +172,69 @@ 2 - + + + Delete Identity + Delete ID - - - - - - Edit ID + + + :/images/identity/list-remove-user_32.png:/images/identity/list-remove-user_32.png + + + + 24 + 24 + + + + true - + + + Edit ID + + + + :/images/identity/user-properties_32.png:/images/identity/user-properties_32.png + + + + 24 + 24 + + + + true + + + + + Edit Reputation + + + :/images/edit_24.png:/images/edit_24.png + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + true + @@ -446,14 +513,14 @@ - pushButton_NewId + toolButton_NewId todoPushButton filterComboBox filterLineEdit treeWidget_IdList - pushButton_Delete - pushButton_EditId - pushButton_Reputation + toolButton_Delete + toolButton_EditId + toolButton_Reputation lineEdit_Nickname lineEdit_KeyId lineEdit_GpgHash @@ -471,6 +538,9 @@ + + + diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index de204ae84..3de0696a0 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -39,6 +39,9 @@ IdEditDialog::IdEditDialog(QWidget *parent) mIsNew = true; ui.setupUi(this); + + ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/list-add-user_64.png")); + ui.headerFrame->setHeaderText(tr("Create New Identity")); /* Setup UI helper */ mStateHelper = new UIStateHelper(this); diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index 2a9dd713b..e16a3385c 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -7,140 +7,176 @@ 0 0 557 - 179 + 259 - + + + 0 + + + 0 + - - - QFormLayout::AllNonFixedFieldsGrow + + + QFrame::NoFrame - - - - Nickname - - - - - - - - - - Key ID - - - - - - - true - - - - - - - PGP Hash - - - - - - - true - - - - - - - PGP Id - - - - - - - true - - - - - - - PGP Name - - - - - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - PGP Associated ID - - - - - - - Pseudonym - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + QFrame::Plain + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Nickname + + + + + + + + + + Key ID + + + + + + + true + + + + + + + PGP Hash + + + + + + + true + + + + + + + PGP Id + + + + + + + true + + + + + + + PGP Name + + + + + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + PGP Associated ID + + + + + + + Pseudonym + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + lineEdit_Nickname lineEdit_KeyId diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 521f08f20..a18fb2573 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -2,6 +2,7 @@ images/add_chat24.png images/blue_lock.png + images/edit_24.png images/stock_signature_bad.png images/stock_signature_ok.png images/anonymous_128_blue.png @@ -427,7 +428,7 @@ images/typing.png images/trustsettings.png images/uploads.png - images/headerFrame.png + images/headerFrame.png images/loader/16-loader.gif images/loader/32-loader.gif images/loader/progress.gif @@ -520,6 +521,11 @@ images/vote_down.png images/window_fullscreen.png images/window_nofullscreen.png + images/identity/user-identity_32.png + images/identity/list-add-user_32.png + images/identity/list-add-user_64.png + images/identity/list-remove-user_32.png + images/identity/user-properties_32.png qss/chat/standard/private/info.xml qss/chat/standard/private/incoming.htm qss/chat/standard/private/outgoing.htm diff --git a/retroshare-gui/src/gui/images/edit_24.png b/retroshare-gui/src/gui/images/edit_24.png new file mode 100644 index 0000000000000000000000000000000000000000..1656b786f06aed2087d3a3a5193d7998bd4fe325 GIT binary patch literal 826 zcmV-A1I7G_P)Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGZFaQ7rFac$%%C-Oi02*{fSaefwW^{L9a%BKeVQFr3 zE>1;MAa*k@H7+qRNAp5A0007gNklxkwi9SLJ5>z7y_`Yo#a_c_jy4)U(!!KJzS}Kv6lgdPRSaL-${_!0zsbEo zFO#2ZtB*mLDu&N0V-S0>NB?R}u*EN57nLt>cS~KnypTbLT88tz-m85o zG1Ta%i;e2%7dxcyJzC4CMlHiR-t1M~mmQ<~-Nsz)>;28@&mOL2F{YN`EN}P7Z>UJo z_+nzH`u)lpowxUPy0}owaK?AL#pbu?D}K<^QT=s%ncb(G>$O9uVmQcxT=GRNT z*VIt`yL-0D#~Ulf(x_(mjg`Wc8+s%^YG|na-_Wo1?(A}{8mbw7X{k`^uF2w`fiC~Q zph@-BsRdHKR5SeCLV<|Gv&F%MSAU7ztHZOz=2NZkN=b}VKe4Ic53un1(~vIl=Ew~0 z^;9doKtZr&&FtM*j!ygEQ(^jR?*!%pR4cqdhBw#d1z$Qe`Ty=k{{K5mjh3jYN^(&x z+y!}gd1v;fKV3H?=u>f$4)xMG%!R^2e6yt`_|Cc8DacXH)i8rtS((+P#QCQJ`TRgE z2*jYGR|E-z_(D)QkQzQ929^EXK+Flmph|`nh(R?ON>vFG5CdXuAT|eLYaq4(Vp}K; zVp~DwKn0rt5bFT3IuI)Yu`CcvKph0K7-S*HG8T|U0F-#+4|MyroB#j-07*qoM6N<$ Ef&*iLJpcdz literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/images/identity/list-add-user_22.png b/retroshare-gui/src/gui/images/identity/list-add-user_22.png new file mode 100644 index 0000000000000000000000000000000000000000..6012f0bc2143221d0b23fd9b6b46922c8d66660a GIT binary patch literal 1203 zcmV;k1WfyhP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L011Qu011Qvs^VjL00007bV*G`2iO7` z2_q9wu5zaU00c8hL_t(|+MShYY!qb}$N%q~dvtfZ+ikl&kRIDwdI&9~6bc^ILX{Xi zVuYq1U`VJWe$W^aH6}$9Q#?MP(GNllrhJgY7)+Xorji=LU_^;*O?qshcemYZw!7Qe zotf7+Z6YQu6#9GepXZ(V@XM2V=iqS%3X7`A!}aUewLadsL9*u1p&R}P?h=CA@Z_US zHJeH^zjE768=Wo}EEx_=hU49reWNdYefnGoE3oXuRaG0apQy|GHOp=;7exV1cQ!l) zg~)L^$}&XSaMeF|Qi%j`Cpav_&bq<_873hw$K%0#T1Pk(#?15-LbEfl%jBV_8p|HR z3JA+zG&XH%sD-zp8j$Un3e3W0w}I$sTeiqGAwU zgpo?3qPiNs!BGo>cuHMgAC4T3VFMl2$pFOW9 z73j$b=zMG;dLo38@#z!3zkiQWN<|iK1@Tf&_gwE(q7i6`C=2WHFeb*waN_*sE+!=Y z$iSJlA6n*Kz4%<>;#l|lcP;MzrSA`aFhx_U3QbKwi3Tw^HAjE@Yxo}k^w5QU&Cl07 zZEo>4nNRt?cw^bXVfX zTAp>i*tYku%bf>k^N6xH&gII2%bm-8cI@M0XU~0iQQRDxfY&QT1u$OTci>1}?E||q?YE?0P|CuJ5Q2yj!C+t*VG@SJ zY=Kph06q<#P|WEZhC(B_5emRGZ-XOYBmDkDuZ!EZZtu#?bz5YKhb)R%j#MgzZ+<$1 znZY1N2PQEy5{0c$V-u&*e>H$qT!mY@W$$sP*LKuUose zpa?*LBnl2DF&hRX3L`}bmjp$`(2eOUYDeDpv;D0Vnd^y9xz-tcTX`4%<6md6<7(Y} Rn|1&I002ovPDHLkV1mv|Cxrk2 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/images/identity/list-add-user_32.png b/retroshare-gui/src/gui/images/identity/list-add-user_32.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa98ec06868fb23d55caeae842618f6260e997c GIT binary patch literal 1715 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/images/identity/list-remove-user_32.png b/retroshare-gui/src/gui/images/identity/list-remove-user_32.png new file mode 100644 index 0000000000000000000000000000000000000000..cfaa4e2b4a438074ee93b43e26fbceb713e223a9 GIT binary patch literal 1661 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 IM6N<$f=?*z4*&oF literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index dbbab898c..0eef22506 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -63,6 +63,8 @@ #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" + /** Constructor */ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) @@ -95,7 +97,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) IdDialog *idDialog = NULL; 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 CirclesDialog *circlesDialog = NULL;