sur5r
/
yate
forked from retronetworking/yate
1
0
Fork 0
Code Pull Requests Activity

Added frames to make sure the scroll bar is shown inside widget borders. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4929 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2012-02-20 15:08:28 +00:00
parent 96e4fd66d9
commit 9134582b56
7 changed files with 273 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
share/skins/default/chat.ui
View File

@ -183,6 +183,9 @@ QToolButton:pressed {
<string>set_richtext_item=tempnotify:&lt;font color="grey">${text}&lt;/font></string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -228,7 +231,7 @@ QToolButton:pressed {
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<widget class="QFrame" name="frame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@ -237,7 +240,7 @@ QToolButton:pressed {
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<width>16</width>
<height>54</height>
</size>
</property>
@ -247,39 +250,69 @@ QToolButton:pressed {
<height>54</height>
</size>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="styleSheet" >
<string/>
</property>
<property name="tabChangesFocus" >
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_textchangednotify" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_identity" stdset="0" >
<string>message</string>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="styleSheet" >
<string/>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_textchangednotify" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_identity" stdset="0" >
<string>message</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@ -506,26 +539,6 @@ QToolButton:pressed {
</property>
</action>
</widget>
<tabstops>
<tabstop>message</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>send_chat_button</sender>
<signal>clicked()</signal>
<receiver>message</receiver>
<slot>setFocus()</slot>
<hints>
<hint type="sourcelabel" >
<x>531</x>
<y>287</y>
</hint>
<hint type="destinationlabel" >
<x>249</x>
<y>287</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

60
share/skins/default/contactinfo.ui
View File

@ -310,7 +310,7 @@ color:blue;</string>
</widget>
</item>
<item>
<widget class="QListWidget" name="groups" >
<widget class="QFrame" name="frame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@ -319,7 +319,7 @@ color:blue;</string>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<width>16</width>
<height>80</height>
</size>
</property>
@ -329,12 +329,50 @@ color:blue;</string>
<height>80</height>
</size>
</property>
<property name="alternatingRowColors" >
<bool>false</bool>
</property>
<property name="selectionMode" >
<enum>QAbstractItemView::NoSelection</enum>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QListWidget" name="groups" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet" >
<string>QListWidget {
border: 0px;
}</string>
</property>
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="alternatingRowColors" >
<bool>false</bool>
</property>
<property name="selectionMode" >
<enum>QAbstractItemView::NoSelection</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@ -385,11 +423,6 @@ color:blue;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet" >
<string>QFrame#frame_resources {
border: 1px solid #717fa0;
}</string>
</property>
<property name="_yate_uiwidget" stdset="0" >
<bool>true</bool>
</property>
@ -413,6 +446,9 @@ color:blue;</string>
<string>hheader_columns_resize=,fixed</string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item>

3
share/skins/default/events.ui
View File

@ -60,6 +60,9 @@
<string>property:readOnly=true</string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item>

28
share/skins/default/help.ui
View File

@ -62,10 +62,34 @@
</property>
<layout class="QVBoxLayout" >
<item>
<widget class="QTextBrowser" name="help_text" >
<property name="openExternalLinks" >
<widget class="QFrame" name="frame_2" >
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QTextBrowser" name="help_text" >
<property name="openExternalLinks" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>

108
share/skins/default/mucchat.ui
View File

@ -301,7 +301,6 @@
<property name="styleSheet" >
<string>QTextEdit {
background-color: #ffffff;
border: 1px solid #717fa0;
color: #666666;
font-family: Arial;
font-size: 12px;
@ -328,6 +327,9 @@
<string>set_richtext_item=tempnotify:&lt;font color="grey">${text}&lt;/font></string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -375,7 +377,6 @@
<string>property:autoExpand=true</string>
<string>property:rootIsDecorated=false</string>
<string>property:allColumnsShowFocus=false</string>
<string>property:styleSheet=QTreeWidget{border-image: none;font-size: 11px;background:white;selection-background-color:#0c7acb;border: 1px solid #717fa0;}QTreeView::branch{background:transparent;}</string>
<string>property:_yate_nogroup_caption=Not set</string>
<string>property:_yate_comparecase=false</string>
<string>property:_yate_itemheight=contact:20</string>
@ -391,6 +392,9 @@
<string>property:_yate_itemtooltip=group:&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">\np, li { white-space: pre-wrap; }\n&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:14pt; font-weight:600;">${name}&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -435,7 +439,7 @@
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<widget class="QFrame" name="frame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@ -444,7 +448,7 @@
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<width>16</width>
<height>54</height>
</size>
</property>
@ -454,30 +458,60 @@
<height>54</height>
</size>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@ -792,26 +826,6 @@
</property>
</action>
</widget>
<tabstops>
<tabstop>message</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>send_chat_button</sender>
<signal>clicked()</signal>
<receiver>message</receiver>
<slot>setFocus()</slot>
<hints>
<hint type="sourcelabel" >
<x>531</x>
<y>285</y>
</hint>
<hint type="destinationlabel" >
<x>249</x>
<y>289</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

96
share/skins/default/mucprivchat.ui
View File

@ -80,6 +80,9 @@
<string>set_richtext_item=tempnotify:&lt;font color="grey">${text}&lt;/font></string>
</stringlist>
</property>
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -122,7 +125,7 @@
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<widget class="QFrame" name="frame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@ -131,7 +134,7 @@
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<width>16</width>
<height>54</height>
</size>
</property>
@ -141,36 +144,66 @@
<height>54</height>
</size>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="tabChangesFocus" >
<property name="_yate_frame_custom" stdset="0" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_textchangednotify" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_identity" stdset="0" >
<string>message</string>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="message" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
<property name="textInteractionFlags" >
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="_yate_filterevents" stdset="0" >
<bool>true</bool>
</property>
<property name="dynamicActionEnter" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionEnterModifiers" stdset="0" >
<string>Ctrl+, Shift+</string>
</property>
<property name="dynamicActionReturn" stdset="0" >
<string>send_chat</string>
</property>
<property name="dynamicActionReturnFilter" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_textchangednotify" stdset="0" >
<bool>true</bool>
</property>
<property name="_yate_identity" stdset="0" >
<string>message</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@ -389,9 +422,6 @@
</property>
</action>
</widget>
<tabstops>
<tabstop>message</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

7
share/skins/default/stylesheet.css
View File

@ -5,6 +5,10 @@ QWidget[_yate_window="true"] {
color:#333333;
}
QFrame[_yate_frame_custom="true"] {
border: 1px solid #717fa0;
}
/* QAbstractButton */
QAbstractButton {
@ -41,7 +45,7 @@ QLineEdit {
/* QTextEdit */
QTextEdit {
border: 1px solid #717fa0;
border: 0px solid #717fa0;
background-color: #ffffff;
font-size: 12px;
}
@ -49,7 +53,6 @@ QTextEdit {
/* QTextBrowser */
QTextBrowser {
font-size: 12px;
border: 1px solid #717fa0;
}
/* QToolButton */