Fix minor typos
This commit is contained in:
parent
1e8299ef66
commit
6b1ecf8f69
|
@ -3,16 +3,16 @@
|
||||||
# These functions force a re-configure on each git commit so that you can
|
# These functions force a re-configure on each git commit so that you can
|
||||||
# trust the values of the variables in your build system.
|
# trust the values of the variables in your build system.
|
||||||
#
|
#
|
||||||
# get_git_head_revision(<refspecvar> <hashvar> [<additonal arguments to git describe> ...])
|
# get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
|
||||||
#
|
#
|
||||||
# Returns the refspec and sha hash of the current head revision
|
# Returns the refspec and sha hash of the current head revision
|
||||||
#
|
#
|
||||||
# git_describe(<var> [<additonal arguments to git describe> ...])
|
# git_describe(<var> [<additional arguments to git describe> ...])
|
||||||
#
|
#
|
||||||
# Returns the results of git describe on the source tree, and adjusting
|
# Returns the results of git describe on the source tree, and adjusting
|
||||||
# the output so that it tests false if an error occurs.
|
# the output so that it tests false if an error occurs.
|
||||||
#
|
#
|
||||||
# git_get_exact_tag(<var> [<additonal arguments to git describe> ...])
|
# git_get_exact_tag(<var> [<additional arguments to git describe> ...])
|
||||||
#
|
#
|
||||||
# Returns the results of git describe --exact-match on the source tree,
|
# Returns the results of git describe --exact-match on the source tree,
|
||||||
# and adjusting the output so that it tests false if there was no exact
|
# and adjusting the output so that it tests false if there was no exact
|
||||||
|
|
|
@ -4,7 +4,7 @@ add_subdirectory(libsnore)
|
||||||
|
|
||||||
if(Qt5Widgets_FOUND)
|
if(Qt5Widgets_FOUND)
|
||||||
ecm_optional_add_subdirectory(daemon)
|
ecm_optional_add_subdirectory(daemon)
|
||||||
add_feature_info(BUILD_daemon BUILD_daemon "Build and installd the snorenotify daemon which recieves and redirects notifications.")
|
add_feature_info(BUILD_daemon BUILD_daemon "Build and installd the snorenotify daemon which receives and redirects notifications.")
|
||||||
|
|
||||||
ecm_optional_add_subdirectory(settings)
|
ecm_optional_add_subdirectory(settings)
|
||||||
add_feature_info(BUILD_settings BUILD_settings "Build and installd the snorensettings application which allows the modification of the settings for all applications using libsnore.")
|
add_feature_info(BUILD_settings BUILD_settings "Build and installd the snorensettings application which allows the modification of the settings for all applications using libsnore.")
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace Snore
|
||||||
class AlertData;
|
class AlertData;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alert contains all relevant data to manage different alerts registred with the notification backend.
|
* Alert contains all relevant data to manage different alerts registered with the notification backend.
|
||||||
* Application uses a shared datamodel, its content is never copied and automatically released.
|
* Application uses a shared datamodel, its content is never copied and automatically released.
|
||||||
*
|
*
|
||||||
* @author Hannah von Reth \<vonreth at kde.org\>
|
* @author Hannah von Reth \<vonreth at kde.org\>
|
||||||
|
|
|
@ -212,7 +212,7 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return the availible actions
|
* @return the available actions
|
||||||
* @see addAction
|
* @see addAction
|
||||||
*/
|
*/
|
||||||
const QHash<int, Action> &actions() const;
|
const QHash<int, Action> &actions() const;
|
||||||
|
|
|
@ -39,7 +39,7 @@ namespace Snore
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A QWidget providing acces to the settings of the plugins.
|
* A QWidget providing access to the settings of the plugins.
|
||||||
* If your application does not offer a ui you might call snore-settings insetad.
|
* If your application does not offer a ui you might call snore-settings insetad.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Sets the primary notification backend.
|
* Sets the primary notification backend.
|
||||||
* @param backend the name of the backend.
|
* @param backend the name of the backend.
|
||||||
* @return whether the backend was set succesful.
|
* @return whether the backend was set successful.
|
||||||
*/
|
*/
|
||||||
bool setPrimaryNotificationBackend(const QString &backend);
|
bool setPrimaryNotificationBackend(const QString &backend);
|
||||||
|
|
||||||
|
@ -161,12 +161,12 @@ Q_SIGNALS:
|
||||||
void notificationClosed(const Snore::Notification ¬ification);
|
void notificationClosed(const Snore::Notification ¬ification);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This signal is emited in case the Primary backend encountered an error.
|
* This signal is emitted in case the Primary backend encountered an error.
|
||||||
*/
|
*/
|
||||||
void primaryNotificationBackendError(const QString &error);
|
void primaryNotificationBackendError(const QString &error);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This signal is emited in case the Primary backend changed.
|
* This signal is emitted in case the Primary backend changed.
|
||||||
*/
|
*/
|
||||||
void primaryNotificationBackendChanged(const QString &error);
|
void primaryNotificationBackendChanged(const QString &error);
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ public:
|
||||||
void init();
|
void init();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a default value wich can be overritten by a client application call to SnoreCore::setDefaultValue()
|
* Set a default value which can be overritten by a client application call to SnoreCore::setDefaultValue()
|
||||||
*/
|
*/
|
||||||
void setDefaultSettingsValueIntern(const QString &key, const QVariant &value);
|
void setDefaultSettingsValueIntern(const QString &key, const QVariant &value);
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ class SNORE_EXPORT Utils : public QObject
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* The MarkupFlag enum.
|
* The MarkupFlag enum.
|
||||||
* If a falg is not present the markup key will be removed.
|
* If a flag is not present the markup key will be removed.
|
||||||
* If any flag is present, special characters mus be html escaped.
|
* If any flag is present, special characters mus be html escaped.
|
||||||
*/
|
*/
|
||||||
enum MarkupFlag {
|
enum MarkupFlag {
|
||||||
|
@ -50,7 +50,7 @@ public:
|
||||||
Href = 1 << 0,
|
Href = 1 << 0,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Line breeaks <br> are supprotet.
|
* Line breaks <br> are supprotet.
|
||||||
* If the flag is not present <br> will be replaced by \\n
|
* If the flag is not present <br> will be replaced by \\n
|
||||||
*/
|
*/
|
||||||
Break = 1 << 1,
|
Break = 1 << 1,
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
ecm_optional_add_subdirectory(backends)
|
ecm_optional_add_subdirectory(backends)
|
||||||
add_feature_info(BUILD_backends BUILD_backends "Build and installd the backends, which are used to display interactive notifications.")
|
add_feature_info(BUILD_backends BUILD_backends "Build and install the backends, which are used to display interactive notifications.")
|
||||||
|
|
||||||
ecm_optional_add_subdirectory(secondary_backends)
|
ecm_optional_add_subdirectory(secondary_backends)
|
||||||
add_feature_info(BUILD_secondary_backends BUILD_secondary_backends "Build and installd the secondary_backends, which are used to display non interactive notifications.")
|
add_feature_info(BUILD_secondary_backends BUILD_secondary_backends "Build and install the secondary_backends, which are used to display non interactive notifications.")
|
||||||
|
|
||||||
ecm_optional_add_subdirectory(frontends)
|
ecm_optional_add_subdirectory(frontends)
|
||||||
add_feature_info(BUILD_frontends BUILD_frontends "Build and installd the frontends, which are used to recieve notifications.")
|
add_feature_info(BUILD_frontends BUILD_frontends "Build and install the frontends, which are used to receive notifications.")
|
||||||
|
|
||||||
ecm_optional_add_subdirectory(plugins)
|
ecm_optional_add_subdirectory(plugins)
|
||||||
|
|
|
@ -91,7 +91,7 @@ LONG32 SnarlInterface::DoRequest(LPCSTR request, UINT replyTimeout)
|
||||||
// Create COPYDATASTRUCT
|
// Create COPYDATASTRUCT
|
||||||
COPYDATASTRUCT cds;
|
COPYDATASTRUCT cds;
|
||||||
cds.dwData = 0x534E4C03; // "SNL",3
|
cds.dwData = 0x534E4C03; // "SNL",3
|
||||||
cds.cbData = (DWORD)strlen(request); // No knowledge of max string lenght
|
cds.cbData = (DWORD)strlen(request); // No knowledge of max string length
|
||||||
cds.lpData = const_cast<char *>(request);
|
cds.lpData = const_cast<char *>(request);
|
||||||
|
|
||||||
// Send message
|
// Send message
|
||||||
|
|
|
@ -50,7 +50,7 @@ NotifyWidget::NotifyWidget(int id, const SnoreNotifier *parent) :
|
||||||
engine->load(QUrl::fromEncoded("qrc:/notification.qml"));
|
engine->load(QUrl::fromEncoded("qrc:/notification.qml"));
|
||||||
m_window = qobject_cast<QQuickWindow *>(engine->rootObjects().value(0));
|
m_window = qobject_cast<QQuickWindow *>(engine->rootObjects().value(0));
|
||||||
|
|
||||||
// TODO: It looks like there is a Qt bug wich make some Windows with this flag invisible in some cases...(Tested: Kubuntu willy)
|
// TODO: It looks like there is a Qt bug which make some Windows with this flag invisible in some cases...(Tested: Kubuntu willy)
|
||||||
m_window->setFlags(Qt::WindowStaysOnTopHint | Qt::ToolTip
|
m_window->setFlags(Qt::WindowStaysOnTopHint | Qt::ToolTip
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
// TODO: is this needed or is ToolTip working?
|
// TODO: is this needed or is ToolTip working?
|
||||||
|
|
|
@ -91,7 +91,7 @@ void SnoreNotifier::slotNotify(Snore::Notification notification)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_queue.append(notification);
|
m_queue.append(notification);
|
||||||
qCDebug(SNORE) << "queing" << m_queue.size();
|
qCDebug(SNORE) << "queueing" << m_queue.size();
|
||||||
if (!m_timer->isActive()) {
|
if (!m_timer->isActive()) {
|
||||||
m_timer->start();
|
m_timer->start();
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,7 @@ void PushoverClient::connectToService()
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
qCWarning(SNORE) << "Connection Error";
|
qCWarning(SNORE) << "Connection Error";
|
||||||
emit error(tr("Please login to %1 and reeanble your device.").arg(QStringLiteral("https://pushover.net")));
|
emit error(tr("Please login to %1 and reenable your device.").arg(QStringLiteral("https://pushover.net")));
|
||||||
emit loggedInChanged(Error);
|
emit loggedInChanged(Error);
|
||||||
m_socket->close();
|
m_socket->close();
|
||||||
m_socket->deleteLater();
|
m_socket->deleteLater();
|
||||||
|
@ -179,7 +179,7 @@ void PushoverClient::registerDevice(const QString &secret, const QString &device
|
||||||
m_frontend->setSettingsValue(QStringLiteral("DeviceID"), message.value(QStringLiteral("id")).toString(), LocalSetting);;
|
m_frontend->setSettingsValue(QStringLiteral("DeviceID"), message.value(QStringLiteral("id")).toString(), LocalSetting);;
|
||||||
connectToService();
|
connectToService();
|
||||||
} else {
|
} else {
|
||||||
qCWarning(SNORE) << "An error occure" << input;
|
qCWarning(SNORE) << "An error occured" << input;
|
||||||
emit loggedInChanged(Error);
|
emit loggedInChanged(Error);
|
||||||
QStringList errorMessages;
|
QStringList errorMessages;
|
||||||
QJsonObject errors = message.value(QStringLiteral("errors")).toObject();
|
QJsonObject errors = message.value(QStringLiteral("errors")).toObject();
|
||||||
|
@ -248,7 +248,7 @@ void PushoverClient::getMessages()
|
||||||
deleteMessages(latestID);
|
deleteMessages(latestID);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
qCWarning(SNORE) << "An error occure" << input;
|
qCWarning(SNORE) << "An error occured" << input;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -129,7 +129,7 @@ void Parser::parse(Notification &sNotification, const QString &msg, QTcpSocket *
|
||||||
if (!snarl->m_applications.contains(client)) {
|
if (!snarl->m_applications.contains(client)) {
|
||||||
snarl->m_applications[client] = Application(appName, icon);
|
snarl->m_applications[client] = Application(appName, icon);
|
||||||
} else {
|
} else {
|
||||||
qCDebug(SNORE) << appName << "already registred";
|
qCDebug(SNORE) << appName << "already registered";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case UNREGISTER:
|
case UNREGISTER:
|
||||||
|
|
|
@ -34,7 +34,7 @@ bool setSetting(const QString &appName, SettingsType type, const QString &_key,
|
||||||
QString key = Utils::normalizeSettingsKey(_key, type, appName);
|
QString key = Utils::normalizeSettingsKey(_key, type, appName);
|
||||||
QVariant oldValue = settings.value(key);
|
QVariant oldValue = settings.value(key);
|
||||||
|
|
||||||
//TODO: make sure that the values are valid qvariant.canConvert doesnt work.
|
//TODO: make sure that the values are valid qvariant.canConvert doesn't work.
|
||||||
if (!oldValue.isValid()) {
|
if (!oldValue.isValid()) {
|
||||||
cout << "Invalid key: " << qPrintable(key) << endl;
|
cout << "Invalid key: " << qPrintable(key) << endl;
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue