Skip to content

Commit 638c89f

Browse files
author
gsherman
committed
Fixed missing eye-candy images on plugin dialogs (needed a RESOURCES = statement in the .pro file)
git-svn-id: http://svn.osgeo.org/qgis/trunk@6329 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 49d63f4 commit 638c89f

File tree

9 files changed

+24
-7
lines changed

9 files changed

+24
-7
lines changed

‎src/plugins/copyright_label/copyright_label.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ LIBS += $${QGISGUILIBADD}
3636
DESTDIR=$${QGISPLUGINDIR}
3737
QT += qt3support svg core gui xml network
3838
message("Building libs into $${DESTDIR}")
39+
RESOURCES = copyright_plugin.qrc
3940

4041
HEADERS += plugin.h \
4142
plugingui.h

‎src/plugins/copyright_label/pluginguibase.ui‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsCopyrightLabelPluginGuiBase</class>
63
<widget class="QDialog" name="QgsCopyrightLabelPluginGuiBase" >
74
<property name="geometry" >
@@ -31,14 +28,25 @@
3128
<bool>true</bool>
3229
</property>
3330
<property name="html" >
34-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt;">Description&lt;/span>&lt;/p>&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">&amp;lt;B&amp;gt; Bold text &amp;lt;/B&amp;gt; &lt;/span>&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">&lt;span style=" font-weight:400; font-style:italic;">&amp;lt;I&amp;gt; Italics &amp;lt;/I&amp;gt;&lt;/span>&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;">&lt;span style=" font-style:normal;">(note: &amp;amp;copy; gives a copyright symbol)&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
31+
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
32+
p, li { white-space: pre-wrap; }
33+
&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
34+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-size:12pt;">Description&lt;/span>&lt;/p>
35+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>
36+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:&lt;/p>
37+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-weight:600;">&amp;lt;B&amp;gt; Bold text &amp;lt;/B&amp;gt; &lt;/span>&lt;/p>
38+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; font-weight:600;">&lt;span style=" font-weight:400; font-style:italic;">&amp;lt;I&amp;gt; Italics &amp;lt;/I&amp;gt;&lt;/span>&lt;/p>
39+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; font-style:italic;">&lt;span style=" font-style:normal;">(note: &amp;amp;copy; gives a copyright symbol)&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
3540
</property>
3641
</widget>
3742
</item>
3843
<item row="1" column="2" >
3944
<widget class="QTextEdit" name="txtCopyrightText" >
4045
<property name="html" >
41-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:14pt;">© QGIS 2006&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
46+
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
47+
p, li { white-space: pre-wrap; }
48+
&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
49+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-size:14pt;">© QGIS 2006&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
4250
</property>
4351
</widget>
4452
</item>
@@ -234,7 +242,6 @@
234242
</layout>
235243
</widget>
236244
<layoutdefault spacing="6" margin="11" />
237-
<pixmapfunction></pixmapfunction>
238245
<resources>
239246
<include location="copyright_plugin.qrc" />
240247
</resources>

‎src/plugins/delimited_text/delimited_text.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ DESTDIR=$${QGISPLUGINDIR}
3131
QT += qt3support svg core gui xml network
3232
message("Building libs into $${DESTDIR}")
3333

34+
RESOURCES = delimited_text.qrc
35+
3436
HEADERS += qgsdelimitedtextplugin.h \
3537
qgsdelimitedtextplugingui.h
3638
FORMS += qgsdelimitedtextpluginguibase.ui

‎src/plugins/georeferencer/georeferencer.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ QT += qt3support svg core gui xml network
4444

4545
message("Building libs into $${DESTDIR}")
4646

47-
REOURCES += georeferencer.qrc
47+
RESOURCES += georeferencer.qrc
4848

4949
FORMS += mapcoordsdialogbase.ui \
5050
pluginguibase.ui \

‎src/plugins/gps_importer/gps_importer.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ message("Building libs into $${DESTDIR}")
4444

4545

4646
# Input
47+
RESOURCES += qgsgps_plugin.qrc
48+
4749
FORMS += qgsgpspluginguibase.ui \
4850
qgsgpsdevicedialogbase.ui
4951

‎src/plugins/grid_maker/grid_maker.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ QT += qt3support svg core gui xml network
3838

3939
message("Building libs into $${DESTDIR}")
4040

41+
RESOURCES += gridmaker_plugin.qrc
4142

4243
HEADERS += graticulecreator.h \
4344
plugin.h \

‎src/plugins/north_arrow/north_arrow.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ DESTDIR=$${QGISPLUGINDIR}
3737
QT += qt3support svg core gui xml network
3838
message("Building libs into $${DESTDIR}")
3939

40+
RESOURCES += northarrow_plugin.qrc
41+
4042
HEADERS += plugin.h \
4143
plugingui.h \
4244
pluginguibase.ui.h

‎src/plugins/scale_bar/scale_bar.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ DESTDIR=$${QGISPLUGINDIR}
3838
QT += qt3support svg core gui xml network
3939
message("Building libs into $${DESTDIR}")
4040

41+
RESOURCES += scalebar_plugin.qrc
4142

4243
HEADERS += plugin.h \
4344
plugingui.h \

‎src/plugins/spit/spit.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ QT += qt3support svg core gui xml network
4545

4646
message("Building libs into $${DESTDIR}")
4747

48+
RESOURCES += spit.qrc
4849

4950
HEADERS += qgsconnectiondialog.h \
5051
qgsdbfbase.h \

0 commit comments

Comments
 (0)