Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-25 06:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

little design changes for General Message

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2233 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-02-07 21:29:38 +00:00
parent bf67301d71
commit ecea917822
2 changed files with 278 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/GeneralMsgDialog.cpp
View file

@ -279,8 +279,8 @@ void GeneralMsgDialog::addAttachment(std::string hash, std::string fname, uint64
SubFileItem *file = new SubFileItem(hash, fname, size, flags, srcId); SubFileItem *file = new SubFileItem(hash, fname, size, flags, srcId);
mAttachments.push_back(file); mAttachments.push_back(file);
QLayout *layout = fileFrame->layout(); //QLayout *layout = fileFrame->layout();
layout->addWidget(file); verticalLayout_2->addWidget(file);
if (mCheckAttachment) if (mCheckAttachment)
{ {
@ -325,8 +325,8 @@ void GeneralMsgDialog::addAttachment(std::string path)
SubFileItem *file = new SubFileItem(path); SubFileItem *file = new SubFileItem(path);
mAttachments.push_back(file); mAttachments.push_back(file);
QLayout *layout = fileFrame->layout(); //QLayout *layout = fileFrame->layout();
layout->addWidget(file); verticalLayout_2->addWidget(file);
if (mCheckAttachment) if (mCheckAttachment)
{ {
@ -387,8 +387,8 @@ void GeneralMsgDialog::addDestination(uint32_t type, std::string grpId, std::str
SubDestItem *dest = new SubDestItem(type, grpId, inReplyTo); SubDestItem *dest = new SubDestItem(type, grpId, inReplyTo);
mDestinations.push_back(dest); mDestinations.push_back(dest);
QLayout *layout = destFrame->layout(); //QLayout *layout = destFrame->layout();
layout->addWidget(dest); verticalLayout->addWidget(dest);
return; return;
} }
@ -647,6 +647,7 @@ void GeneralMsgDialog::sendMessage(uint32_t type, std::string grpId, std::string
break; break;
case FEEDHOLDER_MSG_BLOG: case FEEDHOLDER_MSG_BLOG:
break; break;
default: default:

305
retroshare-gui/src/gui/GeneralMsgDialog.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>564</width> <width>548</width>
<height>482</height> <height>458</height>
</rect> </rect>
</property> </property>
<property name="acceptDrops"> <property name="acceptDrops">
@ -27,21 +27,14 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);}
</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<item> <item>
<widget class="QComboBox" name="typeComboBox"> <widget class="QComboBox" name="typeComboBox">
<property name="acceptDrops"> <property name="acceptDrops">
@ -113,7 +106,7 @@
<string>Add Message Destination</string> <string>Add Message Destination</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>Add Message Destination</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
@ -129,44 +122,78 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);}
</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/new-mail-alert.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<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;
&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;
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;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#ffffff;&quot;&gt;General Message&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QScrollArea" name="scrollArea_2"> <widget class="QFrame" name="frame_2">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>66</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QFrame" name="destFrame">
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">QFrame#destFrame{border: 2px solid black;
background: white;}</string>
</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="QVBoxLayout"> <layout class="QGridLayout" name="gridLayout_6">
<item> <property name="topMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<property name="movable">
<bool>false</bool>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Message</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -222,56 +249,93 @@ background: white;}</string>
</item> </item>
</layout> </layout>
</item> </item>
</layout> <item row="1" column="0">
</widget> <widget class="QScrollArea" name="scrollArea_2">
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="verticalScrollBarPolicy"> <property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum> <enum>Qt::ScrollBarAlwaysOn</enum>
</property> </property>
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents"> <widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>545</width> <width>485</width>
<height>76</height> <height>60</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="2" column="0">
<widget class="QFrame" name="fileFrame"> <spacer name="verticalSpacer_2">
<property name="minimumSize"> <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>20</width>
<height>0</height> <height>40</height>
</size> </size>
</property> </property>
<property name="acceptDrops"> </spacer>
<bool>true</bool> </item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout"/>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Message</string>
</property> </property>
<property name="toolTip"> <layout class="QGridLayout" name="gridLayout_2">
<string>Drag and Drop Files from Search Results</string> <item row="0" column="0">
<layout class="QHBoxLayout" name="_2">
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property> </property>
<property name="styleSheet"> <property name="text">
<string notr="true">QFrame#fileFrame{border: 2px solid black; <string>Subject :</string>
background: white;}</string>
</property> </property>
<property name="frameShape"> </widget>
<enum>QFrame::StyledPanel</enum> </item>
<item>
<widget class="QLineEdit" name="subjectEdit"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QTextEdit" name="msgEdit"/>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="frameShadow"> <property name="standardButtons">
<enum>QFrame::Raised</enum> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> </widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Attachments</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -357,65 +421,46 @@ background: white;}</string>
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="3" column="0">
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<property name="topMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Message</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Subject :</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="subjectEdit"/>
</item>
</layout>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QTextEdit" name="msgEdit"/> <widget class="QScrollArea" name="scrollArea">
</item> <property name="verticalScrollBarPolicy">
</layout> <enum>Qt::ScrollBarAlwaysOn</enum>
</widget> </property>
</item> <property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>485</width>
<height>270</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="standardButtons"> <property name="sizeHint" stdset="0">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <size>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>