comparison: src/gui.cpp
src/gui.cpp
- changeset 344
- 55fcf67230fd
- parent 328
- b6a814a608c6
- child 348
- 20134b519f90
equal
deleted
inserted
replaced
| 343:75487752f3e6 | 344:55fcf67230fd |
|---|---|
| 188 addMenuAction ("exportTo"); | 188 addMenuAction ("exportTo"); |
| 189 menu->addSeparator (); | 189 menu->addSeparator (); |
| 190 addMenuAction ("settings"); | 190 addMenuAction ("settings"); |
| 191 addMenuAction ("setLDrawPath"); | 191 addMenuAction ("setLDrawPath"); |
| 192 menu->addSeparator (); | 192 menu->addSeparator (); |
| 193 #ifndef RELEASE | |
| 193 addMenuAction ("testpic"); | 194 addMenuAction ("testpic"); |
| 195 #endif | |
| 194 addMenuAction ("reloadPrimitives"); | 196 addMenuAction ("reloadPrimitives"); |
| 195 menu->addSeparator (); | 197 menu->addSeparator (); |
| 196 addMenuAction ("exit"); | 198 addMenuAction ("exit"); |
| 197 | 199 |
| 198 // View menu | 200 // View menu |
| 578 } | 580 } |
| 579 | 581 |
| 580 // ============================================================================= | 582 // ============================================================================= |
| 581 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 583 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 582 // ============================================================================= | 584 // ============================================================================= |
| 583 void ForgeWindow::deleteSelection () { | 585 int ForgeWindow::deleteSelection() |
| 584 if (m_sel.size () == 0) | 586 { |
| 585 return; | 587 if( m_sel.size() == 0 ) |
| 588 return 0; | |
| 586 | 589 |
| 587 vector<LDObject*> selCopy = m_sel; | 590 vector<LDObject*> selCopy = m_sel; |
| 591 int num = 0; | |
| 588 | 592 |
| 589 // Delete the objects that were being selected | 593 // Delete the objects that were being selected |
| 590 for (LDObject* obj : selCopy) { | 594 for( LDObject * obj : selCopy ) |
| 591 g_curfile->forgetObject (obj); | 595 { |
| 596 g_curfile->forgetObject( obj ); | |
| 597 ++num; | |
| 592 delete obj; | 598 delete obj; |
| 593 } | 599 } |
| 594 | 600 |
| 595 refresh (); | 601 refresh(); |
| 602 return num; | |
| 596 } | 603 } |
| 597 | 604 |
| 598 // ============================================================================= | 605 // ============================================================================= |
| 599 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 606 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 600 // ============================================================================= | 607 // ============================================================================= |
