ui fix

2023-02-09 19:36:45 +03:00
parent 65dd078f07
commit c3f91d78f0
3 changed files with 810 additions and 815 deletions
--- a/src/qglview_test/qglview_window.ui
+++ b/src/qglview_test/qglview_window.ui
@@ -40,7 +40,7 @@
        <item>
         <widget class="QTabWidget" name="tabWidget">
          <property name="currentIndex">
-           <number>0</number>
+           <number>2</number>
          </property>
          <widget class="QWidget" name="tab">
           <attribute name="title">
@@ -50,7 +50,7 @@
            <item>
             <widget class="QTabWidget" name="tabWidget_2">
              <property name="currentIndex">
-               <number>2</number>
+               <number>1</number>
              </property>
              <widget class="QWidget" name="tab_5">
               <attribute name="title">
@@ -80,8 +80,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                     <width>761</width>
-                     <height>840</height>
+                     <width>618</width>
+                     <height>636</height>
                    </rect>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -644,8 +644,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                     <width>787</width>
-                     <height>403</height>
+                     <width>635</width>
+                     <height>313</height>
                    </rect>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -742,19 +742,6 @@
            <item>
             <widget class="ObjectEditor" name="objectEditor" native="true"/>
            </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>
          </widget>
          <widget class="QWidget" name="tab_3">
@@ -781,7 +768,7 @@
        </item>
       </layout>
      </widget>
-      <widget class="GLWidget" name="view">
+      <widget class="GLWidget" name="view" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -832,7 +819,7 @@
     <x>0</x>
     <y>0</y>
     <width>1107</width>
-     <height>31</height>
+     <height>21</height>
    </rect>
   </property>
   <widget class="QMenu" name="menuFile">
@@ -880,7 +867,7 @@
  </widget>
  <action name="actionExit">
   <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>
   </property>
   <property name="text">
@@ -889,7 +876,7 @@
  </action>
  <action name="actionImport">
   <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>
   </property>
   <property name="text">
@@ -913,7 +900,7 @@
  </action>
  <action name="actionSave">
   <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>
   </property>
   <property name="text">
@@ -925,7 +912,7 @@
  </action>
  <action name="actionReset">
   <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>
   </property>
   <property name="text">
@@ -1067,7 +1054,7 @@
 </customwidgets>
 <resources>
  <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"/>
 </resources>
 <connections/>
--- 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;
--- a/src/widgets/object_editor.ui
+++ b/src/widgets/object_editor.ui
@@ -6,23 +6,11 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>466</width>
-    <height>915</height>
+    <width>470</width>
+    <height>822</height>
   </rect>
  </property>
  <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>
    <widget class="QLabel" name="labelTitle">
     <property name="sizePolicy">
@@ -43,20 +31,26 @@
    </widget>
   </item>
   <item>
-    <widget class="QWidget" name="widgetMain" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
     </property>
-      <property name="topMargin">
-       <number>0</number>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContents</enum>
     </property>
-      <property name="rightMargin">
-       <number>0</number>
+     <property name="widgetResizable">
+      <bool>true</bool>
     </property>
-      <property name="bottomMargin">
-       <number>0</number>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>433</width>
+        <height>825</height>
+       </rect>
      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QGroupBox" name="groupBox">
         <property name="title">
@@ -874,8 +868,22 @@
         </layout>
        </widget>
       </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>
     </widget>
+    </widget>
   </item>
  </layout>
 </widget>