Skip to content

Commit f02f1f4

Browse files
committed
Changing launcher script and always using quickflash
1 parent 0ce48c5 commit f02f1f4

File tree

5 files changed

+11
-30
lines changed

5 files changed

+11
-30
lines changed

gui/packaging/config/config.xml.template

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<!-- Installer window icon -->
1313
<InstallerApplicationIcon>{{ iconfilename }}</InstallerApplicationIcon>
1414

15-
<!-- Optional: Add control script for custom UI like launch checkbox -->
16-
<ControlScript>installscript.qs</ControlScript>
17-
</Installer>
15+
<!-- Launch app after install (shows checkbox automatically) -->
16+
<RunProgram>{{ executable }}.exe</RunProgram>
17+
<RunProgramDescription>Launch {{ progname }}</RunProgramDescription>
18+
</Installer>

gui/packaging/installscript.qs.template

Lines changed: 0 additions & 19 deletions
This file was deleted.

gui/packaging/package.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def render(templates, filenames, variables):
3434

3535
def read_templates():
3636
templates = [
37-
os.path.join(ROOT, 'installscript.qs'),
3837
os.path.join(ROOT, 'config', 'config.xml'),
3938
os.path.join(ROOT, 'packages', 'com.vendor.product', 'meta', 'installscript.qs'),
4039
os.path.join(ROOT, 'packages', 'com.vendor.product', 'meta', 'package.xml'),

gui/src/mainwindow.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,15 @@ void MainWindow::build_operations_menu(QVBoxLayout* target_layout) {
286286
this->button_read_rom = new QPushButton("Read ROM");
287287
this->button_read_cartridge = new QPushButton("Read P2000T Cartridge");
288288
this->button_flash_rom = new QPushButton("Write ROM");
289-
this->button_flash_rom_quick = new QPushButton("QuickWrite ROM");
289+
//this->button_flash_rom_quick = new QPushButton("QuickWrite ROM");
290290
this->button_flash_bank = new QPushButton("Write ROM to bank");
291291
this->button_scan_slots = new QPushButton("Scan slots");
292292

293293
layout->addWidget(this->button_identify_chip);
294294
layout->addWidget(this->button_read_rom);
295295
layout->addWidget(this->button_read_cartridge);
296296
layout->addWidget(this->button_flash_rom);
297-
layout->addWidget(this->button_flash_rom_quick);
297+
//layout->addWidget(this->button_flash_rom_quick);
298298
layout->addWidget(this->button_flash_bank);
299299
layout->addWidget(this->button_erase_chip);
300300
layout->addWidget(this->button_scan_slots);
@@ -304,14 +304,14 @@ void MainWindow::build_operations_menu(QVBoxLayout* target_layout) {
304304
this->button_read_cartridge->setEnabled(false);
305305
this->button_read_rom->setEnabled(false);
306306
this->button_flash_rom->setEnabled(false);
307-
this->button_flash_rom_quick->setEnabled(false);
307+
//this->button_flash_rom_quick->setEnabled(false);
308308
this->button_flash_bank->setEnabled(false);
309309
this->button_scan_slots->setEnabled(false);
310310

311311
connect(this->button_read_rom, SIGNAL(released()), this, SLOT(read_rom()));
312312
connect(this->button_read_cartridge, SIGNAL(released()), this, SLOT(read_cartridge()));
313-
connect(this->button_flash_rom, SIGNAL(released()), this, SLOT(flash_rom()));
314-
connect(this->button_flash_rom_quick, SIGNAL(released()), this, SLOT(flash_rom_quick()));
313+
connect(this->button_flash_rom, SIGNAL(released()), this, SLOT(flash_rom_quick()));
314+
//connect(this->button_flash_rom_quick, SIGNAL(released()), this, SLOT(flash_rom_quick()));
315315
connect(this->button_identify_chip, SIGNAL(released()), this, SLOT(read_chip_id()));
316316
connect(this->button_flash_bank, SIGNAL(released()), this, SLOT(flash_bank()));
317317
connect(this->button_erase_chip, SIGNAL(released()), this, SLOT(erase_chip()));
@@ -874,7 +874,7 @@ void MainWindow::read_chip_id() {
874874
// enable buttons
875875
this->button_read_rom->setEnabled(true);
876876
this->button_flash_rom->setEnabled(true);
877-
this->button_flash_rom_quick->setEnabled(true);
877+
//this->button_flash_rom_quick->setEnabled(true);
878878
this->button_flash_bank->setEnabled(true);
879879
this->button_erase_chip->setEnabled(true);
880880
this->button_scan_slots->setEnabled(true);

gui/src/mainwindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class MainWindow : public QMainWindow
9090
QPushButton* button_read_rom;
9191
QPushButton* button_read_cartridge;
9292
QPushButton* button_flash_rom;
93-
QPushButton* button_flash_rom_quick;
93+
//QPushButton* button_flash_rom_quick;
9494
QPushButton* button_flash_bank;
9595
QPushButton* button_scan_slots;
9696
QPushButton* button_reload_file;

0 commit comments

Comments
 (0)