Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-15 12:32:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* added for expandButtons correct hide/show icons + ToolTips

Browse source 
* added some Vertikal Spacer to put each new Widget on Top for News Feed
* added icons for typeComboBox

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-17 14:13:09 +00:00
parent 0626a08d01
commit c4a3792500
8 changed files with 90 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,10 +55,10 @@ GeneralMsgDialog::GeneralMsgDialog(QWidget *parent, uint32_t type)
* */ * */
typeComboBox->clear(); typeComboBox->clear();
typeComboBox->addItem("Message"); typeComboBox->addItem(QIcon(QString(":/images/evolution.png")),tr("Message"));
typeComboBox->addItem("Forum"); typeComboBox->addItem(QIcon(QString(":/images/konversation16.png")),tr("Forum"));
typeComboBox->addItem("Channel"); typeComboBox->addItem(QIcon(QString(":/images/channels16.png")),tr("Channel"));
typeComboBox->addItem("Blog"); typeComboBox->addItem(QIcon(QString(":/images/kblogger.png")),tr("Blog"));
typeComboBox->setCurrentIndex(type); typeComboBox->setCurrentIndex(type);

4
retroshare-gui/src/gui/feeds/ChanNewItem.cpp
View file

@ -132,10 +132,14 @@ void ChanNewItem::toggle()
if (expandFrame->isHidden()) if (expandFrame->isHidden())
{ {
expandFrame->show(); expandFrame->show();
expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
expandButton->setToolTip("Hide");
} }
else else
{ {
expandFrame->hide(); expandFrame->hide();
expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
expandButton->setToolTip("Expand");
} }
} }

45
retroshare-gui/src/gui/feeds/ChanNewItem.ui
View file

@ -57,7 +57,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/close_normal.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -69,7 +70,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>16</width> <width>16</width>
<height>26</height> <height>26</height>
@ -105,7 +106,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -128,7 +129,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>500</width> <width>500</width>
<height>20</height> <height>20</height>
@ -151,7 +152,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -163,7 +165,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -186,7 +188,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/add_24x24.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -204,16 +207,7 @@
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -224,7 +218,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="images.qrc" >:/images/contacts24.png</pixmap> <pixmap resource="../images.qrc" >:/images/contacts24.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -247,13 +241,26 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="images.qrc" /> <include location="../images.qrc" />
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View file

@ -177,6 +177,8 @@ void ForumMsgItem::toggle()
if (prevFrame->isHidden()) if (prevFrame->isHidden())
{ {
prevFrame->show(); prevFrame->show();
expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
expandButton->setToolTip("Hide");
if (!mIsTop) if (!mIsTop)
{ {
nextFrame->show(); nextFrame->show();
@ -186,6 +188,8 @@ void ForumMsgItem::toggle()
{ {
prevFrame->hide(); prevFrame->hide();
nextFrame->hide(); nextFrame->hide();
expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
expandButton->setToolTip("Expand");
} }
} }

32
retroshare-gui/src/gui/feeds/ForumMsgItem.ui
View file

@ -57,7 +57,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/close_normal.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -69,7 +70,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>16</width> <width>16</width>
<height>26</height> <height>26</height>
@ -105,7 +106,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>500</width> <width>500</width>
<height>20</height> <height>20</height>
@ -128,7 +129,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/add_24x24.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -164,7 +166,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>200</width> <width>200</width>
<height>20</height> <height>20</height>
@ -187,7 +189,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>200</width> <width>200</width>
<height>20</height> <height>20</height>
@ -210,7 +212,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/mail_delete.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -222,7 +225,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -245,7 +248,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/replymail24.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/replymail24.png</normaloff>:/images/replymail24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -302,7 +306,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -335,7 +339,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -367,7 +371,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -419,7 +423,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -451,7 +455,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="images.qrc" /> <include location="../images.qrc" />
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
retroshare-gui/src/gui/feeds/ForumNewItem.cpp
View file

@ -134,10 +134,14 @@ void ForumNewItem::toggle()
if (expandFrame->isHidden()) if (expandFrame->isHidden())
{ {
expandFrame->show(); expandFrame->show();
expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
expandButton->setToolTip("Hide");
} }
else else
{ {
expandFrame->hide(); expandFrame->hide();
expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
expandButton->setToolTip("Expand");
} }
} }

45
retroshare-gui/src/gui/feeds/ForumNewItem.ui
View file

@ -57,7 +57,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/close_normal.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -69,7 +70,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>16</width> <width>16</width>
<height>26</height> <height>26</height>
@ -105,7 +106,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -128,7 +129,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>500</width> <width>500</width>
<height>20</height> <height>20</height>
@ -151,7 +152,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -163,7 +165,7 @@
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -186,7 +188,8 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/add_24x24.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -204,16 +207,7 @@
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin" > <property name="margin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -224,7 +218,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="images.qrc" >:/images/contacts24.png</pixmap> <pixmap resource="../images.qrc" >:/images/contacts24.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -244,6 +238,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -253,7 +260,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="images.qrc" /> <include location="../images.qrc" />
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
retroshare-gui/src/gui/feeds/PeerItem.cpp
View file

@ -213,10 +213,14 @@ void PeerItem::toggle()
if (expandFrame->isHidden()) if (expandFrame->isHidden())
{ {
expandFrame->show(); expandFrame->show();
expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
expandButton->setToolTip("Hide");
} }
else else
{ {
expandFrame->hide(); expandFrame->hide();
expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
expandButton->setToolTip("Expand");
} }
} }