Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions QLog.pro
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ OTHER_FILES += \
res/stylesheet.css \
res/qlog.rc \
res/qlog.desktop \
res/qlog.1 \
res/io.github.foldynl.QLog.metainfo.xml

TRANSLATIONS = i18n/qlog_cs.ts \
Expand Down Expand Up @@ -464,6 +465,9 @@ unix:!macx {
desktop.path = $$PREFIX/share/applications/
desktop.files += res/$${TARGET}.desktop

manpage.path = $$PREFIX/usr/share/man/man1
manpage.files += res/$${TARGET}.1

icon.path = $$PREFIX/share/icons/hicolor/256x256/apps
icon.files += res/$${TARGET}.png

Expand Down
2 changes: 1 addition & 1 deletion core/AlertEvaluator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bool AlertRule::save()

if ( ruleName.isEmpty() )
{
qCDebug(runtime) << "rule name is emptry - do not save";
qCDebug(runtime) << "rule name is empty - do not save";
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion core/CallbookManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void CallbookManager::queryCallsign(const QString &callsign)
}

// create an empty object in cache
// if there is the second query for the same call immediatelly after
// if there is the second query for the same call immediately after
// the first query, then it returns a result of empty object
queryCache.insert(callsign, new CallbookResponseData);

Expand Down
2 changes: 1 addition & 1 deletion core/MembershipQE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void MembershipQE::startPlannedDownload()
if ( updatePlan.size() == 0 )
return;

qCDebug(runtime) << "Remaing downloads" << updatePlan.size() << updatePlan;
qCDebug(runtime) << "Remaining downloads" << updatePlan.size() << updatePlan;

// to prevent network overload, qlog will donwload files one-by-one
QPair<QString, QString> nextDownload = updatePlan.at(0);
Expand Down
2 changes: 1 addition & 1 deletion core/WsjtxUDPReceiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void WsjtxUDPReceiver::forwardDatagram(const QNetworkDatagram &datagram)
}
}

float WsjtxUDPReceiver::modePeriodLenght(const QString &mode)
float WsjtxUDPReceiver::modePeriodLength(const QString &mode)
{
FCT_IDENTIFICATION;

Expand Down
2 changes: 1 addition & 1 deletion core/WsjtxUDPReceiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class WsjtxUDPReceiver : public QObject
Q_OBJECT
public:
explicit WsjtxUDPReceiver(QObject *parent = nullptr);
static float modePeriodLenght(const QString &);
static float modePeriodLength(const QString &);

static quint16 getConfigPort();
static void saveConfigPort(quint16);
Expand Down
8 changes: 4 additions & 4 deletions cwkey/CWKeyer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,15 @@ void CWKeyer::sendTextImpl(const QString &text)
cwKey->sendText(text);
}

void CWKeyer::imediatellyStop()
void CWKeyer::immediatelyStop()
{
FCT_IDENTIFICATION;

QMetaObject::invokeMethod(this, "immediatellyStopImpl",
QMetaObject::invokeMethod(this, "immediatelyStopImpl",
Qt::QueuedConnection);
}

void CWKeyer::immediatellyStopImpl()
void CWKeyer::immediatelyStopImpl()
{
FCT_IDENTIFICATION;

Expand All @@ -348,7 +348,7 @@ void CWKeyer::immediatellyStopImpl()

if ( !cwKey ) return;

cwKey->imediatellyStop();
cwKey->immediatelyStop();
}

void CWKeyer::stopTimerImplt()
Expand Down
4 changes: 2 additions & 2 deletions cwkey/CWKeyer.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ public slots:

void setSpeed(const qint16 wpm);
void sendText(const QString&);
void imediatellyStop();
void immediatelyStop();

private slots:
void openImpl();
void closeImpl();
void setSpeedImpl(const qint16 wpm);
void sendTextImpl(const QString&);
void immediatellyStopImpl();
void immediatelyStopImpl();
void stopTimerImplt();
void keyErrorHandler(const QString&, const QString&);
void cwKeyWPMChangedHandler(qint32);
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWCatKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ bool CWCatKey::setWPM(const qint16 wpm)
return true;
}

bool CWCatKey::imediatellyStop()
bool CWCatKey::immediatelyStop()
{
FCT_IDENTIFICATION;

Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWCatKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CWCatKey : public CWKey

virtual bool sendText(const QString &text) override;
virtual bool setWPM(const qint16 wpm) override;
virtual bool imediatellyStop() override;
virtual bool immediatelyStop() override;

private:
QMutex commandMutex;
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWDaemonKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ bool CWDaemonKey::setWPM(const qint16 wpm)
return (sendData(sentString.toLatin1()) > 0) ? true : false;
}

bool CWDaemonKey::imediatellyStop()
bool CWDaemonKey::immediatelyStop()
{
FCT_IDENTIFICATION;

Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWDaemonKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CWDaemonKey : public CWKey,

virtual bool sendText(const QString &text) override;
virtual bool setWPM(const qint16 wpm) override;
virtual bool imediatellyStop() override;
virtual bool immediatelyStop() override;

protected:
QString lastLogicalError;
Expand Down
4 changes: 2 additions & 2 deletions cwkey/drivers/CWDummyKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ QString CWDummyKey::lastError()
return QString();
}

bool CWDummyKey::imediatellyStop()
bool CWDummyKey::immediatelyStop()
{
FCT_IDENTIFICATION;

if ( isUsed )
{
qInfo() << "imediatelly Stop";
qInfo() << "immediately Stop";
}

return true;
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWDummyKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class CWDummyKey : public CWKey
virtual bool sendText(const QString &text) override;
virtual bool setWPM(const qint16 wpm) override;
virtual QString lastError() override;
virtual bool imediatellyStop() override;
virtual bool immediatelyStop() override;

private:
bool isUsed;
Expand Down
6 changes: 3 additions & 3 deletions cwkey/drivers/CWFldigiKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

MODULE_IDENTIFICATION("qlog.cwkey.driver.cwfldigikey");

//reponse timeout in ms
//response timeout in ms
#define RESPONSE_TIMEOUT 10000

CWFldigiKey::CWFldigiKey(const QString &hostname,
Expand Down Expand Up @@ -160,7 +160,7 @@ bool CWFldigiKey::setWPM(const qint16)
return true;
}

bool CWFldigiKey::imediatellyStop()
bool CWFldigiKey::immediatelyStop()
{
FCT_IDENTIFICATION;

Expand Down Expand Up @@ -289,7 +289,7 @@ bool CWFldigiKey::sendXMLRPCCall(const QString & methodName,
timer.start(RESPONSE_TIMEOUT); // timer for logical timeout - in ms
loop.exec();

// Timeout occured
// Timeout occurred
if (!timer.isActive())
{
disconnect(reply , &QNetworkReply::finished, &loop, &QEventLoop::quit);
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWFldigiKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CWFldigiKey : public CWKey

virtual bool sendText(const QString &text) override;
virtual bool setWPM(const qint16 wpm) override;
virtual bool imediatellyStop() override;
virtual bool immediatelyStop() override;


protected:
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CWKey : public QObject
virtual bool sendText(const QString &text) = 0;
virtual bool setWPM(const qint16 wpm) = 0;
virtual QString lastError() = 0;
virtual bool imediatellyStop() = 0;
virtual bool immediatelyStop() = 0;
virtual bool canStopSending() { return stopSendingCap;}
virtual bool canEchoChar() { return echoCharsCap;}
virtual bool mustRigConnected() { return rigMustConnectedCap;}
Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWWinKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ QString CWWinKey::lastError()
return (lastLogicalError.isEmpty()) ? serial.errorString() : lastLogicalError;
}

bool CWWinKey::imediatellyStop()
bool CWWinKey::immediatelyStop()
{
FCT_IDENTIFICATION;

Expand Down
2 changes: 1 addition & 1 deletion cwkey/drivers/CWWinKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CWWinKey : public CWKey,

virtual bool sendText(const QString &text) override;
virtual bool setWPM(const qint16 wpm) override;
virtual bool imediatellyStop() override;
virtual bool immediatelyStop() override;

private:

Expand Down
2 changes: 1 addition & 1 deletion logformat/LogFormat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ void LogFormat::runQSLImport(QSLFrom fromService)
}

default:
qCDebug(runtime) << "Uknown QSL import";
qCDebug(runtime) << "Unknown QSL import";
}
}

Expand Down
11 changes: 11 additions & 0 deletions res/qlog.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.Sh NAME
.Nm qlog
.\
.\"
.\"
.Nd Amateur Radio logging program based on Qt toolkit
.Sh DESCRIPTION
QLog is a multiplatform Amateur Radio logging application. It is based on the Qt framework and uses SQLite as database backend.


QLogs aims to be as simple as possible, but to provide everything the operator expects from the log to be. This log is not currently focused on contests.
1 change: 1 addition & 0 deletions res/qlog.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ Comment=Amateur Radio Logbook
Exec=qlog
Icon=qlog
Categories=Utility;HamRadio;
Keywords=QLog;Ham;Radio;HamRadio;AmateurRadio;Log;
2 changes: 1 addition & 1 deletion rig/Rig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void Rig::__openRig()
emitRigStatusChanged();
});

connect( rigDriver, &GenericRigDrv::errorOccured, this, [this](const QString &a,
connect( rigDriver, &GenericRigDrv::errorOccurred, this, [this](const QString &a,
const QString &b)
{
close();
Expand Down
2 changes: 1 addition & 1 deletion rig/drivers/FlrigRigDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ void FlrigRigDrv::handleError(const QString &category, const QString &errorMsg)
return; // only one error message will be reported

lastErrorText = errorMsg;
emit errorOccured(category, lastErrorText);
emit errorOccurred(category, lastErrorText);
}

void FlrigRigDrv::sendXmlRpcCommand(const QString &method, const QList<QVariant> &params, bool emitError)
Expand Down
2 changes: 1 addition & 1 deletion rig/drivers/GenericRigDrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class GenericRigDrv : public QObject
void keySpeedChanged(unsigned int);

// Error Signal
void errorOccured(QString, QString);
void errorOccurred(QString, QString);

protected:
RigProfile rigProfile;
Expand Down
4 changes: 2 additions & 2 deletions rig/drivers/HamlibRigDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ void HamlibRigDrv::checkErrorCounter()

// emit only one error
auto it = postponedErrors.constBegin();
emit errorOccured(it.key(), it.value());
emit errorOccurred(it.key(), it.value());
postponedErrors.clear();
}

Expand Down Expand Up @@ -1039,7 +1039,7 @@ bool HamlibRigDrv::isRigRespOK(int errorStatus,
{
// hard error, emit error now
qCDebug(runtime) << "Hard Error";
emit errorOccured(errorName, lastErrorText);
emit errorOccurred(errorName, lastErrorText);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions rig/drivers/OmnirigRigDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ void OmnirigRigDrv::rigStatusChange(int rigID)
if ( OmniRig::ST_ONLINE != rig->Status () )
{
qCDebug(runtime) << "New status" << rig->StatusStr();
emit errorOccured(tr("Rig status changed"),
emit errorOccurred(tr("Rig status changed"),
tr("Rig is not connected"));
}
else
Expand All @@ -479,7 +479,7 @@ void OmnirigRigDrv::COMException(int code,
<< destination
<< help;

emit errorOccured(tr("Omnirig Error"),
emit errorOccurred(tr("Omnirig Error"),
QString("%1 at %2: %3 (%4)").arg(QString::number(code),
source,
destination,
Expand Down
4 changes: 2 additions & 2 deletions rig/drivers/Omnirigv2RigDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ void OmnirigV2RigDrv::rigStatusChange(int rigID)
if ( OmniRigV2::ST_ONLINE != rig->Status () )
{
qCDebug(runtime) << "New status" << rig->StatusStr();
emit errorOccured(tr("Rig status changed"),
emit errorOccurred(tr("Rig status changed"),
tr("Rig is not connected"));
}
else
Expand All @@ -431,7 +431,7 @@ void OmnirigV2RigDrv::COMException(int code,
<< destination
<< help;

emit errorOccured(tr("Omnirig Error"),
emit errorOccurred(tr("Omnirig Error"),
QString("%1 at %2: %3 (%4)").arg(QString::number(code),
source,
destination,
Expand Down
4 changes: 2 additions & 2 deletions rig/drivers/TCIRigDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void TCIRigDrv::onSocketError(QAbstractSocket::SocketError socker_error)
error_msg.append(QObject::tr("Internal Error"));
}

emit errorOccured(tr("Error Occured"),
emit errorOccurred(tr("Error Occurred"),
error_msg);
}

Expand Down Expand Up @@ -556,7 +556,7 @@ void TCIRigDrv::rspSTOP(const QStringList &)

ready = false;

emit errorOccured(tr("Rig status changed"),
emit errorOccurred(tr("Rig status changed"),
tr("Rig is not connected"));
}

Expand Down
2 changes: 1 addition & 1 deletion rotator/Rotator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ void Rotator::__openRot()
emit positionChanged(a, b);
});

connect(rotDriver, &GenericRotDrv::errorOccured, this, [this](const QString &a,
connect(rotDriver, &GenericRotDrv::errorOccurred, this, [this](const QString &a,
const QString &b)
{
close();
Expand Down
2 changes: 1 addition & 1 deletion rotator/drivers/GenericRotDrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class GenericRotDrv : public QObject
void positioningChanged(double azimuth, double elevation);

// Error Signal
void errorOccured(QString, QString);
void errorOccurred(QString, QString);

protected:
RotProfile rotProfile;
Expand Down
4 changes: 2 additions & 2 deletions rotator/drivers/HamlibRotDrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void HamlibRotDrv::checkErrorCounter()

// emit only one error
auto it = postponedErrors.constBegin();
emit errorOccured(it.key(), it.value());
emit errorOccurred(it.key(), it.value());
postponedErrors.clear();
}

Expand Down Expand Up @@ -364,7 +364,7 @@ bool HamlibRotDrv::isRotRespOK(int errorStatus, const QString errorName, bool em
{
// hard error, emit error now
qCDebug(runtime) << "Hard Error";
emit errorOccured(errorName, lastErrorText);
emit errorOccurred(errorName, lastErrorText);
}
else
{
Expand Down
Loading