comparison: src/mainwindow.cpp
src/mainwindow.cpp
- changeset 997
- 1b49f34e533d
- parent 988
- ac4a2ae54f76
- child 998
- 5be0ce31ce60
equal
deleted
inserted
replaced
| 995:7986584e7498 | 997:1b49f34e533d |
|---|---|
| 52 #include "toolsets/extprogramtoolset.h" | 52 #include "toolsets/extprogramtoolset.h" |
| 53 #include "toolsets/toolset.h" | 53 #include "toolsets/toolset.h" |
| 54 #include "dialogs/configdialog.h" | 54 #include "dialogs/configdialog.h" |
| 55 #include "guiutilities.h" | 55 #include "guiutilities.h" |
| 56 #include "glCompiler.h" | 56 #include "glCompiler.h" |
| 57 #include "documentmanager.h" | |
| 57 | 58 |
| 58 static bool g_isSelectionLocked = false; | 59 static bool g_isSelectionLocked = false; |
| 59 static QMap<QAction*, QKeySequence> g_defaultShortcuts; | 60 static QMap<QAction*, QKeySequence> g_defaultShortcuts; |
| 60 | 61 |
| 61 ConfigOption (bool ColorizeObjectsList = true) | 62 ConfigOption (bool ColorizeObjectsList = true) |
| 70 m_configOptions (this), | 71 m_configOptions (this), |
| 71 m_guiUtilities (new GuiUtilities (this)), | 72 m_guiUtilities (new GuiUtilities (this)), |
| 72 ui (*new Ui_MainWindow), | 73 ui (*new Ui_MainWindow), |
| 73 m_externalPrograms (nullptr), | 74 m_externalPrograms (nullptr), |
| 74 m_settings (makeSettings (this)), | 75 m_settings (makeSettings (this)), |
| 76 m_documents (new DocumentManager (this)), | |
| 75 m_currentDocument (nullptr) | 77 m_currentDocument (nullptr) |
| 76 { | 78 { |
| 77 g_win = this; | 79 g_win = this; |
| 78 ui.setupUi (this); | 80 ui.setupUi (this); |
| 79 m_updatingTabs = false; | 81 m_updatingTabs = false; |
| 1130 return ui.primitives; | 1132 return ui.primitives; |
| 1131 } | 1133 } |
| 1132 | 1134 |
| 1133 // --------------------------------------------------------------------------------------------------------------------- | 1135 // --------------------------------------------------------------------------------------------------------------------- |
| 1134 // | 1136 // |
| 1135 QKeySequence MainWindow::defaultShortcut (QAction* act) // [static] | 1137 QKeySequence MainWindow::defaultShortcut (QAction* act) |
| 1136 { | 1138 { |
| 1137 return g_defaultShortcuts[act]; | 1139 return g_defaultShortcuts[act]; |
| 1138 } | 1140 } |
| 1139 | 1141 |
| 1140 // --------------------------------------------------------------------------------------------------------------------- | 1142 // --------------------------------------------------------------------------------------------------------------------- |
