diff --git a/src/qglview_test/qglview_window.ui b/src/qglview_test/qglview_window.ui index e740164..75a7e5e 100644 --- a/src/qglview_test/qglview_window.ui +++ b/src/qglview_test/qglview_window.ui @@ -40,7 +40,7 @@ - 0 + 2 @@ -50,7 +50,7 @@ - 2 + 1 @@ -80,8 +80,8 @@ 0 0 - 761 - 840 + 618 + 636 @@ -644,8 +644,8 @@ 0 0 - 787 - 403 + 635 + 313 @@ -742,19 +742,6 @@ - - - - Qt::Vertical - - - - 20 - 1 - - - - @@ -781,7 +768,7 @@ - + 0 @@ -832,7 +819,7 @@ 0 0 1107 - 31 + 21 @@ -880,7 +867,7 @@ - + :/icons/application-exit.png:/icons/application-exit.png @@ -889,7 +876,7 @@ - + :/icons/document-import.png:/icons/document-import.png @@ -913,7 +900,7 @@ - + :/icons/document-save-all.png:/icons/document-save-all.png @@ -925,7 +912,7 @@ - + :/icons/document-new.png:/icons/document-new.png @@ -1067,7 +1054,7 @@ - + diff --git a/src/widgets/object_editor.cpp b/src/widgets/object_editor.cpp index 41ee4f7..63cacf7 100644 --- a/src/widgets/object_editor.cpp +++ b/src/widgets/object_editor.cpp @@ -32,7 +32,7 @@ ObjectEditor::ObjectEditor(QWidget * parent): QWidget(parent) { active = true; ignore_next = false; on_comboLightType_currentIndexChanged(0); - ui->widgetMain->setEnabled(false); + ui->scrollArea->setEnabled(false); ui->labelAimDist->hide(); ui->spinAimDist->hide(); @@ -89,14 +89,14 @@ void ObjectEditor::selectionChanged() { ignore_next = false; return; } - ui->widgetMain->setEnabled(false); + ui->scrollArea->setEnabled(false); if (!view) return; ObjectBaseList sol = view->selectedObjects(true); if (sol.isEmpty()) { ui->labelTitle->setText(tr("[No selected]")); return; } - ui->widgetMain->setEnabled(true); + ui->scrollArea->setEnabled(true); if (sol.size() == 1) { setObject(sol[0]); return; diff --git a/src/widgets/object_editor.ui b/src/widgets/object_editor.ui index c7de5a2..6963b91 100644 --- a/src/widgets/object_editor.ui +++ b/src/widgets/object_editor.ui @@ -6,23 +6,11 @@ 0 0 - 466 - 915 + 470 + 822 - - 0 - - - 0 - - - 0 - - - 0 - @@ -43,469 +31,429 @@ - - - - 0 + + + Qt::ScrollBarAlwaysOff + + + QAbstractScrollArea::AdjustToContents + + + true + + + + + 0 + 0 + 433 + 825 + - - 0 - - - 0 - - - 0 - - - - - Position - - - - - - - 0 - 0 - - + + + + + Position + + + + + + + 0 + 0 + + + + X: + + + + + + + + + + + 0 + 0 + + + + Y: + + + + + + + + + + + 0 + 0 + + + + Z: + + + + + + + + + + + + + Rotation + + + + + + + 0 + 0 + + + + X: + + + + + + + -360.000000000000000 + + + 360.000000000000000 + + + 1 + + + 4.500000000000000 + + + 90.000000000000000 + + + ° + + + QSlider::TicksAbove + + + 90 + + + + + + + + 0 + 0 + + + + Y: + + + + + + + -360.000000000000000 + + + 360.000000000000000 + + + 4.500000000000000 + + + 90.000000000000000 + + + ° + + + QSlider::TicksAbove + + + 90 + + + + + + + + 0 + 0 + + + + Z: + + + + + + + -360.000000000000000 + + + 360.000000000000000 + + + 4.500000000000000 + + + 90.000000000000000 + + + ° + + + QSlider::TicksAbove + + + 90 + + + + + + + + + + Scale + + + + + + + 0 + 0 + + + + X: + + + + + + + + + + + 0 + 0 + + + + Y: + + + + + + + + + + + 0 + 0 + + + + Z: + + + + + + + + + + + + + Texture + + + + + + + + + + 0 + 0 + + + + SX: + + + + + + + 1.000000000000000 + + + + + + + + + + + 0 + 0 + + + + X: + + + + + + + + 0 + 0 + + + + Y: + + + + + + + + 0 + 0 + + + + R: + + + + + + + 1.000000000000000 + + + + + + + -360.000000000000000 + + + 360.000000000000000 + + + 1 + + + 4.500000000000000 + + + 90.000000000000000 + + + ° + + + QSlider::TicksAbove + + + 90 + + + + + + + + 0 + 0 + + + + SY: + + + + + + + + + + - X: - - - - - - - - - - - 0 - 0 - - - - Y: - - - - - - - - - - - 0 - 0 - - - - Z: - - - - - - - - - - - - - Rotation - - - - - - - 0 - 0 - - - - X: + Receive shadows - - - -360.000000000000000 - - - 360.000000000000000 - - - 1 - - - 4.500000000000000 - - - 90.000000000000000 - - - ° - - - QSlider::TicksAbove - - - 90 - - - - - - - - 0 - 0 - - + - Y: + Cast shadows - - - - -360.000000000000000 - - - 360.000000000000000 - - - 4.500000000000000 - - - 90.000000000000000 - - - ° - - - QSlider::TicksAbove - - - 90 - - - - - - - - 0 - 0 - - - - Z: - - - - - - - -360.000000000000000 - - - 360.000000000000000 - - - 4.500000000000000 - - - 90.000000000000000 - - - ° - - - QSlider::TicksAbove - - - 90 - - - - - - - - - - Scale - - - - - - - 0 - 0 - - - - X: - - - - - - - - - - - 0 - 0 - - - - Y: - - - - - - - - - - - 0 - 0 - - - - Z: - - - - - - - - - - - - - Texture - - - - - - - - - 0 - 0 - - + - SX: - - - - - - - 1.000000000000000 - - - - - - - - - - - 0 - 0 - - - - X: - - - - - - - - 0 - 0 - - - - Y: + Accept fog - - - - 0 - 0 - - + - R: + Visible - - - - 1.000000000000000 - - - - - - - -360.000000000000000 - - - 360.000000000000000 - - - 1 - - - 4.500000000000000 - - - 90.000000000000000 - - - ° - - - QSlider::TicksAbove - - - 90 - - - - - - - - 0 - 0 - - + + - SY: + Accept light - - - - - - - - Receive shadows - - - - - - - Cast shadows - - - - - - - Accept fog - - - - - - - Visible - - - - - - - Accept light - - - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 0 - 0 - - - - Color: - - - - - - - - - - - 0 - 0 - - - - Aim distance: - - - - - - - - - - - - Light - - + + + QFormLayout::AllNonFixedFieldsGrow @@ -513,368 +461,428 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + + 0 + 0 + + - Type: + Color: - - - - Omni - - - - - Cone - - - - - Directional - - - + - + + + + 0 + 0 + + - Intensity: + Aim distance: - - - 0.000000000000000 - - - 10.000000000000000 - - - 1.000000000000000 - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - true - - - 999.000000000000000 - - + - - - - Decay ^0: - - - - - - - 0.000000000000000 - - - 10.000000000000000 - - - 1.000000000000000 - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - true - - - 999.000000000000000 - - - - - - - Decay ^1: - - - - - - - 0.000000000000000 - - - 10.000000000000000 - - - 0.000000000000000 - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - true - - - 999.000000000000000 - - - - - - - Decay ^2: - - - - - - - 0.000000000000000 - - - 10.000000000000000 - - - 0.000000000000000 - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - true - - - 999.000000000000000 - - - - - - - Angle: - - - - - - - - 0 - - - 0 - - - 0 - - - 0 + + + + + + Light + + + + QFormLayout::AllNonFixedFieldsGrow + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + Type: + + + + - - - 0.000000000000000 - - - 180.000000000000000 - - - 1 - - - 5.000000000000000 - - - 30.000000000000000 - - - ° - - + + Omni + - + + Cone + + + + + Directional + + + + + + + + Intensity: + + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + 1.000000000000000 + + + 3 + + + 0.100000000000000 + + + 1.000000000000000 + + + true + + + 999.000000000000000 + + + + + + + Decay ^0: + + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + 1.000000000000000 + + + 3 + + + 0.100000000000000 + + + 1.000000000000000 + + + true + + + 999.000000000000000 + + + + + + + Decay ^1: + + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + 0.000000000000000 + + + 3 + + + 0.100000000000000 + + + 1.000000000000000 + + + true + + + 999.000000000000000 + + + + + + + Decay ^2: + + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + 0.000000000000000 + + + 3 + + + 0.100000000000000 + + + 1.000000000000000 + + + true + + + 999.000000000000000 + + + + + + + Angle: + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0.000000000000000 + + + 180.000000000000000 + + + 1 + + + 5.000000000000000 + + + 30.000000000000000 + + + ° + + + + + + + - + + + + + + + 0.000000000000000 + + + 180.000000000000000 + + + 1 + + + 5.000000000000000 + + + 30.000000000000000 + + + ° + + + + + + + + + + + + + Camera + + + + QFormLayout::AllNonFixedFieldsGrow + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + Depth start: + + + + + + + FOV: + + + + + + + 1.000000000000000 + + + 179.900000000000006 + + + 60.000000000000000 + + + 1 + + + 5.000000000000000 + + + 30.000000000000000 + + + ° + + + + + + + - - + Mirror Y - - - 0.000000000000000 - - - 180.000000000000000 - - - 1 - - - 5.000000000000000 - - - 30.000000000000000 - - - ° + + + Mirror X - - - - - - - - - Camera - - - - QFormLayout::AllNonFixedFieldsGrow + + + + + 5 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + -180.000000000000000 + + + 180.000000000000000 + + + 0.000000000000000 + + + 1 + + + 5.000000000000000 + + + 30.000000000000000 + + + ° + + + + + + + Roll: + + + + + + + + + + Qt::Vertical - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + 0 + - - - - Depth start: - - - - - - - FOV: - - - - - - - 1.000000000000000 - - - 179.900000000000006 - - - 60.000000000000000 - - - 1 - - - 5.000000000000000 - - - 30.000000000000000 - - - ° - - - - - - - - - Mirror Y - - - - - - - Mirror X - - - - - - - - - 5 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - -180.000000000000000 - - - 180.000000000000000 - - - 0.000000000000000 - - - 1 - - - 5.000000000000000 - - - 30.000000000000000 - - - ° - - - - - - - Roll: - - - - - - - + + + +