[QGIS Commit] r8906 - trunk/qgis/src/plugins/delimited_text
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Jul 25 18:55:26 EDT 2008
Author: timlinux
Date: 2008-07-25 18:55:26 -0400 (Fri, 25 Jul 2008)
New Revision: 8906
Added:
trunk/qgis/src/plugins/delimited_text/delimitedText.svg
Removed:
trunk/qgis/src/plugins/delimited_text/icon.xpm
Modified:
trunk/qgis/src/plugins/delimited_text/delimited_text.png
trunk/qgis/src/plugins/delimited_text/delimited_text.qrc
trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
Log:
icon updates & drop xpm in favour of qt resource
Added: trunk/qgis/src/plugins/delimited_text/delimitedText.svg
===================================================================
--- trunk/qgis/src/plugins/delimited_text/delimitedText.svg (rev 0)
+++ trunk/qgis/src/plugins/delimited_text/delimitedText.svg 2008-07-25 22:55:26 UTC (rev 8906)
@@ -0,0 +1,125 @@
+<?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: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="delimitedText.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/delimited_text/delimited_text.png"
+ inkscape:export-xdpi="91"
+ inkscape:export-ydpi="91">
+ <defs
+ id="defs4">
+ <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" />
+ </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="15.958656"
+ 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">
+ <path
+ style="opacity:0.90747334;fill:#54d0ff;fill-opacity:1;fill-rule:nonzero;stroke:#171717;stroke-width:2.28699994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 2.46875,30.4375 C 11.645833,30.4375 20.822917,30.4375 30,30.4375 C 30.064138,24.378635 30.11603,15.883025 30.118277,9.6236971 C 30.118983,7.6558782 30.335133,7.5645206 25.279877,3.5419089 C 23.096951,1.6385074 23.172235,1.7049399 22.845544,1.6952675 C 18.708486,1.5727809 6.911066,1.6005551 2.46875,1.5625 C 2.46875,11.1875 2.46875,20.8125 2.46875,30.4375 z"
+ id="rect14833"
+ sodipodi:nodetypes="ccscscc" />
+ <text
+ xml:space="preserve"
+ style="font-size:29.98666382000000041px;font-style:normal;font-weight:normal;fill:#171717;fill-opacity:0.90980393;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="3.9695039"
+ y="21.511156"
+ id="text14838"
+ transform="scale(0.9040853,1.1060903)"><tspan
+ sodipodi:role="line"
+ id="tspan14840"
+ x="3.9695039"
+ y="21.511156">,,,</tspan></text>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#171717;stroke-width:2.46289229000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.90980393;fill-opacity:0.90980393000000004"
+ d="M 22.008966,3.8177511 L 22.008966,8.8747553 L 27.934187,8.8364447"
+ id="path3769"
+ sodipodi:nodetypes="ccc" />
+ </g>
+</svg>
Modified: trunk/qgis/src/plugins/delimited_text/delimited_text.png
===================================================================
(Binary files differ)
Modified: trunk/qgis/src/plugins/delimited_text/delimited_text.qrc
===================================================================
--- trunk/qgis/src/plugins/delimited_text/delimited_text.qrc 2008-07-25 22:52:13 UTC (rev 8905)
+++ trunk/qgis/src/plugins/delimited_text/delimited_text.qrc 2008-07-25 22:55:26 UTC (rev 8906)
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/new/prefix1" >
+ <qresource prefix="/" >
<file>delimited_text.png</file>
</qresource>
</RCC>
Deleted: trunk/qgis/src/plugins/delimited_text/icon.xpm
===================================================================
(Binary files differ)
Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp 2008-07-25 22:52:13 UTC (rev 8905)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp 2008-07-25 22:55:26 UTC (rev 8906)
@@ -37,8 +37,6 @@
//the gui subclass
#include "qgsdelimitedtextplugingui.h"
-// xpm for creating the toolbar icon
-#include "icon.xpm"
//
static const QString pluginVersion = QObject::tr("Version 0.2");
@@ -98,7 +96,7 @@
void QgsDelimitedTextPlugin::initGui()
{
// Create the action for tool
- myQActionPointer = new QAction(QIcon(icon), tr("&Add Delimited Text Layer"), this);
+ myQActionPointer = new QAction(QIcon(":/delimited_text.png"), tr("&Add Delimited Text Layer"), this);
myQActionPointer->setWhatsThis(tr("Add a delimited text file as a map layer. ")+
tr("The file must have a header row containing the field names. ")+
Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui 2008-07-25 22:52:13 UTC (rev 8905)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui 2008-07-25 22:55:26 UTC (rev 8906)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>657</width>
+ <width>701</width>
<height>547</height>
</rect>
</property>
@@ -16,12 +16,24 @@
<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="0" column="0" colspan="3" >
<widget class="QLabel" name="txtHeading" >
<property name="font" >
@@ -49,18 +61,30 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></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="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
<item row="5" 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="textLabel2" >
<property name="text" >
@@ -71,9 +95,7 @@
<item>
<widget class="QComboBox" name="cmbXField" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -105,9 +127,7 @@
<item>
<widget class="QComboBox" name="cmbYField" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -133,12 +153,21 @@
</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="textLabel1" >
<property name="text" >
@@ -179,12 +208,21 @@
</item>
<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="textLabel1_2" >
<property name="text" >
@@ -233,10 +271,10 @@
<item rowspan="7" row="1" column="0" >
<widget class="QLabel" name="pixmapLabel1" >
<property name="pixmap" >
- <pixmap resource="delimited_text.qrc" >:/new/prefix1/delimited_text.png</pixmap>
+ <pixmap resource="delimited_text.qrc" >:/delimited_text.png</pixmap>
</property>
<property name="scaledContents" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
@@ -246,12 +284,24 @@
<string>Sample text</string>
</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="0" column="0" >
<widget class="QTextEdit" name="txtSample" >
<property name="readOnly" >
@@ -277,18 +327,25 @@
</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>
<widget class="QLabel" name="textLabel3" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -301,9 +358,7 @@
<item>
<widget class="QLineEdit" name="txtDelimiter" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
More information about the QGIS-commit
mailing list