diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 18f46e906..356e195d5 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -8,7 +8,7 @@ MOC_DIR = temp/moc CONFIG += qt release QT += network xml TEMPLATE = app -TARGET += +TARGET += DEPENDPATH += . \ @@ -63,7 +63,6 @@ HEADERS += rshare.h \ gui/SearchDialog.h \ gui/SharedFilesDialog.h \ gui/StatisticDialog.h \ - gui/ChannelsDialog.h \ gui/HelpDialog.h \ gui/LogoBar.h \ lang/languagesupport.h \ @@ -127,7 +126,13 @@ HEADERS += rshare.h \ games/qbackgammon/bgwindow.h \ games/qbackgammon/bgwidget.h \ games/qbackgammon/bgboard.h \ - games/qbackgammon/optionsdlg.h + games/qbackgammon/optionsdlg.h \ + gui/channels/channelsDialog.h \ + gui/channels/channelBrowserDialog.h \ + gui/channels/channelStatsDialog.h \ + gui/channels/myChannelsDialog.h \ + gui/channels/mySubscriptionsDialog.h + FORMS += gui/ChatDialog.ui \ gui/StartDialog.ui \ @@ -142,7 +147,6 @@ FORMS += gui/ChatDialog.ui \ gui/SearchDialog.ui \ gui/SharedFilesDialog.ui \ gui/StatisticDialog.ui \ - gui/ChannelsDialog.ui \ gui/MessagesDialog.ui \ gui/HelpDialog.ui \ gui/bwgraph/bwgraph.ui \ @@ -173,7 +177,12 @@ FORMS += gui/ChatDialog.ui \ gui/Settings/NetworkPage.ui \ gui/authdlg/AuthorizationDialog.ui \ gui/advsearch/advancedsearchdialog.ui \ - gui/advsearch/expressionwidget.ui + gui/advsearch/expressionwidget.ui \ + gui/channels/ChannelsDialog.ui \ + gui/channels/ChannelBrowserDialog.ui \ + gui/channels/ChannelStatsDialog.ui \ + gui/channels/MyChannelsDialog.ui \ + gui/channels/MySubscriptionsDialog.ui SOURCES += main.cpp \ rshare.cpp \ @@ -197,7 +206,6 @@ SOURCES += main.cpp \ gui/SearchDialog.cpp \ gui/SharedFilesDialog.cpp \ gui/StatisticDialog.cpp \ - gui/ChannelsDialog.cpp \ gui/MessagesDialog.cpp \ gui/HelpDialog.cpp \ gui/LogoBar.cpp \ @@ -252,7 +260,12 @@ SOURCES += main.cpp \ games/qbackgammon/bgwindow.cpp \ games/qbackgammon/bgwidget.cpp \ games/qbackgammon/bgboard.cpp \ - games/qbackgammon/optionsdlg.cpp + games/qbackgammon/optionsdlg.cpp \ + gui/channels/channelsDialog.cpp \ + gui/channels/channelBrowserDialog.cpp \ + gui/channels/channelStatsDialog.cpp \ + gui/channels/myChannelsDialog.cpp \ + gui/channels/mySubscriptionsDialog.cpp RESOURCES += gui/images.qrc lang/lang.qrc games/qcheckers/qcheckers.qrc apps/smplayer/icons.qrc TRANSLATIONS += \ @@ -294,7 +307,7 @@ win32 { } -!win32 { - LIBS += -L../../../../lib -lretroshare -lKadC -lminiupnpc -lssl -lcrypto - LIBS += -lqcheckers -lsmplayer -} +!win32 { + LIBS += -L../../../../lib -lretroshare -lKadC -lminiupnpc -lssl -lcrypto + LIBS += -lqcheckers -lsmplayer +} diff --git a/retroshare-gui/src/gui/ChannelsDialog.ui b/retroshare-gui/src/gui/ChannelsDialog.ui index ee53479ed..adde741a0 100644 --- a/retroshare-gui/src/gui/ChannelsDialog.ui +++ b/retroshare-gui/src/gui/ChannelsDialog.ui @@ -500,6 +500,9 @@ Qt::DefaultContextMenu + + :/images/channels.png + 1 @@ -654,6 +657,8 @@ p, li { white-space: pre-wrap; } - + + + diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 97347596d..8357644ba 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -38,8 +38,6 @@ #include "global.h" #include "translator.h" - - #include "Preferences/PreferencesWindow.h" #include "Settings/gsettingswin.h" #include "util/rsversion.h" @@ -58,7 +56,7 @@ #define IMAGE_SEARCH ":/images/filefind.png" #define IMAGE_TRANSFERS ":/images/ktorrent.png" #define IMAGE_FILES ":/images/folder_green.png" -#define IMAGE_CHANNELS ":/images/konsole.png" +#define IMAGE_CHANNELS ":/images/channels.png" #define IMAGE_PREFERENCES ":/images/settings16.png" #define IMAGE_CHAT ":/images/chats_24x24.png" #define IMAGE_RETROSHARE ":/images/rstray3.png" @@ -563,33 +561,33 @@ void MainWindow::loadStyleSheet(const QString &sheetName) } -void MainWindow::startgammon() -{ +void MainWindow::startgammon() +{ BgWindow *bgWindow = new BgWindow(this); bgWindow->show(); - - + + } -void MainWindow::startqcheckers() +void MainWindow::startqcheckers() { - myTopLevel* top = new myTopLevel(); + myTopLevel* top = new myTopLevel(); top->show(); } -/** Shows smplayer */ -void MainWindow::showsmplayer() -{ - static DefaultGui* smplayer = 0; - - if (!smplayer) { - global_init( "smplayer" ); - translator->load( pref->language ); - - smplayer = new DefaultGui(this); - } - - smplayer->show(); +/** Shows smplayer */ +void MainWindow::showsmplayer() +{ + static DefaultGui* smplayer = 0; + + if (!smplayer) { + global_init( "smplayer" ); + translator->load( pref->language ); + + smplayer = new DefaultGui(this); + } + + smplayer->show(); } diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index fdc98dbc8..b09ca02b4 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -33,7 +33,6 @@ #include "SearchDialog.h" #include "TransfersDialog.h" #include "MessagesDialog.h" -#include "ChannelsDialog.h" #include "ChatDialog.h" #include "SharedFilesDialog.h" #include "StatisticDialog.h" @@ -48,6 +47,9 @@ #include "Preferences/ConfirmQuitDialog.h" +#include "channels/channelsDialog.h" + + #include "ui_MainWindow.h" #include "../config/rsharesettings.h" @@ -88,7 +90,7 @@ public: TransfersDialog *transfersDialog; ChatDialog *chatDialog; MessagesDialog *messagesDialog; - ChannelsDialog *channelsDialog; + ChannelsDialog *channelsDialog; SharedFilesDialog *sharedfilesDialog; //GroupsDialog *groupsDialog; //StatisticDialog *statisticDialog; diff --git a/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui b/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui new file mode 100644 index 000000000..2699943fd --- /dev/null +++ b/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui @@ -0,0 +1,422 @@ + + ChannelBrowserDialog + + + + 0 + 0 + 551 + 400 + + + + + 400 + 400 + + + + Channel Browser + + + :/images/channels.png + + + + 9 + + + 6 + + + + + Qt::Horizontal + + + + + Channels + + + + + + + 7 + 7 + 0 + 0 + + + + + 250 + 150 + + + + Channel Details + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 80 + 80 + + + + QFrame::Box + + + + + + :/images/rstray3.png + + + true + + + 5 + + + + + + + 0 + + + 6 + + + + + + 0 + 20 + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:13pt;">Retroshare's Demo Channel</span></p></body></html> + + + Qt::AlignCenter + + + true + + + 5 + + + + + + + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 90 + 0 + + + + + 75 + true + + + + Last update: + + + + + + + + 5 + 0 + 0 + 0 + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-style:italic;">12.12.2007 10:48 UTC</span></p></body></html> + + + + + + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 85 + 20 + + + + + 75 + true + + + + Comment: + + + + + + + Qt::Horizontal + + + + 121 + 20 + + + + + + + + + + + true + + + + Subscribe to this channel to get news on the latest groovy happenings on Retroshare. + + + Qt::AlignJustify|Qt::AlignTop + + + true + + + 5 + + + + + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 90 + 0 + + + + + 75 + true + + + + Subscribers: + + + + + + + + 5 + 0 + 0 + 0 + + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 90 + 20 + + + + + 75 + true + + + + Popularity: + + + + + + + + 5 + 0 + 0 + 0 + + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui b/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui new file mode 100644 index 000000000..f1080fdb3 --- /dev/null +++ b/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui @@ -0,0 +1,315 @@ + + ChannelStatsDialog + + + + 0 + 0 + 370 + 223 + + + + Channel Statistics + + + :/images/channels.png + + + + 9 + + + 6 + + + + + Channel Statistics + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 80 + 80 + + + + QFrame::Box + + + + + + :/images/rstray3.png + + + true + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 5 + + + + + + + + 5 + 5 + 0 + 0 + + + + + true + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:italic; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Subscribe to this channel to get news on the latest groovy happenings on Retroshare. </span></p></body></html> + + + Qt::AlignJustify|Qt::AlignTop + + + true + + + 5 + + + + + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 90 + 20 + + + + + 75 + true + + + + Last update: + + + + + + + + 5 + 0 + 0 + 0 + + + + + 140 + 0 + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-style:italic;">12.12.2007 10:48 UTC</span></p></body></html> + + + + + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 90 + 20 + + + + + 75 + true + + + + Popularity: + + + + + + + + 5 + 0 + 0 + 0 + + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 6 + + + + + + 5 + 0 + 0 + 0 + + + + + 90 + 20 + + + + + 75 + true + + + + Subscribers: + + + + + + + + 5 + 0 + 0 + 0 + + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/channels/ChannelsDialog.ui b/retroshare-gui/src/gui/channels/ChannelsDialog.ui new file mode 100644 index 000000000..c789c562a --- /dev/null +++ b/retroshare-gui/src/gui/channels/ChannelsDialog.ui @@ -0,0 +1,62 @@ + + ChannelsDialog + + + + 0 + 0 + 548 + 348 + + + + Channel Module + + + :/images/channels.png + + + + 9 + + + 6 + + + + + 0 + + + + Browse Channels + + + :/images/channels.png + + + + + My Subscriptions + + + :/images/folder-inbox.png + + + + + My Channels + + + :/images/folder-outbox.png + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/channels/MyChannelsDialog.ui b/retroshare-gui/src/gui/channels/MyChannelsDialog.ui new file mode 100644 index 000000000..c01e42277 --- /dev/null +++ b/retroshare-gui/src/gui/channels/MyChannelsDialog.ui @@ -0,0 +1,336 @@ + + MyChannelsDialog + + + + 0 + 0 + 580 + 450 + + + + + 550 + 450 + + + + My Channels + + + :/images/channels.png + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-style:italic;">or</span></p></body></html> + + + + + + + Create New Channel + + + :/images/add_24x24.png + + + + + + + + 300 + 0 + + + + + Retroshare Demo Channel + + + :/images/rstray3.png + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Channel Details + + + + 9 + + + 6 + + + + + Qt::Horizontal + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Messages</span></p></body></html> + + + + + + + Qt::CustomContextMenu + + + true + + + 10 + + + + Date + + + + + Rank + + + + + From + + + + + Title + + + + + Msg + + + + + Count + + + + + Size + + + + + Type + + + + + Rs[Cert/Chan]IdSize + + + + + RsMsgId + + + + + + + + + Qt::Vertical + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Message Text</span></p></body></html> + + + + + + + + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Recommended Files</span></p></body></html> + + + + + + + Qt::CustomContextMenu + + + + + + + + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save changes + + + :/images/diskSave.png + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 27 + + + + + + + + Delete Channel + + + :/images/deletemail24.png + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui b/retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui new file mode 100644 index 000000000..5bf9b7c00 --- /dev/null +++ b/retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui @@ -0,0 +1,273 @@ + + MySubscriptionsDialog + + + + 0 + 0 + 613 + 453 + + + + My Subscriptions + + + :/images/channels.png + + + + 9 + + + 6 + + + + + Channel Details + + + + 9 + + + 6 + + + + + Qt::Horizontal + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Messages</span></p></body></html> + + + + + + + Qt::CustomContextMenu + + + true + + + 10 + + + + Date + + + + + Rank + + + + + From + + + + + Title + + + + + Msg + + + + + Count + + + + + Size + + + + + Type + + + + + Rs[Cert/Chan]IdSize + + + + + RsMsgId + + + + + + + + + Qt::Vertical + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Message Text</span></p></body></html> + + + + + + + + + + + + 0 + + + 0 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Recommended Files</span></p></body></html> + + + + + + + Qt::CustomContextMenu + + + + + + + + + + + + + + + 0 + + + 6 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<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;">Subscription:</span> </p></body></html> + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + + 7 + 0 + 1 + 0 + + + + + 300 + 0 + + + + + Retroshare Demo Channel + + + :/images/rstray3.png + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + Unsubscribe + + + :/images/deletemail24.png + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/channels/channelBrowserDialog.cpp b/retroshare-gui/src/gui/channels/channelBrowserDialog.cpp new file mode 100644 index 000000000..d9cea8c53 --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelBrowserDialog.cpp @@ -0,0 +1,29 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ + +#include "channelBrowserDialog.h" + +ChannelBrowserDialog::ChannelBrowserDialog(QWidget * parent) : QDialog (parent) +{ + setupUi(this); + +} + diff --git a/retroshare-gui/src/gui/channels/channelBrowserDialog.h b/retroshare-gui/src/gui/channels/channelBrowserDialog.h new file mode 100644 index 000000000..f53c1a2cd --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelBrowserDialog.h @@ -0,0 +1,40 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ +#ifndef _ChannelBrowserDialog_h_ +#define _ChannelBrowserDialog_h_ + +#include +#include "ui_ChannelBrowserDialog.h" + +class ChannelBrowserDialog : public QDialog, +public Ui::ChannelBrowserDialog +{ + Q_OBJECT + +public: + ChannelBrowserDialog(QWidget * parent = 0 ); + + +}; + + +#endif + diff --git a/retroshare-gui/src/gui/channels/channelStatsDialog.cpp b/retroshare-gui/src/gui/channels/channelStatsDialog.cpp new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelStatsDialog.cpp @@ -0,0 +1 @@ + diff --git a/retroshare-gui/src/gui/channels/channelStatsDialog.h b/retroshare-gui/src/gui/channels/channelStatsDialog.h new file mode 100644 index 000000000..ceaea2684 --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelStatsDialog.h @@ -0,0 +1,25 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ +#ifndef _ChannelStatsDialog_h_ +#define _ChannelStatsDialog_h_ + + +#endif diff --git a/retroshare-gui/src/gui/channels/channelsDialog.cpp b/retroshare-gui/src/gui/channels/channelsDialog.cpp new file mode 100644 index 000000000..c79f70fc6 --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelsDialog.cpp @@ -0,0 +1,100 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ + +#include "channelsDialog.h" + +ChannelsDialog::ChannelsDialog(QWidget * parent) : MainPage (parent) +{ + setupUi(this); + + // add the tabs to the channels dialog +} + + + + + + + +void ChannelsDialog::messageslistWidgetCostumPopupMenu( QPoint point ) +{ +} + + +void ChannelsDialog::msgfilelistWidgetCostumPopupMenu( QPoint point ) +{ +} + +void ChannelsDialog::newmessage() +{ +} + +void ChannelsDialog::newchannel() +{ +} + +void ChannelsDialog::subscribechannel() +{ + /* more work */ + +} + +void ChannelsDialog::unsubscribechannel() +{ + /* more work */ + +} + + +void ChannelsDialog::deletechannel() +{ + /* more work */ + +} + + +void ChannelsDialog::getcurrentrecommended() +{ + + +} + + +void ChannelsDialog::getallrecommended() +{ + + +} + +void ChannelsDialog::insertChannels() +{ +} + +void ChannelsDialog::updateChannels( QTreeWidgetItem * item, int column ) +{ + +} + + +void ChannelsDialog::insertMsgTxtAndFiles() +{ + +} diff --git a/retroshare-gui/src/gui/channels/channelsDialog.h b/retroshare-gui/src/gui/channels/channelsDialog.h new file mode 100644 index 000000000..379f645e3 --- /dev/null +++ b/retroshare-gui/src/gui/channels/channelsDialog.h @@ -0,0 +1,79 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ +#ifndef _ChannelsDialog_h_ +#define _ChannelsDialog_h_ + +#include "../mainpage.h" +#include "ui_ChannelsDialog.h" + +#include + +class QTreeWidgetItem; + +class ChannelsDialog : public MainPage, public Ui::ChannelsDialog +{ + Q_OBJECT + +public: + ChannelsDialog(QWidget * parent = 0 ); + + + void insertChannels(); + void insertMsgTxtAndFiles(); + + +private slots: + + /** Create the context popup menu and it's submenus */ + void messageslistWidgetCostumPopupMenu( QPoint point ); + void msgfilelistWidgetCostumPopupMenu(QPoint); + + void updateChannels ( QTreeWidgetItem * item, int column ); + + // Fns for MsgList + void newmessage(); + void newchannel(); + void subscribechannel(); + void unsubscribechannel(); + void deletechannel(); + + // Fns for recommend List + void getcurrentrecommended(); + void getallrecommended(); + +private: + + /** Define the popup menus for the Context menu */ + QMenu* contextMnu; + + /** Defines the actions for the context menu */ + QAction* newMsgAct; + QAction* newChanAct; + QAction* subChanAct; + QAction* unsubChanAct; + QAction* delChanAct; + + QAction* getRecAct; + QAction* getAllRecAct; +}; + + +#endif diff --git a/retroshare-gui/src/gui/channels/myChannelsDialog.cpp b/retroshare-gui/src/gui/channels/myChannelsDialog.cpp new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/retroshare-gui/src/gui/channels/myChannelsDialog.cpp @@ -0,0 +1 @@ + diff --git a/retroshare-gui/src/gui/channels/myChannelsDialog.h b/retroshare-gui/src/gui/channels/myChannelsDialog.h new file mode 100644 index 000000000..bff7e0d46 --- /dev/null +++ b/retroshare-gui/src/gui/channels/myChannelsDialog.h @@ -0,0 +1,26 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ +#ifndef _MyChannelsDialog_h_ +#define _MyChannelsDialog_h_ + + +#endif + diff --git a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp new file mode 100644 index 000000000..83ab9617f --- /dev/null +++ b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp @@ -0,0 +1,21 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ + diff --git a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h new file mode 100644 index 000000000..bff7e0d46 --- /dev/null +++ b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h @@ -0,0 +1,26 @@ +/**************************************************************** +* RetroShare is distributed under the following license: +* +* Copyright (C) 2006, 2007 The RetroShare Team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +****************************************************************/ +#ifndef _MyChannelsDialog_h_ +#define _MyChannelsDialog_h_ + + +#endif + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index f751a1901..cf4b69241 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -1,213 +1,206 @@ - - - images/RetroShare16.png - images/rs-2.png - images/rstray3.png - images/smplayer_icon32.png - images/retrosharelogo1.png - images/retrosharelogo2.png - images/logobar/rslogo2.png - images/add-friend24.png - images/add-share24.png - images/add_24x24.png - images/advsearch_24x24.png - images/amsn.png - images/amsn16.png - images/attachment.png - images/avatar_background.png - images/backgroundimage.png - images/chat.png - images/chat/bar_end.png - images/chat/bar_fill.png - images/chat/chat_emoticon_button.png - images/chat/chat_emoticon_button_on.png - images/chat/chat_send.png - images/chat/font_bold.png - images/chat/font_bold_on.png - images/chat/font_italic.png - images/chat/font_italic_on.png - images/chat/font_underline.png - images/chat/font_underline_on.png - images/chat/hide_avatar_frame.png - images/chat/show_avatar_frame.png - images/chats_24x24.png - images/close-down.png - images/close_normal.png - images/console-small-down.png - images/console-small-hover.png - images/console-small-up.png - images/contract_hover.png - images/dadd.png - images/dauthed.png - images/daway.png - images/dbrb.png - images/dbusy.png - images/dchat.png - images/ddeny.png - images/delete.png - images/deleteall.png - images/deletemail-hover.png - images/deletemail-pressed.png - images/deletemail24.png - images/dhidden.png - images/directoryadd_24x24_shadow.png - images/directoryremove_24x24_shadow.png - images/directoryselect_24x24_shadow.png - images/dlunch.png - images/donline.png - images/down.png - images/down_24x24.png - images/dphone.png - images/edit-bold.png - images/edit-italic.png - images/edit-underline.png - images/encrypted16.png - images/encrypted48.png - images/evolution.png - images/exit_24x24.png - images/expand_hover.png - images/exportpeers_16x16.png - images/filefind.png - images/fileinfo.png - images/find.png - images/flags/af.png - images/flags/cn.png - images/flags/de.png - images/flags/dk.png - images/flags/en.png - images/flags/es.png - images/flags/fi.png - images/flags/fr.png - images/flags/gr.png - images/flags/it.png - images/flags/jp.png - images/flags/kr.png - images/flags/pl.png - images/flags/pt.png - images/flags/ru.png - images/flags/sl.png - images/flags/tr.png - images/flags/cn_trad.png - images/flags/cn_simp.pngse.png - images/flags/se.png - images/folder-draft.png - images/folder-draft24-hover.png - images/folder-draft24.png - images/folder-draft24-pressed.png - images/folder-inbox.png - images/folder-outbox.png - images/folder-sent.png - images/folder_doments.png - images/folder_green.png - images/folder_green16.png - images/graph-area.png - images/graph-line.png - images/hide_toolbox_frame.png - images/info16.png - images/informations_24x24.png - images/invite-friend24.png - images/konsole.png - images/ksysguard.png - images/ktorrent.png - images/loadcert16.png - images/locale.png - images/logobar/logo_bar_fill.png - images/logobar/logo_bar_start.png - images/logobar/rslogo.png - images/mail_delete.png - images/mail_get.png - images/mail_reply.png - images/mail_send.png - images/message-news.png - images/message.png - images/messenger.png - images/message-mail.png - images/mystatus_bg.png - images/network.png - images/network16.png - images/network32.png - images/new-account.png - images/new-contact.png - images/new-mail-alert.png - images/nopic.png - images/peerdetails_16x16.png - images/peers_16x16.png - images/peers_24x24.png - images/removefriend16.png - images/replymail24-hover.png - images/replymail24.png - images/replymail-pressed.png - images/reset.png - images/retro4.png - images/rsmessenger16.png - images/rsmessenger32.png - images/send24.png - images/settings.png - images/settings16.png - images/show_toolbox_frame.png - images/start.png - images/startall.png - images/toaster/chat.png - images/toaster/hangup.png - images/toaster/pickup.png - images/toaster/toaster-background.png - images/toaster/toaster-backrs3.png - images/toaster/toaster-backrs4.png - images/up.png - images/download.png - images/webcache_24x24.png - images/FileTypeArchive.png - images/FileTypeAudio.png - images/FileTypeCDImage.png - images/FileTypeDocument.png - images/FileTypePicture.png - images/FileTypeProgram.png - images/FileTypeVideo.png - images/FileTypeAny.png - images/kbackgammon.png - layouts/default.ui -######################### Internalised QStyleSheets - qss/default.qss - qss/default/retrotoolbar.png -######################### Arachnophobia StyleSheet. - qss/arachnophobia.qss - qss/arachnophobia/background.png -######################### Black StyleSheet. - qss/black.qss - qss/black/backgroundblack.png - qss/black/border.png - qss/black/button.png - qss/black/button_hover.png - qss/black/button_pressed.png - qss/black/checkBox.png - qss/black/checkBox_hover.png - qss/black/checkBox_selected.png - qss/black/checkBox_hoverAndSelected.png -######################### Blue StyleSheet. - qss/blue.qss - qss/blue/blue.png -######################### ed2k StyleSheet. - qss/ed2k.qss - qss/ed2k/backed2k.png - qss/ed2k/little-back.png - qss/ed2k/button-down.png - qss/ed2k/button-up.png - qss/ed2k/button-hover.png -######################### over StyleSheet. - qss/over.qss - qss/over/backover.png - qss/over/greenbot.png - qss/over/greenhover.png - qss/over/greentop.png -######################### Silver StyleSheet. - qss/silver.qss - qss/silver/silver.png -######################### Skin2 StyleSheet. - qss/skin2.qss - qss/skin2/background.png -######################### Help Pages. - help/authors.html - help/thanks.html - help/licence.html - - + + + help/authors.html + help/licence.html + help/thanks.html + images/channels.png + images/FileTypeAny.png + images/FileTypeArchive.png + images/FileTypeAudio.png + images/FileTypeCDImage.png + images/FileTypeDocument.png + images/FileTypePicture.png + images/FileTypeProgram.png + images/FileTypeVideo.png + images/RetroShare16.png + images/add-friend24.png + images/add-share24.png + images/add_24x24.png + images/advsearch_24x24.png + images/amsn.png + images/amsn16.png + images/attachment.png + images/avatar_background.png + images/backgroundimage.png + images/chat.png + images/chat/bar_end.png + images/chat/bar_fill.png + images/chat/chat_emoticon_button.png + images/chat/chat_emoticon_button_on.png + images/chat/chat_send.png + images/chat/font_bold.png + images/chat/font_bold_on.png + images/chat/font_italic.png + images/chat/font_italic_on.png + images/chat/font_underline.png + images/chat/font_underline_on.png + images/chat/hide_avatar_frame.png + images/chat/show_avatar_frame.png + images/chats_24x24.png + images/close-down.png + images/close_normal.png + images/console-small-down.png + images/console-small-hover.png + images/console-small-up.png + images/contract_hover.png + images/dadd.png + images/dauthed.png + images/daway.png + images/dbrb.png + images/dbusy.png + images/dchat.png + images/ddeny.png + images/delete.png + images/deleteall.png + images/deletemail-hover.png + images/deletemail-pressed.png + images/deletemail24.png + images/dhidden.png + images/directoryadd_24x24_shadow.png + images/directoryremove_24x24_shadow.png + images/directoryselect_24x24_shadow.png + images/diskSave.png + images/dlunch.png + images/donline.png + images/down.png + images/down_24x24.png + images/download.png + images/dphone.png + images/edit-bold.png + images/edit-italic.png + images/edit-underline.png + images/encrypted16.png + images/encrypted48.png + images/evolution.png + images/exit_24x24.png + images/expand_hover.png + images/exportpeers_16x16.png + images/filefind.png + images/fileinfo.png + images/find.png + images/flags/af.png + images/flags/cn.png + images/flags/cn_simp.png + images/flags/cn_trad.png + images/flags/de.png + images/flags/dk.png + images/flags/en.png + images/flags/es.png + images/flags/fi.png + images/flags/fr.png + images/flags/gr.png + images/flags/it.png + images/flags/jp.png + images/flags/kr.png + images/flags/pl.png + images/flags/pt.png + images/flags/ru.png + images/flags/se.png + images/flags/sl.png + images/flags/tr.png + images/folder-draft.png + images/folder-draft24-hover.png + images/folder-draft24-pressed.png + images/folder-draft24.png + images/folder-inbox.png + images/folder-outbox.png + images/folder-sent.png + images/folder_doments.png + images/folder_green.png + images/folder_green16.png + images/graph-area.png + images/graph-line.png + images/hide_toolbox_frame.png + images/info16.png + images/informations_24x24.png + images/invite-friend24.png + images/kbackgammon.png + images/konsole.png + images/ksysguard.png + images/ktorrent.png + images/loadcert16.png + images/locale.png + images/logobar/logo_bar_fill.png + images/logobar/logo_bar_start.png + images/logobar/rslogo.png + images/logobar/rslogo2.png + images/mail_delete.png + images/mail_get.png + images/mail_reply.png + images/mail_send.png + images/message-mail.png + images/message-news.png + images/message.png + images/messenger.png + images/mystatus_bg.png + images/network.png + images/network16.png + images/network32.png + images/new-account.png + images/new-contact.png + images/new-mail-alert.png + images/nopic.png + images/peerdetails_16x16.png + images/peers_16x16.png + images/peers_24x24.png + images/removefriend16.png + images/replymail-pressed.png + images/replymail24-hover.png + images/replymail24.png + images/reset.png + images/retro4.png + images/retrosharelogo1.png + images/retrosharelogo2.png + images/rs-2.png + images/rsmessenger16.png + images/rsmessenger32.png + images/rstray3.png + images/send24.png + images/settings.png + images/settings16.png + images/show_toolbox_frame.png + images/smplayer_icon32.png + images/start.png + images/startall.png + images/toaster/chat.png + images/toaster/hangup.png + images/toaster/pickup.png + images/toaster/toaster-background.png + images/toaster/toaster-backrs3.png + images/toaster/toaster-backrs4.png + images/up.png + images/webcache_24x24.png + layouts/default.ui + qss/arachnophobia.qss + qss/arachnophobia/background.png + qss/black.qss + qss/black/backgroundblack.png + qss/black/border.png + qss/black/button.png + qss/black/button_hover.png + qss/black/button_pressed.png + qss/black/checkBox.png + qss/black/checkBox_hover.png + qss/black/checkBox_hoverAndSelected.png + qss/black/checkBox_selected.png + qss/blue.qss + qss/blue/blue.png + qss/default.qss + qss/default/retrotoolbar.png + qss/ed2k.qss + qss/ed2k/backed2k.png + qss/ed2k/button-down.png + qss/ed2k/button-hover.png + qss/ed2k/button-up.png + qss/ed2k/little-back.png + qss/over.qss + qss/over/backover.png + qss/over/greenbot.png + qss/over/greenhover.png + qss/over/greentop.png + qss/silver.qss + qss/silver/silver.png + qss/skin2.qss + qss/skin2/background.png + + diff --git a/retroshare-gui/src/gui/images/channels.png b/retroshare-gui/src/gui/images/channels.png new file mode 100644 index 000000000..3c53997a0 Binary files /dev/null and b/retroshare-gui/src/gui/images/channels.png differ diff --git a/retroshare-gui/src/gui/images/diskSave.png b/retroshare-gui/src/gui/images/diskSave.png new file mode 100644 index 000000000..b5b8e2c7e Binary files /dev/null and b/retroshare-gui/src/gui/images/diskSave.png differ