public/gpui
1
0
Fork 0
mirror of https://github.com/august-alt/gpui.git synced 2025-02-01 13:47:04 +03:00
Code Issues Projects Releases Wiki Activity

fix!: remove -n option it is now replaced with policy name from ldap

Browse Source
This commit is contained in:
august-alt 2022-11-11 12:19:13 +04:00
parent 1483cd32f7
commit e7f63b7181
3 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/man/en/gpui.1
View File

@ -15,10 +15,6 @@ Provide the full path of the policy to edit.
.if !'po4a'hide' .BR \-b
Provide the path of admx files to load.
.TP
.if !'po4a'hide' .BR \-n
The parameter to be used in conjunction with ADMC, allows ADMC to pass the name of the GPO which will be used in
a window title.
.TP
.if !'po4a'hide' .BR \-h ", " \-\-help
Show help message and exit program.
.TP

3
setup/man/ru/gpui.1
View File

@ -15,9 +15,6 @@ gpui-main это программа для управления шаблонам
.if !'po4a'hide' .BR \-b
Позволяет указать путь для загрузки admx файлов.
.TP
.if !'po4a'hide' .BR \-n
Параметр для использования совместно с ADMC, позволяет ADMC передать имя GPO для отображения.
.TP
.if !'po4a'hide' .BR \-h ", " \-\-help
Показать справочное сообщение и закончить работу.
.TP

59
src/gui/commandlineparser.cpp
View File

@ -22,44 +22,42 @@
#include <memory>
#include <QUuid>
#include <QCommandLineParser>
#include <QTranslator>
#include <QLibraryInfo>
#include <QTranslator>
#include <QUuid>
namespace gpui
{
class CommandLineParserPrivate
{
public:
QApplication& application;
QApplication &application;
std::unique_ptr<QCommandLineParser> parser;
CommandLineParserPrivate(QApplication &currentApplication)
: application(currentApplication)
, parser(std::make_unique<QCommandLineParser>())
{
}
{}
private:
CommandLineParserPrivate(const CommandLineParserPrivate&) = delete; // copy ctor
CommandLineParserPrivate(CommandLineParserPrivate&&) = delete; // move ctor
CommandLineParserPrivate& operator=(const CommandLineParserPrivate&) = delete; // copy assignment
CommandLineParserPrivate& operator=(CommandLineParserPrivate&&) = delete; // move assignment
CommandLineParserPrivate(const CommandLineParserPrivate &) = delete; // copy ctor
CommandLineParserPrivate(CommandLineParserPrivate &&) = delete; // move ctor
CommandLineParserPrivate &operator=(const CommandLineParserPrivate &) = delete; // copy assignment
CommandLineParserPrivate &operator=(CommandLineParserPrivate &&) = delete; // move assignment
};
CommandLineParser::CommandLineParser(QApplication &application)
: d(new CommandLineParserPrivate(application))
{
}
{}
CommandLineParser::~CommandLineParser()
{
delete d;
}
CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(CommandLineOptions *options, QString *errorMessage)
CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(CommandLineOptions *options,
QString *errorMessage)
{
QLocale locale;
std::unique_ptr<QTranslator> qtTranslator = std::make_unique<QTranslator>();
@ -71,20 +69,20 @@ CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(Co
QCoreApplication::installTranslator(qtTranslator2.get());
const QCommandLineOption pathOption("p", QObject::tr("The full path of policy to edit."), QObject::tr("path"));
const QCommandLineOption bundleOption("b", QObject::tr("The full path of policy bundle to load."), QObject::tr("path"));
const QCommandLineOption nameOption("n", QObject::tr("The name of a policy to display."), QObject::tr("name"));
const QCommandLineOption bundleOption("b",
QObject::tr("The full path of policy bundle to load."),
QObject::tr("path"));
const QCommandLineOption helpOption(QStringList()
#ifdef Q_OS_WIN
<< QStringLiteral("?")
#endif
<< QStringLiteral("h")
<< QStringLiteral("help"), QObject::tr("Displays help on commandline options."));
#ifdef Q_OS_WIN
<< QStringLiteral("?")
#endif
<< QStringLiteral("h") << QStringLiteral("help"),
QObject::tr("Displays help on commandline options."));
d->parser->setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
d->parser->addOption(pathOption);
d->parser->addOption(bundleOption);
d->parser->addOption(helpOption);
d->parser->addOption(nameOption);
const QCommandLineOption versionOption = d->parser->addVersionOption();
@ -107,7 +105,7 @@ CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(Co
if (d->parser->isSet(pathOption))
{
const QString path = d->parser->value(pathOption);
options->path = path;
options->path = path;
if (options->path.isNull() || options->path.isEmpty())
{
@ -118,7 +116,7 @@ CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(Co
if (d->parser->isSet(bundleOption))
{
const QString path = d->parser->value(bundleOption);
const QString path = d->parser->value(bundleOption);
options->policyBundle = path;
if (options->policyBundle.isNull() || options->policyBundle.isEmpty())
@ -128,19 +126,6 @@ CommandLineParser::CommandLineParseResult CommandLineParser::parseCommandLine(Co
}
}
if (d->parser->isSet(nameOption))
{
const QString name = d->parser->value(nameOption);
options->policyName = name;
if (options->policyName.isNull() || options->policyName.isEmpty())
{
*errorMessage = QObject::tr("Bad policy name: ") + name;
return CommandLineError;
}
}
return CommandLineOk;
}
@ -154,4 +139,4 @@ void CommandLineParser::showVersion() const
d->parser->showVersion();
}
}
} // namespace gpui