Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 12:54:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

some layout changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-01-10 23:14:48 +00:00
parent f60a69bec4
commit add5d45eeb
3 changed files with 73 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -92,13 +92,13 @@ ChannelFeed::ChannelFeed(QWidget *parent)
// //
/*************** Setup Right Hand Side (List of Messages) ****************/ /*************** Setup Right Hand Side (List of Messages) ****************/
mMsgLayout = new QVBoxLayout; /*mMsgLayout = new QVBoxLayout;
mMsgLayout->setSpacing(0); mMsgLayout->setSpacing(0);
mMsgLayout->setMargin(0); mMsgLayout->setMargin(0);
mMsgLayout->setContentsMargins(0,0,0,0); mMsgLayout->setContentsMargins(0,0,0,0);
QWidget *middleWidget2 = new QWidget(); QWidget *middleWidget2 = new QWidget();
middleWidget2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); middleWidget2->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
middleWidget2->setLayout(mMsgLayout); middleWidget2->setLayout(mMsgLayout);
QScrollArea *scrollArea2 = new QScrollArea; QScrollArea *scrollArea2 = new QScrollArea;
@ -113,8 +113,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
layout3->setMargin(0); layout3->setMargin(0);
layout3->setContentsMargins(0,0,0,0); layout3->setContentsMargins(0,0,0,0);
msgFrame->setLayout(layout3);*/
msgFrame->setLayout(layout3);
// mChannelId = "OWNID"; // mChannelId = "OWNID";
@ -684,7 +683,7 @@ void ChannelFeed::updateChannelMsgs()
ChanMsgItem *cmi = new ChanMsgItem(this, 0, mChannelId, it->msgId, true); ChanMsgItem *cmi = new ChanMsgItem(this, 0, mChannelId, it->msgId, true);
mChanMsgItems.push_back(cmi); mChanMsgItems.push_back(cmi);
mMsgLayout->addWidget(cmi); verticalLayout->addWidget(cmi);
} }
} }

59
retroshare-gui/src/gui/ChannelFeed.ui
View File

@ -422,6 +422,65 @@ p, li { white-space: pre-wrap; }
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>430</width>
<height>331</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>391</width>
<height>266</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>

10
retroshare-gui/src/gui/feeds/ChanMsgItem.ui
View File

@ -7,13 +7,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>435</width>
<height>207</height> <height>205</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy"> <property name="sizePolicy">
@ -236,6 +242,8 @@ p, li { white-space: pre-wrap; }
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>