diff --git a/plugins/LinksCloud/AddLinksDialog.cpp b/plugins/LinksCloud/AddLinksDialog.cpp index 8574a9280..655f13c2a 100644 --- a/plugins/LinksCloud/AddLinksDialog.cpp +++ b/plugins/LinksCloud/AddLinksDialog.cpp @@ -40,6 +40,9 @@ AddLinksDialog::AddLinksDialog(QString url, QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/irkick.png")); + ui.headerFrame->setHeaderText(tr("Add Link to Cloud")); + setAttribute ( Qt::WA_DeleteOnClose, true ); /* add button */ diff --git a/plugins/LinksCloud/AddLinksDialog.ui b/plugins/LinksCloud/AddLinksDialog.ui index 04b9363a4..a8ae3fef2 100644 --- a/plugins/LinksCloud/AddLinksDialog.ui +++ b/plugins/LinksCloud/AddLinksDialog.ui @@ -14,7 +14,7 @@ Add Link - + :/images/rstray3.png:/images/rstray3.png @@ -25,52 +25,13 @@ 0 - - - - 16777215 - 52 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - + QFrame::NoFrame QFrame::Raised - - - - - - 32 - 32 - - - - - - - :/images/irkick.png - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;">Add Link to Cloud</span></p></body></html> - - - - @@ -199,7 +160,7 @@ border: 1px solid #CCCCCC;} +2 Great! - + :/images/filerating5.png:/images/filerating5.png @@ -208,7 +169,7 @@ border: 1px solid #CCCCCC;} +1 Good - + :/images/filerating4.png:/images/filerating4.png @@ -217,7 +178,7 @@ border: 1px solid #CCCCCC;} 0 Okay - + :/images/filerating3.png:/images/filerating3.png @@ -226,7 +187,7 @@ border: 1px solid #CCCCCC;} -1 Sux - + :/images/filerating2.png:/images/filerating2.png @@ -235,7 +196,7 @@ border: 1px solid #CCCCCC;} -2 Bad Link - + :/images/filerating1.png:/images/filerating1.png @@ -281,8 +242,16 @@ border: 1px solid #CCCCCC;} + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + - + diff --git a/plugins/LinksCloud/lang/LinksCloud_de.qm b/plugins/LinksCloud/lang/LinksCloud_de.qm index 1f0f14507..0a6cd3ec8 100644 Binary files a/plugins/LinksCloud/lang/LinksCloud_de.qm and b/plugins/LinksCloud/lang/LinksCloud_de.qm differ diff --git a/plugins/LinksCloud/lang/LinksCloud_de.ts b/plugins/LinksCloud/lang/LinksCloud_de.ts index c51a3f14f..9f6b797aa 100644 --- a/plugins/LinksCloud/lang/LinksCloud_de.ts +++ b/plugins/LinksCloud/lang/LinksCloud_de.ts @@ -5,25 +5,24 @@ AddLinksDialog - + Add Link Link hinzufügen - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;">Add Link to Cloud</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;">Link zur Wolke hinzufügen</span></p></body></html> - + Cancel Abbrechen @@ -73,7 +72,12 @@ p, li { white-space: pre-wrap; } -2 Schlechter Link - + + Add Link to Cloud + Link zur Wolke hinzufügen + + + New Link Neuer Link @@ -104,7 +108,7 @@ p, li { white-space: pre-wrap; } LinksDialog - + Title / Comment Titel / Kommentar @@ -280,7 +284,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Verknüpfungswolke</span></p></body></html> - + Add new link Neuen Link hinzufügen diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp index 1e85ae51c..c6af76d7f 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.cpp +++ b/retroshare-gui/src/gui/QuickStartWizard.cpp @@ -39,6 +39,9 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) : { ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/rs_wizard.png")); + ui.headerFrame->setHeaderText("RetroShare"); + ui.pagesWizard->setCurrentIndex(0); loadNetwork(); diff --git a/retroshare-gui/src/gui/QuickStartWizard.ui b/retroshare-gui/src/gui/QuickStartWizard.ui index d3dd3e766..b19e3b0bb 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.ui +++ b/retroshare-gui/src/gui/QuickStartWizard.ui @@ -80,76 +80,13 @@ border-image: url(:/images/btn_26_pressed.png) 4; 0 - - - - 0 - 50 - - - - - 16777215 - 50 - - - - background-image: url(:/images/connect/connectFriendBanner.png); - - + QFrame::NoFrame QFrame::Raised - - - 1 - - - 0 - - - - - - 48 - 48 - - - - background-color: transparent; - - - :/images/rs_wizard.png - - - true - - - - - - - - 0 - 0 - - - - color: rgb(255, 255, 255); - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt;">RetroShare!</span></p></body></html> - - - - @@ -646,15 +583,6 @@ p, li { white-space: pre-wrap; } 22 - - false - - - 22 - - - true - Directory @@ -1005,6 +933,14 @@ p, li { white-space: pre-wrap; } + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + diff --git a/retroshare-gui/src/gui/ShareDialog.cpp b/retroshare-gui/src/gui/ShareDialog.cpp index dc813c007..ce21ee877 100644 --- a/retroshare-gui/src/gui/ShareDialog.cpp +++ b/retroshare-gui/src/gui/ShareDialog.cpp @@ -34,6 +34,9 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent, Qt::WFlags flags /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare48.png")); + ui.headerFrame->setHeaderText(tr("Share Folder")); + connect(ui.browseButton, SIGNAL(clicked( bool ) ), this , SLOT( browseDirectory() ) ); connect(ui.okButton, SIGNAL(clicked( bool ) ), this , SLOT( addDirectory() ) ); connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(close())); diff --git a/retroshare-gui/src/gui/ShareDialog.ui b/retroshare-gui/src/gui/ShareDialog.ui index ed79c1ac3..e4d04c5c4 100644 --- a/retroshare-gui/src/gui/ShareDialog.ui +++ b/retroshare-gui/src/gui/ShareDialog.ui @@ -25,17 +25,7 @@ 0 - - - - 16777215 - 60 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - + QFrame::NoFrame @@ -45,56 +35,6 @@ 1 - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - - - - :/images/fileshare48.png - - - - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Share Folder</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - @@ -269,6 +209,14 @@ p, li { white-space: pre-wrap; } + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp index 3d971038b..f08448c04 100644 --- a/retroshare-gui/src/gui/ShareManager.cpp +++ b/retroshare-gui/src/gui/ShareManager.cpp @@ -51,6 +51,9 @@ ShareManager::ShareManager(QWidget *parent, Qt::WFlags flags) /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare48.png")); + ui.headerFrame->setHeaderText(tr("Share Manager")); + isLoading = false; load(); diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui index 395a386c7..3ad187968 100644 --- a/retroshare-gui/src/gui/ShareManager.ui +++ b/retroshare-gui/src/gui/ShareManager.ui @@ -2,9 +2,6 @@ ShareManager - - Qt::NonModal - 0 @@ -28,11 +25,7 @@ 0 - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - + QFrame::NoFrame @@ -42,56 +35,6 @@ 1 - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - - - - :/images/fileshare48.png - - - - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Share Manager</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - @@ -275,6 +218,14 @@ p, li { white-space: pre-wrap; } + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + diff --git a/retroshare-gui/src/gui/channels/CreateChannel.cpp b/retroshare-gui/src/gui/channels/CreateChannel.cpp index 1bfd5c997..de78fce8d 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannel.cpp @@ -38,6 +38,9 @@ CreateChannel::CreateChannel(QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/add_channel64.png")); + ui.headerFrame->setHeaderText(tr("New Channel")); + picture = NULL; // connect up the buttons. diff --git a/retroshare-gui/src/gui/channels/CreateChannel.ui b/retroshare-gui/src/gui/channels/CreateChannel.ui index c4a2b47d8..287ea8bfd 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.ui +++ b/retroshare-gui/src/gui/channels/CreateChannel.ui @@ -25,64 +25,7 @@ 0 - - - - 16777215 - 64 - - - - QFrame#frame_2{background-image: url(:/images/connect/connectFriendBanner.png);} - - - QFrame::NoFrame - - - QFrame::Raised - - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - - - - - - :/images/add_channel64.png - - - true - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; font-weight:600; color:#ffffff;">New Channel</span></p></body></html> - - - - - + @@ -466,6 +409,12 @@ border-radius: 10px; + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + FriendSelectionWidget QWidget diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp index 7d18cd6c3..fa1140394 100644 --- a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp @@ -44,6 +44,9 @@ CreateChannelMsg::CreateChannelMsg(std::string cId) /* Invoke the Qt Designer generated object setup routine */ setupUi(this); + headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); + headerFrame->setHeaderText(tr("New Channel Post")); + setAttribute ( Qt::WA_DeleteOnClose, true ); connect(buttonBox, SIGNAL(accepted()), this, SLOT(sendMsg())); diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.ui b/retroshare-gui/src/gui/channels/CreateChannelMsg.ui index 6ecd01822..9037fd1c3 100644 --- a/retroshare-gui/src/gui/channels/CreateChannelMsg.ui +++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.ui @@ -28,62 +28,7 @@ 0 - - - - 16777215 - 64 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/images/channels.png - - - true - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt; color:#ffffff;">New Channel Post</span></p></body></html> - - - - - + @@ -419,6 +364,14 @@ background: white;} + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + diff --git a/retroshare-gui/src/gui/channels/ShareKey.cpp b/retroshare-gui/src/gui/channels/ShareKey.cpp index 8de5fe712..202936e4c 100644 --- a/retroshare-gui/src/gui/channels/ShareKey.cpp +++ b/retroshare-gui/src/gui/channels/ShareKey.cpp @@ -36,6 +36,9 @@ ShareKey::ShareKey(QWidget *parent, Qt::WFlags flags, std::string grpId, int grp ui = new Ui::ShareKey(); ui->setupUi(this); + ui->headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png")); + ui->headerFrame->setHeaderText(tr("Share Channel")); + connect( ui->shareButton, SIGNAL( clicked ( bool ) ), this, SLOT( shareKey( ) ) ); connect( ui->cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancel( ) ) ); diff --git a/retroshare-gui/src/gui/channels/ShareKey.ui b/retroshare-gui/src/gui/channels/ShareKey.ui index 55e02c7ec..dc1e6862a 100644 --- a/retroshare-gui/src/gui/channels/ShareKey.ui +++ b/retroshare-gui/src/gui/channels/ShareKey.ui @@ -13,73 +13,14 @@ Share Channel - - - 0 - + 0 - - - - - - - 239 - 49 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png); -} - - - QFrame::NoFrame - - - QFrame::Raised - - - - 6 - - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:18pt; font-weight:600; color:#ffffff;">Share Channel</span></p></body></html> - - - - - - - - 64 - 64 - - - - - - - :/images/user/agt_forum64.png - - - - - - - + + - + QFrame::StyledPanel @@ -88,7 +29,7 @@ p, li { white-space: pre-wrap; } QFrame::Raised - + true @@ -175,7 +116,7 @@ p, li { white-space: pre-wrap; } - + QLayout::SetDefaultConstraint @@ -212,7 +153,7 @@ p, li { white-space: pre-wrap; } - + Select the Friends with which you want to Share your Channel. @@ -225,6 +166,12 @@ p, li { white-space: pre-wrap; } + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + FriendSelectionWidget QWidget @@ -232,8 +179,6 @@ p, li { white-space: pre-wrap; } 1 - - - + diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 17c85b53c..39b28ce9a 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -36,6 +36,9 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list& peer_list, in ui = new Ui::CreateLobbyDialog() ; ui->setupUi(this); + ui->headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png")); + ui->headerFrame->setHeaderText(tr("Create Chat Lobby")); + std::string default_nick ; rsMsgs->getDefaultNickNameForChatLobby(default_nick) ; diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui index 447fccc65..f59fbe19b 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui @@ -40,71 +40,7 @@ 0 - - - - 239 - 64 - - - - - 16777215 - 64 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png); -} - - - QFrame::NoFrame - - - QFrame::Raised - - - - 6 - - - - - - 0 - 0 - - - - - 64 - 64 - - - - - - - :/images/user/agt_forum64.png - - - - - - - - - - <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:18pt; font-weight:600; color:#ffffff;">Create Chat Lobby</span></p></body></html> - - - - - + @@ -379,6 +315,12 @@ background: white; + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + FriendSelectionWidget QWidget diff --git a/retroshare-gui/src/gui/common/HeaderFrame.cpp b/retroshare-gui/src/gui/common/HeaderFrame.cpp new file mode 100644 index 000000000..499076b80 --- /dev/null +++ b/retroshare-gui/src/gui/common/HeaderFrame.cpp @@ -0,0 +1,24 @@ +#include "HeaderFrame.h" +#include "ui_HeaderFrame.h" + +HeaderFrame::HeaderFrame(QWidget *parent) : + QFrame(parent), + ui(new Ui::HeaderFrame) +{ + ui->setupUi(this); +} + +HeaderFrame::~HeaderFrame() +{ + delete ui; +} + +void HeaderFrame::setHeaderText(const QString &headerText) +{ + ui->headerLabel->setText(headerText); +} + +void HeaderFrame::setHeaderImage(const QPixmap &headerImage) +{ + ui->headerImage->setPixmap(headerImage); +} diff --git a/retroshare-gui/src/gui/common/HeaderFrame.h b/retroshare-gui/src/gui/common/HeaderFrame.h new file mode 100644 index 000000000..833da3df2 --- /dev/null +++ b/retroshare-gui/src/gui/common/HeaderFrame.h @@ -0,0 +1,25 @@ +#ifndef HEADERFRAME_H +#define HEADERFRAME_H + +#include + +namespace Ui { +class HeaderFrame; +} + +class HeaderFrame : public QFrame +{ + Q_OBJECT + +public: + HeaderFrame(QWidget *parent = 0); + ~HeaderFrame(); + + void setHeaderText(const QString &headerText); + void setHeaderImage(const QPixmap &headerImage); + +private: + Ui::HeaderFrame *ui; +}; + +#endif // HEADERFRAME_H diff --git a/retroshare-gui/src/gui/common/HeaderFrame.ui b/retroshare-gui/src/gui/common/HeaderFrame.ui new file mode 100644 index 000000000..324ccfc67 --- /dev/null +++ b/retroshare-gui/src/gui/common/HeaderFrame.ui @@ -0,0 +1,118 @@ + + + HeaderFrame + + + + 0 + 0 + 400 + 76 + + + + + 0 + 76 + + + + + 0 + + + 0 + + + + + QFrame#headerFrame { + background-image: url(:/images/headerFrame.png); +} + + + + 12 + + + 6 + + + 6 + + + + + + 64 + 64 + + + + + 64 + 64 + + + + true + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 118 + 116 + 108 + + + + + + + + + 18 + + + + Header text + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 65a098986..e0516de1a 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -66,7 +66,10 @@ ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlag /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, true); + ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo48.png")); + ui.headerFrame->setHeaderText(tr("Friend Details")); + + setAttribute(Qt::WA_DeleteOnClose, true); connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close())); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 2c17452ba..9e2c1163d 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -28,55 +28,13 @@ 0 - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - + QFrame::NoFrame QFrame::Plain - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/images/user/identityinfo48.png - - - false - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; color:#ffffff;">Friend Details</span></p></body></html> - - - - @@ -854,6 +812,12 @@ p, li { white-space: pre-wrap; }
gui/common/AvatarWidget.h
1 + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + LinkTextBrowser QTextBrowser diff --git a/retroshare-gui/src/gui/connect/FriendRequest.cpp b/retroshare-gui/src/gui/connect/FriendRequest.cpp index eb0ccd8a9..04571ebbd 100644 --- a/retroshare-gui/src/gui/connect/FriendRequest.cpp +++ b/retroshare-gui/src/gui/connect/FriendRequest.cpp @@ -52,7 +52,10 @@ FriendRequest::FriendRequest(const std::string& id, QWidget *parent, Qt::WFlags /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, true); + ui.headerFrame->setHeaderImage(QPixmap(":/images/user/user_request48.png")); + ui.headerFrame->setHeaderText(tr("Friend Request")); + + setAttribute(Qt::WA_DeleteOnClose, true); connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close())); diff --git a/retroshare-gui/src/gui/connect/FriendRequest.ui b/retroshare-gui/src/gui/connect/FriendRequest.ui index aab2320ea..e16ee5cbc 100644 --- a/retroshare-gui/src/gui/connect/FriendRequest.ui +++ b/retroshare-gui/src/gui/connect/FriendRequest.ui @@ -28,17 +28,7 @@ 0 - - - - 0 - 0 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - + QFrame::NoFrame @@ -48,47 +38,6 @@ 1 - - - - - - 0 - 0 - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/images/user/user_request48.png - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#ffffff;">Friend Request</span></p></body></html> - - - - @@ -101,7 +50,7 @@ p, li { white-space: pre-wrap; } - + 96 @@ -321,13 +270,15 @@ border-image: url(:/images/btn_blue_hover.png) 4;
gui/common/AvatarWidget.h
1 + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + - - - - diff --git a/retroshare-gui/src/gui/forums/CreateForum.cpp b/retroshare-gui/src/gui/forums/CreateForum.cpp index 148f2d804..d7c15b64a 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.cpp +++ b/retroshare-gui/src/gui/forums/CreateForum.cpp @@ -37,6 +37,9 @@ CreateForum::CreateForum(QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png")); + ui.headerFrame->setHeaderText(tr("New Forum")); + // connect up the buttons. connect( ui.cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancelForum( ) ) ); connect( ui.createButton, SIGNAL( clicked ( bool ) ), this, SLOT( createForum( ) ) ); diff --git a/retroshare-gui/src/gui/forums/CreateForum.ui b/retroshare-gui/src/gui/forums/CreateForum.ui index cd48fe6ff..368d23661 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.ui +++ b/retroshare-gui/src/gui/forums/CreateForum.ui @@ -25,66 +25,13 @@ 0 - - - - 16777215 - 64 - - - - QFrame#frame_2{background-image: url(:/images/connect/connectFriendBanner.png);} - + QFrame::NoFrame QFrame::Raised - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - - - - - - :/images/konversation64.png - - - true - - - - - - - color: rgb(255, 255, 255); - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">New Forum</span></p></body></html> - - - - @@ -366,6 +313,12 @@ p, li { white-space: pre-wrap; }
gui/common/FriendSelectionWidget.h
1 + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + diff --git a/retroshare-gui/src/gui/forumsv2/CreateForumV2.cpp b/retroshare-gui/src/gui/forumsv2/CreateForumV2.cpp index d261c024e..104dfbf7a 100644 --- a/retroshare-gui/src/gui/forumsv2/CreateForumV2.cpp +++ b/retroshare-gui/src/gui/forumsv2/CreateForumV2.cpp @@ -42,6 +42,9 @@ CreateForumV2::CreateForumV2(QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png")); + ui.headerFrame->setHeaderText(tr("New Forum")); + mForumQueue = new TokenQueue(rsForumsV2, this); // connect up the buttons. diff --git a/retroshare-gui/src/gui/forumsv2/CreateForumV2.ui b/retroshare-gui/src/gui/forumsv2/CreateForumV2.ui index 0cfcb4ca5..f76617812 100644 --- a/retroshare-gui/src/gui/forumsv2/CreateForumV2.ui +++ b/retroshare-gui/src/gui/forumsv2/CreateForumV2.ui @@ -25,66 +25,13 @@ 0 - - - - 16777215 - 64 - - - - QFrame#frame_2{background-image: url(:/images/connect/connectFriendBanner.png);} - + QFrame::NoFrame QFrame::Raised - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - - - - - - :/images/konversation64.png - - - true - - - - - - - color: rgb(255, 255, 255); - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">New Forum</span></p></body></html> - - - - diff --git a/retroshare-gui/src/gui/groups/CreateGroup.cpp b/retroshare-gui/src/gui/groups/CreateGroup.cpp index 64c2ea2c6..fb059904d 100644 --- a/retroshare-gui/src/gui/groups/CreateGroup.cpp +++ b/retroshare-gui/src/gui/groups/CreateGroup.cpp @@ -35,6 +35,8 @@ CreateGroup::CreateGroup(const std::string groupId, QWidget *parent, Qt::WFlags /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/user/add_group256.png")); + m_groupId = groupId; if (m_groupId.empty() == false) { @@ -44,15 +46,13 @@ CreateGroup::CreateGroup(const std::string groupId, QWidget *parent, Qt::WFlags ui.groupname->setText(misc::removeNewLine(groupInfo.name)); setWindowTitle(tr("Edit Group")); - ui.headerLabel->setText(tr("" - "" - "

Edit Group

")); + ui.headerFrame->setHeaderText(tr("Edit Group")); } else { /* Group not found, create new */ m_groupId.clear(); } + } else { + ui.headerFrame->setHeaderText(tr("Create a Group")); } std::list groupInfoList; diff --git a/retroshare-gui/src/gui/groups/CreateGroup.ui b/retroshare-gui/src/gui/groups/CreateGroup.ui index d1ba1a54a..c5ea1ce73 100644 --- a/retroshare-gui/src/gui/groups/CreateGroup.ui +++ b/retroshare-gui/src/gui/groups/CreateGroup.ui @@ -24,75 +24,7 @@ 0 - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 9 - - - 6 - - - 9 - - - 6 - - - - - - 64 - 64 - - - - - 64 - 64 - - - - - - - :/images/user/add_group256.png - - - true - - - - - - - - 18 - 75 - true - - - - <!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:18pt; font-weight:600; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Create a Group</span></p></body></html> - - - - - + @@ -171,9 +103,15 @@ p, li { white-space: pre-wrap; } - - - + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + + buttonBox diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp index c11afcb91..b93210dc1 100644 --- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp +++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp @@ -97,6 +97,9 @@ ImHistoryBrowser::ImHistoryBrowser(const std::string &peerId, QTextEdit *edit, Q /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png")); + ui.headerFrame->setHeaderText(tr("Message History")); + m_peerId = peerId; m_isPrivateChat = !m_peerId.empty(); textEdit = edit; diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui index da1e4e647..634528f5b 100644 --- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui +++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui @@ -28,10 +28,7 @@ 0 - - - QFrame#frame_2{background-image: url(:/images/connect/connectFriendBanner.png)} - + QFrame::NoFrame @@ -41,59 +38,6 @@ 1 - - - 6 - - - 2 - - - 2 - - - 2 - - - 9 - - - 6 - - - - - - 64 - 64 - - - - - 64 - 64 - - - - - - - :/images/user/agt_forum64.png - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#ffffff;">Message History</span></p></body></html> - - - - @@ -264,6 +208,12 @@ border: 1px solid #CCCCCC;} + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + LineEditClear QLineEdit diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 6e42b982d..db6832793 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -409,6 +409,7 @@ images/typing.png images/trustsettings.png images/uploads.png + images/headerFrame.png images/loader/16-loader.gif images/loader/32-loader.gif images/loader/progress.gif diff --git a/retroshare-gui/src/gui/images/headerFrame.png b/retroshare-gui/src/gui/images/headerFrame.png new file mode 100644 index 000000000..94f6acfcf Binary files /dev/null and b/retroshare-gui/src/gui/images/headerFrame.png differ diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index e15812f44..20a88a6fc 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -46,6 +46,9 @@ ProfileManager::ProfileManager(QWidget *parent, Qt::WFlags flags) /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png")); + ui.headerFrame->setHeaderText(tr("Profile Manager")); + connect(ui.identityTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( identityTreeWidgetCostumPopupMenu( QPoint ) ) ); connect(ui.newIdentity_PB, SIGNAL(clicked()), this, SLOT(newIdentity())); connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity())); diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui index 2066efe31..cbad7aa33 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.ui +++ b/retroshare-gui/src/gui/profile/ProfileManager.ui @@ -16,492 +16,6 @@ 0 - - - 167777 - 167777 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - Qt::NoContextMenu @@ -520,10 +34,6 @@ padding: 0px 6px; font-size: 12px; } -*{ -color: black; -} - QComboBox QAbstractItemView { background-color:white; } @@ -757,79 +267,23 @@ border: 1px solid #CCCCCC;} - - - - 16777215 - 140 - - - - QFrame#frame_2{background-image: url(:/images/genbackground.png);} - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 3 - - - 3 - - - - - - 64 - 64 - - - - - - - :/images/contact_new128.png - - - true - - - - - - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:24pt; color:#ffffff;">Profile Manager</span></p></body></html> - - - - - - - + + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + genPGPuser - - - - - diff --git a/retroshare-gui/src/gui/style/StyleDialog.cpp b/retroshare-gui/src/gui/style/StyleDialog.cpp index ffbc22245..63caa9737 100644 --- a/retroshare-gui/src/gui/style/StyleDialog.cpp +++ b/retroshare-gui/src/gui/style/StyleDialog.cpp @@ -33,6 +33,9 @@ StyleDialog::StyleDialog(RSStyle &style, QWidget *parent, Qt::WFlags flags) : QD /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); + ui.headerFrame->setHeaderImage(QPixmap(":/images/library.png")); + ui.headerFrame->setHeaderText(tr("Define Style")); + /* Load window postion */ QByteArray geometry = Settings->valueFromGroup("StyleDialog", "Geometry", QByteArray()).toByteArray(); if (geometry.isEmpty() == false) { diff --git a/retroshare-gui/src/gui/style/StyleDialog.ui b/retroshare-gui/src/gui/style/StyleDialog.ui index 11c5b66b1..1b078083c 100644 --- a/retroshare-gui/src/gui/style/StyleDialog.ui +++ b/retroshare-gui/src/gui/style/StyleDialog.ui @@ -31,81 +31,7 @@ 0 - - - - 0 - 0 - - - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 9 - - - 6 - - - 9 - - - 6 - - - - - - 64 - 64 - - - - - 64 - 64 - - - - - - - :/images/library.png - - - true - - - - - - - - 18 - 75 - true - - - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt; color:#ffffff;">Define Style</span></p></body></html> - - - - - + @@ -254,6 +180,14 @@ p, li { white-space: pre-wrap; } + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 3e771e684..3bf4f920b 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 e5fd3a3c5..d13d48fc3 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -1917,7 +1917,7 @@ p, li { white-space: pre-wrap; } ConfCertDialog - + Cancel Abbrechen @@ -1993,12 +1993,13 @@ p, li { white-space: pre-wrap; } Letzter Kontakt - + + Friend Details Freund-Details - + Version @@ -2008,18 +2009,9 @@ p, li { white-space: pre-wrap; } Ort - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; color:#ffffff;">Friend Details</span></p></body></html> - - - - + Other infos - + Andere Informationen @@ -2088,7 +2080,7 @@ p, li { white-space: pre-wrap; } Use old key format - + Benutze altes Schlüsselformat @@ -2096,7 +2088,7 @@ p, li { white-space: pre-wrap; } Übernehmen und Schliessen - + RetroShare @@ -2532,7 +2524,7 @@ Die folgenden Wege sind möglich: Zeige mir: - + Make friend with these peers Füge diese Peers zu deinen Freunden hinzu @@ -2597,7 +2589,7 @@ Die folgenden Wege sind möglich: - + You have a friend request . @@ -3128,7 +3120,7 @@ Möchten Sie die Änderungen speichern? <span style="font-size:24pt; font-weight:500;color:#32CD32;">Neuer Kanal</span> - + Name Name @@ -3143,21 +3135,12 @@ Möchten Sie die Änderungen speichern? Schlüssel verteilen an - + Contacts: Kontakte: - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; font-weight:600; color:#ffffff;">New Channel</span></p></body></html> - - - - + Description Beschreibung @@ -3227,7 +3210,12 @@ p, li { white-space: pre-wrap; } Erstellen - + + New Channel + Neuer Kanal + + + Please add a Name Bitte einen Name hinzufügen @@ -3241,24 +3229,24 @@ p, li { white-space: pre-wrap; } CreateChannelMsg + New Channel Post Neuer Kanalbeitrag - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt; color:#ffffff;">New Channel Post</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt; color:#ffffff;">Neuer Kanalbeitrag</span></p></body></html> - + Channel Post Kanalbeitrag @@ -3328,7 +3316,7 @@ p, li { white-space: pre-wrap; } Drag'n'Drop Dateien aus den Suchergebnissen - + Paste RetroShare Links RetroShare Links einfügen @@ -3398,20 +3386,19 @@ p, li { white-space: pre-wrap; } Erstelle neues Forum - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">New Forum</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">Neues Forum</span></p></body></html> - + Name Name @@ -3426,7 +3413,12 @@ p, li { white-space: pre-wrap; } Schlüssel verteilen an - + + New Forum + Neues Forum + + + Contacts: Kontakte: @@ -3610,20 +3602,19 @@ p, li { white-space: pre-wrap; } Erstelle neues Forum - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">New Forum</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">Neues Forum</span></p></body></html> - + Name Name @@ -3638,7 +3629,12 @@ p, li { white-space: pre-wrap; } Schlüssel verteilen an - + + New Forum + Neues Forum + + + Contacts: Kontakte: @@ -3806,25 +3802,25 @@ p, li { white-space: pre-wrap; } CreateGroup + Create a Group Gruppe erstellen - <!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:18pt; font-weight:600; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Create a Group</span></p></body></html> ruppe erstellen - <!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:18pt; font-weight:600; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Gruppe erstellen</span></p></body></html> - + Group Name Name @@ -3834,38 +3830,38 @@ p, li { white-space: pre-wrap; } Gib einen Namen für Deine Gruppe ein - + + Edit Group Gruppe ändern - <!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:18pt; font-weight:600; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Edit Group</span></p></body></html> - <!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:18pt; font-weight:600; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Gruppe ändern</span></p></body></html> + <!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:18pt; font-weight:600; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:400; color:#ffffff;">Gruppe ändern</span></p></body></html> CreateLobbyDialog + Create Chat Lobby Erstelle Chat Lobby - <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:18pt; font-weight:600; color:#ffffff;">Create Chat Lobby</span></p></body></html> - <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:18pt; font-weight:600; color:#ffffff;">Neue Chat Lobby</span></p></body></html> - + A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab. Eine Chat Lobby ist ein dezentralisierter und anonymer Chat. Alle Teilnehmer erhalten alle Nachrichten. Wenn du eine Lobby erstellst, kannst du andere Freunde in der Freundesliste einladen. @@ -3918,7 +3914,7 @@ p, li { white-space: pre-wrap; } Freunde einladen - + Contacts: Kontakte: @@ -6507,24 +6503,24 @@ p, li { white-space: pre-wrap; } FriendRequest + Friend Request Freundschaftsanfrage - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#ffffff;">Friend Request</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#ffffff;">Freundschaftsanfrage</span></p></body></html> - + Confirm Bestätigen @@ -6612,7 +6608,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Bestätigen und Schliesen</span></p></body></html> - + RetroShare RetroShare @@ -8214,7 +8210,7 @@ p, li { white-space: pre-wrap; } GroupTreeWidget - + Enter a Keyword here Gib einen Suchbegriff ein @@ -8918,17 +8914,17 @@ p, li { white-space: pre-wrap; } ImHistoryBrowser + Message History Nachrichtenverlauf - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#ffffff;">Message History</span></p></body></html> - <!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;"> @@ -8939,8 +8935,8 @@ p, li { white-space: pre-wrap; } Zurücksetzen - - + + Copy Kopieren @@ -9061,7 +9057,7 @@ Die folgenden Wege sind möglich: MainWindow - + Network Netzwerk @@ -9368,7 +9364,7 @@ Bitte gib etwas Speicher frei und drücke OK. MessageComposer - + Compose Verfassen @@ -10729,7 +10725,7 @@ p, li { white-space: pre-wrap; } Klick zum Ändern deines Avatars - + Add a Friend Einen Freund hinzufügen @@ -10739,7 +10735,7 @@ p, li { white-space: pre-wrap; } Ordner für deine Freunde freigeben - + Search Friends Suche Freunde @@ -10776,7 +10772,7 @@ p, li { white-space: pre-wrap; } Freund weiterempfehlen... - + RetroShare Messenger @@ -13003,12 +12999,13 @@ Do you want to send them a Message instead ProfileManager - + + Profile Manager Profil Manager - + Generate New Identity Neue Identität erstellen @@ -13066,16 +13063,7 @@ Do you want to send them a Message instead - - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:24pt; color:#ffffff;">Profile Manager</span></p></body></html> - - - - + Export Identity Exportiere Identität @@ -14022,35 +14010,34 @@ Fehlermeldung: %2 Schnellstart Assistent - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt;">RetroShare!</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt;">RetroShare!</span></p></body></html> - + - + Next > Weiter > - + - + Exit Beenden - + For best performance, RetroShare needs to know a little about your connection to the internet. Für die beste Leistung muß RetroShare ein wenig über Deine Internetverbindung wissen. @@ -14097,13 +14084,13 @@ p, li { white-space: pre-wrap; } - + < Back < Zurück - + <!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; } @@ -14123,7 +14110,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Netzwerkweit</span><span style=" font-family:'Sans'; font-size:8pt;">: Dateien können von jedem über anoynme Tunnel heruntergeladen werden.</span></p></body></html> - + Directory Ordner @@ -14214,7 +14201,7 @@ p, li { white-space: pre-wrap; } Fertigstellen - + Select A Folder To Share Wählen Sie ein Ordner zum Freigeben @@ -14234,7 +14221,7 @@ p, li { white-space: pre-wrap; } Warnung! - + <!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; } @@ -15382,20 +15369,20 @@ The default value is 20. RetroShare Ordner freigeben - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Share Folder</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Ordner freigeben</span></p></body></html> - + + Share Folder Ordner @@ -15450,7 +15437,7 @@ p, li { white-space: pre-wrap; } Abbrechen - + Select A Folder To Share Wähle einen Ordner zum Freigeben aus @@ -15458,30 +15445,30 @@ p, li { white-space: pre-wrap; } ShareKey - + check peers you would like to share private publish key with Wähle die Nachbarn, an die du den privaten Schlüssel verteilen möchtest - + + Share Channel Verteile Kanal - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:18pt; font-weight:600; color:#ffffff;">Share Channel</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:18pt; font-weight:600; color:#ffffff;">Verteile Kanal</span></p></body></html> - + Share for Friend Verteile für Freund @@ -15491,7 +15478,7 @@ p, li { white-space: pre-wrap; } Wähle die Freunde aus, mit denen Du den Kanal teilen möchtest. - + Contacts: Kontakte: @@ -15526,7 +15513,7 @@ p, li { white-space: pre-wrap; } ShareManager - + Add a Share Directory Freigabe hinzufügen @@ -15536,7 +15523,12 @@ p, li { white-space: pre-wrap; } Freigabe entfernen - + + Share Manager + Freigabe Manager + + + If checked, the share is anonymously shared to anybody. Wenn aktiviert, dann ist dieser Ordner anonym feigegeben. @@ -15578,25 +15570,24 @@ p, li { white-space: pre-wrap; } Warnung! - + RetroShare Share Manager RetroShare Freigabe Manager - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Share Manager</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:26pt; font-weight:600; color:#ffffff;">Freigabe Manager</span></p></body></html> - + <!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; } @@ -15997,7 +15988,7 @@ p, li { white-space: pre-wrap; } - + Log In Anmelden @@ -16056,7 +16047,7 @@ p, li { white-space: pre-wrap; } <!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 align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-size:18pt; color:#55aaff;">Anmeldung</span></p><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:18pt; color:#55aaff;"></p></body></html> - + Login Failure Anmeldefehler @@ -16080,7 +16071,17 @@ Lockdatei: - + + Load Person Failure + + + + + Missing PGP Certificate + + + + Another RetroShare using the same profile is already running on your system. Please close that instance first, or choose another profile lock file: @@ -16098,7 +16099,7 @@ Lockdatei: - + Warning @@ -16462,24 +16463,24 @@ p, li { white-space: pre-wrap; } StyleDialog + Define Style Definiere Farben - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt; color:#ffffff;">Define Style</span></p></body></html> - <!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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:18pt; color:#ffffff;">Definiere Farben</span></p></body></html> - + Choose color Farbe wählen @@ -16500,7 +16501,7 @@ p, li { white-space: pre-wrap; } Stil - + None Kein diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 38c9c4c46..20e48d564 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -378,6 +378,7 @@ HEADERS += rshare.h \ gui/common/DropLineEdit.h \ gui/common/LinkTextBrowser.h \ gui/common/UserNotify.h \ + gui/common/HeaderFrame.h \ gui/style/RSStyle.h \ gui/style/StyleDialog.h \ gui/MessagesDialog.h \ @@ -515,6 +516,7 @@ FORMS += gui/StartDialog.ui \ gui/common/FriendSelectionWidget.ui \ gui/common/HashBox.ui \ gui/common/RsCollectionDialog.ui \ + gui/common/HeaderFrame.ui \ gui/style/StyleDialog.ui \ gui/dht/DhtWindow.ui \ gui/bwctrl/BwCtrlWindow.ui \ @@ -643,6 +645,7 @@ SOURCES += main.cpp \ gui/common/DropLineEdit.cpp \ gui/common/LinkTextBrowser.cpp \ gui/common/UserNotify.cpp \ + gui/common/HeaderFrame.cpp \ gui/style/RSStyle.cpp \ gui/style/StyleDialog.cpp \ gui/settings/rsharesettings.cpp \