Skip to content

Commit 026de9f

Browse files
committed
Update input file filters
1 parent c905706 commit 026de9f

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

mainwindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,17 @@ MainWindow::~MainWindow()
193193

194194
void MainWindow::getFrontFile()
195195
{
196-
getFilename(ui->frontLineEdit, tr("front file"), gerber_file_filter);
196+
getFilename(ui->frontLineEdit, tr("front file"), gerber_front_file_filter + gerber_file_filter);
197197
}
198198

199199
void MainWindow::getBackFile()
200200
{
201-
getFilename(ui->backLineEdit, tr("back file"), gerber_file_filter);
201+
getFilename(ui->backLineEdit, tr("back file"), gerber_back_file_filter + gerber_file_filter);
202202
}
203203

204204
void MainWindow::getOutlineFile()
205205
{
206-
getFilename(ui->outlineLineEdit, tr("outline file"), gerber_file_filter);
206+
getFilename(ui->outlineLineEdit, tr("outline file"), gerber_outline_file_filter + gerber_file_filter);
207207
}
208208

209209
void MainWindow::getDrillFile()
@@ -226,7 +226,7 @@ void MainWindow::getPostambleFile()
226226
getFilename(ui->postambleLineEdit, tr("postamble file"), gcode_file_filter);
227227
}
228228

229-
void MainWindow::getFilename(QLineEdit *saveTo, const QString name, const char *filter)
229+
void MainWindow::getFilename(QLineEdit *saveTo, const QString name, QString filter)
230230
{
231231
QString filename;
232232

mainwindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private slots:
9999

100100
void initUi();
101101
QStringList getCmdLineArguments();
102-
void getFilename(QLineEdit *saveTo, const QString name, const char *filter);
102+
void getFilename(QLineEdit *saveTo, const QString name, QString filter);
103103
void adjustMetricImperial(QSpinBox *spinBox, const double cfactor, const QString suffix);
104104
void adjustMetricImperial(QDoubleSpinBox *doubleSpinBox, const double cfactor, const QString suffix);
105105
void saveConfFile(const QString filename);

settings.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,14 @@ static const char *manual_link = "https://github.com/pcb2gcode/pcb2gcode/wiki/Ma
4141

4242
static const char *default_config_filename = "/default_millproject";
4343

44-
static const char *gerber_file_filter = "Gerber files (*.gbr *.gtl *.gtp *.gto *.gbs *.gts *.gbl *.gml);;All types (*.*)";
45-
static const char *excellon_file_filter = "Excellon files (*.drl *.drd);;All types (*.*)";
46-
static const char *gcode_file_filter = "G-Code files (*.nc *.cnc *.ncc *.ecs *.ngc *.fan *.hnc);;All types (*.*)";
47-
static const char *text_file_filter = "Text files (*.*)";
44+
static const QString gerber_front_file_filter("Gerber front files (*.gbr *.gtl *.gml);;");
45+
static const QString gerber_back_file_filter("Gerber back files (*.gbr *.gbl *.gml);;");
46+
static const QString gerber_outline_file_filter("Gerber outline files (*.gbr *.gm1);;");
47+
48+
static const QString gerber_file_filter = "Gerber files (*.gbl *.gbs *.gbo *.gbp *.gko *.gm1 *.gm2 *.g1 *.g2 *.gp1 *.gp2 *.gpb *.gpt *.gtp *.gtl *.gts *.gto *.gbr *.gml);;All types (*.*)";
49+
static const QString excellon_file_filter = "Excellon files (*.drl *.drd *.dri *.txt);;All types (*.*)";
50+
static const QString gcode_file_filter = "G-Code files (*.nc *.cnc *.ncc *.ecs *.ngc *.fan *.hnc);;All types (*.*)";
51+
static const QString text_file_filter = "Text files (*.*)";
4852

4953
#endif // SETTINGS
5054

0 commit comments

Comments
 (0)