diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp index fcfb3c947..c3fff7bf6 100644 --- a/plugins/FeedReader/gui/AddFeedDialog.cpp +++ b/plugins/FeedReader/gui/AddFeedDialog.cpp @@ -61,6 +61,9 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, connect(ui->typeLocalRadio, 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->forumComboBox->setEnabled(false); ui->useInfoFromFeedCheckBox->setChecked(true); diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui index a6a4cea84..bb50990c6 100644 --- a/plugins/FeedReader/gui/AddFeedDialog.ui +++ b/plugins/FeedReader/gui/AddFeedDialog.ui @@ -25,66 +25,13 @@ 0 - + 16777215 64 - - QFrame#headerFrame{background-image: url(:/images/connect/connectFriendBanner.png);} - - - QFrame::NoFrame - - - QFrame::Raised - - - - 6 - - - 6 - - - - - - 48 - 48 - - - - - - - - - - :/images/FeedReader.png - - - true - - - - - - - color: rgb(255, 255, 255); - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;">Feed Details</span></p></body></html> - - - - @@ -433,6 +380,14 @@ p, li { white-space: pre-wrap; } + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 + + urlLineEdit nameLineEdit @@ -455,7 +410,6 @@ p, li { white-space: pre-wrap; } buttonBox - diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp index 7d72a6b23..e608fb728 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.cpp +++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp @@ -69,34 +69,6 @@ #define ROLE_MSG_READ Qt::UserRole + 3 #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) : 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->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->expandButton, SIGNAL(clicked()), this, SLOT(toggleMsgText())); @@ -162,6 +134,12 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent) QTreeWidgetItem *headerItem = ui->msgTreeWidget->headerItem(); 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 */ processSettings(true); @@ -217,7 +195,7 @@ void FeedReaderDialog::processSettings(bool load) toggleMsgText_internal(); // 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 header->restoreState(Settings->value("msgTree").toByteArray()); @@ -866,7 +844,7 @@ void FeedReaderDialog::setMsgAsReadUnread(QList &rows, bool r } } -void FeedReaderDialog::filterColumnChanged() +void FeedReaderDialog::filterColumnChanged(int column) { if (mProcessSettings) { return; @@ -875,13 +853,12 @@ void FeedReaderDialog::filterColumnChanged() filterItems(ui->filterLineEdit->text()); // save index - int filterColumn = filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex()); - Settings->setValueToGroup("FeedReaderDialog", "filterColumn", filterColumn); + Settings->setValueToGroup("FeedReaderDialog", "filterColumn", column); } void FeedReaderDialog::filterItems(const QString& text) { - int filterColumn = filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex()); + int filterColumn = ui->filterLineEdit->currentFilter(); int count = ui->msgTreeWidget->topLevelItemCount(); 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) { - filterItem(item, ui->filterLineEdit->text(), filterColumnFromComboBox(ui->filterColumnComboBox->currentIndex())); + filterItem(item, ui->filterLineEdit->text(), ui->filterLineEdit->currentFilter()); } void FeedReaderDialog::toggleMsgText() diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h index e60f218cb..ccc65d748 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.h +++ b/plugins/FeedReader/gui/FeedReaderDialog.h @@ -52,7 +52,7 @@ private slots: void feedItemChanged(QTreeWidgetItem *item); void msgItemChanged(); void msgItemClicked(QTreeWidgetItem *item, int column); - void filterColumnChanged(); + void filterColumnChanged(int column); void filterItems(const QString &text); void toggleMsgText(); void newFolder(); diff --git a/plugins/FeedReader/gui/FeedReaderDialog.ui b/plugins/FeedReader/gui/FeedReaderDialog.ui index 7dbaeea91..581523506 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.ui +++ b/plugins/FeedReader/gui/FeedReaderDialog.ui @@ -26,15 +26,6 @@ 300 - - QFrame#frame{border: none;} - - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -43,28 +34,19 @@ 0 - - - QFrame#feedsHeaderFrame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - + - QFrame::StyledPanel + QFrame::Box - QFrame::Raised + QFrame::Sunken 2 - + @@ -74,13 +56,16 @@ border: 1px solid #CCCCCC;} - + + + + 10 + 75 + true + + - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt; font-weight:600;">Feeds</span></p></body></html> + Feeds @@ -135,85 +120,22 @@ p, li { white-space: pre-wrap; } - - - - 0 - 32 - - - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - + - QFrame::StyledPanel + QFrame::Box - QFrame::Raised + QFrame::Sunken - + 2 - - - - 2 + + + + Search forums - - - - - - - :/images/find-16.png - - - - - - - Search forums - - - - - - - - - - 0 - 0 - - - - - MS Shell Dlg 2 - - - - 0 - - - - Title - - - - - Date - - - - - Author - - @@ -291,12 +213,6 @@ border: 1px solid #CCCCCC;} - - QLabel#msgTitle{ -border: 2px solid #CCCCCC; -border-radius: 6px; -background: white;} - true diff --git a/plugins/FeedReader/gui/PreviewFeedDialog.ui b/plugins/FeedReader/gui/PreviewFeedDialog.ui index 21a2a89a5..43aa444bb 100644 --- a/plugins/FeedReader/gui/PreviewFeedDialog.ui +++ b/plugins/FeedReader/gui/PreviewFeedDialog.ui @@ -240,12 +240,6 @@ 24 - - QLabel#msgTitle{ -border: 2px solid #CCCCCC; -border-radius: 6px; -background: white;} - true diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc index 764491ea1..696421392 100644 --- a/plugins/FeedReader/services/p3FeedReaderThread.cc +++ b/plugins/FeedReader/services/p3FeedReaderThread.cc @@ -28,6 +28,7 @@ #include "util/XPathWrapper.h" #include +#include // for usleep enum FeedFormat { FORMAT_RSS, FORMAT_RDF }; diff --git a/plugins/plugins.pro b/plugins/plugins.pro index 3da816074..6fc2ba547 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -2,7 +2,9 @@ TEMPLATE = subdirs SUBDIRS += \ LinksCloud \ - VOIP \ + VOIP # disabled until fixed. -# FeedReader +win32 { + SUBDIRS += FeedReader +}