Skip to content

Commit c6056e6

Browse files
author
jef
committedApr 11, 2010
remove Qt 4.5 dependency and fix a warning
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13300 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 97c9c9f commit c6056e6

File tree

5 files changed

+67
-120
lines changed

5 files changed

+67
-120
lines changed
 

‎src/app/composer/qgscomposermanager.cpp

Lines changed: 37 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,25 @@
2424
#include <QListWidgetItem>
2525
#include <QMessageBox>
2626

27-
QgsComposerManager::QgsComposerManager( QgisApp* app, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mQgisApp( app )
27+
QgsComposerManager::QgsComposerManager( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
2828
{
29+
QPushButton *pb;
30+
2931
setupUi( this );
3032
connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
33+
34+
pb = new QPushButton( tr( "&Show" ) );
35+
mButtonBox->addButton( pb, QDialogButtonBox::ActionRole );
36+
connect( pb, SIGNAL( clicked() ), this, SLOT( show_clicked() ) );
37+
38+
pb = new QPushButton( tr( "&Remove" ) );
39+
mButtonBox->addButton( pb, QDialogButtonBox::ActionRole );
40+
connect( pb, SIGNAL( clicked() ), this, SLOT( remove_clicked() ) );
41+
42+
pb = new QPushButton( tr( "Re&name" ) );
43+
mButtonBox->addButton( pb, QDialogButtonBox::ActionRole );
44+
connect( pb, SIGNAL( clicked() ), this, SLOT( rename_clicked() ) );
45+
3146
initialize();
3247
}
3348

@@ -38,19 +53,26 @@ QgsComposerManager::~QgsComposerManager()
3853

3954
void QgsComposerManager::initialize()
4055
{
41-
if ( !mQgisApp )
42-
{
43-
return;
44-
}
45-
46-
QSet<QgsComposer*> composers = mQgisApp->printComposers();
56+
QSet<QgsComposer*> composers = QgisApp::instance()->printComposers();
4757
QSet<QgsComposer*>::const_iterator it = composers.constBegin();
4858
for ( ; it != composers.constEnd(); ++it )
4959
{
5060
QListWidgetItem* item = new QListWidgetItem(( *it )->title(), mComposerListWidget );
5161
item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable );
5262
mItemComposerMap.insert( item, *it );
5363
}
64+
65+
mTemplate->addItem( tr( "Empty composer" ) );
66+
67+
QMap<QString, QString> templateMap = defaultTemplates();
68+
if ( templateMap.size() > 0 )
69+
{
70+
QMap<QString, QString>::const_iterator templateIt = templateMap.constBegin();
71+
for ( ; templateIt != templateMap.constEnd(); ++templateIt )
72+
{
73+
mTemplate->addItem( templateIt.key(), templateIt.value() );
74+
}
75+
}
5476
}
5577

5678
QMap<QString, QString> QgsComposerManager::defaultTemplates() const
@@ -75,51 +97,18 @@ QMap<QString, QString> QgsComposerManager::defaultTemplates() const
7597

7698
void QgsComposerManager::on_mAddButton_clicked()
7799
{
78-
if ( !mQgisApp )
79-
{
80-
return;
81-
}
82-
83-
QMap<QString, QString> templateMap = defaultTemplates();
84-
QString composerTemplate;
85100
QgsComposer* newComposer = 0;
86101

87-
if ( templateMap.size() > 0 )
88-
{
89-
//show template dialog
90-
QStringList templateNameList;
91-
templateNameList.append( tr( "Empty composer" ) );
92-
QMap<QString, QString>::const_iterator templateIt = templateMap.constBegin();
93-
for ( ; templateIt != templateMap.constEnd(); ++templateIt )
94-
{
95-
templateNameList.append( templateIt.key() );
96-
}
97-
98-
QInputDialog templateDialog;
99-
templateDialog.setLabelText( tr( "Select a composer template" ) );
100-
templateDialog.setComboBoxItems( templateNameList );
101-
if ( templateDialog.exec() == QDialog::Rejected )
102-
{
103-
return;
104-
}
105-
106-
QMap<QString, QString>::const_iterator selectedTemplate = templateMap.find( templateDialog.textValue() );
107-
if ( selectedTemplate != templateMap.constEnd() )
108-
{
109-
composerTemplate = selectedTemplate.value();
110-
}
111-
}
112-
113-
newComposer = mQgisApp->createNewComposer();
102+
newComposer = QgisApp::instance()->createNewComposer();
114103
if ( !newComposer )
115104
{
116105
return;
117106
}
118107

119-
if ( !composerTemplate.isEmpty() ) //create composer from template
108+
if ( mTemplate->currentIndex() > 0 )
120109
{
121110
QDomDocument templateDoc;
122-
QFile templateFile( composerTemplate );
111+
QFile templateFile( mTemplate->itemData( mTemplate->currentIndex() ).toString() );
123112
if ( templateFile.open( QIODevice::ReadOnly ) )
124113
{
125114
if ( templateDoc.setContent( &templateFile, false ) )
@@ -134,13 +123,8 @@ void QgsComposerManager::on_mAddButton_clicked()
134123
mItemComposerMap.insert( item, newComposer );
135124
}
136125

137-
void QgsComposerManager::on_mRemoveButton_clicked()
126+
void QgsComposerManager::remove_clicked()
138127
{
139-
if ( !mQgisApp )
140-
{
141-
return;
142-
}
143-
144128
QListWidgetItem* item = mComposerListWidget->currentItem();
145129
if ( !item )
146130
{
@@ -157,21 +141,16 @@ void QgsComposerManager::on_mRemoveButton_clicked()
157141
QMap<QListWidgetItem*, QgsComposer*>::iterator it = mItemComposerMap.find( item );
158142
if ( it != mItemComposerMap.end() )
159143
{
160-
mQgisApp->deleteComposer( it.value() );
144+
QgisApp::instance()->deleteComposer( it.value() );
161145
}
162146
mItemComposerMap.remove( item );
163147
mComposerListWidget->removeItemWidget( item );
164148
//and remove the list widget row
165149
delete( mComposerListWidget->takeItem( mComposerListWidget->row( item ) ) );
166150
}
167151

168-
void QgsComposerManager::on_mShowPushButton_clicked()
152+
void QgsComposerManager::show_clicked()
169153
{
170-
if ( !mQgisApp )
171-
{
172-
return;
173-
}
174-
175154
QListWidgetItem* item = mComposerListWidget->currentItem();
176155
if ( !item )
177156
{
@@ -215,7 +194,7 @@ void QgsComposerManager::on_mShowPushButton_clicked()
215194
{
216195
return;
217196
}
218-
c = mQgisApp->createNewComposer();
197+
c = QgisApp::instance()->createNewComposer();
219198
c->setTitle( it.key()->text() );
220199
if ( c )
221200
{
@@ -236,7 +215,7 @@ void QgsComposerManager::on_mShowPushButton_clicked()
236215
#endif //0
237216
}
238217

239-
void QgsComposerManager::on_mRenamePushButton_clicked()
218+
void QgsComposerManager::rename_clicked()
240219
{
241220
QListWidgetItem* item = mComposerListWidget->currentItem();
242221
if ( !item )

‎src/app/composer/qgscomposermanager.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "ui_qgscomposermanagerbase.h"
2121

22-
class QgisApp;
2322
class QListWidgetItem;
2423
class QgsComposer;
2524

@@ -29,12 +28,11 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
2928
{
3029
Q_OBJECT
3130
public:
32-
QgsComposerManager( QgisApp* app, QWidget * parent = 0, Qt::WindowFlags f = 0 );
31+
QgsComposerManager( QWidget * parent = 0, Qt::WindowFlags f = 0 );
3332
~QgsComposerManager();
3433

3534

3635
private:
37-
QgisApp* mQgisApp;
3836
/**Stores the relation between items and composer pointers. A 0 pointer for the composer means that
3937
this composer needs to be created from a default template*/
4038
QMap<QListWidgetItem*, QgsComposer*> mItemComposerMap;
@@ -47,9 +45,9 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
4745

4846
private slots:
4947
void on_mAddButton_clicked();
50-
void on_mRemoveButton_clicked();
51-
void on_mShowPushButton_clicked();
52-
void on_mRenamePushButton_clicked();
48+
void remove_clicked();
49+
void show_clicked();
50+
void rename_clicked();
5351
void on_mComposerListWidget_itemChanged( QListWidgetItem * item );
5452
};
5553

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3561,7 +3561,7 @@ void QgisApp::newPrintComposer()
35613561

35623562
void QgisApp::showComposerManager()
35633563
{
3564-
QgsComposerManager m( this, 0 );
3564+
QgsComposerManager m;
35653565
m.exec();
35663566
}
35673567

‎src/core/qgsgeometry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5528,7 +5528,7 @@ bool QgsGeometry::geomInDegrees( const GEOSGeometry* geom )
55285528
}
55295529

55305530
double x, y;
5531-
for ( int i = 0; i < ( nCoords - 1 ); ++i )
5531+
for ( unsigned int i = 0; i < ( nCoords - 1 ); ++i )
55325532
{
55335533
GEOSCoordSeq_getX( bBoxCoordSeq, i, &x );
55345534
if ( x > 180 || x < -180 )

‎src/ui/qgscomposermanagerbase.ui

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,42 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsComposerManagerBase</class>
3-
<widget class="QDialog" name="QgsComposerManagerBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsComposerManagerBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>346</width>
9-
<height>203</height>
10+
<height>195</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Composer manager</string>
1415
</property>
15-
<layout class="QGridLayout" name="gridLayout" >
16-
<item rowspan="5" row="0" column="0" >
17-
<widget class="QListWidget" name="mComposerListWidget" />
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0" rowspan="3" colspan="2">
18+
<widget class="QListWidget" name="mComposerListWidget"/>
1819
</item>
19-
<item row="0" column="1" >
20-
<widget class="QPushButton" name="mShowPushButton" >
21-
<property name="text" >
22-
<string>Show</string>
20+
<item row="4" column="0" colspan="2">
21+
<widget class="QDialogButtonBox" name="mButtonBox">
22+
<property name="orientation">
23+
<enum>Qt::Horizontal</enum>
2324
</property>
24-
</widget>
25-
</item>
26-
<item row="1" column="1" >
27-
<widget class="QPushButton" name="mRemoveButton" >
28-
<property name="text" >
29-
<string>Remove</string>
25+
<property name="standardButtons">
26+
<set>QDialogButtonBox::Close</set>
3027
</property>
3128
</widget>
3229
</item>
33-
<item row="2" column="1" >
34-
<widget class="QPushButton" name="mRenamePushButton" >
35-
<property name="text" >
36-
<string>Rename</string>
37-
</property>
38-
</widget>
30+
<item row="3" column="0">
31+
<widget class="QComboBox" name="mTemplate"/>
3932
</item>
40-
<item row="3" column="1" >
41-
<widget class="QPushButton" name="mAddButton" >
42-
<property name="text" >
33+
<item row="3" column="1">
34+
<widget class="QPushButton" name="mAddButton">
35+
<property name="text">
4336
<string>Add</string>
4437
</property>
4538
</widget>
4639
</item>
47-
<item row="4" column="1" >
48-
<spacer name="verticalSpacer" >
49-
<property name="orientation" >
50-
<enum>Qt::Vertical</enum>
51-
</property>
52-
<property name="sizeHint" stdset="0" >
53-
<size>
54-
<width>20</width>
55-
<height>50</height>
56-
</size>
57-
</property>
58-
</spacer>
59-
</item>
60-
<item row="5" column="0" colspan="2" >
61-
<widget class="QDialogButtonBox" name="mButtonBox" >
62-
<property name="orientation" >
63-
<enum>Qt::Horizontal</enum>
64-
</property>
65-
<property name="standardButtons" >
66-
<set>QDialogButtonBox::Close</set>
67-
</property>
68-
</widget>
69-
</item>
7040
</layout>
7141
</widget>
7242
<resources/>
@@ -77,11 +47,11 @@
7747
<receiver>QgsComposerManagerBase</receiver>
7848
<slot>accept()</slot>
7949
<hints>
80-
<hint type="sourcelabel" >
50+
<hint type="sourcelabel">
8151
<x>251</x>
8252
<y>193</y>
8353
</hint>
84-
<hint type="destinationlabel" >
54+
<hint type="destinationlabel">
8555
<x>157</x>
8656
<y>274</y>
8757
</hint>
@@ -93,11 +63,11 @@
9363
<receiver>QgsComposerManagerBase</receiver>
9464
<slot>reject()</slot>
9565
<hints>
96-
<hint type="sourcelabel" >
66+
<hint type="sourcelabel">
9767
<x>251</x>
9868
<y>193</y>
9969
</hint>
100-
<hint type="destinationlabel" >
70+
<hint type="destinationlabel">
10171
<x>286</x>
10272
<y>274</y>
10373
</hint>

0 commit comments

Comments
 (0)
Please sign in to comment.