[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Nicolas Brisset]

SVN commit 1217729 by brisset:

Fix completely broken layout of DebugDialog, which was wasting an awful lot of
space.
Remark: the mesages provided by the ASCII datasource seem to be of type
"Notice", I think "Debug" would be better.


 M  +2 -2      debugdialog.cpp  
 M  +67 -94    debugdialog.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/debugdialog.cpp #1217728:1217729
@@ -27,9 +27,9 @@
   : QDialog(parent), _store(0) {
   setupUi(this);
 
-  _log = new LogWidget(TabPage);
+  _log = new LogWidget(_logTab);
 
-  gridLayout2->addWidget(_log, 0, 0, 0, 2);
+  _logTabLayout->addWidget(_log,0,0);
 
   connect(_clear, SIGNAL(clicked()), this, SLOT(clear()));
   connect(_showDebug, SIGNAL(toggled(bool)), _log, SLOT(setShowDebug(bool)));
--- branches/work/kst/portto4/kst/src/libkstapp/debugdialog.ui #1217728:1217729
@@ -13,40 +13,11 @@
   <property name="windowTitle">
    <string>Kst Debug Dialog</string>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="2" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>421</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="_close">
-     <property name="text">
-      <string>&amp;Close</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QTabWidget" name="_tabs">
      <property name="currentIndex">
-      <number>2</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="_buildInfoTab">
       <attribute name="title">
@@ -113,73 +84,44 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage">
+     <widget class="QWidget" name="_logTab">
       <attribute name="title">
        <string>Log</string>
       </attribute>
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>9</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <item row="1" column="0">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>221</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QGridLayout" name="_logTabLayout"/>
        </item>
-       <item row="1" column="1">
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>GroupBox</string>
-         </property>
-         <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="0" column="1">
-           <widget class="QCheckBox" name="_showNotice">
+       <item>
+        <layout class="QHBoxLayout" name="_logTabButtonsLayout">
+         <item>
+          <widget class="QLabel" name="label">
             <property name="text">
-             <string>&amp;Notice</string>
+            <string>Log level: </string>
             </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QCheckBox" name="_showError">
+         <item>
+          <widget class="QCheckBox" name="_showDebug">
             <property name="text">
-             <string>&amp;Error</string>
+            <string>&amp;Debug</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="_showDebug">
+         <item>
+          <widget class="QCheckBox" name="_showNotice">
             <property name="text">
-             <string>&amp;Debug</string>
+            <string>&amp;Notice</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
+         <item>
            <widget class="QCheckBox" name="_showWarning">
             <property name="text">
              <string>&amp;Warning</string>
@@ -189,32 +131,41 @@
             </property>
            </widget>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QPushButton" name="_clear">
+         <item>
+          <widget class="QCheckBox" name="_showError">
          <property name="text">
-          <string>Clea&amp;r</string>
+            <string>&amp;Error</string>
          </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <spacer name="verticalSpacer">
+         <item>
+          <spacer>
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+            <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
-           <height>40</height>
+             <width>221</width>
+             <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
+         <item>
+          <widget class="QPushButton" name="_clear">
+           <property name="text">
+            <string>Clea&amp;r</string>
+           </property>
+          </widget>
+         </item>
       </layout>
+       </item>
+      </layout>
      </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="_dataSourcesTab">
       <attribute name="title">
        <string>Data Sources</string>
       </attribute>
@@ -246,16 +197,38 @@
      </widget>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>421</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="_close">
+       <property name="text">
+        <string>&amp;Close</string>
+       </property>
+      </widget>
+     </item>
   </layout>
+   </item>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>_email</tabstop>
-  <tabstop>_showDebug</tabstop>
-  <tabstop>_showNotice</tabstop>
-  <tabstop>_showWarning</tabstop>
-  <tabstop>_showError</tabstop>
-  <tabstop>_clear</tabstop>
   <tabstop>_close</tabstop>
  </tabstops>
  <resources/>