SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui fix

Browse Source
This commit is contained in:
Бычков Андрей
2023-02-09 19:36:45 +03:00
parent 65dd078f07
commit c3f91d78f0
3 changed files with 810 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/qglview_test/qglview_window.ui
View File

@@ -40,7 +40,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -50,7 +50,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget_2"> <widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
@@ -80,8 +80,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>761</width> <width>618</width>
<height>840</height> <height>636</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -644,8 +644,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>787</width> <width>635</width>
<height>403</height> <height>313</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -742,19 +742,6 @@
<item> <item>
<widget class="ObjectEditor" name="objectEditor" native="true"/> <widget class="ObjectEditor" name="objectEditor" native="true"/>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="tab_3">
@@ -781,7 +768,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="GLWidget" name="view"> <widget class="GLWidget" name="view" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -832,7 +819,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1107</width> <width>1107</width>
<height>31</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@@ -880,7 +867,7 @@
</widget> </widget>
<action name="actionExit"> <action name="actionExit">
<property name="icon"> <property name="icon">
<iconset resource="../core/qglengine_core.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset> <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -889,7 +876,7 @@
</action> </action>
<action name="actionImport"> <action name="actionImport">
<property name="icon"> <property name="icon">
<iconset resource="../core/qglengine_core.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/document-import.png</normaloff>:/icons/document-import.png</iconset> <normaloff>:/icons/document-import.png</normaloff>:/icons/document-import.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -913,7 +900,7 @@
</action> </action>
<action name="actionSave"> <action name="actionSave">
<property name="icon"> <property name="icon">
<iconset resource="../../../qad/libs/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/document-save-all.png</normaloff>:/icons/document-save-all.png</iconset> <normaloff>:/icons/document-save-all.png</normaloff>:/icons/document-save-all.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -925,7 +912,7 @@
</action> </action>
<action name="actionReset"> <action name="actionReset">
<property name="icon"> <property name="icon">
<iconset resource="../../../qad/libs/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/document-new.png</normaloff>:/icons/document-new.png</iconset> <normaloff>:/icons/document-new.png</normaloff>:/icons/document-new.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -1067,7 +1054,7 @@
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../qad/libs/blockview/qad_blockview.qrc"/> <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
<include location="../../../qad/libs/widgets/qad_widgets.qrc"/> <include location="../../../qad/libs/qglview/qglview.qrc"/>
<include location="../core/qglengine_core.qrc"/> <include location="../core/qglengine_core.qrc"/>
</resources> </resources>
<connections/> <connections/>

6
src/widgets/object_editor.cpp
View File

@@ -32,7 +32,7 @@ ObjectEditor::ObjectEditor(QWidget * parent): QWidget(parent) {
active = true; active = true;
ignore_next = false; ignore_next = false;
on_comboLightType_currentIndexChanged(0); on_comboLightType_currentIndexChanged(0);
ui->widgetMain->setEnabled(false); ui->scrollArea->setEnabled(false);
ui->labelAimDist->hide(); ui->labelAimDist->hide();
ui->spinAimDist->hide(); ui->spinAimDist->hide();
@@ -89,14 +89,14 @@ void ObjectEditor::selectionChanged() {
ignore_next = false; ignore_next = false;
return; return;
} }
ui->widgetMain->setEnabled(false); ui->scrollArea->setEnabled(false);
if (!view) return; if (!view) return;
ObjectBaseList sol = view->selectedObjects(true); ObjectBaseList sol = view->selectedObjects(true);
if (sol.isEmpty()) { if (sol.isEmpty()) {
ui->labelTitle->setText(tr("[No selected]")); ui->labelTitle->setText(tr("[No selected]"));
return; return;
} }
ui->widgetMain->setEnabled(true); ui->scrollArea->setEnabled(true);
if (sol.size() == 1) { if (sol.size() == 1) {
setObject(sol[0]); setObject(sol[0]);
return; return;

56
src/widgets/object_editor.ui
View File

@@ -6,23 +6,11 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>466</width> <width>470</width>
<height>915</height> <height>822</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="labelTitle"> <widget class="QLabel" name="labelTitle">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -43,20 +31,26 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" name="widgetMain" native="true"> <widget class="QScrollArea" name="scrollArea">
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="horizontalScrollBarPolicy">
<property name="leftMargin"> <enum>Qt::ScrollBarAlwaysOff</enum>
<number>0</number>
</property> </property>
<property name="topMargin"> <property name="sizeAdjustPolicy">
<number>0</number> <enum>QAbstractScrollArea::AdjustToContents</enum>
</property> </property>
<property name="rightMargin"> <property name="widgetResizable">
<number>0</number> <bool>true</bool>
</property> </property>
<property name="bottomMargin"> <widget class="QWidget" name="scrollAreaWidgetContents">
<number>0</number> <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>433</width>
<height>825</height>
</rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@@ -874,8 +868,22 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>