Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-06 05:36:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FeedReader:

Browse Source 
- enabled for Windows compile
- removed internal stylesheets
- added missing header for Linux compile

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-18 13:41:36 +00:00
parent 46054187fc
commit 5f27f64ad3
8 changed files with 51 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/FeedReader/gui/AddFeedDialog.cpp
View File

@ -61,6 +61,9 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
connect(ui->typeLocalRadio, SIGNAL(toggled(bool)), this, SLOT(validate())); connect(ui->typeLocalRadio, SIGNAL(toggled(bool)), this, SLOT(validate()));
connect(ui->typeForumRadio, SIGNAL(toggled(bool)), this, SLOT(validate())); connect(ui->typeForumRadio, SIGNAL(toggled(bool)), this, SLOT(validate()));
ui->headerFrame->setHeaderText(tr("Feed Details"));
ui->headerFrame->setHeaderImage(QPixmap(":/images/FeedReader.png"));
ui->activatedCheckBox->setChecked(true); ui->activatedCheckBox->setChecked(true);
ui->forumComboBox->setEnabled(false); ui->forumComboBox->setEnabled(false);
ui->useInfoFromFeedCheckBox->setChecked(true); ui->useInfoFromFeedCheckBox->setChecked(true);

64
plugins/FeedReader/gui/AddFeedDialog.ui
View File

@ -25,66 +25,13 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="headerFrame"> <widget class="HeaderFrame" name="headerFrame">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#headerFrame{background-image: url(:/images/connect/connectFriendBanner.png);}</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="headerIcon">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="FeedReader_images.qrc">:/images/FeedReader.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="headerLabel">
<property name="styleSheet">
<string notr="true">color: rgb(255, 255, 255);</string>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;&quot;&gt;Feed Details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
@ -433,6 +380,14 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>urlLineEdit</tabstop> <tabstop>urlLineEdit</tabstop>
<tabstop>nameLineEdit</tabstop> <tabstop>nameLineEdit</tabstop>
@ -455,7 +410,6 @@ p, li { white-space: pre-wrap; }
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="FeedReader_images.qrc"/>
<include location="../../../retroshare-gui/src/gui/images.qrc"/> <include location="../../../retroshare-gui/src/gui/images.qrc"/>
</resources> </resources>
<connections/> <connections/>

47
plugins/FeedReader/gui/FeedReaderDialog.cpp
View File

@ -69,34 +69,6 @@
#define ROLE_MSG_READ Qt::UserRole + 3 #define ROLE_MSG_READ Qt::UserRole + 3
#define ROLE_MSG_LINK Qt::UserRole + 4 #define ROLE_MSG_LINK Qt::UserRole + 4
static int filterColumnToComboBox(int nIndex)
{
switch (nIndex) {
case COLUMN_MSG_TITLE:
return 0;
case COLUMN_MSG_PUBDATE:
return 1;
case COLUMN_MSG_AUTHOR:
return 2;
}
return filterColumnToComboBox(COLUMN_MSG_TITLE);
}
static int filterColumnFromComboBox(int nIndex)
{
switch (nIndex) {
case 0:
return COLUMN_MSG_TITLE;
case 1:
return COLUMN_MSG_PUBDATE;
case 2:
return COLUMN_MSG_AUTHOR;
}
return COLUMN_MSG_TITLE;
}
FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent) FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
: MainPage(parent), mFeedReader(feedReader), ui(new Ui::FeedReaderDialog) : MainPage(parent), mFeedReader(feedReader), ui(new Ui::FeedReaderDialog)
{ {
@ -119,7 +91,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
connect(ui->msgTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(msgTreeCustomPopupMenu(QPoint))); connect(ui->msgTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(msgTreeCustomPopupMenu(QPoint)));
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterItems(QString))); connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterItems(QString)));
connect(ui->filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged())); connect(ui->filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int)));
connect(ui->linkButton, SIGNAL(clicked()), this, SLOT(openLinkMsg())); connect(ui->linkButton, SIGNAL(clicked()), this, SLOT(openLinkMsg()));
connect(ui->expandButton, SIGNAL(clicked()), this, SLOT(toggleMsgText())); connect(ui->expandButton, SIGNAL(clicked()), this, SLOT(toggleMsgText()));
@ -162,6 +134,12 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
QTreeWidgetItem *headerItem = ui->msgTreeWidget->headerItem(); QTreeWidgetItem *headerItem = ui->msgTreeWidget->headerItem();
headerItem->setText(COLUMN_MSG_READ, ""); headerItem->setText(COLUMN_MSG_READ, "");
/* add filter actions */
ui->filterLineEdit->addFilter(QIcon(), tr("Title"), COLUMN_MSG_TITLE, tr("Search Title"));
ui->filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_MSG_PUBDATE, tr("Search Date"));
ui->filterLineEdit->addFilter(QIcon(), tr("Author"), COLUMN_MSG_AUTHOR, tr("Search Author"));
ui->filterLineEdit->setCurrentFilter(COLUMN_MSG_TITLE);
/* load settings */ /* load settings */
processSettings(true); processSettings(true);
@ -217,7 +195,7 @@ void FeedReaderDialog::processSettings(bool load)
toggleMsgText_internal(); toggleMsgText_internal();
// filterColumn // filterColumn
ui->filterColumnComboBox->setCurrentIndex(filterColumnToComboBox(Settings->value("filterColumn", COLUMN_MSG_TITLE).toInt())); ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", COLUMN_MSG_TITLE).toInt());
// state of thread tree // state of thread tree
header->restoreState(Settings->value("msgTree").toByteArray()); header->restoreState(Settings->value("msgTree").toByteArray());
@ -866,7 +844,7 @@ void FeedReaderDialog::setMsgAsReadUnread(QList<QTreeWidgetItem *> &rows, bool r
} }
} }
void FeedReaderDialog::filterColumnChanged() void FeedReaderDialog::filterColumnChanged(int column)
{ {
if (mProcessSettings) { if (mProcessSettings) {
return; return;
@ -875,13 +853,12 @@ void FeedReaderDialog::filterColumnChanged()
filterItems(ui->filterLineEdit->text()); filterItems(ui->filterLineEdit->text());
// save index // save index
int filterColumn = filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex()); Settings->setValueToGroup("FeedReaderDialog", "filterColumn", column);
Settings->setValueToGroup("FeedReaderDialog", "filterColumn", filterColumn);
} }
void FeedReaderDialog::filterItems(const QString& text) void FeedReaderDialog::filterItems(const QString& text)
{ {
int filterColumn = filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex()); int filterColumn = ui->filterLineEdit->currentFilter();
int count = ui->msgTreeWidget->topLevelItemCount(); int count = ui->msgTreeWidget->topLevelItemCount();
for (int index = 0; index < count; ++index) { for (int index = 0; index < count; ++index) {
@ -904,7 +881,7 @@ void FeedReaderDialog::filterItem(QTreeWidgetItem *item, const QString &text, in
void FeedReaderDialog::filterItem(QTreeWidgetItem *item) void FeedReaderDialog::filterItem(QTreeWidgetItem *item)
{ {
filterItem(item, ui->filterLineEdit->text(), filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex())); filterItem(item, ui->filterLineEdit->text(), ui->filterLineEdit->currentFilter());
} }
void FeedReaderDialog::toggleMsgText() void FeedReaderDialog::toggleMsgText()

2
plugins/FeedReader/gui/FeedReaderDialog.h
View File

@ -52,7 +52,7 @@ private slots:
void feedItemChanged(QTreeWidgetItem *item); void feedItemChanged(QTreeWidgetItem *item);
void msgItemChanged(); void msgItemChanged();
void msgItemClicked(QTreeWidgetItem *item, int column); void msgItemClicked(QTreeWidgetItem *item, int column);
void filterColumnChanged(); void filterColumnChanged(int column);
void filterItems(const QString &text); void filterItems(const QString &text);
void toggleMsgText(); void toggleMsgText();
void newFolder(); void newFolder();

118
plugins/FeedReader/gui/FeedReaderDialog.ui
View File

@ -26,15 +26,6 @@
<height>300</height> <height>300</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#frame{border: none;}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
@ -43,28 +34,19 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="feedsHeaderFrame"> <widget class="QFrame" name="titleBarFrame">
<property name="styleSheet">
<string notr="true"> QFrame#feedsHeaderFrame{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}
</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Box</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin"> <property name="margin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="feedsIcon"> <widget class="QLabel" name="titleBarPixmap">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -74,13 +56,16 @@ border: 1px solid #CCCCCC;}
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="feedsLabel"> <widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>Feeds</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:10pt; font-weight:600;&quot;&gt;Feeds&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -135,45 +120,17 @@ p, li { white-space: pre-wrap; }
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="msgFrame"> <layout class="QGridLayout" name="msgFrame">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QFrame" name="filterFrame"> <widget class="QFrame" name="toolBarFrame">
<property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"> QFrame#frame_2{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Box</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QGridLayout" name="_7"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="margin"> <property name="margin">
<number>2</number> <number>2</number>
</property> </property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QLabel" name="filterLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../retroshare-gui/src/gui/images.qrc">:/images/find-16.png</pixmap>
</property>
</widget>
</item>
<item> <item>
<widget class="LineEditClear" name="filterLineEdit"> <widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip"> <property name="toolTip">
@ -182,41 +139,6 @@ border: 1px solid #CCCCCC;}</string>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="filterColumnComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
</font>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Title</string>
</property>
</item>
<item>
<property name="text">
<string>Date</string>
</property>
</item>
<item>
<property name="text">
<string>Author</string>
</property>
</item>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
@ -291,12 +213,6 @@ border: 1px solid #CCCCCC;}</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="msgTitle"> <widget class="QLabel" name="msgTitle">
<property name="styleSheet">
<string notr="true">QLabel#msgTitle{
border: 2px solid #CCCCCC;
border-radius: 6px;
background: white;}</string>
</property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>

6
plugins/FeedReader/gui/PreviewFeedDialog.ui
View File

@ -240,12 +240,6 @@
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QLabel#msgTitle{
border: 2px solid #CCCCCC;
border-radius: 6px;
background: white;}</string>
</property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>

1
plugins/FeedReader/services/p3FeedReaderThread.cc
View File

@ -28,6 +28,7 @@
#include "util/XPathWrapper.h" #include "util/XPathWrapper.h"
#include <openssl/evp.h> #include <openssl/evp.h>
#include <unistd.h> // for usleep
enum FeedFormat { FORMAT_RSS, FORMAT_RDF }; enum FeedFormat { FORMAT_RSS, FORMAT_RDF };

6
plugins/plugins.pro
View File

@ -2,7 +2,9 @@ TEMPLATE = subdirs
SUBDIRS += \ SUBDIRS += \
LinksCloud \ LinksCloud \
VOIP \ VOIP
# disabled until fixed. # disabled until fixed.
# FeedReader win32 {
SUBDIRS += FeedReader
}