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

Make compatible with Qt 4.3.4

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
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) {

68
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View file

@ -1,4 +1,3 @@
<?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" >
@ -7,7 +6,7 @@
<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" >
@ -21,13 +20,16 @@
<property name="bottomMargin" > <property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QTextBrowser" name="textBrowser" > <widget class="QTextBrowser" name="textBrowser" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -46,7 +48,7 @@
</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>
@ -100,7 +102,7 @@ border-image: url(:/images/mystatus_bg.png);
<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>
@ -144,7 +146,7 @@ border-image: url(:/images/mystatus_bg.png);
<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,7 +157,7 @@ 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" >
@ -190,7 +192,7 @@ border-image: url(:/images/mystatus_bg.png);
<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>
@ -226,7 +228,7 @@ border-image: url(:/images/mystatus_bg.png);
<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>
@ -237,7 +239,7 @@ border-image: url(:/images/mystatus_bg.png);
<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>
@ -280,10 +282,10 @@ border-image: url(:/images/mystatus_bg.png);
</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/>
@ -317,8 +319,7 @@ p, li { white-space: pre-wrap; }
<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>
@ -346,8 +347,7 @@ p, li { white-space: pre-wrap; }
<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>
@ -375,8 +375,7 @@ p, li { white-space: pre-wrap; }
<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>
@ -404,8 +403,7 @@ p, li { white-space: pre-wrap; }
<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>
@ -440,7 +438,7 @@ p, li { white-space: pre-wrap; }
<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>
@ -448,18 +446,7 @@ p, li { white-space: pre-wrap; }
</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">
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<layout class="QHBoxLayout" name="SendLayout">
<property name="leftMargin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
@ -475,8 +462,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc"> <iconset resource="../images.qrc" >:/images/add-share24.png</iconset>
<normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -485,7 +471,7 @@ p, li { white-space: pre-wrap; }
<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>331</width> <width>331</width>
<height>20</height> <height>20</height>
@ -502,7 +488,8 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
</layout> <item row="4" column="0" >
<layout class="QVBoxLayout" />
</item> </item>
</layout> </layout>
</widget> </widget>
@ -547,8 +534,7 @@ p, li { white-space: pre-wrap; }
</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>