Skip to content

Commit 4e4c788

Browse files
author
timlinux
committed
Further updates to plugin builder - build a valid resources file. Various other clean ups. Get rid of xpm useage. Makefile cleanups. I still get compile errors with the generated plugin so its not useable yet.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5169 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 708610b commit 4e4c788

File tree

6 files changed

+15
-281
lines changed

6 files changed

+15
-281
lines changed

src/plugins/plugin_builder.pl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
system("mkdir $pluginDir");
7878
# copy files to appropriate names
7979
system("cp plugin_template/Makefile.am $pluginDir/");
80+
system("cp plugin_template/plugin.qrc $pluginDir/$pluginLCaseName.qrc");
81+
system("cp plugin_template/plugin.png $pluginDir/$pluginLCaseName.png");
8082
system("cp plugin_template/plugin.cpp $pluginDir/$pluginLCaseName.cpp");
8183
system("cp plugin_template/plugin.h $pluginDir/$pluginLCaseName.h");
8284
system("cp plugin_template/plugingui.cpp $pluginDir/${pluginLCaseName}gui.cpp");
@@ -88,7 +90,7 @@
8890
# This is a brute force approach but its quick and dirty :)
8991
#
9092
# replace [pluginlcasename] in template with the new plugin name
91-
system("perl -pi -e 's/\\\[pluginlcasename\\\]/$pluginLCaseName/g' $pluginDir/*.cpp $pluginDir/*.h $pluginDir/*.am $pluginDir/*.ui");
93+
system("perl -pi -e 's/\\\[pluginlcasename\\\]/$pluginLCaseName/g' $pluginDir/*.qrc $pluginDir/*.cpp $pluginDir/*.h $pluginDir/*.am $pluginDir/*.ui");
9294
# replace [pluginname] in template with the new plugin name
9395
system("perl -pi -e 's/\\\[pluginname\\\]/$pluginName/g' $pluginDir/*.cpp $pluginDir/*.h $pluginDir/*.am $pluginDir/*.ui");
9496
# replace [plugindescription] in template with the description

src/plugins/plugin_template/Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ui_%.h: %.ui
4242
## For plugin lib
4343
##
4444

45-
[pluginlcasename]_la_SOURCES = [pluginlcasename].cpp \
45+
libqgis_plugin_[pluginlcasename]_la_SOURCES = [pluginlcasename].cpp \
4646
[pluginlcasename]gui.cpp \
4747
$(plugin_UI)\
4848
$(plugin_MOC)\
@@ -63,12 +63,12 @@ plugin_QRC = [pluginlcasename].qrc
6363

6464
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
6565

66-
[pluginlcasename]_la_LIBADD = $(QT_LDADD) \
66+
libqgis_plugin_[pluginlcasename]_la_LIBADD = $(QT_LDADD) \
6767
$(GDAL_LDADD) \
6868
../../core/libqgis_core.la \
6969
../../gui/libqgis_gui.la
70-
[pluginlcasename]_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
71-
[pluginlcasename]_la_CXXFLAGS = $(CXXFLAGS) \
70+
libqgis_plugin_[pluginlcasename]_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
71+
libqgis_plugin_[pluginlcasename]_la_CXXFLAGS = $(CXXFLAGS) \
7272
$(EXTRA_CXXFLAGS) \
7373
$(QT_CXXFLAGS) \
7474
$(DEBUG_QGIS) \
@@ -77,4 +77,4 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
7777
-I../../core \
7878
-I../../ui \
7979
-I../../gui
80-
[pluginlcasename]_la_LDFLAGS = -avoid-version -module
80+
libqgis_plugin_[pluginlcasename]_la_LDFLAGS = -avoid-version -module

src/plugins/plugin_template/icon.xpm

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

src/plugins/plugin_template/plugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ email : tim@linfiniti.com
4444
#include "plugingui.h"
4545

4646
// xpm for creating the toolbar icon
47-
#include "icon.xpm"
4847
#ifdef WIN32
4948
#define QGISEXTERN extern "C" __declspec( dllexport )
5049
#else
@@ -88,7 +87,8 @@ static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
8887
void [pluginname]::initGui()
8988
{
9089
Q3PopupMenu *pluginMenu = qGisInterface->getPluginMenu("&[menuname]");
91-
menuId = pluginMenu->insertItem(QIcon(icon),"&[menuitemname]", this, SLOT(run()));
90+
//set teh icon from the resource file
91+
menuId = pluginMenu->insertItem(QIcon(":/[pluginlcasename]/[pluginlcasename].png"),"&[menuitemname]", this, SLOT(run()));
9292

9393
pluginMenu->setWhatsThis(menuId, tr("Replace this with a short description of the what the plugin does"));
9494

1.06 KB
Loading
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<RCC>
2+
<qresource prefix="/[pluginlcasename]/" >
3+
<file>[pluginlcasename].png</file>
4+
</qresource>
5+
</RCC>

0 commit comments

Comments
 (0)