[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] /: Remove out-dated margin and spacing settings in UI files
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2013-01-13 10:47:26
Message-ID: 20130113104726.4B029A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 9b7176353bb45354c627f2f69c3f49be28ed8834 by Friedrich W. H. Kossebau.
Committed on 13/01/2013 at 11:47.
Pushed by kossebau into branch 'master'.
Remove out-dated margin and spacing settings in UI files
sources of Kexi, Krita and Plan still need clean-up as well
REVIEW: 108097
thanks inge and boemann for review
M +0 -2 filters/flow/imageexport/flow_imageexportwidget.ui
M +0 -12 filters/words/ascii/ImportDialogUI.ui
M +0 -2 libs/main/KoDetailsPaneBase.ui
M +0 -2 libs/main/KoOpenPaneBase.ui
M +0 -1 libs/main/config/KoConfigAuthorPage.ui
M +0 -4 libs/main/koDocumentInfoAboutWidget.ui
M +0 -1 libs/main/koDocumentInfoAuthorWidget.ui
M +0 -3 libs/widgets/KoCsvImportDialog.ui
M +0 -12 plugins/textshape/dialogs/FontDecorations.ui
M +0 -24 plugins/variables/FixedDateFormat.ui
M +0 -1 sheets/dialogs/DataFormatWidget.ui
M +0 -1 sheets/dialogs/FontWidget.ui
M +0 -1 sheets/dialogs/PositionWidget.ui
M +0 -1 sheets/dialogs/ProtectionWidget.ui
M +0 -19 sheets/dialogs/SpecialPasteWidget.ui
M +0 -1 sheets/dialogs/SubtotalWidget.ui
M +0 -1 sheets/part/dialogs/SheetPropertiesWidget.ui
M +0 -1 sheets/part/dialogs/SheetSelectWidget.ui
M +0 -30 sheets/plugins/scripting/scripts/htmlexportinfos.ui
M +0 -7 sheets/plugins/solver/SolverDetailsWidget.ui
M +0 -13 sheets/plugins/solver/SolverMainWidget.ui
M +0 -2 words/part/dialogs/KWStartupWidget.ui
http://commits.kde.org/calligra/9b7176353bb45354c627f2f69c3f49be28ed8834
diff --git a/filters/flow/imageexport/flow_imageexportwidget.ui \
b/filters/flow/imageexport/flow_imageexportwidget.ui index 05fe6f9..246c40d 100644
--- a/filters/flow/imageexport/flow_imageexportwidget.ui
+++ b/filters/flow/imageexport/flow_imageexportwidget.ui
@@ -252,8 +252,6 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/filters/words/ascii/ImportDialogUI.ui \
b/filters/words/ascii/ImportDialogUI.ui index eec1a36..0fed94c 100644
--- a/filters/words/ascii/ImportDialogUI.ui
+++ b/filters/words/ascii/ImportDialogUI.ui
@@ -16,12 +16,6 @@
<string>Plain Text Import Dialog</string>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>11</number>
- </property>
<item>
<layout class="QHBoxLayout">
<item>
@@ -71,12 +65,6 @@
<string>End of Paragraph</string>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>11</number>
- </property>
<item>
<widget class="QRadioButton" name="radioParagraphAsIs">
<property name="text">
diff --git a/libs/main/KoDetailsPaneBase.ui b/libs/main/KoDetailsPaneBase.ui
index 1bb80f0..d692a00 100644
--- a/libs/main/KoDetailsPaneBase.ui
+++ b/libs/main/KoDetailsPaneBase.ui
@@ -172,8 +172,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<customwidgets>
<customwidget>
<class>KPushButton</class>
diff --git a/libs/main/KoOpenPaneBase.ui b/libs/main/KoOpenPaneBase.ui
index b824720..0b2f2cf 100644
--- a/libs/main/KoOpenPaneBase.ui
+++ b/libs/main/KoOpenPaneBase.ui
@@ -57,8 +57,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<resources/>
<connections/>
</ui>
diff --git a/libs/main/config/KoConfigAuthorPage.ui \
b/libs/main/config/KoConfigAuthorPage.ui index 2a3aea4..aab1da4 100644
--- a/libs/main/config/KoConfigAuthorPage.ui
+++ b/libs/main/config/KoConfigAuthorPage.ui
@@ -264,7 +264,6 @@
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<resources/>
<connections/>
</ui>
diff --git a/libs/main/koDocumentInfoAboutWidget.ui \
b/libs/main/koDocumentInfoAboutWidget.ui index 1695ae4..da0fe95 100644
--- a/libs/main/koDocumentInfoAboutWidget.ui
+++ b/libs/main/koDocumentInfoAboutWidget.ui
@@ -26,9 +26,6 @@
</item>
<item row="14" column="1">
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
<property name="margin">
<number>0</number>
</property>
@@ -303,7 +300,6 @@
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<resources/>
<connections/>
</ui>
diff --git a/libs/main/koDocumentInfoAuthorWidget.ui \
b/libs/main/koDocumentInfoAuthorWidget.ui index c6a9da9..6ce3060 100644
--- a/libs/main/koDocumentInfoAuthorWidget.ui
+++ b/libs/main/koDocumentInfoAuthorWidget.ui
@@ -256,7 +256,6 @@
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<resources/>
<connections/>
</ui>
diff --git a/libs/widgets/KoCsvImportDialog.ui b/libs/widgets/KoCsvImportDialog.ui
index 645cf64..7f94fac 100644
--- a/libs/widgets/KoCsvImportDialog.ui
+++ b/libs/widgets/KoCsvImportDialog.ui
@@ -54,9 +54,6 @@ Boston, MA 02110-1301, USA.
<layout class="QVBoxLayout">
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
<property name="margin">
<number>0</number>
</property>
diff --git a/plugins/textshape/dialogs/FontDecorations.ui \
b/plugins/textshape/dialogs/FontDecorations.ui index 2f9aca1..a524d5e 100644
--- a/plugins/textshape/dialogs/FontDecorations.ui
+++ b/plugins/textshape/dialogs/FontDecorations.ui
@@ -17,12 +17,6 @@
<string>Colors</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
- <number>9</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
<item row="0" column="4" rowspan="2">
<spacer>
<property name="orientation">
@@ -101,12 +95,6 @@
<string>Text Shadow</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
- <number>9</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
<item row="0" column="3" rowspan="3">
<layout class="QGridLayout">
<property name="margin">
diff --git a/plugins/variables/FixedDateFormat.ui \
b/plugins/variables/FixedDateFormat.ui index ff181ac..22ee11a 100644
--- a/plugins/variables/FixedDateFormat.ui
+++ b/plugins/variables/FixedDateFormat.ui
@@ -10,20 +10,11 @@
</rect>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
@@ -80,12 +71,6 @@
</property>
<widget class="QWidget" name="normalPage" >
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QListWidget" name="formatList" >
<property name="sizePolicy" >
@@ -102,20 +87,11 @@
</widget>
<widget class="QWidget" name="customPage" >
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLineEdit" name="customString" />
</item>
diff --git a/sheets/dialogs/DataFormatWidget.ui b/sheets/dialogs/DataFormatWidget.ui
index 5205d22..0dba4be 100644
--- a/sheets/dialogs/DataFormatWidget.ui
+++ b/sheets/dialogs/DataFormatWidget.ui
@@ -223,7 +223,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
diff --git a/sheets/dialogs/FontWidget.ui b/sheets/dialogs/FontWidget.ui
index d0cb129..f91302e 100644
--- a/sheets/dialogs/FontWidget.ui
+++ b/sheets/dialogs/FontWidget.ui
@@ -204,7 +204,6 @@ The default font is set for all cells in the Format -> Style \
Manager menu with t </item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<customwidgets>
<customwidget>
<class>KColorButton</class>
diff --git a/sheets/dialogs/PositionWidget.ui b/sheets/dialogs/PositionWidget.ui
index 2b5dedb..c358326 100644
--- a/sheets/dialogs/PositionWidget.ui
+++ b/sheets/dialogs/PositionWidget.ui
@@ -338,7 +338,6 @@ Vertical text puts your text vertically.</string>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<tabstops>
<tabstop>standard</tabstop>
<tabstop>left</tabstop>
diff --git a/sheets/dialogs/ProtectionWidget.ui b/sheets/dialogs/ProtectionWidget.ui
index 62f20d7..c1370ab 100644
--- a/sheets/dialogs/ProtectionWidget.ui
+++ b/sheets/dialogs/ProtectionWidget.ui
@@ -158,7 +158,6 @@ Note that you can print it even if the cell is protected</string>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<tabstops>
<tabstop>m_bHideAll</tabstop>
<tabstop>m_bIsProtected</tabstop>
diff --git a/sheets/dialogs/SpecialPasteWidget.ui \
b/sheets/dialogs/SpecialPasteWidget.ui index 623d107..522426d 100644
--- a/sheets/dialogs/SpecialPasteWidget.ui
+++ b/sheets/dialogs/SpecialPasteWidget.ui
@@ -29,24 +29,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301 USA </rect>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Content</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QRadioButton" name="everythingButton" >
<property name="text" >
@@ -101,12 +89,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301 USA <string>Operation</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QRadioButton" name="overwriteButton" >
<property name="text" >
@@ -150,7 +132,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301 USA </item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<pixmapfunction></pixmapfunction>
<includes>
<include location="global" >kdialog.h</include>
diff --git a/sheets/dialogs/SubtotalWidget.ui b/sheets/dialogs/SubtotalWidget.ui
index 1a68bf7..8bcedb9 100644
--- a/sheets/dialogs/SubtotalWidget.ui
+++ b/sheets/dialogs/SubtotalWidget.ui
@@ -61,7 +61,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<customwidgets>
<customwidget>
<class>KComboBox</class>
diff --git a/sheets/part/dialogs/SheetPropertiesWidget.ui \
b/sheets/part/dialogs/SheetPropertiesWidget.ui index bb73166..1d41fc7 100644
--- a/sheets/part/dialogs/SheetPropertiesWidget.ui
+++ b/sheets/part/dialogs/SheetPropertiesWidget.ui
@@ -207,7 +207,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<customwidgets>
<customwidget>
<class>KComboBox</class>
diff --git a/sheets/part/dialogs/SheetSelectWidget.ui \
b/sheets/part/dialogs/SheetSelectWidget.ui index 3842e7a..cac6dbd 100644
--- a/sheets/part/dialogs/SheetSelectWidget.ui
+++ b/sheets/part/dialogs/SheetSelectWidget.ui
@@ -277,7 +277,6 @@ It is even possible to print a sheet more than once. Just insert \
the desired she </item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<pixmapfunction>KIcon</pixmapfunction>
<customwidgets>
<customwidget>
diff --git a/sheets/plugins/scripting/scripts/htmlexportinfos.ui \
b/sheets/plugins/scripting/scripts/htmlexportinfos.ui index 214ed86..3afaf09 100644
--- a/sheets/plugins/scripting/scripts/htmlexportinfos.ui
+++ b/sheets/plugins/scripting/scripts/htmlexportinfos.ui
@@ -10,28 +10,16 @@
</rect>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
@@ -58,9 +46,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_6" >
<property name="text" >
@@ -87,9 +72,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
@@ -116,9 +98,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_7" >
<property name="text" >
@@ -145,9 +124,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
@@ -174,9 +150,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
@@ -203,9 +176,6 @@
<property name="margin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="label_5" >
<property name="text" >
diff --git a/sheets/plugins/solver/SolverDetailsWidget.ui \
b/sheets/plugins/solver/SolverDetailsWidget.ui index 18a09d7..474b59b 100644
--- a/sheets/plugins/solver/SolverDetailsWidget.ui
+++ b/sheets/plugins/solver/SolverDetailsWidget.ui
@@ -29,12 +29,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</rect>
</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" >
@@ -109,7 +103,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<pixmapfunction></pixmapfunction>
<includes>
<include location="global" >kdialog.h</include>
diff --git a/sheets/plugins/solver/SolverMainWidget.ui \
b/sheets/plugins/solver/SolverMainWidget.ui index d57e35b..20943d6 100644
--- a/sheets/plugins/solver/SolverMainWidget.ui
+++ b/sheets/plugins/solver/SolverMainWidget.ui
@@ -28,12 +28,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</rect>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item row="2" column="1" >
<widget class="Calligra::Sheets::RegionSelector" name="parameters" />
</item>
@@ -43,12 +37,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
<string>Optimization</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QRadioButton" name="maximizeButton" >
<property name="text" >
@@ -111,7 +99,6 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</item>
</layout>
</widget>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
<customwidgets>
<customwidget>
<class>Calligra::Sheets::RegionSelector</class>
diff --git a/words/part/dialogs/KWStartupWidget.ui \
b/words/part/dialogs/KWStartupWidget.ui index c198d88..79484e0 100644
--- a/words/part/dialogs/KWStartupWidget.ui
+++ b/words/part/dialogs/KWStartupWidget.ui
@@ -76,8 +76,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<tabstops>
<tabstop>tabs</tabstop>
<tabstop>createButton</tabstop>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic