From 7d17bfa7984d3cbbb4aa64e19957c742ffbf05c4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 18 Feb 2014 16:23:59 +0100 Subject: [PATCH] Some changes. --- localization/rssguard-cs_CZ.ts | 18 ++-- resources/misc/db_init_mysql.sql | 2 +- resources/misc/db_init_sqlite.sql | 2 +- src/gui/formsettings.ui | 131 ++++-------------------------- src/gui/messagesview.cpp | 23 +++++- 5 files changed, 49 insertions(+), 127 deletions(-) diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 9ff622076..ed68ce6a0 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -911,7 +911,7 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat. minutes - minut + minut Feed connection timeout @@ -1844,35 +1844,35 @@ Status auto-aktualizace: %5 Copy selection - + Kopírovat výběr Copies current selection into the clipboard. - + Zkopíruje aktuální výběr do schránky. Copy link url to clipboard. - + Kopírovat adresu odkazu do schránky. Copy image to clipboard. - + Kopírovat obrázek do schránky. Copy image url to clipboard. - + Kopírovat adresu obrázku do schránky. Open this hyperlink in new tab. - + Otevřít tento odkaz v novém tabu. Open the hyperlink in this tab. - + Otevřít tento odkaz v aktuálním tabu. Open this image in this tab. - + Otevřít tento obrázek v aktuálním tabu. diff --git a/resources/misc/db_init_mysql.sql b/resources/misc/db_init_mysql.sql index 7d39a2236..bb523b13b 100644 --- a/resources/misc/db_init_mysql.sql +++ b/resources/misc/db_init_mysql.sql @@ -79,7 +79,7 @@ INSERT INTO Categories (id, parent_id, title, description, date_created, type, i -- ! INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('Linux Today', 'Linux Today - Linux News on Internet Time.', 1388678961000, 1, 'UTF-8', 'http://feeds.feedburner.com/linuxtoday/linux?format=xml', 0, 0, 1); -- ! -INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LinuxInsider', 'LinuxInsider: Linux News & Information from Around the World.', 1388678961000, 1, 'UTF-8', 'http://www.linuxinsider.com/perl/syndication/rssfull.pl', 0, 0, 2); +INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LinuxInsider', 'LinuxInsider: Linux News & Information from Around the World.', 1388678961000, 1, 'UTF-8', 'http://www.linuxinsider.com/perl/syndication/rssfull.pl', 0, 0, 1); -- ! INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LXer: Linux News', 'The world is talking about GNU/Linux and Free/Open Source Software.', 1388678961000, 1, 'UTF-8', 'http://lxer.com/module/newswire/headlines.rss', 0, 0, 2); -- ! diff --git a/resources/misc/db_init_sqlite.sql b/resources/misc/db_init_sqlite.sql index eab252ed1..778fe3006 100644 --- a/resources/misc/db_init_sqlite.sql +++ b/resources/misc/db_init_sqlite.sql @@ -73,7 +73,7 @@ INSERT INTO Categories (id, parent_id, title, description, date_created, type, i -- ! INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('Linux Today', 'Linux Today - Linux News on Internet Time.', 1388678961000, 1, 'UTF-8', 'http://feeds.feedburner.com/linuxtoday/linux?format=xml', 0, 0, 1); -- ! -INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LinuxInsider', 'LinuxInsider: Linux News & Information from Around the World.', 1388678961000, 1, 'UTF-8', 'http://www.linuxinsider.com/perl/syndication/rssfull.pl', 0, 0, 2); +INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LinuxInsider', 'LinuxInsider: Linux News & Information from Around the World.', 1388678961000, 1, 'UTF-8', 'http://www.linuxinsider.com/perl/syndication/rssfull.pl', 0, 0, 1); -- ! INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LXer: Linux News', 'The world is talking about GNU/Linux and Free/Open Source Software.', 1388678961000, 1, 'UTF-8', 'http://lxer.com/module/newswire/headlines.rss', 0, 0, 2); -- ! diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index 65f46dc78..817308581 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -21,16 +21,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -44,16 +35,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -82,23 +64,14 @@ - 1 + 0 QFormLayout::AllNonFixedFieldsGrow - - 0 - - - 0 - - - 0 - - + 0 @@ -138,16 +111,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 @@ -261,16 +225,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 @@ -286,21 +241,12 @@ Authors of this application are NOT responsible for lost data. 0 0 - 564 - 363 + 576 + 373 - - 0 - - - 0 - - - 0 - - + 0 @@ -314,16 +260,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 @@ -339,16 +276,7 @@ Authors of this application are NOT responsible for lost data. Icons && skins - - 0 - - - 0 - - - 0 - - + 0 @@ -364,8 +292,8 @@ Authors of this application are NOT responsible for lost data. 0 0 - 558 - 337 + 568 + 344 @@ -580,16 +508,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 @@ -618,16 +537,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 @@ -937,16 +847,7 @@ Authors of this application are NOT responsible for lost data. - - 0 - - - 0 - - - 0 - - + 0 diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index a60b3a24a..d79009aac 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -197,9 +197,30 @@ void MessagesView::currentChanged(const QModelIndex ¤t, void MessagesView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { +// QModelIndex current_index = currentIndex(); +// QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); + +// qDebug("Current row changed - row [%d,%d] source [%d, %d].", +// current_index.row(), current_index.column(), +// mapped_current_index.row(), mapped_current_index.column()); + +// if (mapped_current_index.isValid()) { +// if (!m_batchUnreadSwitch) { +// // Set this message as read only if current item +// // wasn't changed by "mark selected messages unread" action. +// m_sourceModel->setMessageRead(mapped_current_index.row(), 1); +// } + +// emit currentMessagesChanged(QList() << +// m_sourceModel->messageAt(mapped_current_index.row())); +// } +// else { +// emit currentMessagesRemoved(); +// } + // TODO: This fixes bug #13 + possibly // move code from currentChanged to this method too. - scrollTo(currentIndex(), QAbstractItemView::PositionAtCenter); + //scrollTo(current_index, QAbstractItemView::PositionAtCenter); QTreeView::selectionChanged(selected, deselected); }