FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-02-03 10:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some changes.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-18 16:23:59 +01:00
parent 83d650f02b
commit 7d17bfa798
5 changed files with 49 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
localization/rssguard-cs_CZ.ts
View File

@ -1844,35 +1844,35 @@ Status auto-aktualizace: %5</translation>
</message> </message>
<message> <message>
<source>Copy selection</source> <source>Copy selection</source>
<translation type="unfinished"></translation> <translation>Kopírovat výběr</translation>
</message> </message>
<message> <message>
<source>Copies current selection into the clipboard.</source> <source>Copies current selection into the clipboard.</source>
<translation type="unfinished"></translation> <translation>Zkopíruje aktuální výběr do schránky.</translation>
</message> </message>
<message> <message>
<source>Copy link url to clipboard.</source> <source>Copy link url to clipboard.</source>
<translation type="unfinished"></translation> <translation>Kopírovat adresu odkazu do schránky.</translation>
</message> </message>
<message> <message>
<source>Copy image to clipboard.</source> <source>Copy image to clipboard.</source>
<translation type="unfinished"></translation> <translation>Kopírovat obrázek do schránky.</translation>
</message> </message>
<message> <message>
<source>Copy image url to clipboard.</source> <source>Copy image url to clipboard.</source>
<translation type="unfinished"></translation> <translation>Kopírovat adresu obrázku do schránky.</translation>
</message> </message>
<message> <message>
<source>Open this hyperlink in new tab.</source> <source>Open this hyperlink in new tab.</source>
<translation type="unfinished"></translation> <translation>Otevřít tento odkaz v novém tabu.</translation>
</message> </message>
<message> <message>
<source>Open the hyperlink in this tab.</source> <source>Open the hyperlink in this tab.</source>
<translation type="unfinished"></translation> <translation>Otevřít tento odkaz v aktuálním tabu.</translation>
</message> </message>
<message> <message>
<source>Open this image in this tab.</source> <source>Open this image in this tab.</source>
<translation type="unfinished"></translation> <translation>Otevřít tento obrázek v aktuálním tabu.</translation>
</message> </message>
</context> </context>
</TS> </TS>

2
resources/misc/db_init_mysql.sql
View File

@ -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 ('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); 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);
-- ! -- !

2
resources/misc/db_init_sqlite.sql
View File

@ -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 ('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); 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);
-- ! -- !

131
src/gui/formsettings.ui
View File

@ -21,16 +21,7 @@
</property> </property>
<widget class="QWidget" name="m_pageGeneral"> <widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5"> <layout class="QFormLayout" name="formLayout_5">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -44,16 +35,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageDataStorage"> <widget class="QWidget" name="m_pageDataStorage">
<layout class="QFormLayout" name="formLayout_14"> <layout class="QFormLayout" name="formLayout_14">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -82,23 +64,14 @@
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QStackedWidget" name="m_stackedDatabaseDriver"> <widget class="QStackedWidget" name="m_stackedDatabaseDriver">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="m_pageSqlite"> <widget class="QWidget" name="m_pageSqlite">
<layout class="QFormLayout" name="formLayout_15"> <layout class="QFormLayout" name="formLayout_15">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -138,16 +111,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageMysql"> <widget class="QWidget" name="m_pageMysql">
<layout class="QFormLayout" name="formLayout_16"> <layout class="QFormLayout" name="formLayout_16">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -261,16 +225,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageShortcuts"> <widget class="QWidget" name="m_pageShortcuts">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -286,21 +241,12 @@ Authors of this application are NOT responsible for lost data.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>564</width> <width>576</width>
<height>363</height> <height>373</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -314,16 +260,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageUi"> <widget class="QWidget" name="m_pageUi">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -339,16 +276,7 @@ Authors of this application are NOT responsible for lost data.</string>
<string>Icons &amp;&amp; skins</string> <string>Icons &amp;&amp; skins</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -364,8 +292,8 @@ Authors of this application are NOT responsible for lost data.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>558</width> <width>568</width>
<height>337</height> <height>344</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -580,16 +508,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageLanguages"> <widget class="QWidget" name="m_pageLanguages">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -618,16 +537,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageProxy"> <widget class="QWidget" name="m_pageProxy">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -937,16 +847,7 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageFeedsMessages"> <widget class="QWidget" name="m_pageFeedsMessages">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>

23
src/gui/messagesview.cpp
View File

@ -197,9 +197,30 @@ void MessagesView::currentChanged(const QModelIndex &current,
void MessagesView::selectionChanged(const QItemSelection &selected, void MessagesView::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected) { 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<Message>() <<
// m_sourceModel->messageAt(mapped_current_index.row()));
// }
// else {
// emit currentMessagesRemoved();
// }
// TODO: This fixes bug #13 + possibly // TODO: This fixes bug #13 + possibly
// move code from currentChanged to this method too. // move code from currentChanged to this method too.
scrollTo(currentIndex(), QAbstractItemView::PositionAtCenter); //scrollTo(current_index, QAbstractItemView::PositionAtCenter);
QTreeView::selectionChanged(selected, deselected); QTreeView::selectionChanged(selected, deselected);
} }