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/qgis@6329 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 28, 2006 · 81a91ae · 81a91ae
1 parent 3f95be6
commit 81a91ae
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 7 deletions.
diff --git a/src/plugins/copyright_label/copyright_label.pro b/src/plugins/copyright_label/copyright_label.pro
@@ -36,6 +36,7 @@ LIBS += $${QGISGUILIBADD}
 DESTDIR=$${QGISPLUGINDIR}
 QT += qt3support svg core gui xml network
 message("Building libs into $${DESTDIR}")
+RESOURCES = copyright_plugin.qrc
 
 HEADERS += plugin.h \
            plugingui.h 

diff --git a/src/plugins/copyright_label/pluginguibase.ui b/src/plugins/copyright_label/pluginguibase.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>QgsCopyrightLabelPluginGuiBase</class>
  <widget class="QDialog" name="QgsCopyrightLabelPluginGuiBase" >
   <property name="geometry" >
@@ -31,14 +28,25 @@
       <bool>true</bool>
      </property>
      <property name="html" >
-      <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>
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&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;">
+&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>
+&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>
+&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>
+&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>
+&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>
+&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>
      </property>
     </widget>
    </item>
    <item row="1" column="2" >
     <widget class="QTextEdit" name="txtCopyrightText" >
      <property name="html" >
-      <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>
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&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;">
+&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>
      </property>
     </widget>
    </item>
@@ -234,7 +242,6 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
  <resources>
   <include location="copyright_plugin.qrc" />
  </resources>

diff --git a/src/plugins/delimited_text/delimited_text.pro b/src/plugins/delimited_text/delimited_text.pro
@@ -31,6 +31,8 @@ DESTDIR=$${QGISPLUGINDIR}
 QT += qt3support svg core gui xml network
 message("Building libs into $${DESTDIR}")
 
+RESOURCES = delimited_text.qrc
+
 HEADERS += qgsdelimitedtextplugin.h \
            qgsdelimitedtextplugingui.h 
 FORMS +=   qgsdelimitedtextpluginguibase.ui

diff --git a/src/plugins/georeferencer/georeferencer.pro b/src/plugins/georeferencer/georeferencer.pro
@@ -44,7 +44,7 @@ QT += qt3support svg core gui xml network
 
 message("Building libs into $${DESTDIR}")
 
-REOURCES += georeferencer.qrc
+RESOURCES += georeferencer.qrc
 
 FORMS += mapcoordsdialogbase.ui \
          pluginguibase.ui \

diff --git a/src/plugins/gps_importer/gps_importer.pro b/src/plugins/gps_importer/gps_importer.pro
@@ -44,6 +44,8 @@ message("Building libs into $${DESTDIR}")
 
 
 # Input
+RESOURCES += qgsgps_plugin.qrc
+
 FORMS += qgsgpspluginguibase.ui \
               qgsgpsdevicedialogbase.ui
 

diff --git a/src/plugins/grid_maker/grid_maker.pro b/src/plugins/grid_maker/grid_maker.pro
@@ -38,6 +38,7 @@ QT += qt3support svg core gui xml network
 
 message("Building libs into $${DESTDIR}")
 
+RESOURCES += gridmaker_plugin.qrc
 
 HEADERS += graticulecreator.h \
            plugin.h \

diff --git a/src/plugins/north_arrow/north_arrow.pro b/src/plugins/north_arrow/north_arrow.pro
@@ -37,6 +37,8 @@ DESTDIR=$${QGISPLUGINDIR}
 QT += qt3support svg core gui xml network
 message("Building libs into $${DESTDIR}")
 
+RESOURCES += northarrow_plugin.qrc
+
 HEADERS += plugin.h \
            plugingui.h \
            pluginguibase.ui.h 

diff --git a/src/plugins/scale_bar/scale_bar.pro b/src/plugins/scale_bar/scale_bar.pro
@@ -38,6 +38,7 @@ DESTDIR=$${QGISPLUGINDIR}
 QT += qt3support svg core gui xml network
 message("Building libs into $${DESTDIR}")
 
+RESOURCES += scalebar_plugin.qrc
 
 HEADERS += plugin.h \
            plugingui.h \

diff --git a/src/plugins/spit/spit.pro b/src/plugins/spit/spit.pro
@@ -45,6 +45,7 @@ QT += qt3support svg core gui xml network
 
 message("Building libs into $${DESTDIR}")
 
+RESOURCES += spit.qrc
 
 HEADERS += qgsconnectiondialog.h \
            qgsdbfbase.h \