Skip to content

Commit 143e0c6

Browse files
elpasoelpaso
committed
[addlayerbutton] More embeddable dialogs
1 parent b31f05c commit 143e0c6

9 files changed

+93
-34
lines changed

‎src/gui/qgsowssourceselect.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#include <QNetworkRequest>
5555
#include <QNetworkReply>
5656

57-
QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
57+
QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
5858
: QDialog( parent, fl )
5959
, mService( service )
6060
, mManagerMode( managerMode )
@@ -65,12 +65,13 @@ QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent,
6565

6666
if ( mEmbeddedMode )
6767
{
68-
mDialogButtonBox->button( QDialogButtonBox::Close )->hide();
68+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
6969
}
7070

71+
7172
setWindowTitle( tr( "Add Layer(s) from a %1 Server" ).arg( service ) );
7273

73-
mAddButton = mDialogButtonBox->button( QDialogButtonBox::Apply );
74+
mAddButton = buttonBox->button( QDialogButtonBox::Apply );
7475
mAddButton->setText( tr( "&Add" ) );
7576
mAddButton->setToolTip( tr( "Add selected layers to map" ) );
7677
mAddButton->setEnabled( false );

‎src/gui/qgsowssourceselect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class GUI_EXPORT QgsOWSSourceSelect : public QDialog, public Ui::QgsOWSSourceSel
6060
};
6161

6262
//! Constructor
63-
QgsOWSSourceSelect( const QString &service, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
63+
QgsOWSSourceSelect( const QString &service, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, bool embeddedMode = false, bool managerMode = false );
6464

6565
~QgsOWSSourceSelect();
6666

‎src/providers/db2/qgsdb2sourceselect.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, boo
129129

130130
if ( mEmbeddedMode )
131131
{
132-
buttonBox->button( QDialogButtonBox::Close )->hide();
132+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
133+
mHoldDialogOpen->hide();
133134
}
134135

135136
mAddButton = new QPushButton( tr( "&Add" ) );

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl,
130130

131131
if ( mEmbeddedMode )
132132
{
133-
buttonBox->button( QDialogButtonBox::Close )->hide();
133+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
134+
mHoldDialogOpen->hide();
134135
}
135136

136137
mAddButton = new QPushButton( tr( "&Add" ) );

‎src/providers/spatialite/qgsspatialitedataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ void QgsSLRootItem::createDatabase()
351351
QGISEXTERN QgsSpatiaLiteSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
352352
{
353353
// TODO: this should be somewhere else
354-
return new QgsSpatiaLiteSourceSelect( parent, fl, false );
354+
return new QgsSpatiaLiteSourceSelect( parent, fl, embeddedMode );
355355
}
356356

357357
QGISEXTERN int dataCapabilities()

‎src/providers/spatialite/qgsspatialitesourceselect.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::Windo
4545
{
4646
setupUi( this );
4747

48-
if ( embeddedMode )
49-
{
50-
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
51-
}
52-
5348
QgsSettings settings;
5449
restoreGeometry( settings.value( QStringLiteral( "Windows/SpatiaLiteSourceSelect/geometry" ) ).toByteArray() );
5550
mHoldDialogOpen->setChecked( settings.value( QStringLiteral( "Windows/SpatiaLiteSourceSelect/HoldDialogOpen" ), false ).toBool() );
@@ -73,7 +68,8 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::Windo
7368

7469
if ( mEmbeddedMode )
7570
{
76-
buttonBox->button( QDialogButtonBox::Close )->hide();
71+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
72+
mHoldDialogOpen->hide();
7773
}
7874
else
7975
{
@@ -423,7 +419,7 @@ void QgsSpatiaLiteSourceSelect::addTables()
423419
else
424420
{
425421
emit addDatabaseLayers( m_selectedTables, QStringLiteral( "spatialite" ) );
426-
if ( !mHoldDialogOpen->isChecked() )
422+
if ( !( mEmbeddedMode || mHoldDialogOpen->isChecked() ) )
427423
{
428424
accept();
429425
}

‎src/providers/wcs/qgswcssourceselect.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
QgsWCSSourceSelect::QgsWCSSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
3131
: QgsOWSSourceSelect( QStringLiteral( "WCS" ), parent, fl, embeddedMode, managerMode )
3232
{
33+
3334
// Hide irrelevant widgets
3435
mWMSGroupBox->hide();
3536
mLayersTab->layout()->removeWidget( mWMSGroupBox );

‎src/ui/qgsdatasourcemanagerdialog.ui

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,34 @@
151151
</widget>
152152
</widget>
153153
</item>
154+
<item>
155+
<widget class="QDialogButtonBox" name="buttonBox">
156+
<property name="standardButtons">
157+
<set>QDialogButtonBox::Close</set>
158+
</property>
159+
</widget>
160+
</item>
154161
</layout>
155162
</widget>
156163
<resources>
157164
<include location="../../images/images.qrc"/>
158165
</resources>
159-
<connections/>
166+
<connections>
167+
<connection>
168+
<sender>buttonBox</sender>
169+
<signal>rejected()</signal>
170+
<receiver>QgsDataSourceManagerDialog</receiver>
171+
<slot>accept()</slot>
172+
<hints>
173+
<hint type="sourcelabel">
174+
<x>504</x>
175+
<y>578</y>
176+
</hint>
177+
<hint type="destinationlabel">
178+
<x>504</x>
179+
<y>299</y>
180+
</hint>
181+
</hints>
182+
</connection>
183+
</connections>
160184
</ui>

‎src/ui/qgsowssourceselectbase.ui

Lines changed: 54 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<class>QgsOWSSourceSelectBase</class>
44
<widget class="QDialog" name="QgsOWSSourceSelectBase">
55
<property name="geometry">
6-
<rect>:
6+
<rect>
77
<x>0</x>
88
<y>0</y>
99
<width>743</width>
@@ -15,8 +15,7 @@
1515
</property>
1616
<property name="windowIcon">
1717
<iconset>
18-
<normaloff/>
19-
</iconset>
18+
<normaloff>.</normaloff>.</iconset>
2019
</property>
2120
<property name="sizeGripEnabled">
2221
<bool>true</bool>
@@ -26,7 +25,7 @@
2625
</property>
2726
<layout class="QGridLayout" name="gridLayout_2">
2827
<item row="3" column="0">
29-
<widget class="QDialogButtonBox" name="mDialogButtonBox">
28+
<widget class="QDialogButtonBox" name="buttonBox">
3029
<property name="standardButtons">
3130
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Help</set>
3231
</property>
@@ -68,12 +67,12 @@
6867
<layout class="QHBoxLayout" name="horizontalLayout_3">
6968
<item>
7069
<widget class="QPushButton" name="mConnectButton">
71-
<property name="toolTip">
72-
<string>Connect to selected service</string>
73-
</property>
7470
<property name="enabled">
7571
<bool>false</bool>
7672
</property>
73+
<property name="toolTip">
74+
<string>Connect to selected service</string>
75+
</property>
7776
<property name="text">
7877
<string>C&amp;onnect</string>
7978
</property>
@@ -91,25 +90,25 @@
9190
</item>
9291
<item>
9392
<widget class="QPushButton" name="mEditButton">
94-
<property name="toolTip">
95-
<string>Edit selected service connection</string>
96-
</property>
9793
<property name="enabled">
9894
<bool>false</bool>
9995
</property>
96+
<property name="toolTip">
97+
<string>Edit selected service connection</string>
98+
</property>
10099
<property name="text">
101100
<string>Edit</string>
102101
</property>
103102
</widget>
104103
</item>
105104
<item>
106105
<widget class="QPushButton" name="mDeleteButton">
107-
<property name="toolTip">
108-
<string>Remove connection to selected service</string>
109-
</property>
110106
<property name="enabled">
111107
<bool>false</bool>
112108
</property>
109+
<property name="toolTip">
110+
<string>Remove connection to selected service</string>
111+
</property>
113112
<property name="text">
114113
<string>Remove</string>
115114
</property>
@@ -202,7 +201,16 @@
202201
<item>
203202
<widget class="QWidget" name="mTimeWidget" native="true">
204203
<layout class="QHBoxLayout" name="horizontalLayout">
205-
<property name="margin">
204+
<property name="leftMargin">
205+
<number>0</number>
206+
</property>
207+
<property name="topMargin">
208+
<number>0</number>
209+
</property>
210+
<property name="rightMargin">
211+
<number>0</number>
212+
</property>
213+
<property name="bottomMargin">
206214
<number>0</number>
207215
</property>
208216
<item>
@@ -231,7 +239,16 @@
231239
<item>
232240
<widget class="QWidget" name="mCRSWidget" native="true">
233241
<layout class="QHBoxLayout" name="horizontalLayout_2">
234-
<property name="margin">
242+
<property name="leftMargin">
243+
<number>0</number>
244+
</property>
245+
<property name="topMargin">
246+
<number>0</number>
247+
</property>
248+
<property name="rightMargin">
249+
<number>0</number>
250+
</property>
251+
<property name="bottomMargin">
235252
<number>0</number>
236253
</property>
237254
<item>
@@ -273,7 +290,16 @@
273290
<item>
274291
<widget class="QWidget" name="mFormatWidget" native="true">
275292
<layout class="QHBoxLayout" name="horizontalLayout_6">
276-
<property name="margin">
293+
<property name="leftMargin">
294+
<number>0</number>
295+
</property>
296+
<property name="topMargin">
297+
<number>0</number>
298+
</property>
299+
<property name="rightMargin">
300+
<number>0</number>
301+
</property>
302+
<property name="bottomMargin">
277303
<number>0</number>
278304
</property>
279305
<item>
@@ -350,7 +376,16 @@
350376
<item>
351377
<widget class="QWidget" name="mCacheWidget" native="true">
352378
<layout class="QHBoxLayout" name="horizontalLayout_7">
353-
<property name="margin">
379+
<property name="leftMargin">
380+
<number>0</number>
381+
</property>
382+
<property name="topMargin">
383+
<number>0</number>
384+
</property>
385+
<property name="rightMargin">
386+
<number>0</number>
387+
</property>
388+
<property name="bottomMargin">
354389
<number>0</number>
355390
</property>
356391
<item>
@@ -585,12 +620,12 @@ Always network: always load from network and do not check if the cache has a val
585620
<tabstop>mSearchButton</tabstop>
586621
<tabstop>mSearchTableWidget</tabstop>
587622
<tabstop>mSearchAddButton</tabstop>
588-
<tabstop>mDialogButtonBox</tabstop>
623+
<tabstop>buttonBox</tabstop>
589624
</tabstops>
590625
<resources/>
591626
<connections>
592627
<connection>
593-
<sender>mDialogButtonBox</sender>
628+
<sender>buttonBox</sender>
594629
<signal>rejected()</signal>
595630
<receiver>QgsOWSSourceSelectBase</receiver>
596631
<slot>reject()</slot>

0 commit comments

Comments
 (0)