Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

* added a QFrame for the Background of the PushButtons in ChatWindow

Browse Source 
* some updates for stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-10-23 23:37:15 +00:00
parent f90988f743
commit b1f727d080
14 changed files with 437 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

659
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View File

@ -5,20 +5,32 @@
<rect>
<x>0</x>
<y>0</y>
<width>573</width>
<height>410</height>
<width>484</width>
<height>401</height>
</rect>
</property>
<property name="windowTitle" >
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout" >
<property name="geometry" >
<rect>
<x>0</x>
<y>12</y>
<width>484</width>
<height>368</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2" >
<property name="rightMargin" >
<number>0</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QTextBrowser" name="textBrowser" >
<property name="sizePolicy" >
@ -41,31 +53,171 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QWidget" native="1" name="widget" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>42</height>
</size>
<item rowspan="4" row="0" column="1" >
<widget class="QFrame" name="avatarframe" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="styleSheet" >
<string/>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
<number>9</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
<number>9</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="avatarlabel" >
<property name="minimumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="styleSheet" >
<string notr="true" >QLabel{
border-image: url(:/images/mystatus_bg.png);
}</string>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>61</width>
<height>141</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="myavatarlabel" >
<property name="minimumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="styleSheet" >
<string notr="true" >QLabel{
border-image: url(:/images/mystatus_bg.png);
}</string>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>61</width>
<height>41</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item rowspan="4" row="0" column="2" >
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QPushButton" name="avatarFrameButton" >
<property name="minimumSize" >
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="iconSize" >
<size>
<width>16</width>
<height>31</height>
</size>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>14</width>
<height>321</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QFrame" name="Chatbuttonframe" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout" >
<property name="topMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
@ -75,148 +227,14 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>291</width>
<height>24</height>
<width>190</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3" >
<widget class="QPushButton" name="textboldButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Bold</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="4" >
<widget class="QPushButton" name="textunderlineButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Underline</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="5" >
<widget class="QPushButton" name="textitalicButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Italic</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="6" >
<widget class="QPushButton" name="fontButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Set Font</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="7" >
<widget class="QPushButton" name="colorButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Text Color</string>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="emoteiconButton" >
<property name="sizePolicy" >
@ -279,10 +297,148 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="3" >
<widget class="QPushButton" name="textboldButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Bold</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="4" >
<widget class="QPushButton" name="textunderlineButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Underline</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="5" >
<widget class="QPushButton" name="textitalicButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Italic</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="6" >
<widget class="QPushButton" name="fontButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Set Font</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="7" >
<widget class="QPushButton" name="colorButton" >
<property name="minimumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="toolTip" >
<string>Text Color</string>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<item row="2" column="0" >
<widget class="QTextEdit" name="chattextEdit" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
@ -292,16 +448,26 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" >
<item row="3" column="0" >
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>351</width>
<height>20</height>
@ -319,165 +485,26 @@ p, li { white-space: pre-wrap; }
</layout>
</item>
</layout>
</item>
<item row="0" column="1" >
<widget class="QFrame" name="avatarframe" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="avatarlabel" >
<property name="minimumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="styleSheet" >
<string>QLabel{
border-image: url(:/images/mystatus_bg.png);
}</string>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</widget>
<widget class="QStatusBar" name="statusbar" >
<property name="geometry" >
<rect>
<x>0</x>
<y>380</y>
<width>484</width>
<height>21</height>
</rect>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>61</width>
<height>141</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="myavatarlabel" >
<property name="minimumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="styleSheet" >
<string>QLabel{
border-image: url(:/images/mystatus_bg.png);
}</string>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>61</width>
<height>41</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="0" column="2" >
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QPushButton" name="avatarFrameButton" >
<property name="minimumSize" >
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="iconSize" >
<size>
<width>16</width>
<height>31</height>
</size>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>14</width>
<height>321</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QStatusBar" name="statusbar" />
<widget class="QToolBar" name="toolBar" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>484</width>
<height>12</height>
</rect>
</property>
<property name="windowTitle" >
<string>toolBar</string>
</property>

11
retroshare-gui/src/release/qss/black.qss
View File

@ -133,9 +133,13 @@ border-image: url(qss/black/button_hover.png);
QPushButton:pressed
{
border-image: url(qss/black/button_pressed.png) ;
border-image: url(qss/black/button_pressedAndHover.png) ;
}
QPushButton:checked
{
border-image: url(qss/black/button_pressed.png) ;
}
QSplitter
{
@ -230,3 +234,8 @@ QFrame#messengerframetop{
}
QFrame#Chatbuttonframe{
border-image: url(qss/black/backgroundblack.png);
}

6
retroshare-gui/src/release/qss/blue.qss
View File

@ -66,3 +66,9 @@ QFrame#messengerframetop{
border-image: url(qss/blue/blue.png);
}
QFrame#Chatbuttonframe{
border-image: url(qss/blue/blue.png);
}

6
retroshare-gui/src/release/qss/default.qss
View File

@ -15,3 +15,9 @@ QFrame#messengerframetop{
border-image: url(qss/default/rsdefault.png);
}
QFrame#Chatbuttonframe{
border-image: url(qss/default/rsdefault.png);
}

6
retroshare-gui/src/release/qss/orangesurfer.qss
View File

@ -122,3 +122,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/orangesurfer/main.png);
}

6
retroshare-gui/src/release/qss/qlive.qss
View File

@ -43,3 +43,9 @@ QFrame#messengerframetop{
border-image: url(qss/qlive/qb.png);
}
QFrame#Chatbuttonframe{
border-image: url(qss/qlive/qb.png);
}

14
retroshare-gui/src/release/qss/red.qss
View File

@ -26,8 +26,8 @@ QToolButton::pressed {
}
QPushButton {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 red, stop: 1 darkred);
/* background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 red, stop: 1 darkred);*/
}
QPushButton#okButton {
@ -99,6 +99,10 @@ QStatusBar{
}
QToolTip{
background-color: #3E1716;
}
QMenu {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 red, stop: 1 darkred);
@ -140,3 +144,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/red/red.png);
}

6
retroshare-gui/src/release/qss/silver.qss
View File

@ -63,3 +63,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/silver/silver.png);
}

6
retroshare-gui/src/release/qss/silvergrey.qss
View File

@ -103,3 +103,9 @@ QFrame#messengerframetop{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #6F6F6F, stop:1 #979797);
}
QFrame#Chatbuttonframe{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #6F6F6F, stop:1 #979797);
}

6
retroshare-gui/src/release/qss/skin2.qss
View File

@ -34,3 +34,9 @@ QFrame#messengerframetop{
border-image: url(qss/skin2/background.png);
}
QFrame#Chatbuttonframe{
border-image: url(qss/skin2/background.png);
}

23
retroshare-gui/src/release/qss/uus.qss
View File

@ -93,25 +93,24 @@ QPushButton#applyButton {
}
QPushButton {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #BDDF7D, stop: 1 #49881F);
border: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #BDDF7D, stop: 1 #49881F);
stop: 0 #BDDF7D, stop: 1 #49881F);*/
}
QPushButton::hover {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F0F8CB, stop: 1 #F0F8CD);
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F0F8CB, stop: 1 #F0F8CD);*/
}
QPushButton::pressed {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F5FFBC, stop: 1 #609C08);
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F5FFBC, stop: 1 #609C08);*/
}
QLabel
{
color: white;
@ -152,8 +151,7 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */
}
QToolTip{
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #376D85, stop: 0.4 #185772);
background-color: black;
}
QFrame#messengerframetop{
@ -163,3 +161,10 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #BDDF7D, stop: 1 #49881F);
}

6
retroshare-gui/src/release/qss/wx.qss
View File

@ -38,3 +38,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/wx/wx.png);
}

6
retroshare-gui/src/release/qss/yaba.qss
View File

@ -106,3 +106,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/yaba/yaba.png);
}

6
retroshare-gui/src/release/qss/yeah.qss
View File

@ -105,3 +105,9 @@ QFrame#messengerframetop{
/*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F7B552, stop: 1 #FF5E07);*/
}
QFrame#Chatbuttonframe{
border-image: url(qss/yeah/yeah.png);
}