X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ui_mainwindow.ui;h=ad5fb9e244f10c3b843d87fac364de00c7edbf7a;hb=4ed1495550e603bfb7584e1b1b9a0c74e57de223;hp=9518f67a9bda3f52e5b71afcea91457114aff315;hpb=54a8901264c147d7849399860ac46d2b010f8d03;p=nageru

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 9518f67..ad5fb9e 100644
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -27,7 +27,7 @@
     <item row="0" column="0">
      <layout class="QVBoxLayout" name="vertical_layout" stretch="0,0,0">
       <item>
-       <layout class="QHBoxLayout" name="me_displays" stretch="0,0,0,0">
+       <layout class="QHBoxLayout" name="me_displays" stretch="0,0,0,0,0">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <property name="leftMargin">
@@ -43,6 +43,9 @@
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+          </item>
           <item>
            <widget class="QLabel" name="label_preview">
             <property name="text">
@@ -138,10 +141,13 @@
          </layout>
         </item>
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout_4" stretch="1,0">
+         <layout class="QVBoxLayout" name="vu_meter_vertical_layout" stretch="1,0">
           <property name="leftMargin">
            <number>0</number>
           </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <property name="bottomMargin">
@@ -240,8 +246,6 @@
               <property name="autoFillBackground">
                <bool>true</bool>
               </property>
-              <zorder>peak_display</zorder>
-              <zorder>peak_display</zorder>
              </widget>
             </item>
            </layout>
@@ -264,6 +268,119 @@
           </item>
          </layout>
         </item>
+        <item>
+         <layout class="QVBoxLayout" name="lra_vertical_layout" stretch="1,0">
+          <property name="spacing">
+           <number>3</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="LRAMeter" name="lra_meter" native="true">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="palette">
+               <palette>
+                <active>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>255</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>239</green>
+                    <blue>219</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </active>
+                <inactive>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>255</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>239</green>
+                    <blue>219</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </inactive>
+                <disabled>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>239</green>
+                    <blue>219</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>239</green>
+                    <blue>219</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </disabled>
+               </palette>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButton">
+            <property name="maximumSize">
+             <size>
+              <width>30</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>RST</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
        </layout>
       </item>
       <item>
@@ -271,6 +388,9 @@
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
@@ -280,59 +400,22 @@
        </spacer>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="preview_displays">
+       <layout class="QHBoxLayout" name="preview_displays" stretch="0">
         <property name="topMargin">
          <number>0</number>
         </property>
-        <item>
-         <widget class="GLWidget" name="preview1" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>1</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="GLWidget" name="preview2" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>1</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="GLWidget" name="preview3" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>1</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGLWidget" name="preview4" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>1</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>0</width>
-            <height>0</height>
+            <height>40</height>
            </size>
           </property>
          </spacer>
@@ -374,14 +457,15 @@
    <header>glwidget.h</header>
   </customwidget>
   <customwidget>
-   <class>QGLWidget</class>
+   <class>VUMeter</class>
    <extends>QWidget</extends>
-   <header>qglwidget.h</header>
+   <header>vumeter.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
-   <class>VUMeter</class>
+   <class>LRAMeter</class>
    <extends>QWidget</extends>
-   <header>vumeter.h</header>
+   <header>lrameter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>