comparison: src/configDialog.cpp
src/configDialog.cpp
- changeset 538
- 2f85d4d286e5
- parent 529
- c294b2070185
- child 539
- 72ad83a67165
equal
deleted
inserted
replaced
| 537:1add0ee96fb3 | 538:2f85d4d286e5 |
|---|---|
| 191 { QGridLayout* gridlayout = new QGridLayout; | 191 { QGridLayout* gridlayout = new QGridLayout; |
| 192 QLabel* xlabel = new QLabel ("X"), | 192 QLabel* xlabel = new QLabel ("X"), |
| 193 *ylabel = new QLabel ("Y"), | 193 *ylabel = new QLabel ("Y"), |
| 194 *zlabel = new QLabel ("Z"), | 194 *zlabel = new QLabel ("Z"), |
| 195 *anglabel = new QLabel ("Angle"); | 195 *anglabel = new QLabel ("Angle"); |
| 196 short i = 1; | 196 int i = 1; |
| 197 | 197 |
| 198 for (QLabel* label : initlist<QLabel*> ({xlabel, ylabel, zlabel, anglabel})) | 198 for (QLabel* label : initlist<QLabel*> ({xlabel, ylabel, zlabel, anglabel})) |
| 199 { label->setAlignment (Qt::AlignCenter); | 199 { label->setAlignment (Qt::AlignCenter); |
| 200 gridlayout->addWidget (label, 0, i++); | 200 gridlayout->addWidget (label, 0, i++); |
| 201 } | 201 } |
| 334 | 334 |
| 335 Config::save(); | 335 Config::save(); |
| 336 reloadAllSubfiles(); | 336 reloadAllSubfiles(); |
| 337 loadLogoedStuds(); | 337 loadLogoedStuds(); |
| 338 g_win->R()->setBackground(); | 338 g_win->R()->setBackground(); |
| 339 g_win->fullRefresh(); | 339 g_win->doFullRefresh(); |
| 340 g_win->updateToolBars(); | 340 g_win->updateToolBars(); |
| 341 g_win->updateFileList(); | 341 g_win->updateFileList(); |
| 342 } | 342 } |
| 343 | 343 |
| 344 // ============================================================================= | 344 // ============================================================================= |
| 417 | 417 |
| 418 if (entry->isSeparator() == true) | 418 if (entry->isSeparator() == true) |
| 419 return; // don't color separators | 419 return; // don't color separators |
| 420 } | 420 } |
| 421 | 421 |
| 422 short defval = entry ? entry->color()->index : -1; | 422 int defval = entry ? entry->color()->index : -1; |
| 423 short val; | 423 int val; |
| 424 | 424 |
| 425 if (ColorSelector::getColor (val, defval, this) == false) | 425 if (ColorSelector::selectColor (val, defval, this) == false) |
| 426 return; | 426 return; |
| 427 | 427 |
| 428 if (entry) | 428 if (entry) |
| 429 entry->setColor (getColor (val)); | 429 entry->setColor (getColor (val)); |
| 430 else | 430 else |
