sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

replaced "opacity" by "transparency" in the composer GUI

Browse Source
This commit is contained in:
olivierdalang 2013-02-13 16:38:15 +01:00 committed by Larry Shaffer
parent a8822089c1
commit bb57cf4b2b
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/composer/qgscomposeritemwidget.cpp
View File

@ -97,7 +97,7 @@ void QgsComposerItemWidget::on_mBackgroundColorButton_clicked()
} }
mItem->beginCommand( tr( "Background color changed" ) ); mItem->beginCommand( tr( "Background color changed" ) );
newBackgroundColor.setAlpha( mOpacitySlider->value() ); newBackgroundColor.setAlpha( mTransparencySlider->value() );
mItem->setBrush( QBrush( QColor( newBackgroundColor ), Qt::SolidPattern ) ); mItem->setBrush( QBrush( QColor( newBackgroundColor ), Qt::SolidPattern ) );
//if the item is a composer map, we need to regenerate the map image //if the item is a composer map, we need to regenerate the map image
//because it usually is cached //because it usually is cached
@ -110,38 +110,38 @@ void QgsComposerItemWidget::on_mBackgroundColorButton_clicked()
mItem->endCommand(); mItem->endCommand();
} }
void QgsComposerItemWidget::on_mOpacitySpinBox_valueChanged( int value ) void QgsComposerItemWidget::on_mTransparencySpinBox_valueChanged( int value )
{ {
if ( !mItem ) if ( !mItem )
{ {
return; return;
} }
mOpacitySlider->blockSignals( true ); mTransparencySlider->blockSignals( true );
mOpacitySlider->setValue( value ); mTransparencySlider->setValue( value );
mOpacitySlider->blockSignals( false ); mTransparencySlider->blockSignals( false );
changeItemOpacity( value ); changeItemTransparency( value );
} }
void QgsComposerItemWidget::on_mOpacitySlider_sliderReleased() void QgsComposerItemWidget::on_mTransparencySlider_sliderReleased()
{ {
if ( !mItem ) if ( !mItem )
{ {
return; return;
} }
int value = mOpacitySlider->value(); int value = mTransparencySlider->value();
mOpacitySpinBox->blockSignals( true ); mTransparencySpinBox->blockSignals( true );
mOpacitySpinBox->setValue( value ); mTransparencySpinBox->setValue( value );
mOpacitySpinBox->blockSignals( false ); mTransparencySpinBox->blockSignals( false );
changeItemOpacity( value ); changeItemTransparency( value );
} }
void QgsComposerItemWidget::changeItemOpacity( int value ) void QgsComposerItemWidget::changeItemTransparency( int value )
{ {
mItem->beginCommand( tr( "Item opacity changed" ) ); mItem->beginCommand( tr( "Item Transparency changed" ) );
QBrush itemBrush = mItem->brush(); QBrush itemBrush = mItem->brush();
QColor brushColor = itemBrush.color(); QColor brushColor = itemBrush.color();
brushColor.setAlpha( value ); brushColor.setAlpha( 255-value );
mItem->setBrush( QBrush( brushColor ) ); mItem->setBrush( QBrush( brushColor ) );
mItem->update(); mItem->update();
mItem->endCommand(); mItem->endCommand();
@ -347,26 +347,26 @@ void QgsComposerItemWidget::setValuesForGuiElements()
setValuesForGuiPositionElements(); setValuesForGuiPositionElements();
mOpacitySlider->blockSignals( true ); mTransparencySlider->blockSignals( true );
mOutlineWidthSpinBox->blockSignals( true ); mOutlineWidthSpinBox->blockSignals( true );
mFrameGroupBox->blockSignals( true ); mFrameGroupBox->blockSignals( true );
mBackgroundGroupBox->blockSignals( true ); mBackgroundGroupBox->blockSignals( true );
mItemIdLineEdit->blockSignals( true ); mItemIdLineEdit->blockSignals( true );
mOpacitySpinBox->blockSignals( true ); mTransparencySpinBox->blockSignals( true );
mOpacitySpinBox->setValue( mItem->brush().color().alpha() ); mTransparencySpinBox->setValue( 255-mItem->brush().color().alpha() );
mOpacitySlider->setValue( mItem->brush().color().alpha() ); mTransparencySlider->setValue( 255-mItem->brush().color().alpha() );
mOutlineWidthSpinBox->setValue( mItem->pen().widthF() ); mOutlineWidthSpinBox->setValue( mItem->pen().widthF() );
mItemIdLineEdit->setText( mItem->id() ); mItemIdLineEdit->setText( mItem->id() );
mFrameGroupBox->setChecked( mItem->hasFrame() ); mFrameGroupBox->setChecked( mItem->hasFrame() );
mBackgroundGroupBox->setChecked( mItem->hasBackground() ); mBackgroundGroupBox->setChecked( mItem->hasBackground() );
mOpacitySlider->blockSignals( false ); mTransparencySlider->blockSignals( false );
mOutlineWidthSpinBox->blockSignals( false ); mOutlineWidthSpinBox->blockSignals( false );
mFrameGroupBox->blockSignals( false ); mFrameGroupBox->blockSignals( false );
mBackgroundGroupBox->blockSignals( false ); mBackgroundGroupBox->blockSignals( false );
mItemIdLineEdit->blockSignals( false ); mItemIdLineEdit->blockSignals( false );
mOpacitySpinBox->blockSignals( false ); mTransparencySpinBox->blockSignals( false );
} }
void QgsComposerItemWidget::on_mItemIdLineEdit_textChanged( const QString &text ) void QgsComposerItemWidget::on_mItemIdLineEdit_textChanged( const QString &text )

6
src/app/composer/qgscomposeritemwidget.h
View File

@ -39,8 +39,8 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
public slots: public slots:
void on_mFrameColorButton_clicked(); void on_mFrameColorButton_clicked();
void on_mBackgroundColorButton_clicked(); void on_mBackgroundColorButton_clicked();
void on_mOpacitySlider_sliderReleased(); void on_mTransparencySlider_sliderReleased();
void on_mOpacitySpinBox_valueChanged( int value ); void on_mTransparencySpinBox_valueChanged( int value );
void on_mOutlineWidthSpinBox_valueChanged( double d ); void on_mOutlineWidthSpinBox_valueChanged( double d );
void on_mFrameGroupBox_toggled( bool state ); void on_mFrameGroupBox_toggled( bool state );
void on_mBackgroundGroupBox_toggled( bool state ); void on_mBackgroundGroupBox_toggled( bool state );
@ -67,7 +67,7 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
private: private:
QgsComposerItemWidget(); QgsComposerItemWidget();
void changeItemOpacity( int value ); void changeItemTransparency( int value );
void changeItemPosition(); void changeItemPosition();
QgsComposerItem* mItem; QgsComposerItem* mItem;

34
src/ui/qgscomposeritemwidgetbase.ui
View File

@ -310,14 +310,20 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QSpinBox" name="mOpacitySpinBox"> <widget class="QLabel" name="mOpacityLabel">
<property name="maximum"> <property name="text">
<number>255</number> <string>Transparency</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mTransparencySlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSlider" name="mOpacitySlider"> <widget class="QSlider" name="mTransparencySlider">
<property name="maximum"> <property name="maximum">
<number>255</number> <number>255</number>
</property> </property>
@ -327,15 +333,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="mOpacityLabel"> <widget class="QSpinBox" name="mTransparencySpinBox">
<property name="text"> <property name="maximum">
<string>Opacity</string> <number>255</number>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@ -404,9 +404,9 @@
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>mOpacitySlider</sender> <sender>mTransparencySlider</sender>
<signal>valueChanged(int)</signal> <signal>valueChanged(int)</signal>
<receiver>mOpacitySpinBox</receiver> <receiver>mTransparencySpinBox</receiver>
<slot>setValue(int)</slot> <slot>setValue(int)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@ -420,9 +420,9 @@
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>mOpacitySpinBox</sender> <sender>mTransparencySpinBox</sender>
<signal>valueChanged(int)</signal> <signal>valueChanged(int)</signal>
<receiver>mOpacitySlider</receiver> <receiver>mTransparencySlider</receiver>
<slot>setValue(int)</slot> <slot>setValue(int)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">