2021-10-02 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in rdlogmanager(1) that broke the '--show-styles' and
	'-style <name>' command-line switches.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-10-02 14:44:10 -04:00
parent d758d10b30
commit c4b1e2f2fc
3 changed files with 20 additions and 0 deletions

View File

@ -22491,3 +22491,6 @@
RPM package. RPM package.
2021-10-02 Fred Gleason <fredg@paravelsystems.com> 2021-10-02 Fred Gleason <fredg@paravelsystems.com>
Changed the default QStyle to 'plastique'. Changed the default QStyle to 'plastique'.
2021-10-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that broke the '--show-styles' and
'-style <name>' command-line switches.

View File

@ -103,6 +103,13 @@ RDCmdSwitch::RDCmdSwitch(int argc,char *argv[],const QString &modname,
if(value=="-d") { if(value=="-d") {
switch_debug=true; switch_debug=true;
} }
if((value=="-show-styles")||(value=="--show-styles")) {
QStringList styles=QStyleFactory::keys();
for(int i=0;i<styles.size();i++) {
printf("%s\n",styles.at(i).toUtf8().constData());
}
exit(0);
}
QStringList f0=value.split("=",QString::KeepEmptyParts); QStringList f0=value.split("=",QString::KeepEmptyParts);
if(f0.size()>=2) { if(f0.size()>=2) {
if(f0.at(0).left(1)=="-") { if(f0.at(0).left(1)=="-") {

View File

@ -292,6 +292,16 @@ int main(int argc,char *argv[])
RDCmdSwitch *cmd= RDCmdSwitch *cmd=
new RDCmdSwitch(argc,argv,"rdlogmanager",RDLOGMANAGER_USAGE); new RDCmdSwitch(argc,argv,"rdlogmanager",RDLOGMANAGER_USAGE);
for(unsigned i=0;i<cmd->keys();i++) { for(unsigned i=0;i<cmd->keys();i++) {
if((cmd->key(i)=="-display")||(cmd->key(i)=="-style")) {
// Pass through to QApplication
if(i>=(cmd->keys()-1)) {
fprintf(stderr,"rdlogmanager: missing argument to \"%s\"\n",
cmd->key(i).toUtf8().constData());
exit(RDApplication::ExitInvalidOption);
}
i++;
cmd->setProcessed(i,true);
}
if (cmd->key(i)=="-P") { if (cmd->key(i)=="-P") {
cmd_protect_existing = true; cmd_protect_existing = true;
cmd->setProcessed(i,true); cmd->setProcessed(i,true);