Skip to content

Commit 63dfba8

Browse files
author
timlinux
committedNov 8, 2009
UI overhaul bonanza...hope this doesnt break anything...I guess we should say [FEATURE] at some point as the map composer dialogs have been somewhat overhauled....
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12031 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent f8c3e42 commit 63dfba8

23 files changed

+1273
-1263
lines changed
 

‎src/app/composer/qgscomposerlabelwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg
2727

2828
//add widget for general composer item properties
2929
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label );
30-
gridLayout->addWidget( itemPropertiesWidget, 5, 0, 1, 2 );
30+
toolBox->addItem( itemPropertiesWidget, tr( "Item properties" ) );
3131

3232
if ( mComposerLabel )
3333
{

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
2727

2828
//add widget for item properties
2929
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
30-
gridLayout->addWidget( itemPropertiesWidget, 2, 0, 1, 1 );
31-
30+
toolBox->addItem( itemPropertiesWidget, tr( "Item Options") );
31+
3232
if ( legend )
3333
{
3434
mItemTreeView->setModel( legend->model() );

‎src/app/composer/qgscomposermapwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap );
31-
gridLayout->addWidget( itemPropertiesWidget );
31+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3232
QDoubleValidator v( 0 );
3333

3434
mWidthLineEdit->setValidator( &v );

‎src/app/composer/qgscomposerpicturewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
3535

3636
//add widget for general composer item properties
3737
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, picture );
38-
gridLayout->addWidget( itemPropertiesWidget, 8, 0, 1, 4 );
38+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3939

4040
mWidthLineEdit->setValidator( new QDoubleValidator( this ) );
4141
mHeightLineEdit->setValidator( new QDoubleValidator( this ) );

‎src/app/composer/qgscomposerscalebarwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
31-
gridLayout->addWidget( itemPropertiesWidget );
31+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3232

3333
blockMemberSignals( true );
3434
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );

‎src/app/qgisapp.cpp

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
466466
QgsDebugMsg( QgsApplication::showSettings() );
467467
QgsDebugMsg( "\n--------------------------\n\n\n" );
468468
mMapCanvas->freeze( false );
469+
mLastComposerId = 0;
469470
} // QgisApp ctor
470471

471472

@@ -3690,26 +3691,8 @@ void QgisApp::newPrintComposer()
36903691
}
36913692

36923693
//ask user about name
3693-
bool composerExists = true;
3694-
QString composerId;
3695-
while ( composerExists )
3696-
{
3697-
composerId = QInputDialog::getText( 0, tr( "Enter id string for composer" ), tr( "id:" ) );
3698-
if ( composerId.isNull() )
3699-
{
3700-
return;
3701-
}
3702-
3703-
if ( mPrintComposers.contains( composerId ) )
3704-
{
3705-
QMessageBox::critical( 0, tr( "Composer id already exists" ), tr( "The entered composer id '%1' already exists. Please enter a different id" ).arg( composerId ) );
3706-
}
3707-
else
3708-
{
3709-
composerExists = false;
3710-
}
3711-
}
3712-
3694+
mLastComposerId++;
3695+
QString composerId = QString( tr("Map Composer %1").arg( mLastComposerId ) );
37133696
//create new composer object
37143697
QgsComposer* newComposerObject = new QgsComposer( this, composerId );
37153698
//add it to the map of existing print composers
@@ -4244,6 +4227,7 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
42444227
composer->showMinimized();
42454228
composer->zoomFull();
42464229
}
4230+
mLastComposerId = composerNodes.size();
42474231

42484232
return true;
42494233
}
@@ -4256,6 +4240,7 @@ void QgisApp::deletePrintComposers()
42564240
delete it.value();
42574241
}
42584242
mPrintComposers.clear();
4243+
mLastComposerId = 0;
42594244
}
42604245

42614246
void QgisApp::mergeSelectedFeatures()

‎src/app/qgisapp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ class QgisApp : public QMainWindow
991991

992992
QgsUndoWidget* mUndoWidget;
993993

994+
int mLastComposerId;
994995
};
995996

996997
#endif

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 79 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -6,119 +6,94 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>215</width>
10-
<height>434</height>
9+
<width>236</width>
10+
<height>314</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout_2">
17-
<property name="margin">
18-
<number>0</number>
19-
</property>
16+
<layout class="QGridLayout" name="gridLayout">
2017
<item row="0" column="0">
21-
<widget class="QGroupBox" name="mComposerItemPropertiesGroupBox">
22-
<property name="title">
23-
<string>Composer item properties</string>
18+
<widget class="QPushButton" name="mFrameColorButton">
19+
<property name="text">
20+
<string>Frame color...</string>
2421
</property>
25-
<layout class="QGridLayout" name="gridLayout">
26-
<item row="0" column="0">
27-
<widget class="QLabel" name="mColorLabel">
28-
<property name="text">
29-
<string>Color</string>
30-
</property>
31-
<property name="wordWrap">
32-
<bool>true</bool>
33-
</property>
34-
<property name="buddy">
35-
<cstring>mFrameColorButton</cstring>
36-
</property>
37-
</widget>
38-
</item>
39-
<item row="1" column="0">
40-
<widget class="QPushButton" name="mFrameColorButton">
41-
<property name="text">
42-
<string>Frame...</string>
43-
</property>
44-
</widget>
45-
</item>
46-
<item row="2" column="0">
47-
<widget class="QPushButton" name="mBackgroundColorButton">
48-
<property name="text">
49-
<string>Background...</string>
50-
</property>
51-
</widget>
52-
</item>
53-
<item row="3" column="0">
54-
<widget class="QLabel" name="mOpacityLabel">
55-
<property name="text">
56-
<string>Opacity</string>
57-
</property>
58-
<property name="wordWrap">
59-
<bool>true</bool>
60-
</property>
61-
<property name="buddy">
62-
<cstring>mOpacitySlider</cstring>
63-
</property>
64-
</widget>
65-
</item>
66-
<item row="4" column="0">
67-
<widget class="QSlider" name="mOpacitySlider">
68-
<property name="maximum">
69-
<number>255</number>
70-
</property>
71-
<property name="orientation">
72-
<enum>Qt::Horizontal</enum>
73-
</property>
74-
</widget>
75-
</item>
76-
<item row="5" column="0">
77-
<widget class="QLabel" name="mOutlineWidthLabel">
78-
<property name="text">
79-
<string>Outline width</string>
80-
</property>
81-
<property name="wordWrap">
82-
<bool>true</bool>
83-
</property>
84-
<property name="buddy">
85-
<cstring>mOutlineWidthSpinBox</cstring>
86-
</property>
87-
</widget>
88-
</item>
89-
<item row="6" column="0">
90-
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
91-
</item>
92-
<item row="7" column="0">
93-
<widget class="QPushButton" name="mPositionButton">
94-
<property name="text">
95-
<string>Position...</string>
96-
</property>
97-
</widget>
98-
</item>
99-
<item row="8" column="0">
100-
<widget class="QCheckBox" name="mFrameCheckBox">
101-
<property name="text">
102-
<string>Show frame</string>
103-
</property>
104-
</widget>
105-
</item>
106-
<item row="9" column="0">
107-
<spacer name="verticalSpacer">
108-
<property name="orientation">
109-
<enum>Qt::Vertical</enum>
110-
</property>
111-
<property name="sizeHint" stdset="0">
112-
<size>
113-
<width>20</width>
114-
<height>40</height>
115-
</size>
116-
</property>
117-
</spacer>
118-
</item>
119-
</layout>
12022
</widget>
12123
</item>
24+
<item row="1" column="0">
25+
<widget class="QPushButton" name="mBackgroundColorButton">
26+
<property name="text">
27+
<string>Background color...</string>
28+
</property>
29+
</widget>
30+
</item>
31+
<item row="2" column="0">
32+
<widget class="QLabel" name="mOpacityLabel">
33+
<property name="text">
34+
<string>Opacity</string>
35+
</property>
36+
<property name="wordWrap">
37+
<bool>true</bool>
38+
</property>
39+
<property name="buddy">
40+
<cstring>mOpacitySlider</cstring>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="3" column="0">
45+
<widget class="QSlider" name="mOpacitySlider">
46+
<property name="maximum">
47+
<number>255</number>
48+
</property>
49+
<property name="orientation">
50+
<enum>Qt::Horizontal</enum>
51+
</property>
52+
</widget>
53+
</item>
54+
<item row="4" column="0">
55+
<widget class="QLabel" name="mOutlineWidthLabel">
56+
<property name="text">
57+
<string>Outline width</string>
58+
</property>
59+
<property name="wordWrap">
60+
<bool>true</bool>
61+
</property>
62+
<property name="buddy">
63+
<cstring>mOutlineWidthSpinBox</cstring>
64+
</property>
65+
</widget>
66+
</item>
67+
<item row="5" column="0">
68+
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
69+
</item>
70+
<item row="6" column="0">
71+
<widget class="QPushButton" name="mPositionButton">
72+
<property name="text">
73+
<string>Position...</string>
74+
</property>
75+
</widget>
76+
</item>
77+
<item row="7" column="0">
78+
<widget class="QCheckBox" name="mFrameCheckBox">
79+
<property name="text">
80+
<string>Show frame</string>
81+
</property>
82+
</widget>
83+
</item>
84+
<item row="8" column="0">
85+
<spacer name="verticalSpacer">
86+
<property name="orientation">
87+
<enum>Qt::Vertical</enum>
88+
</property>
89+
<property name="sizeHint" stdset="0">
90+
<size>
91+
<width>215</width>
92+
<height>57</height>
93+
</size>
94+
</property>
95+
</spacer>
96+
</item>
12297
</layout>
12398
</widget>
12499
<resources/>

0 commit comments

Comments
 (0)
Please sign in to comment.