703 changes: 0 additions & 703 deletions images/themes/default/qgis.xpm
View file

This file was deleted.

8 changes: 1 addition & 7 deletions src/app/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ typedef SInt32 SRefCon;
#include <signal.h>
#endif

// (if Windows/Mac, use icon from resource)
#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
#include "../../images/themes/default/qgis.xpm" // Linux
#include <QIcon>
#endif

/** print usage text
*/
void usage( std::string const & appName )
Expand Down Expand Up @@ -623,7 +617,7 @@ int main( int argc, char *argv[] )

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

//
Expand Down
3 changes: 2 additions & 1 deletion src/gui/attributetable/qgsdualview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDista
mFeatureList->setModel( mFeatureListModel );

mAttributeDialog = new QgsAttributeDialog( layer, 0, false, myDa );
mAttributeEditorLayout->addWidget( mAttributeDialog->dialog() );
if ( mAttributeDialog->dialog() )
mAttributeEditorLayout->addWidget( mAttributeDialog->dialog() );

columnBoxInit();
}
Expand Down
12 changes: 7 additions & 5 deletions src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ Qt::DropActions QgsCategorizedSymbolRendererV2Model::supportedDropActions() cons

QVariant QgsCategorizedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const
{
if ( !index.isValid() || !mRenderer ) return QVariant();
if ( !index.isValid() || !mRenderer )
return QVariant();

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

Expand Down Expand Up @@ -504,7 +505,6 @@ void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon()

void QgsCategorizedSymbolRendererV2Widget::populateCategories()
{

}

void QgsCategorizedSymbolRendererV2Widget::populateColumns()
Expand Down Expand Up @@ -605,9 +605,11 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
}
}

//DlgAddCategories dlg(mStyle, createDefaultSymbol(), unique_vals, this);
//if (!dlg.exec())
// return;
#if 0
DlgAddCategories dlg( mStyle, createDefaultSymbol(), unique_vals, this );
if ( !dlg.exec() )
return;
#endif

QgsVectorColorRampV2* ramp = cboCategorizedColorRamp->currentColorRamp();

Expand Down
703 changes: 0 additions & 703 deletions src/plugins/georeferencer/icons/default/qgis.xpm
View file

This file was deleted.

11,322 changes: 0 additions & 11,322 deletions src/plugins/gps_importer/gps.xpm
View file

This file was deleted.

34 changes: 17 additions & 17 deletions src/ui/qgsattributetabledialog.ui
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsAttributeTableDialog</class>
<widget class="QDialog" name="QgsAttributeTableDialog">
Expand Down Expand Up @@ -118,8 +118,8 @@
<string>...</string>
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionDeleteSelected.svg</normaloff>../../images/themes/default/mActionDeleteSelected.svg</iconset>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDeleteSelected.svg</normaloff>:/images/themes/default/mActionDeleteSelected.svg</iconset>
</property>
<property name="iconSize">
<size>
Expand Down Expand Up @@ -169,7 +169,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionUnselectAttributes.png</normaloff>../../images/themes/default/mActionUnselectAttributes.png</iconset>
<normaloff>:/images/themes/default/mActionUnselectAttributes.png</normaloff>:/images/themes/default/mActionUnselectAttributes.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -192,7 +192,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionSelectedToTop.png</normaloff>../../images/themes/default/mActionSelectedToTop.png</iconset>
<normaloff>:/images/themes/default/mActionSelectedToTop.png</normaloff>:/images/themes/default/mActionSelectedToTop.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -218,7 +218,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionInvertSelection.png</normaloff>../../images/themes/default/mActionInvertSelection.png</iconset>
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -244,7 +244,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionPanToSelected.png</normaloff>../../images/themes/default/mActionPanToSelected.png</iconset>
<normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -269,8 +269,8 @@
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionZoomToSelected.svg</normaloff>../../images/themes/default/mActionZoomToSelected.svg</iconset>
<iconset resource=":/imagesimages.qrc">
<normaloff>:/images/themes/default/mActionZoomToSelected.svg</normaloff>:/images/themes/default/mActionZoomToSelected.svg</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -296,7 +296,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionEditCopy.png</normaloff>../../images/themes/default/mActionEditCopy.png</iconset>
<normaloff>:/images/themes/default/mActionEditCopy.png</normaloff>:/images/themes/default/mActionEditCopy.png</iconset>
</property>
<property name="iconSize">
<size>
Expand Down Expand Up @@ -326,7 +326,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionDeleteAttribute.png</normaloff>../../images/themes/default/mActionDeleteAttribute.png</iconset>
<normaloff>:/images/themes/default/mActionDeleteAttribute.png</normaloff>:/images/themes/default/mActionDeleteAttribute.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -349,7 +349,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionNewAttribute.png</normaloff>../../images/themes/default/mActionNewAttribute.png</iconset>
<normaloff>:/images/themes/default/mActionNewAttribute.png</normaloff>:/images/themes/default/mActionNewAttribute.png</iconset>
</property>
<property name="iconSize">
<size>
Expand All @@ -372,7 +372,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionCalculateField.png</normaloff>../../images/themes/default/mActionCalculateField.png</iconset>
<normaloff>:/images/themes/default/mActionCalculateField.png</normaloff>:/images/themes/default/mActionCalculateField.png</iconset>
</property>
<property name="iconSize">
<size>
Expand Down Expand Up @@ -450,7 +450,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionFilter.png</normaloff>../../images/themes/default/mActionFilter.png</iconset>
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
</property>
<property name="popupMode">
<enum>QToolButton::MenuButtonPopup</enum>
Expand Down Expand Up @@ -501,7 +501,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionPropertyItem.png</normaloff>../../images/themes/default/mActionPropertyItem.png</iconset>
<normaloff>:/images/themes/default/mActionPropertyItem.png</normaloff>:/images/themes/default/mActionPropertyItem.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -518,7 +518,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionOpenTable.png</normaloff>../../images/themes/default/mActionOpenTable.png</iconset>
<normaloff>:/images/themes/default/mActionOpenTable.png</normaloff>:/images/themes/default/mActionOpenTable.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -539,7 +539,7 @@
<action name="mActionAdvancedFilter">
<property name="icon">
<iconset>
<normaloff>../../images/themes/default/mActionFilter.png</normaloff>../../images/themes/default/mActionFilter.png</iconset>
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
</property>
<property name="text">
<string>Advanced Filter (Expression)</string>
Expand Down