mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-19 11:51:34 -05:00
Added a info Frame, when adding a Distant Peer to the send list.
Added Default blue forum icons for own Forums. Changed default text color for own group & online status text color Switch icon when Contacts View is hided. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0f22870bbd
commit
abc33296a7
retroshare-gui/src/gui
@ -61,7 +61,7 @@ void SubscribeToolButton::updateUi()
|
|||||||
} else {
|
} else {
|
||||||
setPopupMode(QToolButton::DelayedPopup);
|
setPopupMode(QToolButton::DelayedPopup);
|
||||||
setMenu(NULL);
|
setMenu(NULL);
|
||||||
setIcon(QIcon());
|
setIcon(QIcon(":/images/RSS_004_32.png"));
|
||||||
setText(tr("Subscribe"));
|
setText(tr("Subscribe"));
|
||||||
|
|
||||||
#ifndef USE_MENUBUTTONPOPUP
|
#ifndef USE_MENUBUTTONPOPUP
|
||||||
|
@ -171,4 +171,9 @@ void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo,
|
|||||||
if (descriptionIt != forumData->mDescription.end()) {
|
if (descriptionIt != forumData->mDescription.end()) {
|
||||||
groupItemInfo.description = descriptionIt.value();
|
groupItemInfo.description = descriptionIt.value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IS_GROUP_ADMIN(groupInfo.mSubscribeFlags)) {
|
||||||
|
groupItemInfo.icon = QIcon(":images/konv_message2.png");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -115,6 +115,7 @@
|
|||||||
<file>images/channelsblue.png</file>
|
<file>images/channelsblue.png</file>
|
||||||
<file>images/copyrslink.png</file>
|
<file>images/copyrslink.png</file>
|
||||||
<file>images/contacts24.png</file>
|
<file>images/contacts24.png</file>
|
||||||
|
<file>images/contactsclosed24.png</file>
|
||||||
<file>images/connection.png</file>
|
<file>images/connection.png</file>
|
||||||
<file>images/contact_new.png</file>
|
<file>images/contact_new.png</file>
|
||||||
<file>images/contact_new22.png</file>
|
<file>images/contact_new22.png</file>
|
||||||
|
BIN
retroshare-gui/src/gui/images/contactsclosed24.png
Normal file
BIN
retroshare-gui/src/gui/images/contactsclosed24.png
Normal file
Binary file not shown.
After (image error) Size: 4.0 KiB |
@ -131,6 +131,8 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
|
|||||||
|
|
||||||
m_completer = NULL;
|
m_completer = NULL;
|
||||||
|
|
||||||
|
ui.distantFrame->hide();
|
||||||
|
|
||||||
Settings->loadWidgetInformation(this);
|
Settings->loadWidgetInformation(this);
|
||||||
|
|
||||||
setAttribute ( Qt::WA_DeleteOnClose, true );
|
setAttribute ( Qt::WA_DeleteOnClose, true );
|
||||||
@ -1457,6 +1459,8 @@ void MessageComposer::setRecipientToRow(int row, enumType type, destinationType
|
|||||||
|
|
||||||
name = tr("%2 <%2@%1>").arg(QString::fromStdString(gid.toStdString())).arg(QString::fromUtf8(detail.mNickname.c_str())) ;
|
name = tr("%2 <%2@%1>").arg(QString::fromStdString(gid.toStdString())).arg(QString::fromUtf8(detail.mNickname.c_str())) ;
|
||||||
icon = QIcon(identicon);
|
icon = QIcon(identicon);
|
||||||
|
|
||||||
|
ui.distantFrame->show();
|
||||||
}
|
}
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
@ -2181,11 +2185,22 @@ bool MessageComposer::maybeSave()
|
|||||||
void MessageComposer::toggleContacts()
|
void MessageComposer::toggleContacts()
|
||||||
{
|
{
|
||||||
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
|
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
|
||||||
|
updatecontactsviewicons();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MessageComposer::on_contactsdockWidget_visibilityChanged(bool visible)
|
void MessageComposer::on_contactsdockWidget_visibilityChanged(bool visible)
|
||||||
{
|
{
|
||||||
contactSidebarAction->setChecked(visible);
|
contactSidebarAction->setChecked(visible);
|
||||||
|
updatecontactsviewicons();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MessageComposer::updatecontactsviewicons()
|
||||||
|
{
|
||||||
|
if(!ui.contactsdockWidget->isVisible()){
|
||||||
|
ui.actionContactsView->setIcon(QIcon(":/images/contactsclosed24.png"));
|
||||||
|
}else{
|
||||||
|
ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MessageComposer::addImage()
|
void MessageComposer::addImage()
|
||||||
@ -2473,3 +2488,8 @@ void MessageComposer::showTagLabels()
|
|||||||
ui.tagLayout->addStretch();
|
ui.tagLayout->addStretch();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MessageComposer::on_closeInfoFrameButton_clicked()
|
||||||
|
{
|
||||||
|
ui.distantFrame->setVisible(false);
|
||||||
|
}
|
@ -93,6 +93,8 @@ private slots:
|
|||||||
void on_contactsdockWidget_visibilityChanged(bool visible);
|
void on_contactsdockWidget_visibilityChanged(bool visible);
|
||||||
void toggleContacts();
|
void toggleContacts();
|
||||||
void buildCompleter();
|
void buildCompleter();
|
||||||
|
void updatecontactsviewicons();
|
||||||
|
|
||||||
|
|
||||||
void fileNew();
|
void fileNew();
|
||||||
void fileOpen();
|
void fileOpen();
|
||||||
@ -148,6 +150,8 @@ private slots:
|
|||||||
void tagSet(int tagId, bool set);
|
void tagSet(int tagId, bool set);
|
||||||
void tagRemoveAll();
|
void tagRemoveAll();
|
||||||
|
|
||||||
|
void on_closeInfoFrameButton_clicked();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static QString buildReplyHeader(const MessageInfo &msgInfo);
|
static QString buildReplyHeader(const MessageInfo &msgInfo);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>892</width>
|
<width>814</width>
|
||||||
<height>682</height>
|
<height>682</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@ -646,7 +646,7 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="0">
|
<item row="7" column="0">
|
||||||
<widget class="MimeTextEdit" name="msgText">
|
<widget class="MimeTextEdit" name="msgText">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
|
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
|
||||||
@ -789,6 +789,148 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<widget class="QFrame" name="distantFrame">
|
||||||
|
<property name="palette">
|
||||||
|
<palette>
|
||||||
|
<active>
|
||||||
|
<colorrole role="Base">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>255</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
<colorrole role="Window">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>178</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
</active>
|
||||||
|
<inactive>
|
||||||
|
<colorrole role="Base">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>255</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
<colorrole role="Window">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>178</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
</inactive>
|
||||||
|
<disabled>
|
||||||
|
<colorrole role="Base">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>178</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
<colorrole role="Window">
|
||||||
|
<brush brushstyle="SolidPattern">
|
||||||
|
<color alpha="255">
|
||||||
|
<red>255</red>
|
||||||
|
<green>255</green>
|
||||||
|
<blue>178</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
|
</disabled>
|
||||||
|
</palette>
|
||||||
|
</property>
|
||||||
|
<property name="autoFillBackground">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true"/>
|
||||||
|
</property>
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Box</enum>
|
||||||
|
</property>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
|
<property name="margin">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="infoPixmap">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="pixmap">
|
||||||
|
<pixmap resource="../images.qrc">:/images/info16.png</pixmap>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="infoLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">Distant messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="closeInfoFrameButton">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Close</string>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">QToolButton
|
||||||
|
{
|
||||||
|
border-image: url(:/images/closenormal.png)
|
||||||
|
}
|
||||||
|
|
||||||
|
QToolButton:hover
|
||||||
|
{
|
||||||
|
border-image: url(:/images/closehover.png)
|
||||||
|
}
|
||||||
|
|
||||||
|
QToolButton:pressed {
|
||||||
|
border-image: url(:/images/closepressed.png)
|
||||||
|
}</string>
|
||||||
|
</property>
|
||||||
|
<property name="autoRaise">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="layoutWidget_1">
|
<widget class="QWidget" name="layoutWidget_1">
|
||||||
@ -868,8 +1010,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>892</width>
|
<width>814</width>
|
||||||
<height>25</height>
|
<height>21</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -585,3 +585,11 @@ QLabel#subscribersLabel{
|
|||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QFrame#distantFrame{
|
||||||
|
border: 1px solid #DCDC41;
|
||||||
|
border-radius: 6px;
|
||||||
|
background: #FFFFD7;
|
||||||
|
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ ForumsDialog, GxsForumThreadWidget
|
|||||||
GroupTreeWidget
|
GroupTreeWidget
|
||||||
{
|
{
|
||||||
qproperty-textColorCategory: rgb(79, 79, 79);
|
qproperty-textColorCategory: rgb(79, 79, 79);
|
||||||
qproperty-textColorPrivateKey: blue;
|
qproperty-textColorPrivateKey: rgb(35,91,159);
|
||||||
}
|
}
|
||||||
|
|
||||||
FriendSelectionWidget
|
FriendSelectionWidget
|
||||||
@ -156,7 +156,7 @@ FriendList
|
|||||||
qproperty-textColorStatusOffline: black;
|
qproperty-textColorStatusOffline: black;
|
||||||
qproperty-textColorStatusAway: gray;
|
qproperty-textColorStatusAway: gray;
|
||||||
qproperty-textColorStatusBusy: gray;
|
qproperty-textColorStatusBusy: gray;
|
||||||
qproperty-textColorStatusOnline: darkBlue;
|
qproperty-textColorStatusOnline: darkGreen;
|
||||||
qproperty-textColorStatusInactive: gray;
|
qproperty-textColorStatusInactive: gray;
|
||||||
qproperty-textColorGroup: rgb(123, 123, 123);
|
qproperty-textColorGroup: rgb(123, 123, 123);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user