diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.ui b/retroshare-gui/src/gui/Circles/CirclesDialog.ui index a829b7f57..70be6af6a 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.ui +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.ui @@ -26,6 +26,30 @@ 2 + + + + + + + :/images/user/agt_forum24.png + + + + + + + + 10 + 75 + true + + + + Circles + + + @@ -212,6 +236,8 @@ - + + + diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index 5c0908b49..ed2096006 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -49,6 +49,8 @@ CreateCircleDialog::CreateCircleDialog() //QString text = pId.empty() ? tr("Start New Thread") : tr("Post Forum Message"); //setWindowTitle(text); //Settings->loadWidgetInformation(this); + + ui.headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png")); // connect up the buttons. connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember())); @@ -120,6 +122,8 @@ void CreateCircleDialog::setupForPersonalCircle() mIsExternalCircle = false; /* hide distribution line */ + ui.headerFrame->setHeaderText(tr("Create New Personal Circle")); + ui.groupBox_title->setTitle(tr("Personal Circle Details")); ui.frame_PgpTypes->hide(); ui.frame_Distribution->hide(); @@ -134,12 +138,14 @@ void CreateCircleDialog::setupForExternalCircle() mIsExternalCircle = true; /* show distribution line */ + ui.headerFrame->setHeaderText(tr("Create New External Circle")); + ui.groupBox_title->setTitle(tr("External Circle Details")); ui.frame_PgpTypes->show(); ui.frame_Distribution->show(); ui.idChooserLabel->show(); ui.idChooser->show(); - + requestGxsIdentities(); } diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui index 189c9a549..0f3d6ae9a 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui @@ -7,276 +7,306 @@ 0 0 681 - 544 + 515 - - - - - Circle Details + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Plain - - - - - - - - 75 - true - - - - Name - - - - - - - - - - - 75 - true - - - - Creator - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - - - - 75 - true - - - - Distribution - - - - - - - Public - - - - - - - Self-Restricted - - - - - - - Restricted to: - - - - - - - - - - Qt::Horizontal - - - - 147 - 20 - - - - - - - - - - - - - - Circle Membership - - + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + - - - - Name - - - - - IDs - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 188 - - - - - - - - << Add - - - - - - - >> Remove - - - - - - - Qt::Vertical - - - - 20 - 178 - - - - - - - - - - Known Identities - - - - - - QFrame::StyledPanel + + + Circle Membership - - QFrame::Raised - - - - 0 - - - 0 - + - - - All PGP IDs - - - - - - - Known PGP IDs - + + + + Name + + + + + IDs + + - + - + + + Qt::Vertical + + + + 20 + 188 + + + + + + - Filter + << Add - + + + >> Remove + + + + + + + Qt::Vertical + + + + 20 + 178 + + + - - - - Nickname - - - - - ID - - - - - Type - - + + + Known Identities + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + + + All PGP IDs + + + + + + + Known PGP IDs + + + + + + + + + + + + Filter + + + + + + + + + + + + + Nickname + + + + + ID + + + + + Type + + + + + - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Circle Details + + + + + + + + + 75 + true + + + + Name + + + + + + + + + + + 75 + true + + + + Creator + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 0 + + + + + + 75 + true + + + + Distribution + + + + + + + Public + + + + + + + Self-Restricted + + + + + + + Restricted to: + + + + + + + + + + Qt::Horizontal + + + + 147 + 20 + + + + + + + + + + + + buttonBox + groupBox_title @@ -292,6 +322,12 @@ QComboBox
gui/gxs/GxsCircleChooser.h
+ + HeaderFrame + QFrame +
gui/common/headerframe.h
+ 1 + diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 3c09199a9..26be5a57d 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -34,6 +34,12 @@ + + 0 + 0 + + + 24 24 @@ -541,6 +547,7 @@ + diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 63a7fa38c..d211bb585 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -546,12 +546,12 @@ void MessagesDialog::messageslistWidgetCustomPopupMenu( QPoint /*point*/ ) QMenu contextMnu( this ); - QAction *action = contextMnu.addAction(tr("Open in a new window"), this, SLOT(openAsWindow())); + QAction *action = contextMnu.addAction(QIcon(":/images/view_split_top_bottom.png"), tr("Open in a new window"), this, SLOT(openAsWindow())); if (nCount != 1) { action->setDisabled(true); } - action = contextMnu.addAction(tr("Open in a new tab"), this, SLOT(openAsTab())); + action = contextMnu.addAction(QIcon(":/images/tab-dock.png"), tr("Open in a new tab"), this, SLOT(openAsTab())); if (nCount != 1) { action->setDisabled(true); } diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 593a609d6..06126e27c 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -239,6 +239,7 @@ void ConfCertDialog::load() ui.groupBox->show(); ui.groupBox_4->show(); + ui.tabWidget->show(); ui.rsid->hide(); ui.label_rsid->hide(); } else { @@ -259,6 +260,7 @@ void ConfCertDialog::load() ui.crypto_label->hide(); ui.groupBox->hide(); + ui.tabWidget->hide(); } if (detail.gpg_id == rsPeers->getGPGOwnId()) { diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 6fe58495d..3c5037e2f 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -7,7 +7,7 @@ 0 0 635 - 665 + 549 @@ -70,8 +70,24 @@ Details - - + + + + + + 96 + 96 + + + + + 96 + 96 + + + + + Peer Info @@ -153,7 +169,7 @@ - + Other info @@ -218,171 +234,192 @@ - - - - Peer Address + + + + 0 - - - - - - - - - Qt::LeftToRight - - - Local Address - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + + Peer Addresses + + + + + + Peer Address + + + + + + + + + + Qt::LeftToRight + + + Local Address + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + External Address + + + + + + + Dynamic DNS + + + + + + + + + + + + + + + + + + + + + + + + Port + + + + + + + Port + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 27 + + + + + + + + + + + + 0 + + + 65535 + + + 7812 + + + + + + + 0 + + + 65535 + + + 7812 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + - - - - External Address - - - - - - - Dynamic DNS - - - - - - - - - - - - - - - - - - - - - - - - Port - - - - - - - Port - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 27 - - - - - - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - 0 - - - 65535 - - - 7812 - - - - - + + Qt::Vertical 20 - 40 + 47 - - - - - - - Addresses list - - - - - - - Qt::DefaultContextMenu - - - QAbstractItemView::MultiSelection - - - - - - - Qt::Vertical - - - - 20 - 47 - - - - - + + + + + + + Addresses list + + + + + + Addresses list + + + + + + + Qt::DefaultContextMenu + + + QAbstractItemView::MultiSelection + + + + + - + Qt::Vertical @@ -395,22 +432,6 @@ - - - - - 96 - 96 - - - - - 96 - 96 - - - - @@ -773,7 +794,7 @@ p, li { white-space: pre-wrap; } - + @@ -787,7 +808,7 @@ p, li { white-space: pre-wrap; } - + @@ -837,6 +858,16 @@ Some services (Discovery, anonymous routing) can be switched off globally, which + + + + <html><head/><body><p align="justify">Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.</p><p align="justify">To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend's file list. </p></body></html> + + + Use as direct source, when available + + + @@ -850,7 +881,7 @@ Some services (Discovery, anonymous routing) can be switched off globally, which - + Qt::Vertical @@ -863,16 +894,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which - - - - <html><head/><body><p align="justify">Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.</p><p align="justify">To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend's file list. </p></body></html> - - - Use as direct source, when available - - - @@ -904,6 +925,10 @@ Some services (Discovery, anonymous routing) can be switched off globally, which + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index a18fb2573..213327dc9 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -1,6 +1,7 @@ images/add_chat24.png + images/inbox_22.png images/blue_lock.png images/edit_24.png images/stock_signature_bad.png diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp index 61691deae..fa39b2f3b 100644 --- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp +++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp @@ -83,7 +83,7 @@ void MessageUserNotify::setNotifyEnabled(bool enabled, bool combined, bool blink QIcon MessageUserNotify::getIcon() { - return QIcon(":/images/newmsg.png"); + return QIcon(":/images/inbox_22.png"); } QIcon MessageUserNotify::getMainIcon(bool hasNew) diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 0eef22506..6b638ed03 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -64,6 +64,7 @@ #define IMAGE_POSTED ":/images/posted_32.png" #define IMAGE_GXSCHANNELS ":/images/channels.png" #define IMAGE_IDENTITY ":/images/identity/user-identity_32.png" +#define IMAGE_CIRCLES ":/images/user/agt_forum24.png" /** Constructor */ @@ -102,7 +103,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) #ifdef RS_USE_CIRCLES CirclesDialog *circlesDialog = NULL; ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp)); + createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp)); #endif #ifdef RS_USE_PHOTOSHARE