19
19
namespace Core {
20
20
21
21
SettingsProxy::SettingsProxy ()
22
- : m_autoload(Settings::V1 ::loadAutoload())
23
- , m_autosave(Settings::V1 ::loadAutosave())
24
- , m_backgroundColor(Settings::V2 ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::BACKGROUND_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::BACKGROUND_COLOR))
25
- , m_edgeColor(Settings::V2 ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::EDGE_COLOR))
26
- , m_gridColor(Settings::V2 ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::GRID_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::GRID_COLOR))
27
- , m_nodeColor(Settings::V2 ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::NODE_COLOR))
28
- , m_nodeTextColor(Settings::V2 ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_TEXT_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::NODE_TEXT_COLOR))
29
- , m_edgeArrowMode(Settings::V1 ::loadEdgeArrowMode(SceneItems::EdgeModel::ArrowMode::Single))
30
- , m_arrowSize(Settings::V2 ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::ARROW_SIZE_SETTINGS_KEY, Constants::Edge::Defaults::ARROW_SIZE))
31
- , m_edgeWidth(Settings::V2 ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_WIDTH_SETTINGS_KEY, Constants::MindMap::Defaults::EDGE_WIDTH))
32
- , m_invertedControls(Settings::V2 ::getBoolean(Constants::View::EDITING_SETTINGS_GROUP, Constants::View::INVERTED_CONTROLS_SETTINGS_KEY, false ))
33
- , m_reversedEdgeDirection(Settings::V1 ::loadReversedEdgeDirection(false ))
34
- , m_selectNodeGroupByIntersection(Settings::V1 ::loadSelectNodeGroupByIntersection())
35
- , m_textSize(Settings::V2 ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::TEXT_SIZE_SETTINGS_KEY, Constants::MindMap::Defaults::TEXT_SIZE))
36
- , m_font(Settings::V2 ::getFont(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::FONT_SETTINGS_KEY, {}))
22
+ : m_autoload(Settings::Custom ::loadAutoload())
23
+ , m_autosave(Settings::Custom ::loadAutosave())
24
+ , m_backgroundColor(Settings::Generic ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::BACKGROUND_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::BACKGROUND_COLOR))
25
+ , m_edgeColor(Settings::Generic ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::EDGE_COLOR))
26
+ , m_gridColor(Settings::Generic ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::GRID_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::GRID_COLOR))
27
+ , m_nodeColor(Settings::Generic ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::NODE_COLOR))
28
+ , m_nodeTextColor(Settings::Generic ::getColor(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_TEXT_COLOR_SETTINGS_KEY, Constants::MindMap::Defaults::NODE_TEXT_COLOR))
29
+ , m_edgeArrowMode(Settings::Custom ::loadEdgeArrowMode(SceneItems::EdgeModel::ArrowMode::Single))
30
+ , m_arrowSize(Settings::Generic ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::ARROW_SIZE_SETTINGS_KEY, Constants::Edge::Defaults::ARROW_SIZE))
31
+ , m_edgeWidth(Settings::Generic ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_WIDTH_SETTINGS_KEY, Constants::MindMap::Defaults::EDGE_WIDTH))
32
+ , m_invertedControls(Settings::Generic ::getBoolean(Constants::View::EDITING_SETTINGS_GROUP, Constants::View::INVERTED_CONTROLS_SETTINGS_KEY, false ))
33
+ , m_reversedEdgeDirection(Settings::Custom ::loadReversedEdgeDirection(false ))
34
+ , m_selectNodeGroupByIntersection(Settings::Custom ::loadSelectNodeGroupByIntersection())
35
+ , m_textSize(Settings::Generic ::getNumber(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::TEXT_SIZE_SETTINGS_KEY, Constants::MindMap::Defaults::TEXT_SIZE))
36
+ , m_font(Settings::Generic ::getFont(Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::FONT_SETTINGS_KEY, {}))
37
37
, m_shadowEffectParams(
38
- static_cast <int >(Settings::V2 ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_OFFSET_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_OFFSET)),
39
- static_cast <int >(Settings::V2 ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_NORMAL_BLUR_RADIUS_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_BLUR_RADIUS)),
40
- static_cast <int >(Settings::V2 ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_BLUR_RADIUS_SETTINGS_KEY, Constants::Effects::Defaults::SELECTED_ITEM_SHADOW_EFFECT_BLUR_RADIUS)),
41
- Settings::V2 ::getColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SHADOW_COLOR_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_SHADOW_COLOR),
42
- Settings::V2 ::getColor(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR))
43
- , m_optimizeShadowEffects(Settings::V2 ::getBoolean(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::OPTIMIZE_SHADOW_EFFECTS_SETTINGS_KEY, true ))
38
+ static_cast <int >(Settings::Generic ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_OFFSET_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_OFFSET)),
39
+ static_cast <int >(Settings::Generic ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_NORMAL_BLUR_RADIUS_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_BLUR_RADIUS)),
40
+ static_cast <int >(Settings::Generic ::getNumber(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_BLUR_RADIUS_SETTINGS_KEY, Constants::Effects::Defaults::SELECTED_ITEM_SHADOW_EFFECT_BLUR_RADIUS)),
41
+ Settings::Generic ::getColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SHADOW_COLOR_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_SHADOW_COLOR),
42
+ Settings::Generic ::getColor(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR_SETTINGS_KEY, Constants::Effects::Defaults::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR))
43
+ , m_optimizeShadowEffects(Settings::Generic ::getBoolean(Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::OPTIMIZE_SHADOW_EFFECTS_SETTINGS_KEY, true ))
44
44
{
45
45
}
46
46
@@ -53,7 +53,7 @@ void SettingsProxy::setAutoload(bool autoload)
53
53
{
54
54
if (m_autoload != autoload) {
55
55
m_autoload = autoload;
56
- Settings::V1 ::saveAutoload (autoload);
56
+ Settings::Custom ::saveAutoload (autoload);
57
57
}
58
58
}
59
59
@@ -66,7 +66,7 @@ void SettingsProxy::setAutosave(bool autosave)
66
66
{
67
67
if (m_autosave != autosave) {
68
68
m_autosave = autosave;
69
- Settings::V1 ::saveAutosave (autosave);
69
+ Settings::Custom ::saveAutosave (autosave);
70
70
}
71
71
}
72
72
@@ -79,7 +79,7 @@ void SettingsProxy::setBackgroundColor(const QColor & backgroundColor)
79
79
{
80
80
if (m_backgroundColor != backgroundColor) {
81
81
m_backgroundColor = backgroundColor;
82
- Settings::V2 ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::BACKGROUND_COLOR_SETTINGS_KEY, backgroundColor);
82
+ Settings::Generic ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::BACKGROUND_COLOR_SETTINGS_KEY, backgroundColor);
83
83
}
84
84
}
85
85
@@ -92,7 +92,7 @@ void SettingsProxy::setEdgeColor(const QColor & edgeColor)
92
92
{
93
93
if (m_edgeColor != edgeColor) {
94
94
m_edgeColor = edgeColor;
95
- Settings::V2 ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_COLOR_SETTINGS_KEY, edgeColor);
95
+ Settings::Generic ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_COLOR_SETTINGS_KEY, edgeColor);
96
96
}
97
97
}
98
98
@@ -105,7 +105,7 @@ void SettingsProxy::setGridColor(const QColor & gridColor)
105
105
{
106
106
if (m_gridColor != gridColor) {
107
107
m_gridColor = gridColor;
108
- Settings::V2 ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::GRID_COLOR_SETTINGS_KEY, gridColor);
108
+ Settings::Generic ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::GRID_COLOR_SETTINGS_KEY, gridColor);
109
109
}
110
110
}
111
111
@@ -118,7 +118,7 @@ void SettingsProxy::setNodeColor(const QColor & nodeColor)
118
118
{
119
119
if (m_nodeColor != nodeColor) {
120
120
m_nodeColor = nodeColor;
121
- Settings::V2 ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_COLOR_SETTINGS_KEY, nodeColor);
121
+ Settings::Generic ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_COLOR_SETTINGS_KEY, nodeColor);
122
122
}
123
123
}
124
124
@@ -131,7 +131,7 @@ void SettingsProxy::setNodeTextColor(const QColor & nodeTextColor)
131
131
{
132
132
if (m_nodeTextColor != nodeTextColor) {
133
133
m_nodeTextColor = nodeTextColor;
134
- Settings::V2 ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_TEXT_COLOR_SETTINGS_KEY, nodeTextColor);
134
+ Settings::Generic ::setColor (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::NODE_TEXT_COLOR_SETTINGS_KEY, nodeTextColor);
135
135
}
136
136
}
137
137
@@ -144,7 +144,7 @@ void SettingsProxy::setEdgeArrowMode(SceneItems::EdgeModel::ArrowMode mode)
144
144
{
145
145
if (m_edgeArrowMode != mode) {
146
146
m_edgeArrowMode = mode;
147
- Settings::V1 ::saveEdgeArrowMode (mode);
147
+ Settings::Custom ::saveEdgeArrowMode (mode);
148
148
}
149
149
}
150
150
@@ -157,7 +157,7 @@ void SettingsProxy::setArrowSize(double arrowSize)
157
157
{
158
158
if (!qFuzzyCompare (m_arrowSize, arrowSize)) {
159
159
m_arrowSize = arrowSize;
160
- Settings::V2 ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::ARROW_SIZE_SETTINGS_KEY, arrowSize);
160
+ Settings::Generic ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::ARROW_SIZE_SETTINGS_KEY, arrowSize);
161
161
}
162
162
}
163
163
@@ -170,7 +170,7 @@ void SettingsProxy::setEdgeWidth(double edgeWidth)
170
170
{
171
171
if (!qFuzzyCompare (m_edgeWidth, edgeWidth)) {
172
172
m_edgeWidth = edgeWidth;
173
- Settings::V2 ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_WIDTH_SETTINGS_KEY, edgeWidth);
173
+ Settings::Generic ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::EDGE_WIDTH_SETTINGS_KEY, edgeWidth);
174
174
}
175
175
}
176
176
@@ -183,7 +183,7 @@ void SettingsProxy::setInvertedControls(bool invertedControls)
183
183
{
184
184
if (m_invertedControls != invertedControls) {
185
185
m_invertedControls = invertedControls;
186
- Settings::V2 ::setBoolean (Constants::View::EDITING_SETTINGS_GROUP, Constants::View::INVERTED_CONTROLS_SETTINGS_KEY, invertedControls);
186
+ Settings::Generic ::setBoolean (Constants::View::EDITING_SETTINGS_GROUP, Constants::View::INVERTED_CONTROLS_SETTINGS_KEY, invertedControls);
187
187
}
188
188
}
189
189
@@ -196,7 +196,7 @@ void SettingsProxy::setTextSize(int textSize)
196
196
{
197
197
if (m_textSize != textSize) {
198
198
m_textSize = textSize;
199
- Settings::V2 ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::TEXT_SIZE_SETTINGS_KEY, textSize);
199
+ Settings::Generic ::setNumber (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::TEXT_SIZE_SETTINGS_KEY, textSize);
200
200
}
201
201
}
202
202
@@ -209,7 +209,7 @@ void SettingsProxy::setFont(const QFont & font)
209
209
{
210
210
if (m_font != font) {
211
211
m_font = font;
212
- Settings::V2 ::setFont (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::FONT_SETTINGS_KEY, font);
212
+ Settings::Generic ::setFont (Constants::MindMap::Defaults::SETTINGS_GROUP, Constants::MindMap::Defaults::FONT_SETTINGS_KEY, font);
213
213
}
214
214
}
215
215
@@ -222,7 +222,7 @@ void SettingsProxy::setReversedEdgeDirection(bool reversedEdgeDirection)
222
222
{
223
223
if (m_reversedEdgeDirection != reversedEdgeDirection) {
224
224
m_reversedEdgeDirection = reversedEdgeDirection;
225
- Settings::V1 ::saveReversedEdgeDirection (reversedEdgeDirection);
225
+ Settings::Custom ::saveReversedEdgeDirection (reversedEdgeDirection);
226
226
}
227
227
}
228
228
@@ -235,7 +235,7 @@ void SettingsProxy::setSelectNodeGroupByIntersection(bool selectNodeGroupByInter
235
235
{
236
236
if (m_selectNodeGroupByIntersection != selectNodeGroupByIntersection) {
237
237
m_selectNodeGroupByIntersection = selectNodeGroupByIntersection;
238
- Settings::V1 ::saveSelectNodeGroupByIntersection (selectNodeGroupByIntersection);
238
+ Settings::Custom ::saveSelectNodeGroupByIntersection (selectNodeGroupByIntersection);
239
239
}
240
240
}
241
241
@@ -248,11 +248,11 @@ void SettingsProxy::setShadowEffect(const ShadowEffectParams & params)
248
248
{
249
249
if (m_shadowEffectParams != params) {
250
250
m_shadowEffectParams = params;
251
- Settings::V2 ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_OFFSET_SETTINGS_KEY, params.offset );
252
- Settings::V2 ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_NORMAL_BLUR_RADIUS_SETTINGS_KEY, params.blurRadius );
253
- Settings::V2 ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_BLUR_RADIUS_SETTINGS_KEY, params.selectedItemBlurRadius );
254
- Settings::V2 ::setColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SHADOW_COLOR_SETTINGS_KEY, params.shadowColor );
255
- Settings::V2 ::setColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR_SETTINGS_KEY, params.selectedItemShadowColor );
251
+ Settings::Generic ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_OFFSET_SETTINGS_KEY, params.offset );
252
+ Settings::Generic ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_NORMAL_BLUR_RADIUS_SETTINGS_KEY, params.blurRadius );
253
+ Settings::Generic ::setNumber (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_BLUR_RADIUS_SETTINGS_KEY, params.selectedItemBlurRadius );
254
+ Settings::Generic ::setColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SHADOW_COLOR_SETTINGS_KEY, params.shadowColor );
255
+ Settings::Generic ::setColor (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::SHADOW_EFFECT_SELECTED_ITEM_SHADOW_COLOR_SETTINGS_KEY, params.selectedItemShadowColor );
256
256
}
257
257
}
258
258
@@ -265,7 +265,7 @@ void SettingsProxy::setOptimizeShadowEffects(bool optimizeShadowEffects)
265
265
{
266
266
if (m_optimizeShadowEffects != optimizeShadowEffects) {
267
267
m_optimizeShadowEffects = optimizeShadowEffects;
268
- Settings::V2 ::setBoolean (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::OPTIMIZE_SHADOW_EFFECTS_SETTINGS_KEY, optimizeShadowEffects);
268
+ Settings::Generic ::setBoolean (Constants::Effects::EFFECTS_SETTINGS_GROUP, Constants::Effects::OPTIMIZE_SHADOW_EFFECTS_SETTINGS_KEY, optimizeShadowEffects);
269
269
}
270
270
}
271
271
0 commit comments