Mon, 31 Aug 2015 23:18:17 +0300
Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1 | /* | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2 | * LDForge: LDraw parts authoring CAD | 
| 968 | 3 | * Copyright (C) 2013 - 2015 Teemu Piippo | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
4 | * | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
5 | * This program is free software: you can redistribute it and/or modify | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
6 | * it under the terms of the GNU General Public License as published by | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
7 | * the Free Software Foundation, either version 3 of the License, or | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
8 | * (at your option) any later version. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
9 | * | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
10 | * This program is distributed in the hope that it will be useful, | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
13 | * GNU General Public License for more details. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
14 | * | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
15 | * You should have received a copy of the GNU General Public License | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
17 | */ | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
18 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
19 | #include <QGridLayout> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
20 | #include <QMessageBox> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
21 | #include <QEvent> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
22 | #include <QContextMenuEvent> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
23 | #include <QMenuBar> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
24 | #include <QStatusBar> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
25 | #include <QSplitter> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
26 | #include <QListWidget> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
27 | #include <QToolButton> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
28 | #include <QComboBox> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
29 | #include <QDialogButtonBox> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
30 | #include <QToolBar> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
31 | #include <QProgressBar> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
32 | #include <QLabel> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
33 | #include <QFileDialog> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
34 | #include <QPushButton> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
35 | #include <QCoreApplication> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
36 | #include <QTimer> | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
37 | #include <QMetaMethod> | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
38 | #include <QSettings> | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
39 | #include "main.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
40 | #include "glRenderer.h" | 
| 
962
 
a4b463a7ee82
Rename MainWindow files
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
959 
diff
changeset
 | 
41 | #include "mainwindow.h" | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
42 | #include "ldDocument.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
43 | #include "miscallenous.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
44 | #include "colors.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
45 | #include "editHistory.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
46 | #include "radioGroup.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
47 | #include "addObjectDialog.h" | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
48 | #include "messageLog.h" | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
49 | #include "configDialog.h" | 
| 
963
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
50 | #include "ui_mainwindow.h" | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
51 | #include "primitives.h" | 
| 
830
 
a741a0b9df49
- updated filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
823 
diff
changeset
 | 
52 | #include "editmodes/abstractEditMode.h" | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
53 | #include "toolsets/extprogramtoolset.h" | 
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
54 | #include "toolsets/toolset.h" | 
| 
974
 
b2fa5f89798a
Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
972 
diff
changeset
 | 
55 | #include "guiutilities.h" | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
56 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
57 | static bool g_isSelectionLocked = false; | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
58 | static QMap<QAction*, QKeySequence> g_defaultShortcuts; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
59 | |
| 
972
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
60 | ConfigOption (bool ColorizeObjectsList = true) | 
| 
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
61 | ConfigOption (QString QuickColorToolbar = "4:25:14:27:2:3:11:1:22:|:0:72:71:15") | 
| 
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
62 | ConfigOption (bool ListImplicitFiles = false) | 
| 
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
63 | ConfigOption (QStringList HiddenToolbars) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
64 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
65 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
66 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
67 | MainWindow::MainWindow (QWidget* parent, Qt::WindowFlags flags) : | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
68 | QMainWindow (parent, flags), | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
69 | m_configOptions (this), | 
| 
974
 
b2fa5f89798a
Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
972 
diff
changeset
 | 
70 | m_guiUtilities (new GuiUtilities (this)), | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
71 | ui (*new Ui_MainWindow), | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
72 | m_externalPrograms (nullptr), | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
73 | m_settings (makeSettings (this)) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
74 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
75 | g_win = this; | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
76 | ui.setupUi (this); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
77 | m_updatingTabs = false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
78 | m_renderer = new GLRenderer (this); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
79 | m_tabs = new QTabBar; | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
80 | m_tabs->setTabsClosable (true); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
81 | ui.verticalLayout->insertWidget (0, m_tabs); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
82 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
83 | // Stuff the renderer into its frame | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
84 | QVBoxLayout* rendererLayout = new QVBoxLayout (ui.rendererFrame); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
85 | rendererLayout->addWidget (R()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
86 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
87 | connect (ui.objectList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_selectionChanged())); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
88 | connect (ui.objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (slot_editObject (QListWidgetItem*))); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
89 | connect (m_tabs, SIGNAL (currentChanged(int)), this, SLOT (changeCurrentFile())); | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
90 | connect (m_tabs, SIGNAL (tabCloseRequested (int)), this, SLOT (closeTab (int))); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
91 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
92 | if (ActivePrimitiveScanner() != null) | 
| 
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
93 | connect (ActivePrimitiveScanner(), SIGNAL (workDone()), this, SLOT (updatePrimitives())); | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
94 | else | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
95 | updatePrimitives(); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
96 | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
97 | m_msglog = new MessageManager; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
98 | m_msglog->setRenderer (R()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
99 | m_renderer->setMessageLog (m_msglog); | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
100 | m_quickColors = LoadQuickColorList(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
101 | slot_selectionChanged(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
102 | setStatusBar (new QStatusBar); | 
| 
815
 
efe34366e56a
- added ability to filter out surfaces/edgelines/condlines from the viewport
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
808 
diff
changeset
 | 
103 | updateActions(); | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
104 | |
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
105 | // Connect all actions and save default sequences | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
106 | applyToActions ([&](QAction* act) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
107 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
108 | connect (act, SIGNAL (triggered()), this, SLOT (slot_action())); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
109 | g_defaultShortcuts[act] = act->shortcut(); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
110 | }); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
111 | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
112 | updateGridToolBar(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
113 | updateEditModeActions(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
114 | updateRecentFilesMenu(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
115 | updateColorToolbar(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
116 | updateTitle(); | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
117 | loadShortcuts(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
118 | setMinimumSize (300, 200); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
119 | connect (qApp, SIGNAL (aboutToQuit()), this, SLOT (slot_lastSecondCleanup())); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
120 | connect (ui.ringToolHiRes, SIGNAL (clicked (bool)), this, SLOT (ringToolHiResClicked (bool))); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
121 | connect (ui.ringToolSegments, SIGNAL (valueChanged (int)), | 
| 
871
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
122 | this, SLOT (circleToolSegmentsChanged())); | 
| 
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
123 | circleToolSegmentsChanged(); // invoke it manually for initial label text | 
| 
896
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
124 | |
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
125 | // Examine the toolsets and make a dictionary of tools | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
126 | m_toolsets = Toolset::createToolsets (this); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
127 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
128 | QStringList ignore; | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
129 | for (int i = 0; i < Toolset::staticMetaObject.methodCount(); ++i) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
130 | { | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
131 | QMetaMethod method = Toolset::staticMetaObject.method (i); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
132 | ignore.append (QString::fromUtf8 (method.name())); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
133 | } | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
134 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
135 | for (Toolset* toolset : m_toolsets) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
136 | { | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
137 | const QMetaObject* meta = toolset->metaObject(); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
138 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
139 | if (qobject_cast<ExtProgramToolset*> (toolset)) | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
140 | m_externalPrograms = static_cast<ExtProgramToolset*> (toolset); | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
141 | |
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
142 | for (int i = 0; i < meta->methodCount(); ++i) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
143 | { | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
144 | ToolInfo info; | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
145 | info.method = meta->method (i); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
146 | info.object = toolset; | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
147 | QString methodName = QString::fromUtf8 (info.method.name()); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
148 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
149 | if (ignore.contains (methodName)) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
150 | continue; // The method was inherited from base classes | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
151 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
152 | QString actionName = "action" + methodName.left (1).toUpper() + methodName.mid (1); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
153 | QAction* action = findChild<QAction*> (actionName); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
154 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
155 | if (action == nullptr) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
156 | print ("No action for %1::%2 (looked for %3)\n", meta->className(), methodName, actionName); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
157 | else | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
158 | m_toolmap[action] = info; | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
159 | } | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
160 | } | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
161 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
162 | for (QVariant const& toolbarname : m_configOptions.hiddenToolbars()) | 
| 
896
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
163 | { | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
164 | QToolBar* toolbar = findChild<QToolBar*> (toolbarname.toString()); | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
165 | |
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
166 | if (toolbar != null) | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
167 | toolbar->hide(); | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
168 | } | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
169 | |
| 
972
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
170 | newFile(); | 
| 
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
171 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
172 | // If this is the first start, get the user to configuration. Especially point | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
173 | // them to the profile tab, it's the most important form to fill in. | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
174 | if (m_configOptions.firstStart()) | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
175 | { | 
| 
972
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
176 | ConfigDialog* dialog = new ConfigDialog (this, ConfigDialog::ProfileTab); | 
| 
 
a34b73114823
Now doesn't crash anymore
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
971 
diff
changeset
 | 
177 | dialog->show(); | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
178 | m_configOptions.setFirstStart (false); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
179 | } | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
180 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
181 | |
| 
857
 
e62983881460
- fixed crash-on-exit (simply by not running full destruction processing during program termination)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
852 
diff
changeset
 | 
182 | MainWindow::~MainWindow() | 
| 
 
e62983881460
- fixed crash-on-exit (simply by not running full destruction processing during program termination)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
852 
diff
changeset
 | 
183 | { | 
| 
 
e62983881460
- fixed crash-on-exit (simply by not running full destruction processing during program termination)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
852 
diff
changeset
 | 
184 | g_win = null; | 
| 
 
e62983881460
- fixed crash-on-exit (simply by not running full destruction processing during program termination)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
852 
diff
changeset
 | 
185 | } | 
| 
 
e62983881460
- fixed crash-on-exit (simply by not running full destruction processing during program termination)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
852 
diff
changeset
 | 
186 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
187 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
188 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
189 | void MainWindow::slot_action() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
190 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
191 | // Get the name of the sender object and use it to compose the slot name, | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
192 | // then invoke this slot to call the action. | 
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
193 | QAction* action = qobject_cast<QAction*> (sender()); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
194 | |
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
195 | if (action) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
196 | { | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
197 | if (m_toolmap.contains (action)) | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
198 | { | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
199 | const ToolInfo& info = m_toolmap[action]; | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
200 | info.method.invoke (info.object, Qt::DirectConnection); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
201 | } | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
202 | else | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
203 | print ("No tool info for %1!\n", action->objectName()); | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
204 | } | 
| 
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
205 | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
206 | endAction(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
207 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
208 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
209 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
210 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
211 | void MainWindow::endAction() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
212 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
213 | // Add a step in the history now. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
214 | CurrentDocument()->addHistoryStep(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
215 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
216 | // Update the list item of the current file - we may need to draw an icon | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
217 | // now that marks it as having unsaved changes. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
218 | updateDocumentListItem (CurrentDocument()); | 
| 
869
 
7184f3bae695
- circle tool is now able to rotate the partial circular primitives spawned
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
866 
diff
changeset
 | 
219 | refresh(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
220 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
221 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
222 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
223 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
224 | void MainWindow::slot_lastSecondCleanup() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
225 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
226 | delete m_renderer; | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
227 | delete &ui; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
228 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
229 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
230 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
231 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
232 | void MainWindow::updateRecentFilesMenu() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
233 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
234 | // First, clear any items in the recent files menu | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
235 | for (QAction* recent : m_recentFiles) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
236 | delete recent; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
237 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
238 | m_recentFiles.clear(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
239 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
240 | QAction* first = null; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
241 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
242 | for (const QVariant& it : m_configOptions.recentFiles()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
243 | { | 
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
244 | QString file = it.toString(); | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
245 | QAction* recent = new QAction (GetIcon ("open-recent"), file, this); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
246 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
247 | connect (recent, SIGNAL (triggered()), this, SLOT (slot_recentFile())); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
248 | ui.menuOpenRecent->insertAction (first, recent); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
249 | m_recentFiles << recent; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
250 | first = recent; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
251 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
252 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
253 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
254 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
255 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
256 | QList<LDQuickColor> LoadQuickColorList() | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
257 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
258 | QList<LDQuickColor> colors; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
259 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
260 | for (QString colorname : g_win->configBag()->quickColorToolbar().split (":")) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
261 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
262 | if (colorname == "|") | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
263 | colors << LDQuickColor::getSeparator(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
264 | else | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
265 | { | 
| 946 | 266 | LDColor color = colorname.toInt(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
267 | |
| 946 | 268 | if (color.isValid()) | 
| 269 | colors << LDQuickColor (color, null); | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
270 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
271 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
272 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
273 | return colors; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
274 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
275 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
276 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
277 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
278 | void MainWindow::updateColorToolbar() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
279 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
280 | m_colorButtons.clear(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
281 | ui.toolBarColors->clear(); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
282 | ui.toolBarColors->addAction (ui.actionUncolor); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
283 | ui.toolBarColors->addSeparator(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
284 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
285 | for (LDQuickColor& entry : m_quickColors) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
286 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
287 | if (entry.isSeparator()) | 
| 
888
 
7ad8fb667084
- improved part downloader: now asks for the path instead of just directing the user to settings. auto-fix download now configurable and opt-in
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
882 
diff
changeset
 | 
288 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
289 | ui.toolBarColors->addSeparator(); | 
| 
888
 
7ad8fb667084
- improved part downloader: now asks for the path instead of just directing the user to settings. auto-fix download now configurable and opt-in
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
882 
diff
changeset
 | 
290 | } | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
291 | else | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
292 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
293 | QToolButton* colorButton = new QToolButton; | 
| 
974
 
b2fa5f89798a
Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
972 
diff
changeset
 | 
294 | colorButton->setIcon (m_guiUtilities->makeColorIcon (entry.color(), 16)); | 
| 
729
 
dcd7e3e86374
- started work on new icon set
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
663 
diff
changeset
 | 
295 | colorButton->setIconSize (QSize (16, 16)); | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
296 | colorButton->setToolTip (entry.color().name()); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
297 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
298 | connect (colorButton, SIGNAL (clicked()), this, SLOT (slot_quickColor())); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
299 | ui.toolBarColors->addWidget (colorButton); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
300 | m_colorButtons << colorButton; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
301 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
302 | entry.setToolButton (colorButton); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
303 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
304 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
305 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
306 | updateGridToolBar(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
307 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
308 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
309 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
310 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
311 | void MainWindow::updateGridToolBar() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
312 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
313 | // Ensure that the current grid - and only the current grid - is selected. | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
314 | int grid = m_configOptions.grid(); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
315 | ui.actionGridCoarse->setChecked (grid == Grid::Coarse); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
316 | ui.actionGridMedium->setChecked (grid == Grid::Medium); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
317 | ui.actionGridFine->setChecked (grid == Grid::Fine); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
318 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
319 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
320 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
321 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
322 | void MainWindow::updateTitle() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
323 | { | 
| 
948
 
3a91828475fd
Replaced updaterevision with a python script, more renames, clang fixes
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
946 
diff
changeset
 | 
324 | QString title = format (APPNAME " " VERSION_STRING); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
325 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
326 | // Append our current file if we have one | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
327 | if (CurrentDocument()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
328 | { | 
| 
744
 
bbe0e1834065
- removed rest of the uses of <anonymous>
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
739 
diff
changeset
 | 
329 | title += ": "; | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
330 | title += CurrentDocument()->getDisplayName(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
331 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
332 | if (CurrentDocument()->getObjectCount() > 0 and | 
| 
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
333 | CurrentDocument()->getObject (0)->type() == OBJ_Comment) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
334 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
335 | // Append title | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
336 | LDComment* comm = static_cast <LDComment*> (CurrentDocument()->getObject (0)); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
337 | title += format (": %1", comm->text()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
338 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
339 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
340 | if (CurrentDocument()->hasUnsavedChanges()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
341 | title += '*'; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
342 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
343 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
344 | #ifdef DEBUG | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
345 | title += " [debug build]"; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
346 | #elif BUILD_ID != BUILD_RELEASE | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
347 | title += " [pre-release build]"; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
348 | #endif // DEBUG | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
349 | |
| 
948
 
3a91828475fd
Replaced updaterevision with a python script, more renames, clang fixes
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
946 
diff
changeset
 | 
350 | if (strlen (commitTimeString())) | 
| 
 
3a91828475fd
Replaced updaterevision with a python script, more renames, clang fixes
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
946 
diff
changeset
 | 
351 | title += format (" (%1)", QString::fromUtf8 (commitTimeString())); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
352 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
353 | setWindowTitle (title); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
354 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
355 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
356 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
357 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
358 | int MainWindow::deleteSelection() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
359 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
360 | if (Selection().isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
361 | return 0; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
362 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
363 | LDObjectList selCopy = Selection(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
364 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
365 | // Delete the objects that were being selected | 
| 944 | 366 | for (LDObject* obj : selCopy) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
367 | obj->destroy(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
368 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
369 | refresh(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
370 | return selCopy.size(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
371 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
372 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
373 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
374 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
375 | void MainWindow::buildObjList() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
376 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
377 | if (not CurrentDocument()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
378 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
379 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
380 | // Lock the selection while we do this so that refreshing the object list | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
381 | // doesn't trigger selection updating so that the selection doesn't get lost | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
382 | // while this is done. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
383 | g_isSelectionLocked = true; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
384 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
385 | for (int i = 0; i < ui.objectList->count(); ++i) | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
386 | delete ui.objectList->item (i); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
387 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
388 | ui.objectList->clear(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
389 | |
| 944 | 390 | for (LDObject* obj : CurrentDocument()->objects()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
391 | { | 
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
392 | QString descr; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
393 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
394 | switch (obj->type()) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
395 | { | 
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
396 | case OBJ_Comment: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
397 | { | 
| 944 | 398 | descr = static_cast<LDComment*> (obj)->text(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
399 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
400 | // Remove leading whitespace | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
401 | while (descr[0] == ' ') | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
402 | descr.remove (0, 1); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
403 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
404 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
405 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
406 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
407 | case OBJ_Empty: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
408 | break; // leave it empty | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
409 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
410 | case OBJ_Line: | 
| 
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
411 | case OBJ_Triangle: | 
| 
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
412 | case OBJ_Quad: | 
| 
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
413 | case OBJ_CondLine: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
414 | { | 
| 
767
 
44f0d5322628
- slight refactor in ldobject methods
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
762 
diff
changeset
 | 
415 | for (int i = 0; i < obj->numVertices(); ++i) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
416 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
417 | if (i != 0) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
418 | descr += ", "; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
419 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
420 | descr += obj->vertex (i).toString (true); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
421 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
422 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
423 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
424 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
425 | case OBJ_Error: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
426 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
427 | descr = format ("ERROR: %1", obj->asText()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
428 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
429 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
430 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
431 | case OBJ_Subfile: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
432 | { | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
433 | LDSubfile* ref = static_cast<LDSubfile*> (obj); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
434 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
435 | descr = format ("%1 %2, (", ref->fileInfo()->getDisplayName(), ref->position().toString (true)); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
436 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
437 | for (int i = 0; i < 9; ++i) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
438 | descr += format ("%1%2", ref->transform()[i], (i != 8) ? " " : ""); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
439 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
440 | descr += ')'; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
441 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
442 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
443 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
444 | case OBJ_BFC: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
445 | { | 
| 944 | 446 | descr = LDBFC::StatementStrings[int (static_cast<LDBFC*> (obj)->statement())]; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
447 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
448 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
449 | |
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
450 | case OBJ_Overlay: | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
451 | { | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
452 | LDOverlay* ovl = static_cast<LDOverlay*> (obj); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
453 | descr = format ("[%1] %2 (%3, %4), %5 x %6", g_CameraNames[ovl->camera()], | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
454 | Basename (ovl->fileName()), ovl->x(), ovl->y(), | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
455 | ovl->width(), ovl->height()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
456 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
457 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
458 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
459 | default: | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
460 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
461 | descr = obj->typeName(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
462 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
463 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
464 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
465 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
466 | QListWidgetItem* item = new QListWidgetItem (descr); | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
467 | item->setIcon (GetIcon (obj->typeName())); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
468 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
469 | // Use italic font if hidden | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
470 | if (obj->isHidden()) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
471 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
472 | QFont font = item->font(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
473 | font.setItalic (true); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
474 | item->setFont (font); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
475 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
476 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
477 | // Color gibberish orange on red so it stands out. | 
| 
786
 
71d786ce0dcc
- LDObject::Type moved back to global namespace
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
784 
diff
changeset
 | 
478 | if (obj->type() == OBJ_Error) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
479 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
480 | item->setBackground (QColor ("#AA0000")); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
481 | item->setForeground (QColor ("#FFAA00")); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
482 | } | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
483 | else if (m_configOptions.colorizeObjectsList() | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
484 | and obj->isColored() | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
485 | and obj->color().isValid() | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
486 | and obj->color() != MainColor | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
487 | and obj->color() != EdgeColor) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
488 | { | 
| 946 | 489 | // If the object isn't in the main or edge color, draw this list entry in that color. | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
490 | item->setForeground (obj->color().faceColor()); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
491 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
492 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
493 | obj->qObjListEntry = item; | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
494 | ui.objectList->insertItem (ui.objectList->count(), item); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
495 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
496 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
497 | g_isSelectionLocked = false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
498 | updateSelection(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
499 | scrollToSelection(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
500 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
501 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
502 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
503 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
504 | void MainWindow::scrollToSelection() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
505 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
506 | if (Selection().isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
507 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
508 | |
| 944 | 509 | LDObject* obj = Selection().last(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
510 | ui.objectList->scrollToItem (obj->qObjListEntry); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
511 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
512 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
513 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
514 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
515 | void MainWindow::slot_selectionChanged() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
516 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
517 | if (g_isSelectionLocked == true or CurrentDocument() == null) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
518 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
519 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
520 | LDObjectList priorSelection = Selection(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
521 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
522 | // Get the objects from the object list selection | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
523 | CurrentDocument()->clearSelection(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
524 | const QList<QListWidgetItem*> items = ui.objectList->selectedItems(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
525 | |
| 944 | 526 | for (LDObject* obj : CurrentDocument()->objects()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
527 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
528 | for (QListWidgetItem* item : items) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
529 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
530 | if (item == obj->qObjListEntry) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
531 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
532 | obj->select(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
533 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
534 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
535 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
536 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
537 | |
| 
776
 
624131d0163d
- selecting an invertnext'd object now also selects the invertnext
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
774 
diff
changeset
 | 
538 | // The select() method calls may have selected additional items (i.e. invertnexts) | 
| 
 
624131d0163d
- selecting an invertnext'd object now also selects the invertnext
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
774 
diff
changeset
 | 
539 | // Update it all now. | 
| 
 
624131d0163d
- selecting an invertnext'd object now also selects the invertnext
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
774 
diff
changeset
 | 
540 | updateSelection(); | 
| 
 
624131d0163d
- selecting an invertnext'd object now also selects the invertnext
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
774 
diff
changeset
 | 
541 | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
542 | // Update the GL renderer | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
543 | LDObjectList compound = priorSelection + Selection(); | 
| 
966
 
a834e43a57da
Replaced Min/Max/Clamp/Abs with use of Qt versions of them.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
965 
diff
changeset
 | 
544 | removeDuplicates (compound); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
545 | |
| 944 | 546 | for (LDObject* obj : compound) | 
| 
758
 
bb897dfef387
- cut unnecessary code from MainWindow::updateSelection. speeds it up a bit, especially when unselecting but it's not fast enough to my tastes yet
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
757 
diff
changeset
 | 
547 | R()->compileObject (obj); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
548 | |
| 
758
 
bb897dfef387
- cut unnecessary code from MainWindow::updateSelection. speeds it up a bit, especially when unselecting but it's not fast enough to my tastes yet
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
757 
diff
changeset
 | 
549 | R()->update(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
550 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
551 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
552 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
553 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
554 | void MainWindow::slot_recentFile() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
555 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
556 | QAction* qAct = static_cast<QAction*> (sender()); | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
557 | OpenMainModel (qAct->text()); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
558 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
559 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
560 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
561 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
562 | void MainWindow::slot_quickColor() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
563 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
564 | QToolButton* button = static_cast<QToolButton*> (sender()); | 
| 946 | 565 | LDColor color = LDColor::nullColor(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
566 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
567 | for (const LDQuickColor& entry : m_quickColors) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
568 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
569 | if (entry.toolButton() == button) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
570 | { | 
| 946 | 571 | color = entry.color(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
572 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
573 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
574 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
575 | |
| 946 | 576 | if (not color.isValid()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
577 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
578 | |
| 944 | 579 | for (LDObject* obj : Selection()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
580 | { | 
| 
662
 
2f1bd9112408
- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
655 
diff
changeset
 | 
581 | if (not obj->isColored()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
582 | continue; // uncolored object | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
583 | |
| 946 | 584 | obj->setColor (color); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
585 | R()->compileObject (obj); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
586 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
587 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
588 | endAction(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
589 | refresh(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
590 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
591 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
592 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
593 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
594 | int MainWindow::getInsertionPoint() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
595 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
596 | // If we have a selection, put the item after it. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
597 | if (not Selection().isEmpty()) | 
| 
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
598 | return Selection().last()->lineNumber() + 1; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
599 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
600 | // Otherwise place the object at the end. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
601 | return CurrentDocument()->getObjectCount(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
602 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
603 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
604 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
605 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
606 | void MainWindow::doFullRefresh() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
607 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
608 | buildObjList(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
609 | m_renderer->hardRefresh(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
610 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
611 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
612 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
613 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
614 | void MainWindow::refresh() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
615 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
616 | buildObjList(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
617 | m_renderer->update(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
618 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
619 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
620 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
621 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
622 | void MainWindow::updateSelection() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
623 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
624 | g_isSelectionLocked = true; | 
| 
892
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
625 | QItemSelection itemselect; | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
626 | int top = -1; | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
627 | int bottom = -1; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
628 | |
| 944 | 629 | for (LDObject* obj : Selection()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
630 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
631 | if (obj->qObjListEntry == null) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
632 | continue; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
633 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
634 | int row = ui.objectList->row (obj->qObjListEntry); | 
| 
892
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
635 | |
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
636 | if (top == -1) | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
637 | { | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
638 | top = bottom = row; | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
639 | } | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
640 | else | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
641 | { | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
642 | if (row != bottom + 1) | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
643 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
644 | itemselect.select (ui.objectList->model()->index (top, 0), | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
645 | ui.objectList->model()->index (bottom, 0)); | 
| 
892
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
646 | top = -1; | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
647 | } | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
648 | |
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
649 | bottom = row; | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
650 | } | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
651 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
652 | |
| 
892
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
653 | if (top != -1) | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
654 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
655 | itemselect.select (ui.objectList->model()->index (top, 0), | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
656 | ui.objectList->model()->index (bottom, 0)); | 
| 
892
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
657 | } | 
| 
 
49afb6b98253
- rewritten updateSelection() core loop, a new algorithm there makes selection updating a ton lot faster than before
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
888 
diff
changeset
 | 
658 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
659 | ui.objectList->selectionModel()->select (itemselect, QItemSelectionModel::ClearAndSelect); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
660 | g_isSelectionLocked = false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
661 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
662 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
663 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
664 | // | 
| 
795
 
195fa1fff9c3
- changed all color usage to use LDColor classes instead of color indices. Added support for direct colors.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
790 
diff
changeset
 | 
665 | LDColor MainWindow::getSelectedColor() | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
666 | { | 
| 
795
 
195fa1fff9c3
- changed all color usage to use LDColor classes instead of color indices. Added support for direct colors.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
790 
diff
changeset
 | 
667 | LDColor result; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
668 | |
| 944 | 669 | for (LDObject* obj : Selection()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
670 | { | 
| 
662
 
2f1bd9112408
- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
655 
diff
changeset
 | 
671 | if (not obj->isColored()) | 
| 946 | 672 | continue; // This one doesn't use color so it doesn't have a say | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
673 | |
| 946 | 674 | if (result.isValid() and obj->color() != result) | 
| 675 | return LDColor::nullColor(); // No consensus in object color | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
676 | |
| 946 | 677 | if (not result.isValid()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
678 | result = obj->color(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
679 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
680 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
681 | return result; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
682 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
683 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
684 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
685 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
686 | void MainWindow::closeEvent (QCloseEvent* ev) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
687 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
688 | // Check whether it's safe to close all files. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
689 | if (not IsSafeToCloseAll()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
690 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
691 | ev->ignore(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
692 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
693 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
694 | |
| 
896
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
695 | // Save the toolbar set | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
696 | QStringList hiddenToolbars; | 
| 
896
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
697 | |
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
698 | for (QToolBar* toolbar : findChildren<QToolBar*>()) | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
699 | { | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
700 | if (toolbar->isHidden()) | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
701 | hiddenToolbars << toolbar->objectName(); | 
| 
896
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
702 | } | 
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
703 | |
| 
 
4988666b5e3c
- now remembers what toolbars are enabled and what are disabled in config
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
893 
diff
changeset
 | 
704 | // Save the configuration before leaving. | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
705 | m_configOptions.setHiddenToolbars (hiddenToolbars); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
706 | syncSettings(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
707 | ev->accept(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
708 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
709 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
710 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
711 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
712 | void MainWindow::spawnContextMenu (const QPoint pos) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
713 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
714 | const bool single = (Selection().size() == 1); | 
| 944 | 715 | LDObject* singleObj = single ? Selection().first() : nullptr; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
716 | |
| 
788
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
717 | bool hasSubfiles = false; | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
718 | |
| 944 | 719 | for (LDObject* obj : Selection()) | 
| 
788
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
720 | { | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
721 | if (obj->type() == OBJ_Subfile) | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
722 | { | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
723 | hasSubfiles = true; | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
724 | break; | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
725 | } | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
726 | } | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
727 | |
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
728 | QMenu* contextMenu = new QMenu; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
729 | |
| 
840
 
d077dd19bf9a
- changed `&&` and `||` operators to their named variants `and` and `or`
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
834 
diff
changeset
 | 
730 | if (single and singleObj->type() != OBJ_Empty) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
731 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
732 | contextMenu->addAction (ui.actionEdit); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
733 | contextMenu->addSeparator(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
734 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
735 | |
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
736 | contextMenu->addAction (ui.actionCut); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
737 | contextMenu->addAction (ui.actionCopy); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
738 | contextMenu->addAction (ui.actionPaste); | 
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
739 | contextMenu->addAction (ui.actionRemove); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
740 | contextMenu->addSeparator(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
741 | contextMenu->addAction (ui.actionSetColor); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
742 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
743 | if (single) | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
744 | contextMenu->addAction (ui.actionEditRaw); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
745 | |
| 
969
 
b1742ee91d5b
Split actions.cpp and actionsEdit.cpp into toolsets.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
968 
diff
changeset
 | 
746 | contextMenu->addAction (ui.actionMakeBorders); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
747 | contextMenu->addAction (ui.actionSetOverlay); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
748 | contextMenu->addAction (ui.actionClearOverlay); | 
| 
788
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
749 | |
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
750 | if (hasSubfiles) | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
751 | { | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
752 | contextMenu->addSeparator(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
753 | contextMenu->addAction (ui.actionOpenSubfiles); | 
| 
788
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
754 | } | 
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
755 | |
| 
 
c9d1dad83ad0
- added an action for opening the subfiles pointed to by selected references as editable documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
787 
diff
changeset
 | 
756 | contextMenu->addSeparator(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
757 | contextMenu->addAction (ui.actionModeSelect); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
758 | contextMenu->addAction (ui.actionModeDraw); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
759 | contextMenu->addAction (ui.actionModeCircle); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
760 | |
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
761 | if (not Selection().isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
762 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
763 | contextMenu->addSeparator(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
764 | contextMenu->addAction (ui.actionSubfileSelection); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
765 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
766 | |
| 
762
 
d259256e1394
- added a macro for adding operator++ and operator-- to enums, less cast hell this way
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
758 
diff
changeset
 | 
767 | if (R()->camera() != EFreeCamera) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
768 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
769 | contextMenu->addSeparator(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
770 | contextMenu->addAction (ui.actionSetDrawDepth); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
771 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
772 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
773 | contextMenu->exec (pos); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
774 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
775 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
776 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
777 | // | 
| 
795
 
195fa1fff9c3
- changed all color usage to use LDColor classes instead of color indices. Added support for direct colors.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
790 
diff
changeset
 | 
778 | void MainWindow::deleteByColor (LDColor color) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
779 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
780 | LDObjectList objs; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
781 | |
| 944 | 782 | for (LDObject* obj : CurrentDocument()->objects()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
783 | { | 
| 
840
 
d077dd19bf9a
- changed `&&` and `||` operators to their named variants `and` and `or`
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
834 
diff
changeset
 | 
784 | if (not obj->isColored() or obj->color() != color) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
785 | continue; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
786 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
787 | objs << obj; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
788 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
789 | |
| 944 | 790 | for (LDObject* obj : objs) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
791 | obj->destroy(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
792 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
793 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
794 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
795 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
796 | void MainWindow::updateEditModeActions() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
797 | { | 
| 
823
 
1a2f593f0c02
- saving work done on edit mode revamp
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
818 
diff
changeset
 | 
798 | const EditModeType mode = R()->currentEditModeType(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
799 | ui.actionModeSelect->setChecked (mode == EditModeType::Select); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
800 | ui.actionModeDraw->setChecked (mode == EditModeType::Draw); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
801 | ui.actionModeRectangle->setChecked (mode == EditModeType::Rectangle); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
802 | ui.actionModeCircle->setChecked (mode == EditModeType::Circle); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
803 | ui.actionModeMagicWand->setChecked (mode == EditModeType::MagicWand); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
804 | ui.actionModeLinePath->setChecked (mode == EditModeType::LinePath); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
805 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
806 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
807 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
808 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
809 | void MainWindow::slot_editObject (QListWidgetItem* listitem) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
810 | { | 
| 944 | 811 | for (LDObject* it : CurrentDocument()->objects()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
812 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
813 | if (it->qObjListEntry == listitem) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
814 | { | 
| 
768
 
29e6c5552388
- initial overhaul with smart pointers
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
767 
diff
changeset
 | 
815 | AddObjectDialog::staticDialog (it->type(), it); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
816 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
817 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
818 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
819 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
820 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
821 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
822 | // | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
823 | bool MainWindow::save (LDDocument* doc, bool saveAs) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
824 | { | 
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
825 | QString path = doc->fullPath(); | 
| 
834
 
3e697ba996e8
- now prints the filesize upon successful save
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
830 
diff
changeset
 | 
826 | int64 savesize; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
827 | |
| 
840
 
d077dd19bf9a
- changed `&&` and `||` operators to their named variants `and` and `or`
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
834 
diff
changeset
 | 
828 | if (saveAs or path.isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
829 | { | 
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
830 | QString name = doc->defaultName(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
831 | |
| 
662
 
2f1bd9112408
- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
655 
diff
changeset
 | 
832 | if (not doc->fullPath().isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
833 | name = doc->fullPath(); | 
| 967 | 834 | else if (not doc->name().isEmpty()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
835 | name = doc->name(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
836 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
837 | name.replace ("\\", "/"); | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
838 | path = QFileDialog::getSaveFileName (this, tr ("Save As"), | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
839 | name, tr ("LDraw files (*.dat *.ldr)")); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
840 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
841 | if (path.isEmpty()) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
842 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
843 | // User didn't give a file name, abort. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
844 | return false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
845 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
846 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
847 | |
| 
834
 
3e697ba996e8
- now prints the filesize upon successful save
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
830 
diff
changeset
 | 
848 | if (doc->save (path, &savesize)) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
849 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
850 | if (doc == CurrentDocument()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
851 | updateTitle(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
852 | |
| 859 | 853 | print ("Saved to %1 (%2)", path, MakePrettyFileSize (savesize)); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
854 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
855 | // Add it to recent files | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
856 | AddRecentFile (path); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
857 | return true; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
858 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
859 | |
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
860 | QString message = format (tr ("Failed to save to %1: %2"), path, strerror (errno)); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
861 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
862 | // Tell the user the save failed, and give the option for saving as with it. | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
863 | QMessageBox dlg (QMessageBox::Critical, tr ("Save Failure"), message, QMessageBox::Close, this); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
864 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
865 | // Add a save-as button | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
866 | QPushButton* saveAsBtn = new QPushButton (tr ("Save As")); | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
867 | saveAsBtn->setIcon (GetIcon ("file-save-as")); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
868 | dlg.addButton (saveAsBtn, QMessageBox::ActionRole); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
869 | dlg.setDefaultButton (QMessageBox::Close); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
870 | dlg.exec(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
871 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
872 | if (dlg.clickedButton() == saveAsBtn) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
873 | return save (doc, true); // yay recursion! | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
874 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
875 | return false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
876 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
877 | |
| 
789
 
4b7306f52bb5
- String -> QString
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
788 
diff
changeset
 | 
878 | void MainWindow::addMessage (QString msg) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
879 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
880 | m_msglog->addLine (msg); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
881 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
882 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
883 | // ============================================================================ | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
884 | void ObjectList::contextMenuEvent (QContextMenuEvent* ev) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
885 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
886 | g_win->spawnContextMenu (ev->globalPos()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
887 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
888 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
889 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
890 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
891 | QPixmap GetIcon (QString iconName) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
892 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
893 | return (QPixmap (format (":/icons/%1.png", iconName))); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
894 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
895 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
896 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
897 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
898 | bool Confirm (const QString& message) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
899 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
900 | return Confirm (MainWindow::tr ("Confirm"), message); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
901 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
902 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
903 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
904 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
905 | bool Confirm (const QString& title, const QString& message) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
906 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
907 | return QMessageBox::question (g_win, title, message, | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
908 | (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
909 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
910 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
911 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
912 | // | 
| 
882
 
2f3cc8e045d5
- fixed compilation on windows
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
876 
diff
changeset
 | 
913 | void Critical (const QString& message) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
914 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
915 | QMessageBox::critical (g_win, MainWindow::tr ("Error"), message, | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
916 | (QMessageBox::Close), QMessageBox::Close); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
917 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
918 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
919 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
920 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
921 | void MainWindow::updateDocumentList() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
922 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
923 | m_updatingTabs = true; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
924 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
925 | while (m_tabs->count() > 0) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
926 | m_tabs->removeTab (0); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
927 | |
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
928 | for (LDDocument* f : LDDocument::explicitDocuments()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
929 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
930 | // Add an item to the list for this file and store the tab index | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
931 | // in the document so we can find documents by tab index. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
932 | f->setTabIndex (m_tabs->addTab ("")); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
933 | updateDocumentListItem (f); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
934 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
935 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
936 | m_updatingTabs = false; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
937 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
938 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
939 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
940 | // | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
941 | void MainWindow::updateDocumentListItem (LDDocument* doc) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
942 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
943 | bool oldUpdatingTabs = m_updatingTabs; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
944 | m_updatingTabs = true; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
945 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
946 | if (doc->tabIndex() == -1) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
947 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
948 | // We don't have a list item for this file, so the list either doesn't | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
949 | // exist yet or is out of date. Build the list now. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
950 | updateDocumentList(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
951 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
952 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
953 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
954 | // If this is the current file, it also needs to be the selected item on | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
955 | // the list. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
956 | if (doc == CurrentDocument()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
957 | m_tabs->setCurrentIndex (doc->tabIndex()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
958 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
959 | m_tabs->setTabText (doc->tabIndex(), doc->getDisplayName()); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
960 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
961 | // If the document.has unsaved changes, draw a little icon next to it to mark that. | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
962 | m_tabs->setTabIcon (doc->tabIndex(), doc->hasUnsavedChanges() ? GetIcon ("file-save") : QIcon()); | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
963 | m_tabs->setTabData (doc->tabIndex(), doc->name()); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
964 | m_updatingTabs = oldUpdatingTabs; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
965 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
966 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
967 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
968 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
969 | // A file is selected from the list of files on the left of the screen. Find out | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
970 | // which file was picked and change to it. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
971 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
972 | void MainWindow::changeCurrentFile() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
973 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
974 | if (m_updatingTabs) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
975 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
976 | |
| 946 | 977 | LDDocument* file = nullptr; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
978 | int tabIndex = m_tabs->currentIndex(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
979 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
980 | // Find the file pointer of the item that was selected. | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
981 | for (LDDocument* it : LDDocument::explicitDocuments()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
982 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
983 | if (it->tabIndex() == tabIndex) | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
984 | { | 
| 946 | 985 | file = it; | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
986 | break; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
987 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
988 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
989 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
990 | // If we picked the same file we're currently on, we don't need to do | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
991 | // anything. | 
| 946 | 992 | if (file == null or file == CurrentDocument()) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
993 | return; | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
994 | |
| 946 | 995 | LDDocument::setCurrent (file); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
996 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
997 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
998 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
999 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1000 | void MainWindow::refreshObjectList() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1001 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1002 | #if 0 | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1003 | ui.objectList->clear(); | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
1004 | LDDocument* f = getCurrentDocument(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1005 | |
| 944 | 1006 | for (LDObject* obj : *f) | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1007 | ui.objectList->addItem (obj->qObjListEntry); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1008 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1009 | #endif | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1010 | |
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1011 | buildObjList(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1012 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1013 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1014 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1015 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1016 | void MainWindow::updateActions() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1017 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
1018 | if (CurrentDocument() != null and CurrentDocument()->history() != null) | 
| 
815
 
efe34366e56a
- added ability to filter out surfaces/edgelines/condlines from the viewport
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
808 
diff
changeset
 | 
1019 | { | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
1020 | History* his = CurrentDocument()->history(); | 
| 
815
 
efe34366e56a
- added ability to filter out surfaces/edgelines/condlines from the viewport
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
808 
diff
changeset
 | 
1021 | int pos = his->position(); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1022 | ui.actionUndo->setEnabled (pos != -1); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1023 | ui.actionRedo->setEnabled (pos < (long) his->getSize() - 1); | 
| 
815
 
efe34366e56a
- added ability to filter out surfaces/edgelines/condlines from the viewport
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
808 
diff
changeset
 | 
1024 | } | 
| 
 
efe34366e56a
- added ability to filter out surfaces/edgelines/condlines from the viewport
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
808 
diff
changeset
 | 
1025 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1026 | ui.actionWireframe->setChecked (m_configOptions.drawWireframe()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1027 | ui.actionAxes->setChecked (m_configOptions.drawAxes()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1028 | ui.actionBfcView->setChecked (m_configOptions.bfcRedGreenView()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1029 | ui.actionRandomColors->setChecked (m_configOptions.randomColors()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1030 | ui.actionDrawAngles->setChecked (m_configOptions.drawAngles()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1031 | ui.actionDrawSurfaces->setChecked (m_configOptions.drawSurfaces()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1032 | ui.actionDrawEdgeLines->setChecked (m_configOptions.drawEdgeLines()); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1033 | ui.actionDrawConditionalLines->setChecked (m_configOptions.drawConditionalLines()); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1034 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1035 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1036 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1037 | // | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1038 | void MainWindow::updatePrimitives() | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1039 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1040 | PopulatePrimitives (ui.primitives); | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1041 | } | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1042 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1043 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1044 | // | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1045 | void MainWindow::closeTab (int tabindex) | 
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1046 | { | 
| 
945
 
c310073e4f22
More sharedpointer removal
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
944 
diff
changeset
 | 
1047 | LDDocument* doc = FindDocument (m_tabs->tabData (tabindex).toString()); | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1048 | |
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1049 | if (doc == null) | 
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1050 | return; | 
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1051 | |
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1052 | doc->dismiss(); | 
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1053 | } | 
| 
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1054 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1055 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
798
 
88d4973cfe1a
- added close buttons to tabs
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
795 
diff
changeset
 | 
1056 | // | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1057 | void MainWindow::loadShortcuts() | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1058 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1059 | for (QAction* act : findChildren<QAction*>()) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1060 | { | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1061 | QKeySequence seq = m_settings->value ("shortcut_" + act->objectName(), act->shortcut()).value<QKeySequence>(); | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1062 | act->setShortcut (seq); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1063 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1064 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1065 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1066 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1067 | // | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1068 | void MainWindow::saveShortcuts() | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1069 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1070 | applyToActions ([&](QAction* act) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1071 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1072 | QString const key = "shortcut_" + act->objectName(); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1073 | |
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1074 | if (g_defaultShortcuts[act] != act->shortcut()) | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1075 | m_settings->setValue (key, act->shortcut()); | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1076 | else | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1077 | m_settings->remove (key); | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1078 | }); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1079 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1080 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1081 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1082 | // | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1083 | void MainWindow::applyToActions (std::function<void(QAction*)> function) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1084 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1085 | for (QAction* act : findChildren<QAction*>()) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1086 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1087 | if (not act->objectName().isEmpty()) | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1088 | function (act); | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1089 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1090 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1091 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1092 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1093 | // | 
| 
963
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
1094 | QTreeWidget* MainWindow::getPrimitivesTree() const | 
| 
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
1095 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1096 | return ui.primitives; | 
| 
963
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
1097 | } | 
| 
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
1098 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1099 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
963
 
c1526d1877d7
More through removal of the vertex object
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
962 
diff
changeset
 | 
1100 | // | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1101 | QKeySequence MainWindow::defaultShortcut (QAction* act) // [static] | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1102 | { | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1103 | return g_defaultShortcuts[act]; | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1104 | } | 
| 
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1105 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1106 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
806
 
4240f47aa2d4
- moved most of LDColorData API into LDColor
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
798 
diff
changeset
 | 
1107 | // | 
| 
865
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1108 | bool MainWindow::ringToolHiRes() const | 
| 
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1109 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1110 | return ui.ringToolHiRes->isChecked(); | 
| 
865
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1111 | } | 
| 
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1112 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1113 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
865
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1114 | // | 
| 
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1115 | int MainWindow::ringToolSegments() const | 
| 
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1116 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1117 | return ui.ringToolSegments->value(); | 
| 
865
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1118 | } | 
| 
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1119 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1120 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
865
 
6d68840fcb26
- circle mode can now do hi-res
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
861 
diff
changeset
 | 
1121 | // | 
| 
866
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1122 | void MainWindow::ringToolHiResClicked (bool checked) | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1123 | { | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1124 | if (checked) | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1125 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1126 | ui.ringToolSegments->setMaximum (HighResolution); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1127 | ui.ringToolSegments->setValue (ui.ringToolSegments->value() * 3); | 
| 
866
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1128 | } | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1129 | else | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1130 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1131 | ui.ringToolSegments->setValue (ui.ringToolSegments->value() / 3); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1132 | ui.ringToolSegments->setMaximum (LowResolution); | 
| 
866
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1133 | } | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1134 | } | 
| 
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1135 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1136 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
871
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
1137 | // | 
| 
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
1138 | void MainWindow::circleToolSegmentsChanged() | 
| 
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
1139 | { | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1140 | int numerator (ui.ringToolSegments->value()); | 
| 
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1141 | int denominator (ui.ringToolHiRes->isChecked() ? HighResolution : LowResolution); | 
| 
871
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
1142 | Simplify (numerator, denominator); | 
| 
965
 
d1b0aa40db91
MainWindow: "ui->" -> "ui."
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
963 
diff
changeset
 | 
1143 | ui.ringToolSegmentsLabel->setText (format ("%1 / %2", numerator, denominator)); | 
| 
871
 
a860edb4210b
- display a label next to the spinbox showing the fraction
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
869 
diff
changeset
 | 
1144 | } | 
| 
866
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1145 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1146 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1147 | // | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1148 | // Accessor to the settings object | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1149 | // | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1150 | QSettings* MainWindow::makeSettings (QObject* parent) | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1151 | { | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1152 | QString path = qApp->applicationDirPath() + "/" UNIXNAME ".ini"; | 
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1153 | return new QSettings (path, QSettings::IniFormat, parent); | 
| 
970
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1154 | } | 
| 
 
c8aae45afd85
Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
969 
diff
changeset
 | 
1155 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1156 | void MainWindow::syncSettings() | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1157 | { | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1158 | m_settings->sync(); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1159 | } | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1160 | |
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1161 | QVariant MainWindow::getConfigValue (QString name) | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1162 | { | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1163 | QVariant value = m_settings->value (name, m_configOptions.defaultValueByName (name)); | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1164 | return value; | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1165 | } | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1166 | |
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1167 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
866
 
4951b737f8cb
- now able to spawn partial circular primitives
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
865 
diff
changeset
 | 
1168 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
1169 | QImage GetImageFromScreencap (uchar* data, int w, int h) | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1170 | { | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1171 | // GL and Qt formats have R and B swapped. Also, GL flips Y - correct it as well. | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1172 | return QImage (data, w, h, QImage::Format_ARGB32).rgbSwapped().mirrored(); | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1173 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1174 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1175 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1176 | // | 
| 
795
 
195fa1fff9c3
- changed all color usage to use LDColor classes instead of color indices. Added support for direct colors.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
790 
diff
changeset
 | 
1177 | LDQuickColor::LDQuickColor (LDColor color, QToolButton* toolButton) : | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1178 | m_color (color), | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1179 | m_toolButton (toolButton) {} | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1180 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1181 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1182 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1183 | LDQuickColor LDQuickColor::getSeparator() | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1184 | { | 
| 946 | 1185 | return LDQuickColor (LDColor::nullColor(), null); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1186 | } | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1187 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1188 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1189 | // | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1190 | bool LDQuickColor::isSeparator() const | 
| 
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1191 | { | 
| 946 | 1192 | return color() == LDColor::nullColor(); | 
| 
655
 
b376645315ab
- renamed files to camelCase
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1193 | } | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1194 | |
| 
971
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1195 | // --------------------------------------------------------------------------------------------------------------------- | 
| 
 
c00f9665a9f8
Now compiles and links but crashes shortly after startup.
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
970 
diff
changeset
 | 
1196 | // | 
| 
861
 
83426c5fa732
- major identifier renaming
 
Teemu Piippo <crimsondusk64@gmail.com> 
parents: 
859 
diff
changeset
 | 
1197 | void PopulatePrimitives (QTreeWidget* tw, QString const& selectByDefault) | 
| 
790
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1198 | { | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1199 | tw->clear(); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1200 | |
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1201 | for (PrimitiveCategory* cat : g_PrimitiveCategories) | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1202 | { | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1203 | SubfileListItem* parentItem = new SubfileListItem (tw, null); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1204 | parentItem->setText (0, cat->name()); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1205 | QList<QTreeWidgetItem*> subfileItems; | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1206 | |
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1207 | for (Primitive& prim : cat->prims) | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1208 | { | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1209 | SubfileListItem* item = new SubfileListItem (parentItem, &prim); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1210 | item->setText (0, format ("%1 - %2", prim.name, prim.title)); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1211 | subfileItems << item; | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1212 | |
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1213 | // If this primitive is the one the current object points to, | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1214 | // select it by default | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1215 | if (selectByDefault == prim.name) | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1216 | tw->setCurrentItem (item); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1217 | } | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1218 | |
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1219 | tw->addTopLevelItem (parentItem); | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1220 | } | 
| 
 
fe1b83f6ba82
- added primitives toolbox
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
789 
diff
changeset
 | 
1221 | } |