Skip to content

Commit 4b4ac5a

Browse files
author
Marco Hugentobler
committedAug 31, 2012
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents ee16369 + c928868 commit 4b4ac5a

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,17 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
179179
viewMenu->addSeparator();
180180
viewMenu->addAction( mActionRefreshView );
181181

182+
// Panel and toolbar submenus
183+
mPanelMenu = new QMenu( tr( "Panels" ), this );
184+
mPanelMenu->setObjectName( "mPanelMenu" );
185+
mToolbarMenu = new QMenu( tr( "Toolbars" ), this );
186+
mToolbarMenu->setObjectName( "mToolbarMenu" );
187+
viewMenu->addSeparator();
188+
viewMenu->addMenu( mPanelMenu );
189+
viewMenu->addMenu( mToolbarMenu );
190+
// toolBar already exists, add other widgets as they are created
191+
mToolbarMenu->addAction( toolBar->toggleViewAction() );
192+
182193
QMenu *layoutMenu = menuBar()->addMenu( tr( "Layout" ) );
183194
layoutMenu->addAction( mActionUndo );
184195
layoutMenu->addAction( mActionRedo );
@@ -244,10 +255,13 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
244255
setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North );
245256
mGeneralDock = new QDockWidget( tr( "Composition" ), this );
246257
mGeneralDock->setObjectName( "CompositionDock" );
258+
mPanelMenu->addAction( mGeneralDock->toggleViewAction() );
247259
mItemDock = new QDockWidget( tr( "Item Properties" ), this );
248260
mItemDock->setObjectName( "ItemDock" );
261+
mPanelMenu->addAction( mItemDock->toggleViewAction() );
249262
mUndoDock = new QDockWidget( tr( "Command history" ), this );
250263
mUndoDock->setObjectName( "CommandDock" );
264+
mPanelMenu->addAction( mUndoDock->toggleViewAction() );
251265

252266
mGeneralDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
253267
mItemDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );

‎src/app/composer/qgscomposer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
338338
QDockWidget* mItemDock;
339339
QDockWidget* mUndoDock;
340340
QDockWidget* mGeneralDock;
341+
342+
QMenu* mPanelMenu;
343+
QMenu* mToolbarMenu;
341344
};
342345

343346
#endif

‎src/core/qgsexpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ int QgsExpression::functionCount()
890890

891891

892892
QgsExpression::QgsExpression( const QString& expr )
893-
: mExpression( expr ), mRowNumber( 0 ), mCalc( NULL )
893+
: mExpression( expr ), mRowNumber( 0 ), mCalc( NULL ), mScale( 0 )
894894
{
895895
mRootNode = ::parseExpression( mExpression, mParserErrorString );
896896

0 commit comments

Comments
 (0)
Please sign in to comment.