comparison: src/main.cpp
src/main.cpp
- changeset 249
- 37d3c819cafa
- parent 243
- 959469a7e149
- child 250
- 2837b549e616
equal
deleted
inserted
replaced
| 248:29986dfd1750 | 249:37d3c819cafa |
|---|---|
| 15 #include "settingseditor/settingseditor.h" | 15 #include "settingseditor/settingseditor.h" |
| 16 #include "widgets/colorselectdialog.h" | 16 #include "widgets/colorselectdialog.h" |
| 17 #include "settings.h" | 17 #include "settings.h" |
| 18 #include "ui/circletooloptionswidget.h" | 18 #include "ui/circletooloptionswidget.h" |
| 19 #include "messagelog.h" | 19 #include "messagelog.h" |
| 20 #include "ui/objecteditor.h" | |
| 20 | 21 |
| 21 static const QDir LOCALE_DIR {":/locale"}; | 22 static const QDir LOCALE_DIR {":/locale"}; |
| 22 | 23 |
| 23 class ModelSubWindow : public QMdiSubWindow | 24 class ModelSubWindow : public QMdiSubWindow |
| 24 { | 25 { |
| 288 } | 289 } |
| 289 | 290 |
| 290 void initializeTools(Ui_MainWindow* ui, DocumentManager* documents, QWidget* parent) | 291 void initializeTools(Ui_MainWindow* ui, DocumentManager* documents, QWidget* parent) |
| 291 { | 292 { |
| 292 CircleToolOptionsWidget* circleToolOptions = new CircleToolOptionsWidget{parent}; | 293 CircleToolOptionsWidget* circleToolOptions = new CircleToolOptionsWidget{parent}; |
| 294 ObjectEditor* objectEditor = new ObjectEditor{parent}; | |
| 293 const struct | 295 const struct |
| 294 { | 296 { |
| 295 QString name, tooltip; | 297 QString name, tooltip; |
| 296 QPixmap icon; | 298 QPixmap icon; |
| 297 QWidget* widget; | 299 QWidget* widget; |
| 298 } editingModesInfo[] = { | 300 } editingModesInfo[] = { |
| 299 { | 301 { |
| 300 .name = QObject::tr("Select"), | 302 .name = QObject::tr("Select"), |
| 301 .tooltip = QObject::tr("Select elements from the model."), | 303 .tooltip = QObject::tr("Select elements from the model."), |
| 302 .icon = {":/icons/navigate-outline.png"}, | 304 .icon = {":/icons/navigate-outline.png"}, |
| 303 //.widget = this->objectEditor, | 305 .widget = objectEditor, |
| 304 }, | 306 }, |
| 305 { | 307 { |
| 306 .name = QObject::tr("Draw"), | 308 .name = QObject::tr("Draw"), |
| 307 .tooltip = QObject::tr("Draw new elements into the model."), | 309 .tooltip = QObject::tr("Draw new elements into the model."), |
| 308 .icon = {":/icons/pencil-outline.png"}, | 310 .icon = {":/icons/pencil-outline.png"}, |
