Skip to content

Commit 06512e7

Browse files
patrickfournierpatrickfournier
committed
Cancel Scans button from the scan list section now can cancel the preview scan.
1 parent c07f211 commit 06512e7

File tree

6 files changed

+77
-42
lines changed

6 files changed

+77
-42
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
### Fixed
1919

2020
- Fixed a crash when applying a preset that tried to set a hidden parameter.
21+
- Cancel Scans button from the scan list section now can cancel the preview scan.
2122

2223

2324
## [0.1.0] - 2025-05-24

‎po/fr.po‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gorfector master\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-05-28 12:49-0400\n"
10+
"POT-Creation-Date: 2025-05-29 13:39-0400\n"
1111
"PO-Revision-Date: 2025-05-27 18:03-0400\n"
1212
"Last-Translator: Patrick Fournier <>\n"
1313
"Language-Team: French - Canada\n"
@@ -180,45 +180,45 @@ msgstr "Oui"
180180
msgid "No"
181181
msgstr "Non"
182182

183-
#: ../po/../src/App.cpp:549
183+
#: ../po/../src/App.cpp:562
184184
msgid "Select a directory where to save the image files."
185185
msgstr "Choisissez un répertoire dans lequel les images seront enregistrées."
186186

187-
#: ../po/../src/App.cpp:556
187+
#: ../po/../src/App.cpp:569
188188
msgid "Enter a file name to save the image files."
189189
msgstr "Entrez le nom du fichier pour enregistrer l'image."
190190

191-
#: ../po/../src/App.cpp:584
191+
#: ../po/../src/App.cpp:597
192192
msgid "Directory does not exists: {}."
193193
msgstr "Le répertoire '{}' n'existe pas."
194194

195-
#: ../po/../src/App.cpp:599
195+
#: ../po/../src/App.cpp:612
196196
msgid "File '{}' already exists."
197197
msgstr "Le fichier '{}' existe déjà."
198198

199-
#: ../po/../src/App.cpp:612
199+
#: ../po/../src/App.cpp:625
200200
msgid "Incrementing file name '{}' failed to produce a unique name."
201201
msgstr "Impossible de trouver un nom unique en incrémentant '{}'."
202202

203-
#: ../po/../src/App.cpp:629
203+
#: ../po/../src/App.cpp:642
204204
msgid "File already exists"
205205
msgstr "Le fichier existe déjà"
206206

207-
#: ../po/../src/App.cpp:631
207+
#: ../po/../src/App.cpp:644
208208
#, c-format
209209
msgid "The file \"%s\" already exists. Really overwrite it?"
210210
msgstr "Le fichier \"%s\" existe déjà. Voulez-vous vraiment l'écraser?"
211211

212-
#: ../po/../src/App.cpp:634 ../po/../src/PresetPanel.cpp:89
213-
#: ../po/../src/ScanListPanel.cpp:209 ../po/../src/ScanListPanel.cpp:331
212+
#: ../po/../src/App.cpp:647 ../po/../src/PresetPanel.cpp:89
213+
#: ../po/../src/ScanListPanel.cpp:209 ../po/../src/ScanListPanel.cpp:335
214214
msgid "Cancel"
215215
msgstr "Annuler"
216216

217-
#: ../po/../src/App.cpp:634 ../po/../src/OutputOptionsState.hpp:51
217+
#: ../po/../src/App.cpp:647 ../po/../src/OutputOptionsState.hpp:51
218218
msgid "Overwrite"
219219
msgstr "Écraser"
220220

221-
#: ../po/../src/App.cpp:683
221+
#: ../po/../src/App.cpp:696
222222
msgid ""
223223
"The file name must ends with an extension that specify the image format, "
224224
"like {}"
@@ -377,8 +377,8 @@ msgstr "Supprimer ce préréglage"
377377
msgid "Are you sure you want to delete the preset \"%s\"?"
378378
msgstr "Voulez-vous vraiment supprimer le préréglage \"%s\"?"
379379

380-
#: ../po/../src/PresetPanel.cpp:89 ../po/../src/ScanListPanel.cpp:298
381-
#: ../po/../src/ScanListPanel.cpp:331
380+
#: ../po/../src/PresetPanel.cpp:89 ../po/../src/ScanListPanel.cpp:302
381+
#: ../po/../src/ScanListPanel.cpp:335
382382
msgid "Delete"
383383
msgstr "Supprimer"
384384

@@ -390,11 +390,11 @@ msgstr "Appliquer ce préréglage"
390390
msgid "Inspect this preset"
391391
msgstr "Inspecter ce préréglage"
392392

393-
#: ../po/../src/PresetPanel.cpp:164
393+
#: ../po/../src/PresetPanel.cpp:165
394394
msgid "Update this preset"
395395
msgstr "Modifier ce préréglage"
396396

397-
#: ../po/../src/PresetPanel.cpp:177
397+
#: ../po/../src/PresetPanel.cpp:178
398398
msgid "Delete this preset"
399399
msgstr "Supprimer ce préréglage"
400400

@@ -456,11 +456,11 @@ msgstr "Monter"
456456
msgid "Move Item Down"
457457
msgstr "Descendre"
458458

459-
#: ../po/../src/ScanListPanel.cpp:87 ../po/../src/ScanListPanel.cpp:424
459+
#: ../po/../src/ScanListPanel.cpp:87 ../po/../src/ScanListPanel.cpp:443
460460
msgid "Add Scan Area"
461461
msgstr "Ajouter une zone"
462462

463-
#: ../po/../src/ScanListPanel.cpp:88 ../po/../src/ScanListPanel.cpp:420
463+
#: ../po/../src/ScanListPanel.cpp:88 ../po/../src/ScanListPanel.cpp:439
464464
msgid "Add All Params"
465465
msgstr "Ajouter tous les paramètres"
466466

@@ -488,15 +488,15 @@ msgstr "Voulez-vous vraiment vider la liste de numérisation ?"
488488
msgid "Clear"
489489
msgstr "Vider"
490490

491-
#: ../po/../src/ScanListPanel.cpp:285
491+
#: ../po/../src/ScanListPanel.cpp:289
492492
msgid "Load"
493493
msgstr "Charger les réglages"
494494

495-
#: ../po/../src/ScanListPanel.cpp:328
495+
#: ../po/../src/ScanListPanel.cpp:332
496496
msgid "Delete Scan"
497497
msgstr "Supprimer l'item"
498498

499-
#: ../po/../src/ScanListPanel.cpp:330
499+
#: ../po/../src/ScanListPanel.cpp:334
500500
#, c-format
501501
msgid "Are you sure you want to delete the scan item #%03d ?"
502502
msgstr "Voulez-vous vraiment supprimer l'item #%03d ?"

‎po/gorfector.pot‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-05-28 12:49-0400\n"
11+
"POT-Creation-Date: 2025-05-29 13:39-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,45 +165,45 @@ msgstr ""
165165
msgid "No"
166166
msgstr ""
167167

168-
#: ../po/../src/App.cpp:549
168+
#: ../po/../src/App.cpp:562
169169
msgid "Select a directory where to save the image files."
170170
msgstr ""
171171

172-
#: ../po/../src/App.cpp:556
172+
#: ../po/../src/App.cpp:569
173173
msgid "Enter a file name to save the image files."
174174
msgstr ""
175175

176-
#: ../po/../src/App.cpp:584
176+
#: ../po/../src/App.cpp:597
177177
msgid "Directory does not exists: {}."
178178
msgstr ""
179179

180-
#: ../po/../src/App.cpp:599
180+
#: ../po/../src/App.cpp:612
181181
msgid "File '{}' already exists."
182182
msgstr ""
183183

184-
#: ../po/../src/App.cpp:612
184+
#: ../po/../src/App.cpp:625
185185
msgid "Incrementing file name '{}' failed to produce a unique name."
186186
msgstr ""
187187

188-
#: ../po/../src/App.cpp:629
188+
#: ../po/../src/App.cpp:642
189189
msgid "File already exists"
190190
msgstr ""
191191

192-
#: ../po/../src/App.cpp:631
192+
#: ../po/../src/App.cpp:644
193193
#, c-format
194194
msgid "The file \"%s\" already exists. Really overwrite it?"
195195
msgstr ""
196196

197-
#: ../po/../src/App.cpp:634 ../po/../src/PresetPanel.cpp:89
198-
#: ../po/../src/ScanListPanel.cpp:209 ../po/../src/ScanListPanel.cpp:331
197+
#: ../po/../src/App.cpp:647 ../po/../src/PresetPanel.cpp:89
198+
#: ../po/../src/ScanListPanel.cpp:209 ../po/../src/ScanListPanel.cpp:335
199199
msgid "Cancel"
200200
msgstr ""
201201

202-
#: ../po/../src/App.cpp:634 ../po/../src/OutputOptionsState.hpp:51
202+
#: ../po/../src/App.cpp:647 ../po/../src/OutputOptionsState.hpp:51
203203
msgid "Overwrite"
204204
msgstr ""
205205

206-
#: ../po/../src/App.cpp:683
206+
#: ../po/../src/App.cpp:696
207207
msgid ""
208208
"The file name must ends with an extension that specify the image format, "
209209
"like {}"
@@ -356,8 +356,8 @@ msgstr ""
356356
msgid "Are you sure you want to delete the preset \"%s\"?"
357357
msgstr ""
358358

359-
#: ../po/../src/PresetPanel.cpp:89 ../po/../src/ScanListPanel.cpp:298
360-
#: ../po/../src/ScanListPanel.cpp:331
359+
#: ../po/../src/PresetPanel.cpp:89 ../po/../src/ScanListPanel.cpp:302
360+
#: ../po/../src/ScanListPanel.cpp:335
361361
msgid "Delete"
362362
msgstr ""
363363

@@ -369,11 +369,11 @@ msgstr ""
369369
msgid "Inspect this preset"
370370
msgstr ""
371371

372-
#: ../po/../src/PresetPanel.cpp:164
372+
#: ../po/../src/PresetPanel.cpp:165
373373
msgid "Update this preset"
374374
msgstr ""
375375

376-
#: ../po/../src/PresetPanel.cpp:177
376+
#: ../po/../src/PresetPanel.cpp:178
377377
msgid "Delete this preset"
378378
msgstr ""
379379

@@ -435,11 +435,11 @@ msgstr ""
435435
msgid "Move Item Down"
436436
msgstr ""
437437

438-
#: ../po/../src/ScanListPanel.cpp:87 ../po/../src/ScanListPanel.cpp:424
438+
#: ../po/../src/ScanListPanel.cpp:87 ../po/../src/ScanListPanel.cpp:443
439439
msgid "Add Scan Area"
440440
msgstr ""
441441

442-
#: ../po/../src/ScanListPanel.cpp:88 ../po/../src/ScanListPanel.cpp:420
442+
#: ../po/../src/ScanListPanel.cpp:88 ../po/../src/ScanListPanel.cpp:439
443443
msgid "Add All Params"
444444
msgstr ""
445445

@@ -467,15 +467,15 @@ msgstr ""
467467
msgid "Clear"
468468
msgstr ""
469469

470-
#: ../po/../src/ScanListPanel.cpp:285
470+
#: ../po/../src/ScanListPanel.cpp:289
471471
msgid "Load"
472472
msgstr ""
473473

474-
#: ../po/../src/ScanListPanel.cpp:328
474+
#: ../po/../src/ScanListPanel.cpp:332
475475
msgid "Delete Scan"
476476
msgstr ""
477477

478-
#: ../po/../src/ScanListPanel.cpp:330
478+
#: ../po/../src/ScanListPanel.cpp:334
479479
#, c-format
480480
msgid "Are you sure you want to delete the scan item #%03d ?"
481481
msgstr ""

‎src/App.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,11 @@ Gorfector::OutputOptionsState *Gorfector::App::GetOutputOptions()
517517
}
518518

519519
void Gorfector::App::OnPreviewClicked(GtkWidget *)
520+
{
521+
StartPreview();
522+
}
523+
524+
void Gorfector::App::StartPreview()
520525
{
521526
auto *finishCallback = new std::function<void()>([this]() { this->m_ScanProcess = nullptr; });
522527

@@ -533,6 +538,11 @@ void Gorfector::App::OnPreviewClicked(GtkWidget *)
533538
}
534539

535540
void Gorfector::App::OnCancelClicked(GtkWidget *)
541+
{
542+
CancelScan();
543+
}
544+
545+
void Gorfector::App::CancelScan()
536546
{
537547
if (m_ScanProcess != nullptr)
538548
{
@@ -691,6 +701,11 @@ Gorfector::FileWriter *Gorfector::App::SelectFileWriter(const std::string &path)
691701
}
692702

693703
void Gorfector::App::OnScanClicked(GtkWidget *)
704+
{
705+
StartScan();
706+
}
707+
708+
void Gorfector::App::StartScan()
694709
{
695710
if (m_ScanOptionsPanel == nullptr)
696711
{

‎src/App.hpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,21 @@ namespace Gorfector
156156
return m_DeviceSelectorState;
157157
}
158158

159+
/**
160+
* \brief Starts the preview scan of the current device.
161+
*/
162+
void StartPreview();
163+
164+
/**
165+
* \brief Starts the scanning process for the current device.
166+
*/
167+
void StartScan();
168+
169+
/**
170+
* \brief Cancels the current scan operation (preview or scan).
171+
*/
172+
void CancelScan();
173+
159174
/**
160175
* \brief Updates the application UI from the state components.
161176
* \param lastSeenVersions A vector of last seen version identifiers for the state components.

‎src/ScanListPanel.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ void Gorfector::ScanListPanel::OnCancelClicked(GtkWidget *widget)
249249
{
250250
m_ScanProcess->Cancel();
251251
}
252+
else
253+
{
254+
m_App->CancelScan();
255+
}
252256
}
253257

254258
namespace Gorfector

0 commit comments

Comments
 (0)