Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-27 10:21:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimized layout of the private chat window.

Browse Source 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-07-07 23:24:48 +00:00
parent 5e0e244b8a
commit ec12fcff6e
5 changed files with 757 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View File

@ -19,21 +19,12 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <layout class="QGridLayout" name="gridLayout">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>0</number> <number>0</number>
</property> </property>
@ -136,13 +127,13 @@
</property> </property>
<layout class="QGridLayout" name="_2"> <layout class="QGridLayout" name="_2">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>3</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>9</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>6</number> <number>3</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>9</number>
@ -235,13 +226,13 @@ border-image: url(:/images/avatarstatus_bg.png);
<number>2</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>3</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>6</number> <number>3</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>6</number> <number>3</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="friendnamelabel"> <widget class="QLabel" name="friendnamelabel">
@ -867,9 +858,6 @@ background: white;}</string>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget>
</item>
</layout>
<action name="actionBold"> <action name="actionBold">
<property name="text"> <property name="text">
<string>Bold</string> <string>Bold</string>

1
retroshare-gui/src/gui/chat/PopupChatWindow.cpp
View File

@ -147,6 +147,7 @@ void PopupChatWindow::addDialog(PopupChatDialog *dialog)
ui.tabWidget->addTab(dialog, dialog->getTitle()); ui.tabWidget->addTab(dialog, dialog->getTitle());
} else { } else {
ui.horizontalLayout->addWidget(dialog); ui.horizontalLayout->addWidget(dialog);
ui.horizontalLayout->setContentsMargins(0, 0, 5, 0);
peerId = dialog->getPeerId(); peerId = dialog->getPeerId();
chatDialog = dialog; chatDialog = dialog;
calculateStyle(dialog); calculateStyle(dialog);

12
retroshare-gui/src/gui/chat/PopupChatWindow.ui
View File

@ -24,6 +24,18 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabsClosable"> <property name="tabsClosable">

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

2
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -4051,7 +4051,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+104"/> <location line="+104"/>
<source>Messages entered here are sent to all connected friends</source> <source>Messages entered here are sent to all connected friends</source>
<translation type="unfinished"></translation> <translation>Nachrichten, die Du hier eingibst, werden an alle verbundenen Freunde versendet</translation>
</message> </message>
<message> <message>
<location line="+96"/> <location line="+96"/>