Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a tabwidget for the addresses info, to get more space, and the dialog looks little bit less.

Browse Source 
Some changes on Circle Dialog with icons and layout fixes.
Changed tray new message icon, to look or use same like from the Toaster.
Added context menu icons on MessagesDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6680 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-09-02 23:01:24 +00:00
parent e5d8860e21
commit 6dbe3f3669
10 changed files with 533 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
retroshare-gui/src/gui/Circles/CirclesDialog.ui
View File

@ -26,6 +26,30 @@
<property name="margin"> <property name="margin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<widget class="QLabel" name="titleBarPixmap">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/user/agt_forum24.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Circles</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pushButton_localCircle"> <widget class="QPushButton" name="pushButton_localCircle">
<property name="text"> <property name="text">
@ -212,6 +236,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

6
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View File

@ -50,6 +50,8 @@ CreateCircleDialog::CreateCircleDialog()
//setWindowTitle(text); //setWindowTitle(text);
//Settings->loadWidgetInformation(this); //Settings->loadWidgetInformation(this);
ui.headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png"));
// connect up the buttons. // connect up the buttons.
connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember())); connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember()));
connect(ui.removeButton, SIGNAL(clicked()), this, SLOT(removeMember())); connect(ui.removeButton, SIGNAL(clicked()), this, SLOT(removeMember()));
@ -120,6 +122,8 @@ void CreateCircleDialog::setupForPersonalCircle()
mIsExternalCircle = false; mIsExternalCircle = false;
/* hide distribution line */ /* hide distribution line */
ui.headerFrame->setHeaderText(tr("Create New Personal Circle"));
ui.groupBox_title->setTitle(tr("Personal Circle Details")); ui.groupBox_title->setTitle(tr("Personal Circle Details"));
ui.frame_PgpTypes->hide(); ui.frame_PgpTypes->hide();
ui.frame_Distribution->hide(); ui.frame_Distribution->hide();
@ -134,6 +138,8 @@ void CreateCircleDialog::setupForExternalCircle()
mIsExternalCircle = true; mIsExternalCircle = true;
/* show distribution line */ /* show distribution line */
ui.headerFrame->setHeaderText(tr("Create New External Circle"));
ui.groupBox_title->setTitle(tr("External Circle Details")); ui.groupBox_title->setTitle(tr("External Circle Details"));
ui.frame_PgpTypes->show(); ui.frame_PgpTypes->show();
ui.frame_Distribution->show(); ui.frame_Distribution->show();

248
retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
View File

@ -7,127 +7,39 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>681</width> <width>681</width>
<height>544</height> <height>515</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QGridLayout" name="gridLayout_2">
<item> <property name="margin">
<widget class="QGroupBox" name="groupBox_title"> <number>0</number>
<property name="title">
<string>Circle Details</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <property name="spacing">
<item> <number>0</number>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property> </property>
<property name="text"> <item row="0" column="0">
<string>Name</string> <widget class="HeaderFrame" name="headerFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QLineEdit" name="circleName"/> <widget class="QFrame" name="frame">
</item>
<item>
<widget class="QLabel" name="idChooserLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Creator</string>
</property>
</widget>
</item>
<item>
<widget class="GxsIdChooser" name="idChooser"/>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frame_Distribution">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing"> <item row="1" column="0">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Distribution</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Public">
<property name="text">
<string>Public</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Self">
<property name="text">
<string>Self-Restricted</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Restricted">
<property name="text">
<string>Restricted to:</string>
</property>
</widget>
</item>
<item>
<widget class="GxsCircleChooser" name="circleComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>147</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
@ -272,13 +184,131 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_title">
<property name="title">
<string>Circle Details</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="circleName"/>
</item>
<item>
<widget class="QLabel" name="idChooserLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Creator</string>
</property>
</widget>
</item>
<item>
<widget class="GxsIdChooser" name="idChooser"/>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frame_Distribution">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>9</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Distribution</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Public">
<property name="text">
<string>Public</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Self">
<property name="text">
<string>Self-Restricted</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_Restricted">
<property name="text">
<string>Restricted to:</string>
</property>
</widget>
</item>
<item>
<widget class="GxsCircleChooser" name="circleComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>147</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
<zorder>buttonBox</zorder>
<zorder>groupBox_title</zorder>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
@ -292,6 +322,12 @@
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>gui/gxs/GxsCircleChooser.h</header> <header>gui/gxs/GxsCircleChooser.h</header>
</customwidget> </customwidget>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/headerframe.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>

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

@ -34,6 +34,12 @@
<item> <item>
<widget class="QLabel" name="titleBarPixmap"> <widget class="QLabel" name="titleBarPixmap">
<property name="minimumSize"> <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -541,6 +547,7 @@
<include location="../images.qrc"/> <include location="../images.qrc"/>
<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>

4
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -546,12 +546,12 @@ void MessagesDialog::messageslistWidgetCustomPopupMenu( QPoint /*point*/ )
QMenu contextMnu( this ); 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) { if (nCount != 1) {
action->setDisabled(true); 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) { if (nCount != 1) {
action->setDisabled(true); action->setDisabled(true);
} }

2
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -239,6 +239,7 @@ void ConfCertDialog::load()
ui.groupBox->show(); ui.groupBox->show();
ui.groupBox_4->show(); ui.groupBox_4->show();
ui.tabWidget->show();
ui.rsid->hide(); ui.rsid->hide();
ui.label_rsid->hide(); ui.label_rsid->hide();
} else { } else {
@ -259,6 +260,7 @@ void ConfCertDialog::load()
ui.crypto_label->hide(); ui.crypto_label->hide();
ui.groupBox->hide(); ui.groupBox->hide();
ui.tabWidget->hide();
} }
if (detail.gpg_id == rsPeers->getGPGOwnId()) { if (detail.gpg_id == rsPeers->getGPGOwnId()) {

129
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>635</width> <width>635</width>
<height>665</height> <height>549</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -70,8 +70,24 @@
<attribute name="title"> <attribute name="title">
<string>Details</string> <string>Details</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="2"> <item row="0" column="0">
<widget class="AvatarWidget" name="avatar">
<property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Peer Info</string> <string>Peer Info</string>
@ -153,7 +169,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4"> <widget class="QGroupBox" name="groupBox_4">
<property name="title"> <property name="title">
<string>Other info</string> <string>Other info</string>
@ -218,7 +234,17 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="3" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab_5">
<attribute name="title">
<string>Peer Addresses</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Peer Address</string> <string>Peer Address</string>
@ -349,24 +375,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Addresses list</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QListWidget" name="ipAddressList">
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -382,7 +391,35 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0"> </layout>
</widget>
<widget class="QWidget" name="tab_6">
<attribute name="title">
<string>Addresses list</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Addresses list</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QListWidget" name="ipAddressList">
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -395,22 +432,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0">
<widget class="AvatarWidget" name="avatar">
<property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
@ -773,7 +794,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="2"> <item row="0" column="1">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="font"> <property name="font">
<font> <font>
@ -787,7 +808,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="plainTextEdit"> <widget class="QPlainTextEdit" name="plainTextEdit">
<property name="font"> <property name="font">
<font> <font>
@ -837,6 +858,16 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="_direct_transfer_CB">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;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.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;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. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Use as direct source, when available</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="_chat_CB"> <widget class="QCheckBox" name="_chat_CB">
<property name="enabled"> <property name="enabled">
@ -850,7 +881,7 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="3"> <item row="7" column="0" colspan="2">
<spacer name="verticalSpacer_4"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -863,16 +894,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0">
<widget class="QCheckBox" name="_direct_transfer_CB">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;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.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;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. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Use as direct source, when available</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -904,6 +925,10 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/> <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>

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

@ -1,6 +1,7 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/add_chat24.png</file> <file>images/add_chat24.png</file>
<file>images/inbox_22.png</file>
<file>images/blue_lock.png</file> <file>images/blue_lock.png</file>
<file>images/edit_24.png</file> <file>images/edit_24.png</file>
<file>images/stock_signature_bad.png</file> <file>images/stock_signature_bad.png</file>

2
retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
View File

@ -83,7 +83,7 @@ void MessageUserNotify::setNotifyEnabled(bool enabled, bool combined, bool blink
QIcon MessageUserNotify::getIcon() QIcon MessageUserNotify::getIcon()
{ {
return QIcon(":/images/newmsg.png"); return QIcon(":/images/inbox_22.png");
} }
QIcon MessageUserNotify::getMainIcon(bool hasNew) QIcon MessageUserNotify::getMainIcon(bool hasNew)

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

@ -64,6 +64,7 @@
#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" #define IMAGE_IDENTITY ":/images/identity/user-identity_32.png"
#define IMAGE_CIRCLES ":/images/user/agt_forum24.png"
/** Constructor */ /** Constructor */
@ -102,7 +103,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
#ifdef RS_USE_CIRCLES #ifdef RS_USE_CIRCLES
CirclesDialog *circlesDialog = NULL; CirclesDialog *circlesDialog = NULL;
ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages), ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp)); createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
#endif #endif
#ifdef RS_USE_PHOTOSHARE #ifdef RS_USE_PHOTOSHARE