diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index 18ef93418..e34c2df43 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -19,329 +19,320 @@ - + 0 - - - - 0 - - - 0 - - - - + + + 0 + + + 1 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 14 + 16777215 + + + + QFrame#frame{border: transparent} + + + QFrame::StyledPanel + + + QFrame::Raised + + + 0 - - 1 - - - 0 - - - 0 - - - - - - 0 - 0 - + + + + + 14 + 31 + 14 - 16777215 + 31 - - QFrame#frame{border: transparent} + + - - QFrame::StyledPanel + + + 16 + 31 + - - QFrame::Raised + + true - - - 0 - - - - - - 14 - 31 - - - - - 14 - 31 - - - - - - - - 16 - 31 - - - - true - - - - - - - Qt::Vertical - - - - 12 - 335 - - - - - - - + + + + Qt::Vertical + + + + 12 + 335 + + + + + + + + + + + + 132 + 16777215 + + + + border: transparent; + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 9 + + + 3 + + + 9 + + + + + + 116 + 116 + + - 132 - 16777215 + 116 + 116 - border: transparent; - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 6 - - - 6 - - - 6 - - - 9 - - - - - - 116 - 116 - - - - - 116 - 116 - - - - QLabel{ + QLabel{ border-image: url(:/images/avatarstatus_bg.png); } - - - - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - - 61 - 141 - - - - - - - - - 116 - 116 - - - - - 116 - 116 - - - - QLabel{ + + + + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 61 + 141 + + + + + + + + + 116 + 116 + + + + + 116 + 116 + + + + QLabel{ border-image: url(:/images/avatarstatus_bg.png); } - - - - - - Qt::AlignCenter - - - - + + + + + + Qt::AlignCenter + - - - - QFrame#frame_2{border: transparent} + + + + + + + QFrame#frame_2{border: transparent} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 3 + + + 3 + + + 3 + + + + + + 0 + 0 + - - QFrame::StyledPanel + + + Arial + 13 + 75 + true + true + - - QFrame::Raised + + TextLabel - - - 2 - - - 6 - - - 6 - - - 6 - - - - - - 0 - 0 - - - - - Arial - 13 - 75 - true - true - - - - TextLabel - - - - - - - - Arial - 9 - - - - TextLabel - - - - - - - - QFrame#infoframe{border: 1px solid #DCDC41; + + + + + Arial + 9 + + + + TextLabel + + + + + + + + + + QFrame#infoframe{border: 1px solid #DCDC41; border-radius: 6px; background: #FFFFD7; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 6 + + + + + + 16 + 16 + - - QFrame::StyledPanel + + - - QFrame::Raised + + :/images/info16.png - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/info16.png - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - TextLabel - - - - - - - - 16 - 16 - - - - Qt::NoFocus - - - Close - - - QToolButton + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + TextLabel + + + + + + + + 16 + 16 + + + + Qt::NoFocus + + + Close + + + QToolButton { border-image: url(:/images/closenormal.png) } @@ -354,67 +345,67 @@ border-image: url(:/images/closehover.png) QToolButton:pressed { border-image: url(:/images/closepressed.png) } - - - - - - true - - - - + + + + + + true + - - + + + + + + + + 347 + 30 + + + + + 16777215 + 30 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 1 + + + 6 + + + - 347 - 30 + 28 + 28 - 16777215 - 30 + 28 + 28 + + Qt::NoFocus + - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 1 - - - 6 - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - QPushButton::menu-indicator { + QPushButton::menu-indicator { subcontrol-origin: padding; subcontrol-position: bottom right; } @@ -427,447 +418,444 @@ top: 1px; left: 1px; /* shift the arrow by 2 px */ QPushButton:hover { border: 1px solid #CCCCCC; } - - - - - - - :/images/configure.png:/images/configure.png - - - - 22 - 22 - - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Attach a Picture - - - - - - - :/images/add_image24.png:/images/add_image24.png - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - Qt::NoFocus - - - Add a File for your Friend - - - - - - - :/images/add-share24.png:/images/add-share24.png - - - - 24 - 24 - - - - true - - - - - - - Qt::Horizontal - - - - 190 - 25 - - - - - - - - Send - - - - - - - - 0 - 0 - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Bold - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Underline - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Italic - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Font - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Text Color - - - - - - true - - - - + + + + + + + :/images/configure.png:/images/configure.png + + + + 22 + 22 + + + + true + - - + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Attach a Picture + + + + + + + :/images/add_image24.png:/images/add_image24.png + + + + 24 + 24 + + + + true + + - - - - 1 + + + + + 28 + 28 + + + Qt::NoFocus + + + Add a File for your Friend + + + + + + + :/images/add-share24.png:/images/add-share24.png + + + + 24 + 24 + + + + true + + + + + - Qt::Vertical + Qt::Horizontal - - 2 + + + 190 + 25 + - - - - - - - 0 - 0 - - - - - 0 - 100 - - - - QTextBrowser{border: 1px solid #B8B6B1; + + + + + + Send + + + + + + + + 0 + 0 + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + + + + + 24 + 24 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Bold + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Underline + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Italic + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Font + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Text Color + + + + + + true + + + + + + + + + + + + + 1 + + + Qt::Vertical + + + 2 + + + + + + + + 0 + 0 + + + + + 0 + 100 + + + + QTextBrowser{border: 1px solid #B8B6B1; border-radius: 6px; background: white;} - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> - - - true - - - true - - - - + + + true + + + true + - - - - 0 - - - - - - - - 0 - - - 3 - - - - - - - - 0 - 0 - - - - - 0 - 30 - - - - Qt::CustomContextMenu - - - QTextEdit{border: 1px solid #B8B6B1; + + + + + + + 0 + + + + + + + + 0 + + + 3 + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + Qt::CustomContextMenu + + + QTextEdit{border: 1px solid #B8B6B1; border-radius: 6px; background: white;} - - - - - - - - 18 - 18 - - - - - 18 - 18 - - - - T - - - Qt::AlignCenter - - - - + - - - - - - + + + + + + 18 + 18 + + + + + 18 + 18 + + + + T + + + Qt::AlignCenter + + + + + + + + diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp index 7e0f563fc..8c495c4cb 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp @@ -147,6 +147,7 @@ void PopupChatWindow::addDialog(PopupChatDialog *dialog) ui.tabWidget->addTab(dialog, dialog->getTitle()); } else { ui.horizontalLayout->addWidget(dialog); + ui.horizontalLayout->setContentsMargins(0, 0, 5, 0); peerId = dialog->getPeerId(); chatDialog = dialog; calculateStyle(dialog); diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.ui b/retroshare-gui/src/gui/chat/PopupChatWindow.ui index 89ab82c63..983183037 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.ui +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.ui @@ -24,6 +24,18 @@ + + 5 + + + 5 + + + 5 + + + 0 + diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index a97a33b06..4872182b4 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 90401402f..4fd298ba3 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -4051,7 +4051,7 @@ p, li { white-space: pre-wrap; } Messages entered here are sent to all connected friends - + Nachrichten, die Du hier eingibst, werden an alle verbundenen Freunde versendet