Skip to content

Commit 5cfd9aa

Browse files
nyalldawsonnyalldawson
committedNov 1, 2018
[browser] Remove redundant name/uri/provider labels from top
of layer properties widget All this information is already shown in the scrollable metadata section below that, so we're wasting precious space in this valuable widget with a lot of duplicate information (cherry picked from commit 7f332fb)
·
final-3_4_15final-3_4_1
1 parent 755df79 commit 5cfd9aa

File tree

3 files changed

+13
-121
lines changed

3 files changed

+13
-121
lines changed
 

‎src/gui/qgsbrowserdockwidget_p.cpp

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ QgsBrowserPropertiesWrapLabel::QgsBrowserPropertiesWrapLabel( const QString &tex
5959
setPalette( pal );
6060
setLineWrapMode( QTextEdit::WidgetWidth );
6161
setWordWrapMode( QTextOption::WrapAnywhere );
62-
connect( qobject_cast<QAbstractTextDocumentLayout *>( document()->documentLayout() ), &QAbstractTextDocumentLayout::documentSizeChanged,
62+
connect( document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged,
6363
this, &QgsBrowserPropertiesWrapLabel::adjustHeight );
6464
setMaximumHeight( 20 );
6565
}
@@ -116,9 +116,6 @@ QgsBrowserLayerProperties::QgsBrowserLayerProperties( QWidget *parent )
116116
{
117117
setupUi( this );
118118

119-
mUriLabel = new QgsBrowserPropertiesWrapLabel( QString(), this );
120-
mHeaderGridLayout->addItem( new QWidgetItem( mUriLabel ), 1, 1 );
121-
122119
// we don't want links to open in the little widget, open them externally instead
123120
mMetadataTextBrowser->setOpenLinks( false );
124121
connect( mMetadataTextBrowser, &QTextBrowser::anchorClicked, this, &QgsBrowserLayerProperties::urlClicked );
@@ -218,9 +215,6 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
218215
return;
219216
}
220217

221-
mNameLabel->setText( layerItem->name() );
222-
mUriLabel->setText( layerItem->uri() );
223-
mProviderLabel->setText( layerItem->providerKey() );
224218
QString myStyle = QgsApplication::reportStyleSheet();
225219
mMetadataTextBrowser->document()->setDefaultStyleSheet( myStyle );
226220
mMetadataTextBrowser->setHtml( layerMetadata );
@@ -240,20 +234,9 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
240234
}
241235
}
242236

243-
void QgsBrowserLayerProperties::setCondensedMode( bool condensedMode )
237+
void QgsBrowserLayerProperties::setCondensedMode( bool )
244238
{
245-
if ( condensedMode )
246-
{
247-
mUriLabel->setLineWrapMode( QTextEdit::NoWrap );
248-
mUriLabel->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
249-
mUriLabel->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
250-
}
251-
else
252-
{
253-
mUriLabel->setLineWrapMode( QTextEdit::WidgetWidth );
254-
mUriLabel->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
255-
mUriLabel->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded );
256-
}
239+
257240
}
258241

259242
void QgsBrowserLayerProperties::urlClicked( const QUrl &url )

‎src/gui/qgsbrowserdockwidget_p.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ class QgsBrowserLayerProperties : public QgsBrowserPropertiesWidget, private Ui:
126126
private slots:
127127

128128
void urlClicked( const QUrl &url );
129-
130-
private:
131-
QgsBrowserPropertiesWrapLabel *mUriLabel = nullptr;
132129
};
133130

134131
/**

‎src/ui/qgsbrowserlayerpropertiesbase.ui

Lines changed: 10 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -11,106 +11,18 @@
1111
</rect>
1212
</property>
1313
<layout class="QVBoxLayout" name="verticalLayout">
14-
<property name="margin">
14+
<property name="leftMargin">
15+
<number>0</number>
16+
</property>
17+
<property name="topMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="rightMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="bottomMargin">
1524
<number>0</number>
1625
</property>
17-
<item>
18-
<widget class="QWidget" name="mHeaderWidget" native="true">
19-
<property name="sizePolicy">
20-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
21-
<horstretch>0</horstretch>
22-
<verstretch>0</verstretch>
23-
</sizepolicy>
24-
</property>
25-
<layout class="QGridLayout" name="mHeaderGridLayout">
26-
<property name="sizeConstraint">
27-
<enum>QLayout::SetMinimumSize</enum>
28-
</property>
29-
<item row="0" column="0">
30-
<widget class="QLabel" name="mNameTitleLabel">
31-
<property name="sizePolicy">
32-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
33-
<horstretch>0</horstretch>
34-
<verstretch>0</verstretch>
35-
</sizepolicy>
36-
</property>
37-
<property name="text">
38-
<string>Name</string>
39-
</property>
40-
</widget>
41-
</item>
42-
<item row="0" column="1">
43-
<widget class="QLabel" name="mNameLabel">
44-
<property name="sizePolicy">
45-
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
46-
<horstretch>0</horstretch>
47-
<verstretch>0</verstretch>
48-
</sizepolicy>
49-
</property>
50-
<property name="text">
51-
<string>name</string>
52-
</property>
53-
<property name="wordWrap">
54-
<bool>true</bool>
55-
</property>
56-
</widget>
57-
</item>
58-
<item row="1" column="0">
59-
<widget class="QLabel" name="mUriTitleLabel">
60-
<property name="sizePolicy">
61-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
62-
<horstretch>0</horstretch>
63-
<verstretch>0</verstretch>
64-
</sizepolicy>
65-
</property>
66-
<property name="text">
67-
<string>URI</string>
68-
</property>
69-
</widget>
70-
</item>
71-
<item row="2" column="0">
72-
<widget class="QLabel" name="mProviderTItleLabel">
73-
<property name="sizePolicy">
74-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
75-
<horstretch>0</horstretch>
76-
<verstretch>0</verstretch>
77-
</sizepolicy>
78-
</property>
79-
<property name="text">
80-
<string>Provider</string>
81-
</property>
82-
</widget>
83-
</item>
84-
<item row="2" column="1">
85-
<widget class="QLabel" name="mProviderLabel">
86-
<property name="sizePolicy">
87-
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
88-
<horstretch>0</horstretch>
89-
<verstretch>0</verstretch>
90-
</sizepolicy>
91-
</property>
92-
<property name="text">
93-
<string>provider key</string>
94-
</property>
95-
</widget>
96-
</item>
97-
</layout>
98-
</widget>
99-
</item>
100-
<item>
101-
<widget class="Line" name="mLine">
102-
<property name="orientation">
103-
<enum>Qt::Horizontal</enum>
104-
</property>
105-
</widget>
106-
</item>
107-
<item>
108-
<widget class="QLabel" name="mMetadataLabel">
109-
<property name="text">
110-
<string>Metadata</string>
111-
</property>
112-
</widget>
113-
</item>
11426
<item>
11527
<widget class="QTextBrowser" name="mMetadataTextBrowser"/>
11628
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.