Skip to content

Commit

Permalink
[ui] Further tweaks to the temporal controller panel
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirvn @nyalldawson
nirvn authored and nyalldawson committed May 13, 2020
1 parent 1bf1f85 commit 250fa15
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 119 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
View file
Expand Up @@ -1184,7 +1184,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh

mTemporalControllerWidget = new QgsTemporalControllerDockWidget( tr( "Temporal Controller" ), this );
mTemporalControllerWidget->setObjectName( QStringLiteral( "Temporal Controller" ) );
addDockWidget( Qt::BottomDockWidgetArea, mTemporalControllerWidget );
addDockWidget( Qt::TopDockWidgetArea, mTemporalControllerWidget );
mTemporalControllerWidget->hide();
mTemporalControllerWidget->setToggleVisibilityAction( mActionTemporalController );

Expand Down
245 changes: 127 additions & 118 deletions src/ui/qgstemporalcontrollerwidgetbase.ui
View file
Expand Up @@ -27,120 +27,20 @@
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,0,0,0,0,0,0,2,0,4,0">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Range</string>
</property>
</widget>
</item>
<item>
<widget class="QDateTimeEdit" name="mStartDateTime">
<property name="displayFormat">
<string>M/d/yyyy h:mm AP</string>
</property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>to </string>
</property>
</widget>
</item>
<item>
<widget class="QDateTimeEdit" name="mEndDateTime">
<property name="displayFormat">
<string>M/d/yyyy h:mm AP</string>
</property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mSetToProjectTimeButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.svg</normaloff>:/images/themes/default/mActionRefresh.svg</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Step</string>
</property>
</widget>
</item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsDoubleSpinBox" name="mSpinBox">
<widget class="QLabel" name="mCurrentRangeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>130</width>
<height>16777215</height>
</size>
</property>
<property name="decimals">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mTimeStepsComboBox">
<property name="editable">
<bool>false</bool>
</property>
<property name="currentText">
<string/>
<property name="text">
<string>Current frame feedback</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="mSettings">
<property name="text">
Expand All @@ -159,6 +59,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QPushButton" name="mRewindButton">
<property name="text">
Expand Down Expand Up @@ -245,6 +148,19 @@
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="mSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mLoopingCheckBox">
<property name="toolTip">
Expand All @@ -255,28 +171,121 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QSlider" name="mSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Range</string>
</property>
<property name="invertedAppearance">
</widget>
</item>
<item>
<widget class="QDateTimeEdit" name="mStartDateTime">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="displayFormat">
<string>M/d/yyyy h:mm AP</string>
</property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>to </string>
</property>
</widget>
</item>
<item>
<widget class="QDateTimeEdit" name="mEndDateTime">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="displayFormat">
<string>M/d/yyyy h:mm AP</string>
</property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mSetToProjectTimeButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.svg</normaloff>:/images/themes/default/mActionRefresh.svg</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Step</string>
</property>
</widget>
</item>
<item>
<widget class="QgsDoubleSpinBox" name="mSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>130</width>
<height>16777215</height>
</size>
</property>
<property name="decimals">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mTimeStepsComboBox">
<property name="editable">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
<property name="currentText">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="mCurrentRangeLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down

0 comments on commit 250fa15

Please sign in to comment.