Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
49b391f1
Commit
49b391f1
authored
Jul 12, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_sliders' into 'master'
Fixed some sliders not reacting to keys See merge request
!126
parents
d2ddeb7e
d4e780da
Pipeline
#2305
passed with stage
in 80 minutes and 21 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
23 deletions
+6
-23
ACG/QtWidgets/QtClippingDialog.cc
ACG/QtWidgets/QtClippingDialog.cc
+1
-1
Plugin-Decimater/decimaterToolbar.ui
Plugin-Decimater/decimaterToolbar.ui
+2
-2
Plugin-SkeletalAnimation/SkeletalAnimationPlugin.cc
Plugin-SkeletalAnimation/SkeletalAnimationPlugin.cc
+0
-1
Plugin-SkeletalAnimation/animationControls.ui
Plugin-SkeletalAnimation/animationControls.ui
+0
-16
Plugin-Slice/SlicePlugin.cc
Plugin-Slice/SlicePlugin.cc
+2
-2
PluginCollection-Renderers/Plugin-Render-Toon/ToonRenderer_qt.cc
...ollection-Renderers/Plugin-Render-Toon/ToonRenderer_qt.cc
+1
-1
No files found.
ACG/QtWidgets/QtClippingDialog.cc
View file @
49b391f1
...
...
@@ -83,7 +83,7 @@ QtClippingDialog( QWidget * _parent,
connect
(
ui_
.
setButton
,
SIGNAL
(
clicked
()
),
this
,
SLOT
(
set_plane
()
)
);
connect
(
ui_
.
sweepRangeSlider
,
SIGNAL
(
sliderMov
ed
(
int
)
),
connect
(
ui_
.
sweepRangeSlider
,
SIGNAL
(
valueChang
ed
(
int
)
),
this
,
SLOT
(
sweep_plane
(
int
)
)
);
update_values
();
...
...
Plugin-Decimater/decimaterToolbar.ui
View file @
49b391f1
...
...
@@ -734,7 +734,7 @@ p, li { white-space: pre-wrap; }
</connection>
<connection>
<sender>
verticesCountSlider
</sender>
<signal>
sliderMov
ed(int)
</signal>
<signal>
valueChang
ed(int)
</signal>
<receiver>
verticesCount
</receiver>
<slot>
setValue(int)
</slot>
<hints>
...
...
@@ -766,7 +766,7 @@ p, li { white-space: pre-wrap; }
</connection>
<connection>
<sender>
trianglesCountSlider
</sender>
<signal>
sliderMov
ed(int)
</signal>
<signal>
valueChang
ed(int)
</signal>
<receiver>
trianglesCount
</receiver>
<slot>
setValue(int)
</slot>
<hints>
...
...
Plugin-SkeletalAnimation/SkeletalAnimationPlugin.cc
View file @
49b391f1
...
...
@@ -108,7 +108,6 @@ void SkeletalAnimationPlugin::initializePlugin()
connect
(
pToolbox_
->
pbClearSkins
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotClearSkins
())
);
connect
(
pToolbox_
->
cbAnimation
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
slotAnimationIndexChanged
(
int
))
);
connect
(
pToolbox_
->
hsFrame
,
SIGNAL
(
sliderMoved
(
int
)),
this
,
SLOT
(
slotFrameChanged
(
int
))
);
connect
(
pToolbox_
->
hsFrame
,
SIGNAL
(
valueChanged
(
int
)),
this
,
SLOT
(
slotFrameChanged
(
int
))
);
connect
(
pToolbox_
->
pbPlay
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
playAnimation
()
)
);
connect
(
pToolbox_
->
pbStop
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
stopAnimation
()
)
);
...
...
Plugin-SkeletalAnimation/animationControls.ui
View file @
49b391f1
...
...
@@ -298,22 +298,6 @@
</widget>
<resources/>
<connections>
<connection>
<sender>
hsFrame
</sender>
<signal>
sliderMoved(int)
</signal>
<receiver>
lbFrameNumber
</receiver>
<slot>
setNum(int)
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
168
</x>
<y>
173
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
268
</x>
<y>
146
</y>
</hint>
</hints>
</connection>
<connection>
<sender>
hsFrame
</sender>
<signal>
valueChanged(int)
</signal>
...
...
Plugin-Slice/SlicePlugin.cc
View file @
49b391f1
...
...
@@ -97,8 +97,8 @@ void SlicePlugin::initializePlugin(){
connect
(
tool_
->
radioX
,
SIGNAL
(
released
()
),
this
,
SLOT
(
updateSlice
()
)
);
connect
(
tool_
->
radioY
,
SIGNAL
(
released
()
),
this
,
SLOT
(
updateSlice
()
)
);
connect
(
tool_
->
radioZ
,
SIGNAL
(
released
()
),
this
,
SLOT
(
updateSlice
()
)
);
connect
(
tool_
->
posSlider
,
SIGNAL
(
sliderMov
ed
(
int
)
),
this
,
SLOT
(
updateSlice
(
int
)
)
);
connect
(
tool_
->
sizeSlider
,
SIGNAL
(
sliderMov
ed
(
int
)
),
this
,
SLOT
(
updateSlice
(
int
)
)
);
connect
(
tool_
->
posSlider
,
SIGNAL
(
valueChang
ed
(
int
)
),
this
,
SLOT
(
updateSlice
(
int
)
)
);
connect
(
tool_
->
sizeSlider
,
SIGNAL
(
valueChang
ed
(
int
)
),
this
,
SLOT
(
updateSlice
(
int
)
)
);
toolIcon_
=
new
QIcon
(
OpenFlipper
::
Options
::
iconDirStr
()
+
OpenFlipper
::
Options
::
dirSeparator
()
+
"slice.png"
);
emit
addToolbox
(
tr
(
"Slice"
)
,
tool_
,
toolIcon_
);
...
...
PluginCollection-Renderers/Plugin-Render-Toon/ToonRenderer_qt.cc
View file @
49b391f1
...
...
@@ -88,7 +88,7 @@ void ToonRenderer::actionDialog( bool )
optionsDlg
->
setLayout
(
layout
);
connect
(
paletteSizeSlider
,
SIGNAL
(
sliderMov
ed
(
int
)),
this
,
SLOT
(
paletteSizeChanged
(
int
)));
connect
(
paletteSizeSlider
,
SIGNAL
(
valueChang
ed
(
int
)),
this
,
SLOT
(
paletteSizeChanged
(
int
)));
connect
(
outlineColorBtn
,
SIGNAL
(
colorChanged
(
QColor
)),
this
,
SLOT
(
outlineColorChanged
(
QColor
)));
...
...
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