Skip to content

Commit 69f96f3

Browse files
NathanW2NathanW2
committedFeb 20, 2013
Updates to composer window
- Split composer toolbar into many - Rename File menu to Composer - because the composer isn't a "file"
·
ltr-3_40archive/master_2
1 parent cc0c2b1 commit 69f96f3

File tree

2 files changed

+71
-37
lines changed

2 files changed

+71
-37
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
9898
QToolButton* saveProjectToolButton = new QToolButton( this );
9999
saveProjectToolButton->addAction( mSaveProjectAction );
100100
saveProjectToolButton->setDefaultAction( mSaveProjectAction );
101-
toolBar->insertWidget( mActionLoadFromTemplate, saveProjectToolButton );
102-
toolBar->insertSeparator( mActionLoadFromTemplate );
101+
mComposerToolbar->insertWidget( mActionLoadFromTemplate, saveProjectToolButton );
102+
mComposerToolbar->insertSeparator( mActionLoadFromTemplate );
103103

104104
QToolButton* orderingToolButton = new QToolButton( this );
105105
orderingToolButton->setPopupMode( QToolButton::InstantPopup );
@@ -110,7 +110,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
110110
orderingToolButton->addAction( mActionMoveItemsToTop );
111111
orderingToolButton->addAction( mActionMoveItemsToBottom );
112112
orderingToolButton->setDefaultAction( mActionRaiseItems );
113-
toolBar->addWidget( orderingToolButton );
113+
mItemActionToolbar->addWidget( orderingToolButton );
114114

115115
QToolButton* alignToolButton = new QToolButton( this );
116116
alignToolButton->setPopupMode( QToolButton::InstantPopup );
@@ -124,9 +124,9 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
124124
alignToolButton->addAction( mActionAlignVCenter );
125125
alignToolButton->addAction( mActionAlignBottom );
126126
alignToolButton->setDefaultAction( mActionAlignLeft );
127-
toolBar->addWidget( alignToolButton );
127+
mItemActionToolbar->addWidget( alignToolButton );
128128

129-
QToolButton* shapeToolButton = new QToolButton( toolBar );
129+
QToolButton* shapeToolButton = new QToolButton( mItemToolbar );
130130
shapeToolButton->setCheckable( true );
131131
shapeToolButton->setPopupMode( QToolButton::InstantPopup );
132132
shapeToolButton->setAutoRaise( true );
@@ -135,7 +135,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
135135
shapeToolButton->addAction( mActionAddTriangle );
136136
shapeToolButton->addAction( mActionAddEllipse );
137137
shapeToolButton->setDefaultAction( mActionAddEllipse );
138-
toolBar->insertWidget( mActionAddArrow, shapeToolButton );
138+
mItemToolbar->insertWidget( mActionAddArrow, shapeToolButton );
139139

140140
QActionGroup* toggleActionGroup = new QActionGroup( this );
141141
toggleActionGroup->addAction( mActionMoveItemContent );
@@ -169,20 +169,20 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
169169
appMenu->addAction( QgisApp::instance()->actionOptions() );
170170
#endif
171171

172-
QMenu *fileMenu = menuBar()->addMenu( tr( "File" ) );
173-
fileMenu->addAction( mSaveProjectAction );
174-
fileMenu->addSeparator();
175-
fileMenu->addAction( mActionLoadFromTemplate );
176-
fileMenu->addAction( mActionSaveAsTemplate );
177-
fileMenu->addSeparator();
178-
fileMenu->addAction( mActionExportAsImage );
179-
fileMenu->addAction( mActionExportAsPDF );
180-
fileMenu->addAction( mActionExportAsSVG );
181-
fileMenu->addSeparator();
182-
fileMenu->addAction( mActionPageSetup );
183-
fileMenu->addAction( mActionPrint );
184-
fileMenu->addSeparator();
185-
fileMenu->addAction( mActionQuit );
172+
QMenu *composerMenu = menuBar()->addMenu( tr( "Composer" ) );
173+
composerMenu->addAction( mSaveProjectAction );
174+
composerMenu->addSeparator();
175+
composerMenu->addAction( mActionLoadFromTemplate );
176+
composerMenu->addAction( mActionSaveAsTemplate );
177+
composerMenu->addSeparator();
178+
composerMenu->addAction( mActionExportAsImage );
179+
composerMenu->addAction( mActionExportAsPDF );
180+
composerMenu->addAction( mActionExportAsSVG );
181+
composerMenu->addSeparator();
182+
composerMenu->addAction( mActionPageSetup );
183+
composerMenu->addAction( mActionPrint );
184+
composerMenu->addSeparator();
185+
composerMenu->addAction( mActionQuit );
186186
QObject::connect( mActionQuit, SIGNAL( triggered() ), this, SLOT( close() ) );
187187

188188
QMenu *viewMenu = menuBar()->addMenu( tr( "View" ) );
@@ -201,7 +201,10 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
201201
viewMenu->addMenu( mPanelMenu );
202202
viewMenu->addMenu( mToolbarMenu );
203203
// toolBar already exists, add other widgets as they are created
204-
mToolbarMenu->addAction( toolBar->toggleViewAction() );
204+
mToolbarMenu->addAction( mComposerToolbar->toggleViewAction() );
205+
mToolbarMenu->addAction( mPaperNavToolbar->toggleViewAction() );
206+
mToolbarMenu->addAction( mItemActionToolbar->toggleViewAction() );
207+
mToolbarMenu->addAction( mItemToolbar->toggleViewAction() );
205208

206209
QMenu *layoutMenu = menuBar()->addMenu( tr( "Layout" ) );
207210
layoutMenu->addAction( mActionUndo );

‎src/ui/qgscomposerbase.ui

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,9 @@
4646
</item>
4747
</layout>
4848
</widget>
49-
<widget class="QToolBar" name="toolBar">
49+
<widget class="QToolBar" name="mComposerToolbar">
5050
<property name="windowTitle">
51-
<string>Toolbar</string>
52-
</property>
53-
<property name="orientation">
54-
<enum>Qt::Horizontal</enum>
51+
<string>Composer</string>
5552
</property>
5653
<attribute name="toolBarArea">
5754
<enum>TopToolBarArea</enum>
@@ -61,18 +58,54 @@
6158
</attribute>
6259
<addaction name="mActionLoadFromTemplate"/>
6360
<addaction name="mActionSaveAsTemplate"/>
61+
<addaction name="separator"/>
62+
<addaction name="mActionPrint"/>
6463
<addaction name="mActionExportAsImage"/>
65-
<addaction name="mActionExportAsPDF"/>
6664
<addaction name="mActionExportAsSVG"/>
67-
<addaction name="mActionPrint"/>
68-
<addaction name="separator"/>
65+
<addaction name="mActionExportAsPDF"/>
66+
<addaction name="mActionUndo"/>
67+
<addaction name="mActionRedo"/>
68+
</widget>
69+
<widget class="QToolBar" name="mPaperNavToolbar">
70+
<property name="windowTitle">
71+
<string>Paper Navigation</string>
72+
</property>
73+
<attribute name="toolBarArea">
74+
<enum>TopToolBarArea</enum>
75+
</attribute>
76+
<attribute name="toolBarBreak">
77+
<bool>true</bool>
78+
</attribute>
6979
<addaction name="mActionZoomAll"/>
7080
<addaction name="mActionZoomIn"/>
7181
<addaction name="mActionZoomOut"/>
7282
<addaction name="mActionRefreshView"/>
73-
<addaction name="separator"/>
74-
<addaction name="mActionUndo"/>
75-
<addaction name="mActionRedo"/>
83+
</widget>
84+
<widget class="QToolBar" name="mItemActionToolbar">
85+
<property name="windowTitle">
86+
<string>Composer Item Actions</string>
87+
</property>
88+
<attribute name="toolBarArea">
89+
<enum>TopToolBarArea</enum>
90+
</attribute>
91+
<attribute name="toolBarBreak">
92+
<bool>true</bool>
93+
</attribute>
94+
<addaction name="mActionSelectMoveItem"/>
95+
<addaction name="mActionMoveItemContent"/>
96+
<addaction name="mActionGroupItems"/>
97+
<addaction name="mActionUngroupItems"/>
98+
</widget>
99+
<widget class="QToolBar" name="mItemToolbar">
100+
<property name="windowTitle">
101+
<string>Composer Items</string>
102+
</property>
103+
<attribute name="toolBarArea">
104+
<enum>TopToolBarArea</enum>
105+
</attribute>
106+
<attribute name="toolBarBreak">
107+
<bool>true</bool>
108+
</attribute>
76109
<addaction name="mActionAddNewMap"/>
77110
<addaction name="mActionAddImage"/>
78111
<addaction name="mActionAddNewLabel"/>
@@ -81,13 +114,11 @@
81114
<addaction name="mActionAddArrow"/>
82115
<addaction name="mActionAddTable"/>
83116
<addaction name="mActionAddHtml"/>
84-
<addaction name="separator"/>
85-
<addaction name="mActionSelectMoveItem"/>
86-
<addaction name="mActionMoveItemContent"/>
87-
<addaction name="mActionGroupItems"/>
88-
<addaction name="mActionUngroupItems"/>
89117
</widget>
90118
<action name="mActionPrint">
119+
<property name="checkable">
120+
<bool>false</bool>
121+
</property>
91122
<property name="icon">
92123
<iconset>
93124
<normaloff>../themes/default/mActionFilePrint.png</normaloff>../themes/default/mActionFilePrint.png</iconset>

0 commit comments

Comments
 (0)
Please sign in to comment.