Skip to content

Commit 8b5f22e

Browse files
jef-njef-n
committedJul 27, 2013
- fix runtime gui warnings
- remove xpms - also use qgis-icon-60x60.png as window icon on linux
·
ltr-3_44archive/master_2
1 parent 5c80e50 commit 8b5f22e

File tree

7 files changed

+27
-12758
lines changed

7 files changed

+27
-12758
lines changed
 

‎images/themes/default/qgis.xpm‎

Lines changed: 0 additions & 703 deletions
This file was deleted.

‎src/app/main.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ typedef SInt32 SRefCon;
8585
#include <signal.h>
8686
#endif
8787

88-
// (if Windows/Mac, use icon from resource)
89-
#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
90-
#include "../../images/themes/default/qgis.xpm" // Linux
91-
#include <QIcon>
92-
#endif
93-
9488
/** print usage text
9589
*/
9690
void usage( std::string const & appName )
@@ -623,7 +617,7 @@ int main( int argc, char *argv[] )
623617

624618
// (if Windows/Mac, use icon from resource)
625619
#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
626-
myApp.setWindowIcon( QPixmap( qgis_xpm ) ); // Linux
620+
myApp.setWindowIcon( QIcon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" ) );
627621
#endif
628622

629623
//

‎src/gui/attributetable/qgsdualview.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDista
7272
mFeatureList->setModel( mFeatureListModel );
7373

7474
mAttributeDialog = new QgsAttributeDialog( layer, 0, false, myDa );
75-
mAttributeEditorLayout->addWidget( mAttributeDialog->dialog() );
75+
if ( mAttributeDialog->dialog() )
76+
mAttributeEditorLayout->addWidget( mAttributeDialog->dialog() );
7677

7778
columnBoxInit();
7879
}

‎src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ Qt::DropActions QgsCategorizedSymbolRendererV2Model::supportedDropActions() cons
8484

8585
QVariant QgsCategorizedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const
8686
{
87-
if ( !index.isValid() || !mRenderer ) return QVariant();
87+
if ( !index.isValid() || !mRenderer )
88+
return QVariant();
8889

8990
const QgsRendererCategoryV2 category = mRenderer->categories().value( index.row() );
9091

@@ -504,7 +505,6 @@ void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon()
504505

505506
void QgsCategorizedSymbolRendererV2Widget::populateCategories()
506507
{
507-
508508
}
509509

510510
void QgsCategorizedSymbolRendererV2Widget::populateColumns()
@@ -605,9 +605,11 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
605605
}
606606
}
607607

608-
//DlgAddCategories dlg(mStyle, createDefaultSymbol(), unique_vals, this);
609-
//if (!dlg.exec())
610-
// return;
608+
#if 0
609+
DlgAddCategories dlg( mStyle, createDefaultSymbol(), unique_vals, this );
610+
if ( !dlg.exec() )
611+
return;
612+
#endif
611613

612614
QgsVectorColorRampV2* ramp = cboCategorizedColorRamp->currentColorRamp();
613615

‎src/plugins/georeferencer/icons/default/qgis.xpm‎

Lines changed: 0 additions & 703 deletions
This file was deleted.

‎src/plugins/gps_importer/gps.xpm‎

Lines changed: 0 additions & 11322 deletions
This file was deleted.

‎src/ui/qgsattributetabledialog.ui‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
33
<class>QgsAttributeTableDialog</class>
44
<widget class="QDialog" name="QgsAttributeTableDialog">
@@ -118,8 +118,8 @@
118118
<string>...</string>
119119
</property>
120120
<property name="icon">
121-
<iconset>
122-
<normaloff>../../images/themes/default/mActionDeleteSelected.svg</normaloff>../../images/themes/default/mActionDeleteSelected.svg</iconset>
121+
<iconset resource="../../images/images.qrc">
122+
<normaloff>:/images/themes/default/mActionDeleteSelected.svg</normaloff>:/images/themes/default/mActionDeleteSelected.svg</iconset>
123123
</property>
124124
<property name="iconSize">
125125
<size>
@@ -169,7 +169,7 @@
169169
</property>
170170
<property name="icon">
171171
<iconset>
172-
<normaloff>../../images/themes/default/mActionUnselectAttributes.png</normaloff>../../images/themes/default/mActionUnselectAttributes.png</iconset>
172+
<normaloff>:/images/themes/default/mActionUnselectAttributes.png</normaloff>:/images/themes/default/mActionUnselectAttributes.png</iconset>
173173
</property>
174174
<property name="iconSize">
175175
<size>
@@ -192,7 +192,7 @@
192192
</property>
193193
<property name="icon">
194194
<iconset>
195-
<normaloff>../../images/themes/default/mActionSelectedToTop.png</normaloff>../../images/themes/default/mActionSelectedToTop.png</iconset>
195+
<normaloff>:/images/themes/default/mActionSelectedToTop.png</normaloff>:/images/themes/default/mActionSelectedToTop.png</iconset>
196196
</property>
197197
<property name="iconSize">
198198
<size>
@@ -218,7 +218,7 @@
218218
</property>
219219
<property name="icon">
220220
<iconset>
221-
<normaloff>../../images/themes/default/mActionInvertSelection.png</normaloff>../../images/themes/default/mActionInvertSelection.png</iconset>
221+
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
222222
</property>
223223
<property name="iconSize">
224224
<size>
@@ -244,7 +244,7 @@
244244
</property>
245245
<property name="icon">
246246
<iconset>
247-
<normaloff>../../images/themes/default/mActionPanToSelected.png</normaloff>../../images/themes/default/mActionPanToSelected.png</iconset>
247+
<normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
248248
</property>
249249
<property name="iconSize">
250250
<size>
@@ -269,8 +269,8 @@
269269
<string/>
270270
</property>
271271
<property name="icon">
272-
<iconset>
273-
<normaloff>../../images/themes/default/mActionZoomToSelected.svg</normaloff>../../images/themes/default/mActionZoomToSelected.svg</iconset>
272+
<iconset resource=":/imagesimages.qrc">
273+
<normaloff>:/images/themes/default/mActionZoomToSelected.svg</normaloff>:/images/themes/default/mActionZoomToSelected.svg</iconset>
274274
</property>
275275
<property name="iconSize">
276276
<size>
@@ -296,7 +296,7 @@
296296
</property>
297297
<property name="icon">
298298
<iconset>
299-
<normaloff>../../images/themes/default/mActionEditCopy.png</normaloff>../../images/themes/default/mActionEditCopy.png</iconset>
299+
<normaloff>:/images/themes/default/mActionEditCopy.png</normaloff>:/images/themes/default/mActionEditCopy.png</iconset>
300300
</property>
301301
<property name="iconSize">
302302
<size>
@@ -326,7 +326,7 @@
326326
</property>
327327
<property name="icon">
328328
<iconset>
329-
<normaloff>../../images/themes/default/mActionDeleteAttribute.png</normaloff>../../images/themes/default/mActionDeleteAttribute.png</iconset>
329+
<normaloff>:/images/themes/default/mActionDeleteAttribute.png</normaloff>:/images/themes/default/mActionDeleteAttribute.png</iconset>
330330
</property>
331331
<property name="iconSize">
332332
<size>
@@ -349,7 +349,7 @@
349349
</property>
350350
<property name="icon">
351351
<iconset>
352-
<normaloff>../../images/themes/default/mActionNewAttribute.png</normaloff>../../images/themes/default/mActionNewAttribute.png</iconset>
352+
<normaloff>:/images/themes/default/mActionNewAttribute.png</normaloff>:/images/themes/default/mActionNewAttribute.png</iconset>
353353
</property>
354354
<property name="iconSize">
355355
<size>
@@ -372,7 +372,7 @@
372372
</property>
373373
<property name="icon">
374374
<iconset>
375-
<normaloff>../../images/themes/default/mActionCalculateField.png</normaloff>../../images/themes/default/mActionCalculateField.png</iconset>
375+
<normaloff>:/images/themes/default/mActionCalculateField.png</normaloff>:/images/themes/default/mActionCalculateField.png</iconset>
376376
</property>
377377
<property name="iconSize">
378378
<size>
@@ -450,7 +450,7 @@
450450
</property>
451451
<property name="icon">
452452
<iconset>
453-
<normaloff>../../images/themes/default/mActionFilter.png</normaloff>../../images/themes/default/mActionFilter.png</iconset>
453+
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
454454
</property>
455455
<property name="popupMode">
456456
<enum>QToolButton::MenuButtonPopup</enum>
@@ -501,7 +501,7 @@
501501
</property>
502502
<property name="icon">
503503
<iconset>
504-
<normaloff>../../images/themes/default/mActionPropertyItem.png</normaloff>../../images/themes/default/mActionPropertyItem.png</iconset>
504+
<normaloff>:/images/themes/default/mActionPropertyItem.png</normaloff>:/images/themes/default/mActionPropertyItem.png</iconset>
505505
</property>
506506
<property name="checkable">
507507
<bool>true</bool>
@@ -518,7 +518,7 @@
518518
</property>
519519
<property name="icon">
520520
<iconset>
521-
<normaloff>../../images/themes/default/mActionOpenTable.png</normaloff>../../images/themes/default/mActionOpenTable.png</iconset>
521+
<normaloff>:/images/themes/default/mActionOpenTable.png</normaloff>:/images/themes/default/mActionOpenTable.png</iconset>
522522
</property>
523523
<property name="checkable">
524524
<bool>true</bool>
@@ -539,7 +539,7 @@
539539
<action name="mActionAdvancedFilter">
540540
<property name="icon">
541541
<iconset>
542-
<normaloff>../../images/themes/default/mActionFilter.png</normaloff>../../images/themes/default/mActionFilter.png</iconset>
542+
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
543543
</property>
544544
<property name="text">
545545
<string>Advanced Filter (Expression)</string>

0 commit comments

Comments
 (0)
Please sign in to comment.