projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit changes the official Quassel IRC channel, (#quassel)
[quassel.git]
/
src
/
qtui
/
qtmultimedianotificationbackend.cpp
diff --git
a/src/qtui/qtmultimedianotificationbackend.cpp
b/src/qtui/qtmultimedianotificationbackend.cpp
index
a936971
..
5754a3e
100644
(file)
--- a/
src/qtui/qtmultimedianotificationbackend.cpp
+++ b/
src/qtui/qtmultimedianotificationbackend.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,16
+20,17
@@
#include "qtmultimedianotificationbackend.h"
#include "qtmultimedianotificationbackend.h"
+#include <memory>
+
#include <QFileDialog>
#include <QUrl>
#include <QFileDialog>
#include <QUrl>
-#include <memory>
#include "clientsettings.h"
#include "icon.h"
#include "mainwin.h"
#include "qtui.h"
#include "clientsettings.h"
#include "icon.h"
#include "mainwin.h"
#include "qtui.h"
-QtMultimediaNotificationBackend::QtMultimediaNotificationBackend(QObject
*
parent)
+QtMultimediaNotificationBackend::QtMultimediaNotificationBackend(QObject
*
parent)
: AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
: AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
@@
-41,8
+42,7
@@
QtMultimediaNotificationBackend::QtMultimediaNotificationBackend(QObject *parent
_enabled = notificationSettings.value("QtMultimedia/Enabled", true).toBool();
}
_enabled = notificationSettings.value("QtMultimedia/Enabled", true).toBool();
}
-
-void QtMultimediaNotificationBackend::notify(const Notification ¬ification)
+void QtMultimediaNotificationBackend::notify(const Notification& notification)
{
if (_enabled && (notification.type == Highlight || notification.type == PrivMsg)) {
if (_media && _media->availability() == QMultimedia::Available) {
{
if (_enabled && (notification.type == Highlight || notification.type == PrivMsg)) {
if (_media && _media->availability() == QMultimedia::Available) {
@@
-54,32
+54,27
@@
void QtMultimediaNotificationBackend::notify(const Notification ¬ification)
}
}
}
}
-
void QtMultimediaNotificationBackend::close(uint notificationId)
{
Q_UNUSED(notificationId);
}
void QtMultimediaNotificationBackend::close(uint notificationId)
{
Q_UNUSED(notificationId);
}
-
-void QtMultimediaNotificationBackend::enabledChanged(const QVariant &v)
+void QtMultimediaNotificationBackend::enabledChanged(const QVariant& v)
{
_enabled = v.toBool();
}
{
_enabled = v.toBool();
}
-
-void QtMultimediaNotificationBackend::audioFileChanged(const QVariant &v)
+void QtMultimediaNotificationBackend::audioFileChanged(const QVariant& v)
{
createMediaObject(v.toString());
}
{
createMediaObject(v.toString());
}
-
-SettingsPage *QtMultimediaNotificationBackend::createConfigWidget() const
+SettingsPage* QtMultimediaNotificationBackend::createConfigWidget() const
{
return new ConfigWidget();
}
{
return new ConfigWidget();
}
-
-void QtMultimediaNotificationBackend::createMediaObject(const QString &file)
+void QtMultimediaNotificationBackend::createMediaObject(const QString& file)
{
if (file.isEmpty()) {
_media.reset();
{
if (file.isEmpty()) {
_media.reset();
@@
-90,10
+85,9
@@
void QtMultimediaNotificationBackend::createMediaObject(const QString &file)
_media->setMedia(QUrl::fromLocalFile(file));
}
_media->setMedia(QUrl::fromLocalFile(file));
}
-
/***************************************************************************/
/***************************************************************************/
-QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget
*
parent)
+QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget
*
parent)
: SettingsPage("Internal", "QtMultimediaNotification", parent)
{
ui.setupUi(this);
: SettingsPage("Internal", "QtMultimediaNotification", parent)
{
ui.setupUi(this);
@@
-107,10
+101,9
@@
QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent)
connect(ui.filename, &QLineEdit::textChanged, this, &ConfigWidget::widgetChanged);
}
connect(ui.filename, &QLineEdit::textChanged, this, &ConfigWidget::widgetChanged);
}
-
void QtMultimediaNotificationBackend::ConfigWidget::widgetChanged()
{
void QtMultimediaNotificationBackend::ConfigWidget::widgetChanged()
{
- if (!
_audioAvailable) {
+ if (!_audioAvailable) {
ui.play->setEnabled(ui.enabled->isChecked());
ui.open->setEnabled(false);
ui.filename->setEnabled(false);
ui.play->setEnabled(ui.enabled->isChecked());
ui.open->setEnabled(false);
ui.filename->setEnabled(false);
@@
-126,13
+119,11
@@
void QtMultimediaNotificationBackend::ConfigWidget::widgetChanged()
}
}
}
}
-
bool QtMultimediaNotificationBackend::ConfigWidget::hasDefaults() const
{
return true;
}
bool QtMultimediaNotificationBackend::ConfigWidget::hasDefaults() const
{
return true;
}
-
void QtMultimediaNotificationBackend::ConfigWidget::defaults()
{
ui.enabled->setChecked(false);
void QtMultimediaNotificationBackend::ConfigWidget::defaults()
{
ui.enabled->setChecked(false);
@@
-140,7
+131,6
@@
void QtMultimediaNotificationBackend::ConfigWidget::defaults()
widgetChanged();
}
widgetChanged();
}
-
void QtMultimediaNotificationBackend::ConfigWidget::load()
{
NotificationSettings s;
void QtMultimediaNotificationBackend::ConfigWidget::load()
{
NotificationSettings s;
@@
-153,7
+143,6
@@
void QtMultimediaNotificationBackend::ConfigWidget::load()
setChangedState(false);
}
setChangedState(false);
}
-
void QtMultimediaNotificationBackend::ConfigWidget::save()
{
NotificationSettings s;
void QtMultimediaNotificationBackend::ConfigWidget::save()
{
NotificationSettings s;
@@
-162,7
+151,6
@@
void QtMultimediaNotificationBackend::ConfigWidget::save()
load();
}
load();
}
-
void QtMultimediaNotificationBackend::ConfigWidget::on_open_clicked()
{
QString file = QFileDialog::getOpenFileName(this, tr("Select Audio File"));
void QtMultimediaNotificationBackend::ConfigWidget::on_open_clicked()
{
QString file = QFileDialog::getOpenFileName(this, tr("Select Audio File"));
@@
-173,7
+161,6
@@
void QtMultimediaNotificationBackend::ConfigWidget::on_open_clicked()
}
}
}
}
-
void QtMultimediaNotificationBackend::ConfigWidget::on_play_clicked()
{
if (_audioAvailable) {
void QtMultimediaNotificationBackend::ConfigWidget::on_play_clicked()
{
if (_audioAvailable) {