From 25f888b8c612de89b699e6e5a720b6e109c4eee5 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 4 Oct 2009 15:17:06 +0000 Subject: [PATCH] removed not needed old channels sources git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1710 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 19 +- retroshare-gui/src/gui/ApplicationWindow.cpp | 27 - retroshare-gui/src/gui/ApplicationWindow.h | 2 - retroshare-gui/src/gui/ChannelsDialog.cpp | 415 -------- retroshare-gui/src/gui/ChannelsDialog.h | 85 -- retroshare-gui/src/gui/ChannelsDialog.ui | 891 ------------------ retroshare-gui/src/gui/MainWindow.cpp | 28 +- retroshare-gui/src/gui/MainWindow.h | 1 - .../src/gui/channels/ChannelBrowserDialog.ui | 475 ---------- .../src/gui/channels/ChannelStatsDialog.ui | 309 ------ .../src/gui/channels/ChannelsDialog.ui | 23 - .../src/gui/channels/MyChannelsDialog.ui | 318 ------- .../src/gui/channels/MySubscriptionsDialog.ui | 281 ------ .../src/gui/channels/channelBrowserDialog.cpp | 84 -- .../src/gui/channels/channelBrowserDialog.h | 72 -- .../src/gui/channels/channelStatsDialog.cpp | 28 - .../src/gui/channels/channelStatsDialog.h | 39 - .../src/gui/channels/channelsDialog.cpp | 126 --- .../src/gui/channels/channelsDialog.h | 90 -- .../src/gui/channels/myChannelsDialog.cpp | 28 - .../src/gui/channels/myChannelsDialog.h | 40 - .../gui/channels/mySubscriptionsDialog.cpp | 29 - .../src/gui/channels/mySubscriptionsDialog.h | 40 - .../src/gui/toaster/MessageToaster.ui | 4 - retroshare-gui/src/rsiface/notifyqt.cpp | 1 - 25 files changed, 20 insertions(+), 3435 deletions(-) delete mode 100644 retroshare-gui/src/gui/ChannelsDialog.cpp delete mode 100644 retroshare-gui/src/gui/ChannelsDialog.h delete mode 100644 retroshare-gui/src/gui/ChannelsDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/ChannelStatsDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/ChannelsDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/MyChannelsDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui delete mode 100644 retroshare-gui/src/gui/channels/channelBrowserDialog.cpp delete mode 100644 retroshare-gui/src/gui/channels/channelBrowserDialog.h delete mode 100644 retroshare-gui/src/gui/channels/channelStatsDialog.cpp delete mode 100644 retroshare-gui/src/gui/channels/channelStatsDialog.h delete mode 100644 retroshare-gui/src/gui/channels/channelsDialog.cpp delete mode 100644 retroshare-gui/src/gui/channels/channelsDialog.h delete mode 100644 retroshare-gui/src/gui/channels/myChannelsDialog.cpp delete mode 100644 retroshare-gui/src/gui/channels/myChannelsDialog.h delete mode 100644 retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp delete mode 100644 retroshare-gui/src/gui/channels/mySubscriptionsDialog.h diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 91b4202ea..012ab11d2 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -58,12 +58,14 @@ win32-x-g++ { win32 { OBJECTS_DIR = temp/obj + #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" + #QTPLUGIN += qjpeg LIBS += -L"../../../../lib" LIBS += -lretroshare -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -lole32 -lwinmm - + INCLUDEPATH += ../../../../gpgme-1.1.8/src/ INCLUDEPATH += ../../../../libgpg-error-1.7/src/ @@ -235,11 +237,6 @@ HEADERS += rshare.h \ games/qbackgammon/bgwidget.h \ games/qbackgammon/bgboard.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 \ gui/elastic/graphwidget.h \ gui/elastic/edge.h \ gui/elastic/arrow.h \ @@ -323,11 +320,6 @@ FORMS += gui/BlogDialog.ui \ gui/toaster/OnlineToaster.ui \ gui/advsearch/AdvancedSearchDialog.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 \ gui/NewsFeed.ui \ gui/PeersFeed.ui \ gui/MsgFeed.ui \ @@ -454,11 +446,6 @@ SOURCES += main.cpp \ games/qbackgammon/bgwidget.cpp \ games/qbackgammon/bgboard.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 \ gui/elastic/graphwidget.cpp \ gui/elastic/edge.cpp \ gui/elastic/arrow.cpp \ diff --git a/retroshare-gui/src/gui/ApplicationWindow.cpp b/retroshare-gui/src/gui/ApplicationWindow.cpp index e0a696306..8cac9aee4 100644 --- a/retroshare-gui/src/gui/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/ApplicationWindow.cpp @@ -42,7 +42,6 @@ #include "NetworkView.h" #include "PhotoDialog.h" #include "ForumsDialog.h" -#include "channels/channelsDialog.h" #include "BlogDialog.h" #include "CalDialog.h" #include "PeersFeed.h" @@ -112,18 +111,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) /* Create the config pages and actions */ QActionGroup *grp = new QActionGroup(this); - // LinksDialog *linksDialog = NULL; - // ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), - // createPageAction(QIcon(IMAGE_TRANSFERS), tr("Links Cloud"), grp)); - - // ChannelsDialog *channelsDialog = NULL; - // ui.stackPages->add(channelsDialog = new ChannelsDialog(ui.stackPages), - // createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); - - //NewsFeed *newsFeed = NULL; - //ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), - // createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); - StatisticDialog *statisticDialog = NULL; ui.stackPages->add(statisticDialog = new StatisticDialog(ui.stackPages), createPageAction(QIcon(IMAGE_STATISTIC), tr("Statistics"), grp)); @@ -144,13 +131,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(blogDialog = new BlogDialog(ui.stackPages), createPageAction(QIcon(IMAGE_BLOGS), tr("Blog Feed"), grp)); -// ChannelFeed *channelFeed = NULL; -// ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), -// createPageAction(QIcon(IMAGE_CHANNELS), tr("Channel Feed"), grp)); -// -// ForumsDialog *forumsDialog = NULL; -// ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), -// createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); GamesDialog *gamesDialog = NULL; ui.stackPages->add(gamesDialog = new GamesDialog(ui.stackPages), @@ -170,13 +150,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) - - //ui.stackPages->add(groupsDialog = new GroupsDialog(ui.stackPages), - // createPageAction(QIcon(), tr("Groups"), grp)); - - //ui.stackPages->add(new StatisticDialog(ui.stackPages), - // createPageAction(QIcon(IMAGE_STATISTIC), tr("Statistics"), grp)); - /* Create the toolbar */ ui.toolBar->addActions(grp->actions()); ui.toolBar->addSeparator(); diff --git a/retroshare-gui/src/gui/ApplicationWindow.h b/retroshare-gui/src/gui/ApplicationWindow.h index 9f3d4b177..e9c46ed6c 100644 --- a/retroshare-gui/src/gui/ApplicationWindow.h +++ b/retroshare-gui/src/gui/ApplicationWindow.h @@ -27,9 +27,7 @@ #include #include "ExampleDialog.h" -//#include "PluginsPage.h" -//#include "Settings/gsettingswin.h" #include "ui_ApplicationWindow.h" diff --git a/retroshare-gui/src/gui/ChannelsDialog.cpp b/retroshare-gui/src/gui/ChannelsDialog.cpp deleted file mode 100644 index ea36a06a2..000000000 --- a/retroshare-gui/src/gui/ChannelsDialog.cpp +++ /dev/null @@ -1,415 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * 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 "rshare.h" -#include "ChannelsDialog.h" -#include "msgs/ChanMsgDialog.h" -#include "msgs/ChanCreateDialog.h" - -#include "rsiface/rsiface.h" -#include - -#include -#include -#include -#include -#include -#include - -/* Images for context menu icons */ -#define IMAGE_MESSAGE ":/images/folder-draft.png" -#define IMAGE_MESSAGEREPLY ":/images/mail_reply.png" -#define IMAGE_MESSAGEREMOVE ":/images/mail_delete.png" -#define IMAGE_DOWNLOAD ":/images/start.png" -#define IMAGE_DOWNLOADALL ":/images/startall.png" - -/** Constructor */ -ChannelsDialog::ChannelsDialog(QWidget *parent) -: MainPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - connect( ui.msgWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( messageslistWidgetCostumPopupMenu( QPoint ) ) ); - connect( ui.msgList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgfilelistWidgetCostumPopupMenu( QPoint ) ) ); - connect( ui.msgWidget, SIGNAL( itemClicked ( QTreeWidgetItem *, int) ), this, SLOT( updateChannels ( QTreeWidgetItem *, int) ) ); - - /* hide the Tree +/- */ - ui.msgWidget -> setRootIsDecorated( false ); - ui.msgList -> setRootIsDecorated( false ); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -void ChannelsDialog::messageslistWidgetCostumPopupMenu( QPoint point ) -{ - - QMenu contextMnu( this ); - QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - - newMsgAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "New Message" ), this ); - connect( newMsgAct , SIGNAL( triggered() ), this, SLOT( newmessage() ) ); - - newChanAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "New Channel" ), this ); - connect( newChanAct , SIGNAL( triggered() ), this, SLOT( newchannel() ) ); - - subChanAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr( "Subscribe To Channel" ), this ); - connect( subChanAct , SIGNAL( triggered() ), this, SLOT( subscribechannel() ) ); - - unsubChanAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Unsubscribe To Channel" ), this ); - connect( unsubChanAct , SIGNAL( triggered() ), this, SLOT( unsubscribechannel() ) ); - - delChanAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Delete Your Channel" ), this ); - connect( delChanAct , SIGNAL( triggered() ), this, SLOT( deletechannel() ) ); - - contextMnu.clear(); - contextMnu.addAction( newMsgAct); - contextMnu.addAction( newChanAct); - contextMnu.addAction( subChanAct); - contextMnu.addAction( unsubChanAct); - contextMnu.addAction( delChanAct); - contextMnu.exec( mevent->globalPos() ); -} - - -void ChannelsDialog::msgfilelistWidgetCostumPopupMenu( QPoint point ) -{ - - QMenu contextMnu( this ); - QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - - getRecAct = new QAction(QIcon(IMAGE_DOWNLOAD), tr( "Download" ), this ); - connect( getRecAct , SIGNAL( triggered() ), this, SLOT( getcurrentrecommended() ) ); - - getAllRecAct = new QAction(QIcon(IMAGE_DOWNLOADALL), tr( "Download All" ), this ); - connect( getAllRecAct , SIGNAL( triggered() ), this, SLOT( getallrecommended() ) ); - - - contextMnu.clear(); - contextMnu.addAction( getRecAct); - contextMnu.addAction( getAllRecAct); - contextMnu.exec( mevent->globalPos() ); -} - -void ChannelsDialog::newmessage() -{ - static ChanMsgDialog *createChanMsgDialog = new ChanMsgDialog(false); - - /* fill it in */ - std::cerr << "ChannelsDialog::newmessage()" << std::endl; - createChanMsgDialog->newMsg(); - createChanMsgDialog->show(); -} - -void ChannelsDialog::newchannel() -{ - /* put msg on msgBoard, and switch to it. */ - static ChanCreateDialog *createChanDialog = new ChanCreateDialog(); - - /* fill it in */ - std::cerr << "ChannelsDialog::newchannel()" << std::endl; - createChanDialog->newChan(); - createChanDialog->show(); - -} - -void ChannelsDialog::subscribechannel() -{ - /* more work */ - -} - -void ChannelsDialog::unsubscribechannel() -{ - /* more work */ - -} - - -void ChannelsDialog::deletechannel() -{ - /* more work */ - -} - - -void ChannelsDialog::getcurrentrecommended() -{ - - -} - - -void ChannelsDialog::getallrecommended() -{ - - -} - -void ChannelsDialog::insertChannels() -{ - rsiface->lockData(); /* Lock Interface */ - - /* get a link to the table */ - QTreeWidget *msgWidget = ui.msgWidget; - - QList items; - - std::map::const_iterator it2; - std::list::const_iterator it; - - const std::map &ourChans = rsiface->getOurChannels(); - - for(it2 = ourChans.begin(); it2 != ourChans.end(); it2++) - { - for(it = it2 -> second.msglist.begin(); it != it2 -> second.msglist.end(); it++) - { - /* make a widget per friend */ - QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0); - - /* So Text should be: - * as above. */ - - { - std::ostringstream out; - out << "@" << it -> ts; - item -> setText(0, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << it2 -> second.rank; // "5"; // RANK - item -> setText(1, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << "Broadcast on " << it2 -> second.chanName; - item -> setText(2, QString::fromStdString(out.str())); - } - - item -> setText(3, QString::fromStdString(it->title)); - item -> setText(4, QString::fromStdString(it->msg)); - - { - std::ostringstream out; - out << it -> size; - item -> setText(5, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << it -> count; - item -> setText(6, QString::fromStdString(out.str())); - } - - item -> setText(7, "CHAN"); - { - std::ostringstream out; - out << it2 -> first; - item -> setText(8, QString::fromStdString(out.str())); - } - { - std::ostringstream out; - out << it -> msgId; - item -> setText(9, QString::fromStdString(out.str())); - } - - - /* add to the list */ - items.append(item); - } - } - - - const std::map &chans = rsiface->getChannels(); - - for(it2 = chans.begin(); it2 != chans.end(); it2++) - { - for(it = it2 -> second.msglist.begin(); it != it2 -> second.msglist.end(); it++) - { - /* make a widget per friend */ - QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0); - - /* So Text should be: - * as above. */ - - { - std::ostringstream out; - out << "@" << it -> ts; - item -> setText(0, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << it2 -> second.rank; // "5"; // RANK - item -> setText(1, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << "Broadcast on " << it2 -> second.chanName; - item -> setText(2, QString::fromStdString(out.str())); - } - - item -> setText(3, QString::fromStdString(it->title)); - item -> setText(4, QString::fromStdString(it->msg)); - - { - std::ostringstream out; - out << it -> size; - item -> setText(5, QString::fromStdString(out.str())); - } - - { - std::ostringstream out; - out << it -> count; - item -> setText(6, QString::fromStdString(out.str())); - } - - item -> setText(7, "CHAN"); - { - std::ostringstream out; - out << it2 -> first; - item -> setText(8, QString::fromStdString(out.str())); - } - { - std::ostringstream out; - out << it -> msgId; - item -> setText(9, QString::fromStdString(out.str())); - } - - - - /* add to the list */ - items.append(item); - } - } - - /* add the items in! */ - msgWidget->clear(); - msgWidget->insertTopLevelItems(0, items); - - rsiface->unlockData(); /* UnLock Interface */ -} - -void ChannelsDialog::updateChannels( QTreeWidgetItem * item, int column ) -{ - std::cerr << "ChannelsDialog::insertMsgTxtAndFiles()" << std::endl; - insertMsgTxtAndFiles(); -} - - -void ChannelsDialog::insertMsgTxtAndFiles() -{ - /* Locate the current Message */ - QTreeWidget *msglist = ui.msgWidget; - - std::cerr << "ChannelsDialog::insertMsgTxtAndFiles()" << std::endl; - - /* get its Ids */ - std::string chid; - std::string mid; - - QTreeWidgetItem *qtwi = msglist -> currentItem(); - if (!qtwi) - { - /* blank it */ - ui.msgText->setText(""); - ui.msgList->clear(); - return; - } - else - { - chid = qtwi -> text(8).toStdString(); - mid = qtwi -> text(9).toStdString(); - } - - std::cerr << "chId: " << chid << std::endl; - std::cerr << "mId: " << mid << std::endl; - - /* get Message */ - rsiface->lockData(); /* Lock Interface */ - - const MessageInfo *mi = NULL; - mi = rsiface->getChannelMsg(chid, mid); - if (!mi) - { - rsiface->unlockData(); /* Unlock Interface */ - return; - } - - const std::list &recList = mi->files; - std::list::const_iterator it; - - /* get a link to the table */ - QTreeWidget *tree = ui.msgList; - - /* get the MessageInfo */ - - tree->clear(); - tree->setColumnCount(5); - - QList items; - for(it = recList.begin(); it != recList.end(); it++) - { - /* make a widget per person */ - QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0); - /* (0) Filename */ - item -> setText(0, QString::fromStdString(it->fname)); - - /* (1) Size */ - { - std::ostringstream out; - out << it->size; - item -> setText(1, QString::fromStdString(out.str())); - } - /* (2) Rank */ - { - std::ostringstream out; - out << it->rank; - item -> setText(2, QString::fromStdString(out.str())); - } - - item -> setText(3, QString::fromStdString(it->path)); - - /* add to the list */ - items.append(item); - } - - /* add the items in! */ - tree->insertTopLevelItems(0, items); - - - /* add the Msg */ - ui.msgText->setText(QString::fromStdString(mi -> msg)); - - rsiface->unlockData(); /* Unlock Interface */ - -} - - - diff --git a/retroshare-gui/src/gui/ChannelsDialog.h b/retroshare-gui/src/gui/ChannelsDialog.h deleted file mode 100644 index cfa2df710..000000000 --- a/retroshare-gui/src/gui/ChannelsDialog.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * 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 - -//#include - -#include "mainpage.h" -#include "ui_ChannelsDialog.h" - -class ChannelsDialog : public MainPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - ChannelsDialog(QWidget *parent = 0); - /** Default Destructor */ - - - 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; - - /** Qt Designer generated object */ - Ui::ChannelsDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/ChannelsDialog.ui b/retroshare-gui/src/gui/ChannelsDialog.ui deleted file mode 100644 index bcce96c54..000000000 --- a/retroshare-gui/src/gui/ChannelsDialog.ui +++ /dev/null @@ -1,891 +0,0 @@ - - ChannelsDialog - - - - 0 - 0 - 672 - 448 - - - - - 5 - 7 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::DefaultContextMenu - - - :/images/channels.png - - - - 9 - - - 6 - - - - - Qt::Horizontal - - - - - 160 - 16777215 - - - - - 10 - 75 - true - - - - 2 - - - - - 0 - 0 - 98 - 62 - - - - Channels - - - :/images/channels.png - - - Channels - - - - 0 - - - 0 - - - - - Qt::ScrollBarAsNeeded - - - Qt::ScrollBarAsNeeded - - - QAbstractItemView::ScrollPerItem - - - - - - - - - Indy - - - :/images/FileTypeAudio.png - - - - Zoogie on Drums - - - :/images/graph-line.png - - - - - Darkman Records - - - :/images/amsn.png - - - - - - Video - - - :/images/FileTypeVideo.png - - - - Interviews with a Coder - - - :/images/daway.png - - - - - - Miscellaneous - - - :/images/informations_24x24.png - - - - Test Channel 1 - - - - - - RetroShare - - - :/images/rstray3.png - - - - Retroshare's Demo Channel - - - :/images/rstray3.png - - - - - - - - - - - 0 - 0 - 98 - 62 - - - - My Channels - - - - 0 - - - 6 - - - - - - 8 - - - - - Retroshare's Demo Channel - - - - - - - - - - 0 - 0 - 160 - 337 - - - - My Subscriptions - - - - 0 - - - 6 - - - - - - 8 - 75 - true - - - - - Retroshare's Demo Channel - - - - - Opensource Channel - - - - - - - - - - Qt::Horizontal - - - - Qt::Vertical - - - - - 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:'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> - - - - - - - - 7 - 3 - 0 - 0 - - - - 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 - - - - - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index d0186e4d9..89e81c57c 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -132,7 +132,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) connect(ui.actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) ); connect(ui.actionOptions, SIGNAL(triggered()), this, SLOT( showSettings()) ); connect(ui.actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) ); - //connect(ui.actionSMPlayer, SIGNAL(triggered()), this, SLOT( showsmplayer()) ); connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT( showabout()) ); //connect(ui.actionColor, SIGNAL(triggered()), this, SLOT( setStyle()) ); @@ -156,7 +155,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(peersDialog = new PeersDialog(ui.stackPages), createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp)); -// ui.stackPages->add(turtleDialog = new TurtleRouterDialog(ui.stackPages), createPageAction(QIcon(IMAGE_TURTLE), tr("Turtle"), grp)); ui.stackPages->add(searchDialog = new SearchDialog(ui.stackPages), createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp)); @@ -191,13 +189,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) #else - ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); - ChannelFeed *channelFeed = NULL; ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); + ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); + ForumsDialog *forumsDialog = NULL; ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); @@ -317,6 +315,20 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) timer->start(1000); } +/** Destructor. */ +MainWindow::~MainWindow() +{ + delete _bandwidthGraph; + delete _messengerwindowAct; + delete peerstatus; + delete dhtstatus; + delete natstatus; + delete ratesstatus; + delete _settings; + delete applicationWindow; +} + + void MainWindow::displaySystrayMsg(const QString& title,const QString& msg) { trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, 3000); @@ -455,12 +467,6 @@ void MainWindow::showApplWindow() applicationWindow->show(); } -/** Destructor. */ -MainWindow::~MainWindow() -{ - delete _bandwidthGraph; - delete _messengerwindowAct; -} /** Create and bind actions to events. Setup for initial * tray menu configuration. */ diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index e2623b8d6..168b2a944 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -40,7 +40,6 @@ #include "bwgraph/bwgraph.h" #include "help/browser/helpbrowser.h" -#include "channels/channelsDialog.h" #include "ui_MainWindow.h" diff --git a/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui b/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui deleted file mode 100644 index e5873d22c..000000000 --- a/retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui +++ /dev/null @@ -1,475 +0,0 @@ - - ChannelBrowserDialog - - - - 0 - 0 - 551 - 400 - - - - - 400 - 400 - - - - Channel Browser - - - :/images/channels.png - - - - 9 - - - 6 - - - - - Qt::Horizontal - - - - - Channels - - - - - Indie - - - :/images/FileTypeAudio.png - - - - Zoogie on Drums - - - :/images/graph-line.png - - - - - Darkman Records - - - :/images/amsn.png - - - - - - Video - - - :/images/FileTypeVideo.png - - - - Interviews with a Coder - - - :/images/dbrb.png - - - - - - Miscellaneous - - - :/images/informations_24x24.png - - - - Test Channel 1 - - - :/images/FileTypeAudio.png - - - - - The Open Source Channel - - - :/images/FileTypeArchive.png - - - - - - Retroshare - - - :/images/RetroShare16.png - - - - Retroshare's Demo Channel - - - :/images/rstray3.png - - - - - - - - 7 - 7 - 0 - 0 - - - - - 250 - 150 - - - - Channel Details - - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - - 5 - 0 - 0 - 0 - - - - - 90 - 20 - - - - - 75 - true - - - - Popularity: - - - - - - - - 5 - 0 - 0 - 0 - - - - 1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 242 - 16 - - - - - - - - 0 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 80 - 80 - - - - QFrame::Box - - - - - - :/images/rstray3.png - - - true - - - 5 - - - - - - - 0 - - - 6 - - - - - - 0 - 20 - - - - Name of Selected Channel - - - Qt::AlignCenter - - - true - - - 5 - - - - - - - - - - - 0 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 90 - 0 - - - - - 75 - true - - - - Last update: - - - - - - - - 5 - 0 - 0 - 0 - - - - 12.12.2007 10:48 UTC - - - - - - - - - 0 - - - 6 - - - - - - 5 - 0 - 0 - 0 - - - - - 90 - 0 - - - - - 75 - true - - - - Subscribers: - - - - - - - - 5 - 0 - 0 - 0 - - - - 1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 0 - - - 6 - - - - - - true - - - - Once a channel is selected in the tree (left), it's description, data, title and icon will appear here in this right hand side panel.<br><br>The user can subscribe / remove subscriptions or change to the relevant page to manage their channels as required via the context menu. - - - Qt::AlignJustify|Qt::AlignTop - - - true - - - 5 - - - - - - - - - Qt::Vertical - - - - 20 - 10 - - - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui b/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui deleted file mode 100644 index 9889f6a87..000000000 --- a/retroshare-gui/src/gui/channels/ChannelStatsDialog.ui +++ /dev/null @@ -1,309 +0,0 @@ - - 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 - - - - Subscribe to this channel to get news on the latest groovy happenings on Retroshare. - - - Qt::AlignJustify|Qt::AlignTop - - - true - - - 5 - - - - - - - - - 0 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 90 - 20 - - - - - 75 - true - - - - Last update: - - - - - - - - 5 - 0 - 0 - 0 - - - - - 140 - 0 - - - - 12.12.2007 10:48 UTC - - - - - - - - - 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 deleted file mode 100644 index aa00f4fa1..000000000 --- a/retroshare-gui/src/gui/channels/ChannelsDialog.ui +++ /dev/null @@ -1,23 +0,0 @@ - - ChannelsDialog - - - - 0 - 0 - 548 - 348 - - - - Channel Module - - - :/images/channels.png - - - - - - - diff --git a/retroshare-gui/src/gui/channels/MyChannelsDialog.ui b/retroshare-gui/src/gui/channels/MyChannelsDialog.ui deleted file mode 100644 index d71c8d64e..000000000 --- a/retroshare-gui/src/gui/channels/MyChannelsDialog.ui +++ /dev/null @@ -1,318 +0,0 @@ - - MyChannelsDialog - - - - 0 - 0 - 580 - 450 - - - - - 550 - 450 - - - - My Channels - - - :/images/channels.png - - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - - 300 - 0 - - - - - Retroshare Demo Channel - - - :/images/rstray3.png - - - - - Test channel 1 - - - :/images/FileTypeAudio.png - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Create New Channel - - - :/images/add_24x24.png - - - - - - - - - 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 deleted file mode 100644 index e571c1d9d..000000000 --- a/retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui +++ /dev/null @@ -1,281 +0,0 @@ - - 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 - - - - - The Open Source Channel - - - :/images/FileTypeArchive.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 deleted file mode 100644 index 1260e035c..000000000 --- a/retroshare-gui/src/gui/channels/channelBrowserDialog.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************** -* 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" -const QString ChannelBrowserDialog::IMAGE_QUICKSUBSCRIBE = ":/images/channelsubscribe.png"; -const QString ChannelBrowserDialog::IMAGE_QUICKUNSUBSCRIBE = ":/images/channeldelete.png"; -const QString ChannelBrowserDialog::IMAGE_MANAGE_SUB = ":/images/channels.png"; -const QString ChannelBrowserDialog::IMAGE_MANAGE_CHANNEL = ":/images/channels.png"; -const QString ChannelBrowserDialog::IMAGE_QUICKDELETE = ":/images/channeldelete.png"; - -ChannelBrowserDialog::ChannelBrowserDialog(QWidget * parent) - : QDialog (parent), browserContextMenu(0) -{ - setupUi(this); - channelTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu); - connect( channelTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), - this, SLOT(channelTreeWidgetCustumPopupMenu(QPoint))); - -} - -void ChannelBrowserDialog::channelTreeWidgetCustumPopupMenu( QPoint point ) -{ - // block the popup if no results available - if ((channelTreeWidget->selectedItems()).size() == 0) return; - - // create the menu as required - if (browserContextMenu == 0) - { - // setup the browser context menu - browserContextMenu = new QMenu(this); - - // determine the selected channel and adjust the context menu accordingly i.e. no - // quick subscribe entry if the channel is already subscribed to etc - quickSubscribeAct = new QAction(QIcon(IMAGE_QUICKSUBSCRIBE), tr( "Subscribe" ), this ); - connect( quickSubscribeAct, SIGNAL( triggered() ), this, SLOT( quickSubscribe() ) ); - quickUnsubscribeAct = new QAction(QIcon(IMAGE_QUICKUNSUBSCRIBE), tr( "Remove Subscription" ), this ); - connect( quickUnsubscribeAct, SIGNAL( triggered() ), this, SLOT( quickSubscribe() ) ); - subscribeToChannelAct = new QAction(QIcon(IMAGE_MANAGE_SUB), tr( "Manage Subscription" ), this ); - connect( subscribeToChannelAct, SIGNAL( triggered() ), this, SLOT( subscribeToChannel() ) ); - editChannelAct = new QAction(QIcon(IMAGE_MANAGE_CHANNEL), tr( "Manage Channel" ), this ); - connect( editChannelAct, SIGNAL( triggered() ), this, SLOT( manageChannel() ) ); - quickDeleteAct = new QAction(QIcon(IMAGE_QUICKDELETE), tr( "Quick Delete" ), this ); - connect( quickDeleteAct, SIGNAL( triggered() ), this, SLOT( quickDelete() ) ); - - - - browserContextMenu->clear(); - browserContextMenu->addAction( new QAction("NOTE: Entries will be dynamic!!", this)); - browserContextMenu->addSeparator(); - browserContextMenu->addAction( quickSubscribeAct); - browserContextMenu->addAction( quickUnsubscribeAct); - browserContextMenu->addAction( subscribeToChannelAct); - browserContextMenu->addSeparator(); - browserContextMenu->addAction( quickDeleteAct); - browserContextMenu->addAction( editChannelAct); - } - QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, - Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - browserContextMenu->exec( mevent->globalPos() ); -} - -void ChannelBrowserDialog::quickSubscribe(){} -void ChannelBrowserDialog::quickUnsubscribe(){} -void ChannelBrowserDialog::subscribeToChannel(){} -void ChannelBrowserDialog::manageChannel(){} -void ChannelBrowserDialog::quickDelete(){} diff --git a/retroshare-gui/src/gui/channels/channelBrowserDialog.h b/retroshare-gui/src/gui/channels/channelBrowserDialog.h deleted file mode 100644 index c47f17aa9..000000000 --- a/retroshare-gui/src/gui/channels/channelBrowserDialog.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************** -* 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 ); - -private slots: - void channelTreeWidgetCustumPopupMenu( QPoint point ); - -private: - /* constants for the image files */ - static const QString IMAGE_QUICKSUBSCRIBE; - static const QString IMAGE_QUICKUNSUBSCRIBE; - static const QString IMAGE_MANAGE_SUB; - static const QString IMAGE_MANAGE_CHANNEL; - static const QString IMAGE_QUICKDELETE; - - QMenu * browserContextMenu; - - // actions for the context menu - /** context menu: allows one-click subscription to a channel */ - QAction* quickSubscribeAct; - /** context menu: allows one-click removal of channel subscription*/ - QAction* quickUnsubscribeAct; - /** context menu: switches to the my subscriptions page with this - channel selected */ - QAction* subscribeToChannelAct; - /** context menu: switches to my channels page with this channel - selected */ - QAction* editChannelAct; - /** conetxt menu: one-click delete (with confirmation pop-up) */ - QAction* quickDeleteAct; - - void quickSubscribe(); - void quickUnsubscribe(); - void subscribeToChannel(); - void manageChannel(); - void quickDelete(); -}; - - -#endif - diff --git a/retroshare-gui/src/gui/channels/channelStatsDialog.cpp b/retroshare-gui/src/gui/channels/channelStatsDialog.cpp deleted file mode 100644 index da49e5cc3..000000000 --- a/retroshare-gui/src/gui/channels/channelStatsDialog.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************** -* 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 "channelStatsDialog.h" - -ChannelStatsDialog::ChannelStatsDialog(QWidget * parent) : QDialog (parent) -{ - setupUi(this); - -} diff --git a/retroshare-gui/src/gui/channels/channelStatsDialog.h b/retroshare-gui/src/gui/channels/channelStatsDialog.h deleted file mode 100644 index f472587f7..000000000 --- a/retroshare-gui/src/gui/channels/channelStatsDialog.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************** -* 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_ - -#include -#include "ui_ChannelStatsDialog.h" - -class ChannelStatsDialog : public QDialog, -public Ui::ChannelStatsDialog -{ - Q_OBJECT - -public: - ChannelStatsDialog(QWidget * parent = 0 ); - - -}; - - -#endif diff --git a/retroshare-gui/src/gui/channels/channelsDialog.cpp b/retroshare-gui/src/gui/channels/channelsDialog.cpp deleted file mode 100644 index 247baf9a3..000000000 --- a/retroshare-gui/src/gui/channels/channelsDialog.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************** -* 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); - QGridLayout* grid = new QGridLayout(this); - - // setup the tabs - channelPages = new QTabWidget(this); - - // add the tabs to the channels dialog - channelBrowserDialog = new ChannelBrowserDialog(); - channelBrowserDialog->setObjectName(QString::fromUtf8("browserTab")); - channelPages->addTab(channelBrowserDialog, - QIcon(QString::fromUtf8(":/images/channels.png")), - tr("Browse Channels")); - - mySubscriptionsDialog = new MySubscriptionsDialog(); - mySubscriptionsDialog->setObjectName(QString::fromUtf8("mySubsTab")); - channelPages->addTab(mySubscriptionsDialog, - QIcon(QString::fromUtf8(":/images/folder-inbox.png")), - tr("My Subscriptions")); - - myChannelsDialog = new MyChannelsDialog(); - myChannelsDialog->setObjectName(QString::fromUtf8("myChannelsTab")); - channelPages->addTab(myChannelsDialog, - QIcon(QString::fromUtf8(":/images/folder-outbox.png")), - tr("My Channels")); - - grid->addWidget(channelPages, 0, 0, 1, 1); - - channelPages->setCurrentIndex(0); - -} - - - - - - - -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 deleted file mode 100644 index 29c2ee7e1..000000000 --- a/retroshare-gui/src/gui/channels/channelsDialog.h +++ /dev/null @@ -1,90 +0,0 @@ -/**************************************************************** -* 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 "channelBrowserDialog.h" -#include "myChannelsDialog.h" -#include "mySubscriptionsDialog.h" - -#include -#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; - - /** the module's pages */ - QTabWidget * channelPages; - ChannelBrowserDialog * channelBrowserDialog; - MyChannelsDialog * myChannelsDialog; - MySubscriptionsDialog * mySubscriptionsDialog; -}; - - -#endif diff --git a/retroshare-gui/src/gui/channels/myChannelsDialog.cpp b/retroshare-gui/src/gui/channels/myChannelsDialog.cpp deleted file mode 100644 index ec7b57513..000000000 --- a/retroshare-gui/src/gui/channels/myChannelsDialog.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************** -* 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 "myChannelsDialog.h" - -MyChannelsDialog::MyChannelsDialog(QWidget * parent) : QDialog (parent) -{ - setupUi(this); - -} diff --git a/retroshare-gui/src/gui/channels/myChannelsDialog.h b/retroshare-gui/src/gui/channels/myChannelsDialog.h deleted file mode 100644 index 483b9e549..000000000 --- a/retroshare-gui/src/gui/channels/myChannelsDialog.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************** -* 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_ - - -#include -#include "ui_MyChannelsDialog.h" - -class MyChannelsDialog : public QDialog, -public Ui::MyChannelsDialog -{ - Q_OBJECT - -public: - MyChannelsDialog(QWidget * parent = 0 ); - - -}; - -#endif - diff --git a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp deleted file mode 100644 index 3703539c0..000000000 --- a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************** -* 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 "mySubscriptionsDialog.h" - -MySubscriptionsDialog::MySubscriptionsDialog(QWidget * parent) : QDialog -(parent) -{ - setupUi(this); - -} diff --git a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h b/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h deleted file mode 100644 index 361eaf889..000000000 --- a/retroshare-gui/src/gui/channels/mySubscriptionsDialog.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************** -* 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 _MySubscriptionsDialog_h_ -#define _MySubscriptionsDialog_h_ - -#include -#include "ui_MySubscriptionsDialog.h" - -class MySubscriptionsDialog : public QDialog, -public Ui::MySubscriptionsDialog -{ - Q_OBJECT - -public: - MySubscriptionsDialog(QWidget * parent = 0 ); - - -}; - - -#endif - diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui index b793c36eb..b01c3388b 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.ui +++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui @@ -294,10 +294,6 @@ border-radius: 10px } - - - - diff --git a/retroshare-gui/src/rsiface/notifyqt.cpp b/retroshare-gui/src/rsiface/notifyqt.cpp index 85dff1a43..df8dad66f 100644 --- a/retroshare-gui/src/rsiface/notifyqt.cpp +++ b/retroshare-gui/src/rsiface/notifyqt.cpp @@ -13,7 +13,6 @@ #include "gui/TransfersDialog.h" //#include "gui/ChatDialog.h" #include "gui/MessagesDialog.h" -#include "gui/ChannelsDialog.h" #include "gui/MessengerWindow.h" #include "gui/toaster/OnlineToaster.h"