Skip to content

Commit

Permalink
[composer] Change "stroke" to "line" for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jun 21, 2015
1 parent 8db94fc commit 89d4adc
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerattributetablewidget.cpp
View file
Expand Up @@ -369,7 +369,7 @@ void QgsComposerAttributeTableWidget::on_mGridStrokeWidthSpinBox_valueChanged( d
QgsComposition* composition = mComposerTable->composition();
if ( composition )
{
composition->beginMultiFrameCommand( mComposerTable, tr( "Table grid stroke" ), QgsComposerMultiFrameMergeCommand::TableGridStrokeWidth );
composition->beginMultiFrameCommand( mComposerTable, tr( "Table grid line" ), QgsComposerMultiFrameMergeCommand::TableGridStrokeWidth );
}
mComposerTable->setGridStrokeWidth( d );
if ( composition )
Expand Down
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposerscalebarwidget.cpp
View file
Expand Up @@ -73,10 +73,10 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
mFontColorButton->setAllowAlpha( true );
mFontColorButton->setContext( "composer" );

mStrokeColorButton->setColorDialogTitle( tr( "Select stroke color" ) );
mStrokeColorButton->setColorDialogTitle( tr( "Select line color" ) );
mStrokeColorButton->setAllowAlpha( true );
mStrokeColorButton->setContext( "composer" );
mStrokeColorButton->setNoColorString( tr( "Transparent stroke" ) );
mStrokeColorButton->setNoColorString( tr( "Transparent line" ) );
mStrokeColorButton->setShowNoColor( true );

blockMemberSignals( false );
Expand Down Expand Up @@ -399,7 +399,7 @@ void QgsComposerScaleBarWidget::on_mStrokeColorButton_colorChanged( const QColor
return;
}

mComposerScaleBar->beginCommand( tr( "Scalebar stroke color changed" ) );
mComposerScaleBar->beginCommand( tr( "Scalebar line color changed" ) );
disconnectUpdateSignal();
QPen newPen = mComposerScaleBar->pen();
newPen.setColor( newColor );
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposertablewidget.cpp
View file
Expand Up @@ -272,7 +272,7 @@ void QgsComposerTableWidget::on_mGridStrokeWidthSpinBox_valueChanged( double d )
{
return;
}
mComposerTable->beginCommand( tr( "Table grid stroke" ), QgsComposerMergeCommand::TableGridStrokeWidth );
mComposerTable->beginCommand( tr( "Table grid line" ), QgsComposerMergeCommand::TableGridStrokeWidth );
mComposerTable->setGridStrokeWidth( d );
mComposerTable->update();
mComposerTable->endCommand();
Expand Down
23 changes: 16 additions & 7 deletions src/ui/qgscomposerattributetablewidgetbase.ui
View file
Expand Up @@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<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>
Expand Down Expand Up @@ -395,7 +404,7 @@
<item row="0" column="0">
<widget class="QLabel" name="mGridStrokeWidthLabel">
<property name="text">
<string>Stroke width</string>
<string>Line width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -731,11 +740,6 @@
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
Expand All @@ -747,6 +751,11 @@
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgscomposerscalebarwidgetbase.ui
View file
Expand Up @@ -589,7 +589,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Stroke color</string>
<string>Line color</string>
</property>
</widget>
</item>
Expand Down
29 changes: 19 additions & 10 deletions src/ui/qgscomposertablewidgetbase.ui
View file
Expand Up @@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<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>
Expand Down Expand Up @@ -45,7 +54,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-139</y>
<y>0</y>
<width>392</width>
<height>711</height>
</rect>
Expand Down Expand Up @@ -239,7 +248,7 @@
<item row="0" column="0">
<widget class="QLabel" name="mGridStrokeWidthLabel">
<property name="text">
<string>Stroke width</string>
<string>Line width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -445,22 +454,22 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header location="global">qgsmaplayercombobox.h</header>
<header>qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
Expand Down

0 comments on commit 89d4adc

Please sign in to comment.