Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
d67884ec
Commit
d67884ec
authored
Aug 10, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed misleading indentation warning
parent
c0455ef7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
11 deletions
+17
-11
widgets/coreWidget/viewMode.cc
widgets/coreWidget/viewMode.cc
+10
-4
widgets/coreWidget/viewerControl.cc
widgets/coreWidget/viewerControl.cc
+2
-2
widgets/viewModeWidget/viewModeWidget.cc
widgets/viewModeWidget/viewModeWidget.cc
+5
-5
No files found.
widgets/coreWidget/viewMode.cc
View file @
d67884ec
...
...
@@ -172,12 +172,14 @@ void CoreWidget::slotAddViewModeToolbars(QString _mode, bool _custom, QStringLis
}
else
{
//insert before custom viewModes
int
i
=
viewModes_
.
size
();
for
(
int
k
=
0
;
k
<
viewModes_
.
size
();
k
++
)
for
(
int
k
=
0
;
k
<
viewModes_
.
size
();
k
++
)
{
if
(
viewModes_
[
k
]
->
custom
==
true
){
i
=
k
;
break
;
}
viewModes_
.
insert
(
i
,
vm
);
}
viewModes_
.
insert
(
i
,
vm
);
}
}
else
{
vm
=
viewModes_
[
id
];
...
...
@@ -271,14 +273,18 @@ void CoreWidget::slotSetViewModeIcon(QString _mode, bool _custom, QString _iconN
if
(
_custom
)
{
viewModes_
.
push_back
(
vm
);
}
else
{
//insert before custom viewModes
int
i
=
viewModes_
.
size
();
for
(
int
k
=
0
;
k
<
viewModes_
.
size
();
k
++
)
for
(
int
k
=
0
;
k
<
viewModes_
.
size
();
k
++
)
{
if
(
viewModes_
[
k
]
->
custom
==
true
){
i
=
k
;
break
;
}
viewModes_
.
insert
(
i
,
vm
);
}
viewModes_
.
insert
(
i
,
vm
);
}
}
else
{
vm
=
viewModes_
[
id
];
...
...
widgets/coreWidget/viewerControl.cc
View file @
d67884ec
...
...
@@ -1124,8 +1124,8 @@ void CoreWidget::slotSetViewingDirection(QAction* _action) {
if
(
_action
->
data
().
toInt
()
!=
PluginFunctions
::
VIEW_FREE
)
PluginFunctions
::
allowRotation
(
false
,
PluginFunctions
::
activeExaminer
()
);
// Update view
examiner_widgets_
[
PluginFunctions
::
activeExaminer
()]
->
updateGL
();
// Update view
examiner_widgets_
[
PluginFunctions
::
activeExaminer
()]
->
updateGL
();
}
void
CoreWidget
::
slotLockRotation
(
bool
_lock
)
{
...
...
widgets/viewModeWidget/viewModeWidget.cc
View file @
d67884ec
...
...
@@ -330,7 +330,7 @@ void viewModeWidget::slotSetAllWidgets(){
}
if
(
!
modes_
.
empty
()
)
{
if
(
!
modes_
.
empty
()
)
{
QStringList
allToolboxes
=
modes_
[
0
]
->
visibleToolboxes
;
QStringList
allToolbars
=
modes_
[
0
]
->
visibleToolbars
;
QStringList
allContextMenus
=
modes_
[
0
]
->
visibleContextMenus
;
...
...
@@ -358,9 +358,9 @@ void viewModeWidget::slotSetAllWidgets(){
availableToolbars
->
addItems
(
availableToolbarList
);
availableContextMenus
->
addItems
(
availableContextMenuList
);
}
else
{
std
::
cerr
<<
"Mode not found!"
<<
std
::
endl
;
}
}
else
{
std
::
cerr
<<
"Mode not found!"
<<
std
::
endl
;
}
}
...
...
@@ -877,7 +877,7 @@ void viewModeWidget::show(QString _lastMode){
if
(
viewModeList
->
item
(
i
)
->
text
()
==
_lastMode
)
viewModeList
->
setCurrentRow
(
i
);
removeButton
->
setEnabled
(
false
);
removeButton
->
setEnabled
(
false
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment