Make compatible with Qt 4.3.4

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1198 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-05-08 18:43:01 +00:00
parent 2172dbf55e
commit 0c41943958
2 changed files with 191 additions and 205 deletions

View file

@ -715,7 +715,7 @@ void PopupChatDialog::addExtraFile()
SubFileItem *file = new SubFileItem(filePath); SubFileItem *file = new SubFileItem(filePath);
//file-> //file->
ui.SendLayout->addWidget(file, 1, 0); ui.vboxLayout->addWidget(file, 1, 0);
//when the file is local or is finished hashing, call the fileHashingFinished method to send a chat message //when the file is local or is finished hashing, call the fileHashingFinished method to send a chat message
if (file->getState() == SFI_STATE_LOCAL) { if (file->getState() == SFI_STATE_LOCAL) {

View file

@ -1,44 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0" >
<ui version="4.0">
<class>PopupChatDialog</class> <class>PopupChatDialog</class>
<widget class="QMainWindow" name="PopupChatDialog"> <widget class="QMainWindow" name="PopupChatDialog" >
<property name="geometry"> <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>484</width> <width>484</width>
<height>437</height> <height>439</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle" >
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout"> <layout class="QGridLayout" >
<property name="rightMargin"> <property name="rightMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="horizontalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <property name="verticalSpacing" >
<widget class="QTextBrowser" name="textBrowser"> <number>0</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <item row="0" column="0" >
<widget class="QTextBrowser" name="textBrowser" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="sizeIncrement"> <property name="sizeIncrement" >
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -46,61 +48,61 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="4"> <item rowspan="4" row="0" column="1" >
<widget class="QFrame" name="avatarframe"> <widget class="QFrame" name="avatarframe" >
<property name="frameShape"> <property name="frameShape" >
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow" >
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" >
<property name="leftMargin"> <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin" >
<number>9</number> <number>9</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0" >
<widget class="QLabel" name="avatarlabel"> <widget class="QLabel" name="avatarlabel" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>116</width> <width>116</width>
<height>116</height> <height>116</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>116</width> <width>116</width>
<height>116</height> <height>116</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet" >
<string>QLabel{ <string>QLabel{
border-image: url(:/images/mystatus_bg.png); border-image: url(:/images/mystatus_bg.png);
}</string> }</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="alignment"> <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" >
<spacer> <spacer>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" >
<size> <size>
<width>61</width> <width>61</width>
<height>141</height> <height>141</height>
@ -108,43 +110,43 @@ border-image: url(:/images/mystatus_bg.png);
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" >
<widget class="QLabel" name="myavatarlabel"> <widget class="QLabel" name="myavatarlabel" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>116</width> <width>116</width>
<height>116</height> <height>116</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>116</width> <width>116</width>
<height>116</height> <height>116</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet" >
<string>QLabel{ <string>QLabel{
border-image: url(:/images/mystatus_bg.png); border-image: url(:/images/mystatus_bg.png);
}</string> }</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="alignment"> <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0" >
<spacer> <spacer>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" >
<size> <size>
<width>61</width> <width>61</width>
<height>30</height> <height>30</height>
@ -155,42 +157,42 @@ border-image: url(:/images/mystatus_bg.png);
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="2" rowspan="4"> <item rowspan="4" row="0" column="2" >
<layout class="QGridLayout"> <layout class="QGridLayout" >
<item row="0" column="0"> <item row="0" column="0" >
<widget class="QPushButton" name="avatarFrameButton"> <widget class="QPushButton" name="avatarFrameButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>14</width> <width>14</width>
<height>31</height> <height>31</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>14</width> <width>14</width>
<height>31</height> <height>31</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="iconSize"> <property name="iconSize" >
<size> <size>
<width>16</width> <width>16</width>
<height>31</height> <height>31</height>
</size> </size>
</property> </property>
<property name="checkable"> <property name="checkable" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" >
<spacer> <spacer>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" >
<size> <size>
<width>14</width> <width>14</width>
<height>321</height> <height>321</height>
@ -200,33 +202,33 @@ border-image: url(:/images/mystatus_bg.png);
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" >
<widget class="QFrame" name="Chatbuttonframe"> <widget class="QFrame" name="Chatbuttonframe" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>16</width> <width>16</width>
<height>46</height> <height>46</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape" >
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow" >
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" >
<property name="topMargin"> <property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0" >
<spacer> <spacer>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" >
<size> <size>
<width>190</width> <width>190</width>
<height>25</height> <height>25</height>
@ -234,30 +236,30 @@ border-image: url(:/images/mystatus_bg.png);
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" >
<widget class="QPushButton" name="emoteiconButton"> <widget class="QPushButton" name="emoteiconButton" >
<property name="sizePolicy"> <property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="iconSize"> <property name="iconSize" >
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -265,30 +267,30 @@ border-image: url(:/images/mystatus_bg.png);
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2" >
<widget class="QPushButton" name="styleButton"> <widget class="QPushButton" name="styleButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Set Chat Window Style&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set Chat Window Style&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="iconSize"> <property name="iconSize" >
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -296,140 +298,136 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="3" >
<widget class="QPushButton" name="textboldButton"> <widget class="QPushButton" name="textboldButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Bold</string> <string>Bold</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon" >
<iconset> <iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property> </property>
<property name="checkable"> <property name="checkable" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="4" >
<widget class="QPushButton" name="textunderlineButton"> <widget class="QPushButton" name="textunderlineButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Underline</string> <string>Underline</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon" >
<iconset> <iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property> </property>
<property name="checkable"> <property name="checkable" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5"> <item row="0" column="5" >
<widget class="QPushButton" name="textitalicButton"> <widget class="QPushButton" name="textitalicButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Italic</string> <string>Italic</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon" >
<iconset> <iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property> </property>
<property name="checkable"> <property name="checkable" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="6"> <item row="0" column="6" >
<widget class="QPushButton" name="fontButton"> <widget class="QPushButton" name="fontButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Set Font</string> <string>Set Font</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon" >
<iconset> <iconset>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
<normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</normaloff>C:/Dokumente und Einstellungen/Linux/.designer/backup</iconset>
</property> </property>
<property name="checkable"> <property name="checkable" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7"> <item row="0" column="7" >
<widget class="QPushButton" name="colorButton"> <widget class="QPushButton" name="colorButton" >
<property name="minimumSize"> <property name="minimumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize" >
<size> <size>
<width>28</width> <width>28</width>
<height>28</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Text Color</string> <string>Text Color</string>
</property> </property>
<property name="text"> <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
@ -437,129 +435,117 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" >
<widget class="QTextEdit" name="chattextEdit"> <widget class="QTextEdit" name="chattextEdit" >
<property name="sizePolicy"> <property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="Maximum"> <sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0" >
<layout class="QVBoxLayout" name="SendLayout"> <layout class="QHBoxLayout" >
<property name="leftMargin"> <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin" >
<number>2</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin" >
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="SendLayout"> <widget class="QPushButton" name="addFileButton" >
<property name="leftMargin"> <property name="text" >
<number>0</number> <string/>
</property> </property>
<property name="topMargin"> <property name="icon" >
<number>2</number> <iconset resource="../images.qrc" >:/images/add-share24.png</iconset>
</property> </property>
<property name="bottomMargin"> </widget>
<number>2</number> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property> </property>
<item> <property name="sizeHint" >
<widget class="QPushButton" name="addFileButton"> <size>
<property name="text"> <width>331</width>
<string/> <height>20</height>
</property> </size>
<property name="icon"> </property>
<iconset resource="../images.qrc"> </spacer>
<normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset> </item>
</property> <item>
</widget> <widget class="QPushButton" name="sendButton" >
</item> <property name="text" >
<item> <string>Send</string>
<spacer> </property>
<property name="orientation"> </widget>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>331</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="sendButton">
<property name="text">
<string>Send</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0" >
<layout class="QVBoxLayout" />
</item>
</layout> </layout>
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar" />
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar" >
<property name="windowTitle"> <property name="windowTitle" >
<string>toolBar</string> <string>toolBar</string>
</property> </property>
<property name="iconSize"> <property name="iconSize" >
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea" >
<enum>TopToolBarArea</enum> <enum>TopToolBarArea</enum>
</attribute> </attribute>
<attribute name="toolBarBreak"> <attribute name="toolBarBreak" >
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="actionAvatar"/> <addaction name="actionAvatar" />
</widget> </widget>
<action name="actionBold"> <action name="actionBold" >
<property name="text"> <property name="text" >
<string>Bold</string> <string>Bold</string>
</property> </property>
</action> </action>
<action name="actionItalic"> <action name="actionItalic" >
<property name="text"> <property name="text" >
<string>Italic</string> <string>Italic</string>
</property> </property>
</action> </action>
<action name="actionUnderline"> <action name="actionUnderline" >
<property name="text"> <property name="text" >
<string>Underline</string> <string>Underline</string>
</property> </property>
</action> </action>
<action name="actionStrike"> <action name="actionStrike" >
<property name="text"> <property name="text" >
<string>Strike</string> <string>Strike</string>
</property> </property>
</action> </action>
<action name="actionAvatar"> <action name="actionAvatar" >
<property name="icon"> <property name="icon" >
<iconset resource="../images.qrc"> <iconset resource="../images.qrc" >:/images/add_image24.png</iconset>
<normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
</property> </property>
<property name="text"> <property name="text" >
<string>Avatar</string> <string>Avatar</string>
</property> </property>
<property name="toolTip"> <property name="toolTip" >
<string>Set your Avatar Picture</string> <string>Set your Avatar Picture</string>
</property> </property>
</action> </action>
</widget> </widget>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc" />
</resources> </resources>
<connections/> <connections/>
</ui> </ui>