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

set different icon and Text label when creating Channels from ChannelFeed.

Browse source 
added retroshareRevision for writing Revision in seperate string.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1535 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-08-14 11:49:15 +00:00
parent dfeaed705b
commit 384145ef48
6 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/ChannelFeed.cpp
View file

@ -128,7 +128,12 @@ ChannelFeed::ChannelFeed(QWidget *parent)
void ChannelFeed::createChannel() void ChannelFeed::createChannel()
{ {
CreateForum *cf = new CreateForum(NULL, false); CreateForum *cf = new CreateForum(NULL, false);
cf->setWindowTitle(tr("Create Channel"));
cf->setWindowTitle(tr("Create a new Channel"));
cf->ui.labelicon->setPixmap(QPixmap(":/images/add_channel64.png"));
QString titleStr("<span style=\"font-size:16pt; font-weight:500;"
"color:#32cd32;\">%1</span>");
cf->ui.textlabelcreatforums->setText( titleStr.arg( tr("Create a new Channel") ) ) ;
cf->show(); cf->show();
} }

6
retroshare-gui/src/gui/forums/CreateForum.h
View file

@ -36,6 +36,10 @@ public:
void newForum(); /* cleanup */ void newForum(); /* cleanup */
/** Qt Designer generated object */
Ui::CreateForum ui;
public slots: public slots:
/** Overloaded QWidget.show */ /** Overloaded QWidget.show */
void show(); void show();
@ -48,8 +52,6 @@ void cancelForum();
private: private:
/** Qt Designer generated object */
Ui::CreateForum ui;
bool mIsForum; bool mIsForum;
}; };

6
retroshare-gui/src/gui/forums/CreateForum.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>490</width> <width>490</width>
<height>414</height> <height>421</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -513,7 +513,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="labelicon">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -532,7 +532,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="textlabelcreatforums">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-image: url(:/images/connect/connectFriendBanner.png)</string> <string notr="true">background-image: url(:/images/connect/connectFriendBanner.png)</string>
</property> </property>

4
retroshare-gui/src/util/rsversion.cpp
View file

@ -24,3 +24,7 @@
QString retroshareVersion() { QString retroshareVersion() {
return QString(GUI_VERSION); return QString(GUI_VERSION);
} }
QString retroshareRevision() {
return QString(GUI_REVISION);
}

5
retroshare-gui/src/util/rsversion.h
View file

@ -22,7 +22,12 @@
#define GUI_VERSION "0.5.0" #define GUI_VERSION "0.5.0"
#define GUI_REVISION "0.5.0"
#include <QString> #include <QString>
QString retroshareVersion(); QString retroshareVersion();
QString retroshareRevision();

2
retroshare-gui/src/version_detail.sh
View file

@ -47,7 +47,7 @@ fi
if [[ $version != '' ]]; then if [[ $version != '' ]]; then
version="$version date : $(date +'%T %m.%d.%y')" version="$version date : $(date +'%T %m.%d.%y')"
echo "Writing version to util/rsversion.h : $version " echo "Writing version to util/rsversion.h : $version "
sed -i "s/GUI_VERSION .*/GUI_VERSION \"$version\"/g" util/rsversion.h sed -i "s/GUI_REVISION .*/GUI_REVISION \"$version\"/g" util/rsversion.h
fi fi
echo "version_detail.sh scripts finished" echo "version_detail.sh scripts finished"
exit 0 exit 0