[QGIS Commit] r8904 - trunk/qgis/src/plugins/copyright_label
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Jul 25 18:50:03 EDT 2008
Author: timlinux
Date: 2008-07-25 18:50:03 -0400 (Fri, 25 Jul 2008)
New Revision: 8904
Added:
trunk/qgis/src/plugins/copyright_label/copyright.svg
Removed:
trunk/qgis/src/plugins/copyright_label/icon.xcf
trunk/qgis/src/plugins/copyright_label/icon.xpm
Modified:
trunk/qgis/src/plugins/copyright_label/copyright.png
trunk/qgis/src/plugins/copyright_label/plugin.cpp
trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
Log:
icon updates & drop xpm in favour of qt resource
Modified: trunk/qgis/src/plugins/copyright_label/copyright.png
===================================================================
(Binary files differ)
Added: trunk/qgis/src/plugins/copyright_label/copyright.svg
===================================================================
--- trunk/qgis/src/plugins/copyright_label/copyright.svg (rev 0)
+++ trunk/qgis/src/plugins/copyright_label/copyright.svg 2008-07-25 22:50:03 UTC (rev 8904)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="copyright.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/copyright_label/copyright.png"
+ inkscape:export-xdpi="91"
+ inkscape:export-ydpi="91">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3198">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3200" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3202" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow2Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Mend"
+ style="overflow:visible;">
+ <path
+ id="path3704"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.6) rotate(180) translate(0,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lend"
+ style="overflow:visible;">
+ <path
+ id="path3698"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lend"
+ style="overflow:visible;">
+ <path
+ id="path3680"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.8) rotate(180) translate(12.5,0)" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3198"
+ id="linearGradient3204"
+ x1="0.45400391"
+ y1="16.15391"
+ x2="31.232431"
+ y2="16.15391"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="24.1875"
+ inkscape:cx="16"
+ inkscape:cy="16"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1680"
+ inkscape:window-height="975"
+ inkscape:window-x="0"
+ inkscape:window-y="49" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Camada 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <text
+ xml:space="preserve"
+ style="font-size:41.23527527px;font-style:normal;font-weight:normal;fill:#54d0ff;fill-opacity:1;stroke:#000000;stroke-width:0.96948421px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="-4.7247334"
+ y="31.032364"
+ id="text2404"
+ transform="scale(1.0083644,0.991705)"><tspan
+ sodipodi:role="line"
+ id="tspan2406"
+ x="-4.7247334"
+ y="31.032364"
+ style="fill:#54d0ff;fill-opacity:1;stroke:#000000;stroke-width:0.96948421;stroke-opacity:1">©</tspan><tspan
+ sodipodi:role="line"
+ x="-4.7247334"
+ y="82.576462"
+ id="tspan2408"
+ style="fill:#54d0ff;fill-opacity:1;stroke:#000000;stroke-width:0.96948421;stroke-opacity:1" /></text>
+ </g>
+</svg>
Deleted: trunk/qgis/src/plugins/copyright_label/icon.xcf
===================================================================
(Binary files differ)
Deleted: trunk/qgis/src/plugins/copyright_label/icon.xpm
===================================================================
(Binary files differ)
Modified: trunk/qgis/src/plugins/copyright_label/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/copyright_label/plugin.cpp 2008-07-25 22:46:52 UTC (rev 8903)
+++ trunk/qgis/src/plugins/copyright_label/plugin.cpp 2008-07-25 22:50:03 UTC (rev 8904)
@@ -43,8 +43,6 @@
//the gui subclass
#include "plugingui.h"
-// xpm for creating the toolbar icon
-#include "icon.xpm"
static const char * const ident_ = "$Id$";
@@ -76,7 +74,7 @@
void QgsCopyrightLabelPlugin::initGui()
{
// Create the action for tool
- myQActionPointer = new QAction(QIcon(icon), tr("&Copyright Label"), this);
+ myQActionPointer = new QAction(QIcon(":/copyright.png"), tr("&Copyright Label"), this);
myQActionPointer->setWhatsThis(tr("Creates a copyright label that is displayed on the map canvas."));
// Connect the action to the run
connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));
Modified: trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/copyright_label/pluginguibase.ui 2008-07-25 22:46:52 UTC (rev 8903)
+++ trunk/qgis/src/plugins/copyright_label/pluginguibase.ui 2008-07-25 22:50:03 UTC (rev 8904)
@@ -16,20 +16,41 @@
<iconset/>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
+ <property name="horizontalSpacing" >
<number>6</number>
</property>
+ <property name="verticalSpacing" >
+ <number>6</number>
+ </property>
<item row="3" column="2" >
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
@@ -40,9 +61,7 @@
<item>
<widget class="QgsColorButton" name="pbnColorChooser" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>7</vsizetype>
+ <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -78,24 +97,33 @@
<property name="html" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Description</span></p>
-<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;"></p>
-<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:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">&lt;B&gt; Bold text &lt;/B&gt; </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400; font-style:italic;">&lt;I&gt; Italics &lt;/I&gt;</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;"><span style=" font-style:normal;">(note: &amp;copy; gives a copyright symbol)</span></p></body></html></string>
+</style></head><body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+<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;"><span style=" font-size:12pt;">Description</span></p>
+<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;"></p>
+<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:</p>
+<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;"><span style=" font-weight:600;">&lt;B&gt; Bold text &lt;/B&gt; </span></p>
+<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;"><span style=" font-weight:400; font-style:italic;">&lt;I&gt; Italics &lt;/I&gt;</span></p>
+<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;"><span style=" font-style:normal;">(note: &amp;copy; gives a copyright symbol)</span></p></body></html></string>
</property>
</widget>
</item>
<item row="4" column="2" >
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -127,18 +155,30 @@
<item row="1" column="2" >
<widget class="QTextEdit" name="txtCopyrightText" >
<property name="html" >
- <string>© QGIS 2008</string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">© QGIS 2008</p></body></html></string>
</property>
</widget>
</item>
<item row="2" column="2" >
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="textLabel16" >
<property name="text" >
@@ -224,7 +264,7 @@
<pixmap resource="copyright_plugin.qrc" >:/copyright.png</pixmap>
</property>
<property name="scaledContents" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
More information about the QGIS-commit
mailing list