diff --git a/plugins/LinksCloud/AddLinksDialog.ui b/plugins/LinksCloud/AddLinksDialog.ui index a8ae3fef2..26018091d 100644 --- a/plugins/LinksCloud/AddLinksDialog.ui +++ b/plugins/LinksCloud/AddLinksDialog.ui @@ -125,26 +125,13 @@ - + 16777215 40 - - QFrame#frame_3{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - diff --git a/plugins/LinksCloud/LinksDialog.ui b/plugins/LinksCloud/LinksDialog.ui index 7faeb43ad..f478977bd 100644 --- a/plugins/LinksCloud/LinksDialog.ui +++ b/plugins/LinksCloud/LinksDialog.ui @@ -487,32 +487,25 @@ background: white;} - + 16777215 32 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel QFrame::Raised - + 2 - - + + 24 @@ -530,8 +523,8 @@ border: 1px solid #CCCCCC;} - - + + Arial @@ -545,7 +538,7 @@ border: 1px solid #CCCCCC;} - + Qt::Horizontal @@ -558,7 +551,7 @@ border: 1px solid #CCCCCC;} - + Add new link diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 6ce05e30a..6a02faf98 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -490,16 +490,13 @@ void ChannelFeed::updateChannelMsgs() return; } + QPixmap chanImage; if (ci.pngImageLen != 0) { - QPixmap chanImage; chanImage.loadFromData(ci.pngChanImage, ci.pngImageLen, "PNG"); - iconLabel->setPixmap(chanImage); - iconLabel->setStyleSheet("QLabel{border: 3px solid white;}"); } else { - QPixmap defaulImage(CHAN_DEFAULT_IMAGE); - iconLabel->setPixmap(defaulImage); - iconLabel->setStyleSheet("QLabel{border: 2px solid white;border-radius: 10px;}"); + chanImage = QPixmap(CHAN_DEFAULT_IMAGE); } + iconLabel->setPixmap(chanImage); iconLabel->setEnabled(true); /* set Channel name */ diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index a13322f26..90533ff49 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -16,7 +16,7 @@ Qt::Horizontal - + 0 @@ -40,69 +40,53 @@ 0 - - - QFrame#chheaderframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + QFrame::StyledPanel QFrame::Raised - + 2 - - - - 0 + + + + + 24 + 24 + - - - - - 24 - 24 - - - - - - - :/images/channels32.png - - - true - - - - - - - - Arial - 10 - 75 - true - - - - Channels - - - - + + + + + :/images/channels32.png + + + true + + - - + + + + + Arial + 10 + 75 + true + + + + Channels + + + + + Qt::Horizontal @@ -114,33 +98,7 @@ border: 1px solid #CCCCCC;} - - - - true - - - Qt::NoFocus - - - Create Channel - - - - :/images/add_channel24.png:/images/add_channel24.png - - - - 32 - 16 - - - - true - - - - + Qt::NoFocus @@ -166,6 +124,32 @@ border: 1px solid #CCCCCC;} + + + + true + + + Qt::NoFocus + + + Create Channel + + + + :/images/add_channel24.png:/images/add_channel24.png + + + + 32 + 16 + + + + true + + + @@ -182,169 +166,73 @@ border: 1px solid #CCCCCC;} - + - - - QFrame#frame{background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #F2F2F2, stop:1 #E6E6E6); -border: 1px solid #CCCCCC;} - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - + + - 0 + 4 - - - - 16 + + + + + 64 + 64 + - - 9 + + + 64 + 64 + - - - - - 64 - 64 - - - - - 64 - 64 - - - - QLabel{ -border: 2px solid white; -border-radius: 10px; -} - - - - - - :/images/channels.png - - - true - - - - - - - - - - - - - - - Microsoft Sans Serif - 22 - 50 - false - - - - Channel Name - - - true - - - - - - - - - Qt::Horizontal + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + :/images/channels.png + + + true - - - - 2 + + + + + + + + - - 2 + + + Microsoft Sans Serif + 22 + 50 + false + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 26 - - - - Qt::NoFocus - - - Post to Channel - - - - :/images/mail_send.png:/images/mail_send.png - - - - 32 - 16 - - - - true - - - - + + Channel Name + + + true + + - + true @@ -354,7 +242,7 @@ border-radius: 10px; 0 0 - 364 + 398 16 @@ -378,7 +266,7 @@ border-radius: 10px; - + @@ -399,6 +287,88 @@ border-radius: 10px; + + + + + 16777215 + 25 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 26 + + + + Qt::NoFocus + + + Post to Channel + + + + :/images/mail_send.png:/images/mail_send.png + + + + 32 + 16 + + + + true + + + + + + + Qt::Horizontal + + + + 314 + 10 + + + + + + + + + + + Qt::Horizontal + + + diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index 1f716dc40..1453c2983 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -15,71 +15,43 @@ 0 - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + QFrame::StyledPanel QFrame::Raised - + 2 - - - - 0 + + + + - - - - - - - :/images/user/agt_forum24.png - - - - - - - - Arial - 10 - 75 - true - - - - Chat lobbies - - - - + + :/images/user/agt_forum24.png + + - + + + + + Arial + 10 + 75 + true + + + + Chat lobbies + + + + Qt::Horizontal @@ -92,7 +64,7 @@ border: 1px solid #CCCCCC;} - + Qt::NoFocus diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index 3d0db384c..1c6035fa7 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -187,10 +187,6 @@ ForumsDialog::ForumsDialog(QWidget *parent) QTreeWidgetItem *headerItem = ui.threadTreeWidget->headerItem(); headerItem->setText(COLUMN_THREAD_READ, ""); - m_ForumNameFont = QFont("Times", 12, QFont::Bold); - ui.forumName->setFont(m_ForumNameFont); - ui.threadTitle->setFont(m_ForumNameFont); - /* Initialize group tree */ ui.forumTreeWidget->initDisplayMenu(ui.displayButton); diff --git a/retroshare-gui/src/gui/ForumsDialog.h b/retroshare-gui/src/gui/ForumsDialog.h index 5fbd546eb..904e94ad3 100644 --- a/retroshare-gui/src/gui/ForumsDialog.h +++ b/retroshare-gui/src/gui/ForumsDialog.h @@ -142,7 +142,6 @@ private: std::string mCurrThreadId; int subscribeFlags; - QFont m_ForumNameFont; int lastViewType; std::string lastForumID; diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index 7b8200014..ab3de5fa8 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -40,68 +40,52 @@ 0 - - - QFrame#chheaderframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + QFrame::StyledPanel QFrame::Raised - + 2 - - - - 0 + + + + + 24 + 24 + - - - - - 24 - 24 - - - - - - - :/images/konversation.png - - - true - - - - - - - - Arial - 10 - 75 - true - - - - Forums - - - - + + + + + :/images/konversation.png + + + true + + - + + + + + Arial + 10 + 75 + true + + + + Forums + + + + Qt::Horizontal @@ -114,30 +98,7 @@ border: 1px solid #CCCCCC;} - - - - Qt::NoFocus - - - Create Forum - - - - :/images/new_forum16.png:/images/new_forum16.png - - - - 32 - 16 - - - - true - - - - + Qt::NoFocus @@ -163,6 +124,29 @@ border: 1px solid #CCCCCC;} + + + + Qt::NoFocus + + + Create Forum + + + + :/images/new_forum16.png:/images/new_forum16.png + + + + 32 + 16 + + + + true + + + @@ -221,32 +205,20 @@ border: 1px solid #CCCCCC;} - - 2 + + 0 0 - - - 0 - 0 - + + + 10 + 75 + true + - - - 16777215 - 1677215 - - - - -border: 2px solid #CCCCCC; -border-radius:6px; -background: white; - - - - + + true Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -345,11 +317,12 @@ background: white; - - QLabel#threadTitle{ -border: 2px solid #CCCCCC; -border-radius: 6px; -background: white;} + + + 10 + 75 + true + true @@ -497,31 +470,86 @@ background: white;} - + 0 32 - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel QFrame::Raised - + 2 - + + + + Qt::NoFocus + + + Start new Thread for Selected Forum + + + + :/images/mail_new.png:/images/mail_new.png + + + + 24 + 16 + + + + true + + + + + + + Qt::NoFocus + + + Reply Message + + + + :/images/mail_reply.png:/images/mail_reply.png + + + + 24 + 16 + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + 2 @@ -545,7 +573,7 @@ border: 1px solid #CCCCCC;} - + @@ -583,68 +611,6 @@ border: 1px solid #CCCCCC;} - - - - Qt::NoFocus - - - Reply Message - - - - :/images/mail_reply.png:/images/mail_reply.png - - - - 24 - 16 - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - Start new Thread for Selected Forum - - - - :/images/mail_new.png:/images/mail_new.png - - - - 24 - 16 - - - - true - - - @@ -654,7 +620,6 @@ border: 1px solid #CCCCCC;} - 10 75 true @@ -713,11 +678,6 @@ border: 1px solid #CCCCCC;} - - LinkTextBrowser - QTextBrowser -
gui/common/LinkTextBrowser.h
- GroupTreeWidget QWidget @@ -729,6 +689,11 @@ border: 1px solid #CCCCCC;} QLineEdit
gui/common/LineEditClear.h
 + + LinkTextBrowser + QTextBrowser +
gui/common/LinkTextBrowser.h
+ diff --git a/retroshare-gui/src/gui/ForumsV2Dialog.cpp b/retroshare-gui/src/gui/ForumsV2Dialog.cpp index afc2ed43f..dfbb0673e 100644 --- a/retroshare-gui/src/gui/ForumsV2Dialog.cpp +++ b/retroshare-gui/src/gui/ForumsV2Dialog.cpp @@ -203,10 +203,6 @@ ForumsV2Dialog::ForumsV2Dialog(QWidget *parent) QTreeWidgetItem *headerItem = ui.threadTreeWidget->headerItem(); headerItem->setText(COLUMN_THREAD_READ, ""); - m_ForumNameFont = QFont("Times", 12, QFont::Bold); - ui.forumName->setFont(m_ForumNameFont); - ui.threadTitle->setFont(m_ForumNameFont); - /* Initialize group tree */ ui.forumTreeWidget->initDisplayMenu(ui.displayButton); diff --git a/retroshare-gui/src/gui/ForumsV2Dialog.h b/retroshare-gui/src/gui/ForumsV2Dialog.h index 39c831d57..c4651a40c 100644 --- a/retroshare-gui/src/gui/ForumsV2Dialog.h +++ b/retroshare-gui/src/gui/ForumsV2Dialog.h @@ -216,7 +216,6 @@ private: std::string mCurrThreadId; int subscribeFlags; - QFont m_ForumNameFont; int lastViewType; std::string lastForumID; diff --git a/retroshare-gui/src/gui/ForumsV2Dialog.ui b/retroshare-gui/src/gui/ForumsV2Dialog.ui index 9091c887f..78ca64881 100644 --- a/retroshare-gui/src/gui/ForumsV2Dialog.ui +++ b/retroshare-gui/src/gui/ForumsV2Dialog.ui @@ -43,68 +43,52 @@ 0 - - - QFrame#chheaderframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + QFrame::StyledPanel QFrame::Raised - + 2 - - - - 0 + + + + + 24 + 24 + - - - - - 24 - 24 - - - - - - - :/images/konversation.png - - - true - - - - - - - - Arial - 10 - 75 - true - - - - Forums - - - - + + + + + :/images/konversation.png + + + true + + - + + + + + Arial + 10 + 75 + true + + + + Forums + + + + Qt::Horizontal @@ -117,30 +101,7 @@ border: 1px solid #CCCCCC;} - - - - Qt::NoFocus - - - Create Forum - - - - :/images/new_forum16.png:/images/new_forum16.png - - - - 32 - 16 - - - - true - - - - + Qt::NoFocus @@ -166,6 +127,29 @@ border: 1px solid #CCCCCC;} + + + + Qt::NoFocus + + + Create Forum + + + + :/images/new_forum16.png:/images/new_forum16.png + + + + 32 + 16 + + + + true + + + @@ -235,31 +219,20 @@ border: 1px solid #CCCCCC;} - - 2 + + 0 0 - - - 0 - 0 - + + + 10 + 75 + true + - - - 16777215 - 1677215 - - - - border: 2px solid #CCCCCC; -border-radius:6px; -background: white; - - - - + + true Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -358,11 +331,12 @@ background: white; - - QLabel#threadTitle{ -border: 2px solid #CCCCCC; -border-radius: 6px; -background: white;} + + + 10 + 75 + true + true @@ -510,31 +484,86 @@ background: white;} - + 0 32 - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel QFrame::Raised - + 2 - + + + + Qt::NoFocus + + + Start new Thread for Selected Forum + + + + :/images/mail_new.png:/images/mail_new.png + + + + 24 + 16 + + + + true + + + + + + + Qt::NoFocus + + + Reply Message + + + + :/images/mail_reply.png:/images/mail_reply.png + + + + 24 + 16 + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + 2 @@ -558,7 +587,7 @@ border: 1px solid #CCCCCC;} - + @@ -596,68 +625,6 @@ border: 1px solid #CCCCCC;} - - - - Qt::NoFocus - - - Reply Message - - - - :/images/mail_reply.png:/images/mail_reply.png - - - - 24 - 16 - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - Start new Thread for Selected Forum - - - - :/images/mail_new.png:/images/mail_new.png - - - - 24 - 16 - - - - true - - - @@ -667,7 +634,6 @@ border: 1px solid #CCCCCC;} - 10 75 true @@ -726,11 +692,6 @@ border: 1px solid #CCCCCC;} - - LinkTextBrowser - QTextBrowser -
gui/common/LinkTextBrowser.h
- GroupTreeWidget QWidget @@ -742,6 +703,11 @@ border: 1px solid #CCCCCC;} QLineEdit
gui/common/LineEditClear.h
 + + LinkTextBrowser + QTextBrowser +
gui/common/LinkTextBrowser.h
+ diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index de75ba933..6f24197fb 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -88,7 +88,7 @@ FriendsDialog::FriendsDialog(QWidget *parent) last_status_send_time = 0 ; inChatCharFormatChanged = false; - connect( ui.mypersonalstatuslabel, SIGNAL(clicked()), SLOT(statusmessage())); + connect( ui.mypersonalstatusLabel, SIGNAL(clicked()), SLOT(statusmessage())); connect( ui.actionSet_your_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar())); connect( ui.actionSet_your_Personal_Message, SIGNAL(triggered()), this, SLOT(statusmessage())); connect( ui.addfileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); @@ -212,7 +212,7 @@ FriendsDialog::FriendsDialog(QWidget *parent) // add self nick and Avatar to Friends. RsPeerDetails pd ; if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) { - ui.nicklabel->setText(PeerDefs::nameWithLocation(pd)); + ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd)); } /* Hide platform specific features */ @@ -755,7 +755,7 @@ void FriendsDialog::on_actionCreate_New_Channel_activated() /** Loads own personal status */ void FriendsDialog::loadmypersonalstatus() { - ui.mypersonalstatuslabel->setText(QString::fromUtf8(rsMsgs->getCustomStateString().c_str())); + ui.mypersonalstatusLabel->setText(QString::fromUtf8(rsMsgs->getCustomStateString().c_str())); } void FriendsDialog::statusmessage() diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 0808ca58f..500101831 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -25,59 +25,43 @@ 0 - - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + QFrame::StyledPanel QFrame::Raised - + 2 - - - - 0 + + + + - - - - - - - :/images/user/friends24.png - - - - - - - - Arial - 10 - 75 - true - - - - Friends - - - - + + :/images/user/friends24.png + + - + + + + + Arial + 10 + 75 + true + + + + Friends + + + + Qt::Horizontal @@ -90,36 +74,7 @@ border: 1px solid #CCCCCC;} - - - - Qt::NoFocus - - - Add - - - - - - - :/images/edit_add24.png:/images/edit_add24.png - - - - 32 - 16 - - - - QToolButton::InstantPopup - - - true - - - - + @@ -151,6 +106,35 @@ border: 1px solid #CCCCCC;} + + + + Qt::NoFocus + + + Add + + + + + + + :/images/edit_add24.png:/images/edit_add24.png + + + + 32 + 16 + + + + QToolButton::InstantPopup + + + true + + + @@ -181,13 +165,7 @@ border: 1px solid #CCCCCC;} 1 - - - - 0 - 0 - - + 0 @@ -200,15 +178,6 @@ border: 1px solid #CCCCCC;} 70 - - QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png)} - - - QFrame::StyledPanel - - - QFrame::Raised - 1 @@ -233,7 +202,7 @@ border: 1px solid #CCCCCC;} - + 0 @@ -246,43 +215,6 @@ border: 1px solid #CCCCCC;} 42 - - - - - - - 50 - 205 - 50 - - - - - - - - - 50 - 205 - 50 - - - - - - - - - 118 - 116 - 108 - - - - - - 16 @@ -320,7 +252,7 @@ border: 1px solid #CCCCCC;} - + 0 @@ -355,19 +287,18 @@ border: 1px solid #CCCCCC;} - + 16777215 38 - - QFrame#buttonframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} + + QFrame::StyledPanel + + + QFrame::Raised @@ -677,31 +608,27 @@ border: 1px solid #CCCCCC;} - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 321 - 20 - - - - - - - - Send - - - - + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 321 + 20 + + + + + + + + Send + + @@ -964,6 +891,12 @@ background: white;} QTextBrowser
gui/common/LinkTextBrowser.h
+ + HashBox + QScrollArea +
gui/common/HashBox.h
+ 1 + ChatTabWidget QTabWidget @@ -976,12 +909,6 @@ background: white;}
gui/common/AvatarWidget.h
1 - - HashBox - QScrollArea -
gui/common/HashBox.h
- 1 - FriendList QWidget diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 1e9bd1d41..32bcb7fd3 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -15,7 +15,7 @@ 1 - + 0 @@ -34,19 +34,6 @@ 36 - - - 0 - 68 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui index 86d1479a1..e6d220aba 100644 --- a/retroshare-gui/src/gui/MessengerWindow.ui +++ b/retroshare-gui/src/gui/MessengerWindow.ui @@ -112,37 +112,48 @@ - + 16777215 32 - - #frame { -border-image:none; -background-color: qlineargradient(x1: 0, y1: 0, x2: 0.0, y2: 1.0, -stop: 0 #ffffff, -stop: 0.4 #eeeeee, -stop: 0.401 #e2e2e2, -stop: 1 #dddddd); -color: #CCCCCC; -border-top: 1px solid #606060; -border-bottom: 1px solid #CCCCCC; -} - QFrame::StyledPanel QFrame::Raised - + 2 - + + + + 2 + + + + + + + + :/images/find-16.png + + + + + + + Search Friends + + + + + + @@ -180,7 +191,7 @@ border-bottom: 1px solid #CCCCCC; - + @@ -212,31 +223,7 @@ border-bottom: 1px solid #CCCCCC; - - - - 2 - - - - - - - - :/images/find-16.png - - - - - - - Search Friends - - - - - - + @@ -318,6 +305,11 @@ stop:0 #FEFEFE, stop:1 #E8E8E8); + + LineEditClear + QLineEdit +
gui/common/LineEditClear.h
+ AvatarWidget QLabel @@ -330,11 +322,6 @@ stop:0 #FEFEFE, stop:1 #E8E8E8);
gui/common/FriendList.h
1 - - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
- LogoBar QFrame diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 3ea216e97..647aa22b6 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -126,26 +126,25 @@ - + 0 32 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} + + QFrame::StyledPanel + + + QFrame::Raised - 1 + 2 - + 22 @@ -164,7 +163,7 @@ border: 1px solid #CCCCCC;} - + Arial diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui index 6c7c8ccc7..4a1a04381 100644 --- a/retroshare-gui/src/gui/SearchDialog.ui +++ b/retroshare-gui/src/gui/SearchDialog.ui @@ -6,8 +6,8 @@ 0 0 - 574 - 329 + 581 + 331 @@ -24,40 +24,24 @@ 0 - + 16777215 32 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} + + QFrame::StyledPanel - - - 3 + + QFrame::Raised + + + + 2 - - 0 - - - 3 - - - 0 - - - 6 - - - 0 - - + QToolButton, QPushButton, QComboBox { @@ -184,7 +168,7 @@ border-image: url(:/images/btn_26_pressed.png) 4; - + Qt::Horizontal @@ -200,7 +184,7 @@ border-image: url(:/images/btn_26_pressed.png) 4; - + 0 @@ -239,30 +223,6 @@ background: white;} 0 - - - - - 3 - 0 - - - - - 0 - 16 - - - - Enter a keyword here (at least 3 char long) - - - QLineEdit#lineEdit{background: transparent; -border: none;} - - - - @@ -302,6 +262,30 @@ border: none;} + + + + + 3 + 0 + + + + + 0 + 16 + + + + Enter a keyword here (at least 3 char long) + + + QLineEdit#lineEdit{background: transparent; +border: none;} + + + + @@ -340,7 +324,7 @@ border-image: url(:/images/btn3.png) 4; - + Qt::Horizontal @@ -356,7 +340,7 @@ border-image: url(:/images/btn3.png) 4; - + Advanced Search @@ -739,19 +723,18 @@ border-image: url(:/images/btn_26_pressed.png) 4; - + 16777215 38 - - QFrame#frame_3{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); -border-radius: 10px; -border: 2px solid #CCCCCC;} + + QFrame::StyledPanel + + + QFrame::Raised diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index 52d9aac24..60a87b148 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -855,7 +855,7 @@ void SharedFilesDialog::showFrame(bool show) ui.remoteButton->setChecked(false); ui.splittedButton->setChecked(false); - ui.labeltext->setText( tr("My Shared Files")); + ui.titleBarLabel->setText( tr("My Shared Files")); } } @@ -869,7 +869,7 @@ void SharedFilesDialog::showFrameRemote(bool show) ui.localButton->setChecked(false); ui.splittedButton->setChecked(false); - ui.labeltext->setText( tr("Friends Files")); + ui.titleBarLabel->setText( tr("Friends Files")); } } @@ -884,7 +884,7 @@ void SharedFilesDialog::showFrameSplitted(bool show) ui.localButton->setChecked(false); ui.remoteButton->setChecked(false); - ui.labeltext->setText( tr("Files")); + ui.titleBarLabel->setText( tr("Files")); } } diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 13db7ab26..815611d5d 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -14,337 +14,6 @@ 0 - - - - - 0 - 0 - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - - 2 - - - 6 - - - - - - 24 - 24 - - - - - - - :/images/fileshare24.png - - - true - - - - - - - - 16777215 - 16 - - - - - Arial - 10 - 75 - true - - - - Files - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 100 - 20 - - - - - - - - - All - - - - :/images/view_calendar_list.png:/images/view_calendar_list.png - - - - - One day old - - - - :/images/view_calendar_day.png:/images/view_calendar_day.png - - - - - One Week old - - - - :/images/view_calendar_week.png:/images/view_calendar_week.png - - - - - One month old - - - - :/images/view_calendar_month.png:/images/view_calendar_month.png - - - - - - - - 2 - - - - - - - - :/images/find-16.png - - - - - - - Search files - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - MS Shell Dlg 2 - - - - Qt::NoFocus - - - Start Search - - - - :/images/start.png:/images/start.png - - - true - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - MS Shell Dlg 2 - - - - Qt::NoFocus - - - Reset - - - QPushButton -{ - border-image: url(:/images/closenormal.png) -} - -QPushButton:hover -{ -border-image: url(:/images/closehover.png) -} - -QPushButton:pressed { -border-image: url(:/images/closepressed.png) -} - - - - - - - - - - - - - Tree view - - - - - Flat view - - - - - - - - - 24 - 24 - - - - Qt::NoFocus - - - Splitted View - - - - :/images/view_split_top_bottom.png:/images/view_split_top_bottom.png - - - true - - - true - - - true - - - - - - - - 24 - 24 - - - - Qt::NoFocus - - - Friends Folders - - - - :/images/friendsfolder24.png:/images/friendsfolder24.png - - - true - - - true - - - - - - - - 24 - 24 - - - - Qt::NoFocus - - - My Folders - - - - :/images/folder16.png:/images/folder16.png - - - true - - - true - - - - - - @@ -517,6 +186,333 @@ background: white;} + + + + + 0 + 0 + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + + 24 + 24 + + + + + + + :/images/fileshare24.png + + + true + + + + + + + + 16777215 + 16 + + + + + Arial + 10 + 75 + true + + + + Files + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 100 + 20 + + + + + + + + 2 + + + + + + + + :/images/find-16.png + + + + + + + Search files + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + + MS Shell Dlg 2 + + + + Qt::NoFocus + + + Start Search + + + + :/images/start.png:/images/start.png + + + true + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + + MS Shell Dlg 2 + + + + Qt::NoFocus + + + Reset + + + QPushButton +{ + border-image: url(:/images/closenormal.png) +} + +QPushButton:hover +{ +border-image: url(:/images/closehover.png) +} + +QPushButton:pressed { +border-image: url(:/images/closepressed.png) +} + + + + + + + + + + + + + Tree view + + + + + Flat view + + + + + + + + + All + + + + :/images/view_calendar_list.png:/images/view_calendar_list.png + + + + + One day old + + + + :/images/view_calendar_day.png:/images/view_calendar_day.png + + + + + One Week old + + + + :/images/view_calendar_week.png:/images/view_calendar_week.png + + + + + One month old + + + + :/images/view_calendar_month.png:/images/view_calendar_month.png + + + + + + + + + 24 + 24 + + + + Qt::NoFocus + + + Splitted View + + + + :/images/view_split_top_bottom.png:/images/view_split_top_bottom.png + + + true + + + true + + + true + + + + + + + + 24 + 24 + + + + Qt::NoFocus + + + Friends Folders + + + + :/images/friendsfolder24.png:/images/friendsfolder24.png + + + true + + + true + + + + + + + + 24 + 24 + + + + Qt::NoFocus + + + My Folders + + + + :/images/folder16.png:/images/folder16.png + + + true + + + true + + + + + + diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index 0297c93ef..2fe0208fa 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -129,13 +129,50 @@ border-image: url(:/images/avatar_background.png); 32 + + + + + + + 85 + 170 + 255 + + + + + + + + + 85 + 170 + 255 + + + + + + + + + 118 + 116 + 108 + + + + + + + + + 18 + + - <!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;">Login</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 diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index 1949b2715..a8ad8ab99 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -21,108 +21,6 @@ 0 - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - 0 - - - 6 - - - - - - - - :/images/down.png - - - - - - - - Arial - 10 - 75 - true - - - - Downloads - - - - - - - - - Qt::Horizontal - - - - 483 - 20 - - - - - - - - Qt::NoFocus - - - Open Collection - - - - - - - Qt::ClickFocus - - - Show cache transfers - - - - - - @@ -178,6 +76,91 @@ border: 1px solid #CCCCCC;} + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + + + + :/images/down.png + + + + + + + + Arial + 10 + 75 + true + + + + Downloads + + + + + + + Qt::Horizontal + + + + 483 + 20 + + + + + + + + Qt::NoFocus + + + Open Collection + + + + + + + Qt::ClickFocus + + + Show cache transfers + + + + + + @@ -266,7 +249,7 @@ border: 1px solid #CCCCCC;} - + diff --git a/retroshare-gui/src/gui/common/HeaderFrame.ui b/retroshare-gui/src/gui/common/HeaderFrame.ui index 324ccfc67..52cd2b7d6 100644 --- a/retroshare-gui/src/gui/common/HeaderFrame.ui +++ b/retroshare-gui/src/gui/common/HeaderFrame.ui @@ -18,97 +18,43 @@ - 0 + 12 - - 0 + + 6 + + + 6 - - - QFrame#headerFrame { - background-image: url(:/images/headerFrame.png); -} + + + + 64 + 64 + + + + + 64 + 64 + + + + true + + + + + + + + 18 + + + + Header text - - - 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/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui index 4933aef3a..205d93e60 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui @@ -84,19 +84,15 @@ - + 16777215 38 - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} + + QFrame::StyledPanel QFrame::Raised diff --git a/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui b/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui index ee02caffb..8a75ccdca 100644 --- a/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui +++ b/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui @@ -84,19 +84,15 @@ - + 16777215 38 - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} + + QFrame::StyledPanel QFrame::Raised diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui index 634528f5b..cee062c93 100644 --- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui +++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui @@ -41,28 +41,21 @@ - + 16777215 38 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel QFrame::Raised - - + + 1 @@ -82,7 +75,7 @@ border: 1px solid #CCCCCC;} - + @@ -208,20 +201,21 @@ border: 1px solid #CCCCCC;} + + LineEditClear + QLineEdit +
gui/common/LineEditClear.h
+ HeaderFrame QFrame
gui/common/HeaderFrame.h
1 - - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
- + diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.ui b/retroshare-gui/src/gui/msgs/MessageWindow.ui index 53fbde101..560747e15 100644 --- a/retroshare-gui/src/gui/msgs/MessageWindow.ui +++ b/retroshare-gui/src/gui/msgs/MessageWindow.ui @@ -23,7 +23,7 @@ 0 - + 0 @@ -42,19 +42,6 @@ 36 - - - 0 - 68 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.ui b/retroshare-gui/src/gui/profile/ProfileWidget.ui index 69ba220c3..b784a14f2 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.ui +++ b/retroshare-gui/src/gui/profile/ProfileWidget.ui @@ -24,44 +24,18 @@ 0 - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - + QFrame::StyledPanel QFrame::Raised - - - 1 + + + 2 - - 1 - - - 1 - - - - - Qt::Horizontal - - - - 298 - 20 - - - - - + Edit Personal message @@ -81,7 +55,7 @@ border: 1px solid #CCCCCC;} - + Copy Certificate @@ -98,7 +72,7 @@ border: 1px solid #CCCCCC;} - + Profile Manager @@ -121,6 +95,19 @@ border: 1px solid #CCCCCC;} + + + + Qt::Horizontal + + + + 298 + 20 + + + + @@ -135,7 +122,7 @@ border: 1px solid #CCCCCC;} 0 0 498 - 569 + 567 @@ -1180,6 +1167,8 @@ border: 2px solid #CCCCCC;} + + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 84cf110b9..7e379cf61 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -1 +1,55 @@ /* Standard stylesheet for RetroShare */ + +/* Standard rules */ + +QFrame#titleBarFrame, QFrame#toolBarFrame { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8); + border: 1px solid #CCCCCC; +} + +/* HeaderFrame */ + +HeaderFrame { + background-image: url(:/images/headerFrame.png); + border: 0px; +} +HeaderFrame QLabel#headerLabel { + color: rgb(255, 255, 255); +} + +/* FriendsDialog */ + +FriendsDialog QLabel#nicknameLabel { + color: rgb(50, 205, 50); +} +FriendsDialog QFrame#headerFrame { + background-image: url(:/images/headerFrame.png); + border: 0px; +} + +/* ChannelFeed */ + +ChannelFeed QFrame#headerFrame { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F2F2F2, stop:1 #E6E6E6); + border: 1px solid #CCCCCC; +} + +ChannelFeed QFrame#headerFrame QLabel#iconLabel { + border: 2px solid white; +} + +/* ForumsDialog */ + +ForumsDialog QLabel#forumName, ForumsDialog QLabel#threadTitle +{ + border: 2px solid #CCCCCC; + border-radius:6px; + background: white; +} + +ForumsDialog2 QLabel#forumName, ForumsDialog2 QLabel#threadTitle +{ + border: 2px solid #CCCCCC; + border-radius:6px; + background: white; +} diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index c4be3a9e7..c2c3d03e9 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -1,6 +1,8 @@ /* Default stylesheet This file is used as default for all stylesheets and can be overloaded */ +/* AvatarWidget */ + AvatarWidget{border-width: 10px;} AvatarWidget[frameState="NORMAL"]{border-image:url(:/images/avatarstatus-bg-116.png);} AvatarWidget[frameState="OFFLINE"]{border-image:url(:/images/avatarstatus-bg-offline-116.png);} diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index d13d48fc3..742cfa1ba 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -1091,7 +1091,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:'Arial'; font-size:10pt; font-weight:600;">Kanäle</span></p></body></html> - + Display Anzeige @@ -1104,7 +1104,7 @@ p, li { white-space: pre-wrap; } Aktiviere Auto-Download - + Create Channel Kanal erstellen @@ -1121,17 +1121,17 @@ p, li { white-space: pre-wrap; } Abonnieren - + Channels Kanäle - + Loading Lade - + Set all as read @@ -1162,7 +1162,7 @@ p, li { white-space: pre-wrap; } Andere Kanäle - + Post to Channel Kanalbeitrag erstellen @@ -1209,7 +1209,7 @@ p, li { white-space: pre-wrap; } Deaktiviere Auto-Download - + @@ -1349,12 +1349,12 @@ 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-weight:600;">Chat Lobbies</span></p></body></html> - + Chat lobbies Chat Lobbies - + Create new chat lobby Neue Chat Lobby erstellen @@ -3496,17 +3496,17 @@ p, li { white-space: pre-wrap; } CreateForumMsg - + Post Forum Msg Forumbeitrag schreiben - + Forum Forum - + Forum Post Beitrag @@ -3516,22 +3516,22 @@ p, li { white-space: pre-wrap; } Beitrag unterschreiben - + Subject Betreff - + Close Schliessen - + Post Forum Message Erstelle Forumbeitrag - + Paste RetroShare Link RetroShare Link einfügen @@ -3727,7 +3727,7 @@ p, li { white-space: pre-wrap; } Betreff - + Attach File Datei anhängen @@ -5629,17 +5629,17 @@ 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:'Arial'; font-weight:600;">Foren</span></p></body></html> - + Thread: Thema: - + Start new Thread for Selected Forum Starte ein neues Thema im ausgewählten Forum - + Display Anzeige @@ -5656,7 +5656,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;">Forum:</p></body></html> - + Last Post Letzter Beitrag @@ -5672,34 +5672,34 @@ p, li { white-space: pre-wrap; } - + Date Datum - - + + Title Titel - + Forums Foren - + Forum: Forum: - + Author Autor - + Signed Unterzeichnet @@ -5736,27 +5736,27 @@ p, li { white-space: pre-wrap; } Nächste ungelesene - + Search forums Suche Foren - + Reply Message Auf Beitrag antworten - + Loading Lade - + Create Forum Forum erstellen - + Print Drucken @@ -5788,7 +5788,7 @@ p, li { white-space: pre-wrap; } Zurücksetzen - + Content Inhalt @@ -5847,22 +5847,22 @@ 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:'Arial'; font-weight:600;">Foren</span></p></body></html> - + Forums Foren - + Display Anzeige - + Create Forum Forum erstellen - + Forum: Forum: @@ -5883,24 +5883,24 @@ p, li { white-space: pre-wrap; } - + Title Titel - - + + Date Datum - - + + Author Autor - + Signed @@ -5930,7 +5930,7 @@ p, li { white-space: pre-wrap; } Nächste ungelesene - + Search forums Suche Foren @@ -5940,17 +5940,17 @@ p, li { white-space: pre-wrap; } Inhalt - + Reply Message - + Start new Thread for Selected Forum Starte ein neues Thema im ausgewählten Forum - + Loading Lade @@ -6713,17 +6713,17 @@ 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-weight:600;">Freunde</span></p></body></html> - + Add Hinzufügen - + Display Anzeige - + Friends Freunde @@ -6736,7 +6736,7 @@ p, li { white-space: pre-wrap; } Wähle oder ändere dein Avatar Bild - + Edit Personal message Statusnachricht ändern @@ -6746,12 +6746,12 @@ p, li { white-space: pre-wrap; } Gruppenchat - + Messages entered here are sent to all connected friends Nachrichten, die Du hier eingibst, werden an alle verbundenen Freunde versendet - + Bold Fett @@ -6781,12 +6781,12 @@ p, li { white-space: pre-wrap; } Datei anhängen - + Send Senden - + Clear Chat History Nachrichtenverlauf leeren @@ -8935,7 +8935,7 @@ p, li { white-space: pre-wrap; } Zurücksetzen - + Copy Kopieren @@ -10171,7 +10171,7 @@ p, li { white-space: pre-wrap; } MessageWindow - + New Message Neue Nachricht @@ -10303,7 +10303,7 @@ p, li { white-space: pre-wrap; } MessagesDialog - + New Message Neue Nachricht @@ -10725,7 +10725,7 @@ p, li { white-space: pre-wrap; } Klick zum Ändern deines Avatars - + Add a Friend Einen Freund hinzufügen @@ -10735,7 +10735,7 @@ p, li { white-space: pre-wrap; } Ordner für deine Freunde freigeben - + Search Friends Suche Freunde @@ -10772,7 +10772,7 @@ p, li { white-space: pre-wrap; } Freund weiterempfehlen... - + RetroShare Messenger @@ -10954,25 +10954,25 @@ Rechtsklick und als Freund hinzufügen um zu verbinden. - + Name Name - - + + Did I authenticated peer Habe ich den Peer authentifiziert - + Did I sign his gpg key Habe ich seinen GPG Schlüssel unterzeichnet - + Cert Id ID des Zertifikates @@ -11038,14 +11038,14 @@ p, li { white-space: pre-wrap; } Erstelle ein neues Profil - - + + Network Netzwerk - - + + Did peer authenticated me Hat mich der Peer authentifiziert @@ -13238,7 +13238,7 @@ und den Import zum Laden verwenden ProfileWidget - + Edit Personal message Statusnachricht ändern @@ -13254,7 +13254,7 @@ und den Import zum Laden verwenden Profil Manager - + Public Information Öffentliche Informationen @@ -14637,6 +14637,11 @@ p, li { white-space: pre-wrap; } Unable to open log file '%1': %2 Kann Logdatei nicht öffnen '%1': %2 + + + built-in + + RsidPage @@ -14691,7 +14696,7 @@ p, li { white-space: pre-wrap; } SearchDialog - + Sources Quellen @@ -14707,7 +14712,7 @@ p, li { white-space: pre-wrap; } Herunterladen - + Enter a keyword here (at least 3 char long) Gib einen Suchbegriff ein (min. 3 Zeichen) @@ -14749,7 +14754,7 @@ p, li { white-space: pre-wrap; } Neu(e) RetroShare Link(s) - + Any Alle @@ -14894,7 +14899,7 @@ p, li { white-space: pre-wrap; } Ausgewählte herunterladen - + Include files from your own file list in the search result Schließe Dateien von dir in die Suchresultate ein @@ -14935,7 +14940,7 @@ p, li { white-space: pre-wrap; } Zurücksetzen - + Advanced Search Erweiterte Suche @@ -15657,13 +15662,13 @@ p, li { white-space: pre-wrap; } SharedFilesDialog - + Download Herunterladen - + Splitted View Geteiltes Fenster @@ -15695,7 +15700,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:'MS Shell Dlg 2'; font-weight:600;">Dateien</span></p></body></html> - + All Alle @@ -15715,7 +15720,7 @@ p, li { white-space: pre-wrap; } Einen Monat alt - + Search files Suche Dateien @@ -15740,7 +15745,7 @@ p, li { white-space: pre-wrap; } Listenansicht - + check files Prüfe Dateien @@ -15988,7 +15993,12 @@ p, li { white-space: pre-wrap; } - + + Login + Anmeldung + + + Log In Anmelden @@ -16037,14 +16047,13 @@ p, li { white-space: pre-wrap; } Passwort speichern - <!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;">Login</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> - <!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> + <!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> @@ -16903,12 +16912,12 @@ 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-weight:600;">Downloads:</span></p></body></html> - + Downloads Downloads - + Open Collection Öffne Kollektion @@ -16918,7 +16927,7 @@ p, li { white-space: pre-wrap; } Zeige Cache Übertragungen - + Uploads