diff --git a/pri/build_opts.pri b/pri/build_opts.pri
index 0276a6fca..2a36951cc 100644
--- a/pri/build_opts.pri
+++ b/pri/build_opts.pri
@@ -7,7 +7,11 @@ 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
-QT *= core gui widgets sql network xml qml multimedia
+QT *= core gui widgets sql network xml qml
+
+!os2 {
+ QT *= multimedia
+}
greaterThan(QT_MAJOR_VERSION, 5) {
QT *= core5compat
diff --git a/resources/docs/Documentation.md b/resources/docs/Documentation.md
index 9ab4227c1..5d6fc3cad 100755
--- a/resources/docs/Documentation.md
+++ b/resources/docs/Documentation.md
@@ -48,11 +48,11 @@ RSS Guard is cross-platform application and at this point is know to work on:
## Major Features
### Supported Feed Readers
-RSS Guard is multi-account application and supports many web feed readers via built-in [plugins](#papi). One of the plugins, of course, provide support for standard **RSS/ATOM/JSON** feeds with set of features everyone would expect from classic feed reader like OPML support etc.
+RSS Guard is multi-account application and supports many web feed readers via built-in [plugins](#papi). One of the plugins, of course, provides support for standard **RSS/ATOM/JSON** feeds with set of features everyone would expect from classic feed reader like OPML support etc.
I organized supported web feed readers into elegant table.
-| Service | Two-way Synchronization | [Intelligent Synchronization Algorithm](#intel) 2 | Synchronized Labels 1 | OAuth |
+| Service | Two-way Synchronization | [Intelligent Synchronization Algorithm](#intel) (ISA) 2 | Synchronized Labels 1 | OAuth |
|----|-----|-----|----|---|
| Feedly | ✅ | ❌ | ✅ | ✅ (only for official binaries) |
| Gmail | ✅ | ❌ | ❌ | ✅ |
@@ -66,7 +66,7 @@ I organized supported web feed readers into elegant table.
-In ISA, RSS Guard only downloads only articles which are new or were updated, whereas older algorithm in RSS Guard usually always fetches all available articles, even if they are not needed, leading to unnecessary overload of your network connection and RSS Guard.
+With ISA, RSS Guard only downloads only articles which are new or were updated, whereas older algorithm in RSS Guard usually always fetches all available articles, even if they are not needed, leading to unnecessary overload of your network connection and RSS Guard.
3 Tested services are:
* Bazqux
diff --git a/src/librssguard/gui/notifications/singlenotificationeditor.cpp b/src/librssguard/gui/notifications/singlenotificationeditor.cpp
index 1e188a230..049417b1e 100755
--- a/src/librssguard/gui/notifications/singlenotificationeditor.cpp
+++ b/src/librssguard/gui/notifications/singlenotificationeditor.cpp
@@ -11,8 +11,12 @@ SingleNotificationEditor::SingleNotificationEditor(const Notification& notificat
: QGroupBox(parent), m_notificationEvent(Notification::Event::NoEvent) {
m_ui.setupUi(this);
+#if defined(Q_OS_OS2)
+ m_ui.m_wdgSound->setVisible(false);
+#else
m_ui.m_btnBrowseSound->setIcon(qApp->icons()->fromTheme(QSL("document-open")));
m_ui.m_btnPlaySound->setIcon(qApp->icons()->fromTheme(QSL("media-playback-start")));
+#endif
loadNotification(notification);
@@ -21,7 +25,7 @@ SingleNotificationEditor::SingleNotificationEditor(const Notification& notificat
connect(m_ui.m_txtSound, &QLineEdit::textChanged, this, &SingleNotificationEditor::notificationChanged);
connect(m_ui.m_cbBalloon, &QCheckBox::toggled, this, &SingleNotificationEditor::notificationChanged);
- setFixedHeight(sizeHint().height());
+ //setFixedHeight(sizeHint().height());
}
Notification SingleNotificationEditor::notification() const {
diff --git a/src/librssguard/gui/notifications/singlenotificationeditor.ui b/src/librssguard/gui/notifications/singlenotificationeditor.ui
index b5d43cfef..78a5546c0 100755
--- a/src/librssguard/gui/notifications/singlenotificationeditor.ui
+++ b/src/librssguard/gui/notifications/singlenotificationeditor.ui
@@ -6,65 +6,83 @@
0
0
- 353
- 65
+ 423
+ 128
-
-
- 6
-
-
- 6
-
-
- 6
-
-
- 6
-
- -
-
-
- Sound
-
-
- m_txtSound
-
-
-
- -
-
-
-
-
-
- Full path to your WAV sound file
-
-
-
- -
-
-
- &Browse
-
-
-
- -
-
-
- &Play
-
-
-
-
-
- -
+
+
+ 0
+ 0
+
+
+
+
-
Balloon notification
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Sound
+
+
+ m_txtSound
+
+
+
+ -
+
+
-
+
+
+ Full path to your WAV sound file
+
+
+
+ -
+
+
+ &Browse
+
+
+
+ -
+
+
+ &Play
+
+
+
+
+
+
+
+
diff --git a/src/librssguard/miscellaneous/notification.cpp b/src/librssguard/miscellaneous/notification.cpp
index 45ff55d8a..b36be9ab9 100755
--- a/src/librssguard/miscellaneous/notification.cpp
+++ b/src/librssguard/miscellaneous/notification.cpp
@@ -5,7 +5,10 @@
#include "miscellaneous/application.h"
#include
+
+#if !defined(Q_OS_OS2)
#include
+#endif
Notification::Notification(Notification::Event event, bool balloon, const QString& sound_path)
: m_event(event), m_balloonEnabled(balloon), m_soundPath(sound_path) {}
@@ -28,7 +31,9 @@ void Notification::setSoundPath(const QString& sound_path) {
void Notification::playSound(Application* app) const {
if (!m_soundPath.isEmpty()) {
+#if !defined(Q_OS_OS2)
QSound::play(QDir::toNativeSeparators(app->replaceDataUserDataFolderPlaceholder(m_soundPath)));
+#endif
}
}