diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-09-10 09:01:31 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-09-10 10:18:04 +0000 |
| commit | 4193fc4f00c2e687ca82de589603c7fa133bff50 (patch) | |
| tree | 285051fe9b7a3a8f891b12fb1d83e8cd23d4607a /src/Authoring/Studio/UI | |
| parent | 7128f00e5e38b5de229e75f5386f3bd3fe9806d2 (diff) | |
Remove legacy viewer
Task-number: QT3DS-2291
Change-Id: I0a11dfc1d69e4844e67476b60bc40da99c6ad12a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/UI')
| -rw-r--r-- | src/Authoring/Studio/UI/StudioAppPrefsPage.cpp | 9 | ||||
| -rw-r--r-- | src/Authoring/Studio/UI/StudioAppPrefsPage.ui | 31 |
2 files changed, 12 insertions, 28 deletions
diff --git a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp index 00c1349c..bfea1bac 100644 --- a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp +++ b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp @@ -90,7 +90,6 @@ void CStudioAppPrefsPage::onInitDialog() // Add tool tips for controls m_ui->m_DefaultInterpolation->setToolTip(tr("Set default keyframe interpolation type")); m_ui->m_checkTimelineAbsoluteSnapping->setToolTip(tr("Enable timeline snapping grid")); - m_ui->m_checkLegacyViewer->setToolTip(tr("Enable preview with legacy Qt 3D Viewer 1.1")); m_ui->m_SnapRangeCombo->setToolTip(tr("Set resolution of timeline snapping grid")); m_ui->m_buttonRestoreDefaults->setToolTip(tr("Click to restore default Studio settings")); @@ -119,8 +118,6 @@ void CStudioAppPrefsPage::onInitDialog() connect(m_ui->m_SnapRangeCombo, activated, this, [=](){ setModified(true); }); connect(m_ui->m_checkTimelineAbsoluteSnapping, &QCheckBox::clicked, this, [=](){ setModified(true); enableOptions(); }); - connect(m_ui->m_checkLegacyViewer, &QCheckBox::clicked, - this, [=](){ setModified(true); m_restartNeeded = true; }); connect(m_ui->m_EditViewStartupView, activated, this, [=](){ setModified(true); }); connect(m_ui->selectorWidth, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), @@ -164,9 +161,6 @@ void CStudioAppPrefsPage::loadSettings() m_ui->m_checkTimelineAbsoluteSnapping->setChecked( CStudioPreferences::IsTimelineSnappingGridActive()); - // Legacy viewer - m_ui->m_checkLegacyViewer->setChecked(CStudioPreferences::IsLegacyViewerActive()); - // Tool handles m_ui->selectorWidth->setValue(CStudioPreferences::getSelectorLineWidth()); m_ui->selectorLength->setValue(CStudioPreferences::getSelectorLineLength()); @@ -209,9 +203,6 @@ void CStudioAppPrefsPage::saveSettings() long theCurrentSelection = m_ui->m_SnapRangeCombo->currentIndex(); CStudioPreferences::SetTimelineSnappingGridResolution((ESnapGridResolution)theCurrentSelection); - // Legacy viewer - CStudioPreferences::SetLegacyViewerActive(m_ui->m_checkLegacyViewer->isChecked()); - // Preferred Startup View long theSel = m_ui->m_EditViewStartupView->currentIndex(); long theNumItems = m_ui->m_EditViewStartupView->count(); diff --git a/src/Authoring/Studio/UI/StudioAppPrefsPage.ui b/src/Authoring/Studio/UI/StudioAppPrefsPage.ui index 1af60cd3..9d724e63 100644 --- a/src/Authoring/Studio/UI/StudioAppPrefsPage.ui +++ b/src/Authoring/Studio/UI/StudioAppPrefsPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>347</width> - <height>511</height> + <width>418</width> + <height>543</height> </rect> </property> <property name="windowTitle"> @@ -20,6 +20,16 @@ <string>General</string> </property> <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0"> + <widget class="QCheckBox" name="m_checkTimelineAbsoluteSnapping"> + <property name="text"> + <string>Timeline Snapping Grid</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="m_DefaultInterpolation"/> + </item> <item row="0" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> @@ -30,26 +40,9 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QComboBox" name="m_DefaultInterpolation"/> - </item> <item row="1" column="1"> <widget class="QComboBox" name="m_SnapRangeCombo"/> </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="m_checkTimelineAbsoluteSnapping"> - <property name="text"> - <string>Timeline Snapping Grid</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="m_checkLegacyViewer"> - <property name="text"> - <string>Legacy Viewer</string> - </property> - </widget> - </item> </layout> </widget> </item> |