Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-18 02:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned Creation Dialogs for Channels and Forums and updated german translation.

Browse source 
Fixed small bug in AppearancePage.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-13 15:11:20 +00:00
parent a57ebbe623
commit 81ca05e75e
13 changed files with 1111 additions and 1176 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/channels/CreateChannel.cpp
View file

@ -242,7 +242,7 @@ void CreateChannel::cancelChannel()
void CreateChannel::addChannelLogo()
{
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
QString fileName = QFileDialog::getOpenFileName(this, tr("Load File"), QDir::homePath(), tr("Pictures (*.png *.xpm *.jpg)"));
if(!fileName.isEmpty())
{
picture = QPixmap(fileName).scaled(64,64, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);

24
retroshare-gui/src/gui/channels/CreateChannel.ui
View file

@ -69,7 +69,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation64.png</pixmap>
<pixmap resource="../images.qrc">:/images/add_channel64.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -78,15 +78,8 @@
</item>
<item row="0" column="1">
<widget class="QLabel" name="textlabelcreatforums">
<property name="styleSheet">
<string notr="true">color: rgb(255, 255, 255);</string>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;&quot;&gt;New Channel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;span style=&quot;font-size:24pt; font-weight:500;color:#32CD32;&quot;&gt;New Channel&lt;/span&gt;</string>
</property>
</widget>
</item>
@ -276,7 +269,7 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QRadioButton" name="msgAuth">
<property name="text">
<string>Authemticated Messages</string>
<string>Authenticated Messages</string>
</property>
</widget>
</item>
@ -481,17 +474,6 @@ border-radius: 10px;
</widget>
<resources>
<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"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

7
retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
View file

@ -494,7 +494,7 @@ void CreateChannelMsg::sendMessage(std::wstring subject, std::wstring msg, std::
void CreateChannelMsg::addThumbnail()
{
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
QString fileName = QFileDialog::getOpenFileName(this, tr("Load File"), QDir::homePath(), tr("Pictures (*.png *.xpm *.jpg)"));
if(!fileName.isEmpty())
{
picture = QPixmap(fileName).scaled(156,107, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
@ -517,8 +517,3 @@ void CreateChannelMsg::addThumbnail()
//updateThumbnail() ;
}
}