Replace "drop down" and some dropdown by drop-down

qgis · Jul 6, 2017 · 0c96792 · 0c96792
1 parent 15be889
commit 0c96792
Show file tree

Hide file tree

Showing 17 changed files with 86 additions and 85 deletions.
diff --git a/NEWS b/NEWS
@@ -800,7 +800,7 @@ changed so we will just provide a bullet list of key new features here.
  - Make NULL value string representation configurable.
  - Fix feature updates in feature form from attribute table.
  - Add support for NULL values in value maps (comboboxes).
- - Use layer names instead of ids in drop down list when loading value maps from layers.
+ - Use layer names instead of ids in drop-down list when loading value maps from layers.
  - Support feature form expression fields: line edits on the form which
       name prefix "expr_" are evaluated. Their value is interpreted as field
       calculator string and replaced with the calculated value.

diff --git a/doc/news.html b/doc/news.html
@@ -917,7 +917,7 @@ <H2>14.6. Providers and Data Handling</H2>
  <LI>Make NULL value string representation configurable.
  <LI>Fix feature updates in feature form from attribute table.
  <LI>Add support for NULL values in value maps (comboboxes).
- <LI>Use layer names instead of ids in drop down list when loading value maps from layers.
+ <LI>Use layer names instead of ids in drop-down list when loading value maps from layers.
  <LI>Support feature form expression fields: line edits on the form which
       name prefix "expr_" are evaluated. Their value is interpreted as field
       calculator string and replaced with the calculated value.

diff --git a/doc/news.t2t b/doc/news.t2t
@@ -779,7 +779,7 @@ changed so we will just provide a bullet list of key new features here.
  - Make NULL value string representation configurable.
  - Fix feature updates in feature form from attribute table.
  - Add support for NULL values in value maps (comboboxes).
- - Use layer names instead of ids in drop down list when loading value maps from layers.
+ - Use layer names instead of ids in drop-down list when loading value maps from layers.
  - Support feature form expression fields: line edits on the form which
       name prefix "expr_" are evaluated. Their value is interpreted as field
       calculator string and replaced with the calculated value.

diff --git a/python/gui/qgscolorbutton.sip b/python/gui/qgscolorbutton.sip
@@ -12,7 +12,7 @@ class QgsColorButton : QToolButton
 {
 %Docstring
  A cross platform button subclass for selecting colors. Will open a color chooser dialog when clicked.
- Offers live updates to button from color chooser dialog. An attached drop down menu allows for copying
+ Offers live updates to button from color chooser dialog. An attached drop-down menu allows for copying
  and pasting colors, picking colors from the screen, and selecting colors from color swatch grids.
 .. versionadded:: 2.5
 %End
@@ -40,7 +40,7 @@ class QgsColorButton : QToolButton
  Construct a new color ramp button.
  Use ``parent`` to attach a parent QWidget to the dialog.
  Use ``cdt`` string to define the title to show in the color ramp dialog
- Use a color scheme ``registry`` for color swatch grids to show in the drop down menu. If not specified,
+ Use a color scheme ``registry`` for color swatch grids to show in the drop-down menu. If not specified,
  the button will use the global color scheme registry instead
 %End
 
@@ -106,16 +106,16 @@ class QgsColorButton : QToolButton
 
     void setShowMenu( const bool showMenu );
 %Docstring
- Sets whether the drop down menu should be shown for the button. The default behavior is to
+ Sets whether the drop-down menu should be shown for the button. The default behavior is to
  show the menu.
- \param showMenu set to false to hide the drop down menu
+ \param showMenu set to false to hide the drop-down menu
 .. seealso:: showMenu
 %End
 
     bool showMenu() const;
 %Docstring
- Returns whether the drop down menu is shown for the button.
- :return: true if drop down menu is shown
+ Returns whether the drop-down menu is shown for the button.
+ :return: true if drop-down menu is shown
 .. seealso:: setShowMenu
  :rtype: bool
 %End
@@ -138,7 +138,7 @@ class QgsColorButton : QToolButton
 
     void setDefaultColor( const QColor &color );
 %Docstring
- Sets the default color for the button, which is shown in the button's drop down menu for the
+ Sets the default color for the button, which is shown in the button's drop-down menu for the
  "default color" option.
  \param color default color for the button. Set to an invalid QColor to disable the default color
  option.
@@ -147,7 +147,7 @@ class QgsColorButton : QToolButton
 
     QColor defaultColor() const;
 %Docstring
- Returns the default color for the button, which is shown in the button's drop down menu for the
+ Returns the default color for the button, which is shown in the button's drop-down menu for the
  "default color" option.
  :return: default color for the button. Returns an invalid QColor if the default color
  option is disabled.
@@ -157,7 +157,7 @@ class QgsColorButton : QToolButton
 
     void setShowNoColor( const bool showNoColorOption );
 %Docstring
- Sets whether the "no color" option should be shown in the button's drop down menu. If selected,
+ Sets whether the "no color" option should be shown in the button's drop-down menu. If selected,
  the "no color" option sets the color button's color to a totally transparent color.
  \param showNoColorOption set to true to show the no color option. This is disabled by default.
 .. seealso:: showNoColor
@@ -170,7 +170,7 @@ class QgsColorButton : QToolButton
 
     bool showNoColor() const;
 %Docstring
- Returns whether the "no color" option is shown in the button's drop down menu. If selected,
+ Returns whether the "no color" option is shown in the button's drop-down menu. If selected,
  the "no color" option sets the color button's color to a totally transparent color.
  :return: true if the no color option is shown.
 .. seealso:: setShowNoColor
@@ -184,7 +184,7 @@ class QgsColorButton : QToolButton
 
     void setNoColorString( const QString &noColorString );
 %Docstring
- Sets the string to use for the "no color" option in the button's drop down menu.
+ Sets the string to use for the "no color" option in the button's drop-down menu.
  \param noColorString string to use for the "no color" menu option
 .. seealso:: noColorString
 .. seealso:: setShowNoColor
@@ -196,7 +196,7 @@ class QgsColorButton : QToolButton
 
     void setShowNull( bool showNull );
 %Docstring
- Sets whether a set to null (clear) option is shown in the button's drop down menu.
+ Sets whether a set to null (clear) option is shown in the button's drop-down menu.
  \param showNull set to true to show a null option
 .. versionadded:: 2.16
 .. seealso:: showNull()
@@ -205,7 +205,7 @@ class QgsColorButton : QToolButton
 
     bool showNull() const;
 %Docstring
- Returns whether the set to null (clear) option is shown in the button's drop down menu.
+ Returns whether the set to null (clear) option is shown in the button's drop-down menu.
 .. versionadded:: 2.16
 .. seealso:: setShowNull()
 .. seealso:: isNull()
@@ -223,7 +223,7 @@ class QgsColorButton : QToolButton
 
     QString noColorString() const;
 %Docstring
- Returns the string used for the "no color" option in the button's drop down menu.
+ Returns the string used for the "no color" option in the button's drop-down menu.
  :return: string used for the "no color" menu option
 .. seealso:: setNoColorString
 .. seealso:: showNoColor
@@ -237,7 +237,7 @@ class QgsColorButton : QToolButton
     void setContext( const QString &context );
 %Docstring
  Sets the context string for the color button. The context string is passed to all color swatch
- grids shown in the button's drop down menu, to allow them to customise their display colors
+ grids shown in the button's drop-down menu, to allow them to customise their display colors
  based on the context.
  \param context context string for the color button's color swatch grids
 .. seealso:: context
@@ -246,7 +246,7 @@ class QgsColorButton : QToolButton
     QString context() const;
 %Docstring
  Returns the context string for the color button. The context string is passed to all color swatch
- grids shown in the button's drop down menu, to allow them to customise their display colors
+ grids shown in the button's drop-down menu, to allow them to customise their display colors
  based on the context.
  :return: context string for the color button's color swatch grids
 .. seealso:: setContext
@@ -256,18 +256,18 @@ class QgsColorButton : QToolButton
     void setColorSchemeRegistry( QgsColorSchemeRegistry *registry );
 %Docstring
  Sets the color scheme registry for the button, which controls the color swatch grids
- that are shown in the button's drop down menu.
+ that are shown in the button's drop-down menu.
  \param registry color scheme registry for the button. Set to 0 to hide all color
- swatch grids from the button's drop down menu.
+ swatch grids from the button's drop-down menu.
 .. seealso:: colorSchemeRegistry
 %End
 
     QgsColorSchemeRegistry *colorSchemeRegistry();
 %Docstring
  Returns the color scheme registry for the button, which controls the color swatch grids
- that are shown in the button's drop down menu.
+ that are shown in the button's drop-down menu.
  :return: color scheme registry for the button. If returned value is 0 then all color
- swatch grids are hidden from the button's drop down menu.
+ swatch grids are hidden from the button's drop-down menu.
 .. seealso:: setColorSchemeRegistry
  :rtype: QgsColorSchemeRegistry
 %End

diff --git a/python/gui/qgscolorrampbutton.sip b/python/gui/qgscolorrampbutton.sip
@@ -14,7 +14,7 @@ class QgsColorRampButton : QToolButton
 {
 %Docstring
  A cross platform button subclass for selecting color ramps. Will open color ramp dialogs when clicked.
- Offers live updates to button from color ramp dialog. An attached drop down menu allows for access to
+ Offers live updates to button from color ramp dialog. An attached drop-down menu allows for access to
  saved color ramps, as well as option to invert the current color ramp and create new ramps.
 .. versionadded:: 3.0
 %End
@@ -75,23 +75,23 @@ class QgsColorRampButton : QToolButton
 
     void setShowMenu( const bool showMenu );
 %Docstring
- Sets whether the drop down menu should be shown for the button. The default behavior is to
+ Sets whether the drop-down menu should be shown for the button. The default behavior is to
  show the menu.
- \param showMenu set to false to hide the drop down menu
+ \param showMenu set to false to hide the drop-down menu
 .. seealso:: showMenu
 %End
 
     bool showMenu() const;
 %Docstring
- Returns whether the drop down menu is shown for the button.
- :return: true if drop down menu is shown
+ Returns whether the drop-down menu is shown for the button.
+ :return: true if drop-down menu is shown
 .. seealso:: setShowMenu
  :rtype: bool
 %End
 
     void setDefaultColorRamp( QgsColorRamp *colorramp );
 %Docstring
- Sets the default color ramp for the button, which is shown in the button's drop down menu for the
+ Sets the default color ramp for the button, which is shown in the button's drop-down menu for the
  "default color ramp" option.
  \param colorramp default color ramp for the button. Set to a null pointer to disable the default color
  ramp option. The ramp will be cloned and ownership is not transferred.
@@ -100,7 +100,7 @@ class QgsColorRampButton : QToolButton
 
     QgsColorRamp *defaultColorRamp() const /Factory/;
 %Docstring
- Returns a copy of the default color ramp for the button, which is shown in the button's drop down menu for the
+ Returns a copy of the default color ramp for the button, which is shown in the button's drop-down menu for the
  "default color ramp" option.
  :return: default color ramp for the button. Returns a null pointer if the default color ramp
  option is disabled.
@@ -110,14 +110,14 @@ class QgsColorRampButton : QToolButton
 
     void setShowRandomColorRamp( bool showRandom );
 %Docstring
- Sets whether a random colors option is shown in the button's drop down menu.
+ Sets whether a random colors option is shown in the button's drop-down menu.
  \param showRandom set to true to show a random colors option
 .. seealso:: showRandom()
 %End
 
     bool showRandomColorRamp() const;
 %Docstring
- Returns whether random colors option is shown in the button's drop down menu.
+ Returns whether random colors option is shown in the button's drop-down menu.
 .. seealso:: setShowRandom()
  :rtype: bool
 %End
@@ -132,15 +132,15 @@ class QgsColorRampButton : QToolButton
 
     void setShowNull( bool showNull );
 %Docstring
- Sets whether a set to null (clear) option is shown in the button's drop down menu.
+ Sets whether a set to null (clear) option is shown in the button's drop-down menu.
  \param showNull set to true to show a null option
 .. seealso:: showNull()
 .. seealso:: isNull()
 %End
 
     bool showNull() const;
 %Docstring
- Returns whether the set to null (clear) option is shown in the button's drop down menu.
+ Returns whether the set to null (clear) option is shown in the button's drop-down menu.
 .. seealso:: setShowNull()
 .. seealso:: isNull()
  :rtype: bool
@@ -157,7 +157,7 @@ class QgsColorRampButton : QToolButton
     void setContext( const QString &context );
 %Docstring
  Sets the context string for the color ramp button. The context string is passed to all color ramp
- preview icons shown in the button's drop down menu, to (eventually) allow them to customise their display colors
+ preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
  based on the context.
  \param context context string for the color dialog button's color ramp preview icons
 .. seealso:: context
@@ -166,7 +166,7 @@ class QgsColorRampButton : QToolButton
     QString context() const;
 %Docstring
  Returns the context string for the color ramp button. The context string is passed to all color ramp
- preview icons shown in the button's drop down menu, to (eventually) allow them to customise their display colors
+ preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
  based on the context.
  :return: context context string for the color dialog button's color ramp preview icons
 .. seealso:: setContext

diff --git a/python/gui/qgsexpressionlineedit.sip b/python/gui/qgsexpressionlineedit.sip
@@ -18,7 +18,7 @@ class QgsExpressionLineEdit : QWidget
  This widget is designed for use in contexts where no layer fields are available for
  use in an expression. In contexts where the expression is directly associated with
  a layer and fields can be used, then QgsFieldExpressionWidget is a more appropriate
- choice as it gives users direct access to select fields from a drop down list.
+ choice as it gives users direct access to select fields from a drop-down list.
 
  QgsExpressionLineEdit also supports a multiline editor mode which is useful where
  more space is available for the widget, but where QgsExpressionBuilderWidget

diff --git a/resources/context_help/QgsSpatiaLiteSourceSelect b/resources/context_help/QgsSpatiaLiteSourceSelect
@@ -1,3 +1,3 @@
 <h3>Add SpatiaLite Tables</h3>
 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>
-The connections you define will be remembered for further use and available to choose from the drop down menu.
+The connections you define will be remembered for further use and available to choose from the drop-down menu.
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -2403,6 +2403,7 @@ Dravadian:Dravidian
 dreasm:dreams
 driectly:directly
 drnik:drink
+drop down:drop-down
 droped:dropped:*
 droppped:dropped
 druming:drumming

diff --git a/src/core/qgsattributetableconfig.h b/src/core/qgsattributetableconfig.h
@@ -71,7 +71,7 @@ class CORE_EXPORT QgsAttributeTableConfig
     enum ActionWidgetStyle
     {
       ButtonList,   //!< A list of buttons
-      DropDown      //!< A tool button with a dropdown to select the current action
+      DropDown      //!< A tool button with a drop-down to select the current action
     };
 
     QgsAttributeTableConfig();

diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h
@@ -68,7 +68,7 @@ class CORE_EXPORT QgsColorScheme
     enum SchemeFlag
     {
       ShowInColorDialog = 0x01, //!< Show scheme in color picker dialog
-      ShowInColorButtonMenu = 0x02, //!< Show scheme in color button drop down menu
+      ShowInColorButtonMenu = 0x02, //!< Show scheme in color button drop-down menu
       ShowInAllContexts = ShowInColorDialog | ShowInColorButtonMenu //!< Show scheme in all contexts
     };
     Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag )

diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -61,7 +61,7 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch
   setMinimumSize( QSize( 24, 16 ) );
   connect( this, &QAbstractButton::clicked, this, &QgsColorButton::buttonClicked );
 
-  //setup dropdown menu
+  //setup drop-down menu
   mMenu = new QMenu( this );
   connect( mMenu, &QMenu::aboutToShow, this, &QgsColorButton::prepareMenu );
   setMenu( mMenu );
@@ -597,7 +597,7 @@ void QgsColorButton::setButtonBackground( const QColor &color )
   {
     if ( !mIconSize.isValid() )
     {
-      //calculate size of push button part of widget (ie, without the menu dropdown button part)
+      //calculate size of push button part of widget (ie, without the menu drop-down button part)
       QStyleOptionToolButton opt;
       initStyleOption( &opt );
       QRect buttonSize = QApplication::style()->subControlRect( QStyle::CC_ToolButton, &opt, QStyle::SC_ToolButton,