Skip to content
Permalink
Browse files

[ui] Harmonize loop widget of 3D map view

  • Loading branch information
nirvn committed Jun 27, 2020
1 parent cadb59b commit 28e1445a93594e4d85116ab41333b5cd4b0daa4d
Showing with 4 additions and 7 deletions.
  1. +1 −4 src/app/3d/qgs3danimationwidget.cpp
  2. +3 −3 src/ui/3d/animation3dwidget.ui
@@ -40,7 +40,6 @@ Qgs3DAnimationWidget::Qgs3DAnimationWidget( QWidget *parent )
btnEditKeyframe->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.svg" ) ) );
btnPlayPause->setIcon( QIcon( QgsApplication::iconPath( "mTaskRunning.svg" ) ) );
btnDuplicateKeyframe->setIcon( QIcon( QgsApplication::iconPath( "mActionEditCopy.svg" ) ) );
btnRepeat->setIcon( QIcon( QgsApplication::iconPath( "mActionRefresh.svg" ) ) );
btnExportAnimation->setIcon( QIcon( QgsApplication::iconPath( "mActionFileSave.svg" ) ) );
cboKeyframe->addItem( tr( "<none>" ) );

@@ -58,8 +57,6 @@ Qgs3DAnimationWidget::Qgs3DAnimationWidget( QWidget *parent )
btnPlayPause->setCheckable( true );
connect( btnPlayPause, &QToolButton::clicked, this, &Qgs3DAnimationWidget::onPlayPause );

btnRepeat->setCheckable( true );

connect( sliderTime, &QSlider::valueChanged, this, &Qgs3DAnimationWidget::onSliderValueChanged );

connect( cboKeyframe, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, &Qgs3DAnimationWidget::onKeyframeChanged );
@@ -173,7 +170,7 @@ void Qgs3DAnimationWidget::onAnimationTimer()
{
if ( sliderTime->value() >= sliderTime->maximum() )
{
if ( btnRepeat->isChecked() )
if ( mLoopingCheckBox->isChecked() )
sliderTime->setValue( 0 );
else
{
@@ -276,12 +276,12 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="btnRepeat">
<widget class="QCheckBox" name="mLoopingCheckBox">
<property name="toolTip">
<string>Repeat</string>
<string>Automatically reset and repeat the animation endlessly</string>
</property>
<property name="text">
<string></string>
<string>Loop</string>
</property>
</widget>
</item>

0 comments on commit 28e1445

Please sign in to comment.
You can’t perform that action at this time.