Some cleanups.
This commit is contained in:
parent
ca916c847b
commit
c8991206e3
@ -148,8 +148,6 @@ void FeedsModelStandardFeed::update() {
|
|||||||
case FeedsModelFeed::StandardAtom10:
|
case FeedsModelFeed::StandardAtom10:
|
||||||
messages = ParsingFactory::parseAsATOM10(formatted_feed_contents);
|
messages = ParsingFactory::parseAsATOM10(formatted_feed_contents);
|
||||||
|
|
||||||
// TODO: Add support for other standard formats.
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -56,8 +56,6 @@ QSettings::Status Settings::setupSettings() {
|
|||||||
s_instance = new Settings(app_path_file, QSettings::IniFormat,
|
s_instance = new Settings(app_path_file, QSettings::IniFormat,
|
||||||
Settings::Portable, qApp);
|
Settings::Portable, qApp);
|
||||||
|
|
||||||
// TODO: Separate web settings into another unit if
|
|
||||||
// MORE web/network-related settings will be needed.
|
|
||||||
// Construct icon cache in the same path.
|
// Construct icon cache in the same path.
|
||||||
QString web_path = app_path + QDir::separator() + QString(APP_DB_WEB_PATH);
|
QString web_path = app_path + QDir::separator() + QString(APP_DB_WEB_PATH);
|
||||||
QDir(web_path).mkpath(web_path);
|
QDir(web_path).mkpath(web_path);
|
||||||
|
@ -87,9 +87,6 @@ void FeedMessageViewer::loadSize() {
|
|||||||
settings->value(APP_CFG_GUI,
|
settings->value(APP_CFG_GUI,
|
||||||
KEY_MESSAGES_VIEW + QString::number(MSG_DB_DCREATED_INDEX),
|
KEY_MESSAGES_VIEW + QString::number(MSG_DB_DCREATED_INDEX),
|
||||||
default_msg_section_size).toInt());
|
default_msg_section_size).toInt());
|
||||||
|
|
||||||
// TODO: Perhaps make toolbar icon size changeable,
|
|
||||||
// this concerns toolbars of web browsers too.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FeedMessageViewer::quitDownloader() {
|
void FeedMessageViewer::quitDownloader() {
|
||||||
|
@ -43,14 +43,14 @@ void FeedsView::setSortingEnabled(bool enable) {
|
|||||||
header()->setSortIndicatorShown(false);
|
header()->setSortIndicatorShown(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<FeedsModelFeed *> FeedsView::selectedFeeds() const {
|
QList<FeedsModelFeed*> FeedsView::selectedFeeds() const {
|
||||||
QModelIndexList selection = selectionModel()->selectedRows();
|
QModelIndexList selection = selectionModel()->selectedRows();
|
||||||
QModelIndexList mapped_selection = m_proxyModel->mapListToSource(selection);
|
QModelIndexList mapped_selection = m_proxyModel->mapListToSource(selection);
|
||||||
|
|
||||||
return m_sourceModel->feedsForIndexes(mapped_selection);
|
return m_sourceModel->feedsForIndexes(mapped_selection);
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<FeedsModelFeed *> FeedsView::allFeeds() const {
|
QList<FeedsModelFeed*> FeedsView::allFeeds() const {
|
||||||
return m_sourceModel->allFeeds();
|
return m_sourceModel->allFeeds();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,12 +98,7 @@ void FeedsView::addNewStandardCategory() {
|
|||||||
|
|
||||||
QPointer<FormStandardCategoryDetails> form_pointer = new FormStandardCategoryDetails(m_sourceModel, this);
|
QPointer<FormStandardCategoryDetails> form_pointer = new FormStandardCategoryDetails(m_sourceModel, this);
|
||||||
|
|
||||||
if (form_pointer.data()->exec(NULL) == QDialog::Accepted) {
|
form_pointer.data()->exec(NULL);
|
||||||
// TODO: nova kategorie pridana
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// TODO: nova kategorie nepridana
|
|
||||||
}
|
|
||||||
|
|
||||||
delete form_pointer.data();
|
delete form_pointer.data();
|
||||||
|
|
||||||
@ -114,12 +109,7 @@ void FeedsView::addNewStandardCategory() {
|
|||||||
void FeedsView::editStandardCategory(FeedsModelStandardCategory *category) {
|
void FeedsView::editStandardCategory(FeedsModelStandardCategory *category) {
|
||||||
QPointer<FormStandardCategoryDetails> form_pointer = new FormStandardCategoryDetails(m_sourceModel, this);
|
QPointer<FormStandardCategoryDetails> form_pointer = new FormStandardCategoryDetails(m_sourceModel, this);
|
||||||
|
|
||||||
if (form_pointer.data()->exec(category) == QDialog::Accepted) {
|
form_pointer.data()->exec(category);
|
||||||
// TODO: kategorie upravena
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// TODO: kategorie neupravena (uživatel zrušil dialog)
|
|
||||||
}
|
|
||||||
|
|
||||||
delete form_pointer.data();
|
delete form_pointer.data();
|
||||||
}
|
}
|
||||||
@ -147,12 +137,7 @@ void FeedsView::addNewStandardFeed() {
|
|||||||
|
|
||||||
QPointer<FormStandardFeedDetails> form_pointer = new FormStandardFeedDetails(m_sourceModel, this);
|
QPointer<FormStandardFeedDetails> form_pointer = new FormStandardFeedDetails(m_sourceModel, this);
|
||||||
|
|
||||||
if (form_pointer.data()->exec(NULL) == QDialog::Accepted) {
|
form_pointer.data()->exec(NULL);
|
||||||
// TODO: nova kategorie pridana
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// TODO: nova kategorie nepridana
|
|
||||||
}
|
|
||||||
|
|
||||||
delete form_pointer.data();
|
delete form_pointer.data();
|
||||||
|
|
||||||
@ -163,12 +148,7 @@ void FeedsView::addNewStandardFeed() {
|
|||||||
void FeedsView::editStandardFeed(FeedsModelStandardFeed *feed) {
|
void FeedsView::editStandardFeed(FeedsModelStandardFeed *feed) {
|
||||||
QPointer<FormStandardFeedDetails> form_pointer = new FormStandardFeedDetails(m_sourceModel, this);
|
QPointer<FormStandardFeedDetails> form_pointer = new FormStandardFeedDetails(m_sourceModel, this);
|
||||||
|
|
||||||
if (form_pointer.data()->exec(feed) == QDialog::Accepted) {
|
form_pointer.data()->exec(feed);
|
||||||
// TODO: kategorie upravena
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// TODO: kategorie neupravena (uživatel zrušil dialog)
|
|
||||||
}
|
|
||||||
|
|
||||||
delete form_pointer.data();
|
delete form_pointer.data();
|
||||||
}
|
}
|
||||||
|
@ -7,18 +7,6 @@
|
|||||||
#include "core/feedsmodel.h"
|
#include "core/feedsmodel.h"
|
||||||
|
|
||||||
|
|
||||||
// TODO: http://soundguyrob.files.wordpress.com/2011/03/screen-shot-2011-03-01-at-7-45-23-pm.jpg
|
|
||||||
// přepsat počet nepřečtených zpráv podle screenshotu (tedy smazat asi sloupec "unread")
|
|
||||||
// a počet nepřečtených přes drawRow kreslit do prvního sloupce
|
|
||||||
// taky použít ten layout pro zobrazení zprávy
|
|
||||||
// NEBO pouzit delegaty (QItemDelegate nebo QStyledItemDelegate) - https://qt-project.org/forums/viewthread/24493
|
|
||||||
// + NEWSPAPER view -> v currentChanged MessagesView se
|
|
||||||
// vytáhnou všechny vybrané zprávy, dají se do QList<Message>
|
|
||||||
// a bude se emitovat signal ze se maji tyto zpravy zobrazit
|
|
||||||
// - na tohle navazat metodu v WebBrowseru, neco
|
|
||||||
// jako navigateToMessages(const QList<Message> &messages), mrknout
|
|
||||||
// do navigateToMessage
|
|
||||||
|
|
||||||
class FeedsProxyModel;
|
class FeedsProxyModel;
|
||||||
class FeedsModelFeed;
|
class FeedsModelFeed;
|
||||||
class FeedsModelCategory;
|
class FeedsModelCategory;
|
||||||
|
@ -173,7 +173,7 @@ void FormStandardFeedDetails::apply() {
|
|||||||
FeedsModelStandardFeed::Type type = static_cast<FeedsModelStandardFeed::Type>(m_ui->m_cmbType->itemData(m_ui->m_cmbType->currentIndex()).value<int>());
|
FeedsModelStandardFeed::Type type = static_cast<FeedsModelStandardFeed::Type>(m_ui->m_cmbType->itemData(m_ui->m_cmbType->currentIndex()).value<int>());
|
||||||
FeedsModelStandardFeed *new_feed = new FeedsModelStandardFeed();
|
FeedsModelStandardFeed *new_feed = new FeedsModelStandardFeed();
|
||||||
|
|
||||||
// TODO: Setup data for new_feed.
|
// Setup data for new_feed.
|
||||||
new_feed->setTitle(m_ui->m_txtTitle->lineEdit()->text());
|
new_feed->setTitle(m_ui->m_txtTitle->lineEdit()->text());
|
||||||
new_feed->setCreationDate(QDateTime::currentDateTime());
|
new_feed->setCreationDate(QDateTime::currentDateTime());
|
||||||
new_feed->setDescription(m_ui->m_txtDescription->lineEdit()->text());
|
new_feed->setDescription(m_ui->m_txtDescription->lineEdit()->text());
|
||||||
@ -184,8 +184,7 @@ void FormStandardFeedDetails::apply() {
|
|||||||
new_feed->setParent(parent);
|
new_feed->setParent(parent);
|
||||||
|
|
||||||
if (m_editableFeed == NULL) {
|
if (m_editableFeed == NULL) {
|
||||||
// TODO: Add the feed.
|
// Add the feed.
|
||||||
// Add the category.
|
|
||||||
if (m_feedsModel->addStandardFeed(new_feed, parent)) {
|
if (m_feedsModel->addStandardFeed(new_feed, parent)) {
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
@ -194,7 +193,7 @@ void FormStandardFeedDetails::apply() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// TODO: Edit the feed.
|
// Edit the feed.
|
||||||
if (m_feedsModel->editStandardFeed(m_editableFeed, new_feed)) {
|
if (m_feedsModel->editStandardFeed(m_editableFeed, new_feed)) {
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
|
@ -24,12 +24,6 @@ class LineEditWithStatus : public QWidget {
|
|||||||
explicit LineEditWithStatus(QWidget *parent = 0);
|
explicit LineEditWithStatus(QWidget *parent = 0);
|
||||||
virtual ~LineEditWithStatus();
|
virtual ~LineEditWithStatus();
|
||||||
|
|
||||||
// TODO: napsat metodu setStatus(enum-statusu, qstring)
|
|
||||||
// kde enum-statusu bude Ok, Warning, Error a qstring bude text kerej se objevi jako
|
|
||||||
// tooltip na toolbuttonu
|
|
||||||
// pak bude proste navazani na textEdited() a tam si bude uzivatel
|
|
||||||
// widgetu nastavovat pres to setStatus co chce on
|
|
||||||
|
|
||||||
// Sets custom status for this control.
|
// Sets custom status for this control.
|
||||||
void setStatus(StatusType status, const QString &tooltip_text);
|
void setStatus(StatusType status, const QString &tooltip_text);
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ void MessagesView::currentChanged(const QModelIndex ¤t,
|
|||||||
void MessagesView::loadFeeds(const QList<int> &feed_ids) {
|
void MessagesView::loadFeeds(const QList<int> &feed_ids) {
|
||||||
// Load messages.
|
// Load messages.
|
||||||
// TODO: Here we could load user-defined default sorting
|
// TODO: Here we could load user-defined default sorting
|
||||||
// column/order AND possibly hide/show user-defined columns.
|
// column/order AND possibly hide/show user-defined columns for the feed(s).
|
||||||
m_sourceModel->loadMessages(feed_ids);
|
m_sourceModel->loadMessages(feed_ids);
|
||||||
|
|
||||||
// Make sure that initial sorting is that unread messages are visible
|
// Make sure that initial sorting is that unread messages are visible
|
||||||
|
@ -74,7 +74,7 @@ bool SystemTrayIcon::isSystemTrayAvailable() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool SystemTrayIcon::isSystemTrayActivated() {
|
bool SystemTrayIcon::isSystemTrayActivated() {
|
||||||
// TODO: check if this can be rewritten for bigger speed.
|
// TODO: Check if this can be rewritten for bigger speed.
|
||||||
return SystemTrayIcon::isSystemTrayAvailable() && Settings::instance()->value(APP_CFG_GUI,
|
return SystemTrayIcon::isSystemTrayAvailable() && Settings::instance()->value(APP_CFG_GUI,
|
||||||
"use_tray_icon",
|
"use_tray_icon",
|
||||||
true).toBool();
|
true).toBool();
|
||||||
|
@ -23,9 +23,6 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
|
||||||
// TODO: lepsi paint bez framu balloontip
|
|
||||||
// http://windowdetective.sourceforge.net/files/Window%20Detective/src/ui/custom_widgets/BalloonTip.cpp
|
|
||||||
|
|
||||||
// TODO: Check if extra UNIX signalling is needed.
|
// TODO: Check if extra UNIX signalling is needed.
|
||||||
// Use <csignal> header for it - signal function and catch SIGHUP
|
// Use <csignal> header for it - signal function and catch SIGHUP
|
||||||
// void my_terminate (int param) {
|
// void my_terminate (int param) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user