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

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

View File

@ -128,7 +128,12 @@ ChannelFeed::ChannelFeed(QWidget *parent)
void ChannelFeed::createChannel()
{
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();
}

View File

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

View File

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

View File

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

View File

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

View File

@ -47,7 +47,7 @@ fi
if [[ $version != '' ]]; then
version="$version date : $(date +'%T %m.%d.%y')"
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
echo "version_detail.sh scripts finished"
exit 0