Skip to content

Commit 0c96792

Browse files
committedJul 6, 2017
Replace "drop down" and some dropdown by drop-down
1 parent 15be889 commit 0c96792

17 files changed

+86
-85
lines changed
 

‎NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ changed so we will just provide a bullet list of key new features here.
800800
- Make NULL value string representation configurable.
801801
- Fix feature updates in feature form from attribute table.
802802
- Add support for NULL values in value maps (comboboxes).
803-
- Use layer names instead of ids in drop down list when loading value maps from layers.
803+
- Use layer names instead of ids in drop-down list when loading value maps from layers.
804804
- Support feature form expression fields: line edits on the form which
805805
name prefix "expr_" are evaluated. Their value is interpreted as field
806806
calculator string and replaced with the calculated value.

‎doc/news.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ <H2>14.6. Providers and Data Handling</H2>
917917
<LI>Make NULL value string representation configurable.
918918
<LI>Fix feature updates in feature form from attribute table.
919919
<LI>Add support for NULL values in value maps (comboboxes).
920-
<LI>Use layer names instead of ids in drop down list when loading value maps from layers.
920+
<LI>Use layer names instead of ids in drop-down list when loading value maps from layers.
921921
<LI>Support feature form expression fields: line edits on the form which
922922
name prefix "expr_" are evaluated. Their value is interpreted as field
923923
calculator string and replaced with the calculated value.

‎doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ changed so we will just provide a bullet list of key new features here.
779779
- Make NULL value string representation configurable.
780780
- Fix feature updates in feature form from attribute table.
781781
- Add support for NULL values in value maps (comboboxes).
782-
- Use layer names instead of ids in drop down list when loading value maps from layers.
782+
- Use layer names instead of ids in drop-down list when loading value maps from layers.
783783
- Support feature form expression fields: line edits on the form which
784784
name prefix "expr_" are evaluated. Their value is interpreted as field
785785
calculator string and replaced with the calculated value.

‎python/gui/qgscolorbutton.sip

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class QgsColorButton : QToolButton
1212
{
1313
%Docstring
1414
A cross platform button subclass for selecting colors. Will open a color chooser dialog when clicked.
15-
Offers live updates to button from color chooser dialog. An attached drop down menu allows for copying
15+
Offers live updates to button from color chooser dialog. An attached drop-down menu allows for copying
1616
and pasting colors, picking colors from the screen, and selecting colors from color swatch grids.
1717
.. versionadded:: 2.5
1818
%End
@@ -40,7 +40,7 @@ class QgsColorButton : QToolButton
4040
Construct a new color ramp button.
4141
Use ``parent`` to attach a parent QWidget to the dialog.
4242
Use ``cdt`` string to define the title to show in the color ramp dialog
43-
Use a color scheme ``registry`` for color swatch grids to show in the drop down menu. If not specified,
43+
Use a color scheme ``registry`` for color swatch grids to show in the drop-down menu. If not specified,
4444
the button will use the global color scheme registry instead
4545
%End
4646

@@ -106,16 +106,16 @@ class QgsColorButton : QToolButton
106106

107107
void setShowMenu( const bool showMenu );
108108
%Docstring
109-
Sets whether the drop down menu should be shown for the button. The default behavior is to
109+
Sets whether the drop-down menu should be shown for the button. The default behavior is to
110110
show the menu.
111-
\param showMenu set to false to hide the drop down menu
111+
\param showMenu set to false to hide the drop-down menu
112112
.. seealso:: showMenu
113113
%End
114114

115115
bool showMenu() const;
116116
%Docstring
117-
Returns whether the drop down menu is shown for the button.
118-
:return: true if drop down menu is shown
117+
Returns whether the drop-down menu is shown for the button.
118+
:return: true if drop-down menu is shown
119119
.. seealso:: setShowMenu
120120
:rtype: bool
121121
%End
@@ -138,7 +138,7 @@ class QgsColorButton : QToolButton
138138

139139
void setDefaultColor( const QColor &color );
140140
%Docstring
141-
Sets the default color for the button, which is shown in the button's drop down menu for the
141+
Sets the default color for the button, which is shown in the button's drop-down menu for the
142142
"default color" option.
143143
\param color default color for the button. Set to an invalid QColor to disable the default color
144144
option.
@@ -147,7 +147,7 @@ class QgsColorButton : QToolButton
147147

148148
QColor defaultColor() const;
149149
%Docstring
150-
Returns the default color for the button, which is shown in the button's drop down menu for the
150+
Returns the default color for the button, which is shown in the button's drop-down menu for the
151151
"default color" option.
152152
:return: default color for the button. Returns an invalid QColor if the default color
153153
option is disabled.
@@ -157,7 +157,7 @@ class QgsColorButton : QToolButton
157157

158158
void setShowNoColor( const bool showNoColorOption );
159159
%Docstring
160-
Sets whether the "no color" option should be shown in the button's drop down menu. If selected,
160+
Sets whether the "no color" option should be shown in the button's drop-down menu. If selected,
161161
the "no color" option sets the color button's color to a totally transparent color.
162162
\param showNoColorOption set to true to show the no color option. This is disabled by default.
163163
.. seealso:: showNoColor
@@ -170,7 +170,7 @@ class QgsColorButton : QToolButton
170170

171171
bool showNoColor() const;
172172
%Docstring
173-
Returns whether the "no color" option is shown in the button's drop down menu. If selected,
173+
Returns whether the "no color" option is shown in the button's drop-down menu. If selected,
174174
the "no color" option sets the color button's color to a totally transparent color.
175175
:return: true if the no color option is shown.
176176
.. seealso:: setShowNoColor
@@ -184,7 +184,7 @@ class QgsColorButton : QToolButton
184184

185185
void setNoColorString( const QString &noColorString );
186186
%Docstring
187-
Sets the string to use for the "no color" option in the button's drop down menu.
187+
Sets the string to use for the "no color" option in the button's drop-down menu.
188188
\param noColorString string to use for the "no color" menu option
189189
.. seealso:: noColorString
190190
.. seealso:: setShowNoColor
@@ -196,7 +196,7 @@ class QgsColorButton : QToolButton
196196

197197
void setShowNull( bool showNull );
198198
%Docstring
199-
Sets whether a set to null (clear) option is shown in the button's drop down menu.
199+
Sets whether a set to null (clear) option is shown in the button's drop-down menu.
200200
\param showNull set to true to show a null option
201201
.. versionadded:: 2.16
202202
.. seealso:: showNull()
@@ -205,7 +205,7 @@ class QgsColorButton : QToolButton
205205

206206
bool showNull() const;
207207
%Docstring
208-
Returns whether the set to null (clear) option is shown in the button's drop down menu.
208+
Returns whether the set to null (clear) option is shown in the button's drop-down menu.
209209
.. versionadded:: 2.16
210210
.. seealso:: setShowNull()
211211
.. seealso:: isNull()
@@ -223,7 +223,7 @@ class QgsColorButton : QToolButton
223223

224224
QString noColorString() const;
225225
%Docstring
226-
Returns the string used for the "no color" option in the button's drop down menu.
226+
Returns the string used for the "no color" option in the button's drop-down menu.
227227
:return: string used for the "no color" menu option
228228
.. seealso:: setNoColorString
229229
.. seealso:: showNoColor
@@ -237,7 +237,7 @@ class QgsColorButton : QToolButton
237237
void setContext( const QString &context );
238238
%Docstring
239239
Sets the context string for the color button. The context string is passed to all color swatch
240-
grids shown in the button's drop down menu, to allow them to customise their display colors
240+
grids shown in the button's drop-down menu, to allow them to customise their display colors
241241
based on the context.
242242
\param context context string for the color button's color swatch grids
243243
.. seealso:: context
@@ -246,7 +246,7 @@ class QgsColorButton : QToolButton
246246
QString context() const;
247247
%Docstring
248248
Returns the context string for the color button. The context string is passed to all color swatch
249-
grids shown in the button's drop down menu, to allow them to customise their display colors
249+
grids shown in the button's drop-down menu, to allow them to customise their display colors
250250
based on the context.
251251
:return: context string for the color button's color swatch grids
252252
.. seealso:: setContext
@@ -256,18 +256,18 @@ class QgsColorButton : QToolButton
256256
void setColorSchemeRegistry( QgsColorSchemeRegistry *registry );
257257
%Docstring
258258
Sets the color scheme registry for the button, which controls the color swatch grids
259-
that are shown in the button's drop down menu.
259+
that are shown in the button's drop-down menu.
260260
\param registry color scheme registry for the button. Set to 0 to hide all color
261-
swatch grids from the button's drop down menu.
261+
swatch grids from the button's drop-down menu.
262262
.. seealso:: colorSchemeRegistry
263263
%End
264264

265265
QgsColorSchemeRegistry *colorSchemeRegistry();
266266
%Docstring
267267
Returns the color scheme registry for the button, which controls the color swatch grids
268-
that are shown in the button's drop down menu.
268+
that are shown in the button's drop-down menu.
269269
:return: color scheme registry for the button. If returned value is 0 then all color
270-
swatch grids are hidden from the button's drop down menu.
270+
swatch grids are hidden from the button's drop-down menu.
271271
.. seealso:: setColorSchemeRegistry
272272
:rtype: QgsColorSchemeRegistry
273273
%End

‎python/gui/qgscolorrampbutton.sip

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class QgsColorRampButton : QToolButton
1414
{
1515
%Docstring
1616
A cross platform button subclass for selecting color ramps. Will open color ramp dialogs when clicked.
17-
Offers live updates to button from color ramp dialog. An attached drop down menu allows for access to
17+
Offers live updates to button from color ramp dialog. An attached drop-down menu allows for access to
1818
saved color ramps, as well as option to invert the current color ramp and create new ramps.
1919
.. versionadded:: 3.0
2020
%End
@@ -75,23 +75,23 @@ class QgsColorRampButton : QToolButton
7575

7676
void setShowMenu( const bool showMenu );
7777
%Docstring
78-
Sets whether the drop down menu should be shown for the button. The default behavior is to
78+
Sets whether the drop-down menu should be shown for the button. The default behavior is to
7979
show the menu.
80-
\param showMenu set to false to hide the drop down menu
80+
\param showMenu set to false to hide the drop-down menu
8181
.. seealso:: showMenu
8282
%End
8383

8484
bool showMenu() const;
8585
%Docstring
86-
Returns whether the drop down menu is shown for the button.
87-
:return: true if drop down menu is shown
86+
Returns whether the drop-down menu is shown for the button.
87+
:return: true if drop-down menu is shown
8888
.. seealso:: setShowMenu
8989
:rtype: bool
9090
%End
9191

9292
void setDefaultColorRamp( QgsColorRamp *colorramp );
9393
%Docstring
94-
Sets the default color ramp for the button, which is shown in the button's drop down menu for the
94+
Sets the default color ramp for the button, which is shown in the button's drop-down menu for the
9595
"default color ramp" option.
9696
\param colorramp default color ramp for the button. Set to a null pointer to disable the default color
9797
ramp option. The ramp will be cloned and ownership is not transferred.
@@ -100,7 +100,7 @@ class QgsColorRampButton : QToolButton
100100

101101
QgsColorRamp *defaultColorRamp() const /Factory/;
102102
%Docstring
103-
Returns a copy of the default color ramp for the button, which is shown in the button's drop down menu for the
103+
Returns a copy of the default color ramp for the button, which is shown in the button's drop-down menu for the
104104
"default color ramp" option.
105105
:return: default color ramp for the button. Returns a null pointer if the default color ramp
106106
option is disabled.
@@ -110,14 +110,14 @@ class QgsColorRampButton : QToolButton
110110

111111
void setShowRandomColorRamp( bool showRandom );
112112
%Docstring
113-
Sets whether a random colors option is shown in the button's drop down menu.
113+
Sets whether a random colors option is shown in the button's drop-down menu.
114114
\param showRandom set to true to show a random colors option
115115
.. seealso:: showRandom()
116116
%End
117117

118118
bool showRandomColorRamp() const;
119119
%Docstring
120-
Returns whether random colors option is shown in the button's drop down menu.
120+
Returns whether random colors option is shown in the button's drop-down menu.
121121
.. seealso:: setShowRandom()
122122
:rtype: bool
123123
%End
@@ -132,15 +132,15 @@ class QgsColorRampButton : QToolButton
132132

133133
void setShowNull( bool showNull );
134134
%Docstring
135-
Sets whether a set to null (clear) option is shown in the button's drop down menu.
135+
Sets whether a set to null (clear) option is shown in the button's drop-down menu.
136136
\param showNull set to true to show a null option
137137
.. seealso:: showNull()
138138
.. seealso:: isNull()
139139
%End
140140

141141
bool showNull() const;
142142
%Docstring
143-
Returns whether the set to null (clear) option is shown in the button's drop down menu.
143+
Returns whether the set to null (clear) option is shown in the button's drop-down menu.
144144
.. seealso:: setShowNull()
145145
.. seealso:: isNull()
146146
:rtype: bool
@@ -157,7 +157,7 @@ class QgsColorRampButton : QToolButton
157157
void setContext( const QString &context );
158158
%Docstring
159159
Sets the context string for the color ramp button. The context string is passed to all color ramp
160-
preview icons shown in the button's drop down menu, to (eventually) allow them to customise their display colors
160+
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
161161
based on the context.
162162
\param context context string for the color dialog button's color ramp preview icons
163163
.. seealso:: context
@@ -166,7 +166,7 @@ class QgsColorRampButton : QToolButton
166166
QString context() const;
167167
%Docstring
168168
Returns the context string for the color ramp button. The context string is passed to all color ramp
169-
preview icons shown in the button's drop down menu, to (eventually) allow them to customise their display colors
169+
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
170170
based on the context.
171171
:return: context context string for the color dialog button's color ramp preview icons
172172
.. seealso:: setContext

‎python/gui/qgsexpressionlineedit.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsExpressionLineEdit : QWidget
1818
This widget is designed for use in contexts where no layer fields are available for
1919
use in an expression. In contexts where the expression is directly associated with
2020
a layer and fields can be used, then QgsFieldExpressionWidget is a more appropriate
21-
choice as it gives users direct access to select fields from a drop down list.
21+
choice as it gives users direct access to select fields from a drop-down list.
2222

2323
QgsExpressionLineEdit also supports a multiline editor mode which is useful where
2424
more space is available for the widget, but where QgsExpressionBuilderWidget
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<h3>Add SpatiaLite Tables</h3>
22
To define a new connection, click on <label>New</label> button and use the file browser to point to your SpatiaLite database, which is a file with a <i>.sqlite</i> extension.<p>
3-
The connections you define will be remembered for further use and available to choose from the drop down menu.
3+
The connections you define will be remembered for further use and available to choose from the drop-down menu.

‎scripts/spell_check/spelling.dat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,6 +2403,7 @@ Dravadian:Dravidian
24032403
dreasm:dreams
24042404
driectly:directly
24052405
drnik:drink
2406+
drop down:drop-down
24062407
droped:dropped:*
24072408
droppped:dropped
24082409
druming:drumming

‎src/core/qgsattributetableconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class CORE_EXPORT QgsAttributeTableConfig
7171
enum ActionWidgetStyle
7272
{
7373
ButtonList, //!< A list of buttons
74-
DropDown //!< A tool button with a dropdown to select the current action
74+
DropDown //!< A tool button with a drop-down to select the current action
7575
};
7676

7777
QgsAttributeTableConfig();

‎src/core/qgscolorscheme.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CORE_EXPORT QgsColorScheme
6868
enum SchemeFlag
6969
{
7070
ShowInColorDialog = 0x01, //!< Show scheme in color picker dialog
71-
ShowInColorButtonMenu = 0x02, //!< Show scheme in color button drop down menu
71+
ShowInColorButtonMenu = 0x02, //!< Show scheme in color button drop-down menu
7272
ShowInAllContexts = ShowInColorDialog | ShowInColorButtonMenu //!< Show scheme in all contexts
7373
};
7474
Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag )

‎src/gui/qgscolorbutton.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch
6161
setMinimumSize( QSize( 24, 16 ) );
6262
connect( this, &QAbstractButton::clicked, this, &QgsColorButton::buttonClicked );
6363

64-
//setup dropdown menu
64+
//setup drop-down menu
6565
mMenu = new QMenu( this );
6666
connect( mMenu, &QMenu::aboutToShow, this, &QgsColorButton::prepareMenu );
6767
setMenu( mMenu );
@@ -597,7 +597,7 @@ void QgsColorButton::setButtonBackground( const QColor &color )
597597
{
598598
if ( !mIconSize.isValid() )
599599
{
600-
//calculate size of push button part of widget (ie, without the menu dropdown button part)
600+
//calculate size of push button part of widget (ie, without the menu drop-down button part)
601601
QStyleOptionToolButton opt;
602602
initStyleOption( &opt );
603603
QRect buttonSize = QApplication::style()->subControlRect( QStyle::CC_ToolButton, &opt, QStyle::SC_ToolButton,

0 commit comments

Comments
 (0)
Please sign in to comment.