Reduce margins on delete field dialog, save geometry

NathanW2 · NathanW2 · commit 79a57a2cf15b · 2014-05-25T22:37:31.000+10:00
diff --git a/src/app/qgsdelattrdialog.cpp b/src/app/qgsdelattrdialog.cpp
@@ -19,6 +19,8 @@
 #include "qgsfield.h"
 #include "qgsvectorlayer.h"
 
+#include <QSettings>
+
 QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl ): QDialog()
 {
   setupUi( this );
@@ -32,6 +34,15 @@ QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl ): QDialog()
       item->setData( Qt::UserRole, idx );
     }
   }
+
+  QSettings settings;
+  restoreGeometry( settings.value( "/Windows/QgsDelAttrDialog/geometry" ).toByteArray() );
+}
+
+QgsDelAttrDialog::~QgsDelAttrDialog()
+{
+  QSettings settings;
+  settings.setValue( "/Windows/QgsDelAttrDialog/geometry", saveGeometry() );
 }
 
 QList<int> QgsDelAttrDialog::selectedAttributes()
diff --git a/src/app/qgsdelattrdialog.h b/src/app/qgsdelattrdialog.h
@@ -29,6 +29,7 @@ class APP_EXPORT QgsDelAttrDialog: public QDialog, private Ui::QgsDelAttrDialogB
     Q_OBJECT
   public:
     QgsDelAttrDialog( const QgsVectorLayer* vl );
+    ~QgsDelAttrDialog();
     /**Returns the selected attribute indices*/
     QList<int> selectedAttributes();
 };
diff --git a/src/ui/qgsdelattrdialogbase.ui b/src/ui/qgsdelattrdialogbase.ui
@@ -1,35 +1,51 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QgsDelAttrDialogBase</class>
- <widget class="QDialog" name="QgsDelAttrDialogBase" >
-  <property name="geometry" >
+ <widget class="QDialog" name="QgsDelAttrDialogBase">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>360</width>
     <height>238</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Delete Attributes</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QListWidget" name="listBox2" >
-     <property name="selectionMode" >
+  <layout class="QGridLayout">
+   <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>3</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QListWidget" name="listBox2">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="selectionMode">
       <enum>QAbstractItemView::MultiSelection</enum>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections>
   <connection>
@@ -38,11 +54,11 @@
    <receiver>QgsDelAttrDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>314</x>
      <y>209</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>356</x>
      <y>188</y>
     </hint>
@@ -54,11 +70,11 @@
    <receiver>QgsDelAttrDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>234</x>
      <y>210</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>197</x>
      <y>189</y>
     </hint>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`#include "qgsfield.h"`
`20`	`20`	`#include "qgsvectorlayer.h"`
`21`	`21`
	`22`	`+#include <QSettings>`
	`23`	`+`
`22`	`24`	`QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl ): QDialog()`
`23`	`25`	`{`
`24`	`26`	`setupUi( this );`
`@@ -32,6 +34,15 @@ QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl ): QDialog()`
`32`	`34`	`item->setData( Qt::UserRole, idx );`
`33`	`35`	`}`
`34`	`36`	`}`
	`37`	`+`
	`38`	`+ QSettings settings;`
	`39`	`+ restoreGeometry( settings.value( "/Windows/QgsDelAttrDialog/geometry" ).toByteArray() );`
	`40`	`+}`
	`41`	`+`
	`42`	`+QgsDelAttrDialog::~QgsDelAttrDialog()`
	`43`	`+{`
	`44`	`+ QSettings settings;`
	`45`	`+ settings.setValue( "/Windows/QgsDelAttrDialog/geometry", saveGeometry() );`
`35`	`46`	`}`
`36`	`47`
`37`	`48`	`QList<int> QgsDelAttrDialog::selectedAttributes()`