fix for #773
This commit is contained in:
parent
a555cd3224
commit
89a77315b1
|
@ -26,7 +26,7 @@
|
||||||
<url type="donation">https://github.com/sponsors/martinrotter</url>
|
<url type="donation">https://github.com/sponsors/martinrotter</url>
|
||||||
<content_rating type="oars-1.1" />
|
<content_rating type="oars-1.1" />
|
||||||
<releases>
|
<releases>
|
||||||
<release version="4.2.3" date="2022-08-31"/>
|
<release version="4.2.3" date="2022-09-01"/>
|
||||||
</releases>
|
</releases>
|
||||||
<content_rating type="oars-1.0">
|
<content_rating type="oars-1.0">
|
||||||
<content_attribute id="violence-cartoon">none</content_attribute>
|
<content_attribute id="violence-cartoon">none</content_attribute>
|
||||||
|
|
|
@ -31,7 +31,7 @@ else
|
||||||
pip3 install aqtinstall
|
pip3 install aqtinstall
|
||||||
|
|
||||||
QTPATH="$(pwd)/Qt"
|
QTPATH="$(pwd)/Qt"
|
||||||
QTVERSION="6.3.0"
|
QTVERSION="6.3.1"
|
||||||
QTBIN="$QTPATH/$QTVERSION/macos/bin"
|
QTBIN="$QTPATH/$QTVERSION/macos/bin"
|
||||||
|
|
||||||
echo "Qt bin directory is: $QTBIN"
|
echo "Qt bin directory is: $QTBIN"
|
||||||
|
|
|
@ -941,10 +941,8 @@ void Application::parseCmdArgumentsFromOtherInstance(const QString& message) {
|
||||||
|
|
||||||
cmd_parser.addOption(QCommandLineOption({QSL(CLI_QUIT_INSTANCE)}));
|
cmd_parser.addOption(QCommandLineOption({QSL(CLI_QUIT_INSTANCE)}));
|
||||||
cmd_parser.addOption(QCommandLineOption({QSL(CLI_IS_RUNNING)}));
|
cmd_parser.addOption(QCommandLineOption({QSL(CLI_IS_RUNNING)}));
|
||||||
cmd_parser
|
|
||||||
.addPositionalArgument(QSL("urls"),
|
fillCmdArgumentsParser(cmd_parser);
|
||||||
QSL("List of URL addresses pointing to individual online feeds which should be added."),
|
|
||||||
QSL("[url-1 ... url-n]"));
|
|
||||||
|
|
||||||
if (!cmd_parser.parse(messages)) {
|
if (!cmd_parser.parse(messages)) {
|
||||||
qCriticalNN << LOGSEC_CORE << cmd_parser.errorText();
|
qCriticalNN << LOGSEC_CORE << cmd_parser.errorText();
|
||||||
|
@ -983,43 +981,8 @@ void Application::parseCmdArgumentsFromOtherInstance(const QString& message) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::parseCmdArgumentsFromMyInstance(const QStringList& raw_cli_args) {
|
void Application::parseCmdArgumentsFromMyInstance(const QStringList& raw_cli_args) {
|
||||||
QCommandLineOption help({QSL(CLI_HELP_SHORT), QSL(CLI_HELP_LONG)}, QSL("Displays overview of CLI."));
|
fillCmdArgumentsParser(m_cmdParser);
|
||||||
QCommandLineOption version({QSL(CLI_VER_SHORT), QSL(CLI_VER_LONG)}, QSL("Displays version of the application."));
|
|
||||||
QCommandLineOption
|
|
||||||
log_file({QSL(CLI_LOG_SHORT), QSL(CLI_LOG_LONG)},
|
|
||||||
QSL("Write application debug log to file. Note that logging to file may slow application down."),
|
|
||||||
QSL("log-file"));
|
|
||||||
QCommandLineOption
|
|
||||||
custom_data_folder({QSL(CLI_DAT_SHORT), QSL(CLI_DAT_LONG)},
|
|
||||||
QSL("Use custom folder for user data and disable single instance application mode."),
|
|
||||||
QSL("user-data-folder"));
|
|
||||||
QCommandLineOption disable_singleinstance({QSL(CLI_SIN_SHORT), QSL(CLI_SIN_LONG)},
|
|
||||||
QSL("Allow running of multiple application instances."));
|
|
||||||
|
|
||||||
#if defined(USE_WEBENGINE)
|
|
||||||
QCommandLineOption force_nowebengine({QSL(CLI_FORCE_NOWEBENGINE_SHORT), QSL(CLI_FORCE_NOWEBENGINE_LONG)},
|
|
||||||
QSL("Force usage of simpler text-based embedded web browser."));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QCommandLineOption disable_only_debug({QSL(CLI_NDEBUG_SHORT), QSL(CLI_NDEBUG_LONG)},
|
|
||||||
QSL("Disable just \"debug\" output."));
|
|
||||||
QCommandLineOption disable_debug({QSL(CLI_NSTDOUTERR_SHORT), QSL(CLI_NSTDOUTERR_LONG)},
|
|
||||||
QSL("Completely disable stdout/stderr outputs."));
|
|
||||||
QCommandLineOption forced_style({QSL(CLI_STYLE_SHORT), QSL(CLI_STYLE_LONG)},
|
|
||||||
QSL("Force some application style."),
|
|
||||||
QSL("style-name"));
|
|
||||||
|
|
||||||
m_cmdParser.addOptions({
|
|
||||||
help, version, log_file, custom_data_folder, disable_singleinstance, disable_only_debug, disable_debug,
|
|
||||||
#if defined(USE_WEBENGINE)
|
|
||||||
force_nowebengine,
|
|
||||||
#endif
|
|
||||||
forced_style
|
|
||||||
});
|
|
||||||
m_cmdParser
|
|
||||||
.addPositionalArgument(QSL("urls"),
|
|
||||||
QSL("List of URL addresses pointing to individual online feeds which should be added."),
|
|
||||||
QSL("[url-1 ... url-n]"));
|
|
||||||
m_cmdParser.setApplicationDescription(QSL(APP_NAME));
|
m_cmdParser.setApplicationDescription(QSL(APP_NAME));
|
||||||
m_cmdParser.setSingleDashWordOptionMode(QCommandLineParser::SingleDashWordOptionMode::ParseAsLongOptions);
|
m_cmdParser.setSingleDashWordOptionMode(QCommandLineParser::SingleDashWordOptionMode::ParseAsLongOptions);
|
||||||
|
|
||||||
|
@ -1079,6 +1042,45 @@ void Application::parseCmdArgumentsFromMyInstance(const QStringList& raw_cli_arg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Application::fillCmdArgumentsParser(QCommandLineParser& parser) {
|
||||||
|
QCommandLineOption help({QSL(CLI_HELP_SHORT), QSL(CLI_HELP_LONG)}, QSL("Displays overview of CLI."));
|
||||||
|
QCommandLineOption version({QSL(CLI_VER_SHORT), QSL(CLI_VER_LONG)}, QSL("Displays version of the application."));
|
||||||
|
QCommandLineOption
|
||||||
|
log_file({QSL(CLI_LOG_SHORT), QSL(CLI_LOG_LONG)},
|
||||||
|
QSL("Write application debug log to file. Note that logging to file may slow application down."),
|
||||||
|
QSL("log-file"));
|
||||||
|
QCommandLineOption
|
||||||
|
custom_data_folder({QSL(CLI_DAT_SHORT), QSL(CLI_DAT_LONG)},
|
||||||
|
QSL("Use custom folder for user data and disable single instance application mode."),
|
||||||
|
QSL("user-data-folder"));
|
||||||
|
QCommandLineOption disable_singleinstance({QSL(CLI_SIN_SHORT), QSL(CLI_SIN_LONG)},
|
||||||
|
QSL("Allow running of multiple application instances."));
|
||||||
|
|
||||||
|
#if defined(USE_WEBENGINE)
|
||||||
|
QCommandLineOption force_nowebengine({QSL(CLI_FORCE_NOWEBENGINE_SHORT), QSL(CLI_FORCE_NOWEBENGINE_LONG)},
|
||||||
|
QSL("Force usage of simpler text-based embedded web browser."));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
QCommandLineOption disable_only_debug({QSL(CLI_NDEBUG_SHORT), QSL(CLI_NDEBUG_LONG)},
|
||||||
|
QSL("Disable just \"debug\" output."));
|
||||||
|
QCommandLineOption disable_debug({QSL(CLI_NSTDOUTERR_SHORT), QSL(CLI_NSTDOUTERR_LONG)},
|
||||||
|
QSL("Completely disable stdout/stderr outputs."));
|
||||||
|
QCommandLineOption forced_style({QSL(CLI_STYLE_SHORT), QSL(CLI_STYLE_LONG)},
|
||||||
|
QSL("Force some application style."),
|
||||||
|
QSL("style-name"));
|
||||||
|
|
||||||
|
parser.addOptions({
|
||||||
|
help, version, log_file, custom_data_folder, disable_singleinstance, disable_only_debug, disable_debug,
|
||||||
|
#if defined(USE_WEBENGINE)
|
||||||
|
force_nowebengine,
|
||||||
|
#endif
|
||||||
|
forced_style
|
||||||
|
});
|
||||||
|
parser.addPositionalArgument(QSL("urls"),
|
||||||
|
QSL("List of URL addresses pointing to individual online feeds which should be added."),
|
||||||
|
QSL("[url-1 ... url-n]"));
|
||||||
|
}
|
||||||
|
|
||||||
void Application::onNodeJsPackageUpdateError(const QList<NodeJs::PackageMetadata>& pkgs, const QString& error) {
|
void Application::onNodeJsPackageUpdateError(const QList<NodeJs::PackageMetadata>& pkgs, const QString& error) {
|
||||||
qApp->showGuiMessage(Notification::Event::NodePackageFailedToUpdate,
|
qApp->showGuiMessage(Notification::Event::NodePackageFailedToUpdate,
|
||||||
{{},
|
{{},
|
||||||
|
|
|
@ -187,6 +187,8 @@ class RSSGUARD_DLLSPEC Application : public SingleApplication {
|
||||||
void parseCmdArgumentsFromMyInstance(const QStringList& raw_cli_args);
|
void parseCmdArgumentsFromMyInstance(const QStringList& raw_cli_args);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void fillCmdArgumentsParser(QCommandLineParser& parser);
|
||||||
|
|
||||||
void onNodeJsPackageUpdateError(const QList<NodeJs::PackageMetadata>& pkgs, const QString& error);
|
void onNodeJsPackageUpdateError(const QList<NodeJs::PackageMetadata>& pkgs, const QString& error);
|
||||||
void onNodeJsPackageInstalled(const QList<NodeJs::PackageMetadata>& pkgs, bool already_up_to_date);
|
void onNodeJsPackageInstalled(const QList<NodeJs::PackageMetadata>& pkgs, bool already_up_to_date);
|
||||||
void onCommitData(QSessionManager& manager);
|
void onCommitData(QSessionManager& manager);
|
||||||
|
|
Loading…
Reference in New Issue