comparison: src/toolsets/extprogramtoolset.cpp
src/toolsets/extprogramtoolset.cpp
- changeset 1435
- b8dc3620e5db
- parent 1419
- f7c53002a990
equal
deleted
inserted
replaced
| 1434:4c06435bd87f | 1435:b8dc3620e5db |
|---|---|
| 437 return; | 437 return; |
| 438 | 438 |
| 439 QDialog* dlg = new QDialog; | 439 QDialog* dlg = new QDialog; |
| 440 Ui::IntersectorUI ui; | 440 Ui::IntersectorUI ui; |
| 441 ui.setupUi (dlg); | 441 ui.setupUi (dlg); |
| 442 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_incol); | 442 fillUsedColorsToComboBox(currentDocument(), ui.cmb_incol); |
| 443 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_cutcol); | 443 fillUsedColorsToComboBox(currentDocument(), ui.cmb_cutcol); |
| 444 ui.cb_repeat->setWhatsThis ("If this is set, " APPNAME " runs Intersector a second time with inverse files to cut " | 444 ui.cb_repeat->setWhatsThis ("If this is set, " APPNAME " runs Intersector a second time with inverse files to cut " |
| 445 " the cutter group with the input group. Both groups are cut by the intersection."); | 445 " the cutter group with the input group. Both groups are cut by the intersection."); |
| 446 ui.cb_edges->setWhatsThis ("Makes " APPNAME " try run Isecalc to create edgelines for the intersection."); | 446 ui.cb_edges->setWhatsThis ("Makes " APPNAME " try run Isecalc to create edgelines for the intersection."); |
| 447 | 447 |
| 448 LDColor inCol, cutCol; | 448 LDColor inCol, cutCol; |
| 525 return; | 525 return; |
| 526 | 526 |
| 527 QDialog* dlg = new QDialog; | 527 QDialog* dlg = new QDialog; |
| 528 Ui::CovererUI ui; | 528 Ui::CovererUI ui; |
| 529 ui.setupUi (dlg); | 529 ui.setupUi (dlg); |
| 530 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_col1); | 530 fillUsedColorsToComboBox(currentDocument(), ui.cmb_col1); |
| 531 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_col2); | 531 fillUsedColorsToComboBox(currentDocument(), ui.cmb_col2); |
| 532 | 532 |
| 533 if (not dlg->exec()) | 533 if (not dlg->exec()) |
| 534 return; | 534 return; |
| 535 | 535 |
| 536 LDColor in1Col {ui.cmb_col1->itemData (ui.cmb_col1->currentIndex()).toInt()}; | 536 LDColor in1Col {ui.cmb_col1->itemData (ui.cmb_col1->currentIndex()).toInt()}; |
| 576 | 576 |
| 577 Ui::IsecalcUI ui; | 577 Ui::IsecalcUI ui; |
| 578 QDialog* dlg = new QDialog; | 578 QDialog* dlg = new QDialog; |
| 579 ui.setupUi (dlg); | 579 ui.setupUi (dlg); |
| 580 | 580 |
| 581 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_col1); | 581 fillUsedColorsToComboBox(currentDocument(), ui.cmb_col1); |
| 582 guiUtilities()->fillUsedColorsToComboBox (ui.cmb_col2); | 582 fillUsedColorsToComboBox(currentDocument(), ui.cmb_col2); |
| 583 | 583 |
| 584 LDColor in1Col, in2Col; | 584 LDColor in1Col, in2Col; |
| 585 | 585 |
| 586 if (not dlg->exec()) | 586 if (not dlg->exec()) |
| 587 return; | 587 return; |
