FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reloaded langs + removed direct access to model from items - better encapsulation.

Browse Source
This commit is contained in:
Martin Rotter 2015-11-30 12:53:04 +01:00
parent 51e9d80fbc
commit bf3d97dd2c
27 changed files with 787 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
localization/rssguard-cs_CZ.ts
View File

@ -513,6 +513,14 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
<source>New messages downloaded</source>
<translation>Staženy nové zprávy</translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -661,6 +669,45 @@ or this functionality is not implemented yet.</source>
<translation>&lt;body&gt;%5 je (velmi) lehkotonážní prohlížeč kanálů.&lt;br&gt;&lt;br&gt;Tento software je distribuován pod licencí GNU General Public License, verze 3.&lt;br&gt;&lt;br&gt;Kontakty:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~web&lt;/li&gt;&lt;/ul&gt;Zdrojový kór pro %5 lze získat na jeho webu.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Název</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Verze</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished">Autor</translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Popis</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -881,10 +928,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Žádná akce není právě dostupná.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation>Kanály &amp;&amp; ka&amp;tegorie</translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Skryje hlavní ikno, je-li aktuálně viditelné. Jinak jej zobrazí.</translation>
@ -1061,26 +1104,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1137,26 +1168,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1165,22 +1184,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1189,6 +1196,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1918,6 +1957,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3281,6 +3324,14 @@ Nepřečtené zprávy: %2</translation>
<source>Stop web page loading.</source>
<translation>Zastavit načítání aktuální webové stránky.</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Nelze přidat kanál</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

133
localization/rssguard-de_DE.ts
View File

@ -502,6 +502,14 @@ Click here to open parent directory.</source>
<source>New messages downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -650,6 +658,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Name</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Version</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished">Author</translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Beschreibung</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -869,10 +916,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Keine Funktionen verfügbar.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation>Fee&amp;ds &amp;&amp; Kategorien</translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Hauptfenster verstecken falls es sichtbar was oder sichtbar falls es versteckt war.</translation>
@ -1049,26 +1092,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1125,26 +1156,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1153,22 +1172,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1177,6 +1184,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1888,6 +1927,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -2053,7 +2096,7 @@ File filter for external e-mail selection dialog.</extracomment>
</message>
<message>
<source> minutes</source>
<translation type="unfinished"></translation>
<translation type="unfinished"> Minuten</translation>
</message>
<message>
<source>Title</source>
@ -3239,6 +3282,14 @@ Unread news: %2</source>
<source>Stop web page loading.</source>
<translation>Stoppe das laden der Webseite.</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Kann Feed nicht hinzufügen</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-en_GB.ts
View File

@ -502,6 +502,14 @@ Click here to open parent directory.</source>
<source>New messages downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -650,6 +658,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -869,10 +916,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation type="unfinished"></translation>
@ -1049,26 +1092,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1125,26 +1156,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1153,22 +1172,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1177,6 +1184,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1886,6 +1925,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3234,6 +3277,14 @@ Unread news: %2</source>
<source>Stop web page loading.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-en_US.ts
View File

@ -502,6 +502,14 @@ Click here to open parent directory.</source>
<source>New messages downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -650,6 +658,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -869,10 +916,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation type="unfinished"></translation>
@ -1049,26 +1092,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1125,26 +1156,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1153,22 +1172,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1177,6 +1184,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1886,6 +1925,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3234,6 +3277,14 @@ Unread news: %2</source>
<source>Stop web page loading.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-fr_FR.ts
View File

@ -502,6 +502,14 @@ Click here to open parent directory.</source>
<source>New messages downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -650,6 +658,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Nom</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Version</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Description</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -869,10 +916,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Aucune actions disponibles pour le moment.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation>Flux &amp;&amp; catégories</translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Cacher la fenêtre principale si il est visible et la montrer si il est cacher.</translation>
@ -1049,26 +1092,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1125,26 +1156,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1153,22 +1172,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1177,6 +1184,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1898,6 +1937,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3250,6 +3293,14 @@ Unread news: %2</source>
<source>Stop web page loading.</source>
<translation>Arrêter le chargement de la page</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Impossible d&apos;ajouter le flux</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-it_IT.ts
View File

@ -502,6 +502,14 @@ Click here to open parent directory.</source>
<source>New messages downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -650,6 +658,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Nome</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Versione</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished">Autore</translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Descrizione</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -869,10 +916,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Non è disponibile nessuna azione adesso.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Nasconde la finestra principale se è visibile e la mostra se è nascosta.</translation>
@ -1049,26 +1092,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1125,26 +1156,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1153,22 +1172,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1177,6 +1184,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1888,6 +1927,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3239,6 +3282,14 @@ Unread news: %2</source>
<source>Stop web page loading.</source>
<translation>Ferma caricamento pagina web.</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Impossibile aggiungere feed</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-nl_NL.ts
View File

@ -508,6 +508,14 @@ Klik hier om map te openen.</translation>
<source>New messages downloaded</source>
<translation>Nieuw bericht gedownload</translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -656,6 +664,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Naam</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Versie</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Omschrijving</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -875,10 +922,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Er zijn geen acties beschikbaar op dit moment.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation>Fee&amp;ds &amp;&amp; categorieën</translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Verberg hoofdvenster als het zichtbaar is en toon het als het verborgen is.</translation>
@ -1055,26 +1098,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1131,26 +1162,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1159,22 +1178,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1183,6 +1190,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1920,6 +1959,10 @@ Open nieuw webbrowser pagina(sleep muis omlaag).</translation>
<source>E-mail</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3280,6 +3323,14 @@ Ongelezen nieuws: %2</translation>
<source>Stop web page loading.</source>
<translation>Stop het laden van pagina.</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Kan geen feed toevoegen</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

131
localization/rssguard-sv_SE.ts
View File

@ -507,6 +507,14 @@ Klicka här för att öppna målmappen.</translation>
<source>New messages downloaded</source>
<translation>Nya meddelanden nedladdade</translation>
</message>
<message>
<source>Cannot perform drag &amp; drop operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsToolBar</name>
@ -655,6 +663,45 @@ or this functionality is not implemented yet.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAddAccount</name>
<message>
<source>Add new account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished">Namn</translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished">Version</translation>
</message>
<message>
<source>Author</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Description</source>
<translation type="unfinished">Beskrivning</translation>
</message>
<message>
<source>Cannot add account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Some critical error occurred, report this to developers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This account can be added only once.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormBackupDatabaseSettings</name>
<message>
@ -874,10 +921,6 @@ or this functionality is not implemented yet.</source>
<source>No actions are available right now.</source>
<translation>Inga åtgärder tillgängliga just nu.</translation>
</message>
<message>
<source>Fee&amp;ds &amp;&amp; categories</source>
<translation>&amp;Flöden &amp;&amp; kategorier</translation>
</message>
<message>
<source>Hides main window if it is visible and shows it if it is hidden.</source>
<translation>Dölj programfönstret om det är synligt, och visa det om det är dolt.</translation>
@ -1054,26 +1097,14 @@ or this functionality is not implemented yet.</source>
<source>Add &amp;new item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;all items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update &amp;selected items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected item</source>
<translation type="unfinished"></translation>
@ -1130,26 +1161,14 @@ or this functionality is not implemented yet.</source>
<source>Deletes all messages from all items.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Shift+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;next item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select &amp;previous item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show only unread items</source>
<translation type="unfinished"></translation>
@ -1158,22 +1177,10 @@ or this functionality is not implemented yet.</source>
<source>&amp;Expand/collapse selected item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit selected service account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore selected messages</source>
<translation type="unfinished"></translation>
@ -1182,6 +1189,38 @@ or this functionality is not implemented yet.</source>
<source>No possible actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds &amp;&amp; categories &amp;&amp; accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Recycle bin(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Restore all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Empty all recycle bins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select next &amp;unread message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Restore recycle bin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Empty recycle bin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1912,6 +1951,10 @@ File filter for external e-mail selection dialog.</extracomment>
<source>E-mail</source>
<translation></translation>
</message>
<message>
<source>Enable notifications</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormStandardCategoryDetails</name>
@ -3270,6 +3313,14 @@ Olästa nyheter: %2</translation>
<source>Stop web page loading.</source>
<translation>Stoppa inläsning av webbsidan.</translation>
</message>
<message>
<source>Cannot add feed</source>
<translation type="unfinished">Kan inte lägga till flöde</translation>
</message>
<message>
<source>You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WebView</name>

11
src/core/feedsmodel.cpp
View File

@ -685,12 +685,15 @@ void FeedsModel::reloadWholeLayout() {
}
bool FeedsModel::addServiceAccount(ServiceRoot *root) {
m_rootItem->appendChild(root);
int new_row_index = m_rootItem->childCount();
// Item add, reload da shit.
reloadWholeLayout();
beginInsertRows(indexForItem(m_rootItem), new_row_index, new_row_index);
m_rootItem->appendChild(root);
endInsertRows();
// Connect.
connect(root, SIGNAL(itemRemovalRequested(RootItem*)), this, SLOT(removeItem(RootItem*)));
connect(root, SIGNAL(itemReassignmentRequested(RootItem*,RootItem*)), this, SLOT(reassignNodeToNewParent(RootItem*,RootItem*)));
connect(root, SIGNAL(readFeedsFilterInvalidationRequested()), this, SIGNAL(readFeedsFilterInvalidationRequested()));
connect(root, SIGNAL(dataChanged(QList<RootItem*>)), this, SLOT(onItemDataChanged(QList<RootItem*>)));
connect(root, SIGNAL(reloadMessageListRequested(bool)), this, SIGNAL(reloadMessageListRequested(bool)));
@ -731,7 +734,7 @@ void FeedsModel::loadActivatedServiceAccounts() {
// Iterate all globally available feed "service plugins".
foreach (ServiceEntryPoint *entry_point, qApp->feedServices()) {
// Load all stored root nodes from the entry point and add those to the model.
QList<ServiceRoot*> roots = entry_point->initializeSubtree(this);
QList<ServiceRoot*> roots = entry_point->initializeSubtree();
foreach (ServiceRoot *root, roots) {
addServiceAccount(root);

11
src/core/feedsmodel.h
View File

@ -75,11 +75,6 @@ class FeedsModel : public QAbstractItemModel {
// Removes item with given index.
// NOTE: Also deletes item from memory.
void removeItem(const QModelIndex &index);
void removeItem(RootItem *deleting_item);
// Checks if new parent node is different from one used by original node.
// If it is, then it reassigns original_node to new parent.
void reassignNodeToNewParent(RootItem *original_node, RootItem *new_parent);
// Returns all activated service roots.
// NOTE: Service root nodes are lying directly UNDER
@ -157,6 +152,12 @@ class FeedsModel : public QAbstractItemModel {
bool addServiceAccount(ServiceRoot *root);
public slots:
// Checks if new parent node is different from one used by original node.
// If it is, then it reassigns original_node to new parent.
void reassignNodeToNewParent(RootItem *original_node, RootItem *new_parent);
void removeItem(RootItem *deleting_item);
bool restoreAllBins();
bool emptyAllBins();

2
src/gui/dialogs/formaddaccount.cpp
View File

@ -52,7 +52,7 @@ void FormAddAccount::addSelectedAccount() {
accept();
ServiceEntryPoint *point = selectedEntryPoint();
ServiceRoot *new_root = point->createNewRoot(m_model);
ServiceRoot *new_root = point->createNewRoot();
if (new_root != NULL) {
m_model->addServiceAccount(new_root);

4
src/services/abstract/serviceentrypoint.h
View File

@ -38,13 +38,13 @@ class ServiceEntryPoint {
// some kind of first-time configuration dialog inside itself
// before returning the root item.
// Returns NULL if initialization of new root cannot be done.
virtual ServiceRoot *createNewRoot(FeedsModel *main_model) = 0;
virtual ServiceRoot *createNewRoot() = 0;
// Performs initialization of all service accounts created using this entry
// point from persistent DB.
// Returns list of root nodes which will be afterwards added
// to the global feed model.
virtual QList<ServiceRoot*> initializeSubtree(FeedsModel *main_model) = 0;
virtual QList<ServiceRoot*> initializeSubtree() = 0;
// Can this service account be added just once?
// NOTE: This is true particularly for "standard" service

14
src/services/abstract/serviceroot.cpp
View File

@ -20,17 +20,13 @@
#include "core/feedsmodel.h"
ServiceRoot::ServiceRoot(FeedsModel *feeds_model, RootItem *parent) : RootItem(parent), m_feedsModel(feeds_model) {
ServiceRoot::ServiceRoot(RootItem *parent) : RootItem(parent) {
setKind(RootItemKind::ServiceRoot);
}
ServiceRoot::~ServiceRoot() {
}
FeedsModel *ServiceRoot::feedsModel() const {
return m_feedsModel;
}
void ServiceRoot::itemChanged(QList<RootItem*> items) {
emit dataChanged(items);
}
@ -42,3 +38,11 @@ void ServiceRoot::requestReloadMessageList(bool mark_selected_messages_read) {
void ServiceRoot::requestFeedReadFilterReload() {
emit readFeedsFilterInvalidationRequested();
}
void ServiceRoot::requestItemReassignment(RootItem *item, RootItem *new_parent) {
emit itemReassignmentRequested(item, new_parent);
}
void ServiceRoot::requestItemRemoval(RootItem *item) {
emit itemRemovalRequested(item);
}

12
src/services/abstract/serviceroot.h
View File

@ -37,7 +37,7 @@ class ServiceRoot : public RootItem {
Q_OBJECT
public:
explicit ServiceRoot(FeedsModel *feeds_model, RootItem *parent = NULL);
explicit ServiceRoot(RootItem *parent = NULL);
virtual ~ServiceRoot();
// Returns list of specific actions for "Add new item" main window menu.
@ -125,22 +125,22 @@ class ServiceRoot : public RootItem {
// Selected item is naturally recycle bin.
virtual bool onAfterMessagesRestoredFromBin(RootItem *selected_item, QList<int> message_db_ids) = 0;
// Access to feed model.
FeedsModel *feedsModel() const;
// Obvious methods to wrap signals.
void itemChanged(QList<RootItem*> items);
void requestReloadMessageList(bool mark_selected_messages_read);
void requestFeedReadFilterReload();
void requestItemReassignment(RootItem *item, RootItem *new_parent);
void requestItemRemoval(RootItem *item);
signals:
// Emitted if data in any item belonging to this root are changed.
void dataChanged(QList<RootItem*> items);
void readFeedsFilterInvalidationRequested();
void reloadMessageListRequested(bool mark_selected_messages_read);
private:
FeedsModel *m_feedsModel;
void itemReassignmentRequested(RootItem *item, RootItem *new_parent);
void itemRemovalRequested(RootItem *item);
};
#endif // SERVICEROOT_H

4
src/services/standard/gui/formstandardcategorydetails.cpp
View File

@ -122,7 +122,7 @@ void FormStandardCategoryDetails::apply() {
if (m_editableCategory == NULL) {
// Add the category.
if (new_category->addItself(parent)) {
m_serviceRoot->feedsModel()->reassignNodeToNewParent(new_category, parent);
m_serviceRoot->requestItemReassignment(new_category, parent);
accept();
}
else {
@ -139,7 +139,7 @@ void FormStandardCategoryDetails::apply() {
bool edited = m_editableCategory->editItself(new_category);
if (edited) {
m_serviceRoot->feedsModel()->reassignNodeToNewParent(m_editableCategory, new_category->parent());
m_serviceRoot->requestItemReassignment(m_editableCategory, new_category->parent());
accept();
}
else {

4
src/services/standard/gui/formstandardfeeddetails.cpp
View File

@ -241,7 +241,7 @@ void FormStandardFeedDetails::apply() {
if (m_editableFeed == NULL) {
// Add the feed.
if (new_feed->addItself(parent)) {
m_serviceRoot->feedsModel()->reassignNodeToNewParent(new_feed, parent);
m_serviceRoot->requestItemReassignment(new_feed, parent);
accept();
}
else {
@ -258,7 +258,7 @@ void FormStandardFeedDetails::apply() {
bool edited = m_editableFeed->editItself(new_feed);
if (edited) {
m_serviceRoot->feedsModel()->reassignNodeToNewParent(m_editableFeed, new_feed->parent());
m_serviceRoot->requestItemReassignment(m_editableFeed, new_feed->parent());
accept();
}
else {

4
src/services/standard/standardcategory.cpp
View File

@ -100,7 +100,7 @@ bool StandardCategory::performDragDropChange(RootItem *target_item) {
category_new->setParent(target_item);
if (editItself(category_new)) {
serviceRoot()->feedsModel()->reassignNodeToNewParent(this, target_item);
serviceRoot()->requestItemReassignment(this, target_item);
delete category_new;
return true;
}
@ -120,7 +120,7 @@ bool StandardCategory::editViaGui() {
bool StandardCategory::deleteViaGui() {
if (removeItself()) {
serviceRoot()->feedsModel()->removeItem(this);
serviceRoot()->requestItemRemoval(this);
return true;
}
else {

4
src/services/standard/standardfeed.cpp
View File

@ -116,7 +116,7 @@ bool StandardFeed::editViaGui() {
bool StandardFeed::deleteViaGui() {
if (removeItself()) {
serviceRoot()->feedsModel()->removeItem(this);
serviceRoot()->requestItemRemoval(this);
return true;
}
else {
@ -445,7 +445,7 @@ bool StandardFeed::performDragDropChange(RootItem *target_item) {
feed_new->setParent(target_item);
if (editItself(feed_new)) {
serviceRoot()->feedsModel()->reassignNodeToNewParent(this, target_item);
serviceRoot()->requestItemReassignment(this, target_item);
delete feed_new;
return true;
}

2
src/services/standard/standardfeedsimportexportmodel.cpp
View File

@ -167,7 +167,7 @@ bool FeedsImportExportModel::importAsOPML20(const QByteArray &data) {
return false;
}
StandardServiceRoot *root_item = new StandardServiceRoot(false, NULL, NULL);
StandardServiceRoot *root_item = new StandardServiceRoot(false);
QStack<RootItem*> model_items; model_items.push(root_item);
QStack<QDomElement> elements_to_process; elements_to_process.push(opml_document.documentElement().elementsByTagName(QSL("body")).at(0).toElement());

8
src/services/standard/standardserviceentrypoint.cpp
View File

@ -59,20 +59,20 @@ QString StandardServiceEntryPoint::code() {
return SERVICE_CODE_STD_RSS;
}
ServiceRoot *StandardServiceEntryPoint::createNewRoot(FeedsModel *main_model) {
ServiceRoot *StandardServiceEntryPoint::createNewRoot() {
// Switch DB.
QSqlDatabase database = qApp->database()->connection(QSL("StandardServiceEntryPoint"), DatabaseFactory::FromSettings);
QSqlQuery query(database);
if (query.exec(QSL("UPDATE Information SET inf_value = 1 WHERE inf_key = 'standard_account_enabled';"))) {
return new StandardServiceRoot(true, main_model);
return new StandardServiceRoot(true);
}
else {
return NULL;
}
}
QList<ServiceRoot*> StandardServiceEntryPoint::initializeSubtree(FeedsModel *main_model) {
QList<ServiceRoot*> StandardServiceEntryPoint::initializeSubtree() {
// Check DB if standard account is enabled.
QSqlDatabase database = qApp->database()->connection(QSL("StandardServiceEntryPoint"), DatabaseFactory::FromSettings);
QSqlQuery query(database);
@ -80,7 +80,7 @@ QList<ServiceRoot*> StandardServiceEntryPoint::initializeSubtree(FeedsModel *mai
if (query.exec(QSL("SELECT inf_value FROM Information WHERE inf_key = 'standard_account_enabled';"))) {
if (query.next() && query.value(0).toInt() == 1) {
StandardServiceRoot *root = new StandardServiceRoot(true, main_model);
StandardServiceRoot *root = new StandardServiceRoot(true);
roots.append(root);
}
}

4
src/services/standard/standardserviceentrypoint.h
View File

@ -34,8 +34,8 @@ class StandardServiceEntryPoint : public ServiceEntryPoint {
QIcon icon();
QString code();
ServiceRoot *createNewRoot(FeedsModel *main_model);
QList<ServiceRoot*> initializeSubtree(FeedsModel *main_model);
ServiceRoot *createNewRoot();
QList<ServiceRoot*> initializeSubtree();
};
#endif // STANDARDSERVICEENTRYPOINT_H

13
src/services/standard/standardserviceroot.cpp
View File

@ -43,8 +43,8 @@
#include <QSqlTableModel>
StandardServiceRoot::StandardServiceRoot(bool load_from_db, FeedsModel *feeds_model, RootItem *parent)
: ServiceRoot(feeds_model, parent), m_recycleBin(new StandardRecycleBin(this)),
StandardServiceRoot::StandardServiceRoot(bool load_from_db, RootItem *parent)
: ServiceRoot(parent), m_recycleBin(new StandardRecycleBin(this)),
m_actionExportFeeds(NULL), m_actionImportFeeds(NULL), m_serviceMenu(QList<QAction*>()),
m_addItemMenu(QList<QAction*>()), m_feedContextMenu(QList<QAction*>()), m_actionFeedFetchMetadata(NULL) {
@ -54,7 +54,6 @@ StandardServiceRoot::StandardServiceRoot(bool load_from_db, FeedsModel *feeds_mo
setCreationDate(QDateTime::currentDateTime());
if (load_from_db) {
loadFromDatabase();
}
}
@ -134,10 +133,8 @@ bool StandardServiceRoot::deleteViaGui() {
// Switch "existence" flag.
bool data_removed = QSqlQuery(connection).exec(QSL("UPDATE Information SET inf_value = 0 WHERE inf_key = 'standard_account_enabled';"));
// TODO: pokračovat
if (data_removed) {
feedsModel()->removeItem(this);
requestItemRemoval(this);
}
return data_removed;
@ -508,7 +505,7 @@ bool StandardServiceRoot::mergeImportExportModel(FeedsImportExportModel *model,
new_category->clearChildren();
if (new_category->addItself(target_parent)) {
feedsModel()->reassignNodeToNewParent(new_category, target_parent);
requestItemReassignment(new_category, target_parent);
// Process all children of this category.
original_parents.push(new_category);
@ -542,7 +539,7 @@ bool StandardServiceRoot::mergeImportExportModel(FeedsImportExportModel *model,
// Append this feed and end this iteration.
if (new_feed->addItself(target_parent)) {
feedsModel()->reassignNodeToNewParent(new_feed, target_parent);
requestItemReassignment(new_feed, target_parent);
}
else {
delete new_feed;

2
src/services/standard/standardserviceroot.h
View File

@ -40,7 +40,7 @@ class StandardServiceRoot : public ServiceRoot {
Q_OBJECT
public:
explicit StandardServiceRoot(bool load_from_db, FeedsModel *feeds_model, RootItem *parent = NULL);
explicit StandardServiceRoot(bool load_from_db, RootItem *parent = NULL);
virtual ~StandardServiceRoot();
// Start/stop root.

4
src/services/tt-rss/ttrssserviceentrypoint.cpp
View File

@ -58,10 +58,10 @@ QString TtRssServiceEntryPoint::code() {
return SERVICE_CODE_TT_RSS;
}
ServiceRoot *TtRssServiceEntryPoint::createNewRoot(FeedsModel *main_model) {
ServiceRoot *TtRssServiceEntryPoint::createNewRoot() {
return NULL;
}
QList<ServiceRoot*> TtRssServiceEntryPoint::initializeSubtree(FeedsModel *main_model) {
QList<ServiceRoot*> TtRssServiceEntryPoint::initializeSubtree() {
return QList<ServiceRoot*>();
}

4
src/services/tt-rss/ttrssserviceentrypoint.h
View File

@ -35,8 +35,8 @@ class TtRssServiceEntryPoint : public ServiceEntryPoint {
QIcon icon();
QString code();
ServiceRoot *createNewRoot(FeedsModel *main_model);
QList<ServiceRoot*> initializeSubtree(FeedsModel *main_model);
ServiceRoot *createNewRoot();
QList<ServiceRoot*> initializeSubtree();
};
#endif // TTRSSSERVICEENTRYPOINT_H

2
src/services/tt-rss/ttrssserviceroot.cpp
View File

@ -23,7 +23,7 @@
#include "core/feedsmodel.h"
TtRssServiceRoot::TtRssServiceRoot(FeedsModel *feeds_model, RootItem *parent) : ServiceRoot(feeds_model, parent) {
TtRssServiceRoot::TtRssServiceRoot(RootItem *parent) : ServiceRoot(parent) {
// TODO: nadpis se bude měnit podle nastavení uživatelského
// jména a serveru tohoto ttrss učtu
setTitle(qApp->system()->getUsername() + "@ttrss");

2
src/services/tt-rss/ttrssserviceroot.h
View File

@ -29,7 +29,7 @@ class TtRssServiceRoot : public ServiceRoot {
Q_OBJECT
public:
explicit TtRssServiceRoot(FeedsModel *feeds_model, RootItem *parent = NULL);
explicit TtRssServiceRoot(RootItem *parent = NULL);
virtual ~TtRssServiceRoot();
QString code();