Skip to content

Commit

Permalink
Add a success dependent OK button to log dialog.
Browse files Browse the repository at this point in the history
  • Loading branch information
@netterfield
netterfield committed Nov 30, 2014
1 parent 8bc17b3 commit 3eb078e
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 53 deletions.
17 changes: 15 additions & 2 deletions src/libkstapp/logdialog.cpp
View file
Expand Up @@ -21,7 +21,7 @@
namespace Kst {

LogDialog::LogDialog(MainWindow *parent)
: QDialog(parent), _logtime(0), _format(QString()), _logdir(QString()), _parent(parent) {
: QDialog(parent), _logtime(0), _format(QString()), _logdir(QString()), _parent(parent), _closeIfFinished(false) {

setupUi(this);

Expand Down Expand Up @@ -61,6 +61,7 @@ LogDialog::LogDialog(MainWindow *parent)

connect(_close, SIGNAL(clicked()), this, SLOT(close()));
connect(_apply, SIGNAL(clicked()), this, SLOT(apply()));
connect(_ok, SIGNAL(clicked()), this, SLOT(ok()));

_proc = new QProcess(this);
connect(_proc, SIGNAL(readyReadStandardError()), this, SLOT(scriptStdErr()));
Expand Down Expand Up @@ -97,7 +98,7 @@ void LogDialog::enableApply() {
}


void LogDialog::apply() {
void LogDialog::doIt() {
_logdir = _saveLocation->file();
_format = _formats->currentText();
_username = _user->text();
Expand Down Expand Up @@ -131,6 +132,15 @@ void LogDialog::apply() {
_rerunScript->setEnabled(true);
}

void LogDialog::apply() {
_closeIfFinished = false;
doIt();
}

void LogDialog::ok() {
_closeIfFinished = true;
doIt();
}

void LogDialog::runScript() {
QString script = _script->text().simplified().replace("$imagefile",_imagename).
Expand Down Expand Up @@ -158,6 +168,9 @@ void LogDialog::scriptStarted() {
void LogDialog::scriptFinished(int code) {
if (code == 0) {
_scriptRunning->setText(tr("Script: Finished"));
if (_closeIfFinished) {
close();
}
} else {
_scriptRunning->setText(tr("Script: return code %1").arg(code));
}
Expand Down
3 changes: 3 additions & 0 deletions src/libkstapp/logdialog.h
View file
Expand Up @@ -38,6 +38,8 @@ class LogDialog : public QDialog, Ui::LogDialog
void changed();
void enableApply();
void apply();
void ok();
void doIt();
void enableWidthHeight();
void runScript();
void scriptStdErr();
Expand All @@ -58,6 +60,7 @@ class LogDialog : public QDialog, Ui::LogDialog
QString _imagename;
QString _msgfilename;
QString _username;
bool _closeIfFinished;

};

Expand Down
127 changes: 76 additions & 51 deletions src/libkstapp/logdialog.ui
View file
Expand Up @@ -14,57 +14,7 @@
<string>Make a log entry</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QPushButton" name="_rerunScript">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Rerun Script</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="_scriptRunning">
<property name="text">
<string>Script:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>321</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="_apply">
<property name="text">
<string>&amp;Apply</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="_close">
<property name="text">
<string>&amp;Close</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<item row="0" column="0" colspan="6">
<widget class="QTabWidget" name="_tab">
<property name="currentIndex">
<number>0</number>
Expand Down Expand Up @@ -357,6 +307,81 @@
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="_rerunScript">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Rerun Script</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="_scriptRunning">
<property name="text">
<string>Script:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>321</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="_ok">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Ok</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="_apply">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Apply</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QPushButton" name="_close">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
Expand Down

0 comments on commit 3eb078e

Please sign in to comment.