File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed
Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -423,17 +423,14 @@ void MainWindow::enableStartButton()
423423void MainWindow::menu_aboutpcb2gcode ()
424424{
425425 QMessageBox msgBox (this );
426- QProcess pcb2gcodeVersionProcess (this );
427- QByteArray version;
426+ QString version;
428427
429428 msgBox.setWindowTitle (tr (" About pcb2gcode" ));
430429 msgBox.setTextFormat (Qt::RichText);
431430 msgBox.setText ( QString (tr (about_pcb2gcode_str)).arg (tr (" (retrieving version...)" )) );
432431 msgBox.show ();
433432
434- pcb2gcodeVersionProcess.start (PCB2GCODE_EXECUTABLE, QStringList (" --version" ), QProcess::ReadWrite);
435- pcb2gcodeVersionProcess.waitForReadyRead (5000 );
436- version = pcb2gcodeVersionProcess.readAllStandardOutput ();
433+ version = getPcb2gcodeVersion ();
437434
438435 if ( version.isEmpty () )
439436 msgBox.setText ( QString (tr (about_pcb2gcode_str)).arg (tr (" (<font color=\" Red\" >can't run" PCB2GCODE_EXECUTABLE " </font>)" )) );
@@ -443,6 +440,18 @@ void MainWindow::menu_aboutpcb2gcode()
443440 msgBox.exec ();
444441}
445442
443+ QString MainWindow::getPcb2gcodeVersion ()
444+ {
445+ QProcess pcb2gcodeVersionProcess (this );
446+ QByteArray version;
447+
448+ pcb2gcodeVersionProcess.start (PCB2GCODE_EXECUTABLE, QStringList (" --version" ), QProcess::ReadOnly);
449+ pcb2gcodeVersionProcess.waitForReadyRead (2000 );
450+ version = pcb2gcodeVersionProcess.readAllStandardOutput ();
451+
452+ return QString (version);
453+ }
454+
446455void MainWindow::menu_aboutpcb2gcodeGUI ()
447456{
448457 QMessageBox msgBox (this );
Original file line number Diff line number Diff line change @@ -104,6 +104,7 @@ private slots:
104104 void adjustMetricImperial (QDoubleSpinBox *doubleSpinBox, const double cfactor, const QString suffix);
105105 void saveConfFile (const QString filename);
106106 bool loadConfFile (const QString filename);
107+ QString getPcb2gcodeVersion ();
107108};
108109
109110#endif // MAINWINDOW_H
You can’t perform that action at this time.
0 commit comments