Update of composer item's GUI

qgis · Feb 19, 2013 · 2d4220b · 2d4220b
1 parent a645f43
commit 2d4220b
Show file tree

Hide file tree

Showing 39 changed files with 3,155 additions and 3,201 deletions.
diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -189,6 +189,11 @@ class QgsComposerItem: QObject, QGraphicsRectItem
       @note: this method was added in version 1.6*/
     void setItemPosition( double x, double y, double width, double height, ItemPositionMode itemPoint = UpperLeft );
 
+    /**Returns item's last used position mode.
+      @note: This property has no effect on actual's item position, which is always the top-left corner.
+      @note: this method was added in version 2.0*/
+    ItemPositionMode lastUsedPositionMode();
+
     /**Sets this items bound in scene coordinates such that 1 item size units
      corresponds to 1 scene size unit*/
     virtual void setSceneRect( const QRectF& rectangle );

diff --git a/python/core/composer/qgscomposershape.sip b/python/core/composer/qgscomposershape.sip
@@ -36,16 +36,8 @@ class QgsComposerShape: QgsComposerItem
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
 
     //setters and getters
-    void setLineWidth( double width );
-    double lineWidth() const;
-    void setOutlineColor( const QColor& color );
-    QColor outlineColor() const;
-    void setFillColor( const QColor& color );
-    QColor fillColor() const;
     QgsComposerShape::Shape shapeType() const;
     void setShapeType( QgsComposerShape::Shape s );
-    bool transparentFill() const;
-    void setTransparentFill( bool transparent );
 
     /**Sets this items bound in scene coordinates such that 1 item size units
      corresponds to 1 scene size unit. Also, the shape is scaled*/

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -133,7 +133,6 @@ SET(QGIS_APP_SRCS
   composer/qgscomposerlegendwidget.cpp
   composer/qgscompositionwidget.cpp
   composer/qgsatlascompositionwidget.cpp
-  composer/qgsitempositiondialog.cpp
 
   legend/qgslegendgroup.cpp
   legend/qgslegend.cpp
@@ -281,7 +280,6 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscomposershapewidget.h
   composer/qgscompositionwidget.h
   composer/qgsatlascompositionwidget.h
-  composer/qgsitempositiondialog.h
 
   legend/qgslegend.h
   legend/qgsapplegendinterface.h

diff --git a/src/app/composer/qgscomposerarrowwidget.cpp b/src/app/composer/qgscomposerarrowwidget.cpp
@@ -36,7 +36,7 @@ QgsComposerArrowWidget::QgsComposerArrowWidget( QgsComposerArrow* arrow ): QWidg
 
   //add widget for general composer item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, mArrow );
-  toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
+  mainLayout->addWidget( itemPropertiesWidget );
 
   setGuiElementValues();
 

diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp
@@ -42,7 +42,7 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposer
   {
     //add widget for general composer item properties
     QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, mFrame );
-    mToolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
+    mainLayout->addWidget( itemPropertiesWidget );
   }
 }
 

diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
@@ -18,14 +18,35 @@
 #include "qgscomposeritemwidget.h"
 #include "qgscomposeritem.h"
 #include "qgscomposermap.h"
-#include "qgsitempositiondialog.h"
 #include "qgspoint.h"
 #include <QColorDialog>
 
 QgsComposerItemWidget::QgsComposerItemWidget( QWidget* parent, QgsComposerItem* item ): QWidget( parent ), mItem( item )
 {
+
   setupUi( this );
+
+  //make button exclusive
+  QButtonGroup* buttonGroup = new QButtonGroup( this );
+  buttonGroup->addButton( mUpperLeftCheckBox );
+  buttonGroup->addButton( mUpperMiddleCheckBox );
+  buttonGroup->addButton( mUpperRightCheckBox );
+  buttonGroup->addButton( mMiddleLeftCheckBox );
+  buttonGroup->addButton( mMiddleCheckBox );
+  buttonGroup->addButton( mMiddleRightCheckBox );
+  buttonGroup->addButton( mLowerLeftCheckBox );
+  buttonGroup->addButton( mLowerMiddleCheckBox );
+  buttonGroup->addButton( mLowerRightCheckBox );
+  buttonGroup->setExclusive( true );  
+
+  mXLineEdit->setValidator( new QDoubleValidator( 0 ) );
+  mYLineEdit->setValidator( new QDoubleValidator( 0 ) );
+  mWidthLineEdit->setValidator( new QDoubleValidator( 0 ) );
+  mHeightLineEdit->setValidator( new QDoubleValidator( 0 ) );
+
   setValuesForGuiElements();
+  connect( mItem, SIGNAL( sizeChanged() ), this, SLOT( setValuesForGuiPositionElements() ) );
+
 }
 
 QgsComposerItemWidget::QgsComposerItemWidget(): QWidget( 0 ), mItem( 0 )
@@ -126,6 +147,70 @@ void QgsComposerItemWidget::changeItemOpacity( int value )
   mItem->endCommand();
 }
 
+void QgsComposerItemWidget::changeItemPosition()
+{
+  mItem->beginCommand( tr( "Item position changed" ) );
+
+  bool convXSuccess, convYSuccess;
+  double x = mXLineEdit->text().toDouble( &convXSuccess );
+  double y = mYLineEdit->text().toDouble( &convYSuccess );
+
+  bool convSuccessWidth, convSuccessHeight;
+  double width = mWidthLineEdit->text().toDouble( &convSuccessWidth );
+  double height = mHeightLineEdit->text().toDouble( &convSuccessHeight );
+
+  if ( !convXSuccess || !convYSuccess || !convSuccessWidth || !convSuccessHeight )
+  {
+    return;
+  }
+
+  mItem->setItemPosition( x, y, width, height, positionMode() );
+
+  mItem->update();
+  mItem->endCommand();
+}
+
+QgsComposerItem::ItemPositionMode QgsComposerItemWidget::positionMode() const
+{
+  if ( mUpperLeftCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::UpperLeft;
+  }
+  else if ( mUpperMiddleCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::UpperMiddle;
+  }
+  else if ( mUpperRightCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::UpperRight;
+  }
+  else if ( mMiddleLeftCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::MiddleLeft;
+  }
+  else if ( mMiddleCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::Middle;
+  }
+  else if ( mMiddleRightCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::MiddleRight;
+  }
+  else if ( mLowerLeftCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::LowerLeft;
+  }
+  else if ( mLowerMiddleCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::LowerMiddle;
+  }
+  else if ( mLowerRightCheckBox->checkState() == Qt::Checked )
+  {
+    return QgsComposerItem::LowerRight;
+  }
+  return QgsComposerItem::UpperLeft;
+}
+
 void QgsComposerItemWidget::on_mOutlineWidthSpinBox_valueChanged( double d )
 {
   if ( !mItem )
@@ -166,13 +251,102 @@ void QgsComposerItemWidget::on_mBackgroundGroupBox_toggled( bool state )
   mItem->endCommand();
 }
 
+
+void QgsComposerItemWidget::setValuesForGuiPositionElements()
+{
+  if ( !mItem )
+  {
+    return;
+  }
+
+  mXLineEdit->blockSignals( true );
+  mYLineEdit->blockSignals( true );
+  mWidthLineEdit->blockSignals( true );
+  mHeightLineEdit->blockSignals( true );
+
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::UpperLeft )
+  {
+    mUpperLeftCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::UpperMiddle )
+  {
+    mUpperMiddleCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() / 2.0 ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::UpperRight )
+  {
+    mUpperRightCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::MiddleLeft )
+  {
+    mMiddleLeftCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() / 2.0 ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::Middle )
+  {
+    mMiddleCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() / 2.0 ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() / 2.0 ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::MiddleRight )
+  {
+    mMiddleRightCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() / 2.0 ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::LowerLeft )
+  {
+    mLowerLeftCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::LowerMiddle )
+  {
+    mLowerMiddleCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() / 2.0 ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() ) );
+  }
+
+  if( mItem->lastUsedPositionMode() == QgsComposerItem::LowerRight )
+  {
+    mLowerRightCheckBox->setChecked( true );
+    mXLineEdit->setText( QString::number( mItem->transform().dx() + mItem->rect().width() ) );
+    mYLineEdit->setText( QString::number( mItem->transform().dy() + mItem->rect().height() ) );
+  }
+
+  mWidthLineEdit->setText( QString::number( mItem->rect().width() ) );
+  mHeightLineEdit->setText( QString::number( mItem->rect().height() ) );
+
+
+  mXLineEdit->blockSignals( false );
+  mYLineEdit->blockSignals( false );
+  mWidthLineEdit->blockSignals( false );
+  mHeightLineEdit->blockSignals( false );
+}
+
 void QgsComposerItemWidget::setValuesForGuiElements()
 {
   if ( !mItem )
   {
     return;
   }
 
+  setValuesForGuiPositionElements();
+
   mOpacitySlider->blockSignals( true );
   mOutlineWidthSpinBox->blockSignals( true );
   mFrameGroupBox->blockSignals( true );
@@ -195,25 +369,6 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mOpacitySpinBox->blockSignals( false );
 }
 
-void QgsComposerItemWidget::on_mPositionButton_clicked()
-{
-  if ( !mItem )
-  {
-    return;
-  }
-
-  mItem->beginCommand( tr( "Item position changed" ) );
-  QgsItemPositionDialog d( mItem, 0 );
-  if ( d.exec() == QDialog::Accepted )
-  {
-    mItem->endCommand();
-  }
-  else
-  {
-    mItem->cancelCommand();
-  }
-}
-
 void QgsComposerItemWidget::on_mItemIdLineEdit_textChanged( const QString &text )
 {
   if ( mItem )

diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h
@@ -19,6 +19,7 @@
 #define QGSCOMPOSERITEMWIDGET_H
 
 #include "ui_qgscomposeritemwidgetbase.h"
+#include "qgscomposeritem.h"
 
 class QgsComposerItem;
 
@@ -31,6 +32,10 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
     QgsComposerItemWidget( QWidget* parent, QgsComposerItem* item );
     ~QgsComposerItemWidget();
 
+    /**A combination of upper/middle/lower and left/middle/right*/
+    QgsComposerItem::ItemPositionMode positionMode() const;
+
+
   public slots:
     void on_mFrameColorButton_clicked();
     void on_mBackgroundColorButton_clicked();
@@ -39,13 +44,31 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
     void on_mOutlineWidthSpinBox_valueChanged( double d );
     void on_mFrameGroupBox_toggled( bool state );
     void on_mBackgroundGroupBox_toggled( bool state );
-    void on_mPositionButton_clicked();
     void on_mItemIdLineEdit_textChanged( const QString& text );
 
+    //adjust coordinates in line edits
+    void on_mXLineEdit_editingFinished(){ changeItemPosition(); }
+    void on_mYLineEdit_editingFinished(){ changeItemPosition(); }
+    void on_mWidthLineEdit_editingFinished(){ changeItemPosition(); }
+    void on_mHeightLineEdit_editingFinished(){ changeItemPosition(); }
+
+    void on_mUpperLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mUpperMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mUpperRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mMiddleLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mMiddleRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mLowerLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mLowerMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
+    void on_mLowerRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
+
+    void setValuesForGuiElements();
+    void setValuesForGuiPositionElements();
+
   private:
     QgsComposerItemWidget();
-    void setValuesForGuiElements();
     void changeItemOpacity( int value );
+    void changeItemPosition();
 
     QgsComposerItem* mItem;
 };

diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp
@@ -30,7 +30,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg
 
   //add widget for general composer item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label );
-  toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
+  mainLayout->addWidget( itemPropertiesWidget );
 
 
   if ( mComposerLabel )
@@ -48,15 +48,13 @@ void QgsComposerLabelWidget::on_mHtmlCheckBox_stateChanged( int state )
     {
       mFontButton->setEnabled( false );
       mFontColorButton->setEnabled( false );
-      mHorizontalAlignementGroup->setEnabled( false );
-      mVerticalAlignementGroup->setEnabled( false );
+      mAlignementGroup->setEnabled( false );
     }
     else
     {
       mFontButton->setEnabled( true );
       mFontColorButton->setEnabled( true );
-      mHorizontalAlignementGroup->setEnabled( true );
-      mVerticalAlignementGroup->setEnabled( true );
+      mAlignementGroup->setEnabled( true );
     }
 
     mComposerLabel->beginCommand( tr( "Label text HTML state changed" ), QgsComposerMergeCommand::ComposerLabelSetText );

diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -49,7 +49,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
 
   //add widget for item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
-  toolBox->addItem( itemPropertiesWidget, tr( "General Options" ) );
+  mainLayout->addWidget( itemPropertiesWidget );
 
   if ( legend )
   {