From 5deaf2658bdeddea718f0d311f4e7b12fe70b2c1 Mon Sep 17 00:00:00 2001 From: libris Date: Thu, 13 Dec 2007 16:02:33 +0000 Subject: [PATCH] Check-in of GUI files for the new Channels Module implementation. These files are place holders only. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@278 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 35 +- retroshare-gui/src/gui/ChannelsDialog.ui | 7 +- retroshare-gui/src/gui/MainWindow.cpp | 42 +- retroshare-gui/src/gui/MainWindow.h | 6 +- .../src/gui/channels/ChannelBrowserDialog.ui | 422 ++++++++++++++++++ .../src/gui/channels/ChannelStatsDialog.ui | 315 +++++++++++++ .../src/gui/channels/ChannelsDialog.ui | 62 +++ .../src/gui/channels/MyChannelsDialog.ui | 336 ++++++++++++++ .../src/gui/channels/MySubscriptionsDialog.ui | 273 +++++++++++ .../src/gui/channels/channelBrowserDialog.cpp | 29 ++ .../src/gui/channels/channelBrowserDialog.h | 40 ++ .../src/gui/channels/channelStatsDialog.cpp | 1 + .../src/gui/channels/channelStatsDialog.h | 25 ++ .../src/gui/channels/channelsDialog.cpp | 100 +++++ .../src/gui/channels/channelsDialog.h | 79 ++++ .../src/gui/channels/myChannelsDialog.cpp | 1 + .../src/gui/channels/myChannelsDialog.h | 26 ++ .../gui/channels/mySubscriptionsDialog.cpp | 21 + .../src/gui/channels/mySubscriptionsDialog.h | 26 ++ retroshare-gui/src/gui/images.qrc | 419 +++++++++-------- retroshare-gui/src/gui/images/channels.png | Bin 0 -> 3212 bytes retroshare-gui/src/gui/images/diskSave.png | Bin 0 -> 4775 bytes 22 files changed, 2016 insertions(+), 249 deletions(-) create mode 100644 retroshare-gui/src/gui/channels/ChannelBrowserDialog.ui create mode 100644 retroshare-gui/src/gui/channels/ChannelStatsDialog.ui create mode 100644 retroshare-gui/src/gui/channels/ChannelsDialog.ui create mode 100644 retroshare-gui/src/gui/channels/MyChannelsDialog.ui create mode 100644 retroshare-gui/src/gui/channels/MySubscriptionsDialog.ui create mode 100644 retroshare-gui/src/gui/channels/channelBrowserDialog.cpp create mode 100644 retroshare-gui/src/gui/channels/channelBrowserDialog.h create mode 100644 retroshare-gui/src/gui/channels/channelStatsDialog.cpp create mode 100644 retroshare-gui/src/gui/channels/channelStatsDialog.h create mode 100644 retroshare-gui/src/gui/channels/channelsDialog.cpp create mode 100644 retroshare-gui/src/gui/channels/channelsDialog.h create mode 100644 retroshare-gui/src/gui/channels/myChannelsDialog.cpp create mode 100644 retroshare-gui/src/gui/channels/myChannelsDialog.h create mode 100644 retroshare-gui/src/gui/channels/mySubscriptionsDialog.cpp create mode 100644 retroshare-gui/src/gui/channels/mySubscriptionsDialog.h create mode 100644 retroshare-gui/src/gui/images/channels.png create mode 100644 retroshare-gui/src/gui/images/diskSave.png 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 0000000000000000000000000000000000000000..3c53997a0c621fd9c55d15b2a4595ceece8cdae5 GIT binary patch literal 3212 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 literal 0 HcmV?d00001