mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-10 01:55:19 -04: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:
defnax
parent
0f22870bbd
commit
abc33296a7
9 changed files with 190 additions and 10 deletions
|
|
@ -130,14 +130,16 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
|
|||
m_compareRole->setRole(COLUMN_CONTACT_NAME, ROLE_CONTACT_SORT);
|
||||
|
||||
m_completer = NULL;
|
||||
|
||||
ui.distantFrame->hide();
|
||||
|
||||
Settings->loadWidgetInformation(this);
|
||||
|
||||
setAttribute ( Qt::WA_DeleteOnClose, true );
|
||||
|
||||
ui.hashBox->hide();
|
||||
ui.signMessage_CB->setChecked(true) ;
|
||||
ui.signMessage_CB->setEnabled(false) ;
|
||||
ui.signMessage_CB->setChecked(true) ;
|
||||
ui.signMessage_CB->setEnabled(false) ;
|
||||
|
||||
// connect up the buttons.
|
||||
connect( ui.actionSend, SIGNAL( triggered (bool)), this, SLOT( sendMessage( ) ) );
|
||||
|
|
@ -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())) ;
|
||||
icon = QIcon(identicon);
|
||||
|
||||
ui.distantFrame->show();
|
||||
}
|
||||
break ;
|
||||
|
||||
|
|
@ -2181,11 +2185,22 @@ bool MessageComposer::maybeSave()
|
|||
void MessageComposer::toggleContacts()
|
||||
{
|
||||
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
|
||||
updatecontactsviewicons();
|
||||
}
|
||||
|
||||
void MessageComposer::on_contactsdockWidget_visibilityChanged(bool 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()
|
||||
|
|
@ -2473,3 +2488,8 @@ void MessageComposer::showTagLabels()
|
|||
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 toggleContacts();
|
||||
void buildCompleter();
|
||||
void updatecontactsviewicons();
|
||||
|
||||
|
||||
void fileNew();
|
||||
void fileOpen();
|
||||
|
|
@ -147,6 +149,8 @@ private slots:
|
|||
void tagAboutToShow();
|
||||
void tagSet(int tagId, bool set);
|
||||
void tagRemoveAll();
|
||||
|
||||
void on_closeInfoFrameButton_clicked();
|
||||
|
||||
private:
|
||||
static QString buildReplyHeader(const MessageInfo &msgInfo);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>892</width>
|
||||
<width>814</width>
|
||||
<height>682</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -646,7 +646,7 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<item row="7" column="0">
|
||||
<widget class="MimeTextEdit" name="msgText">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
|
||||
|
|
@ -789,6 +789,148 @@
|
|||
</item>
|
||||
</layout>
|
||||
</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>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget_1">
|
||||
|
|
@ -868,8 +1010,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>892</width>
|
||||
<height>25</height>
|
||||
<width>814</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue