From f12c395e80e8882a344048f530d66520ad03147d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 10 Jun 2019 09:54:18 +0200 Subject: [PATCH] experimentally separate executable and core library --- build.pro | 46 ++ pri/build_opts.pri | 70 ++ pri/defs.pri | 36 + pri/install.pri | 269 ++++++ pri/vars.pri | 36 + .../desktop/com.github.rssguard.appdata.xml | 2 +- rssguard.pro | 771 ------------------ src/{ => librssguard}/core/feeddownloader.cpp | 0 src/{ => librssguard}/core/feeddownloader.h | 0 src/{ => librssguard}/core/feedsmodel.cpp | 0 src/{ => librssguard}/core/feedsmodel.h | 2 +- .../core/feedsproxymodel.cpp | 0 src/{ => librssguard}/core/feedsproxymodel.h | 0 src/{ => librssguard}/core/message.cpp | 0 src/{ => librssguard}/core/message.h | 0 src/{ => librssguard}/core/messagesmodel.cpp | 0 src/{ => librssguard}/core/messagesmodel.h | 0 .../core/messagesmodelcache.cpp | 0 .../core/messagesmodelcache.h | 0 .../core/messagesmodelsqllayer.cpp | 0 .../core/messagesmodelsqllayer.h | 0 .../core/messagesproxymodel.cpp | 0 .../core/messagesproxymodel.h | 0 .../definitions/definitions.h | 0 .../dynamic-shortcuts/dynamicshortcuts.cpp | 0 .../dynamic-shortcuts/dynamicshortcuts.h | 0 .../dynamicshortcutswidget.cpp | 0 .../dynamicshortcutswidget.h | 0 .../dynamic-shortcuts/shortcutbutton.cpp | 0 .../dynamic-shortcuts/shortcutbutton.h | 0 .../dynamic-shortcuts/shortcutcatcher.cpp | 0 .../dynamic-shortcuts/shortcutcatcher.h | 0 .../exceptions/applicationexception.cpp | 0 .../exceptions/applicationexception.h | 0 .../exceptions/ioexception.cpp | 0 .../exceptions/ioexception.h | 0 src/{ => librssguard}/gui/baselineedit.cpp | 0 src/{ => librssguard}/gui/baselineedit.h | 0 src/{ => librssguard}/gui/basetoolbar.cpp | 0 src/{ => librssguard}/gui/basetoolbar.h | 0 src/{ => librssguard}/gui/colorlabel.cpp | 0 src/{ => librssguard}/gui/colorlabel.h | 0 .../gui/comboboxwithstatus.cpp | 0 .../gui/comboboxwithstatus.h | 0 .../gui/dialogs/formabout.cpp | 0 src/{ => librssguard}/gui/dialogs/formabout.h | 2 +- .../gui/dialogs/formabout.ui | 0 .../gui/dialogs/formaddaccount.cpp | 0 .../gui/dialogs/formaddaccount.h | 0 .../gui/dialogs/formaddaccount.ui | 0 .../dialogs/formbackupdatabasesettings.cpp | 0 .../gui/dialogs/formbackupdatabasesettings.h | 0 .../gui/dialogs/formbackupdatabasesettings.ui | 0 .../gui/dialogs/formdatabasecleanup.cpp | 0 .../gui/dialogs/formdatabasecleanup.h | 0 .../gui/dialogs/formdatabasecleanup.ui | 0 .../gui/dialogs/formmain.cpp | 5 + src/{ => librssguard}/gui/dialogs/formmain.h | 4 +- src/{ => librssguard}/gui/dialogs/formmain.ui | 0 .../dialogs/formrestoredatabasesettings.cpp | 0 .../gui/dialogs/formrestoredatabasesettings.h | 0 .../dialogs/formrestoredatabasesettings.ui | 0 .../gui/dialogs/formsettings.cpp | 0 .../gui/dialogs/formsettings.h | 0 .../gui/dialogs/formsettings.ui | 0 .../gui/dialogs/formupdate.cpp | 0 .../gui/dialogs/formupdate.h | 2 +- .../gui/dialogs/formupdate.ui | 0 .../gui/dialogs/oauthlogin.cpp | 0 .../gui/dialogs/oauthlogin.h | 0 .../gui/dialogs/oauthlogin.ui | 0 .../gui/discoverfeedsbutton.cpp | 0 .../gui/discoverfeedsbutton.h | 0 src/{ => librssguard}/gui/edittableview.cpp | 0 src/{ => librssguard}/gui/edittableview.h | 0 .../gui/feedmessageviewer.cpp | 0 src/{ => librssguard}/gui/feedmessageviewer.h | 2 +- src/{ => librssguard}/gui/feedstoolbar.cpp | 0 src/{ => librssguard}/gui/feedstoolbar.h | 0 src/{ => librssguard}/gui/feedsview.cpp | 0 src/{ => librssguard}/gui/feedsview.h | 2 +- src/{ => librssguard}/gui/guiutilities.cpp | 0 src/{ => librssguard}/gui/guiutilities.h | 0 src/{ => librssguard}/gui/labelwithstatus.cpp | 0 src/{ => librssguard}/gui/labelwithstatus.h | 0 .../gui/lineeditwithstatus.cpp | 0 .../gui/lineeditwithstatus.h | 0 .../gui/locationlineedit.cpp | 0 src/{ => librssguard}/gui/locationlineedit.h | 0 src/{ => librssguard}/gui/messagebox.cpp | 0 src/{ => librssguard}/gui/messagebox.h | 0 .../gui/messagepreviewer.cpp | 0 src/{ => librssguard}/gui/messagepreviewer.h | 0 src/{ => librssguard}/gui/messagepreviewer.ui | 0 .../gui/messagessearchlineedit.cpp | 0 .../gui/messagessearchlineedit.h | 0 src/{ => librssguard}/gui/messagestoolbar.cpp | 0 src/{ => librssguard}/gui/messagestoolbar.h | 0 src/{ => librssguard}/gui/messagesview.cpp | 0 src/{ => librssguard}/gui/messagesview.h | 0 .../gui/messagetextbrowser.cpp | 0 .../gui/messagetextbrowser.h | 0 .../gui/newspaperpreviewer.cpp | 0 .../gui/newspaperpreviewer.h | 0 .../gui/newspaperpreviewer.ui | 0 src/{ => librssguard}/gui/plaintoolbutton.cpp | 0 src/{ => librssguard}/gui/plaintoolbutton.h | 0 .../gui/searchtextwidget.cpp | 0 src/{ => librssguard}/gui/searchtextwidget.h | 0 src/{ => librssguard}/gui/searchtextwidget.ui | 0 .../gui/settings/settingsbrowsermail.cpp | 0 .../gui/settings/settingsbrowsermail.h | 0 .../gui/settings/settingsbrowsermail.ui | 0 .../gui/settings/settingsdatabase.cpp | 0 .../gui/settings/settingsdatabase.h | 0 .../gui/settings/settingsdatabase.ui | 0 .../gui/settings/settingsdownloads.cpp | 0 .../gui/settings/settingsdownloads.h | 0 .../gui/settings/settingsdownloads.ui | 0 .../gui/settings/settingsfeedsmessages.cpp | 0 .../gui/settings/settingsfeedsmessages.h | 0 .../gui/settings/settingsfeedsmessages.ui | 0 .../gui/settings/settingsgeneral.cpp | 0 .../gui/settings/settingsgeneral.h | 0 .../gui/settings/settingsgeneral.ui | 0 .../gui/settings/settingsgui.cpp | 0 .../gui/settings/settingsgui.h | 0 .../gui/settings/settingsgui.ui | 0 .../gui/settings/settingslocalization.cpp | 0 .../gui/settings/settingslocalization.h | 0 .../gui/settings/settingslocalization.ui | 0 .../gui/settings/settingspanel.cpp | 0 .../gui/settings/settingspanel.h | 0 .../gui/settings/settingsshortcuts.cpp | 0 .../gui/settings/settingsshortcuts.h | 0 .../gui/settings/settingsshortcuts.ui | 0 src/{ => librssguard}/gui/squeezelabel.cpp | 0 src/{ => librssguard}/gui/squeezelabel.h | 0 src/{ => librssguard}/gui/statusbar.cpp | 0 src/{ => librssguard}/gui/statusbar.h | 0 .../gui/styleditemdelegatewithoutfocus.cpp | 0 .../gui/styleditemdelegatewithoutfocus.h | 0 src/{ => librssguard}/gui/systemtrayicon.cpp | 0 src/{ => librssguard}/gui/systemtrayicon.h | 0 src/{ => librssguard}/gui/tabbar.cpp | 0 src/{ => librssguard}/gui/tabbar.h | 0 src/{ => librssguard}/gui/tabcontent.cpp | 0 src/{ => librssguard}/gui/tabcontent.h | 0 src/{ => librssguard}/gui/tabwidget.cpp | 0 src/{ => librssguard}/gui/tabwidget.h | 0 src/{ => librssguard}/gui/timespinbox.cpp | 0 src/{ => librssguard}/gui/timespinbox.h | 0 src/{ => librssguard}/gui/toolbareditor.cpp | 0 src/{ => librssguard}/gui/toolbareditor.h | 0 src/{ => librssguard}/gui/toolbareditor.ui | 0 .../gui/treeviewcolumnsmenu.cpp | 0 .../gui/treeviewcolumnsmenu.h | 0 src/{ => librssguard}/gui/treewidget.cpp | 0 src/{ => librssguard}/gui/treewidget.h | 0 src/{ => librssguard}/gui/webbrowser.cpp | 0 src/{ => librssguard}/gui/webbrowser.h | 0 src/{ => librssguard}/gui/webviewer.cpp | 0 src/{ => librssguard}/gui/webviewer.h | 0 .../gui/widgetwithstatus.cpp | 0 src/{ => librssguard}/gui/widgetwithstatus.h | 0 src/librssguard/librssguard.pro | 467 +++++++++++ .../miscellaneous/application.cpp | 51 +- .../miscellaneous/application.h | 11 +- .../miscellaneous/autosaver.cpp | 0 .../miscellaneous/autosaver.h | 0 .../miscellaneous/databasecleaner.cpp | 0 .../miscellaneous/databasecleaner.h | 0 .../miscellaneous/databasefactory.cpp | 0 .../miscellaneous/databasefactory.h | 0 .../miscellaneous/databasequeries.cpp | 0 .../miscellaneous/databasequeries.h | 0 .../miscellaneous/debugging.cpp | 0 .../miscellaneous/debugging.h | 0 .../miscellaneous/disablewindowtabbing.mm | 0 .../miscellaneous/externaltool.cpp | 0 .../miscellaneous/externaltool.h | 0 .../miscellaneous/feedreader.cpp | 0 .../miscellaneous/feedreader.h | 2 +- .../miscellaneous/iconfactory.cpp | 0 .../miscellaneous/iconfactory.h | 2 +- .../miscellaneous/iofactory.cpp | 0 .../miscellaneous/iofactory.h | 0 .../miscellaneous/localization.cpp | 0 .../miscellaneous/localization.h | 4 +- src/{ => librssguard}/miscellaneous/mutex.cpp | 0 src/{ => librssguard}/miscellaneous/mutex.h | 0 .../miscellaneous/regexfactory.cpp | 0 .../miscellaneous/regexfactory.h | 0 .../miscellaneous/settings.cpp | 0 .../miscellaneous/settings.h | 0 .../miscellaneous/settingsproperties.h | 0 .../miscellaneous/simplecrypt/simplecrypt.cpp | 0 .../miscellaneous/simplecrypt/simplecrypt.h | 0 .../miscellaneous/skinfactory.cpp | 0 .../miscellaneous/skinfactory.h | 6 +- .../miscellaneous/systemfactory.cpp | 22 + .../miscellaneous/systemfactory.h | 2 + .../miscellaneous/textfactory.cpp | 0 .../miscellaneous/textfactory.h | 0 .../adblock/adblockaddsubscriptiondialog.cpp | 0 .../adblock/adblockaddsubscriptiondialog.h | 0 .../adblock/adblockaddsubscriptiondialog.ui | 0 .../network-web/adblock/adblockdialog.cpp | 0 .../network-web/adblock/adblockdialog.h | 0 .../network-web/adblock/adblockdialog.ui | 0 .../network-web/adblock/adblockicon.cpp | 0 .../network-web/adblock/adblockicon.h | 0 .../network-web/adblock/adblockmanager.cpp | 0 .../network-web/adblock/adblockmanager.h | 0 .../network-web/adblock/adblockmatcher.cpp | 0 .../network-web/adblock/adblockmatcher.h | 0 .../network-web/adblock/adblockrule.cpp | 0 .../network-web/adblock/adblockrule.h | 0 .../network-web/adblock/adblocksearchtree.cpp | 0 .../network-web/adblock/adblocksearchtree.h | 0 .../adblock/adblocksubscription.cpp | 0 .../network-web/adblock/adblocksubscription.h | 0 .../network-web/adblock/adblocktreewidget.cpp | 0 .../network-web/adblock/adblocktreewidget.h | 0 .../adblock/adblockurlinterceptor.cpp | 0 .../adblock/adblockurlinterceptor.h | 0 .../network-web/basenetworkaccessmanager.cpp | 0 .../network-web/basenetworkaccessmanager.h | 0 .../network-web/downloader.cpp | 0 .../network-web/downloader.h | 0 .../network-web/downloaditem.ui | 0 .../network-web/downloadmanager.cpp | 0 .../network-web/downloadmanager.h | 0 .../network-web/downloadmanager.ui | 0 .../network-web/googlesuggest.cpp | 0 .../network-web/googlesuggest.h | 0 .../network-web/httpresponse.cpp | 0 .../network-web/httpresponse.h | 0 .../network-web/networkfactory.cpp | 0 .../network-web/networkfactory.h | 0 .../network-web/networkurlinterceptor.cpp | 0 .../network-web/networkurlinterceptor.h | 0 .../network-web/oauth2service.cpp | 0 .../network-web/oauth2service.h | 0 .../network-web/oauthhttphandler.cpp | 0 .../network-web/oauthhttphandler.h | 0 .../network-web/rssguardschemehandler.cpp | 0 .../network-web/rssguardschemehandler.h | 0 .../silentnetworkaccessmanager.cpp | 0 .../network-web/silentnetworkaccessmanager.h | 0 .../network-web/urlinterceptor.h | 0 .../network-web/webfactory.cpp | 0 .../network-web/webfactory.h | 0 src/{ => librssguard}/network-web/webpage.cpp | 0 src/{ => librssguard}/network-web/webpage.h | 0 .../qtsingleapplication/qtlocalpeer.cpp | 0 .../qtsingleapplication/qtlocalpeer.h | 0 .../qtsingleapplication/qtlockedfile.cpp | 0 .../qtsingleapplication/qtlockedfile.h | 0 .../qtsingleapplication/qtlockedfile_unix.cpp | 0 .../qtsingleapplication/qtlockedfile_win.cpp | 0 .../qtsingleapplication.cpp | 0 .../qtsingleapplication/qtsingleapplication.h | 0 .../qtsinglecoreapplication.cpp | 0 .../qtsinglecoreapplication.h | 0 .../services/abstract/accountcheckmodel.cpp | 0 .../services/abstract/accountcheckmodel.h | 0 .../services/abstract/cacheforserviceroot.cpp | 0 .../services/abstract/cacheforserviceroot.h | 0 .../services/abstract/category.cpp | 0 .../services/abstract/category.h | 0 .../services/abstract/feed.cpp | 0 .../services/abstract/feed.h | 0 .../services/abstract/gui/formfeeddetails.cpp | 0 .../services/abstract/gui/formfeeddetails.h | 0 .../services/abstract/gui/formfeeddetails.ui | 0 .../services/abstract/recyclebin.cpp | 0 .../services/abstract/recyclebin.h | 0 .../services/abstract/rootitem.cpp | 0 .../services/abstract/rootitem.h | 2 +- .../services/abstract/serviceentrypoint.cpp | 0 .../services/abstract/serviceentrypoint.h | 0 .../services/abstract/serviceroot.cpp | 0 .../services/abstract/serviceroot.h | 0 .../services/gmail/definitions.h | 0 .../services/gmail/gmailentrypoint.cpp | 0 .../services/gmail/gmailentrypoint.h | 0 .../services/gmail/gmailfeed.cpp | 0 .../services/gmail/gmailfeed.h | 0 .../services/gmail/gmailserviceroot.cpp | 0 .../services/gmail/gmailserviceroot.h | 0 .../services/gmail/gui/formaddeditemail.cpp | 0 .../services/gmail/gui/formaddeditemail.h | 0 .../services/gmail/gui/formaddeditemail.ui | 0 .../gmail/gui/formdownloadattachment.cpp | 0 .../gmail/gui/formdownloadattachment.h | 0 .../gmail/gui/formdownloadattachment.ui | 0 .../gmail/gui/formeditgmailaccount.cpp | 0 .../services/gmail/gui/formeditgmailaccount.h | 0 .../gmail/gui/formeditgmailaccount.ui | 0 .../gmail/network/gmailnetworkfactory.cpp | 0 .../gmail/network/gmailnetworkfactory.h | 0 .../services/inoreader/definitions.h | 0 .../gui/formeditinoreaderaccount.cpp | 0 .../inoreader/gui/formeditinoreaderaccount.h | 0 .../inoreader/gui/formeditinoreaderaccount.ui | 0 .../inoreader/inoreaderentrypoint.cpp | 0 .../services/inoreader/inoreaderentrypoint.h | 0 .../services/inoreader/inoreaderfeed.cpp | 0 .../services/inoreader/inoreaderfeed.h | 0 .../inoreader/inoreaderserviceroot.cpp | 0 .../services/inoreader/inoreaderserviceroot.h | 0 .../network/inoreadernetworkfactory.cpp | 0 .../network/inoreadernetworkfactory.h | 0 .../services/owncloud/definitions.h | 0 .../owncloud/gui/formeditowncloudaccount.cpp | 0 .../owncloud/gui/formeditowncloudaccount.h | 0 .../owncloud/gui/formeditowncloudaccount.ui | 0 .../owncloud/gui/formowncloudfeeddetails.cpp | 0 .../owncloud/gui/formowncloudfeeddetails.h | 0 .../network/owncloudnetworkfactory.cpp | 0 .../owncloud/network/owncloudnetworkfactory.h | 0 .../services/owncloud/owncloudfeed.cpp | 0 .../services/owncloud/owncloudfeed.h | 0 .../owncloud/owncloudserviceentrypoint.cpp | 0 .../owncloud/owncloudserviceentrypoint.h | 0 .../services/owncloud/owncloudserviceroot.cpp | 0 .../services/owncloud/owncloudserviceroot.h | 0 .../services/standard/atomparser.cpp | 0 .../services/standard/atomparser.h | 0 .../services/standard/feedparser.cpp | 0 .../services/standard/feedparser.h | 0 .../gui/formstandardcategorydetails.cpp | 0 .../gui/formstandardcategorydetails.h | 0 .../gui/formstandardcategorydetails.ui | 0 .../standard/gui/formstandardfeeddetails.cpp | 0 .../standard/gui/formstandardfeeddetails.h | 0 .../standard/gui/formstandardimportexport.cpp | 0 .../standard/gui/formstandardimportexport.h | 0 .../standard/gui/formstandardimportexport.ui | 0 .../services/standard/rdfparser.cpp | 0 .../services/standard/rdfparser.h | 0 .../services/standard/rssparser.cpp | 0 .../services/standard/rssparser.h | 0 .../services/standard/standardcategory.cpp | 0 .../services/standard/standardcategory.h | 0 .../services/standard/standardfeed.cpp | 0 .../services/standard/standardfeed.h | 0 .../standardfeedsimportexportmodel.cpp | 0 .../standard/standardfeedsimportexportmodel.h | 0 .../standard/standardserviceentrypoint.cpp | 0 .../standard/standardserviceentrypoint.h | 0 .../services/standard/standardserviceroot.cpp | 0 .../services/standard/standardserviceroot.h | 0 .../services/tt-rss/definitions.h | 0 .../tt-rss/gui/formeditttrssaccount.cpp | 0 .../tt-rss/gui/formeditttrssaccount.h | 0 .../tt-rss/gui/formeditttrssaccount.ui | 0 .../tt-rss/gui/formttrssfeeddetails.cpp | 0 .../tt-rss/gui/formttrssfeeddetails.h | 0 .../tt-rss/network/ttrssnetworkfactory.cpp | 0 .../tt-rss/network/ttrssnetworkfactory.h | 0 .../services/tt-rss/ttrssfeed.cpp | 0 .../services/tt-rss/ttrssfeed.h | 0 .../tt-rss/ttrssserviceentrypoint.cpp | 0 .../services/tt-rss/ttrssserviceentrypoint.h | 0 .../services/tt-rss/ttrssserviceroot.cpp | 0 .../services/tt-rss/ttrssserviceroot.h | 0 src/main.cpp | 222 ----- src/rssguard/main.cpp | 96 +++ src/rssguard/rssguard.pro | 93 +++ 371 files changed, 1213 insertions(+), 1016 deletions(-) create mode 100644 build.pro create mode 100644 pri/build_opts.pri create mode 100644 pri/defs.pri create mode 100644 pri/install.pri create mode 100644 pri/vars.pri delete mode 100755 rssguard.pro rename src/{ => librssguard}/core/feeddownloader.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/feeddownloader.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/feedsmodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/feedsmodel.h (98%) mode change 100755 => 100644 rename src/{ => librssguard}/core/feedsproxymodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/feedsproxymodel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/message.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/message.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodelcache.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodelcache.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodelsqllayer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesmodelsqllayer.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesproxymodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/core/messagesproxymodel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/definitions/definitions.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/dynamicshortcuts.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/dynamicshortcuts.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/dynamicshortcutswidget.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/dynamicshortcutswidget.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/shortcutbutton.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/shortcutbutton.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/shortcutcatcher.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/dynamic-shortcuts/shortcutcatcher.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/exceptions/applicationexception.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/exceptions/applicationexception.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/exceptions/ioexception.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/exceptions/ioexception.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/baselineedit.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/baselineedit.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/basetoolbar.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/basetoolbar.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/colorlabel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/colorlabel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/comboboxwithstatus.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/comboboxwithstatus.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formabout.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formabout.h (87%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formabout.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formaddaccount.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formaddaccount.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formaddaccount.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formbackupdatabasesettings.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formbackupdatabasesettings.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formbackupdatabasesettings.ui (100%) rename src/{ => librssguard}/gui/dialogs/formdatabasecleanup.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formdatabasecleanup.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formdatabasecleanup.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formmain.cpp (99%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formmain.h (93%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formmain.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formrestoredatabasesettings.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formrestoredatabasesettings.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formrestoredatabasesettings.ui (100%) rename src/{ => librssguard}/gui/dialogs/formsettings.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formsettings.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formsettings.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formupdate.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formupdate.h (95%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/formupdate.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/oauthlogin.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/oauthlogin.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/dialogs/oauthlogin.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/discoverfeedsbutton.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/discoverfeedsbutton.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/edittableview.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/edittableview.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedmessageviewer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedmessageviewer.h (97%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedstoolbar.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedstoolbar.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedsview.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/feedsview.h (98%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/guiutilities.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/guiutilities.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/labelwithstatus.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/labelwithstatus.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/lineeditwithstatus.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/lineeditwithstatus.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/locationlineedit.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/locationlineedit.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagebox.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagebox.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagepreviewer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagepreviewer.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagepreviewer.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagessearchlineedit.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagessearchlineedit.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagestoolbar.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagestoolbar.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagesview.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagesview.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagetextbrowser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/messagetextbrowser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/newspaperpreviewer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/newspaperpreviewer.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/newspaperpreviewer.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/plaintoolbutton.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/plaintoolbutton.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/searchtextwidget.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/searchtextwidget.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/searchtextwidget.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsbrowsermail.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsbrowsermail.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsbrowsermail.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdatabase.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdatabase.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdatabase.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdownloads.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdownloads.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsdownloads.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsfeedsmessages.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsfeedsmessages.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsfeedsmessages.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgeneral.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgeneral.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgeneral.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgui.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgui.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsgui.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingslocalization.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingslocalization.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingslocalization.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingspanel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingspanel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsshortcuts.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsshortcuts.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/settings/settingsshortcuts.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/squeezelabel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/squeezelabel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/statusbar.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/statusbar.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/styleditemdelegatewithoutfocus.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/styleditemdelegatewithoutfocus.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/systemtrayicon.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/systemtrayicon.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabbar.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabbar.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabcontent.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabcontent.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabwidget.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/tabwidget.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/timespinbox.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/timespinbox.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/toolbareditor.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/toolbareditor.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/toolbareditor.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/treeviewcolumnsmenu.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/treeviewcolumnsmenu.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/treewidget.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/treewidget.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/webbrowser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/webbrowser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/webviewer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/webviewer.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/widgetwithstatus.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/gui/widgetwithstatus.h (100%) mode change 100755 => 100644 create mode 100644 src/librssguard/librssguard.pro rename src/{ => librssguard}/miscellaneous/application.cpp (89%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/application.h (95%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/autosaver.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/autosaver.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasecleaner.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasecleaner.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasefactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasefactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasequeries.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/databasequeries.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/debugging.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/debugging.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/disablewindowtabbing.mm (100%) rename src/{ => librssguard}/miscellaneous/externaltool.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/externaltool.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/feedreader.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/feedreader.h (97%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/iconfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/iconfactory.h (96%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/iofactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/iofactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/localization.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/localization.h (90%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/mutex.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/mutex.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/regexfactory.cpp (100%) rename src/{ => librssguard}/miscellaneous/regexfactory.h (100%) rename src/{ => librssguard}/miscellaneous/settings.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/settings.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/settingsproperties.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/simplecrypt/simplecrypt.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/simplecrypt/simplecrypt.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/skinfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/skinfactory.h (91%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/systemfactory.cpp (89%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/systemfactory.h (98%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/textfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/miscellaneous/textfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockaddsubscriptiondialog.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockaddsubscriptiondialog.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockaddsubscriptiondialog.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockdialog.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockdialog.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockdialog.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockicon.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockicon.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockmanager.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockmanager.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockmatcher.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockmatcher.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockrule.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockrule.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocksearchtree.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocksearchtree.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocksubscription.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocksubscription.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocktreewidget.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblocktreewidget.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockurlinterceptor.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/adblock/adblockurlinterceptor.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/basenetworkaccessmanager.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/basenetworkaccessmanager.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/downloader.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/downloader.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/downloaditem.ui (100%) rename src/{ => librssguard}/network-web/downloadmanager.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/downloadmanager.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/downloadmanager.ui (100%) rename src/{ => librssguard}/network-web/googlesuggest.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/googlesuggest.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/httpresponse.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/httpresponse.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/networkfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/networkfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/networkurlinterceptor.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/networkurlinterceptor.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/oauth2service.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/oauth2service.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/oauthhttphandler.cpp (100%) rename src/{ => librssguard}/network-web/oauthhttphandler.h (100%) rename src/{ => librssguard}/network-web/rssguardschemehandler.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/rssguardschemehandler.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/silentnetworkaccessmanager.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/silentnetworkaccessmanager.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/urlinterceptor.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/webfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/webfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/webpage.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/network-web/webpage.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlocalpeer.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlocalpeer.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlockedfile.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlockedfile.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlockedfile_unix.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtlockedfile_win.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtsingleapplication.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtsingleapplication.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtsinglecoreapplication.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/qtsingleapplication/qtsinglecoreapplication.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/accountcheckmodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/accountcheckmodel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/cacheforserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/cacheforserviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/category.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/category.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/feed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/feed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/gui/formfeeddetails.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/gui/formfeeddetails.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/gui/formfeeddetails.ui (100%) rename src/{ => librssguard}/services/abstract/recyclebin.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/recyclebin.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/rootitem.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/rootitem.h (99%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/serviceentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/serviceentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/serviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/abstract/serviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/definitions.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailfeed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailfeed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gmailserviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formaddeditemail.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formaddeditemail.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formaddeditemail.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formdownloadattachment.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formdownloadattachment.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formdownloadattachment.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formeditgmailaccount.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formeditgmailaccount.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/gui/formeditgmailaccount.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/network/gmailnetworkfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/gmail/network/gmailnetworkfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/definitions.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/gui/formeditinoreaderaccount.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/gui/formeditinoreaderaccount.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/gui/formeditinoreaderaccount.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderfeed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderfeed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/inoreaderserviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/network/inoreadernetworkfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/inoreader/network/inoreadernetworkfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/definitions.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/gui/formeditowncloudaccount.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/gui/formeditowncloudaccount.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/gui/formeditowncloudaccount.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/gui/formowncloudfeeddetails.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/gui/formowncloudfeeddetails.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/network/owncloudnetworkfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/network/owncloudnetworkfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudfeed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudfeed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudserviceentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudserviceentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/owncloud/owncloudserviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/atomparser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/atomparser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/feedparser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/feedparser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardcategorydetails.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardcategorydetails.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardcategorydetails.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardfeeddetails.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardfeeddetails.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardimportexport.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardimportexport.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/gui/formstandardimportexport.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/rdfparser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/rdfparser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/rssparser.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/rssparser.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardcategory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardcategory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardfeed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardfeed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardfeedsimportexportmodel.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardfeedsimportexportmodel.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardserviceentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardserviceentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/standard/standardserviceroot.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/definitions.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/gui/formeditttrssaccount.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/gui/formeditttrssaccount.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/gui/formeditttrssaccount.ui (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/gui/formttrssfeeddetails.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/gui/formttrssfeeddetails.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/network/ttrssnetworkfactory.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/network/ttrssnetworkfactory.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssfeed.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssfeed.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssserviceentrypoint.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssserviceentrypoint.h (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssserviceroot.cpp (100%) mode change 100755 => 100644 rename src/{ => librssguard}/services/tt-rss/ttrssserviceroot.h (100%) mode change 100755 => 100644 delete mode 100755 src/main.cpp create mode 100644 src/rssguard/main.cpp create mode 100644 src/rssguard/rssguard.pro diff --git a/build.pro b/build.pro new file mode 100644 index 000000000..bafdb6405 --- /dev/null +++ b/build.pro @@ -0,0 +1,46 @@ +################################################################# +# +# For license of this file, see /LICENSE.md. +# +# This is RSS Guard compilation script for qmake. +# +# Usage: +# a) DEBUG build for testing. (out of source build type) +# cd ../build-dir +# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=debug PREFIX=./usr +# make +# make install +# +# b) RELEASE build for production use. (out of source build type) +# cd ../build-dir +# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=release PREFIX=./usr +# make +# make install +# +# Variables: +# USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used. +# Otherwise simple text component is used and some features will be disabled. +# Default value is "false". If QtWebEngine is installed during compilation, then +# value of this variable is tweaked automatically. +# PREFIX - specifies base folder to which files are copied during "make install" +# step, defaults to "$$OUT_PWD/usr" on Linux and to "$$OUT_PWD/app" on Windows. +# +# Other information: +# - supports Windows, Linux, Mac OS X, Android, +# - Qt 5.9.0 or higher is required, +# - C++ 11 is required. +# +# Authors and contributors: +# - Martin Rotter (project leader). +# +################################################################# + +TEMPLATE = subdirs + +CONFIG += ordered +SUBDIRS = librssguard rssguard + +librssguard.subdir = src/librssguard + +rssguard.subdir = src/rssguard +rssguard.depends = libtextosaurus diff --git a/pri/build_opts.pri b/pri/build_opts.pri new file mode 100644 index 000000000..566470c95 --- /dev/null +++ b/pri/build_opts.pri @@ -0,0 +1,70 @@ +CONFIG *= c++1z warn_on resources_big +CONFIG -= debug_and_release +DEFINES *= QT_USE_QSTRINGBUILDER QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS UNICODE _UNICODE +VERSION = $$APP_VERSION +QT *= core gui widgets sql network xml + +equals(USE_WEBENGINE, true) { + message($$MSG_PREFIX: Application will be compiled WITH QtWebEngine module.) + QT *= webenginewidgets + DEFINES *= USE_WEBENGINE +} +else { + message($$MSG_PREFIX: Application will be compiled without QtWebEngine module. Some features will be disabled.) +} + +gcc|g++|clang* { + QMAKE_CXXFLAGS *= -std=c++17 +} + +msvc { + QMAKE_CXXFLAGS *= /std:c++17 +} + +clang* { + DEFINES *= CLANG=1 +} + +# Setup specific compiler options. +CONFIG(release, debug|release) { + message($$MSG_PREFIX: Building in "release" mode.) + + gcc:QMAKE_CXXFLAGS_RELEASE -= -O2 + clang:QMAKE_CXXFLAGS_RELEASE -= -O2 + gcc:QMAKE_CXXFLAGS_RELEASE *= -O3 + clang:QMAKE_CXXFLAGS_RELEASE *= -O3 +} +else { + message($$MSG_PREFIX: Building in "debug" mode.) + + DEFINES *= DEBUG=1 + gcc:QMAKE_CXXFLAGS_DEBUG *= -Wall + clang:QMAKE_CXXFLAGS_DEBUG *= -Wall +} + +MOC_DIR = $$OUT_PWD/moc +RCC_DIR = $$OUT_PWD/rcc +UI_DIR = $$OUT_PWD/ui + +mac { + QT *= macextras +} + +# Make needed tweaks for RC file getting generated on Windows. +win32 { + RC_ICONS = ../../resources/graphics/rssguard.ico + QMAKE_TARGET_COMPANY = $$APP_AUTHOR + QMAKE_TARGET_DESCRIPTION = $$APP_NAME ($$APP_TYPE) + QMAKE_TARGET_COPYRIGHT = $$APP_COPYRIGHT + QMAKE_TARGET_PRODUCT = $$APP_NAME + + # Additionally link against Shell32. + LIBS *= Shell32.lib +} + +static { + message($$MSG_PREFIX: Building static version of library.) +} +else { + message($$MSG_PREFIX: Building shared version of library.) +} diff --git a/pri/defs.pri b/pri/defs.pri new file mode 100644 index 000000000..dea4629df --- /dev/null +++ b/pri/defs.pri @@ -0,0 +1,36 @@ +# Custom definitions. +DEFINES *= APP_VERSION='"\\\"$$APP_VERSION\\\""' +DEFINES *= APP_NAME='"\\\"$$APP_NAME\\\""' +DEFINES *= APP_LOW_NAME='"\\\"$$APP_LOW_NAME\\\""' +DEFINES *= APP_LOW_H_NAME='"\\\"$$APP_LOW_H_NAME\\\""' +DEFINES *= APP_LONG_NAME='"\\\"$$APP_LONG_NAME\\\""' +DEFINES *= APP_AUTHOR='"\\\"$$APP_AUTHOR\\\""' +DEFINES *= APP_EMAIL='"\\\"$$APP_EMAIL\\\""' +DEFINES *= APP_URL='"\\\"$$APP_URL\\\""' +DEFINES *= APP_URL_ISSUES='"\\\"$$APP_URL_ISSUES\\\""' +DEFINES *= APP_URL_ISSUES_NEW='"\\\"$$APP_URL_ISSUES_NEW\\\""' +DEFINES *= APP_URL_WIKI='"\\\"$$APP_URL_WIKI\\\""' +DEFINES *= APP_USERAGENT='"\\\"$$APP_USERAGENT\\\""' +DEFINES *= APP_DONATE_URL='"\\\"$$APP_DONATE_URL\\\""' +DEFINES *= APP_SYSTEM_NAME='"\\\"$$QMAKE_HOST.os\\\""' +DEFINES *= APP_SYSTEM_VERSION='"\\\"$$QMAKE_HOST.arch\\\""' + +DISTFILES += ../../resources/scripts/uncrustify/uncrustify.cfg + +CODECFORTR = UTF-8 +CODECFORSRC = UTF-8 + +exists(.git) { + APP_REVISION = $$system(git rev-parse --short HEAD) +} + +isEmpty(APP_REVISION) { + APP_REVISION = "" +} + +equals(USE_WEBENGINE, false) { + # Add extra revision naming when building without webengine. + APP_REVISION = $$sprintf('%1-%2', $$APP_REVISION, nowebengine) +} + +DEFINES *= APP_REVISION='"\\\"$$APP_REVISION\\\""' \ No newline at end of file diff --git a/pri/install.pri b/pri/install.pri new file mode 100644 index 000000000..bc124abea --- /dev/null +++ b/pri/install.pri @@ -0,0 +1,269 @@ +# Setup all public headers, this needs to be kept in +# sync with truly used headers. +INSTALL_HEADERS = \ +../librssguard/core/feeddownloader.h \ +../librssguard/core/feedsmodel.h \ +../librssguard/core/feedsproxymodel.h \ +../librssguard/core/message.h \ +../librssguard/core/messagesmodel.h \ +../librssguard/core/messagesmodelcache.h \ +../librssguard/core/messagesmodelsqllayer.h \ +../librssguard/core/messagesproxymodel.h \ +../librssguard/definitions/definitions.h \ +../librssguard/dynamic-shortcuts/dynamicshortcuts.h \ +../librssguard/dynamic-shortcuts/dynamicshortcutswidget.h \ +../librssguard/dynamic-shortcuts/shortcutbutton.h \ +../librssguard/dynamic-shortcuts/shortcutcatcher.h \ +../librssguard/exceptions/applicationexception.h \ +../librssguard/exceptions/ioexception.h \ +../librssguard/gui/baselineedit.h \ +../librssguard/gui/basetoolbar.h \ +../librssguard/gui/colorlabel.h \ +../librssguard/gui/comboboxwithstatus.h \ +../librssguard/gui/dialogs/formabout.h \ +../librssguard/gui/dialogs/formaddaccount.h \ +../librssguard/gui/dialogs/formbackupdatabasesettings.h \ +../librssguard/gui/dialogs/formdatabasecleanup.h \ +../librssguard/gui/dialogs/formmain.h \ +../librssguard/gui/dialogs/formrestoredatabasesettings.h \ +../librssguard/gui/dialogs/formsettings.h \ +../librssguard/gui/dialogs/formupdate.h \ +../librssguard/gui/dialogs/oauthlogin.h \ +../librssguard/gui/discoverfeedsbutton.h \ +../librssguard/gui/edittableview.h \ +../librssguard/gui/feedmessageviewer.h \ +../librssguard/gui/feedstoolbar.h \ +../librssguard/gui/feedsview.h \ +../librssguard/gui/guiutilities.h \ +../librssguard/gui/labelwithstatus.h \ +../librssguard/gui/lineeditwithstatus.h \ +../librssguard/gui/locationlineedit.h \ +../librssguard/gui/messagebox.h \ +../librssguard/gui/messagepreviewer.h \ +../librssguard/gui/messagessearchlineedit.h \ +../librssguard/gui/messagestoolbar.h \ +../librssguard/gui/messagesview.h \ +../librssguard/gui/messagetextbrowser.h \ +../librssguard/gui/newspaperpreviewer.h \ +../librssguard/gui/plaintoolbutton.h \ +../librssguard/gui/searchtextwidget.h \ +../librssguard/gui/settings/settingsbrowsermail.h \ +../librssguard/gui/settings/settingsdatabase.h \ +../librssguard/gui/settings/settingsdownloads.h \ +../librssguard/gui/settings/settingsfeedsmessages.h \ +../librssguard/gui/settings/settingsgeneral.h \ +../librssguard/gui/settings/settingsgui.h \ +../librssguard/gui/settings/settingslocalization.h \ +../librssguard/gui/settings/settingspanel.h \ +../librssguard/gui/settings/settingsshortcuts.h \ +../librssguard/gui/squeezelabel.h \ +../librssguard/gui/statusbar.h \ +../librssguard/gui/styleditemdelegatewithoutfocus.h \ +../librssguard/gui/systemtrayicon.h \ +../librssguard/gui/tabbar.h \ +../librssguard/gui/tabcontent.h \ +../librssguard/gui/tabwidget.h \ +../librssguard/gui/timespinbox.h \ +../librssguard/gui/toolbareditor.h \ +../librssguard/gui/treeviewcolumnsmenu.h \ +../librssguard/gui/treewidget.h \ +../librssguard/gui/webbrowser.h \ +../librssguard/gui/webviewer.h \ +../librssguard/gui/widgetwithstatus.h \ +../librssguard/miscellaneous/application.h \ +../librssguard/miscellaneous/autosaver.h \ +../librssguard/miscellaneous/databasecleaner.h \ +../librssguard/miscellaneous/databasefactory.h \ +../librssguard/miscellaneous/databasequeries.h \ +../librssguard/miscellaneous/debugging.h \ +../librssguard/miscellaneous/externaltool.h \ +../librssguard/miscellaneous/feedreader.h \ +../librssguard/miscellaneous/iconfactory.h \ +../librssguard/miscellaneous/iofactory.h \ +../librssguard/miscellaneous/localization.h \ +../librssguard/miscellaneous/mutex.h \ +../librssguard/miscellaneous/regexfactory.h \ +../librssguard/miscellaneous/settings.h \ +../librssguard/miscellaneous/settingsproperties.h \ +../librssguard/miscellaneous/simplecrypt/simplecrypt.h \ +../librssguard/miscellaneous/skinfactory.h \ +../librssguard/miscellaneous/systemfactory.h \ +../librssguard/miscellaneous/textfactory.h \ +../librssguard/network-web/adblock/adblockaddsubscriptiondialog.h \ +../librssguard/network-web/adblock/adblockdialog.h \ +../librssguard/network-web/adblock/adblockicon.h \ +../librssguard/network-web/adblock/adblockmanager.h \ +../librssguard/network-web/adblock/adblockmatcher.h \ +../librssguard/network-web/adblock/adblockrule.h \ +../librssguard/network-web/adblock/adblocksearchtree.h \ +../librssguard/network-web/adblock/adblocksubscription.h \ +../librssguard/network-web/adblock/adblocktreewidget.h \ +../librssguard/network-web/adblock/adblockurlinterceptor.h \ +../librssguard/network-web/basenetworkaccessmanager.h \ +../librssguard/network-web/downloader.h \ +../librssguard/network-web/downloadmanager.h \ +../librssguard/network-web/googlesuggest.h \ +../librssguard/network-web/httpresponse.h \ +../librssguard/network-web/networkfactory.h \ +../librssguard/network-web/networkurlinterceptor.h \ +../librssguard/network-web/oauth2service.h \ +../librssguard/network-web/oauthhttphandler.h \ +../librssguard/network-web/rssguardschemehandler.h \ +../librssguard/network-web/silentnetworkaccessmanager.h \ +../librssguard/network-web/urlinterceptor.h \ +../librssguard/network-web/webfactory.h \ +../librssguard/network-web/webpage.h \ +../librssguard/qtsingleapplication/qtlocalpeer.h \ +../librssguard/qtsingleapplication/qtlockedfile.h \ +../librssguard/qtsingleapplication/qtsingleapplication.h \ +../librssguard/qtsingleapplication/qtsinglecoreapplication.h \ +../librssguard/services/abstract/accountcheckmodel.h \ +../librssguard/services/abstract/cacheforserviceroot.h \ +../librssguard/services/abstract/category.h \ +../librssguard/services/abstract/feed.h \ +../librssguard/services/abstract/gui/formfeeddetails.h \ +../librssguard/services/abstract/recyclebin.h \ +../librssguard/services/abstract/rootitem.h \ +../librssguard/services/abstract/serviceentrypoint.h \ +../librssguard/services/abstract/serviceroot.h \ +../librssguard/services/gmail/definitions.h \ +../librssguard/services/gmail/gmailentrypoint.h \ +../librssguard/services/gmail/gmailfeed.h \ +../librssguard/services/gmail/gmailserviceroot.h \ +../librssguard/services/gmail/gui/formaddeditemail.h \ +../librssguard/services/gmail/gui/formdownloadattachment.h \ +../librssguard/services/gmail/gui/formeditgmailaccount.h \ +../librssguard/services/gmail/network/gmailnetworkfactory.h \ +../librssguard/services/inoreader/definitions.h \ +../librssguard/services/inoreader/gui/formeditinoreaderaccount.h \ +../librssguard/services/inoreader/inoreaderentrypoint.h \ +../librssguard/services/inoreader/inoreaderfeed.h \ +../librssguard/services/inoreader/inoreaderserviceroot.h \ +../librssguard/services/inoreader/network/inoreadernetworkfactory.h \ +../librssguard/services/owncloud/definitions.h \ +../librssguard/services/owncloud/gui/formeditowncloudaccount.h \ +../librssguard/services/owncloud/gui/formowncloudfeeddetails.h \ +../librssguard/services/owncloud/network/owncloudnetworkfactory.h \ +../librssguard/services/owncloud/owncloudfeed.h \ +../librssguard/services/owncloud/owncloudserviceentrypoint.h \ +../librssguard/services/owncloud/owncloudserviceroot.h \ +../librssguard/services/standard/atomparser.h \ +../librssguard/services/standard/feedparser.h \ +../librssguard/services/standard/gui/formstandardcategorydetails.h \ +../librssguard/services/standard/gui/formstandardfeeddetails.h \ +../librssguard/services/standard/gui/formstandardimportexport.h \ +../librssguard/services/standard/rdfparser.h \ +../librssguard/services/standard/rssparser.h \ +../librssguard/services/standard/standardcategory.h \ +../librssguard/services/standard/standardfeed.h \ +../librssguard/services/standard/standardfeedsimportexportmodel.h \ +../librssguard/services/standard/standardserviceentrypoint.h \ +../librssguard/services/standard/standardserviceroot.h \ +../librssguard/services/tt-rss/definitions.h \ +../librssguard/services/tt-rss/gui/formeditttrssaccount.h \ +../librssguard/services/tt-rss/gui/formttrssfeeddetails.h \ +../librssguard/services/tt-rss/network/ttrssnetworkfactory.h \ +../librssguard/services/tt-rss/ttrssfeed.h \ +../librssguard/services/tt-rss/ttrssserviceentrypoint.h \ +../librssguard/services/tt-rss/ttrssserviceroot.h + +# Install all files on Windows. +win32 { + target.path = $$PREFIX + + lib.files = $$OUT_PWD/../librssguard/librssguard.dll $$OUT_PWD/../librssguard/librssguard.lib + lib.path = $$PREFIX + lib.CONFIG = no_check_exist + + + qt_dlls_root.files = resources/binaries/windows/qt5-msvc2017/*.* + qt_dlls_root.path = $$quote($$PREFIX/) + + qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2017/* + qt_dlls_plugins.path = $$quote($$PREFIX/) + + INSTALLS += target lib qt_dlls_root qt_dlls_plugins + + equals(USE_WEBENGINE, true) { + # Copy extra resource files for QtWebEngine. + qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2017-webengine/* + qtwebengine_dlls.path = $$quote($$PREFIX/) + + qtwebengine.files = resources/binaries/windows/qt5-msvc2017-webengine/*.* + qtwebengine.path = $$quote($$PREFIX/) + + INSTALLS += qtwebengine_dlls qtwebengine + } + + INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) +} + +# Install all files on Linux. +unix:!mac:!android { + target.path = $$PREFIX/bin + + desktop_file.files = resources/desktop/$${APP_REVERSE_NAME}.desktop + desktop_file.path = $$quote($$PREFIX/share/applications/) + + appdata.files = resources/desktop/$${APP_REVERSE_NAME}.appdata.xml + appdata.path = $$quote($$PREFIX/share/metainfo/) + + lib.files = $$OUT_PWD/../librssguard/librssguard.so + lib.path = $$quote($$PREFIX/lib/) + lib.CONFIG = no_check_exist + + desktop_icon.files = resources/graphics/$${TARGET}.png + desktop_icon.path = $$quote($$PREFIX/share/icons/hicolor/512x512/apps/) + + INSTALLS += target lib desktop_file desktop_icon appdata + + INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) +} + +mac { + IDENTIFIER = $$APP_REVERSE_NAME + CONFIG -= app_bundle + ICON = resources/macosx/$${TARGET}.icns + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + LIBS += -framework AppKit + + QMAKE_POST_LINK += $$system(install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" $$OUT_PWD/rssguard) + + target.path = $$quote($$PREFIX/Contents/MacOS/) + + lib.files = $$OUT_PWD/../librssguard/librssguard.dylib + lib.path = $$quote($$PREFIX/Contents/MacOS/) + lib.CONFIG = no_check_exist + + # Install app icon. + icns_icon.files = resources/macosx/$${TARGET}.icns + icns_icon.path = $$quote($$PREFIX/Contents/Resources/) + + # Install Info.plist. + info_plist.files = resources/macosx/Info.plist.in + info_plist.path = $$quote($$PREFIX/Contents/) + + # Process the just installed Info.plist. + info_plist2.extra = @sed -e "s,@EXECUTABLE@,$$TARGET,g" -e "s,@SHORT_VERSION@,$$APP_VERSION,g" -e "s,@APP_NAME@,\"$$APP_NAME\",g" -e "s,@ICON@,$$basename(ICON),g" -e "s,@TYPEINFO@,"????",g" $$shell_quote($$PREFIX/Contents/Info.plist.in) > $$shell_quote($$PREFIX/Contents/Info.plist) && \ + rm -f $$shell_quote($$PREFIX/Contents/Info.plist.in) + info_plist2.path = $$quote($$PREFIX/Contents/) + + # Install PkgInfo + pkginfo.extra = @printf "APPL????" > $$shell_quote($$PREFIX/Contents/PkgInfo) + pkginfo.path = $$quote($$PREFIX/Contents/) + + INSTALLS += target lib icns_icon info_plist info_plist2 pkginfo + + INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/Contents/Resources/Include/libtextosaurus/) +} + +# Create install step for each folder of public headers. +for(header, INSTALL_HEADERS) { + path = $${INSTALL_HEADERS_PREFIX}/$${dirname(header)} + + message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step.) + + eval(headers_$${dirname(header)}.files += $$header) + eval(headers_$${dirname(header)}.path = $$path) + eval(INSTALLS *= headers_$${dirname(header)}) +} \ No newline at end of file diff --git a/pri/vars.pri b/pri/vars.pri new file mode 100644 index 000000000..d141e301b --- /dev/null +++ b/pri/vars.pri @@ -0,0 +1,36 @@ +APP_NAME = "RSS Guard" +APP_LOW_NAME = "rssguard" +APP_REVERSE_NAME = "com.github.rssguard" +APP_LOW_H_NAME = ".rssguard" +APP_AUTHOR = "Martin Rotter" +APP_COPYRIGHT = "(C) 2011-2019 $$APP_AUTHOR" +APP_VERSION = "3.6.0" +APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" +APP_EMAIL = "rotter.martinos@gmail.com" +APP_URL = "https://github.com/martinrotter/rssguard" +APP_URL_ISSUES = "https://github.com/martinrotter/rssguard/issues" +APP_URL_ISSUES_NEW = "https://github.com/martinrotter/rssguard/issues/new" +APP_URL_WIKI = "https://github.com/martinrotter/rssguard/wiki" +APP_USERAGENT = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)" +APP_DONATE_URL = "https://martinrotter.github.io/donate" +APP_WIN_ARCH = "win64" + +message(rssguard: Welcome RSS Guard qmake script.) + +lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) { + warning(rssguard: At least Qt \"5.9.0\" is required!!!) +} + +isEmpty(USE_WEBENGINE) { + USE_WEBENGINE = false + message($$MSG_PREFIX: USE_WEBENGINE variable is not set.) + + qtHaveModule(webenginewidgets) { + USE_WEBENGINE = true + ##message($$MSG_PREFIX: WebEngine component IS installed, enabling it.) + } + else { + USE_WEBENGINE = false + ##message($$MSG_PREFIX: WebEngine component is probably NOT installed, disabling it.) + } +} diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index bbb397f9e..374ed17f9 100755 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/rssguard.pro b/rssguard.pro deleted file mode 100755 index 0341e3f74..000000000 --- a/rssguard.pro +++ /dev/null @@ -1,771 +0,0 @@ -################################################################# -# -# For license of this file, see /LICENSE.md. -# -# This is RSS Guard compilation script for qmake. -# -# Usage: -# a) DEBUG build for testing. (out of source build type) -# cd ../build-dir -# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=debug PREFIX=./usr -# make -# make install -# -# b) RELEASE build for production use. (out of source build type) -# cd ../build-dir -# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=release PREFIX=./usr -# make -# make install -# -# Variables: -# USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used. -# Otherwise simple text component is used and some features will be disabled. -# Default value is "false". If QtWebEngine is installed during compilation, then -# value of this variable is tweaked automatically. -# PREFIX - specifies base folder to which files are copied during "make install" -# step, defaults to "$$OUT_PWD/usr" on Linux and to "$$OUT_PWD/app" on Windows. -# -# Other information: -# - supports Windows, Linux, Mac OS X, Android, -# - Qt 5.7.0 or higher is required, -# - C++ 11 is required. -# -# Authors and contributors: -# - Martin Rotter (project leader), -# - Elbert Pol (huge OS/2-related contributions). -# -################################################################# - -TEMPLATE = app -TARGET = rssguard - -message(rssguard: Welcome RSS Guard qmake script.) - -lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) { - warning(rssguard: At least Qt \"5.9.0\" is required!!!) -} - -APP_NAME = "RSS Guard" -APP_LOW_NAME = "rssguard" -APP_REVERSE_NAME = "com.github.rssguard" -APP_LOW_H_NAME = ".rssguard" -APP_AUTHOR = "Martin Rotter" -APP_COPYRIGHT = "(C) 2011-2019 $$APP_AUTHOR" -APP_VERSION = "3.5.10" -APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" -APP_EMAIL = "rotter.martinos@gmail.com" -APP_URL = "https://github.com/martinrotter/rssguard" -APP_URL_ISSUES = "https://github.com/martinrotter/rssguard/issues" -APP_URL_ISSUES_NEW = "https://github.com/martinrotter/rssguard/issues/new" -APP_URL_WIKI = "https://github.com/martinrotter/rssguard/wiki" -APP_USERAGENT = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)" -APP_DONATE_URL = "https://martinrotter.github.io/donate" -APP_WIN_ARCH = "win64" - -isEmpty(PREFIX) { - message(rssguard: PREFIX variable is not set. This might indicate error.) - - win32 { - PREFIX = $$OUT_PWD/app - } - - android { - PREFIX = $$OUT_PWD/app - } - - mac { - PREFIX = $$quote($$OUT_PWD/$${APP_NAME}.app) - } - - unix:!mac:!android { - PREFIX = $$OUT_PWD/AppDir/usr - } -} - -isEmpty(USE_WEBENGINE) { - USE_WEBENGINE = false - message("rssguard: USE_WEBENGINE variable is not set.") - - qtHaveModule(webenginewidgets) { - USE_WEBENGINE = true - message("rssguard: WebEngine component IS installed, enabling it.") - } - else { - USE_WEBENGINE = false - message("rssguard: WebEngine component is probably NOT installed, disabling it.") - } -} - -message(rssguard: Shadow copy build directory \"$$OUT_PWD\".) - -# Custom definitions. -DEFINES *= APP_VERSION='"\\\"$$APP_VERSION\\\""' -DEFINES *= APP_NAME='"\\\"$$APP_NAME\\\""' -DEFINES *= APP_LOW_NAME='"\\\"$$APP_LOW_NAME\\\""' -DEFINES *= APP_LOW_H_NAME='"\\\"$$APP_LOW_H_NAME\\\""' -DEFINES *= APP_LONG_NAME='"\\\"$$APP_LONG_NAME\\\""' -DEFINES *= APP_AUTHOR='"\\\"$$APP_AUTHOR\\\""' -DEFINES *= APP_EMAIL='"\\\"$$APP_EMAIL\\\""' -DEFINES *= APP_URL='"\\\"$$APP_URL\\\""' -DEFINES *= APP_URL_ISSUES='"\\\"$$APP_URL_ISSUES\\\""' -DEFINES *= APP_URL_ISSUES_NEW='"\\\"$$APP_URL_ISSUES_NEW\\\""' -DEFINES *= APP_URL_WIKI='"\\\"$$APP_URL_WIKI\\\""' -DEFINES *= APP_USERAGENT='"\\\"$$APP_USERAGENT\\\""' -DEFINES *= APP_DONATE_URL='"\\\"$$APP_DONATE_URL\\\""' -DEFINES *= APP_SYSTEM_NAME='"\\\"$$QMAKE_HOST.os\\\""' -DEFINES *= APP_SYSTEM_VERSION='"\\\"$$QMAKE_HOST.arch\\\""' - -CODECFORTR = UTF-8 -CODECFORSRC = UTF-8 - -exists(.git) { - APP_REVISION = $$system(git rev-parse --short HEAD) -} - -isEmpty(APP_REVISION) { - APP_REVISION = "" -} - -equals(USE_WEBENGINE, false) { - # Add extra revision naming when building without webengine. - APP_REVISION = $$sprintf('%1-%2', $$APP_REVISION, nowebengine) -} - -DEFINES *= APP_REVISION='"\\\"$$APP_REVISION\\\""' - -message(rssguard: RSS Guard version is: \"$$APP_VERSION\".) -message(rssguard: Detected Qt version: \"$$QT_VERSION\".) -message(rssguard: Build destination directory: \"$$DESTDIR\".) -message(rssguard: Prefix directory: \"$$PREFIX\".) -message(rssguard: Build revision: \"$$APP_REVISION\".) -message(rssguard: lrelease executable name: \"$$LRELEASE\".) - -QT *= core gui widgets sql network xml - -CONFIG *= c++1z warn_on -CONFIG -= debug_and_release -DEFINES *= QT_USE_QSTRINGBUILDER QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS UNICODE _UNICODE -VERSION = $$APP_VERSION - -win32 { - # Makes sure we use correct subsystem on Windows. - !contains(QMAKE_TARGET.arch, x86_64) { - message(rssguard: Compilling x86 variant.) - QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 - } else { - message(rssguard: Compilling x86_64 variant.) - QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02 - } - - # Additionally link against Shell32. - LIBS *= Shell32.lib -} - -gcc|g++|clang* { - QMAKE_CXXFLAGS *= -std=c++17 -} - -msvc { - QMAKE_CXXFLAGS *= /std:c++17 -} - -clang* { - DEFINES *= CLANG=1 -} - -# Setup specific compiler options. -CONFIG(release, debug|release) { - message(rssguard: Building in "release" mode.) - - gcc:QMAKE_CXXFLAGS_RELEASE -= -O2 - clang:QMAKE_CXXFLAGS_RELEASE -= -O2 - gcc:QMAKE_CXXFLAGS_RELEASE *= -O3 - clang:QMAKE_CXXFLAGS_RELEASE *= -O3 -} -else { - message(rssguard: Building in "debug" mode.) - - DEFINES *= DEBUG=1 - gcc:QMAKE_CXXFLAGS_DEBUG *= -Wall - clang:QMAKE_CXXFLAGS_DEBUG *= -Wall -} - -DISTFILES += resources/scripts/uncrustify/uncrustify.cfg - -MOC_DIR = $$OUT_PWD/moc -RCC_DIR = $$OUT_PWD/rcc -UI_DIR = $$OUT_PWD/ui - -mac { - QT *= macextras -} - -equals(USE_WEBENGINE, true) { - message(rssguard: Application will be compiled WITH QtWebEngine module.) - QT *= webenginewidgets - DEFINES *= USE_WEBENGINE -} -else { - message(rssguard: Application will be compiled without QtWebEngine module. Some features will be disabled.) -} - -# Make needed tweaks for RC file getting generated on Windows. -win32 { - RC_ICONS = resources/graphics/rssguard.ico - QMAKE_TARGET_COMPANY = $$APP_AUTHOR - QMAKE_TARGET_DESCRIPTION = $$APP_NAME - QMAKE_TARGET_COPYRIGHT = $$APP_COPYRIGHT - QMAKE_TARGET_PRODUCT = $$APP_NAME -} - -CONFIG *= resources_big -RESOURCES += resources/sql.qrc \ - resources/rssguard.qrc \ - resources/icons.qrc - -HEADERS += src/core/feeddownloader.h \ - src/core/feedsmodel.h \ - src/core/feedsproxymodel.h \ - src/core/message.h \ - src/core/messagesmodel.h \ - src/core/messagesmodelcache.h \ - src/core/messagesmodelsqllayer.h \ - src/core/messagesproxymodel.h \ - src/definitions/definitions.h \ - src/dynamic-shortcuts/dynamicshortcuts.h \ - src/dynamic-shortcuts/dynamicshortcutswidget.h \ - src/dynamic-shortcuts/shortcutbutton.h \ - src/dynamic-shortcuts/shortcutcatcher.h \ - src/exceptions/applicationexception.h \ - src/exceptions/ioexception.h \ - src/gui/baselineedit.h \ - src/gui/basetoolbar.h \ - src/gui/colorlabel.h \ - src/gui/comboboxwithstatus.h \ - src/gui/dialogs/formabout.h \ - src/gui/dialogs/formaddaccount.h \ - src/gui/dialogs/formbackupdatabasesettings.h \ - src/gui/dialogs/formdatabasecleanup.h \ - src/gui/dialogs/formmain.h \ - src/gui/dialogs/formrestoredatabasesettings.h \ - src/gui/dialogs/formsettings.h \ - src/gui/dialogs/formupdate.h \ - src/gui/edittableview.h \ - src/gui/feedmessageviewer.h \ - src/gui/feedstoolbar.h \ - src/gui/feedsview.h \ - src/gui/guiutilities.h \ - src/gui/labelwithstatus.h \ - src/gui/lineeditwithstatus.h \ - src/gui/messagebox.h \ - src/gui/messagessearchlineedit.h \ - src/gui/messagestoolbar.h \ - src/gui/messagesview.h \ - src/gui/plaintoolbutton.h \ - src/gui/settings/settingsbrowsermail.h \ - src/gui/settings/settingsdatabase.h \ - src/gui/settings/settingsdownloads.h \ - src/gui/settings/settingsfeedsmessages.h \ - src/gui/settings/settingsgeneral.h \ - src/gui/settings/settingsgui.h \ - src/gui/settings/settingslocalization.h \ - src/gui/settings/settingspanel.h \ - src/gui/settings/settingsshortcuts.h \ - src/gui/squeezelabel.h \ - src/gui/statusbar.h \ - src/gui/styleditemdelegatewithoutfocus.h \ - src/gui/systemtrayicon.h \ - src/gui/tabbar.h \ - src/gui/tabcontent.h \ - src/gui/tabwidget.h \ - src/gui/timespinbox.h \ - src/gui/toolbareditor.h \ - src/gui/treeviewcolumnsmenu.h \ - src/gui/widgetwithstatus.h \ - src/miscellaneous/application.h \ - src/miscellaneous/autosaver.h \ - src/miscellaneous/databasecleaner.h \ - src/miscellaneous/databasefactory.h \ - src/miscellaneous/databasequeries.h \ - src/miscellaneous/debugging.h \ - src/miscellaneous/externaltool.h \ - src/miscellaneous/feedreader.h \ - src/miscellaneous/iconfactory.h \ - src/miscellaneous/iofactory.h \ - src/miscellaneous/localization.h \ - src/miscellaneous/mutex.h \ - src/miscellaneous/regexfactory.h \ - src/miscellaneous/settings.h \ - src/miscellaneous/settingsproperties.h \ - src/miscellaneous/simplecrypt/simplecrypt.h \ - src/miscellaneous/skinfactory.h \ - src/miscellaneous/systemfactory.h \ - src/miscellaneous/textfactory.h \ - src/network-web/basenetworkaccessmanager.h \ - src/network-web/downloader.h \ - src/network-web/downloadmanager.h \ - src/network-web/networkfactory.h \ - src/network-web/oauth2service.h \ - src/network-web/silentnetworkaccessmanager.h \ - src/network-web/webfactory.h \ - src/qtsingleapplication/qtlocalpeer.h \ - src/qtsingleapplication/qtlockedfile.h \ - src/qtsingleapplication/qtsingleapplication.h \ - src/qtsingleapplication/qtsinglecoreapplication.h \ - src/services/abstract/accountcheckmodel.h \ - src/services/abstract/cacheforserviceroot.h \ - src/services/abstract/category.h \ - src/services/abstract/feed.h \ - src/services/abstract/gui/formfeeddetails.h \ - src/services/abstract/recyclebin.h \ - src/services/abstract/rootitem.h \ - src/services/abstract/serviceentrypoint.h \ - src/services/abstract/serviceroot.h \ - src/services/gmail/definitions.h \ - src/services/gmail/gmailentrypoint.h \ - src/services/gmail/gmailfeed.h \ - src/services/gmail/gmailserviceroot.h \ - src/services/gmail/gui/formeditgmailaccount.h \ - src/services/gmail/network/gmailnetworkfactory.h \ - src/services/inoreader/definitions.h \ - src/services/inoreader/gui/formeditinoreaderaccount.h \ - src/services/inoreader/inoreaderentrypoint.h \ - src/services/inoreader/inoreaderfeed.h \ - src/services/inoreader/inoreaderserviceroot.h \ - src/services/inoreader/network/inoreadernetworkfactory.h \ - src/services/owncloud/definitions.h \ - src/services/owncloud/gui/formeditowncloudaccount.h \ - src/services/owncloud/gui/formowncloudfeeddetails.h \ - src/services/owncloud/network/owncloudnetworkfactory.h \ - src/services/owncloud/owncloudfeed.h \ - src/services/owncloud/owncloudserviceentrypoint.h \ - src/services/owncloud/owncloudserviceroot.h \ - src/services/standard/atomparser.h \ - src/services/standard/feedparser.h \ - src/services/standard/gui/formstandardcategorydetails.h \ - src/services/standard/gui/formstandardfeeddetails.h \ - src/services/standard/gui/formstandardimportexport.h \ - src/services/standard/rdfparser.h \ - src/services/standard/rssparser.h \ - src/services/standard/standardcategory.h \ - src/services/standard/standardfeed.h \ - src/services/standard/standardfeedsimportexportmodel.h \ - src/services/standard/standardserviceentrypoint.h \ - src/services/standard/standardserviceroot.h \ - src/services/tt-rss/definitions.h \ - src/services/tt-rss/gui/formeditttrssaccount.h \ - src/services/tt-rss/gui/formttrssfeeddetails.h \ - src/services/tt-rss/network/ttrssnetworkfactory.h \ - src/services/tt-rss/ttrssfeed.h \ - src/services/tt-rss/ttrssserviceentrypoint.h \ - src/services/tt-rss/ttrssserviceroot.h \ - src/network-web/httpresponse.h \ - src/services/gmail/gui/formdownloadattachment.h \ - src/services/gmail/gui/formaddeditemail.h \ - src/gui/searchtextwidget.h - -SOURCES += src/core/feeddownloader.cpp \ - src/core/feedsmodel.cpp \ - src/core/feedsproxymodel.cpp \ - src/core/message.cpp \ - src/core/messagesmodel.cpp \ - src/core/messagesmodelcache.cpp \ - src/core/messagesmodelsqllayer.cpp \ - src/core/messagesproxymodel.cpp \ - src/dynamic-shortcuts/dynamicshortcuts.cpp \ - src/dynamic-shortcuts/dynamicshortcutswidget.cpp \ - src/dynamic-shortcuts/shortcutbutton.cpp \ - src/dynamic-shortcuts/shortcutcatcher.cpp \ - src/exceptions/applicationexception.cpp \ - src/exceptions/ioexception.cpp \ - src/gui/baselineedit.cpp \ - src/gui/basetoolbar.cpp \ - src/gui/colorlabel.cpp \ - src/gui/comboboxwithstatus.cpp \ - src/gui/dialogs/formabout.cpp \ - src/gui/dialogs/formaddaccount.cpp \ - src/gui/dialogs/formbackupdatabasesettings.cpp \ - src/gui/dialogs/formdatabasecleanup.cpp \ - src/gui/dialogs/formmain.cpp \ - src/gui/dialogs/formrestoredatabasesettings.cpp \ - src/gui/dialogs/formsettings.cpp \ - src/gui/dialogs/formupdate.cpp \ - src/gui/edittableview.cpp \ - src/gui/feedmessageviewer.cpp \ - src/gui/feedstoolbar.cpp \ - src/gui/feedsview.cpp \ - src/gui/guiutilities.cpp \ - src/gui/labelwithstatus.cpp \ - src/gui/lineeditwithstatus.cpp \ - src/gui/messagebox.cpp \ - src/gui/messagessearchlineedit.cpp \ - src/gui/messagestoolbar.cpp \ - src/gui/messagesview.cpp \ - src/gui/plaintoolbutton.cpp \ - src/gui/settings/settingsbrowsermail.cpp \ - src/gui/settings/settingsdatabase.cpp \ - src/gui/settings/settingsdownloads.cpp \ - src/gui/settings/settingsfeedsmessages.cpp \ - src/gui/settings/settingsgeneral.cpp \ - src/gui/settings/settingsgui.cpp \ - src/gui/settings/settingslocalization.cpp \ - src/gui/settings/settingspanel.cpp \ - src/gui/settings/settingsshortcuts.cpp \ - src/gui/squeezelabel.cpp \ - src/gui/statusbar.cpp \ - src/gui/styleditemdelegatewithoutfocus.cpp \ - src/gui/systemtrayicon.cpp \ - src/gui/tabbar.cpp \ - src/gui/tabcontent.cpp \ - src/gui/tabwidget.cpp \ - src/gui/timespinbox.cpp \ - src/gui/toolbareditor.cpp \ - src/gui/treeviewcolumnsmenu.cpp \ - src/gui/widgetwithstatus.cpp \ - src/main.cpp \ - src/miscellaneous/application.cpp \ - src/miscellaneous/autosaver.cpp \ - src/miscellaneous/databasecleaner.cpp \ - src/miscellaneous/databasefactory.cpp \ - src/miscellaneous/databasequeries.cpp \ - src/miscellaneous/debugging.cpp \ - src/miscellaneous/externaltool.cpp \ - src/miscellaneous/feedreader.cpp \ - src/miscellaneous/iconfactory.cpp \ - src/miscellaneous/iofactory.cpp \ - src/miscellaneous/localization.cpp \ - src/miscellaneous/mutex.cpp \ - src/miscellaneous/regexfactory.cpp \ - src/miscellaneous/settings.cpp \ - src/miscellaneous/simplecrypt/simplecrypt.cpp \ - src/miscellaneous/skinfactory.cpp \ - src/miscellaneous/systemfactory.cpp \ - src/miscellaneous/textfactory.cpp \ - src/network-web/basenetworkaccessmanager.cpp \ - src/network-web/downloader.cpp \ - src/network-web/downloadmanager.cpp \ - src/network-web/networkfactory.cpp \ - src/network-web/oauth2service.cpp \ - src/network-web/silentnetworkaccessmanager.cpp \ - src/network-web/webfactory.cpp \ - src/qtsingleapplication/qtlocalpeer.cpp \ - src/qtsingleapplication/qtlockedfile.cpp \ - src/qtsingleapplication/qtsingleapplication.cpp \ - src/qtsingleapplication/qtsinglecoreapplication.cpp \ - src/services/abstract/accountcheckmodel.cpp \ - src/services/abstract/cacheforserviceroot.cpp \ - src/services/abstract/category.cpp \ - src/services/abstract/feed.cpp \ - src/services/abstract/gui/formfeeddetails.cpp \ - src/services/abstract/recyclebin.cpp \ - src/services/abstract/rootitem.cpp \ - src/services/abstract/serviceentrypoint.cpp \ - src/services/abstract/serviceroot.cpp \ - src/services/gmail/gmailentrypoint.cpp \ - src/services/gmail/gmailfeed.cpp \ - src/services/gmail/gmailserviceroot.cpp \ - src/services/gmail/gui/formeditgmailaccount.cpp \ - src/services/gmail/network/gmailnetworkfactory.cpp \ - src/services/inoreader/gui/formeditinoreaderaccount.cpp \ - src/services/inoreader/inoreaderentrypoint.cpp \ - src/services/inoreader/inoreaderfeed.cpp \ - src/services/inoreader/inoreaderserviceroot.cpp \ - src/services/inoreader/network/inoreadernetworkfactory.cpp \ - src/services/owncloud/gui/formeditowncloudaccount.cpp \ - src/services/owncloud/gui/formowncloudfeeddetails.cpp \ - src/services/owncloud/network/owncloudnetworkfactory.cpp \ - src/services/owncloud/owncloudfeed.cpp \ - src/services/owncloud/owncloudserviceentrypoint.cpp \ - src/services/owncloud/owncloudserviceroot.cpp \ - src/services/standard/atomparser.cpp \ - src/services/standard/feedparser.cpp \ - src/services/standard/gui/formstandardcategorydetails.cpp \ - src/services/standard/gui/formstandardfeeddetails.cpp \ - src/services/standard/gui/formstandardimportexport.cpp \ - src/services/standard/rdfparser.cpp \ - src/services/standard/rssparser.cpp \ - src/services/standard/standardcategory.cpp \ - src/services/standard/standardfeed.cpp \ - src/services/standard/standardfeedsimportexportmodel.cpp \ - src/services/standard/standardserviceentrypoint.cpp \ - src/services/standard/standardserviceroot.cpp \ - src/services/tt-rss/gui/formeditttrssaccount.cpp \ - src/services/tt-rss/gui/formttrssfeeddetails.cpp \ - src/services/tt-rss/network/ttrssnetworkfactory.cpp \ - src/services/tt-rss/ttrssfeed.cpp \ - src/services/tt-rss/ttrssserviceentrypoint.cpp \ - src/services/tt-rss/ttrssserviceroot.cpp \ - src/network-web/httpresponse.cpp \ - src/services/gmail/gui/formdownloadattachment.cpp \ - src/services/gmail/gui/formaddeditemail.cpp \ - src/gui/searchtextwidget.cpp - -mac { - OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm -} - -FORMS += src/gui/dialogs/formabout.ui \ - src/gui/dialogs/formaddaccount.ui \ - src/gui/dialogs/formbackupdatabasesettings.ui \ - src/gui/dialogs/formdatabasecleanup.ui \ - src/gui/dialogs/formmain.ui \ - src/gui/dialogs/formrestoredatabasesettings.ui \ - src/gui/dialogs/formsettings.ui \ - src/gui/dialogs/formupdate.ui \ - src/gui/settings/settingsbrowsermail.ui \ - src/gui/settings/settingsdatabase.ui \ - src/gui/settings/settingsdownloads.ui \ - src/gui/settings/settingsfeedsmessages.ui \ - src/gui/settings/settingsgeneral.ui \ - src/gui/settings/settingsgui.ui \ - src/gui/settings/settingslocalization.ui \ - src/gui/settings/settingsshortcuts.ui \ - src/gui/toolbareditor.ui \ - src/network-web/downloaditem.ui \ - src/network-web/downloadmanager.ui \ - src/services/abstract/gui/formfeeddetails.ui \ - src/services/gmail/gui/formeditgmailaccount.ui \ - src/services/inoreader/gui/formeditinoreaderaccount.ui \ - src/services/owncloud/gui/formeditowncloudaccount.ui \ - src/services/standard/gui/formstandardcategorydetails.ui \ - src/services/standard/gui/formstandardimportexport.ui \ - src/services/tt-rss/gui/formeditttrssaccount.ui \ - src/services/gmail/gui/formdownloadattachment.ui \ - src/services/gmail/gui/formaddeditemail.ui \ - src/gui/searchtextwidget.ui - -equals(USE_WEBENGINE, true) { - HEADERS += src/gui/locationlineedit.h \ - src/gui/webviewer.h \ - src/gui/webbrowser.h \ - src/gui/discoverfeedsbutton.h \ - src/network-web/googlesuggest.h \ - src/network-web/webpage.h \ - src/network-web/rssguardschemehandler.h \ - src/gui/dialogs/oauthlogin.h - - SOURCES += src/gui/locationlineedit.cpp \ - src/gui/webviewer.cpp \ - src/gui/webbrowser.cpp \ - src/gui/discoverfeedsbutton.cpp \ - src/network-web/googlesuggest.cpp \ - src/network-web/webpage.cpp \ - src/network-web/rssguardschemehandler.cpp \ - src/gui/dialogs/oauthlogin.cpp - - # Add AdBlock sources. - HEADERS += src/network-web/adblock/adblockaddsubscriptiondialog.h \ - src/network-web/adblock/adblockdialog.h \ - src/network-web/adblock/adblockicon.h \ - src/network-web/adblock/adblockmanager.h \ - src/network-web/adblock/adblockmatcher.h \ - src/network-web/adblock/adblockrule.h \ - src/network-web/adblock/adblocksearchtree.h \ - src/network-web/adblock/adblocksubscription.h \ - src/network-web/adblock/adblocktreewidget.h \ - src/network-web/adblock/adblockurlinterceptor.h \ - src/network-web/urlinterceptor.h \ - src/network-web/networkurlinterceptor.h \ - src/gui/treewidget.h - - SOURCES += src/network-web/adblock/adblockaddsubscriptiondialog.cpp \ - src/network-web/adblock/adblockdialog.cpp \ - src/network-web/adblock/adblockicon.cpp \ - src/network-web/adblock/adblockmanager.cpp \ - src/network-web/adblock/adblockmatcher.cpp \ - src/network-web/adblock/adblockrule.cpp \ - src/network-web/adblock/adblocksearchtree.cpp \ - src/network-web/adblock/adblocksubscription.cpp \ - src/network-web/adblock/adblocktreewidget.cpp \ - src/network-web/adblock/adblockurlinterceptor.cpp \ - src/network-web/networkurlinterceptor.cpp \ - src/gui/treewidget.cpp - - FORMS += src/network-web/adblock/adblockaddsubscriptiondialog.ui \ - src/network-web/adblock/adblockdialog.ui \ - src/gui/dialogs/oauthlogin.ui -} -else { - HEADERS += src/gui/messagepreviewer.h \ - src/gui/messagetextbrowser.h \ - src/gui/newspaperpreviewer.h \ - src/network-web/oauthhttphandler.h - - SOURCES += src/gui/messagepreviewer.cpp \ - src/gui/messagetextbrowser.cpp \ - src/gui/newspaperpreviewer.cpp \ - src/network-web/oauthhttphandler.cpp - - FORMS += src/gui/messagepreviewer.ui \ - src/gui/newspaperpreviewer.ui -} - -INCLUDEPATH += $$PWD/. \ - $$PWD/src \ - $$PWD/src/gui \ - $$PWD/src/gui/dialogs \ - $$PWD/src/dynamic-shortcuts - -TRANSLATIONS_WO_QT += $$PWD/localization/rssguard_cs.ts \ - $$PWD/localization/rssguard_da.ts \ - $$PWD/localization/rssguard_de.ts \ - $$PWD/localization/rssguard_en.ts \ - $$PWD/localization/rssguard_es.ts \ - $$PWD/localization/rssguard_fr.ts \ - $$PWD/localization/rssguard_he.ts \ - $$PWD/localization/rssguard_id.ts \ - $$PWD/localization/rssguard_it.ts \ - $$PWD/localization/rssguard_ja.ts \ - $$PWD/localization/rssguard_lt.ts \ - $$PWD/localization/rssguard_nl.ts \ - $$PWD/localization/rssguard_pl.ts \ - $$PWD/localization/rssguard_pt.ts \ - $$PWD/localization/rssguard_sv.ts \ - $$PWD/localization/rssguard_uk.ts \ - $$PWD/localization/rssguard_zh.ts - -TRANSLATIONS += $$TRANSLATIONS_WO_QT \ - $$PWD/localization/qtbase_cs.ts \ - $$PWD/localization/qtbase_da.ts \ - $$PWD/localization/qtbase_de.ts \ - $$PWD/localization/qtbase_es.ts \ - $$PWD/localization/qtbase_fr.ts \ - $$PWD/localization/qtbase_he.ts \ - $$PWD/localization/qtbase_it.ts \ - $$PWD/localization/qtbase_ja.ts \ - $$PWD/localization/qtbase_lt.ts \ - $$PWD/localization/qtbase_pl.ts \ - $$PWD/localization/qtbase_pt.ts \ - $$PWD/localization/qtbase_sv.ts \ - $$PWD/localization/qtbase_uk.ts \ - $$PWD/localization/qtbase_zh.ts - -load(uic) -uic.commands -= -no-stringliteral - -# Create new "make lupdate" target. -lupdate.target = lupdate -lupdate.commands = lupdate -no-obsolete -pro $$shell_quote($$shell_path($$PWD/rssguard.pro)) -ts $$TRANSLATIONS_WO_QT - -QMAKE_EXTRA_TARGETS += lupdate - -# Make sure QM translations are nerated. -qtPrepareTool(LRELEASE, lrelease) { - system($$LRELEASE -compress $$shell_quote($$shell_path($$PWD/rssguard.pro))) -} - -# Create new "make 7zip" target and "make zip" target. -win32 { - seven_zip.target = 7zip - seven_zip.depends = install - seven_zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.7z $$shell_path($$PREFIX/*) - - zip.target = zip - zip.depends = install - zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.zip $$shell_path($$PREFIX/*) - - QMAKE_EXTRA_TARGETS += seven_zip zip -} - -mac { - dmg.target = dmg - dmg.depends = install - dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -dmg - - QMAKE_EXTRA_TARGETS += dmg -} - -# Create NSIS installer target on Windows. -win32 { - nsis.target = nsis - nsis.depends = install - nsis.commands = \ - $$shell_path($$shell_quote($$PWD/resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ - xcopy /Y $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \ - $$shell_path($$shell_quote($$PWD/resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in)) - - QMAKE_EXTRA_TARGETS += nsis -} - -win32 { - windows_all.target = windows_all - windows_all.depends = seven_zip nsis - windows_all.commands = echo "windows_all done..." - - QMAKE_EXTRA_TARGETS += windows_all -} - -# Install all files on Windows. -win32 { - target.path = $$PREFIX - - qt_dlls_root.files = resources/binaries/windows/qt5-msvc2017/*.* - qt_dlls_root.path = $$quote($$PREFIX/) - - qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2017/* - qt_dlls_plugins.path = $$quote($$PREFIX/) - - INSTALLS += target qt_dlls_root qt_dlls_plugins - - equals(USE_WEBENGINE, true) { - # Copy extra resource files for QtWebEngine. - qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2017-webengine/* - qtwebengine_dlls.path = $$quote($$PREFIX/) - - qtwebengine.files = resources/binaries/windows/qt5-msvc2017-webengine/*.* - qtwebengine.path = $$quote($$PREFIX/) - - INSTALLS += qtwebengine_dlls qtwebengine - } -} - -# Install all files on Linux. -unix:!mac:!android { - target.path = $$PREFIX/bin - - desktop_file.files = resources/desktop/$${APP_REVERSE_NAME}.desktop - desktop_file.path = $$quote($$PREFIX/share/applications/) - - appdata.files = resources/desktop/$${APP_REVERSE_NAME}.appdata.xml - appdata.path = $$quote($$PREFIX/share/metainfo/) - - desktop_icon.files = resources/graphics/$${TARGET}.png - desktop_icon.path = $$quote($$PREFIX/share/icons/hicolor/512x512/apps/) - - INSTALLS += target desktop_file desktop_icon appdata -} - -android { - target.path = $$PREFIX - - INSTALLS += target -} - -mac { - IDENTIFIER = org.$${TARGET}.RSSGuard - CONFIG -= app_bundle - ICON = resources/macosx/$${TARGET}.icns - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 - LIBS += -framework AppKit - - target.path = $$quote($$PREFIX/Contents/MacOS/) - - # Install app icon. - icns_icon.files = resources/macosx/$${TARGET}.icns - icns_icon.path = $$quote($$PREFIX/Contents/Resources/) - - # Install Info.plist. - info_plist.files = resources/macosx/Info.plist.in - info_plist.path = $$quote($$PREFIX/Contents/) - - # Process the just installed Info.plist. - info_plist2.extra = @sed -e "s,@EXECUTABLE@,$$TARGET,g" -e "s,@SHORT_VERSION@,$$APP_VERSION,g" -e "s,@APP_NAME@,\"$$APP_NAME\",g" -e "s,@ICON@,$$basename(ICON),g" -e "s,@TYPEINFO@,"????",g" $$shell_quote($$PREFIX/Contents/Info.plist.in) > $$shell_quote($$PREFIX/Contents/Info.plist) && \ - rm -f $$shell_quote($$PREFIX/Contents/Info.plist.in) - info_plist2.path = $$quote($$PREFIX/Contents/) - - # Install PkgInfo - pkginfo.extra = @printf "APPL????" > $$shell_quote($$PREFIX/Contents/PkgInfo) - pkginfo.path = $$quote($$PREFIX/Contents/) - - INSTALLS += target icns_icon info_plist info_plist2 pkginfo -} diff --git a/src/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/feeddownloader.cpp rename to src/librssguard/core/feeddownloader.cpp diff --git a/src/core/feeddownloader.h b/src/librssguard/core/feeddownloader.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/feeddownloader.h rename to src/librssguard/core/feeddownloader.h diff --git a/src/core/feedsmodel.cpp b/src/librssguard/core/feedsmodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/feedsmodel.cpp rename to src/librssguard/core/feedsmodel.cpp diff --git a/src/core/feedsmodel.h b/src/librssguard/core/feedsmodel.h old mode 100755 new mode 100644 similarity index 98% rename from src/core/feedsmodel.h rename to src/librssguard/core/feedsmodel.h index 684b52df9..0b3d8acf3 --- a/src/core/feedsmodel.h +++ b/src/librssguard/core/feedsmodel.h @@ -13,7 +13,7 @@ class ServiceRoot; class ServiceEntryPoint; class StandardServiceRoot; -class FeedsModel : public QAbstractItemModel { +class RSSGUARD_DLLSPEC FeedsModel : public QAbstractItemModel { Q_OBJECT public: diff --git a/src/core/feedsproxymodel.cpp b/src/librssguard/core/feedsproxymodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/feedsproxymodel.cpp rename to src/librssguard/core/feedsproxymodel.cpp diff --git a/src/core/feedsproxymodel.h b/src/librssguard/core/feedsproxymodel.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/feedsproxymodel.h rename to src/librssguard/core/feedsproxymodel.h diff --git a/src/core/message.cpp b/src/librssguard/core/message.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/message.cpp rename to src/librssguard/core/message.cpp diff --git a/src/core/message.h b/src/librssguard/core/message.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/message.h rename to src/librssguard/core/message.h diff --git a/src/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodel.cpp rename to src/librssguard/core/messagesmodel.cpp diff --git a/src/core/messagesmodel.h b/src/librssguard/core/messagesmodel.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodel.h rename to src/librssguard/core/messagesmodel.h diff --git a/src/core/messagesmodelcache.cpp b/src/librssguard/core/messagesmodelcache.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodelcache.cpp rename to src/librssguard/core/messagesmodelcache.cpp diff --git a/src/core/messagesmodelcache.h b/src/librssguard/core/messagesmodelcache.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodelcache.h rename to src/librssguard/core/messagesmodelcache.h diff --git a/src/core/messagesmodelsqllayer.cpp b/src/librssguard/core/messagesmodelsqllayer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodelsqllayer.cpp rename to src/librssguard/core/messagesmodelsqllayer.cpp diff --git a/src/core/messagesmodelsqllayer.h b/src/librssguard/core/messagesmodelsqllayer.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesmodelsqllayer.h rename to src/librssguard/core/messagesmodelsqllayer.h diff --git a/src/core/messagesproxymodel.cpp b/src/librssguard/core/messagesproxymodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesproxymodel.cpp rename to src/librssguard/core/messagesproxymodel.cpp diff --git a/src/core/messagesproxymodel.h b/src/librssguard/core/messagesproxymodel.h old mode 100755 new mode 100644 similarity index 100% rename from src/core/messagesproxymodel.h rename to src/librssguard/core/messagesproxymodel.h diff --git a/src/definitions/definitions.h b/src/librssguard/definitions/definitions.h old mode 100755 new mode 100644 similarity index 100% rename from src/definitions/definitions.h rename to src/librssguard/definitions/definitions.h diff --git a/src/dynamic-shortcuts/dynamicshortcuts.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/dynamicshortcuts.cpp rename to src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp diff --git a/src/dynamic-shortcuts/dynamicshortcuts.h b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.h old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/dynamicshortcuts.h rename to src/librssguard/dynamic-shortcuts/dynamicshortcuts.h diff --git a/src/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/dynamicshortcutswidget.cpp rename to src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp diff --git a/src/dynamic-shortcuts/dynamicshortcutswidget.h b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/dynamicshortcutswidget.h rename to src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h diff --git a/src/dynamic-shortcuts/shortcutbutton.cpp b/src/librssguard/dynamic-shortcuts/shortcutbutton.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/shortcutbutton.cpp rename to src/librssguard/dynamic-shortcuts/shortcutbutton.cpp diff --git a/src/dynamic-shortcuts/shortcutbutton.h b/src/librssguard/dynamic-shortcuts/shortcutbutton.h old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/shortcutbutton.h rename to src/librssguard/dynamic-shortcuts/shortcutbutton.h diff --git a/src/dynamic-shortcuts/shortcutcatcher.cpp b/src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/shortcutcatcher.cpp rename to src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp diff --git a/src/dynamic-shortcuts/shortcutcatcher.h b/src/librssguard/dynamic-shortcuts/shortcutcatcher.h old mode 100755 new mode 100644 similarity index 100% rename from src/dynamic-shortcuts/shortcutcatcher.h rename to src/librssguard/dynamic-shortcuts/shortcutcatcher.h diff --git a/src/exceptions/applicationexception.cpp b/src/librssguard/exceptions/applicationexception.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/exceptions/applicationexception.cpp rename to src/librssguard/exceptions/applicationexception.cpp diff --git a/src/exceptions/applicationexception.h b/src/librssguard/exceptions/applicationexception.h old mode 100755 new mode 100644 similarity index 100% rename from src/exceptions/applicationexception.h rename to src/librssguard/exceptions/applicationexception.h diff --git a/src/exceptions/ioexception.cpp b/src/librssguard/exceptions/ioexception.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/exceptions/ioexception.cpp rename to src/librssguard/exceptions/ioexception.cpp diff --git a/src/exceptions/ioexception.h b/src/librssguard/exceptions/ioexception.h old mode 100755 new mode 100644 similarity index 100% rename from src/exceptions/ioexception.h rename to src/librssguard/exceptions/ioexception.h diff --git a/src/gui/baselineedit.cpp b/src/librssguard/gui/baselineedit.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/baselineedit.cpp rename to src/librssguard/gui/baselineedit.cpp diff --git a/src/gui/baselineedit.h b/src/librssguard/gui/baselineedit.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/baselineedit.h rename to src/librssguard/gui/baselineedit.h diff --git a/src/gui/basetoolbar.cpp b/src/librssguard/gui/basetoolbar.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/basetoolbar.cpp rename to src/librssguard/gui/basetoolbar.cpp diff --git a/src/gui/basetoolbar.h b/src/librssguard/gui/basetoolbar.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/basetoolbar.h rename to src/librssguard/gui/basetoolbar.h diff --git a/src/gui/colorlabel.cpp b/src/librssguard/gui/colorlabel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/colorlabel.cpp rename to src/librssguard/gui/colorlabel.cpp diff --git a/src/gui/colorlabel.h b/src/librssguard/gui/colorlabel.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/colorlabel.h rename to src/librssguard/gui/colorlabel.h diff --git a/src/gui/comboboxwithstatus.cpp b/src/librssguard/gui/comboboxwithstatus.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/comboboxwithstatus.cpp rename to src/librssguard/gui/comboboxwithstatus.cpp diff --git a/src/gui/comboboxwithstatus.h b/src/librssguard/gui/comboboxwithstatus.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/comboboxwithstatus.h rename to src/librssguard/gui/comboboxwithstatus.h diff --git a/src/gui/dialogs/formabout.cpp b/src/librssguard/gui/dialogs/formabout.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formabout.cpp rename to src/librssguard/gui/dialogs/formabout.cpp diff --git a/src/gui/dialogs/formabout.h b/src/librssguard/gui/dialogs/formabout.h old mode 100755 new mode 100644 similarity index 87% rename from src/gui/dialogs/formabout.h rename to src/librssguard/gui/dialogs/formabout.h index 185c03e29..b09f6f914 --- a/src/gui/dialogs/formabout.h +++ b/src/librssguard/gui/dialogs/formabout.h @@ -7,7 +7,7 @@ #include "ui_formabout.h" -class FormAbout : public QDialog { +class RSSGUARD_DLLSPEC FormAbout : public QDialog { Q_OBJECT public: diff --git a/src/gui/dialogs/formabout.ui b/src/librssguard/gui/dialogs/formabout.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formabout.ui rename to src/librssguard/gui/dialogs/formabout.ui diff --git a/src/gui/dialogs/formaddaccount.cpp b/src/librssguard/gui/dialogs/formaddaccount.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formaddaccount.cpp rename to src/librssguard/gui/dialogs/formaddaccount.cpp diff --git a/src/gui/dialogs/formaddaccount.h b/src/librssguard/gui/dialogs/formaddaccount.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formaddaccount.h rename to src/librssguard/gui/dialogs/formaddaccount.h diff --git a/src/gui/dialogs/formaddaccount.ui b/src/librssguard/gui/dialogs/formaddaccount.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formaddaccount.ui rename to src/librssguard/gui/dialogs/formaddaccount.ui diff --git a/src/gui/dialogs/formbackupdatabasesettings.cpp b/src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formbackupdatabasesettings.cpp rename to src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp diff --git a/src/gui/dialogs/formbackupdatabasesettings.h b/src/librssguard/gui/dialogs/formbackupdatabasesettings.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formbackupdatabasesettings.h rename to src/librssguard/gui/dialogs/formbackupdatabasesettings.h diff --git a/src/gui/dialogs/formbackupdatabasesettings.ui b/src/librssguard/gui/dialogs/formbackupdatabasesettings.ui similarity index 100% rename from src/gui/dialogs/formbackupdatabasesettings.ui rename to src/librssguard/gui/dialogs/formbackupdatabasesettings.ui diff --git a/src/gui/dialogs/formdatabasecleanup.cpp b/src/librssguard/gui/dialogs/formdatabasecleanup.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formdatabasecleanup.cpp rename to src/librssguard/gui/dialogs/formdatabasecleanup.cpp diff --git a/src/gui/dialogs/formdatabasecleanup.h b/src/librssguard/gui/dialogs/formdatabasecleanup.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formdatabasecleanup.h rename to src/librssguard/gui/dialogs/formdatabasecleanup.h diff --git a/src/gui/dialogs/formdatabasecleanup.ui b/src/librssguard/gui/dialogs/formdatabasecleanup.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formdatabasecleanup.ui rename to src/librssguard/gui/dialogs/formdatabasecleanup.ui diff --git a/src/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/gui/dialogs/formmain.cpp rename to src/librssguard/gui/dialogs/formmain.cpp index c95cca83d..5ffa24be6 --- a/src/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #if defined (USE_WEBENGINE) @@ -47,9 +48,13 @@ FormMain::FormMain(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f), m_ui(new Ui::FormMain) { + qDebug().nospace() << "Creating main application form in thread: \'" << QThread::currentThreadId() << "\'."; + m_ui->setupUi(this); qApp->setMainForm(this); + setWindowTitle(APP_LONG_NAME); + #if defined (USE_WEBENGINE) m_ui->m_menuWebBrowserTabs->addAction(AdBlockManager::instance()->adBlockIcon()); m_ui->m_menuWebBrowserTabs->addAction(qApp->web()->engineSettingsAction()); diff --git a/src/gui/dialogs/formmain.h b/src/librssguard/gui/dialogs/formmain.h old mode 100755 new mode 100644 similarity index 93% rename from src/gui/dialogs/formmain.h rename to src/librssguard/gui/dialogs/formmain.h index 46b1aed5e..2be040d21 --- a/src/gui/dialogs/formmain.h +++ b/src/librssguard/gui/dialogs/formmain.h @@ -9,7 +9,7 @@ class StatusBar; -class FormMain : public QMainWindow { +class RSSGUARD_DLLSPEC FormMain : public QMainWindow { Q_OBJECT friend class TabWidget; @@ -19,7 +19,7 @@ class FormMain : public QMainWindow { public: // Constructors and destructors. - explicit FormMain(QWidget* parent = 0, Qt::WindowFlags f = 0); + explicit FormMain(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowType::Widget); virtual ~FormMain(); // Returns menu for the tray icon. diff --git a/src/gui/dialogs/formmain.ui b/src/librssguard/gui/dialogs/formmain.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formmain.ui rename to src/librssguard/gui/dialogs/formmain.ui diff --git a/src/gui/dialogs/formrestoredatabasesettings.cpp b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formrestoredatabasesettings.cpp rename to src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp diff --git a/src/gui/dialogs/formrestoredatabasesettings.h b/src/librssguard/gui/dialogs/formrestoredatabasesettings.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formrestoredatabasesettings.h rename to src/librssguard/gui/dialogs/formrestoredatabasesettings.h diff --git a/src/gui/dialogs/formrestoredatabasesettings.ui b/src/librssguard/gui/dialogs/formrestoredatabasesettings.ui similarity index 100% rename from src/gui/dialogs/formrestoredatabasesettings.ui rename to src/librssguard/gui/dialogs/formrestoredatabasesettings.ui diff --git a/src/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formsettings.cpp rename to src/librssguard/gui/dialogs/formsettings.cpp diff --git a/src/gui/dialogs/formsettings.h b/src/librssguard/gui/dialogs/formsettings.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formsettings.h rename to src/librssguard/gui/dialogs/formsettings.h diff --git a/src/gui/dialogs/formsettings.ui b/src/librssguard/gui/dialogs/formsettings.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formsettings.ui rename to src/librssguard/gui/dialogs/formsettings.ui diff --git a/src/gui/dialogs/formupdate.cpp b/src/librssguard/gui/dialogs/formupdate.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formupdate.cpp rename to src/librssguard/gui/dialogs/formupdate.cpp diff --git a/src/gui/dialogs/formupdate.h b/src/librssguard/gui/dialogs/formupdate.h old mode 100755 new mode 100644 similarity index 95% rename from src/gui/dialogs/formupdate.h rename to src/librssguard/gui/dialogs/formupdate.h index 7de16613d..e87c1f0aa --- a/src/gui/dialogs/formupdate.h +++ b/src/librssguard/gui/dialogs/formupdate.h @@ -13,7 +13,7 @@ #include #include -class FormUpdate : public QDialog { +class RSSGUARD_DLLSPEC FormUpdate : public QDialog { Q_OBJECT public: diff --git a/src/gui/dialogs/formupdate.ui b/src/librssguard/gui/dialogs/formupdate.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/formupdate.ui rename to src/librssguard/gui/dialogs/formupdate.ui diff --git a/src/gui/dialogs/oauthlogin.cpp b/src/librssguard/gui/dialogs/oauthlogin.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/oauthlogin.cpp rename to src/librssguard/gui/dialogs/oauthlogin.cpp diff --git a/src/gui/dialogs/oauthlogin.h b/src/librssguard/gui/dialogs/oauthlogin.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/oauthlogin.h rename to src/librssguard/gui/dialogs/oauthlogin.h diff --git a/src/gui/dialogs/oauthlogin.ui b/src/librssguard/gui/dialogs/oauthlogin.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/dialogs/oauthlogin.ui rename to src/librssguard/gui/dialogs/oauthlogin.ui diff --git a/src/gui/discoverfeedsbutton.cpp b/src/librssguard/gui/discoverfeedsbutton.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/discoverfeedsbutton.cpp rename to src/librssguard/gui/discoverfeedsbutton.cpp diff --git a/src/gui/discoverfeedsbutton.h b/src/librssguard/gui/discoverfeedsbutton.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/discoverfeedsbutton.h rename to src/librssguard/gui/discoverfeedsbutton.h diff --git a/src/gui/edittableview.cpp b/src/librssguard/gui/edittableview.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/edittableview.cpp rename to src/librssguard/gui/edittableview.cpp diff --git a/src/gui/edittableview.h b/src/librssguard/gui/edittableview.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/edittableview.h rename to src/librssguard/gui/edittableview.h diff --git a/src/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/feedmessageviewer.cpp rename to src/librssguard/gui/feedmessageviewer.cpp diff --git a/src/gui/feedmessageviewer.h b/src/librssguard/gui/feedmessageviewer.h old mode 100755 new mode 100644 similarity index 97% rename from src/gui/feedmessageviewer.h rename to src/librssguard/gui/feedmessageviewer.h index 5f9a0a16e..62419f113 --- a/src/gui/feedmessageviewer.h +++ b/src/librssguard/gui/feedmessageviewer.h @@ -25,7 +25,7 @@ class QToolBar; class QSplitter; class QProgressBar; -class FeedMessageViewer : public TabContent { +class RSSGUARD_DLLSPEC FeedMessageViewer : public TabContent { Q_OBJECT public: diff --git a/src/gui/feedstoolbar.cpp b/src/librssguard/gui/feedstoolbar.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/feedstoolbar.cpp rename to src/librssguard/gui/feedstoolbar.cpp diff --git a/src/gui/feedstoolbar.h b/src/librssguard/gui/feedstoolbar.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/feedstoolbar.h rename to src/librssguard/gui/feedstoolbar.h diff --git a/src/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/feedsview.cpp rename to src/librssguard/gui/feedsview.cpp diff --git a/src/gui/feedsview.h b/src/librssguard/gui/feedsview.h old mode 100755 new mode 100644 similarity index 98% rename from src/gui/feedsview.h rename to src/librssguard/gui/feedsview.h index f57d15735..ad54672c5 --- a/src/gui/feedsview.h +++ b/src/librssguard/gui/feedsview.h @@ -13,7 +13,7 @@ class FeedsProxyModel; class Feed; class Category; -class FeedsView : public QTreeView { +class RSSGUARD_DLLSPEC FeedsView : public QTreeView { Q_OBJECT public: diff --git a/src/gui/guiutilities.cpp b/src/librssguard/gui/guiutilities.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/guiutilities.cpp rename to src/librssguard/gui/guiutilities.cpp diff --git a/src/gui/guiutilities.h b/src/librssguard/gui/guiutilities.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/guiutilities.h rename to src/librssguard/gui/guiutilities.h diff --git a/src/gui/labelwithstatus.cpp b/src/librssguard/gui/labelwithstatus.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/labelwithstatus.cpp rename to src/librssguard/gui/labelwithstatus.cpp diff --git a/src/gui/labelwithstatus.h b/src/librssguard/gui/labelwithstatus.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/labelwithstatus.h rename to src/librssguard/gui/labelwithstatus.h diff --git a/src/gui/lineeditwithstatus.cpp b/src/librssguard/gui/lineeditwithstatus.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/lineeditwithstatus.cpp rename to src/librssguard/gui/lineeditwithstatus.cpp diff --git a/src/gui/lineeditwithstatus.h b/src/librssguard/gui/lineeditwithstatus.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/lineeditwithstatus.h rename to src/librssguard/gui/lineeditwithstatus.h diff --git a/src/gui/locationlineedit.cpp b/src/librssguard/gui/locationlineedit.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/locationlineedit.cpp rename to src/librssguard/gui/locationlineedit.cpp diff --git a/src/gui/locationlineedit.h b/src/librssguard/gui/locationlineedit.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/locationlineedit.h rename to src/librssguard/gui/locationlineedit.h diff --git a/src/gui/messagebox.cpp b/src/librssguard/gui/messagebox.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagebox.cpp rename to src/librssguard/gui/messagebox.cpp diff --git a/src/gui/messagebox.h b/src/librssguard/gui/messagebox.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagebox.h rename to src/librssguard/gui/messagebox.h diff --git a/src/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagepreviewer.cpp rename to src/librssguard/gui/messagepreviewer.cpp diff --git a/src/gui/messagepreviewer.h b/src/librssguard/gui/messagepreviewer.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagepreviewer.h rename to src/librssguard/gui/messagepreviewer.h diff --git a/src/gui/messagepreviewer.ui b/src/librssguard/gui/messagepreviewer.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagepreviewer.ui rename to src/librssguard/gui/messagepreviewer.ui diff --git a/src/gui/messagessearchlineedit.cpp b/src/librssguard/gui/messagessearchlineedit.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagessearchlineedit.cpp rename to src/librssguard/gui/messagessearchlineedit.cpp diff --git a/src/gui/messagessearchlineedit.h b/src/librssguard/gui/messagessearchlineedit.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagessearchlineedit.h rename to src/librssguard/gui/messagessearchlineedit.h diff --git a/src/gui/messagestoolbar.cpp b/src/librssguard/gui/messagestoolbar.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagestoolbar.cpp rename to src/librssguard/gui/messagestoolbar.cpp diff --git a/src/gui/messagestoolbar.h b/src/librssguard/gui/messagestoolbar.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagestoolbar.h rename to src/librssguard/gui/messagestoolbar.h diff --git a/src/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagesview.cpp rename to src/librssguard/gui/messagesview.cpp diff --git a/src/gui/messagesview.h b/src/librssguard/gui/messagesview.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagesview.h rename to src/librssguard/gui/messagesview.h diff --git a/src/gui/messagetextbrowser.cpp b/src/librssguard/gui/messagetextbrowser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagetextbrowser.cpp rename to src/librssguard/gui/messagetextbrowser.cpp diff --git a/src/gui/messagetextbrowser.h b/src/librssguard/gui/messagetextbrowser.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/messagetextbrowser.h rename to src/librssguard/gui/messagetextbrowser.h diff --git a/src/gui/newspaperpreviewer.cpp b/src/librssguard/gui/newspaperpreviewer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/newspaperpreviewer.cpp rename to src/librssguard/gui/newspaperpreviewer.cpp diff --git a/src/gui/newspaperpreviewer.h b/src/librssguard/gui/newspaperpreviewer.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/newspaperpreviewer.h rename to src/librssguard/gui/newspaperpreviewer.h diff --git a/src/gui/newspaperpreviewer.ui b/src/librssguard/gui/newspaperpreviewer.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/newspaperpreviewer.ui rename to src/librssguard/gui/newspaperpreviewer.ui diff --git a/src/gui/plaintoolbutton.cpp b/src/librssguard/gui/plaintoolbutton.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/plaintoolbutton.cpp rename to src/librssguard/gui/plaintoolbutton.cpp diff --git a/src/gui/plaintoolbutton.h b/src/librssguard/gui/plaintoolbutton.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/plaintoolbutton.h rename to src/librssguard/gui/plaintoolbutton.h diff --git a/src/gui/searchtextwidget.cpp b/src/librssguard/gui/searchtextwidget.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/searchtextwidget.cpp rename to src/librssguard/gui/searchtextwidget.cpp diff --git a/src/gui/searchtextwidget.h b/src/librssguard/gui/searchtextwidget.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/searchtextwidget.h rename to src/librssguard/gui/searchtextwidget.h diff --git a/src/gui/searchtextwidget.ui b/src/librssguard/gui/searchtextwidget.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/searchtextwidget.ui rename to src/librssguard/gui/searchtextwidget.ui diff --git a/src/gui/settings/settingsbrowsermail.cpp b/src/librssguard/gui/settings/settingsbrowsermail.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsbrowsermail.cpp rename to src/librssguard/gui/settings/settingsbrowsermail.cpp diff --git a/src/gui/settings/settingsbrowsermail.h b/src/librssguard/gui/settings/settingsbrowsermail.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsbrowsermail.h rename to src/librssguard/gui/settings/settingsbrowsermail.h diff --git a/src/gui/settings/settingsbrowsermail.ui b/src/librssguard/gui/settings/settingsbrowsermail.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsbrowsermail.ui rename to src/librssguard/gui/settings/settingsbrowsermail.ui diff --git a/src/gui/settings/settingsdatabase.cpp b/src/librssguard/gui/settings/settingsdatabase.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdatabase.cpp rename to src/librssguard/gui/settings/settingsdatabase.cpp diff --git a/src/gui/settings/settingsdatabase.h b/src/librssguard/gui/settings/settingsdatabase.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdatabase.h rename to src/librssguard/gui/settings/settingsdatabase.h diff --git a/src/gui/settings/settingsdatabase.ui b/src/librssguard/gui/settings/settingsdatabase.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdatabase.ui rename to src/librssguard/gui/settings/settingsdatabase.ui diff --git a/src/gui/settings/settingsdownloads.cpp b/src/librssguard/gui/settings/settingsdownloads.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdownloads.cpp rename to src/librssguard/gui/settings/settingsdownloads.cpp diff --git a/src/gui/settings/settingsdownloads.h b/src/librssguard/gui/settings/settingsdownloads.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdownloads.h rename to src/librssguard/gui/settings/settingsdownloads.h diff --git a/src/gui/settings/settingsdownloads.ui b/src/librssguard/gui/settings/settingsdownloads.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsdownloads.ui rename to src/librssguard/gui/settings/settingsdownloads.ui diff --git a/src/gui/settings/settingsfeedsmessages.cpp b/src/librssguard/gui/settings/settingsfeedsmessages.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsfeedsmessages.cpp rename to src/librssguard/gui/settings/settingsfeedsmessages.cpp diff --git a/src/gui/settings/settingsfeedsmessages.h b/src/librssguard/gui/settings/settingsfeedsmessages.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsfeedsmessages.h rename to src/librssguard/gui/settings/settingsfeedsmessages.h diff --git a/src/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsfeedsmessages.ui rename to src/librssguard/gui/settings/settingsfeedsmessages.ui diff --git a/src/gui/settings/settingsgeneral.cpp b/src/librssguard/gui/settings/settingsgeneral.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgeneral.cpp rename to src/librssguard/gui/settings/settingsgeneral.cpp diff --git a/src/gui/settings/settingsgeneral.h b/src/librssguard/gui/settings/settingsgeneral.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgeneral.h rename to src/librssguard/gui/settings/settingsgeneral.h diff --git a/src/gui/settings/settingsgeneral.ui b/src/librssguard/gui/settings/settingsgeneral.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgeneral.ui rename to src/librssguard/gui/settings/settingsgeneral.ui diff --git a/src/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgui.cpp rename to src/librssguard/gui/settings/settingsgui.cpp diff --git a/src/gui/settings/settingsgui.h b/src/librssguard/gui/settings/settingsgui.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgui.h rename to src/librssguard/gui/settings/settingsgui.h diff --git a/src/gui/settings/settingsgui.ui b/src/librssguard/gui/settings/settingsgui.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsgui.ui rename to src/librssguard/gui/settings/settingsgui.ui diff --git a/src/gui/settings/settingslocalization.cpp b/src/librssguard/gui/settings/settingslocalization.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingslocalization.cpp rename to src/librssguard/gui/settings/settingslocalization.cpp diff --git a/src/gui/settings/settingslocalization.h b/src/librssguard/gui/settings/settingslocalization.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingslocalization.h rename to src/librssguard/gui/settings/settingslocalization.h diff --git a/src/gui/settings/settingslocalization.ui b/src/librssguard/gui/settings/settingslocalization.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingslocalization.ui rename to src/librssguard/gui/settings/settingslocalization.ui diff --git a/src/gui/settings/settingspanel.cpp b/src/librssguard/gui/settings/settingspanel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingspanel.cpp rename to src/librssguard/gui/settings/settingspanel.cpp diff --git a/src/gui/settings/settingspanel.h b/src/librssguard/gui/settings/settingspanel.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingspanel.h rename to src/librssguard/gui/settings/settingspanel.h diff --git a/src/gui/settings/settingsshortcuts.cpp b/src/librssguard/gui/settings/settingsshortcuts.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsshortcuts.cpp rename to src/librssguard/gui/settings/settingsshortcuts.cpp diff --git a/src/gui/settings/settingsshortcuts.h b/src/librssguard/gui/settings/settingsshortcuts.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsshortcuts.h rename to src/librssguard/gui/settings/settingsshortcuts.h diff --git a/src/gui/settings/settingsshortcuts.ui b/src/librssguard/gui/settings/settingsshortcuts.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/settings/settingsshortcuts.ui rename to src/librssguard/gui/settings/settingsshortcuts.ui diff --git a/src/gui/squeezelabel.cpp b/src/librssguard/gui/squeezelabel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/squeezelabel.cpp rename to src/librssguard/gui/squeezelabel.cpp diff --git a/src/gui/squeezelabel.h b/src/librssguard/gui/squeezelabel.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/squeezelabel.h rename to src/librssguard/gui/squeezelabel.h diff --git a/src/gui/statusbar.cpp b/src/librssguard/gui/statusbar.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/statusbar.cpp rename to src/librssguard/gui/statusbar.cpp diff --git a/src/gui/statusbar.h b/src/librssguard/gui/statusbar.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/statusbar.h rename to src/librssguard/gui/statusbar.h diff --git a/src/gui/styleditemdelegatewithoutfocus.cpp b/src/librssguard/gui/styleditemdelegatewithoutfocus.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/styleditemdelegatewithoutfocus.cpp rename to src/librssguard/gui/styleditemdelegatewithoutfocus.cpp diff --git a/src/gui/styleditemdelegatewithoutfocus.h b/src/librssguard/gui/styleditemdelegatewithoutfocus.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/styleditemdelegatewithoutfocus.h rename to src/librssguard/gui/styleditemdelegatewithoutfocus.h diff --git a/src/gui/systemtrayicon.cpp b/src/librssguard/gui/systemtrayicon.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/systemtrayicon.cpp rename to src/librssguard/gui/systemtrayicon.cpp diff --git a/src/gui/systemtrayicon.h b/src/librssguard/gui/systemtrayicon.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/systemtrayicon.h rename to src/librssguard/gui/systemtrayicon.h diff --git a/src/gui/tabbar.cpp b/src/librssguard/gui/tabbar.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabbar.cpp rename to src/librssguard/gui/tabbar.cpp diff --git a/src/gui/tabbar.h b/src/librssguard/gui/tabbar.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabbar.h rename to src/librssguard/gui/tabbar.h diff --git a/src/gui/tabcontent.cpp b/src/librssguard/gui/tabcontent.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabcontent.cpp rename to src/librssguard/gui/tabcontent.cpp diff --git a/src/gui/tabcontent.h b/src/librssguard/gui/tabcontent.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabcontent.h rename to src/librssguard/gui/tabcontent.h diff --git a/src/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabwidget.cpp rename to src/librssguard/gui/tabwidget.cpp diff --git a/src/gui/tabwidget.h b/src/librssguard/gui/tabwidget.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/tabwidget.h rename to src/librssguard/gui/tabwidget.h diff --git a/src/gui/timespinbox.cpp b/src/librssguard/gui/timespinbox.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/timespinbox.cpp rename to src/librssguard/gui/timespinbox.cpp diff --git a/src/gui/timespinbox.h b/src/librssguard/gui/timespinbox.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/timespinbox.h rename to src/librssguard/gui/timespinbox.h diff --git a/src/gui/toolbareditor.cpp b/src/librssguard/gui/toolbareditor.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/toolbareditor.cpp rename to src/librssguard/gui/toolbareditor.cpp diff --git a/src/gui/toolbareditor.h b/src/librssguard/gui/toolbareditor.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/toolbareditor.h rename to src/librssguard/gui/toolbareditor.h diff --git a/src/gui/toolbareditor.ui b/src/librssguard/gui/toolbareditor.ui old mode 100755 new mode 100644 similarity index 100% rename from src/gui/toolbareditor.ui rename to src/librssguard/gui/toolbareditor.ui diff --git a/src/gui/treeviewcolumnsmenu.cpp b/src/librssguard/gui/treeviewcolumnsmenu.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/treeviewcolumnsmenu.cpp rename to src/librssguard/gui/treeviewcolumnsmenu.cpp diff --git a/src/gui/treeviewcolumnsmenu.h b/src/librssguard/gui/treeviewcolumnsmenu.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/treeviewcolumnsmenu.h rename to src/librssguard/gui/treeviewcolumnsmenu.h diff --git a/src/gui/treewidget.cpp b/src/librssguard/gui/treewidget.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/treewidget.cpp rename to src/librssguard/gui/treewidget.cpp diff --git a/src/gui/treewidget.h b/src/librssguard/gui/treewidget.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/treewidget.h rename to src/librssguard/gui/treewidget.h diff --git a/src/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/webbrowser.cpp rename to src/librssguard/gui/webbrowser.cpp diff --git a/src/gui/webbrowser.h b/src/librssguard/gui/webbrowser.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/webbrowser.h rename to src/librssguard/gui/webbrowser.h diff --git a/src/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/webviewer.cpp rename to src/librssguard/gui/webviewer.cpp diff --git a/src/gui/webviewer.h b/src/librssguard/gui/webviewer.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/webviewer.h rename to src/librssguard/gui/webviewer.h diff --git a/src/gui/widgetwithstatus.cpp b/src/librssguard/gui/widgetwithstatus.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/gui/widgetwithstatus.cpp rename to src/librssguard/gui/widgetwithstatus.cpp diff --git a/src/gui/widgetwithstatus.h b/src/librssguard/gui/widgetwithstatus.h old mode 100755 new mode 100644 similarity index 100% rename from src/gui/widgetwithstatus.h rename to src/librssguard/gui/widgetwithstatus.h diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro new file mode 100644 index 000000000..d4533f982 --- /dev/null +++ b/src/librssguard/librssguard.pro @@ -0,0 +1,467 @@ +TEMPLATE = lib + +unix|mac { + TARGET = rssguard +} +else { + TARGET = librssguard +} + +MSG_PREFIX = "librssguard" +APP_TYPE = "core library" + +include(../../pri/vars.pri) +include(../../pri/defs.pri) + +message($$MSG_PREFIX: Shadow copy build directory \"$$OUT_PWD\".) +message($$MSG_PREFIX: $$APP_NAME version is: \"$$APP_VERSION\".) +message($$MSG_PREFIX: Detected Qt version: \"$$QT_VERSION\".) +message($$MSG_PREFIX: Build destination directory: \"$$DESTDIR\".) +message($$MSG_PREFIX: Build revision: \"$$APP_REVISION\".) +message($$MSG_PREFIX: lrelease executable name: \"$$LRELEASE\".) + +include(../../pri/build_opts.pri) + +DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_EXPORT +CONFIG += unversioned_libname unversioned_soname skip_target_version_ext + +RESOURCES += ../../resources/sql.qrc \ + ../../resources/rssguard.qrc \ + ../../resources/icons.qrc + +HEADERS += core/feeddownloader.h \ + core/feedsmodel.h \ + core/feedsproxymodel.h \ + core/message.h \ + core/messagesmodel.h \ + core/messagesmodelcache.h \ + core/messagesmodelsqllayer.h \ + core/messagesproxymodel.h \ + definitions/definitions.h \ + dynamic-shortcuts/dynamicshortcuts.h \ + dynamic-shortcuts/dynamicshortcutswidget.h \ + dynamic-shortcuts/shortcutbutton.h \ + dynamic-shortcuts/shortcutcatcher.h \ + exceptions/applicationexception.h \ + exceptions/ioexception.h \ + gui/baselineedit.h \ + gui/basetoolbar.h \ + gui/colorlabel.h \ + gui/comboboxwithstatus.h \ + gui/dialogs/formabout.h \ + gui/dialogs/formaddaccount.h \ + gui/dialogs/formbackupdatabasesettings.h \ + gui/dialogs/formdatabasecleanup.h \ + gui/dialogs/formmain.h \ + gui/dialogs/formrestoredatabasesettings.h \ + gui/dialogs/formsettings.h \ + gui/dialogs/formupdate.h \ + gui/edittableview.h \ + gui/feedmessageviewer.h \ + gui/feedstoolbar.h \ + gui/feedsview.h \ + gui/guiutilities.h \ + gui/labelwithstatus.h \ + gui/lineeditwithstatus.h \ + gui/messagebox.h \ + gui/messagessearchlineedit.h \ + gui/messagestoolbar.h \ + gui/messagesview.h \ + gui/plaintoolbutton.h \ + gui/settings/settingsbrowsermail.h \ + gui/settings/settingsdatabase.h \ + gui/settings/settingsdownloads.h \ + gui/settings/settingsfeedsmessages.h \ + gui/settings/settingsgeneral.h \ + gui/settings/settingsgui.h \ + gui/settings/settingslocalization.h \ + gui/settings/settingspanel.h \ + gui/settings/settingsshortcuts.h \ + gui/squeezelabel.h \ + gui/statusbar.h \ + gui/styleditemdelegatewithoutfocus.h \ + gui/systemtrayicon.h \ + gui/tabbar.h \ + gui/tabcontent.h \ + gui/tabwidget.h \ + gui/timespinbox.h \ + gui/toolbareditor.h \ + gui/treeviewcolumnsmenu.h \ + gui/widgetwithstatus.h \ + miscellaneous/application.h \ + miscellaneous/autosaver.h \ + miscellaneous/databasecleaner.h \ + miscellaneous/databasefactory.h \ + miscellaneous/databasequeries.h \ + miscellaneous/debugging.h \ + miscellaneous/externaltool.h \ + miscellaneous/feedreader.h \ + miscellaneous/iconfactory.h \ + miscellaneous/iofactory.h \ + miscellaneous/localization.h \ + miscellaneous/mutex.h \ + miscellaneous/regexfactory.h \ + miscellaneous/settings.h \ + miscellaneous/settingsproperties.h \ + miscellaneous/simplecrypt/simplecrypt.h \ + miscellaneous/skinfactory.h \ + miscellaneous/systemfactory.h \ + miscellaneous/textfactory.h \ + network-web/basenetworkaccessmanager.h \ + network-web/downloader.h \ + network-web/downloadmanager.h \ + network-web/networkfactory.h \ + network-web/oauth2service.h \ + network-web/silentnetworkaccessmanager.h \ + network-web/webfactory.h \ + qtsingleapplication/qtlocalpeer.h \ + qtsingleapplication/qtlockedfile.h \ + qtsingleapplication/qtsingleapplication.h \ + qtsingleapplication/qtsinglecoreapplication.h \ + services/abstract/accountcheckmodel.h \ + services/abstract/cacheforserviceroot.h \ + services/abstract/category.h \ + services/abstract/feed.h \ + services/abstract/gui/formfeeddetails.h \ + services/abstract/recyclebin.h \ + services/abstract/rootitem.h \ + services/abstract/serviceentrypoint.h \ + services/abstract/serviceroot.h \ + services/gmail/definitions.h \ + services/gmail/gmailentrypoint.h \ + services/gmail/gmailfeed.h \ + services/gmail/gmailserviceroot.h \ + services/gmail/gui/formeditgmailaccount.h \ + services/gmail/network/gmailnetworkfactory.h \ + services/inoreader/definitions.h \ + services/inoreader/gui/formeditinoreaderaccount.h \ + services/inoreader/inoreaderentrypoint.h \ + services/inoreader/inoreaderfeed.h \ + services/inoreader/inoreaderserviceroot.h \ + services/inoreader/network/inoreadernetworkfactory.h \ + services/owncloud/definitions.h \ + services/owncloud/gui/formeditowncloudaccount.h \ + services/owncloud/gui/formowncloudfeeddetails.h \ + services/owncloud/network/owncloudnetworkfactory.h \ + services/owncloud/owncloudfeed.h \ + services/owncloud/owncloudserviceentrypoint.h \ + services/owncloud/owncloudserviceroot.h \ + services/standard/atomparser.h \ + services/standard/feedparser.h \ + services/standard/gui/formstandardcategorydetails.h \ + services/standard/gui/formstandardfeeddetails.h \ + services/standard/gui/formstandardimportexport.h \ + services/standard/rdfparser.h \ + services/standard/rssparser.h \ + services/standard/standardcategory.h \ + services/standard/standardfeed.h \ + services/standard/standardfeedsimportexportmodel.h \ + services/standard/standardserviceentrypoint.h \ + services/standard/standardserviceroot.h \ + services/tt-rss/definitions.h \ + services/tt-rss/gui/formeditttrssaccount.h \ + services/tt-rss/gui/formttrssfeeddetails.h \ + services/tt-rss/network/ttrssnetworkfactory.h \ + services/tt-rss/ttrssfeed.h \ + services/tt-rss/ttrssserviceentrypoint.h \ + services/tt-rss/ttrssserviceroot.h \ + network-web/httpresponse.h \ + services/gmail/gui/formdownloadattachment.h \ + services/gmail/gui/formaddeditemail.h \ + gui/searchtextwidget.h + +SOURCES += core/feeddownloader.cpp \ + core/feedsmodel.cpp \ + core/feedsproxymodel.cpp \ + core/message.cpp \ + core/messagesmodel.cpp \ + core/messagesmodelcache.cpp \ + core/messagesmodelsqllayer.cpp \ + core/messagesproxymodel.cpp \ + dynamic-shortcuts/dynamicshortcuts.cpp \ + dynamic-shortcuts/dynamicshortcutswidget.cpp \ + dynamic-shortcuts/shortcutbutton.cpp \ + dynamic-shortcuts/shortcutcatcher.cpp \ + exceptions/applicationexception.cpp \ + exceptions/ioexception.cpp \ + gui/baselineedit.cpp \ + gui/basetoolbar.cpp \ + gui/colorlabel.cpp \ + gui/comboboxwithstatus.cpp \ + gui/dialogs/formabout.cpp \ + gui/dialogs/formaddaccount.cpp \ + gui/dialogs/formbackupdatabasesettings.cpp \ + gui/dialogs/formdatabasecleanup.cpp \ + gui/dialogs/formmain.cpp \ + gui/dialogs/formrestoredatabasesettings.cpp \ + gui/dialogs/formsettings.cpp \ + gui/dialogs/formupdate.cpp \ + gui/edittableview.cpp \ + gui/feedmessageviewer.cpp \ + gui/feedstoolbar.cpp \ + gui/feedsview.cpp \ + gui/guiutilities.cpp \ + gui/labelwithstatus.cpp \ + gui/lineeditwithstatus.cpp \ + gui/messagebox.cpp \ + gui/messagessearchlineedit.cpp \ + gui/messagestoolbar.cpp \ + gui/messagesview.cpp \ + gui/plaintoolbutton.cpp \ + gui/settings/settingsbrowsermail.cpp \ + gui/settings/settingsdatabase.cpp \ + gui/settings/settingsdownloads.cpp \ + gui/settings/settingsfeedsmessages.cpp \ + gui/settings/settingsgeneral.cpp \ + gui/settings/settingsgui.cpp \ + gui/settings/settingslocalization.cpp \ + gui/settings/settingspanel.cpp \ + gui/settings/settingsshortcuts.cpp \ + gui/squeezelabel.cpp \ + gui/statusbar.cpp \ + gui/styleditemdelegatewithoutfocus.cpp \ + gui/systemtrayicon.cpp \ + gui/tabbar.cpp \ + gui/tabcontent.cpp \ + gui/tabwidget.cpp \ + gui/timespinbox.cpp \ + gui/toolbareditor.cpp \ + gui/treeviewcolumnsmenu.cpp \ + gui/widgetwithstatus.cpp \ + miscellaneous/application.cpp \ + miscellaneous/autosaver.cpp \ + miscellaneous/databasecleaner.cpp \ + miscellaneous/databasefactory.cpp \ + miscellaneous/databasequeries.cpp \ + miscellaneous/debugging.cpp \ + miscellaneous/externaltool.cpp \ + miscellaneous/feedreader.cpp \ + miscellaneous/iconfactory.cpp \ + miscellaneous/iofactory.cpp \ + miscellaneous/localization.cpp \ + miscellaneous/mutex.cpp \ + miscellaneous/regexfactory.cpp \ + miscellaneous/settings.cpp \ + miscellaneous/simplecrypt/simplecrypt.cpp \ + miscellaneous/skinfactory.cpp \ + miscellaneous/systemfactory.cpp \ + miscellaneous/textfactory.cpp \ + network-web/basenetworkaccessmanager.cpp \ + network-web/downloader.cpp \ + network-web/downloadmanager.cpp \ + network-web/networkfactory.cpp \ + network-web/oauth2service.cpp \ + network-web/silentnetworkaccessmanager.cpp \ + network-web/webfactory.cpp \ + qtsingleapplication/qtlocalpeer.cpp \ + qtsingleapplication/qtlockedfile.cpp \ + qtsingleapplication/qtsingleapplication.cpp \ + qtsingleapplication/qtsinglecoreapplication.cpp \ + services/abstract/accountcheckmodel.cpp \ + services/abstract/cacheforserviceroot.cpp \ + services/abstract/category.cpp \ + services/abstract/feed.cpp \ + services/abstract/gui/formfeeddetails.cpp \ + services/abstract/recyclebin.cpp \ + services/abstract/rootitem.cpp \ + services/abstract/serviceentrypoint.cpp \ + services/abstract/serviceroot.cpp \ + services/gmail/gmailentrypoint.cpp \ + services/gmail/gmailfeed.cpp \ + services/gmail/gmailserviceroot.cpp \ + services/gmail/gui/formeditgmailaccount.cpp \ + services/gmail/network/gmailnetworkfactory.cpp \ + services/inoreader/gui/formeditinoreaderaccount.cpp \ + services/inoreader/inoreaderentrypoint.cpp \ + services/inoreader/inoreaderfeed.cpp \ + services/inoreader/inoreaderserviceroot.cpp \ + services/inoreader/network/inoreadernetworkfactory.cpp \ + services/owncloud/gui/formeditowncloudaccount.cpp \ + services/owncloud/gui/formowncloudfeeddetails.cpp \ + services/owncloud/network/owncloudnetworkfactory.cpp \ + services/owncloud/owncloudfeed.cpp \ + services/owncloud/owncloudserviceentrypoint.cpp \ + services/owncloud/owncloudserviceroot.cpp \ + services/standard/atomparser.cpp \ + services/standard/feedparser.cpp \ + services/standard/gui/formstandardcategorydetails.cpp \ + services/standard/gui/formstandardfeeddetails.cpp \ + services/standard/gui/formstandardimportexport.cpp \ + services/standard/rdfparser.cpp \ + services/standard/rssparser.cpp \ + services/standard/standardcategory.cpp \ + services/standard/standardfeed.cpp \ + services/standard/standardfeedsimportexportmodel.cpp \ + services/standard/standardserviceentrypoint.cpp \ + services/standard/standardserviceroot.cpp \ + services/tt-rss/gui/formeditttrssaccount.cpp \ + services/tt-rss/gui/formttrssfeeddetails.cpp \ + services/tt-rss/network/ttrssnetworkfactory.cpp \ + services/tt-rss/ttrssfeed.cpp \ + services/tt-rss/ttrssserviceentrypoint.cpp \ + services/tt-rss/ttrssserviceroot.cpp \ + network-web/httpresponse.cpp \ + services/gmail/gui/formdownloadattachment.cpp \ + services/gmail/gui/formaddeditemail.cpp \ + gui/searchtextwidget.cpp + +mac { + OBJECTIVE_SOURCES += miscellaneous/disablewindowtabbing.mm +} + +FORMS += gui/dialogs/formabout.ui \ + gui/dialogs/formaddaccount.ui \ + gui/dialogs/formbackupdatabasesettings.ui \ + gui/dialogs/formdatabasecleanup.ui \ + gui/dialogs/formmain.ui \ + gui/dialogs/formrestoredatabasesettings.ui \ + gui/dialogs/formsettings.ui \ + gui/dialogs/formupdate.ui \ + gui/settings/settingsbrowsermail.ui \ + gui/settings/settingsdatabase.ui \ + gui/settings/settingsdownloads.ui \ + gui/settings/settingsfeedsmessages.ui \ + gui/settings/settingsgeneral.ui \ + gui/settings/settingsgui.ui \ + gui/settings/settingslocalization.ui \ + gui/settings/settingsshortcuts.ui \ + gui/toolbareditor.ui \ + network-web/downloaditem.ui \ + network-web/downloadmanager.ui \ + services/abstract/gui/formfeeddetails.ui \ + services/gmail/gui/formeditgmailaccount.ui \ + services/inoreader/gui/formeditinoreaderaccount.ui \ + services/owncloud/gui/formeditowncloudaccount.ui \ + services/standard/gui/formstandardcategorydetails.ui \ + services/standard/gui/formstandardimportexport.ui \ + services/tt-rss/gui/formeditttrssaccount.ui \ + services/gmail/gui/formdownloadattachment.ui \ + services/gmail/gui/formaddeditemail.ui \ + gui/searchtextwidget.ui + +equals(USE_WEBENGINE, true) { + HEADERS += gui/locationlineedit.h \ + gui/webviewer.h \ + gui/webbrowser.h \ + gui/discoverfeedsbutton.h \ + network-web/googlesuggest.h \ + network-web/webpage.h \ + network-web/rssguardschemehandler.h \ + gui/dialogs/oauthlogin.h + + SOURCES += gui/locationlineedit.cpp \ + gui/webviewer.cpp \ + gui/webbrowser.cpp \ + gui/discoverfeedsbutton.cpp \ + network-web/googlesuggest.cpp \ + network-web/webpage.cpp \ + network-web/rssguardschemehandler.cpp \ + gui/dialogs/oauthlogin.cpp + + # Add AdBlock sources. + HEADERS += network-web/adblock/adblockaddsubscriptiondialog.h \ + network-web/adblock/adblockdialog.h \ + network-web/adblock/adblockicon.h \ + network-web/adblock/adblockmanager.h \ + network-web/adblock/adblockmatcher.h \ + network-web/adblock/adblockrule.h \ + network-web/adblock/adblocksearchtree.h \ + network-web/adblock/adblocksubscription.h \ + network-web/adblock/adblocktreewidget.h \ + network-web/adblock/adblockurlinterceptor.h \ + network-web/urlinterceptor.h \ + network-web/networkurlinterceptor.h \ + gui/treewidget.h + + SOURCES += network-web/adblock/adblockaddsubscriptiondialog.cpp \ + network-web/adblock/adblockdialog.cpp \ + network-web/adblock/adblockicon.cpp \ + network-web/adblock/adblockmanager.cpp \ + network-web/adblock/adblockmatcher.cpp \ + network-web/adblock/adblockrule.cpp \ + network-web/adblock/adblocksearchtree.cpp \ + network-web/adblock/adblocksubscription.cpp \ + network-web/adblock/adblocktreewidget.cpp \ + network-web/adblock/adblockurlinterceptor.cpp \ + network-web/networkurlinterceptor.cpp \ + gui/treewidget.cpp + + FORMS += network-web/adblock/adblockaddsubscriptiondialog.ui \ + network-web/adblock/adblockdialog.ui \ + gui/dialogs/oauthlogin.ui +} +else { + HEADERS += gui/messagepreviewer.h \ + gui/messagetextbrowser.h \ + gui/newspaperpreviewer.h \ + network-web/oauthhttphandler.h + + SOURCES += gui/messagepreviewer.cpp \ + gui/messagetextbrowser.cpp \ + gui/newspaperpreviewer.cpp \ + network-web/oauthhttphandler.cpp + + FORMS += gui/messagepreviewer.ui \ + gui/newspaperpreviewer.ui +} + +INCLUDEPATH += $$PWD/. \ + $$PWD/gui \ + $$PWD/gui/dialogs \ + $$PWD/dynamic-shortcuts + +TRANSLATIONS_WO_QT += $$PWD/../../localization/rssguard_cs.ts \ + $$PWD/../../localization/rssguard_da.ts \ + $$PWD/../../localization/rssguard_de.ts \ + $$PWD/../../localization/rssguard_en.ts \ + $$PWD/../../localization/rssguard_es.ts \ + $$PWD/../../localization/rssguard_fr.ts \ + $$PWD/../../localization/rssguard_he.ts \ + $$PWD/../../localization/rssguard_id.ts \ + $$PWD/../../localization/rssguard_it.ts \ + $$PWD/../../localization/rssguard_ja.ts \ + $$PWD/../../localization/rssguard_lt.ts \ + $$PWD/../../localization/rssguard_nl.ts \ + $$PWD/../../localization/rssguard_pl.ts \ + $$PWD/../../localization/rssguard_pt.ts \ + $$PWD/../../localization/rssguard_sv.ts \ + $$PWD/../../localization/rssguard_uk.ts \ + $$PWD/../../localization/rssguard_zh.ts + +TRANSLATIONS += $$TRANSLATIONS_WO_QT \ + $$PWD/../../localization/qtbase_cs.ts \ + $$PWD/../../localization/qtbase_da.ts \ + $$PWD/../../localization/qtbase_de.ts \ + $$PWD/../../localization/qtbase_es.ts \ + $$PWD/../../localization/qtbase_fr.ts \ + $$PWD/../../localization/qtbase_he.ts \ + $$PWD/../../localization/qtbase_it.ts \ + $$PWD/../../localization/qtbase_ja.ts \ + $$PWD/../../localization/qtbase_lt.ts \ + $$PWD/../../localization/qtbase_pl.ts \ + $$PWD/../../localization/qtbase_pt.ts \ + $$PWD/../../localization/qtbase_sv.ts \ + $$PWD/../../localization/qtbase_uk.ts \ + $$PWD/../../localization/qtbase_zh.ts + +load(uic) +uic.commands -= -no-stringliteral + +# Create new "make lupdate" target. +lupdate.target = lupdate +lupdate.commands = lupdate -no-obsolete -pro $$shell_quote($$shell_path($$PWD/librssguard.pro)) -ts $$TRANSLATIONS_WO_QT + +QMAKE_EXTRA_TARGETS += lupdate + +# Make sure QM translations are nerated. +qtPrepareTool(LRELEASE, lrelease) { + message($$MSG_PREFIX: Running: \"$$LRELEASE\" -compress librssguard.pro) + system($$LRELEASE -compress librssguard.pro) +} + +mac { + IDENTIFIER = $$APP_REVERSE_NAME + CONFIG -= app_bundle + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + LIBS += -framework AppKit +} diff --git a/src/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp old mode 100755 new mode 100644 similarity index 89% rename from src/miscellaneous/application.cpp rename to src/librssguard/miscellaneous/application.cpp index 39124cd73..a136fb6ba --- a/src/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -2,17 +2,18 @@ #include "miscellaneous/application.h" +#include "dynamic-shortcuts/dynamicshortcuts.h" #include "exceptions/applicationexception.h" #include "gui/dialogs/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" #include "gui/messagebox.h" #include "gui/statusbar.h" +#include "miscellaneous/debugging.h" #include "miscellaneous/feedreader.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/iofactory.h" #include "miscellaneous/mutex.h" - #include "network-web/webfactory.h" #include "services/abstract/serviceroot.h" #include "services/owncloud/owncloudserviceentrypoint.h" @@ -49,6 +50,18 @@ Application::Application(const QString& id, int& argc, char** argv) m_system(new SystemFactory(this)), m_skins(new SkinFactory(this)), m_localization(new Localization(this)), m_icons(new IconFactory(this)), m_database(new DatabaseFactory(this)), m_downloadManager(nullptr), m_shouldRestart(false) { + + // Setup debug output system. + qInstallMessageHandler(Debugging::debugHandler); + + //: Abbreviation of language, e.g. en. + //: Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. + //: Examples: "cs", "en", "it", "cs_CZ", "en_GB", "en_US". + QObject::tr("LANG_ABBREV"); + + //: Name of translator - optional. + QObject::tr("LANG_AUTHOR"); + connect(this, &Application::aboutToQuit, this, &Application::onAboutToQuit); connect(this, &Application::commitDataRequest, this, &Application::onCommitData); connect(this, &Application::saveStateRequest, this, &Application::onSaveState); @@ -61,18 +74,47 @@ Application::Application(const QString& id, int& argc, char** argv) QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(QByteArray(APP_LOW_NAME), new RssGuardSchemeHandler(QWebEngineProfile::defaultProfile())); #endif + + if (arguments().contains(QL1S("-log"))) { + Debugging::instance()->setTargetFile(IOFactory::getSystemFolder(QStandardPaths::TempLocation) + + QDir::separator() + QL1S("rssguard.log")); + } } Application::~Application() { qDebug("Destroying Application instance."); } +void Application::reactOnForeignNotifications() { + connect(this, &Application::messageReceived, this, &Application::processExecutionMessage); +} + +void Application::hideOrShowMainForm() { + // Display main window. + if (qApp->settings()->value(GROUP(GUI), SETTING(GUI::MainWindowStartsHidden)).toBool() && SystemTrayIcon::isSystemTrayActivated()) { + qDebug("Hiding the main window when the application is starting."); + mainForm()->switchVisibility(true); + } + else { + qDebug("Showing the main window when the application is starting."); + mainForm()->show(); + } +} + +void Application::loadDynamicShortcuts() { + DynamicShortcuts::load(userActions()); +} + void Application::showPolls() const { if (isFirstRun(APP_VERSION)) { //web()->openUrlInExternalBrowser(QSL("https://goo.gl/forms/7bJNr33Ii22Q1c3k2")); } } +bool Application::isAlreadyRunning() { + return sendMessage((QStringList() << APP_IS_RUNNING << Application::arguments().mid(1)).join(ARGUMENTS_LIST_SEPARATOR)); +} + FeedReader* Application::feedReader() { return m_feedReader; } @@ -314,8 +356,11 @@ NetworkUrlInterceptor* Application::urlIinterceptor() { #endif void Application::showTrayIcon() { - qDebug("Showing tray icon."); - trayIcon()->show(); + // Display tray icon if it is enabled and available. + if (SystemTrayIcon::isSystemTrayActivated()) { + qDebug("Showing tray icon."); + trayIcon()->show(); + } } void Application::deleteTrayIcon() { diff --git a/src/miscellaneous/application.h b/src/librssguard/miscellaneous/application.h old mode 100755 new mode 100644 similarity index 95% rename from src/miscellaneous/application.h rename to src/librssguard/miscellaneous/application.h index 822d4a065..c9940f13a --- a/src/miscellaneous/application.h +++ b/src/librssguard/miscellaneous/application.h @@ -9,6 +9,7 @@ #include "definitions/definitions.h" #include "gui/systemtrayicon.h" #include "miscellaneous/databasefactory.h" +#include "miscellaneous/feedreader.h" #include "miscellaneous/iofactory.h" #include "miscellaneous/localization.h" #include "miscellaneous/settings.h" @@ -32,24 +33,26 @@ class IconFactory; class QAction; class Mutex; class QWebEngineDownloadItem; -class FeedReader; class WebFactory; #if defined(USE_WEBENGINE) class NetworkUrlInterceptor; #endif -class Application : public QtSingleApplication { +class RSSGUARD_DLLSPEC Application : public QtSingleApplication { Q_OBJECT public: - - // Constructors and destructors. explicit Application(const QString& id, int& argc, char** argv); virtual ~Application(); + void reactOnForeignNotifications(); + void hideOrShowMainForm(); + void loadDynamicShortcuts(); void showPolls() const; + bool isAlreadyRunning(); + FeedReader* feedReader(); void setFeedReader(FeedReader* feed_reader); diff --git a/src/miscellaneous/autosaver.cpp b/src/librssguard/miscellaneous/autosaver.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/autosaver.cpp rename to src/librssguard/miscellaneous/autosaver.cpp diff --git a/src/miscellaneous/autosaver.h b/src/librssguard/miscellaneous/autosaver.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/autosaver.h rename to src/librssguard/miscellaneous/autosaver.h diff --git a/src/miscellaneous/databasecleaner.cpp b/src/librssguard/miscellaneous/databasecleaner.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasecleaner.cpp rename to src/librssguard/miscellaneous/databasecleaner.cpp diff --git a/src/miscellaneous/databasecleaner.h b/src/librssguard/miscellaneous/databasecleaner.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasecleaner.h rename to src/librssguard/miscellaneous/databasecleaner.h diff --git a/src/miscellaneous/databasefactory.cpp b/src/librssguard/miscellaneous/databasefactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasefactory.cpp rename to src/librssguard/miscellaneous/databasefactory.cpp diff --git a/src/miscellaneous/databasefactory.h b/src/librssguard/miscellaneous/databasefactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasefactory.h rename to src/librssguard/miscellaneous/databasefactory.h diff --git a/src/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasequeries.cpp rename to src/librssguard/miscellaneous/databasequeries.cpp diff --git a/src/miscellaneous/databasequeries.h b/src/librssguard/miscellaneous/databasequeries.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/databasequeries.h rename to src/librssguard/miscellaneous/databasequeries.h diff --git a/src/miscellaneous/debugging.cpp b/src/librssguard/miscellaneous/debugging.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/debugging.cpp rename to src/librssguard/miscellaneous/debugging.cpp diff --git a/src/miscellaneous/debugging.h b/src/librssguard/miscellaneous/debugging.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/debugging.h rename to src/librssguard/miscellaneous/debugging.h diff --git a/src/miscellaneous/disablewindowtabbing.mm b/src/librssguard/miscellaneous/disablewindowtabbing.mm similarity index 100% rename from src/miscellaneous/disablewindowtabbing.mm rename to src/librssguard/miscellaneous/disablewindowtabbing.mm diff --git a/src/miscellaneous/externaltool.cpp b/src/librssguard/miscellaneous/externaltool.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/externaltool.cpp rename to src/librssguard/miscellaneous/externaltool.cpp diff --git a/src/miscellaneous/externaltool.h b/src/librssguard/miscellaneous/externaltool.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/externaltool.h rename to src/librssguard/miscellaneous/externaltool.h diff --git a/src/miscellaneous/feedreader.cpp b/src/librssguard/miscellaneous/feedreader.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/feedreader.cpp rename to src/librssguard/miscellaneous/feedreader.cpp diff --git a/src/miscellaneous/feedreader.h b/src/librssguard/miscellaneous/feedreader.h old mode 100755 new mode 100644 similarity index 97% rename from src/miscellaneous/feedreader.h rename to src/librssguard/miscellaneous/feedreader.h index 592339252..16b1bb763 --- a/src/miscellaneous/feedreader.h +++ b/src/librssguard/miscellaneous/feedreader.h @@ -17,7 +17,7 @@ class FeedsProxyModel; class ServiceEntryPoint; class QTimer; -class FeedReader : public QObject { +class RSSGUARD_DLLSPEC FeedReader : public QObject { Q_OBJECT public: diff --git a/src/miscellaneous/iconfactory.cpp b/src/librssguard/miscellaneous/iconfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/iconfactory.cpp rename to src/librssguard/miscellaneous/iconfactory.cpp diff --git a/src/miscellaneous/iconfactory.h b/src/librssguard/miscellaneous/iconfactory.h old mode 100755 new mode 100644 similarity index 96% rename from src/miscellaneous/iconfactory.h rename to src/librssguard/miscellaneous/iconfactory.h index bdb2b323d..a5eb5a271 --- a/src/miscellaneous/iconfactory.h +++ b/src/librssguard/miscellaneous/iconfactory.h @@ -13,7 +13,7 @@ #include #include -class IconFactory : public QObject { +class RSSGUARD_DLLSPEC IconFactory : public QObject { Q_OBJECT public: diff --git a/src/miscellaneous/iofactory.cpp b/src/librssguard/miscellaneous/iofactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/iofactory.cpp rename to src/librssguard/miscellaneous/iofactory.cpp diff --git a/src/miscellaneous/iofactory.h b/src/librssguard/miscellaneous/iofactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/iofactory.h rename to src/librssguard/miscellaneous/iofactory.h diff --git a/src/miscellaneous/localization.cpp b/src/librssguard/miscellaneous/localization.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/localization.cpp rename to src/librssguard/miscellaneous/localization.cpp diff --git a/src/miscellaneous/localization.h b/src/librssguard/miscellaneous/localization.h old mode 100755 new mode 100644 similarity index 90% rename from src/miscellaneous/localization.h rename to src/librssguard/miscellaneous/localization.h index 409868667..0174fe85f --- a/src/miscellaneous/localization.h +++ b/src/librssguard/miscellaneous/localization.h @@ -15,13 +15,13 @@ struct Language { QString m_email; }; -class Localization : public QObject { +class RSSGUARD_DLLSPEC Localization : public QObject { Q_OBJECT public: // Constructor. - explicit Localization(QObject* parent = 0); + explicit Localization(QObject* parent = nullptr); // Destructor. virtual ~Localization(); diff --git a/src/miscellaneous/mutex.cpp b/src/librssguard/miscellaneous/mutex.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/mutex.cpp rename to src/librssguard/miscellaneous/mutex.cpp diff --git a/src/miscellaneous/mutex.h b/src/librssguard/miscellaneous/mutex.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/mutex.h rename to src/librssguard/miscellaneous/mutex.h diff --git a/src/miscellaneous/regexfactory.cpp b/src/librssguard/miscellaneous/regexfactory.cpp similarity index 100% rename from src/miscellaneous/regexfactory.cpp rename to src/librssguard/miscellaneous/regexfactory.cpp diff --git a/src/miscellaneous/regexfactory.h b/src/librssguard/miscellaneous/regexfactory.h similarity index 100% rename from src/miscellaneous/regexfactory.h rename to src/librssguard/miscellaneous/regexfactory.h diff --git a/src/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/settings.cpp rename to src/librssguard/miscellaneous/settings.cpp diff --git a/src/miscellaneous/settings.h b/src/librssguard/miscellaneous/settings.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/settings.h rename to src/librssguard/miscellaneous/settings.h diff --git a/src/miscellaneous/settingsproperties.h b/src/librssguard/miscellaneous/settingsproperties.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/settingsproperties.h rename to src/librssguard/miscellaneous/settingsproperties.h diff --git a/src/miscellaneous/simplecrypt/simplecrypt.cpp b/src/librssguard/miscellaneous/simplecrypt/simplecrypt.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/simplecrypt/simplecrypt.cpp rename to src/librssguard/miscellaneous/simplecrypt/simplecrypt.cpp diff --git a/src/miscellaneous/simplecrypt/simplecrypt.h b/src/librssguard/miscellaneous/simplecrypt/simplecrypt.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/simplecrypt/simplecrypt.h rename to src/librssguard/miscellaneous/simplecrypt/simplecrypt.h diff --git a/src/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/skinfactory.cpp rename to src/librssguard/miscellaneous/skinfactory.cpp diff --git a/src/miscellaneous/skinfactory.h b/src/librssguard/miscellaneous/skinfactory.h old mode 100755 new mode 100644 similarity index 91% rename from src/miscellaneous/skinfactory.h rename to src/librssguard/miscellaneous/skinfactory.h index 4600bc6e7..f1da3ed72 --- a/src/miscellaneous/skinfactory.h +++ b/src/librssguard/miscellaneous/skinfactory.h @@ -8,7 +8,7 @@ #include #include -struct Skin { +struct RSSGUARD_DLLSPEC Skin { QString m_baseName; QString m_visibleName; QString m_author; @@ -24,13 +24,13 @@ struct Skin { Q_DECLARE_METATYPE(Skin) -class SkinFactory : public QObject { +class RSSGUARD_DLLSPEC SkinFactory : public QObject { Q_OBJECT public: // Constructor. - explicit SkinFactory(QObject* parent = 0); + explicit SkinFactory(QObject* parent = nullptr); // Destructor. virtual ~SkinFactory(); diff --git a/src/miscellaneous/systemfactory.cpp b/src/librssguard/miscellaneous/systemfactory.cpp old mode 100755 new mode 100644 similarity index 89% rename from src/miscellaneous/systemfactory.cpp rename to src/librssguard/miscellaneous/systemfactory.cpp index 3c9d6c18a..635000af7 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/librssguard/miscellaneous/systemfactory.cpp @@ -2,6 +2,8 @@ #include "miscellaneous/systemfactory.h" +#include "gui/dialogs/formmain.h" +#include "gui/dialogs/formupdate.h" #include "miscellaneous/application.h" #include "miscellaneous/systemfactory.h" #include "network-web/networkfactory.h" @@ -219,6 +221,26 @@ void SystemFactory::checkForUpdates() const { downloader->downloadFile(RELEASES_LIST); } +void SystemFactory::checkForUpdatesOnStartup() { + if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) { + QObject::connect(qApp->system(), &SystemFactory::updatesChecked, + this, [&](QPair, QNetworkReply::NetworkError> updates) { + QObject::disconnect(qApp->system(), &SystemFactory::updatesChecked, this, nullptr); + + if (!updates.first.isEmpty() && updates.second == QNetworkReply::NoError && + SystemFactory::isVersionNewer(updates.first.at(0).m_availableVersion, APP_VERSION)) { + qApp->showGuiMessage(QObject::tr("New version available"), + QObject::tr("Click the bubble for more information."), + QSystemTrayIcon::Information, qApp->mainForm(), false, + [] { + FormUpdate(qApp->mainForm()).exec(); + }); + } + }); + qApp->system()->checkForUpdates(); + } +} + bool SystemFactory::isVersionNewer(const QString& new_version, const QString& base_version) { QStringList base_version_tkn = base_version.split(QL1C('.')); QStringList new_version_tkn = new_version.split(QL1C('.')); diff --git a/src/miscellaneous/systemfactory.h b/src/librssguard/miscellaneous/systemfactory.h old mode 100755 new mode 100644 similarity index 98% rename from src/miscellaneous/systemfactory.h rename to src/librssguard/miscellaneous/systemfactory.h index 5e45fc0e6..ab67f2d64 --- a/src/miscellaneous/systemfactory.h +++ b/src/librssguard/miscellaneous/systemfactory.h @@ -72,6 +72,8 @@ class SystemFactory : public QObject { // Tries to download list with new updates. void checkForUpdates() const; + void checkForUpdatesOnStartup(); + static QRegularExpression supportedUpdateFiles(); // Checks if update is newer than current application version. diff --git a/src/miscellaneous/textfactory.cpp b/src/librssguard/miscellaneous/textfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/textfactory.cpp rename to src/librssguard/miscellaneous/textfactory.cpp diff --git a/src/miscellaneous/textfactory.h b/src/librssguard/miscellaneous/textfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/miscellaneous/textfactory.h rename to src/librssguard/miscellaneous/textfactory.h diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.cpp b/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockaddsubscriptiondialog.cpp rename to src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.h b/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockaddsubscriptiondialog.h rename to src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.h diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.ui b/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.ui old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockaddsubscriptiondialog.ui rename to src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.ui diff --git a/src/network-web/adblock/adblockdialog.cpp b/src/librssguard/network-web/adblock/adblockdialog.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockdialog.cpp rename to src/librssguard/network-web/adblock/adblockdialog.cpp diff --git a/src/network-web/adblock/adblockdialog.h b/src/librssguard/network-web/adblock/adblockdialog.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockdialog.h rename to src/librssguard/network-web/adblock/adblockdialog.h diff --git a/src/network-web/adblock/adblockdialog.ui b/src/librssguard/network-web/adblock/adblockdialog.ui old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockdialog.ui rename to src/librssguard/network-web/adblock/adblockdialog.ui diff --git a/src/network-web/adblock/adblockicon.cpp b/src/librssguard/network-web/adblock/adblockicon.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockicon.cpp rename to src/librssguard/network-web/adblock/adblockicon.cpp diff --git a/src/network-web/adblock/adblockicon.h b/src/librssguard/network-web/adblock/adblockicon.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockicon.h rename to src/librssguard/network-web/adblock/adblockicon.h diff --git a/src/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockmanager.cpp rename to src/librssguard/network-web/adblock/adblockmanager.cpp diff --git a/src/network-web/adblock/adblockmanager.h b/src/librssguard/network-web/adblock/adblockmanager.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockmanager.h rename to src/librssguard/network-web/adblock/adblockmanager.h diff --git a/src/network-web/adblock/adblockmatcher.cpp b/src/librssguard/network-web/adblock/adblockmatcher.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockmatcher.cpp rename to src/librssguard/network-web/adblock/adblockmatcher.cpp diff --git a/src/network-web/adblock/adblockmatcher.h b/src/librssguard/network-web/adblock/adblockmatcher.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockmatcher.h rename to src/librssguard/network-web/adblock/adblockmatcher.h diff --git a/src/network-web/adblock/adblockrule.cpp b/src/librssguard/network-web/adblock/adblockrule.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockrule.cpp rename to src/librssguard/network-web/adblock/adblockrule.cpp diff --git a/src/network-web/adblock/adblockrule.h b/src/librssguard/network-web/adblock/adblockrule.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockrule.h rename to src/librssguard/network-web/adblock/adblockrule.h diff --git a/src/network-web/adblock/adblocksearchtree.cpp b/src/librssguard/network-web/adblock/adblocksearchtree.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocksearchtree.cpp rename to src/librssguard/network-web/adblock/adblocksearchtree.cpp diff --git a/src/network-web/adblock/adblocksearchtree.h b/src/librssguard/network-web/adblock/adblocksearchtree.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocksearchtree.h rename to src/librssguard/network-web/adblock/adblocksearchtree.h diff --git a/src/network-web/adblock/adblocksubscription.cpp b/src/librssguard/network-web/adblock/adblocksubscription.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocksubscription.cpp rename to src/librssguard/network-web/adblock/adblocksubscription.cpp diff --git a/src/network-web/adblock/adblocksubscription.h b/src/librssguard/network-web/adblock/adblocksubscription.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocksubscription.h rename to src/librssguard/network-web/adblock/adblocksubscription.h diff --git a/src/network-web/adblock/adblocktreewidget.cpp b/src/librssguard/network-web/adblock/adblocktreewidget.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocktreewidget.cpp rename to src/librssguard/network-web/adblock/adblocktreewidget.cpp diff --git a/src/network-web/adblock/adblocktreewidget.h b/src/librssguard/network-web/adblock/adblocktreewidget.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblocktreewidget.h rename to src/librssguard/network-web/adblock/adblocktreewidget.h diff --git a/src/network-web/adblock/adblockurlinterceptor.cpp b/src/librssguard/network-web/adblock/adblockurlinterceptor.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockurlinterceptor.cpp rename to src/librssguard/network-web/adblock/adblockurlinterceptor.cpp diff --git a/src/network-web/adblock/adblockurlinterceptor.h b/src/librssguard/network-web/adblock/adblockurlinterceptor.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/adblock/adblockurlinterceptor.h rename to src/librssguard/network-web/adblock/adblockurlinterceptor.h diff --git a/src/network-web/basenetworkaccessmanager.cpp b/src/librssguard/network-web/basenetworkaccessmanager.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/basenetworkaccessmanager.cpp rename to src/librssguard/network-web/basenetworkaccessmanager.cpp diff --git a/src/network-web/basenetworkaccessmanager.h b/src/librssguard/network-web/basenetworkaccessmanager.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/basenetworkaccessmanager.h rename to src/librssguard/network-web/basenetworkaccessmanager.h diff --git a/src/network-web/downloader.cpp b/src/librssguard/network-web/downloader.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/downloader.cpp rename to src/librssguard/network-web/downloader.cpp diff --git a/src/network-web/downloader.h b/src/librssguard/network-web/downloader.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/downloader.h rename to src/librssguard/network-web/downloader.h diff --git a/src/network-web/downloaditem.ui b/src/librssguard/network-web/downloaditem.ui similarity index 100% rename from src/network-web/downloaditem.ui rename to src/librssguard/network-web/downloaditem.ui diff --git a/src/network-web/downloadmanager.cpp b/src/librssguard/network-web/downloadmanager.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/downloadmanager.cpp rename to src/librssguard/network-web/downloadmanager.cpp diff --git a/src/network-web/downloadmanager.h b/src/librssguard/network-web/downloadmanager.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/downloadmanager.h rename to src/librssguard/network-web/downloadmanager.h diff --git a/src/network-web/downloadmanager.ui b/src/librssguard/network-web/downloadmanager.ui similarity index 100% rename from src/network-web/downloadmanager.ui rename to src/librssguard/network-web/downloadmanager.ui diff --git a/src/network-web/googlesuggest.cpp b/src/librssguard/network-web/googlesuggest.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/googlesuggest.cpp rename to src/librssguard/network-web/googlesuggest.cpp diff --git a/src/network-web/googlesuggest.h b/src/librssguard/network-web/googlesuggest.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/googlesuggest.h rename to src/librssguard/network-web/googlesuggest.h diff --git a/src/network-web/httpresponse.cpp b/src/librssguard/network-web/httpresponse.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/httpresponse.cpp rename to src/librssguard/network-web/httpresponse.cpp diff --git a/src/network-web/httpresponse.h b/src/librssguard/network-web/httpresponse.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/httpresponse.h rename to src/librssguard/network-web/httpresponse.h diff --git a/src/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/networkfactory.cpp rename to src/librssguard/network-web/networkfactory.cpp diff --git a/src/network-web/networkfactory.h b/src/librssguard/network-web/networkfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/networkfactory.h rename to src/librssguard/network-web/networkfactory.h diff --git a/src/network-web/networkurlinterceptor.cpp b/src/librssguard/network-web/networkurlinterceptor.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/networkurlinterceptor.cpp rename to src/librssguard/network-web/networkurlinterceptor.cpp diff --git a/src/network-web/networkurlinterceptor.h b/src/librssguard/network-web/networkurlinterceptor.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/networkurlinterceptor.h rename to src/librssguard/network-web/networkurlinterceptor.h diff --git a/src/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/oauth2service.cpp rename to src/librssguard/network-web/oauth2service.cpp diff --git a/src/network-web/oauth2service.h b/src/librssguard/network-web/oauth2service.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/oauth2service.h rename to src/librssguard/network-web/oauth2service.h diff --git a/src/network-web/oauthhttphandler.cpp b/src/librssguard/network-web/oauthhttphandler.cpp similarity index 100% rename from src/network-web/oauthhttphandler.cpp rename to src/librssguard/network-web/oauthhttphandler.cpp diff --git a/src/network-web/oauthhttphandler.h b/src/librssguard/network-web/oauthhttphandler.h similarity index 100% rename from src/network-web/oauthhttphandler.h rename to src/librssguard/network-web/oauthhttphandler.h diff --git a/src/network-web/rssguardschemehandler.cpp b/src/librssguard/network-web/rssguardschemehandler.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/rssguardschemehandler.cpp rename to src/librssguard/network-web/rssguardschemehandler.cpp diff --git a/src/network-web/rssguardschemehandler.h b/src/librssguard/network-web/rssguardschemehandler.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/rssguardschemehandler.h rename to src/librssguard/network-web/rssguardschemehandler.h diff --git a/src/network-web/silentnetworkaccessmanager.cpp b/src/librssguard/network-web/silentnetworkaccessmanager.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/silentnetworkaccessmanager.cpp rename to src/librssguard/network-web/silentnetworkaccessmanager.cpp diff --git a/src/network-web/silentnetworkaccessmanager.h b/src/librssguard/network-web/silentnetworkaccessmanager.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/silentnetworkaccessmanager.h rename to src/librssguard/network-web/silentnetworkaccessmanager.h diff --git a/src/network-web/urlinterceptor.h b/src/librssguard/network-web/urlinterceptor.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/urlinterceptor.h rename to src/librssguard/network-web/urlinterceptor.h diff --git a/src/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/webfactory.cpp rename to src/librssguard/network-web/webfactory.cpp diff --git a/src/network-web/webfactory.h b/src/librssguard/network-web/webfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/webfactory.h rename to src/librssguard/network-web/webfactory.h diff --git a/src/network-web/webpage.cpp b/src/librssguard/network-web/webpage.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/webpage.cpp rename to src/librssguard/network-web/webpage.cpp diff --git a/src/network-web/webpage.h b/src/librssguard/network-web/webpage.h old mode 100755 new mode 100644 similarity index 100% rename from src/network-web/webpage.h rename to src/librssguard/network-web/webpage.h diff --git a/src/qtsingleapplication/qtlocalpeer.cpp b/src/librssguard/qtsingleapplication/qtlocalpeer.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlocalpeer.cpp rename to src/librssguard/qtsingleapplication/qtlocalpeer.cpp diff --git a/src/qtsingleapplication/qtlocalpeer.h b/src/librssguard/qtsingleapplication/qtlocalpeer.h old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlocalpeer.h rename to src/librssguard/qtsingleapplication/qtlocalpeer.h diff --git a/src/qtsingleapplication/qtlockedfile.cpp b/src/librssguard/qtsingleapplication/qtlockedfile.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlockedfile.cpp rename to src/librssguard/qtsingleapplication/qtlockedfile.cpp diff --git a/src/qtsingleapplication/qtlockedfile.h b/src/librssguard/qtsingleapplication/qtlockedfile.h old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlockedfile.h rename to src/librssguard/qtsingleapplication/qtlockedfile.h diff --git a/src/qtsingleapplication/qtlockedfile_unix.cpp b/src/librssguard/qtsingleapplication/qtlockedfile_unix.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlockedfile_unix.cpp rename to src/librssguard/qtsingleapplication/qtlockedfile_unix.cpp diff --git a/src/qtsingleapplication/qtlockedfile_win.cpp b/src/librssguard/qtsingleapplication/qtlockedfile_win.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtlockedfile_win.cpp rename to src/librssguard/qtsingleapplication/qtlockedfile_win.cpp diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/librssguard/qtsingleapplication/qtsingleapplication.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtsingleapplication.cpp rename to src/librssguard/qtsingleapplication/qtsingleapplication.cpp diff --git a/src/qtsingleapplication/qtsingleapplication.h b/src/librssguard/qtsingleapplication/qtsingleapplication.h old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtsingleapplication.h rename to src/librssguard/qtsingleapplication/qtsingleapplication.h diff --git a/src/qtsingleapplication/qtsinglecoreapplication.cpp b/src/librssguard/qtsingleapplication/qtsinglecoreapplication.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtsinglecoreapplication.cpp rename to src/librssguard/qtsingleapplication/qtsinglecoreapplication.cpp diff --git a/src/qtsingleapplication/qtsinglecoreapplication.h b/src/librssguard/qtsingleapplication/qtsinglecoreapplication.h old mode 100755 new mode 100644 similarity index 100% rename from src/qtsingleapplication/qtsinglecoreapplication.h rename to src/librssguard/qtsingleapplication/qtsinglecoreapplication.h diff --git a/src/services/abstract/accountcheckmodel.cpp b/src/librssguard/services/abstract/accountcheckmodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/accountcheckmodel.cpp rename to src/librssguard/services/abstract/accountcheckmodel.cpp diff --git a/src/services/abstract/accountcheckmodel.h b/src/librssguard/services/abstract/accountcheckmodel.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/accountcheckmodel.h rename to src/librssguard/services/abstract/accountcheckmodel.h diff --git a/src/services/abstract/cacheforserviceroot.cpp b/src/librssguard/services/abstract/cacheforserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/cacheforserviceroot.cpp rename to src/librssguard/services/abstract/cacheforserviceroot.cpp diff --git a/src/services/abstract/cacheforserviceroot.h b/src/librssguard/services/abstract/cacheforserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/cacheforserviceroot.h rename to src/librssguard/services/abstract/cacheforserviceroot.h diff --git a/src/services/abstract/category.cpp b/src/librssguard/services/abstract/category.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/category.cpp rename to src/librssguard/services/abstract/category.cpp diff --git a/src/services/abstract/category.h b/src/librssguard/services/abstract/category.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/category.h rename to src/librssguard/services/abstract/category.h diff --git a/src/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/feed.cpp rename to src/librssguard/services/abstract/feed.cpp diff --git a/src/services/abstract/feed.h b/src/librssguard/services/abstract/feed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/feed.h rename to src/librssguard/services/abstract/feed.h diff --git a/src/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/gui/formfeeddetails.cpp rename to src/librssguard/services/abstract/gui/formfeeddetails.cpp diff --git a/src/services/abstract/gui/formfeeddetails.h b/src/librssguard/services/abstract/gui/formfeeddetails.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/gui/formfeeddetails.h rename to src/librssguard/services/abstract/gui/formfeeddetails.h diff --git a/src/services/abstract/gui/formfeeddetails.ui b/src/librssguard/services/abstract/gui/formfeeddetails.ui similarity index 100% rename from src/services/abstract/gui/formfeeddetails.ui rename to src/librssguard/services/abstract/gui/formfeeddetails.ui diff --git a/src/services/abstract/recyclebin.cpp b/src/librssguard/services/abstract/recyclebin.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/recyclebin.cpp rename to src/librssguard/services/abstract/recyclebin.cpp diff --git a/src/services/abstract/recyclebin.h b/src/librssguard/services/abstract/recyclebin.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/recyclebin.h rename to src/librssguard/services/abstract/recyclebin.h diff --git a/src/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/rootitem.cpp rename to src/librssguard/services/abstract/rootitem.cpp diff --git a/src/services/abstract/rootitem.h b/src/librssguard/services/abstract/rootitem.h old mode 100755 new mode 100644 similarity index 99% rename from src/services/abstract/rootitem.h rename to src/librssguard/services/abstract/rootitem.h index a83d96d03..4b174e1d1 --- a/src/services/abstract/rootitem.h +++ b/src/librssguard/services/abstract/rootitem.h @@ -33,7 +33,7 @@ namespace RootItemKind { // Represents ROOT item of FeedsModel. // NOTE: This class is derived to add functionality for // all other non-root items of FeedsModel. -class RootItem : public QObject { +class RSSGUARD_DLLSPEC RootItem : public QObject { Q_OBJECT public: diff --git a/src/services/abstract/serviceentrypoint.cpp b/src/librssguard/services/abstract/serviceentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/serviceentrypoint.cpp rename to src/librssguard/services/abstract/serviceentrypoint.cpp diff --git a/src/services/abstract/serviceentrypoint.h b/src/librssguard/services/abstract/serviceentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/serviceentrypoint.h rename to src/librssguard/services/abstract/serviceentrypoint.h diff --git a/src/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/serviceroot.cpp rename to src/librssguard/services/abstract/serviceroot.cpp diff --git a/src/services/abstract/serviceroot.h b/src/librssguard/services/abstract/serviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/abstract/serviceroot.h rename to src/librssguard/services/abstract/serviceroot.h diff --git a/src/services/gmail/definitions.h b/src/librssguard/services/gmail/definitions.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/definitions.h rename to src/librssguard/services/gmail/definitions.h diff --git a/src/services/gmail/gmailentrypoint.cpp b/src/librssguard/services/gmail/gmailentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailentrypoint.cpp rename to src/librssguard/services/gmail/gmailentrypoint.cpp diff --git a/src/services/gmail/gmailentrypoint.h b/src/librssguard/services/gmail/gmailentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailentrypoint.h rename to src/librssguard/services/gmail/gmailentrypoint.h diff --git a/src/services/gmail/gmailfeed.cpp b/src/librssguard/services/gmail/gmailfeed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailfeed.cpp rename to src/librssguard/services/gmail/gmailfeed.cpp diff --git a/src/services/gmail/gmailfeed.h b/src/librssguard/services/gmail/gmailfeed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailfeed.h rename to src/librssguard/services/gmail/gmailfeed.h diff --git a/src/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailserviceroot.cpp rename to src/librssguard/services/gmail/gmailserviceroot.cpp diff --git a/src/services/gmail/gmailserviceroot.h b/src/librssguard/services/gmail/gmailserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gmailserviceroot.h rename to src/librssguard/services/gmail/gmailserviceroot.h diff --git a/src/services/gmail/gui/formaddeditemail.cpp b/src/librssguard/services/gmail/gui/formaddeditemail.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formaddeditemail.cpp rename to src/librssguard/services/gmail/gui/formaddeditemail.cpp diff --git a/src/services/gmail/gui/formaddeditemail.h b/src/librssguard/services/gmail/gui/formaddeditemail.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formaddeditemail.h rename to src/librssguard/services/gmail/gui/formaddeditemail.h diff --git a/src/services/gmail/gui/formaddeditemail.ui b/src/librssguard/services/gmail/gui/formaddeditemail.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formaddeditemail.ui rename to src/librssguard/services/gmail/gui/formaddeditemail.ui diff --git a/src/services/gmail/gui/formdownloadattachment.cpp b/src/librssguard/services/gmail/gui/formdownloadattachment.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formdownloadattachment.cpp rename to src/librssguard/services/gmail/gui/formdownloadattachment.cpp diff --git a/src/services/gmail/gui/formdownloadattachment.h b/src/librssguard/services/gmail/gui/formdownloadattachment.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formdownloadattachment.h rename to src/librssguard/services/gmail/gui/formdownloadattachment.h diff --git a/src/services/gmail/gui/formdownloadattachment.ui b/src/librssguard/services/gmail/gui/formdownloadattachment.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formdownloadattachment.ui rename to src/librssguard/services/gmail/gui/formdownloadattachment.ui diff --git a/src/services/gmail/gui/formeditgmailaccount.cpp b/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formeditgmailaccount.cpp rename to src/librssguard/services/gmail/gui/formeditgmailaccount.cpp diff --git a/src/services/gmail/gui/formeditgmailaccount.h b/src/librssguard/services/gmail/gui/formeditgmailaccount.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formeditgmailaccount.h rename to src/librssguard/services/gmail/gui/formeditgmailaccount.h diff --git a/src/services/gmail/gui/formeditgmailaccount.ui b/src/librssguard/services/gmail/gui/formeditgmailaccount.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/gui/formeditgmailaccount.ui rename to src/librssguard/services/gmail/gui/formeditgmailaccount.ui diff --git a/src/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/network/gmailnetworkfactory.cpp rename to src/librssguard/services/gmail/network/gmailnetworkfactory.cpp diff --git a/src/services/gmail/network/gmailnetworkfactory.h b/src/librssguard/services/gmail/network/gmailnetworkfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/gmail/network/gmailnetworkfactory.h rename to src/librssguard/services/gmail/network/gmailnetworkfactory.h diff --git a/src/services/inoreader/definitions.h b/src/librssguard/services/inoreader/definitions.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/definitions.h rename to src/librssguard/services/inoreader/definitions.h diff --git a/src/services/inoreader/gui/formeditinoreaderaccount.cpp b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/gui/formeditinoreaderaccount.cpp rename to src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp diff --git a/src/services/inoreader/gui/formeditinoreaderaccount.h b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/gui/formeditinoreaderaccount.h rename to src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h diff --git a/src/services/inoreader/gui/formeditinoreaderaccount.ui b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/gui/formeditinoreaderaccount.ui rename to src/librssguard/services/inoreader/gui/formeditinoreaderaccount.ui diff --git a/src/services/inoreader/inoreaderentrypoint.cpp b/src/librssguard/services/inoreader/inoreaderentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderentrypoint.cpp rename to src/librssguard/services/inoreader/inoreaderentrypoint.cpp diff --git a/src/services/inoreader/inoreaderentrypoint.h b/src/librssguard/services/inoreader/inoreaderentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderentrypoint.h rename to src/librssguard/services/inoreader/inoreaderentrypoint.h diff --git a/src/services/inoreader/inoreaderfeed.cpp b/src/librssguard/services/inoreader/inoreaderfeed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderfeed.cpp rename to src/librssguard/services/inoreader/inoreaderfeed.cpp diff --git a/src/services/inoreader/inoreaderfeed.h b/src/librssguard/services/inoreader/inoreaderfeed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderfeed.h rename to src/librssguard/services/inoreader/inoreaderfeed.h diff --git a/src/services/inoreader/inoreaderserviceroot.cpp b/src/librssguard/services/inoreader/inoreaderserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderserviceroot.cpp rename to src/librssguard/services/inoreader/inoreaderserviceroot.cpp diff --git a/src/services/inoreader/inoreaderserviceroot.h b/src/librssguard/services/inoreader/inoreaderserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/inoreaderserviceroot.h rename to src/librssguard/services/inoreader/inoreaderserviceroot.h diff --git a/src/services/inoreader/network/inoreadernetworkfactory.cpp b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/network/inoreadernetworkfactory.cpp rename to src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp diff --git a/src/services/inoreader/network/inoreadernetworkfactory.h b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/inoreader/network/inoreadernetworkfactory.h rename to src/librssguard/services/inoreader/network/inoreadernetworkfactory.h diff --git a/src/services/owncloud/definitions.h b/src/librssguard/services/owncloud/definitions.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/definitions.h rename to src/librssguard/services/owncloud/definitions.h diff --git a/src/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/gui/formeditowncloudaccount.cpp rename to src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp diff --git a/src/services/owncloud/gui/formeditowncloudaccount.h b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/gui/formeditowncloudaccount.h rename to src/librssguard/services/owncloud/gui/formeditowncloudaccount.h diff --git a/src/services/owncloud/gui/formeditowncloudaccount.ui b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/gui/formeditowncloudaccount.ui rename to src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui diff --git a/src/services/owncloud/gui/formowncloudfeeddetails.cpp b/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/gui/formowncloudfeeddetails.cpp rename to src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp diff --git a/src/services/owncloud/gui/formowncloudfeeddetails.h b/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/gui/formowncloudfeeddetails.h rename to src/librssguard/services/owncloud/gui/formowncloudfeeddetails.h diff --git a/src/services/owncloud/network/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/network/owncloudnetworkfactory.cpp rename to src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp diff --git a/src/services/owncloud/network/owncloudnetworkfactory.h b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/network/owncloudnetworkfactory.h rename to src/librssguard/services/owncloud/network/owncloudnetworkfactory.h diff --git a/src/services/owncloud/owncloudfeed.cpp b/src/librssguard/services/owncloud/owncloudfeed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudfeed.cpp rename to src/librssguard/services/owncloud/owncloudfeed.cpp diff --git a/src/services/owncloud/owncloudfeed.h b/src/librssguard/services/owncloud/owncloudfeed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudfeed.h rename to src/librssguard/services/owncloud/owncloudfeed.h diff --git a/src/services/owncloud/owncloudserviceentrypoint.cpp b/src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudserviceentrypoint.cpp rename to src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp diff --git a/src/services/owncloud/owncloudserviceentrypoint.h b/src/librssguard/services/owncloud/owncloudserviceentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudserviceentrypoint.h rename to src/librssguard/services/owncloud/owncloudserviceentrypoint.h diff --git a/src/services/owncloud/owncloudserviceroot.cpp b/src/librssguard/services/owncloud/owncloudserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudserviceroot.cpp rename to src/librssguard/services/owncloud/owncloudserviceroot.cpp diff --git a/src/services/owncloud/owncloudserviceroot.h b/src/librssguard/services/owncloud/owncloudserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/owncloud/owncloudserviceroot.h rename to src/librssguard/services/owncloud/owncloudserviceroot.h diff --git a/src/services/standard/atomparser.cpp b/src/librssguard/services/standard/atomparser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/atomparser.cpp rename to src/librssguard/services/standard/atomparser.cpp diff --git a/src/services/standard/atomparser.h b/src/librssguard/services/standard/atomparser.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/atomparser.h rename to src/librssguard/services/standard/atomparser.h diff --git a/src/services/standard/feedparser.cpp b/src/librssguard/services/standard/feedparser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/feedparser.cpp rename to src/librssguard/services/standard/feedparser.cpp diff --git a/src/services/standard/feedparser.h b/src/librssguard/services/standard/feedparser.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/feedparser.h rename to src/librssguard/services/standard/feedparser.h diff --git a/src/services/standard/gui/formstandardcategorydetails.cpp b/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardcategorydetails.cpp rename to src/librssguard/services/standard/gui/formstandardcategorydetails.cpp diff --git a/src/services/standard/gui/formstandardcategorydetails.h b/src/librssguard/services/standard/gui/formstandardcategorydetails.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardcategorydetails.h rename to src/librssguard/services/standard/gui/formstandardcategorydetails.h diff --git a/src/services/standard/gui/formstandardcategorydetails.ui b/src/librssguard/services/standard/gui/formstandardcategorydetails.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardcategorydetails.ui rename to src/librssguard/services/standard/gui/formstandardcategorydetails.ui diff --git a/src/services/standard/gui/formstandardfeeddetails.cpp b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardfeeddetails.cpp rename to src/librssguard/services/standard/gui/formstandardfeeddetails.cpp diff --git a/src/services/standard/gui/formstandardfeeddetails.h b/src/librssguard/services/standard/gui/formstandardfeeddetails.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardfeeddetails.h rename to src/librssguard/services/standard/gui/formstandardfeeddetails.h diff --git a/src/services/standard/gui/formstandardimportexport.cpp b/src/librssguard/services/standard/gui/formstandardimportexport.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardimportexport.cpp rename to src/librssguard/services/standard/gui/formstandardimportexport.cpp diff --git a/src/services/standard/gui/formstandardimportexport.h b/src/librssguard/services/standard/gui/formstandardimportexport.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardimportexport.h rename to src/librssguard/services/standard/gui/formstandardimportexport.h diff --git a/src/services/standard/gui/formstandardimportexport.ui b/src/librssguard/services/standard/gui/formstandardimportexport.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/gui/formstandardimportexport.ui rename to src/librssguard/services/standard/gui/formstandardimportexport.ui diff --git a/src/services/standard/rdfparser.cpp b/src/librssguard/services/standard/rdfparser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/rdfparser.cpp rename to src/librssguard/services/standard/rdfparser.cpp diff --git a/src/services/standard/rdfparser.h b/src/librssguard/services/standard/rdfparser.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/rdfparser.h rename to src/librssguard/services/standard/rdfparser.h diff --git a/src/services/standard/rssparser.cpp b/src/librssguard/services/standard/rssparser.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/rssparser.cpp rename to src/librssguard/services/standard/rssparser.cpp diff --git a/src/services/standard/rssparser.h b/src/librssguard/services/standard/rssparser.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/rssparser.h rename to src/librssguard/services/standard/rssparser.h diff --git a/src/services/standard/standardcategory.cpp b/src/librssguard/services/standard/standardcategory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardcategory.cpp rename to src/librssguard/services/standard/standardcategory.cpp diff --git a/src/services/standard/standardcategory.h b/src/librssguard/services/standard/standardcategory.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardcategory.h rename to src/librssguard/services/standard/standardcategory.h diff --git a/src/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardfeed.cpp rename to src/librssguard/services/standard/standardfeed.cpp diff --git a/src/services/standard/standardfeed.h b/src/librssguard/services/standard/standardfeed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardfeed.h rename to src/librssguard/services/standard/standardfeed.h diff --git a/src/services/standard/standardfeedsimportexportmodel.cpp b/src/librssguard/services/standard/standardfeedsimportexportmodel.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardfeedsimportexportmodel.cpp rename to src/librssguard/services/standard/standardfeedsimportexportmodel.cpp diff --git a/src/services/standard/standardfeedsimportexportmodel.h b/src/librssguard/services/standard/standardfeedsimportexportmodel.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardfeedsimportexportmodel.h rename to src/librssguard/services/standard/standardfeedsimportexportmodel.h diff --git a/src/services/standard/standardserviceentrypoint.cpp b/src/librssguard/services/standard/standardserviceentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardserviceentrypoint.cpp rename to src/librssguard/services/standard/standardserviceentrypoint.cpp diff --git a/src/services/standard/standardserviceentrypoint.h b/src/librssguard/services/standard/standardserviceentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardserviceentrypoint.h rename to src/librssguard/services/standard/standardserviceentrypoint.h diff --git a/src/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardserviceroot.cpp rename to src/librssguard/services/standard/standardserviceroot.cpp diff --git a/src/services/standard/standardserviceroot.h b/src/librssguard/services/standard/standardserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/standard/standardserviceroot.h rename to src/librssguard/services/standard/standardserviceroot.h diff --git a/src/services/tt-rss/definitions.h b/src/librssguard/services/tt-rss/definitions.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/definitions.h rename to src/librssguard/services/tt-rss/definitions.h diff --git a/src/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/gui/formeditttrssaccount.cpp rename to src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp diff --git a/src/services/tt-rss/gui/formeditttrssaccount.h b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/gui/formeditttrssaccount.h rename to src/librssguard/services/tt-rss/gui/formeditttrssaccount.h diff --git a/src/services/tt-rss/gui/formeditttrssaccount.ui b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.ui old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/gui/formeditttrssaccount.ui rename to src/librssguard/services/tt-rss/gui/formeditttrssaccount.ui diff --git a/src/services/tt-rss/gui/formttrssfeeddetails.cpp b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/gui/formttrssfeeddetails.cpp rename to src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp diff --git a/src/services/tt-rss/gui/formttrssfeeddetails.h b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/gui/formttrssfeeddetails.h rename to src/librssguard/services/tt-rss/gui/formttrssfeeddetails.h diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/network/ttrssnetworkfactory.cpp rename to src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.h b/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/network/ttrssnetworkfactory.h rename to src/librssguard/services/tt-rss/network/ttrssnetworkfactory.h diff --git a/src/services/tt-rss/ttrssfeed.cpp b/src/librssguard/services/tt-rss/ttrssfeed.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssfeed.cpp rename to src/librssguard/services/tt-rss/ttrssfeed.cpp diff --git a/src/services/tt-rss/ttrssfeed.h b/src/librssguard/services/tt-rss/ttrssfeed.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssfeed.h rename to src/librssguard/services/tt-rss/ttrssfeed.h diff --git a/src/services/tt-rss/ttrssserviceentrypoint.cpp b/src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssserviceentrypoint.cpp rename to src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp diff --git a/src/services/tt-rss/ttrssserviceentrypoint.h b/src/librssguard/services/tt-rss/ttrssserviceentrypoint.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssserviceentrypoint.h rename to src/librssguard/services/tt-rss/ttrssserviceentrypoint.h diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssserviceroot.cpp rename to src/librssguard/services/tt-rss/ttrssserviceroot.cpp diff --git a/src/services/tt-rss/ttrssserviceroot.h b/src/librssguard/services/tt-rss/ttrssserviceroot.h old mode 100755 new mode 100644 similarity index 100% rename from src/services/tt-rss/ttrssserviceroot.h rename to src/librssguard/services/tt-rss/ttrssserviceroot.h diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100755 index 90fcd460f..000000000 --- a/src/main.cpp +++ /dev/null @@ -1,222 +0,0 @@ -// For license of this file, see /LICENSE.md. - -#include "definitions/definitions.h" -#include "dynamic-shortcuts/dynamicshortcuts.h" -#include "gui/dialogs/formabout.h" -#include "gui/dialogs/formmain.h" -#include "gui/dialogs/formupdate.h" -#include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" -#include "gui/messagebox.h" -#include "miscellaneous/application.h" -#include "miscellaneous/databasefactory.h" -#include "miscellaneous/debugging.h" -#include "miscellaneous/feedreader.h" -#include "miscellaneous/iconfactory.h" -#include "network-web/oauth2service.h" -#include "network-web/silentnetworkaccessmanager.h" -#include "network-web/webfactory.h" - -// Needed for setting ini file format on Mac OS. -#ifdef Q_OS_MAC -#include -#endif - -#include -#include -#include -#include -#include - -#if defined (Q_OS_MAC) -extern void disableWindowTabbing(); - -#endif - -int main(int argc, char* argv[]) { - for (int i = 0; i < argc; i++) { - // TODO: use process arg parser - const QString str = QString::fromLocal8Bit(argv[i]); - - if (str == "-h") { - qDebug("Usage: rssguard [OPTIONS]\n\n" - "Option\t\tMeaning\n" - "-h\t\tDisplays this help."); - return EXIT_SUCCESS; - } - } - - //: Abbreviation of language, e.g. en. - //: Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. - //: Examples: "cs", "en", "it", "cs_CZ", "en_GB", "en_US". - QObject::tr("LANG_ABBREV"); - - //: Name of translator - optional. - QObject::tr("LANG_AUTHOR"); - - // Ensure that ini format is used as application settings storage on Mac OS. - QSettings::setDefaultFormat(QSettings::IniFormat); - - // Setup debug output system. - qInstallMessageHandler(Debugging::debugHandler); - - // Instantiate base application object. - Application application(APP_LOW_NAME, argc, argv); - - if (Application::arguments().contains(QL1S("-log"))) { - Debugging::instance()->setTargetFile(IOFactory::getSystemFolder(QStandardPaths::TempLocation) + - QDir::separator() + QL1S("rssguard.log")); - } - - qDebug("Starting %s.", qPrintable(QSL(APP_LONG_NAME))); - qDebug("Instantiated Application class."); - - // Check if another instance is running. - if (application.sendMessage((QStringList() << APP_IS_RUNNING << Application::arguments().mid(1)).join(ARGUMENTS_LIST_SEPARATOR))) { - qWarning("Another instance of the application is already running. Notifying it."); - return EXIT_FAILURE; - } - - // Load localization and setup locale before any widget is constructed. - qApp->localization()->loadActiveLanguage(); - application.setFeedReader(new FeedReader(&application)); - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - -#if defined (Q_OS_MAC) - QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); - disableWindowTabbing(); -#endif - - // Register needed metatypes. - qRegisterMetaType>("QList"); - qRegisterMetaType>("QList"); - - // Add an extra path for non-system icon themes and set current icon theme - // and skin. - qApp->icons()->setupSearchPaths(); - qApp->icons()->loadCurrentIconTheme(); - qApp->skins()->loadCurrentSkin(); - - // These settings needs to be set before any QSettings object. - Application::setApplicationName(APP_NAME); - Application::setApplicationVersion(APP_VERSION); - Application::setOrganizationDomain(APP_URL); - Application::setWindowIcon(QIcon(APP_ICON_PATH)); - - // Setup single-instance behavior. - QObject::connect(&application, &Application::messageReceived, &application, &Application::processExecutionMessage); - qDebug().nospace() << "Creating main application form in thread: \'" << QThread::currentThreadId() << "\'."; - - // Instantiate main application window. - FormMain main_window; - - // Set correct information for main window. - main_window.setWindowTitle(APP_LONG_NAME); - - // Now is a good time to initialize dynamic keyboard shortcuts. - DynamicShortcuts::load(qApp->userActions()); - - // Display main window. - if (qApp->settings()->value(GROUP(GUI), SETTING(GUI::MainWindowStartsHidden)).toBool() && SystemTrayIcon::isSystemTrayActivated()) { - qDebug("Hiding the main window when the application is starting."); - main_window.switchVisibility(true); - } - else { - qDebug("Showing the main window when the application is starting."); - main_window.show(); - } - - // Display tray icon if it is enabled and available. - if (SystemTrayIcon::isSystemTrayActivated()) { - qApp->showTrayIcon(); - } - - // Load activated accounts. - qApp->feedReader()->feedsModel()->loadActivatedServiceAccounts(); - - if (qApp->isFirstRun() || qApp->isFirstRun(APP_VERSION)) { - qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.\n\nPlease, check NEW stuff included in this\n" - "version by clicking this popup notification.").arg(APP_LONG_NAME), - QSystemTrayIcon::NoIcon, nullptr, false, [] { - FormAbout(qApp->mainForm()).exec(); - }); - } - - if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) { - QObject::connect(qApp->system(), &SystemFactory::updatesChecked, [](QPair, QNetworkReply::NetworkError> updates) { - QObject::disconnect(qApp->system(), &SystemFactory::updatesChecked, nullptr, nullptr); - - if (!updates.first.isEmpty() && updates.second == QNetworkReply::NoError && - SystemFactory::isVersionNewer(updates.first.at(0).m_availableVersion, APP_VERSION)) { - qApp->showGuiMessage(QObject::tr("New version available"), - QObject::tr("Click the bubble for more information."), - QSystemTrayIcon::Information, qApp->mainForm(), false, - [] { - FormUpdate(qApp->mainForm()).exec(); - }); - } - }); - qApp->system()->checkForUpdates(); - } - - qApp->showPolls(); - qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->loadAllExpandStates(); - -/* - OAuth2Service* srv = new OAuth2Service( - "https://accounts.google.com/o/oauth2/auth", - "https://accounts.google.com/o/oauth2/token", - "369069180494-j66bgeciouinec1eem7fhvj6qm0as7q3.apps.googleusercontent.com", - "vppQtxrEeBkImiXcjGYl9NxZ", - "https://mail.google.com/"); - - //srv->setRefreshToken("1/RKE3oohSoTHE54L0IPflvndK-DcI7l0of3lVdLa1Q9Q"); - QObject::connect(srv, &OAuth2Service::authCodeObtained, [](QString auth_code) { - int a = 5; - }); - QObject::connect(srv, &OAuth2Service::authFailed, []() { - int a = 5; - }); - QObject::connect(srv, &OAuth2Service::tokensReceived, [srv](QString acc, QString ref, int exp) { - - QHttpMultiPart* multi = new QHttpMultiPart(srv); - QHttpPart p1; - QHttpPart p2; - - multi->setContentType(QHttpMultiPart::ContentType::MixedType); - p1.setRawHeader("Content-Type", "application/http"); - p2.setRawHeader("Content-Type", "application/http"); - p1.setBody("GET /gmail/v1/users/me/messages/15f3427a9f6d2728\r\n"); - p2.setBody("GET /gmail/v1/users/me/messages/15f259a2c353589b\r\n"); - multi->append(p1); - multi->append(p2); - QNetworkRequest req; - - auto bearer = srv->bearer(); - req.setRawHeader(QString("Authorization").toLocal8Bit(), bearer.toLocal8Bit()); - - req.setUrl(QUrl::fromUserInput("https://www.googleapis.com/batch")); - auto* repl = SilentNetworkAccessManager::instance()->post(req, multi); - - //req.setUrl(QUrl::fromUserInput("https://www.googleapis.com/gmail/v1/users/me/labels")); - //auto* repl = SilentNetworkAccessManager::instance()->get(req); - - QObject::connect(repl, &QNetworkReply::finished, [repl]() { - auto resp = repl->readAll(); - auto a = 8; - - IOFactory::writeTextFile("b.html", resp); - }); - - int a = 5; - }); - QObject::connect(srv, &OAuth2Service::tokensRetrieveError, [](QString err, QString desc) { - int a = 5; - }); - srv->login(); - */ - - // Enter global event loop. - return Application::exec(); -} diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp new file mode 100644 index 000000000..7bbea4781 --- /dev/null +++ b/src/rssguard/main.cpp @@ -0,0 +1,96 @@ +// For license of this file, see /LICENSE.md. + +#include "core/feedsmodel.h" +#include "definitions/definitions.h" +#include "gui/dialogs/formabout.h" +#include "gui/dialogs/formmain.h" +#include "gui/feedmessageviewer.h" +#include "gui/feedsview.h" +#include "miscellaneous/application.h" + +#if defined (Q_OS_MAC) +extern void disableWindowTabbing(); + +#endif + +int main(int argc, char* argv[]) { + for (int i = 0; i < argc; i++) { + // TODO: use process arg parser + const QString str = QString::fromLocal8Bit(argv[i]); + + if (str == "-h") { + qDebug("Usage: rssguard [OPTIONS]\n\n" + "Option\t\tMeaning\n" + "-h\t\tDisplays this help."); + return EXIT_SUCCESS; + } + } + + // Ensure that ini format is used as application settings storage on Mac OS. + QSettings::setDefaultFormat(QSettings::IniFormat); + + // Instantiate base application object. + Application application(APP_LOW_NAME, argc, argv); + + qDebug("Starting %s.", qPrintable(QSL(APP_LONG_NAME))); + qDebug("Instantiated Application class."); + + // Check if another instance is running. + if (application.isAlreadyRunning()) { + qWarning("Another instance of the application is already running. Notifying it."); + return EXIT_FAILURE; + } + + // Load localization and setup locale before any widget is constructed. + qApp->localization()->loadActiveLanguage(); + qApp->setFeedReader(new FeedReader(&application)); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + +#if defined (Q_OS_MAC) + QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); + disableWindowTabbing(); +#endif + + // Register needed metatypes. + qRegisterMetaType>("QList"); + qRegisterMetaType>("QList"); + + // Add an extra path for non-system icon themes and set current icon theme + // and skin. + qApp->icons()->setupSearchPaths(); + qApp->icons()->loadCurrentIconTheme(); + qApp->skins()->loadCurrentSkin(); + + // These settings needs to be set before any QSettings object. + Application::setApplicationName(APP_NAME); + Application::setApplicationVersion(APP_VERSION); + Application::setOrganizationDomain(APP_URL); + Application::setWindowIcon(QIcon(APP_ICON_PATH)); + + qApp->reactOnForeignNotifications(); + + // Instantiate main application window. + FormMain main_window; + + qApp->loadDynamicShortcuts(); + qApp->hideOrShowMainForm(); + qApp->showTrayIcon(); + + // Load activated accounts. + qApp->feedReader()->feedsModel()->loadActivatedServiceAccounts(); + + if (qApp->isFirstRun() || qApp->isFirstRun(APP_VERSION)) { + qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.\n\nPlease, check NEW stuff included in this\n" + "version by clicking this popup notification.").arg(APP_LONG_NAME), + QSystemTrayIcon::NoIcon, nullptr, false, [] { + FormAbout(qApp->mainForm()).exec(); + }); + } + + qApp->showPolls(); + qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->loadAllExpandStates(); + + // Enter global event loop. + return Application::exec(); +} diff --git a/src/rssguard/rssguard.pro b/src/rssguard/rssguard.pro new file mode 100644 index 000000000..f4ac63294 --- /dev/null +++ b/src/rssguard/rssguard.pro @@ -0,0 +1,93 @@ +TEMPLATE = app +TARGET = rssguard + +MSG_PREFIX = "rssguard" +APP_TYPE = "executable" + +include(../../pri/vars.pri) + +isEmpty(PREFIX) { + message($$MSG_PREFIX: PREFIX variable is not set. This might indicate error.) + + win32 { + PREFIX = $$OUT_PWD/app + } + + android { + PREFIX = $$OUT_PWD/app + } + + mac { + PREFIX = $$quote($$OUT_PWD/$${APP_NAME}.app) + } + + unix:!mac:!android { + PREFIX = $$OUT_PWD/AppDir/usr + } +} + +include(../../pri/defs.pri) + +message($$MSG_PREFIX: Shadow copy build directory \"$$OUT_PWD\".) +message($$MSG_PREFIX: $$APP_NAME version is: \"$$APP_VERSION\".) +message($$MSG_PREFIX: Detected Qt version: \"$$QT_VERSION\".) +message($$MSG_PREFIX: Build destination directory: \"$$DESTDIR\".) +message($$MSG_PREFIX: Prefix directory: \"$$PREFIX\".) +message($$MSG_PREFIX: Build revision: \"$$APP_REVISION\".) + +include(../../pri/build_opts.pri) + +DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_IMPORT +SOURCES += main.cpp +INCLUDEPATH += $$PWD/../librssguard \ + $$PWD/../librssguard/gui \ + $$OUT_PWD/../librssguard \ + $$OUT_PWD/../librssguard/ui + +DEPENDPATH += $$PWD/../librssguard + +win32: LIBS += -L$$OUT_PWD/../librssguard/ -llibrssguard +unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard + +# Create new "make 7zip" target and "make zip" target. +win32 { + seven_zip.target = 7zip + seven_zip.depends = install + seven_zip.commands = $$shell_path($$shell_quote($$PWD/../../resources/scripts/7za/7za.exe)) a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.7z $$shell_path($$PREFIX/*) + + zip.target = zip + zip.depends = install + zip.commands = $$shell_path($$shell_quote($$PWD/../../resources/scripts/7za/7za.exe)) a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.zip $$shell_path($$PREFIX/*) + + QMAKE_EXTRA_TARGETS += seven_zip zip +} + +mac { + dmg.target = dmg + dmg.depends = install + dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -dmg + + QMAKE_EXTRA_TARGETS += dmg +} + +# Create NSIS installer target on Windows. +win32 { + nsis.target = nsis + nsis.depends = install + nsis.commands = \ + $$shell_path($$shell_quote($$PWD/../../resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ + xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \ + $$shell_path($$shell_quote($$PWD/../../resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in)) + + QMAKE_EXTRA_TARGETS += nsis +} + +win32 { + windows_all.target = windows_all + windows_all.depends = seven_zip nsis + windows_all.commands = echo "windows_all done..." + + QMAKE_EXTRA_TARGETS += windows_all +} + +include(../../pri/install.pri)