[addlayerbutton] Removed button bar from main dialog

elpaso · elpaso · commit 14cc77c4eca6 · 2017-06-02T16:57:45.000+02:00
No Close button anymore ... prepare your wrist for
a precise hit on the [X] or hit ESC to close the
dialog.
diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp
@@ -126,7 +126,7 @@ void QgsOptionsDialogBase::initOptionsBase( bool restoreUi, const QString &title
     buttonBoxFrame->layout()->setContentsMargins( 0, 0, 0, 0 );
     layout->insertWidget( layout->count() + 1, buttonBoxFrame );
   }
-  else
+  else if ( mOptButtonBox )
   {
     layout->insertWidget( layout->count() + 1, mOptButtonBox );
   }
diff --git a/src/ui/qgsdatasourcemanagerdialog.ui b/src/ui/qgsdatasourcemanagerdialog.ui
@@ -154,43 +154,6 @@
      </widget>
     </widget>
    </item>
-   <item>
-    <widget class="QFrame" name="mButtonBoxFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <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>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QDialogButtonBox" name="buttonBox">
-        <property name="standardButtons">
-         <set>QDialogButtonBox::Close</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void QgsOptionsDialogBase::initOptionsBase( bool restoreUi, const QString &title`
`126`	`126`	`buttonBoxFrame->layout()->setContentsMargins( 0, 0, 0, 0 );`
`127`	`127`	`layout->insertWidget( layout->count() + 1, buttonBoxFrame );`
`128`	`128`	`}`
`129`		`- else`
	`129`	`+ else if ( mOptButtonBox )`
`130`	`130`	`{`
`131`	`131`	`layout->insertWidget( layout->count() + 1, mOptButtonBox );`
`132`	`132`	`}`