opengnsys
/
ogbrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#919: Defining new link types accepted by the Browser: command+confirm, command+output, command+confirm+output.

remotes/github/master
Ramón M. Gómez 2019-06-27 16:22:27 +02:00
parent 87a5fc2fbc
commit 35c9d5b9df
2 changed files with 105 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/mainwindow.cpp
View File

@ -54,6 +54,7 @@ MainWindow::MainWindow(QWidget *parent)
// Output
m_output->setReadOnly(true);
m_output->setFontPointSize(16);
// Button Dock
QDockWidget* dock=new QDockWidget();
@ -167,14 +168,16 @@ void MainWindow::slotLinkHandle(const QUrl &url)
return;
}
QString urlString = url.toString();
if(urlString.startsWith(COMMAND))
QString urlScheme = url.scheme();
// Clear the output widget for a normal user
if(! m_env.contains("ogactiveadmin") || m_env["ogactiveadmin"] != "true")
{
// For COMMAND link, execute
executeCommand(urlString.remove(0,QString(COMMAND).length()));
m_output->clear();
}
else if(urlString.startsWith(COMMAND_WITH_CONFIRMATION))
if(urlScheme == "COMMAND_CONFIRM" || urlScheme == "COMMAND_CONFIRM_OUTPUT" ||
urlScheme == "COMMAND_OUTPUT_CONFIRM" || urlScheme == "COMMAND_WITH_CONFIRMATION")
{
// For COMMAND_WITH_CONFIRMATION link, show confirmation box and execute, if accepted
// For all command with confirmation links, show a popup box
QMessageBox msgBox;
msgBox.setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint);
msgBox.setWindowTitle(tr(gettext("AVISO")));
@ -185,10 +188,37 @@ void MainWindow::slotLinkHandle(const QUrl &url)
msgBox.addButton(tr(gettext("Cancelar")), QMessageBox::RejectRole);
msgBox.setDefaultButton(execButton);
msgBox.exec();
// Continue if user press the execution button
if (msgBox.clickedButton() == execButton)
{
executeCommand(urlString.remove(0,QString(COMMAND_WITH_CONFIRMATION).length()));
// For command with confirmation and output link, show an output window to non-admin user
if((urlScheme == "COMMAND_CONFIRM_OUTPUT" || urlScheme == "COMMAND_OUTPUT_CONFIRM") &&
(! m_env.contains("ogactiveadmin") || m_env["ogactiveadmin"] != "true"))
{
int w=MainWindow::width(), h=MainWindow::height();
m_output->setWindowFlags(Qt::Window);
m_output->move(100, 100);
m_output->setFixedSize(w*0.8-100, h*0.8-100);
m_output->show();
}
// Execute the command
executeCommand(urlString.remove(0, urlScheme.length()+1));
}
}
else if(urlScheme == "COMMAND" || urlScheme == "COMMAND_OUTPUT")
{
// For command with output link, show an output window to non-admin user
if(urlScheme == "COMMAND_OUTPUT" &&
(! m_env.contains("ogactiveadmin") || m_env["ogactiveadmin"] != "true"))
{
int w=MainWindow::width(), h=MainWindow::height();
m_output->setWindowFlags(Qt::Window);
m_output->move(100, 100);
m_output->setFixedSize(w*0.8-100, h*0.8-100);
m_output->show();
}
// Execute the command
executeCommand(urlString.remove(0, urlScheme.length()+1));
}
else
{
@ -263,7 +293,11 @@ void MainWindow::slotProcessOutput()
while((m_process->readLine(buf,BUFFERSIZE) > 0))
{
QString s(buf);
print(tr("Proc. stdout: ")+s);
if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
{
m_output->insertPlainText(tr("Proc. stdout: "));
}
print(s);
captureOutputForStatusBar(s);
}
}
@ -275,7 +309,10 @@ void MainWindow::slotProcessErrorOutput()
while((m_process->readLine(buf,BUFFERSIZE) > 0))
{
QString s(buf);
if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
{
m_output->insertPlainText(tr("Proc. stderr: "));
}
m_output->setTextColor(QColor(Qt::darkBlue));
print(s);
m_output->setTextColor(QColor(Qt::black));
@ -284,17 +321,37 @@ void MainWindow::slotProcessErrorOutput()
void MainWindow::slotProcessFinished(int code, QProcess::ExitStatus status)
{
if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
{
// Admin user: show process status
if(status==QProcess::NormalExit)
{
print(tr(gettext("Fin del proceso. Valor de retorno: "))+QString::number(code));
if(code > 0)
{
m_output->setTextColor(QColor(Qt::darkRed));
}
print("\n"+tr(gettext("Fin del proceso. Valor de retorno: "))+QString::number(code));
}
else
{
print(tr(gettext("El proceso ha fallado inesperadamente. Salida: ")+code));
m_output->setTextColor(QColor(Qt::darkRed));
print("\n"+tr(gettext("El proceso ha fallado inesperadamente. Salida: ")+code));
}
m_output->setTextColor(QColor(Qt::black));
}
else
{
// Non-admin user: show instruction to close the popup window
write(tr(gettext("Fin del proceso. Valor de retorno: "))+QString::number(code));
m_output->setFontUnderline(true);
print("\n\n"+tr(gettext("AVISO: Pulsar el botón superior derecho para cerrar"))+" [X]");
m_output->setFontUnderline(false);
}
// On error, show a message box
if(code>0)
if(code > 0 && ! m_output->isActiveWindow())
{
showErrorMessage(gettext("Código de salida: ")+QString::number(code));
}
finishProgressBar();
}
@ -398,7 +455,8 @@ int MainWindow::readEnvironmentValues()
return ret;
}
void MainWindow::print(QString s)
// Write a string to the log file
void MainWindow::write(QString s)
{
if(! s.endsWith("\n"))
s+="\n";
@ -407,15 +465,24 @@ void MainWindow::print(QString s)
*m_logstream<<CURRENT_TIME()<<": browser: "<<s;
m_logstream->flush();
}
}
// Print and log a string
void MainWindow::print(QString s)
{
if(! s.endsWith("\n"))
s+="\n";
write(s);
if(m_output)
m_output->insertPlainText(s);
}
// Show message in status bar
void MainWindow::captureOutputForStatusBar(QString output)
{
// Capturar para modificar status bar
// Modify the status bar
output=output.trimmed();
// Get percentage (string starts with "[Number]")
QRegExp regexp(REGEXP_STRING);
if(regexp.indexIn(output) != -1)
{
@ -440,13 +507,14 @@ void MainWindow::startProgressBar()
m_web->setEnabled(false);
}
// Reset status bar
void MainWindow::finishProgressBar()
{
m_progressBar->reset();
m_web->setEnabled(true);
}
// Execute a command
void MainWindow::executeCommand(QString &string)
{
QStringList list=string.split(" ",QString::SkipEmptyParts);
@ -455,9 +523,17 @@ void MainWindow::executeCommand(QString &string)
// Assign the same Browser's environment to the process
m_process->setEnvironment(QProcess::systemEnvironment());
m_process->start(program,list);
// Only show the command line to admin user
if(m_env.contains("ogactiveadmin") && m_env["ogactiveadmin"] == "true")
{
m_output->setTextColor(QColor(Qt::darkGreen));
print(tr(gettext("Lanzando el comando: "))+string);
m_output->setTextColor(QColor(Qt::black));
}
else
{
write(tr(gettext("Lanzando el comando: "))+string);
}
startProgressBar();
}

9
src/mainwindow.h
View File

@ -1,8 +1,12 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#define COMMAND "command:"
#define COMMAND_WITH_CONFIRMATION "commandwithconfirmation:"
#define COMMAND "command"
#define COMMAND_CONFIRM "command+confirm"
#define COMMAND_WITH_CONFIRMATION "commandwithconfirmation" // Backwards compatibility
#define COMMAND_OUTPUT "command+output"
#define COMMAND_CONFIRM_OUTPUT "command+confirm+output"
#define COMMAND_OUTPUT_CONFIRM "command+output+confirm"
#define ENVIRONMENT "OGLOGFILE,ogactiveadmin,DEFAULTSPEED"
#include <QWidget>
@ -62,6 +66,7 @@ class MainWindow : public QMainWindow
protected:
int readEnvironmentValues();
void print(QString s);
void write(QString s);
void captureOutputForStatusBar(QString output);
void startProgressBar();
void finishProgressBar();