mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-01 10:56:15 -05:00
Added a Blockquote Button to ToolBar, changed Message Toasters Icon label as ToolButton
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2126 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
777b52753a
commit
704d89ab9a
@ -295,6 +295,7 @@
|
||||
<file>images/preview.png</file>
|
||||
<file>images/player_play.png</file>
|
||||
<file>images/quick_restart24.png</file>
|
||||
<file>images/quote_24.png</file>
|
||||
<file>images/redled.png</file>
|
||||
<file>images/greenled.png</file>
|
||||
<file>images/grayled.png</file>
|
||||
|
||||
BIN
retroshare-gui/src/gui/images/quote_24.png
Normal file
BIN
retroshare-gui/src/gui/images/quote_24.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
retroshare-gui/src/gui/images/quote_24_hover.png
Normal file
BIN
retroshare-gui/src/gui/images/quote_24_hover.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
@ -91,9 +91,11 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
|
||||
connect(ui.sizeincreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeIncrease()));
|
||||
connect(ui.sizedecreaseButton, SIGNAL (clicked()), this, SLOT (fontSizeDecrease()));
|
||||
connect(ui.blockquoteButton, SIGNAL (clicked()), this, SLOT (blockQuote()));
|
||||
connect(ui.actionQuote, SIGNAL(triggered()), this, SLOT(blockQuote()));
|
||||
connect(ui.codeButton, SIGNAL (clicked()), this, SLOT (toggleCode()));
|
||||
connect(ui.splitPostButton, SIGNAL (clicked()), this, SLOT (addPostSplitter()));
|
||||
|
||||
connect(ui.msgText, SIGNAL( checkSpellingChanged( bool ) ), this, SLOT( spellChecking( bool ) ) );
|
||||
|
||||
connect(ui.msgText, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
|
||||
this, SLOT(currentCharFormatChanged(const QTextCharFormat &)));
|
||||
@ -500,7 +502,7 @@ void ChanMsgDialog::insertForwardPastedText(std::string msg)
|
||||
while( (i=msg.find_first_of('\n',i+1)) < msg.size())
|
||||
msg.replace(i,1,std::string("\n<BR/>> ")) ;
|
||||
|
||||
ui.msgText->setHtml(QString("<HTML><blockquote ><font color=\"blue\">")+QString::fromStdString(std::string("") + msg)+"</font><br/><br/></blockquote></HTML>") ;
|
||||
ui.msgText->setHtml(QString("<HTML><blockquote [type=cite]><font color=\"blue\">")+QString::fromStdString(std::string("") + msg)+"</font><br/><br/></blockquote></HTML>") ;
|
||||
|
||||
ui.msgText->setFocus( Qt::OtherFocusReason );
|
||||
|
||||
|
||||
@ -666,6 +666,7 @@ border: 1px solid #CCCCCC;}</string>
|
||||
<addaction name="actionContactsView"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionAttach"/>
|
||||
<addaction name="actionQuote"/>
|
||||
<addaction name="actionSaveas"/>
|
||||
</widget>
|
||||
<action name="actionSend">
|
||||
@ -690,6 +691,9 @@ border: 1px solid #CCCCCC;}</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionContactsView">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/contacts24.png</normaloff>:/images/contacts24.png</iconset>
|
||||
@ -725,6 +729,21 @@ border: 1px solid #CCCCCC;}</string>
|
||||
<string>Attach File</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionQuote">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/quote_24.png</normaloff>:/images/quote_24.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Quote</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Add Blockquote</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>msgSendList</tabstop>
|
||||
|
||||
@ -32,6 +32,8 @@ MessageToaster::MessageToaster( QWidget * parent, Qt::WFlags f)
|
||||
// connect buttons
|
||||
connect(closebtn, SIGNAL(clicked()), this, SLOT(closeClicked()));
|
||||
connect(openmessagebtn, SIGNAL(clicked()), this, SLOT(openmessageClicked()));
|
||||
connect(openmessagetoolButton, SIGNAL(clicked()), this, SLOT(openmessageClicked()));
|
||||
|
||||
// init state
|
||||
displayState = dsInactive;
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>304</width>
|
||||
<height>115</height>
|
||||
<height>113</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
@ -47,34 +47,41 @@ border: 2px solid #CCCCCC;}</string>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<widget class="QToolButton" name="openmessagetoolButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>30</y>
|
||||
<width>61</width>
|
||||
<height>61</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/folder_inbox64.png</normaloff>:/images/folder_inbox64.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<widget class="QLabel" name="imgVideoService">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>30</y>
|
||||
<width>61</width>
|
||||
<height>61</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../images.qrc">:/images/folder_inbox64.png</pixmap>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="messagelabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
@ -280,7 +287,6 @@ border-radius: 10px }</string>
|
||||
</property>
|
||||
</widget>
|
||||
<zorder>frame</zorder>
|
||||
<zorder>imgVideoService</zorder>
|
||||
<zorder>messagelabel</zorder>
|
||||
<zorder>openmessagebtn</zorder>
|
||||
<zorder>lblTitle</zorder>
|
||||
@ -294,6 +300,7 @@ border-radius: 10px }</string>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user