[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] kmymoney/dialogs/settings: Fixed automatic layout
From:       Thomas Baumgart <null () kde ! org>
Date:       2017-07-01 9:34:56
Message-ID: E1dREno-0003nG-Ap () code ! kde ! org
[Download RAW message or body]

Git commit 124cc92e8c36fd024d9e6a1a8fb3afae1165fd66 by Thomas Baumgart.
Committed on 01/07/2017 at 09:34.
Pushed by tbaumgart into branch 'master'.

Fixed automatic layout

The layouts for the new online banking trace options were missing.

Needs backport to 4.8

M  +70   -87   kmymoney/dialogs/settings/ksettingsgeneraldecl.ui

https://commits.kde.org/kmymoney/124cc92e8c36fd024d9e6a1a8fb3afae1165fd66

diff --git a/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui \
b/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui index b1502e40..3c5e1eeb 100644
--- a/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
+++ b/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget2">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -542,87 +542,70 @@ You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; to \
temporarily show hidden  <property name="title">
           <string>Logging</string>
          </property>
-         <widget class="QCheckBox" name="kcfg_logImportedStatements">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>100</y>
-            <width>151</width>
-            <height>21</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Log imported statements</string>
-          </property>
-         </widget>
-         <widget class="QLineEdit" name="kcfg_logPath">
-          <property name="geometry">
-           <rect>
-            <x>60</x>
-            <y>30</y>
-            <width>341</width>
-            <height>20</height>
-           </rect>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-         <widget class="QLabel" name="label_3">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>30</y>
-            <width>41</width>
-            <height>20</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Log path</string>
-          </property>
-         </widget>
-         <widget class="QCheckBox" name="kcfg_logOfxTransactions">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>130</y>
-            <width>131</width>
-            <height>21</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Log OFX transactions</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="label_4">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>50</y>
-            <width>551</width>
-            <height>50</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>On choosing a log file path please keep in mind that log files \
                may contain sensitive data (e.g. passwords in clear-text \
                etc).</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="choosePath">
-          <property name="geometry">
-           <rect>
-            <x>406</x>
-            <y>30</y>
-            <width>31</width>
-            <height>21</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-         </widget>
+         <layout class="QVBoxLayout" name="verticalLayout_10">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>Log path</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="kcfg_logPath">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="choosePath">
+              <property name="text">
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>On choosing a log file path please keep in mind that log files \
may contain sensitive data (e.g. passwords in clear-text etc).</string> +            \
</property> +            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="kcfg_logImportedStatements">
+            <property name="text">
+             <string>Log imported statements</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="kcfg_logOfxTransactions">
+            <property name="text">
+             <string>Log OFX transactions</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>255</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
         </widget>
        </item>
       </layout>
@@ -634,16 +617,16 @@ You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; to \
temporarily show hidden  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
-  <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+  <customwidget>
    <class>kMyMoneyDateInput</class>
    <extends>QFrame</extends>
    <header>kmymoneydateinput.h</header>


[prev in list] [next in list] [prev in thread] [next in thread]