diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index 318f6327b..ba8fb4a05 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -10,154 +10,165 @@ 476 - - + + + + + + 0 + 0 + + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + + + + 24 + 24 + + + + + + + :/images/channels32.png + + + true + + + + + + + + 10 + 75 + true + + + + Channels + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::NoFocus + + + Display + + + + :/images/looknfeel.png:/images/looknfeel.png + + + + 32 + 16 + + + + QToolButton::InstantPopup + + + true + + + + + + + true + + + Qt::NoFocus + + + Create Channel + + + + :/images/add_channel24.png:/images/add_channel24.png + + + + 32 + 16 + + + + true + + + + + + + + 0 + 0 + + + + + + + + :/images/64px_help.png:/images/64px_help.png + + + true + + + true + + + + + + + Qt::Horizontal - + - + 0 0 - - - 1 - - - 0 - - - - - QFrame::Box - - - QFrame::Sunken - - - - 2 - - - - - - 24 - 24 - - - - - - - :/images/channels32.png - - - true - - - - - - - - 10 - 75 - true - - - - Channels - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - Display - - - - :/images/looknfeel.png:/images/looknfeel.png - - - - 32 - 16 - - - - QToolButton::InstantPopup - - - true - - - - - - - true - - - Qt::NoFocus - - - Create Channel - - - - :/images/add_channel24.png:/images/add_channel24.png - - - - 32 - 16 - - - - true - - - - - - - - - - - 0 - 0 - - - - - - - - + + + QFrame::Box @@ -219,59 +230,7 @@ - - - - true - - - - - 0 - 0 - 414 - 16 - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - - - - - - - Loading - - - - - - - 1000 - - - 24 - - - - - - + QFrame::Box @@ -322,6 +281,58 @@ + + + + + + Loading + + + + + + + 1000 + + + 24 + + + + + + + + + true + + + + + 0 + 0 + 625 + 16 + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + @@ -343,6 +354,10 @@ Enable Auto-Download + splitter + treeWidget + titleBarFrame + treeWidget diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 1e3b2458a..8583fdbc8 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -56,7 +56,7 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags) QObject::connect(lobbyTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*,int))); QObject::connect(lobbyTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(updateCurrentLobby())); - QObject::connect(newlobbytoolButton, SIGNAL(clicked()), this, SLOT(createChatLobby())); + //QObject::connect(newlobbytoolButton, SIGNAL(clicked()), this, SLOT(createChatLobby())); compareRole = new RSTreeWidgetItemCompareRole; compareRole->setRole(COLUMN_NAME, ROLE_SORT); diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index eb35dbe05..c1809ef5e 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -26,16 +26,7 @@ QFrame::Sunken - - 2 - - - 2 - - - 2 - - + 2 @@ -76,24 +67,24 @@ - - - Qt::NoFocus + + + + 0 + 0 + - - Create new chat lobby + + - :/images/edit_add24.png:/images/edit_add24.png + :/images/64px_help.png:/images/64px_help.png - - - 24 - 16 - + + true - + true diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index 147cd6662..0dcb445fb 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -11,6 +11,84 @@ + + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + + + + + + :/images/reload24.png + + + false + + + + + + + + 10 + 75 + true + + + + File Transfers + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + + 0 + 0 + + + + + + + + :/images/64px_help.png:/images/64px_help.png + + + true + + + true + + + + + + @@ -20,11 +98,11 @@ - 1 + 0 - + :/images/down.png:/images/down.png @@ -89,7 +167,7 @@ - + :/images/up.png:/images/up.png @@ -121,6 +199,7 @@ + diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index 2e52cf057..de41f5cbb 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -6,160 +6,163 @@ 0 0 - 732 - 420 + 769 + 519 - - - 9 - - - 9 - - + + + + + Qt::Horizontal + + + + + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + + + + 24 + 24 + + + + + + + :/images/konversation.png + + + true + + + + + + + + 10 + 75 + true + + + + Forums + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + Qt::NoFocus + + + Display + + + + :/images/looknfeel.png:/images/looknfeel.png + + + + 32 + 16 + + + + QToolButton::InstantPopup + + + true + + + + + + + Qt::NoFocus + + + Create Forum + + + + :/images/new_forum16.png:/images/new_forum16.png + + + + 32 + 16 + + + + true + + + + + + + + 0 + 0 + + + + + + + + :/images/64px_help.png:/images/64px_help.png + + + true + + + true + + + + + + + Qt::Horizontal - - - - 300 - 300 - + + + + 0 + 0 + - - QFrame::NoFrame - - - - 0 - - - 0 - - - - - QFrame::Box - - - QFrame::Sunken - - - - 2 - - - - - - 24 - 24 - - - - - - - :/images/konversation.png - - - true - - - - - - - - 10 - 75 - true - - - - Forums - - - - - - - Qt::Horizontal - - - - 123 - 13 - - - - - - - - Qt::NoFocus - - - Display - - - - :/images/looknfeel.png:/images/looknfeel.png - - - - 32 - 16 - - - - QToolButton::InstantPopup - - - true - - - - - - - Qt::NoFocus - - - Create Forum - - - - :/images/new_forum16.png:/images/new_forum16.png - - - - 32 - 16 - - - - true - - - - - - - - - - - 0 - 0 - - - - - @@ -616,18 +619,23 @@ PrintPreview + splitter + forumTreeWidget + forumTreeWidget + titleBarFrame + threadSplitter + + LineEditClear + QLineEdit +
gui/common/LineEditClear.h
+ LinkTextBrowser QTextBrowser
gui/common/LinkTextBrowser.h
 - - LineEditClear - QLineEdit -
gui/common/LineEditClear.h
- GroupTreeWidget QWidget diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 8684d0af2..cf36d35b1 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -212,6 +212,20 @@ FriendsDialog::FriendsDialog(QWidget *parent) ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd)); } + QString hlp_str = tr( + "

  Friends

\ +

The Friends tab shows...your friends: the list of persons you have accepted to connect to. \ +

\ +

On the right, you will find 3 useful tabs: \ +

    \ +
  • Broadcast allows you to send messages to all connected friends at once
    • \ +
  • Local Network represents the network around you, including friends of your friends
    • \ +
  • Keyring contains keys you collected, forwarded to you by your friends
    • \ +

\ + ") ; + + registerHelpButton(ui.helpButton, hlp_str) ; + /* Hide platform specific features */ #ifdef Q_WS_WIN @@ -859,41 +873,6 @@ void FriendsDialog::on_actionMessageHistory_triggered() imBrowser.exec(); } -//void FriendsDialog::on_actionAdd_Group_activated() -//{ -// CreateGroup createGrpDialog ("", this); -// createGrpDialog.exec(); -//} - -// void FriendsDialog::newsFeedChanged(int count) -// { -// int newsFeedTabIndex = ui.tabWidget->indexOf(newsFeed); -// if (newsFeedTabIndex < 0) { -// return; -// } -// -// if (count) { -// ui.tabWidget->tabBar()->setTabText(newsFeedTabIndex, QString("%1 (%2)").arg(newsFeedText).arg(count)); -// ui.tabWidget->tabBar()->setTabTextColor(newsFeedTabIndex, Qt::blue); -// ui.tabWidget->tabBar()->setTabIcon(newsFeedTabIndex, QIcon(IMAGE_NEWSFEED_NEW)); -// } else { -// ui.tabWidget->tabBar()->setTabText(newsFeedTabIndex, newsFeedText); -// ui.tabWidget->tabBar()->setTabTextColor(newsFeedTabIndex, newsFeedTabColor); -// ui.tabWidget->tabBar()->setTabIcon(newsFeedTabIndex, QIcon(IMAGE_NEWSFEED)); -// } -// } - -//void FriendsDialog::recommendFriends() -//{ -// FriendRecommendDialog::showYourself(); -//} - -//void FriendsDialog::servicePermission() -//{ -// ServicePermissionDialog dlg; -// dlg.exec(); -//} - /*static*/ bool FriendsDialog::isGroupChatActive() { FriendsDialog *friendsDialog = dynamic_cast(MainWindow::getPage(MainWindow::Friends)); diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 21c01e3fe..12542c055 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -10,103 +10,127 @@ 491 - - + + + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + + + + + + :/images/user/friends24.png + + + + + + + + 10 + 75 + true + + + + Friends + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + + 0 + 0 + + + + + + + + :/images/64px_help.png:/images/64px_help.png + + + true + + + true + + + + + + + Qt::Horizontal - - - - 1 - + + - - - QFrame::Box - - - QFrame::Sunken - - - - 2 - - - - - - - - :/images/user/friends24.png - - - - - - - - 10 - 75 - true - - - - Friends - - - - - - - Qt::Horizontal - - - - 123 - 13 - - - - - - - - - 30 - 0 - - - - Qt::NoFocus - - - Display - - - - :/images/looknfeel.png:/images/looknfeel.png - - - - 32 - 16 - - - - QToolButton::InstantPopup - - - true - - - - - - - - + + + + + + + + + 30 + 0 + + + + Qt::NoFocus + + + Display + + + + :/images/looknfeel.png:/images/looknfeel.png + + + + 32 + 16 + + + + QToolButton::InstantPopup + + + true + + + + @@ -164,22 +188,6 @@ 1 - - - - - 61 - 61 - - - - - 61 - 61 - - - - @@ -249,6 +257,22 @@ + + + + + 61 + 61 + + + + + 61 + 61 + + + + diff --git a/retroshare-gui/src/gui/MainPage.cpp b/retroshare-gui/src/gui/MainPage.cpp index 2bb79a758..5f047a04a 100644 --- a/retroshare-gui/src/gui/MainPage.cpp +++ b/retroshare-gui/src/gui/MainPage.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include MainPage::MainPage(QWidget *parent , Qt::WindowFlags flags ) : QWidget(parent, flags) @@ -11,25 +12,33 @@ MainPage::MainPage(QWidget *parent , Qt::WindowFlags flags ) : QWidget(parent, f void MainPage::showHelp(bool b) { - if(help_browser == NULL) - { - help_browser = new QTextBrowser(this) ; - help_browser->setHtml(helpHtmlText()) ; - - QGraphicsDropShadowEffect * effect = new QGraphicsDropShadowEffect(help_browser) ; - effect->setBlurRadius(30.0); - help_browser->setGraphicsEffect(effect); - - help_browser->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)) ; - help_browser->resize(size()*0.5) ; - help_browser->move(width()/2 - help_browser->width()/2,height()/2 - help_browser->height()/2); - help_browser->update() ; - } + help_browser->resize(size()*0.5) ; + help_browser->move(width()/2 - help_browser->width()/2,height()/2 - help_browser->height()/2); + help_browser->update() ; std::cerr << "Toggling help to " << b << std::endl; + if(b) help_browser->show() ; else help_browser->hide() ; } +void MainPage::registerHelpButton(QPushButton *button,const QString& help_html_txt) +{ + if(help_browser == NULL) + { + help_browser = new QTextBrowser(this) ; + + QGraphicsDropShadowEffect * effect = new QGraphicsDropShadowEffect(help_browser) ; + effect->setBlurRadius(30.0); + help_browser->setGraphicsEffect(effect); + + help_browser->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)) ; + help_browser->hide() ; + } + + help_browser->setHtml(help_html_txt) ; + + QObject::connect(button,SIGNAL(toggled(bool)), this, SLOT( showHelp(bool) ) ) ; +} diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 41ea73e73..33abdeb7b 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -10,11 +10,8 @@ 485 - - - 1 - - + + @@ -47,143 +44,37 @@ 6 - - - - - 0 - 0 - - - - - 167777 - 167777 - - - - Qt::NoFocus - - - New Message + + + + + 10 + 75 + true + - Compose - - - - :/images/folder-draft24.png:/images/folder-draft24.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true + Messages - - - - Qt::Vertical - - + + - - - - 0 - 0 - + + + Qt::Horizontal - + - 0 - 0 + 40 + 20 - - - 16777 - 16777 - - - - Qt::NoFocus - - - Reply to selected message - - - Reply - - - - :/images/replymail-pressed.png:/images/replymail-pressed.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - + - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - Qt::NoFocus - - - Reply all to selected message - - - Reply all - - - - :/images/replymailall24-hover.png:/images/replymailall24-hover.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - + @@ -224,14 +115,14 @@ - + Qt::Vertical - + @@ -272,7 +163,7 @@ - + @@ -322,7 +213,7 @@ - + @@ -354,20 +245,17 @@ - - - - Qt::Horizontal + + + + - - - 40 - 20 - + + :/images/message-mail-read.png - + - + Qt::NoFocus @@ -396,13 +284,169 @@ - - + + + + + 0 + 0 + + + + + + + + :/images/64px_help.png:/images/64px_help.png + + + true + + + true + + + + + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Qt::NoFocus + + + Reply to selected message + + + Reply + + + + :/images/replymail-pressed.png:/images/replymail-pressed.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Qt::NoFocus + + + Reply all to selected message + + + Reply all + + + + :/images/replymailall24-hover.png:/images/replymailall24-hover.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + + 167777 + 167777 + + + + Qt::NoFocus + + + New Message + + + Compose + + + + :/images/folder-draft24.png:/images/folder-draft24.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + - + true @@ -767,7 +811,7 @@ LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
 RSTabWidget diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index acbe22be7..81d9c0cf3 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -20,6 +20,7 @@ ****************************************************************/ #include +#include #include "NewsFeed.h" @@ -84,19 +85,8 @@ NewsFeed::NewsFeed(QWidget *parent) connect(removeAllButton, SIGNAL(clicked()), this, SLOT(removeAll())); connect(feedOptionsButton, SIGNAL(clicked()), this, SLOT(feedoptions())); - connect(helpButton, SIGNAL(toggled(bool)), (MainPage*)this, SLOT(showHelp(bool))); -} -NewsFeed::~NewsFeed() -{ - if (instance == this) { - instance = NULL; - } -} - -const QString& NewsFeed::helpHtmlText() const -{ - static const QString str = tr( + QString hlp_str = tr( "

  News Feed

\

The News Feed displays the last events on your network, sorted by the time you received them. \ This gives you a summary of the activity of your friends. \ @@ -110,7 +100,17 @@ const QString& NewsFeed::helpHtmlText() const

\ ") ; - return str ; + registerHelpButton(helpButton,hlp_str) ; + + mLayout = new QVBoxLayout(scrollArea) ; + mLayout->addItem(new QSpacerItem(10,0,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)) ; +} + +NewsFeed::~NewsFeed() +{ + if (instance == this) { + instance = NULL; + } } UserNotify *NewsFeed::getUserNotify(QObject *parent) @@ -462,9 +462,9 @@ void NewsFeed::addFeedItem(QWidget *item) lockLayout(NULL, true); if (Settings->getAddFeedsAtEnd()) { - verticalLayout->addWidget(item); + mLayout->addWidget(item); } else { - verticalLayout->insertWidget(0, item); + mLayout->insertWidget(0, item); } item->show(); diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h index 9ce8f82d7..3b9292b09 100644 --- a/retroshare-gui/src/gui/NewsFeed.h +++ b/retroshare-gui/src/gui/NewsFeed.h @@ -52,8 +52,6 @@ public: virtual void openChat(std::string peerId); virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const RsGxsMessageId &msgId, const QString &title); - virtual const QString& helpHtmlText() const ; - static void testFeeds(uint notifyFlags); static void testFeed(FeedNotify *feedNotify); @@ -96,7 +94,7 @@ private: void sendNewsFeedChanged(); - QLayout *mLayout; + QVBoxLayout *mLayout; QSet widgets; /* lists of feedItems */ diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui index 8ae0de9df..fbfd65855 100644 --- a/retroshare-gui/src/gui/NewsFeed.ui +++ b/retroshare-gui/src/gui/NewsFeed.ui @@ -6,17 +6,11 @@ 0 0 - 428 - 256 + 571 + 376 - - - 0 - - - 0 - + @@ -138,7 +132,7 @@ 0 0 - 426 + 551 16 @@ -148,14 +142,6 @@ 0 - - - 3 - - - 3 - - diff --git a/retroshare-gui/src/retroshare-gui/mainpage.h b/retroshare-gui/src/retroshare-gui/mainpage.h index 3b0b42e8e..27480859d 100644 --- a/retroshare-gui/src/retroshare-gui/mainpage.h +++ b/retroshare-gui/src/retroshare-gui/mainpage.h @@ -27,6 +27,7 @@ #include class UserNotify; +class QPushButton ; class MainPage : public QWidget { @@ -42,13 +43,13 @@ class MainPage : public QWidget // Overload this to add some help info to the page. The way the info is // shown is handled by showHelp() below; // - virtual const QString& helpHtmlText() const { static QString s ; return s ; } + void registerHelpButton(QPushButton *button, const QString& help_html_text) ; - public slots: + private slots: void showHelp(bool b) ; private: - QTextBrowser *help_browser ; + QTextBrowser *help_browser ; }; #endif