diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 6a02faf98..3369c86f4 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -485,8 +485,8 @@ void ChannelFeed::updateChannelMsgs() if (!rsChannels->getChannelInfo(mChannelId, ci)) { postButton->setEnabled(false); nameLabel->setText(tr("No Channel Selected")); - iconLabel->setPixmap(QPixmap(":/images/channels.png")); - iconLabel->setEnabled(false); + logoLabel->setPixmap(QPixmap(":/images/channels.png")); + logoLabel->setEnabled(false); return; } @@ -496,8 +496,8 @@ void ChannelFeed::updateChannelMsgs() } else { chanImage = QPixmap(CHAN_DEFAULT_IMAGE); } - iconLabel->setPixmap(chanImage); - iconLabel->setEnabled(true); + logoLabel->setPixmap(chanImage); + logoLabel->setEnabled(true); /* set Channel name */ nameLabel->setText(QString::fromStdWString(ci.channelName)); diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index 90533ff49..f0df8f9c8 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -23,15 +23,6 @@ 0 - - QFrame#chanFrame{border: none;} - - - QFrame::StyledPanel - - - QFrame::Raised - 2 @@ -174,7 +165,7 @@ 4 - + 64 @@ -242,7 +233,7 @@ 0 0 - 398 + 413 16 @@ -289,12 +280,6 @@ - - - 16777215 - 25 - - QFrame::StyledPanel @@ -307,24 +292,6 @@ - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 26 - - Qt::NoFocus diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 500101831..da045eee7 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -17,7 +17,7 @@ Qt::Horizontal - + 6 @@ -160,7 +160,7 @@ - + 1 @@ -886,6 +886,18 @@ background: white;} + + AvatarWidget + QLabel +
gui/common/AvatarWidget.h
+ 1 + + + FriendList + QWidget +
gui/common/FriendList.h
+ 1 + LinkTextBrowser QTextBrowser @@ -903,18 +915,6 @@ background: white;}
gui/chat/ChatTabWidget.h
1 - - AvatarWidget - QLabel -
gui/common/AvatarWidget.h
- 1 - - - FriendList - QWidget -
gui/common/FriendList.h
- 1 - diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui index e6d220aba..4ade112df 100644 --- a/retroshare-gui/src/gui/MessengerWindow.ui +++ b/retroshare-gui/src/gui/MessengerWindow.ui @@ -33,15 +33,6 @@ 82 - - - - - QFrame::NoFrame - - - QFrame::Raised - 6 @@ -79,9 +70,6 @@ 0 - - - QToolButton::InstantPopup @@ -155,24 +143,9 @@ - - - 0 - 0 - - - - - 32 - 32 - - Add a Friend - - - :/images/user/add_user24.png:/images/user/add_user24.png @@ -183,9 +156,6 @@ 24 - - Qt::ToolButtonTextBesideIcon - true @@ -193,21 +163,9 @@ - - - 0 - 0 - - Share Files for your Friends - - - - - - :/images/friendsfolder24.png:/images/friendsfolder24.png @@ -247,20 +205,13 @@ - + 0 65 - - QFrame#logoframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::NoFrame @@ -270,14 +221,11 @@ border: 1px solid #CCCCCC;} - - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); -} - + + + 3 + diff --git a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui index cd9ff4649..cf7b46fc8 100644 --- a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui +++ b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui @@ -29,53 +29,6 @@ 130 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - -QToolButton, QPushButton, QComboBox { -border-image: url(:/images/btn_26.png) 4; -border-width: 4; -padding: 0px 6px; -font-size: 12px; -} - -*{ -color: black; -} - -QComboBox QAbstractItemView { -background-color:white; -} - -QComboBox::down-arrow { -image: url(:/images/combobox_arrow.png); -} - -QComboBox:drop-down -{ -subcontrol-origin: padding; -subcontrol-position: top right; -border-left-style: none; -border-top-right-radius: 1px; -border-bottom-right-radius: 1px; -} - -QToolButton:hover, QPushButton:hover, QComboBox:hover { -border-image: url(:/images/btn_26_hover.png) 4; -} - -QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { -color:gray; -} - -QToolButton:pressed, QPushButton:pressed{ -border-image: url(:/images/btn_26_pressed.png) 4; -} - QFrame::StyledPanel @@ -100,13 +53,6 @@ border-image: url(:/images/btn_26_pressed.png) 4; false - - QWidget#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - Search Criteria @@ -137,12 +83,6 @@ border: 1px solid #CCCCCC;} false - - QFrame::NoFrame - - - QFrame::Raised - @@ -174,9 +114,6 @@ border: 1px solid #CCCCCC;} Add a further search criterion. - - - :/images/add_24x24.png:/images/add_24x24.png diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.ui b/retroshare-gui/src/gui/advsearch/expressionwidget.ui index 02f9c252c..9e7d2d780 100644 --- a/retroshare-gui/src/gui/advsearch/expressionwidget.ui +++ b/retroshare-gui/src/gui/advsearch/expressionwidget.ui @@ -31,10 +31,6 @@ Expression Widget - - QWidget#ExpressionWidget{ -background: transparent;} - 6 @@ -56,12 +52,6 @@ background: transparent;} 26 - - QFrame::NoFrame - - - QFrame::Raised - @@ -78,12 +68,6 @@ background: transparent;} 26 - - QFrame::NoFrame - - - QFrame::Raised - @@ -100,12 +84,6 @@ background: transparent;} 26 - - QFrame::NoFrame - - - QFrame::Raised - @@ -122,34 +100,13 @@ background: transparent;} 26 - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - 0 - - - - - 20 - 20 - - Delete this expression - - - :/images/delete.png:/images/delete.png diff --git a/retroshare-gui/src/gui/channels/CreateChannel.cpp b/retroshare-gui/src/gui/channels/CreateChannel.cpp index de78fce8d..c19f33e47 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannel.cpp @@ -47,8 +47,7 @@ CreateChannel::CreateChannel(QWidget *parent) connect( ui.cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancelChannel( ) ) ); connect( ui.createButton, SIGNAL( clicked ( bool ) ), this, SLOT( createChannel( ) ) ); - connect( ui.LogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); - connect( ui.ChannelLogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); + connect( ui.logoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); connect( ui.pubKeyShare_cb, SIGNAL( clicked() ), this, SLOT( setShareList( ) )); if (!ui.pubKeyShare_cb->isChecked()) { @@ -150,5 +149,5 @@ void CreateChannel::addChannelLogo() // the same function as in EditChanDetails picture = img; // to show the selected - ui.ChannelLogoButton->setIcon(picture); + ui.logoLabel->setPixmap(picture); } diff --git a/retroshare-gui/src/gui/channels/CreateChannel.ui b/retroshare-gui/src/gui/channels/CreateChannel.ui index 287ea8bfd..9241e6370 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.ui +++ b/retroshare-gui/src/gui/channels/CreateChannel.ui @@ -6,8 +6,8 @@ 0 0 - 696 - 509 + 703 + 611 @@ -17,24 +17,18 @@ :/images/rstray3.png:/images/rstray3.png - - - 0 - + 0 - + + 0 + + - + - - QFrame::NoFrame - - - QFrame::Raised - @@ -284,7 +278,7 @@ - + 64 @@ -297,29 +291,22 @@ 64 - - -border: 2px solid white; -border-radius: 10px; - + + QFrame::StyledPanel - - + + QFrame::Raised - - - :/images/channels.png:/images/channels.png + + :/images/channels.png - - - 64 - 64 - + + true - + Add Channel Logo diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.ui b/retroshare-gui/src/gui/channels/CreateChannelMsg.ui index 9037fd1c3..ce12f36da 100644 --- a/retroshare-gui/src/gui/channels/CreateChannelMsg.ui +++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.ui @@ -139,9 +139,6 @@ p, li { white-space: pre-wrap; } 0 - - - :/images/thumb-default-video.png @@ -298,7 +295,7 @@ p, li { white-space: pre-wrap; } 0 0 511 - 28 + 24 @@ -328,16 +325,6 @@ p, li { white-space: pre-wrap; } Drag and Drop Files from Search Results - - QFrame#fileFrame{border: 2px solid black; -background: white;} - - - QFrame::StyledPanel - - - QFrame::Raised - diff --git a/retroshare-gui/src/gui/channels/EditChanDetails.cpp b/retroshare-gui/src/gui/channels/EditChanDetails.cpp index 2a655ceef..a881a2857 100644 --- a/retroshare-gui/src/gui/channels/EditChanDetails.cpp +++ b/retroshare-gui/src/gui/channels/EditChanDetails.cpp @@ -43,32 +43,12 @@ EditChanDetails::EditChanDetails(QWidget *parent, Qt::WFlags flags, std::string connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); - connect( ui.LogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); - connect( ui.ChannelLogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); + connect( ui.logoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); - ui.ChannelLogoButton->setDisabled(true); - ui.LogoButton->setDisabled(true); + ui.logoButton->setDisabled(true); + ui.logoLabel->setDisabled(true); loadChannel(); - -} - - -/** - Overloads the default show() slot so we can set opacity*/ - -void EditChanDetails::show() -{ - - if(!this->isVisible()) { - QDialog::show(); - - } -} - -void EditChanDetails::closeEvent (QCloseEvent * event) -{ - QWidget::closeEvent(event); } void EditChanDetails::closeinfodlg() @@ -76,13 +56,11 @@ void EditChanDetails::closeinfodlg() close(); } - void EditChanDetails::loadChannel() { - if (!rsChannels) { - return; + return; } ChannelInfo ci; @@ -95,23 +73,21 @@ void EditChanDetails::loadChannel() ui.DescriptiontextEdit->setText(QString::fromStdWString(ci.channelDesc)); // Set Channel Logo + QPixmap chanImage; if(ci.pngImageLen != 0) { - QPixmap chanImage; chanImage.loadFromData(ci.pngChanImage, ci.pngImageLen, "PNG"); - ui.ChannelLogoButton->setIcon(QIcon(chanImage)); } else { - QPixmap defaulImage(CHAN_DEFAULT_IMAGE); - ui.ChannelLogoButton->setIcon(QIcon(defaulImage)); + chanImage = QPixmap(CHAN_DEFAULT_IMAGE); } + ui.logoLabel->setPixmap(chanImage); } void EditChanDetails::applyDialog() { - if(!rsChannels) return; @@ -124,7 +100,6 @@ void EditChanDetails::applyDialog() ci.channelName = misc::removeNewLine(ui.nameline->text()).toStdWString(); ci.channelDesc = ui.DescriptiontextEdit->document()->toPlainText().toStdWString(); - /* reload now */ rsChannels->channelEditInfo(mChannelId, ci); @@ -134,7 +109,6 @@ void EditChanDetails::applyDialog() return; } - void EditChanDetails::addChannelLogo() // the same function as in CreateChannel { QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load channel logo"), 64, 64); @@ -145,6 +119,5 @@ void EditChanDetails::addChannelLogo() // the same function as in CreateChannel picture = img; // to show the selected - ui.ChannelLogoButton->setIcon(picture); + ui.logoLabel->setPixmap(picture); } - diff --git a/retroshare-gui/src/gui/channels/EditChanDetails.h b/retroshare-gui/src/gui/channels/EditChanDetails.h index b5c7b81fe..e13650ffb 100644 --- a/retroshare-gui/src/gui/channels/EditChanDetails.h +++ b/retroshare-gui/src/gui/channels/EditChanDetails.h @@ -30,41 +30,27 @@ class EditChanDetails : public QDialog { Q_OBJECT -public: - +public: /** Default constructor */ EditChanDetails(QWidget *parent = 0, Qt::WFlags flags = 0, std::string cId = ""); /** Default destructor */ - + signals: - void configChanged() ; + void configChanged(); -public slots: - /** Overloaded QWidget.show */ - void show(); - - -protected: - void closeEvent (QCloseEvent * event); - private slots: - void closeinfodlg(); void applyDialog(); void addChannelLogo(); - - -private: +private: void loadChannel(); std::string mChannelId; - QPixmap picture; - + /** Qt Designer generated object */ Ui::EditChanDetails ui; - }; #endif diff --git a/retroshare-gui/src/gui/channels/EditChanDetails.ui b/retroshare-gui/src/gui/channels/EditChanDetails.ui index 8d2e0a9ca..1660e4c22 100644 --- a/retroshare-gui/src/gui/channels/EditChanDetails.ui +++ b/retroshare-gui/src/gui/channels/EditChanDetails.ui @@ -116,7 +116,7 @@ - + Add Channel Logo @@ -127,7 +127,7 @@ - + 64 @@ -140,24 +140,17 @@ 64 - - -border: 2px solid white; -border-radius: 10px; - + + QFrame::StyledPanel - - + + QFrame::Raised - - - :/images/channels.png:/images/channels.png + + :/images/channels.png - - - 64 - 64 - + + true diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui index 60cc289d1..f39397f65 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui @@ -32,7 +32,7 @@ 0 - + 0 @@ -45,15 +45,6 @@ 16777215 - - QFrame#frame{border: transparent} - - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -110,15 +101,6 @@ 16777215 - - border: transparent; - - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -133,15 +115,7 @@ 3 - - - QListWidget{ - border: 1px solid #B8B6B1; - border-radius: 6px; - background: white; -} - - + diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 412bf1c6a..2693c812f 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -91,15 +91,15 @@ ChatWidget::ChatWidget(QWidget *parent) : connect(ui->textBrowser, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTextBrowser(QPoint))); - connect(ui->chattextEdit, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); + connect(ui->chatTextEdit, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); // reset text and color after removing all characters from the QTextEdit and after calling QTextEdit::clear - connect(ui->chattextEdit, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(chatCharFormatChanged())); + connect(ui->chatTextEdit, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(chatCharFormatChanged())); - ui->infoframe->setVisible(false); - ui->statusmessagelabel->hide(); + ui->infoFrame->setVisible(false); + ui->statusMessageLabel->hide(); setAcceptDrops(true); - ui->chattextEdit->setAcceptDrops(false); + ui->chatTextEdit->setAcceptDrops(false); ui->hashBox->setDropWidget(this); ui->hashBox->setAutoHide(true); @@ -115,7 +115,7 @@ ChatWidget::ChatWidget(QWidget *parent) : menu->addAction(ui->actionMessageHistory); ui->pushtoolsButton->setMenu(menu); - ui->chattextEdit->installEventFilter(this); + ui->chatTextEdit->installEventFilter(this); #ifdef RS_RELEASE_VERSION ui->attachPictureButton->setVisible(false); @@ -133,7 +133,7 @@ ChatWidget::~ChatWidget() void ChatWidget::addChatButton(QPushButton *button) { - ui->chatButtonLayout->addWidget(button) ; + ui->toolBarFrame->layout()->addWidget(button) ; } void ChatWidget::init(const std::string &peerId, const QString &title) @@ -220,7 +220,7 @@ void ChatWidget::processSettings(bool load) bool ChatWidget::eventFilter(QObject *obj, QEvent *event) { - if (obj == ui->chattextEdit) { + if (obj == ui->chatTextEdit) { if (event->type() == QEvent::KeyPress) { updateStatusTyping(); @@ -236,7 +236,7 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event) } else { if (keyEvent->modifiers() & Qt::ControlModifier) { // insert return - ui->chattextEdit->textCursor().insertText("\n"); + ui->chatTextEdit->textCursor().insertText("\n"); } else { // send message with Enter sendChat(); @@ -296,7 +296,7 @@ void ChatWidget::removeFromParent(QWidget *oldParent) void ChatWidget::focusDialog() { - ui->chattextEdit->setFocus(); + ui->chatTextEdit->setFocus(); } void ChatWidget::setWelcomeMessage(QString &text) @@ -363,7 +363,7 @@ bool ChatWidget::isActive() void ChatWidget::pasteLink() { std::cerr << "In paste link" << std::endl; - ui->chattextEdit->insertHtml(RSLinkClipboard::toHtml()); + ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml()); } void ChatWidget::pasteOwnCertificateLink() @@ -373,7 +373,7 @@ void ChatWidget::pasteOwnCertificateLink() std::string ownId = rsPeers->getOwnId() ; if( link.createCertificate(ownId) ) { - ui->chattextEdit->insertHtml(link.toHtml() + " "); + ui->chatTextEdit->insertHtml(link.toHtml() + " "); } } @@ -381,7 +381,7 @@ void ChatWidget::contextMenu(QPoint /*point*/) { std::cerr << "In context menu" << std::endl; - QMenu *contextMnu = ui->chattextEdit->createStandardContextMenu(); + QMenu *contextMnu = ui->chatTextEdit->createStandardContextMenu(); contextMnu->addSeparator(); QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); @@ -413,7 +413,7 @@ void ChatWidget::chatCharFormatChanged() // Reset font and color before inserting a character if edit box is empty // (color info disappears when the user deletes all text) - if (ui->chattextEdit->toPlainText().isEmpty()) { + if (ui->chatTextEdit->toPlainText().isEmpty()) { setColorAndFont(); } @@ -445,7 +445,7 @@ void ChatWidget::updateStatusTyping() void ChatWidget::sendChat() { - QTextEdit *chatWidget = ui->chattextEdit; + QTextEdit *chatWidget = ui->chatTextEdit; if (chatWidget->toPlainText().isEmpty()) { // nothing to send @@ -478,13 +478,13 @@ void ChatWidget::sendChat() void ChatWidget::on_closeInfoFrameButton_clicked() { - ui->infoframe->setVisible(false); + ui->infoFrame->setVisible(false); } void ChatWidget::chooseColor() { bool ok; - QRgb color = QColorDialog::getRgba(ui->chattextEdit->textColor().rgba(), &ok, window()); + QRgb color = QColorDialog::getRgba(ui->chatTextEdit->textColor().rgba(), &ok, window()); if (ok) { currentColor = QColor(color); PeerSettings->setPrivateChatColor(peerId, currentColor.name()); @@ -531,10 +531,10 @@ void ChatWidget::setColorAndFont() currentFont.setUnderline(ui->textunderlineButton->isChecked()); currentFont.setItalic(ui->textitalicButton->isChecked()); - ui->chattextEdit->setFont(currentFont); - ui->chattextEdit->setTextColor(currentColor); + ui->chatTextEdit->setFont(currentFont); + ui->chatTextEdit->setTextColor(currentColor); - ui->chattextEdit->setFocus(); + ui->chatTextEdit->setFocus(); } void ChatWidget::setFont() @@ -550,7 +550,7 @@ void ChatWidget::smileyWidget() void ChatWidget::addSmiley() { - ui->chattextEdit->textCursor().insertText(qobject_cast(sender())->toolTip().split("|").first()); + ui->chatTextEdit->textCursor().insertText(qobject_cast(sender())->toolTip().split("|").first()); } void ChatWidget::clearChatHistory() @@ -568,7 +568,7 @@ void ChatWidget::deleteChatHistory() void ChatWidget::messageHistory() { - ImHistoryBrowser imBrowser(peerId, ui->chattextEdit, window()); + ImHistoryBrowser imBrowser(peerId, ui->chatTextEdit, window()); imBrowser.exec(); } @@ -686,27 +686,27 @@ void ChatWidget::updateStatus(const QString &peer_id, int status) switch (status) { case RS_STATUS_OFFLINE: - ui->infoframe->setVisible(true); - ui->infolabel->setText(peerName + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online")); + ui->infoFrame->setVisible(true); + ui->infoLabel->setText(peerName + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online")); break; case RS_STATUS_INACTIVE: - ui->infoframe->setVisible(true); - ui->infolabel->setText(peerName + " " + tr("is Idle and may not reply")); + ui->infoFrame->setVisible(true); + ui->infoLabel->setText(peerName + " " + tr("is Idle and may not reply")); break; case RS_STATUS_ONLINE: - ui->infoframe->setVisible(false); + ui->infoFrame->setVisible(false); break; case RS_STATUS_AWAY: - ui->infolabel->setText(peerName + " " + tr("is Away and may not reply")); - ui->infoframe->setVisible(true); + ui->infoLabel->setText(peerName + " " + tr("is Away and may not reply")); + ui->infoFrame->setVisible(true); break; case RS_STATUS_BUSY: - ui->infolabel->setText(peerName + " " + tr("is Busy and may not reply")); - ui->infoframe->setVisible(true); + ui->infoLabel->setText(peerName + " " + tr("is Busy and may not reply")); + ui->infoFrame->setVisible(true); break; } @@ -747,11 +747,11 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr if (stdPeerId == peerId) { // the peers status string has changed if (status_string.isEmpty()) { - ui->statusmessagelabel->hide(); + ui->statusMessageLabel->hide(); } else { - ui->statusmessagelabel->show(); + ui->statusMessageLabel->show(); status_text = RsHtml().formatText(NULL, status_string, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); - ui->statusmessagelabel->setText(status_text); + ui->statusMessageLabel->setText(status_text); } } } diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index fd4512205..7d076e5fa 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -51,7 +51,7 @@ - + Arial @@ -66,26 +66,83 @@ - - - QFrame#infoframe{border: 1px solid #DCDC41; -border-radius: 6px; -background: #FFFFD7; -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FFFFD7, stop:1 #FFFFB2);} + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 178 + + + + + + + 255 + 255 + 178 + + + + + + + + true - QFrame::StyledPanel - - - QFrame::Raised + QFrame::Box 6 - + 16 @@ -104,7 +161,7 @@ stop:0 #FFFFD7, stop:1 #FFFFB2);} - + TextLabel @@ -183,11 +240,6 @@ border-image: url(:/images/closepressed.png) Qt::CustomContextMenu - - QTextBrowser{border: 1px solid #B8B6B1; -border-radius: 6px; -background: white;} - @@ -211,7 +263,7 @@ background: white;} - + 0 @@ -227,11 +279,6 @@ background: white;} Qt::CustomContextMenu - - QTextEdit{border: 1px solid #B8B6B1; -border-radius: 6px; -background: white;} - @@ -261,318 +308,329 @@ background: white;} - - - - - - 0 - 0 - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - - :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Bold - - - - :/images/edit-bold.png:/images/edit-bold.png - - - true - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Underline - - - - :/images/edit-underline.png:/images/edit-underline.png - - - true - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Italic - - - - :/images/edit-italic.png:/images/edit-italic.png - - - true - - - true - - - - - - - - 32 - 28 - - - - - 32 - 28 - - - - Qt::NoFocus - - - Font - - - - :/images/fonts.png:/images/fonts.png - - - QToolButton::InstantPopup - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Text Color - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - Attach a Picture - - - - :/images/add_image24.png:/images/add_image24.png - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - Qt::NoFocus - - - Add a File for your Friend - - - - :/images/add-share24.png:/images/add-share24.png - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Qt::NoFocus - - - - :/images/configure.png:/images/configure.png - - - - 22 - 22 - - - - QToolButton::InstantPopup - - - true - - - - - - - Qt::Horizontal - - - - 190 - 25 - - - - - - - - Send - - - - + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + + 0 + 0 + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + + :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png + + + + 24 + 24 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Bold + + + + :/images/edit-bold.png:/images/edit-bold.png + + + true + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Underline + + + + :/images/edit-underline.png:/images/edit-underline.png + + + true + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Italic + + + + :/images/edit-italic.png:/images/edit-italic.png + + + true + + + true + + + + + + + + 32 + 28 + + + + + 32 + 28 + + + + Qt::NoFocus + + + Font + + + + :/images/fonts.png:/images/fonts.png + + + QToolButton::InstantPopup + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Text Color + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + Attach a Picture + + + + :/images/add_image24.png:/images/add_image24.png + + + + 24 + 24 + + + + true + + + + + + + + 28 + 28 + + + + Qt::NoFocus + + + Add a File for your Friend + + + + :/images/add-share24.png:/images/add-share24.png + + + + 24 + 24 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Qt::NoFocus + + + + :/images/configure.png:/images/configure.png + + + + 22 + 22 + + + + QToolButton::InstantPopup + + + true + + + + + + + Qt::Horizontal + + + + 190 + 25 + + + + + + + + Send + + + + + diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 39b28ce9a..ddab0a384 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -65,6 +65,8 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list& peer_list, in } checkTextFields(); + + ui->lobbyName_LE->setFocus(); } CreateLobbyDialog::~CreateLobbyDialog() diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui index f59fbe19b..f98b28275 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui @@ -17,297 +17,255 @@ :/images/user/agt_forum24.png:/images/user/agt_forum24.png - - - 0 - + 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - + + 0 + + + + + + + + + + + + 12 + + + + 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. + + + true + + - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 12 - - - - 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. - - - true - - - - - - - - - Select the Friends with which you want to group chat. - - - - - - - true - - - - 0 - 0 - - - - - 52487 - 524287 - - - - - 220 - 0 - - - - - 0 - 0 - - - - false - - - QDockWidget::NoDockWidgetFeatures - - - Invited friends - - - - - 0 - - - 0 - - - - - - 0 - 4 - - - - - 20 - 0 - - - - - 1677215 - 16777215 - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - - - - QFrame#frame_4{ -border: 2px solid #CCCCCC; -border-radius:6px; -background: white; -} - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - - Lobby name: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Lobby topic: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Your nick name: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Security policy: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - - - - - - Public (Visible by friends) - - - - - Private (Works on invitation only) - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - QLayout::SetDefaultConstraint - - - 0 - + + + + + - + + + + + Lobby name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Lobby topic: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Your nick name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Security policy: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + Public (Visible by friends) + + + + + Private (Works on invitation only) + + + + + + + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 - - - - Create - - - - - - - Cancel - - - - - - + + + + + + + + Select the Friends with which you want to group chat. + + + + + + + true + + + + 0 + 0 + + + + + 52487 + 524287 + + + + + 220 + 0 + + + + + 0 + 0 + + + + false + + + QDockWidget::NoDockWidgetFeatures + + + Invited friends + + + + + 0 + + + 0 + + + + + + 0 + 4 + + + + + 20 + 0 + + + + + 1677215 + 16777215 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + + + + + + + + QLayout::SetDefaultConstraint + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Create + + + + + + + Cancel + + + + diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index 2e26ab38e..d944866f7 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -45,15 +45,6 @@ 16777215 - - QFrame#frame{border: transparent} - - - QFrame::StyledPanel - - - QFrame::Raised - 0 diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.ui b/retroshare-gui/src/gui/chat/PopupChatWindow.ui index 2c6aa62d3..af4de9983 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.ui +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.ui @@ -14,9 +14,6 @@ MainWindow - - - 5 diff --git a/retroshare-gui/src/gui/forums/CreateForum.ui b/retroshare-gui/src/gui/forums/CreateForum.ui index 368d23661..438c23847 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.ui +++ b/retroshare-gui/src/gui/forums/CreateForum.ui @@ -17,31 +17,18 @@ :/images/rstray3.png:/images/rstray3.png - - - 0 - + 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - + + 0 + + + - + - - QFrame::NoFrame - - - QFrame::Raised - @@ -307,18 +294,18 @@ - - FriendSelectionWidget - QWidget -
gui/common/FriendSelectionWidget.h
- 1 - HeaderFrame QFrame
gui/common/HeaderFrame.h
1 + + FriendSelectionWidget + QWidget +
gui/common/FriendSelectionWidget.h
+ 1 + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 7e379cf61..dd81fb6d4 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -13,32 +13,38 @@ HeaderFrame { background-image: url(:/images/headerFrame.png); border: 0px; } -HeaderFrame QLabel#headerLabel { +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 */ +FriendsDialog QFrame#headerFrame > QLabel#nicknameLabel { + color: rgb(50, 205, 50); +} + +/* Channels */ 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 { +ChannelFeed QLabel#logoLabel, EditChanDetails QLabel#logoLabel, CreateChannel QLabel#logoLabel { border: 2px solid white; } -/* ForumsDialog */ +CreateChannelMsg QFrame#fileFrame { + border: 2px solid black; + background: white; +} + +/* Forums */ ForumsDialog QLabel#forumName, ForumsDialog QLabel#threadTitle { @@ -53,3 +59,43 @@ ForumsDialog2 QLabel#forumName, ForumsDialog2 QLabel#threadTitle border-radius:6px; background: white; } + +/* MessengerWindow */ + +MessengerWindow QFrame#logoFrame { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8); + border: 1px solid #CCCCCC; +} + +/* Chat lobby */ + +ChatLobbyDialog QFrame#participantsFrame { + border: transparent; +} + +ChatLobbyDialog QListWidget#participantsList { + border: 1px solid #B8B6B1; + border-radius: 6px; + background: white; +} + +CreateLobbyDialog QFrame#lobbyFrame { + border: 2px solid #CCCCCC; + border-radius:6px; + background: white; +} + +/* Chat */ + +ChatWidget QTextEdit#chatTextEdit, ChatWidget QTextBrowser#textBrowser { + border: 1px solid #B8B6B1; + border-radius: 6px; + background: white; +} + +ChatWidget QFrame#infoFrame { + border: 1px solid #DCDC41; + border-radius: 6px; + background: #FFFFD7; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); +}