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

set minimum size for channel items to 22 for bether display and moved Post Button to top header

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-05-17 21:20:11 +00:00
parent f7305de302
commit bea26895ef
2 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,6 +385,7 @@ void ChannelFeed::updateChannelListOwn(std::list<std::string> &ids)
QStandardItem *chNameItem = new QStandardItem(); QStandardItem *chNameItem = new QStandardItem();
QStandardItem *chPopItem = new QStandardItem(); QStandardItem *chPopItem = new QStandardItem();
QStandardItem *chIdItem = new QStandardItem(); QStandardItem *chIdItem = new QStandardItem();
chNameItem->setSizeHint( QSize( 22,22 ) );
ChannelInfo ci; ChannelInfo ci;
if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) { if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {
@ -459,6 +460,7 @@ void ChannelFeed::updateChannelListSub(std::list<std::string> &ids)
QStandardItem *chNameItem = new QStandardItem(); QStandardItem *chNameItem = new QStandardItem();
QStandardItem *chPopItem = new QStandardItem(); QStandardItem *chPopItem = new QStandardItem();
QStandardItem *chIdItem = new QStandardItem(); QStandardItem *chIdItem = new QStandardItem();
chNameItem->setSizeHint( QSize( 22,22 ) );
ChannelInfo ci; ChannelInfo ci;
if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) { if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {
@ -495,7 +497,8 @@ void ChannelFeed::updateChannelListSub(std::list<std::string> &ids)
{ {
chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_3.png")), Qt::DecorationRole); chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_3.png")), Qt::DecorationRole);
} }
else if (popcount < 16) { else if (popcount < 16)
{
chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_4.png")), Qt::DecorationRole); chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_4.png")), Qt::DecorationRole);
} }
else else
@ -534,6 +537,7 @@ void ChannelFeed::updateChannelListPop(std::list<std::string> &ids)
QStandardItem *chNameItem = new QStandardItem(); QStandardItem *chNameItem = new QStandardItem();
QStandardItem *chPopItem = new QStandardItem(); QStandardItem *chPopItem = new QStandardItem();
QStandardItem *chIdItem = new QStandardItem(); QStandardItem *chIdItem = new QStandardItem();
chNameItem->setSizeHint( QSize( 22,22 ) );
ChannelInfo ci; ChannelInfo ci;
if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) { if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {

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

@ -147,7 +147,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2"> <item row="0" column="3">
<widget class="QPushButton" name="channelpushButton"> <widget class="QPushButton" name="channelpushButton">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -204,6 +204,44 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="2">
<widget class="QToolButton" name="postButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="toolTip">
<string>Post To Channel</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -320,58 +358,6 @@ p, li { white-space: pre-wrap; }
<property name="rightMargin"> <property name="rightMargin">
<number>9</number> <number>9</number>
</property> </property>
<item row="0" column="0">
<widget class="QPushButton" name="postButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="toolTip">
<string>Post To Channel</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton, QPushButton, QComboBox {
border-image: url(:/images/btn_26.png) 4;
border-width: 4;
padding: 0px 6px;
font-size: 12px;
}
QToolButton:hover, QPushButton:hover, QComboBox:hover {
border-image: url(:/images/btn_26_hover.png) 4;
}
QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
color:gray;
}
QToolButton:pressed, QPushButton:pressed{
border-image: url(:/images/btn_26_pressed.png) 4;
}</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
</property>
</widget>
</item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QPushButton" name="unsubscribeButton"> <widget class="QPushButton" name="unsubscribeButton">
<property name="sizePolicy"> <property name="sizePolicy">
@ -527,8 +513,8 @@ border-image: url(:/images/btn_26_pressed.png) 4;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>425</width> <width>429</width>
<height>325</height> <height>331</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">