Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-16 00:53:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed "Accept Friend Request" Button to "Confirm",

Browse source 
set correct stylesheet for new forum item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-04-06 21:29:09 +00:00
parent d0a9874c54
commit 70af1eccf5
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
retroshare-gui/src/gui/connect/FriendRequest.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>414</width> <width>414</width>
<height>359</height> <height>367</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -106,7 +106,7 @@ p, li { white-space: pre-wrap; }
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <item row="1" column="0">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -119,7 +119,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="cancelButton"> <widget class="QPushButton" name="cancelButton">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton, QPushButton, QComboBox { <string notr="true">QToolButton, QPushButton, QComboBox {
@ -141,7 +141,7 @@ border-image: url(:/images/btn_26_hover.png) 4;
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="applyButton"> <widget class="QPushButton" name="applyButton">
<property name="toolTip"> <property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@ -165,7 +165,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
}</string> }</string>
</property> </property>
<property name="text"> <property name="text">
<string>Accept Friend Request</string> <string>Confirm</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -175,6 +175,16 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="3">
<widget class="Line" name="line">
<property name="windowModality">
<enum>Qt::NonModal</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -430,6 +440,9 @@ p, li { white-space: pre-wrap; }
<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"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

5
retroshare-gui/src/gui/feeds/ForumNewItem.ui
View file

@ -26,9 +26,9 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QFrame#frame{border: 2px solid orange; <string notr="true">QFrame#frame{border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FB8428); stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}</string> border-radius: 10px}</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@ -283,6 +283,7 @@ border-radius: 10px}</string>
</widget> </widget>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>