Skip to content

Commit 9a1f10e

Browse files
author
timlinux
committedJul 25, 2008
icon updates & drop xpm in favour of qt resource
git-svn-id: http://svn.osgeo.org/qgis/trunk@8906 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent bcefd5c commit 9a1f10e

File tree

6 files changed

+214
-78
lines changed

6 files changed

+214
-78
lines changed
 

‎src/plugins/delimited_text/delimitedText.svg

Lines changed: 125 additions & 0 deletions
Loading

‎src/plugins/delimited_text/delimited_text.png

-154 KB
Loading

‎src/plugins/delimited_text/delimited_text.qrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<RCC>
2-
<qresource prefix="/new/prefix1" >
2+
<qresource prefix="/" >
33
<file>delimited_text.png</file>
44
</qresource>
55
</RCC>

‎src/plugins/delimited_text/icon.xpm

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

‎src/plugins/delimited_text/qgsdelimitedtextplugin.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
//the gui subclass
3838
#include "qgsdelimitedtextplugingui.h"
3939

40-
// xpm for creating the toolbar icon
41-
#include "icon.xpm"
4240
//
4341

4442
static const QString pluginVersion = QObject::tr("Version 0.2");
@@ -98,7 +96,7 @@ void QgsDelimitedTextPlugin::help()
9896
void QgsDelimitedTextPlugin::initGui()
9997
{
10098
// Create the action for tool
101-
myQActionPointer = new QAction(QIcon(icon), tr("&Add Delimited Text Layer"), this);
99+
myQActionPointer = new QAction(QIcon(":/delimited_text.png"), tr("&Add Delimited Text Layer"), this);
102100

103101
myQActionPointer->setWhatsThis(tr("Add a delimited text file as a map layer. ")+
104102
tr("The file must have a header row containing the field names. ")+

‎src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui

Lines changed: 87 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>657</width>
8+
<width>701</width>
99
<height>547</height>
1010
</rect>
1111
</property>
@@ -16,10 +16,22 @@
1616
<iconset/>
1717
</property>
1818
<layout class="QGridLayout" >
19-
<property name="margin" >
19+
<property name="leftMargin" >
2020
<number>9</number>
2121
</property>
22-
<property name="spacing" >
22+
<property name="topMargin" >
23+
<number>9</number>
24+
</property>
25+
<property name="rightMargin" >
26+
<number>9</number>
27+
</property>
28+
<property name="bottomMargin" >
29+
<number>9</number>
30+
</property>
31+
<property name="horizontalSpacing" >
32+
<number>6</number>
33+
</property>
34+
<property name="verticalSpacing" >
2335
<number>6</number>
2436
</property>
2537
<item row="0" column="0" colspan="3" >
@@ -49,18 +61,30 @@
4961
<bool>true</bool>
5062
</property>
5163
<property name="html" >
52-
<string></string>
64+
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
65+
p, li { white-space: pre-wrap; }
66+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
67+
&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;/body>&lt;/html></string>
5368
</property>
5469
</widget>
5570
</item>
5671
<item row="5" column="2" >
5772
<layout class="QHBoxLayout" >
58-
<property name="margin" >
59-
<number>0</number>
60-
</property>
6173
<property name="spacing" >
6274
<number>6</number>
6375
</property>
76+
<property name="leftMargin" >
77+
<number>0</number>
78+
</property>
79+
<property name="topMargin" >
80+
<number>0</number>
81+
</property>
82+
<property name="rightMargin" >
83+
<number>0</number>
84+
</property>
85+
<property name="bottomMargin" >
86+
<number>0</number>
87+
</property>
6488
<item>
6589
<widget class="QLabel" name="textLabel2" >
6690
<property name="text" >
@@ -71,9 +95,7 @@
7195
<item>
7296
<widget class="QComboBox" name="cmbXField" >
7397
<property name="sizePolicy" >
74-
<sizepolicy>
75-
<hsizetype>7</hsizetype>
76-
<vsizetype>0</vsizetype>
98+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
7799
<horstretch>0</horstretch>
78100
<verstretch>0</verstretch>
79101
</sizepolicy>
@@ -105,9 +127,7 @@
105127
<item>
106128
<widget class="QComboBox" name="cmbYField" >
107129
<property name="sizePolicy" >
108-
<sizepolicy>
109-
<hsizetype>7</hsizetype>
110-
<vsizetype>0</vsizetype>
130+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
111131
<horstretch>0</horstretch>
112132
<verstretch>0</verstretch>
113133
</sizepolicy>
@@ -133,12 +153,21 @@
133153
</item>
134154
<item row="2" column="2" >
135155
<layout class="QHBoxLayout" >
136-
<property name="margin" >
137-
<number>0</number>
138-
</property>
139156
<property name="spacing" >
140157
<number>6</number>
141158
</property>
159+
<property name="leftMargin" >
160+
<number>0</number>
161+
</property>
162+
<property name="topMargin" >
163+
<number>0</number>
164+
</property>
165+
<property name="rightMargin" >
166+
<number>0</number>
167+
</property>
168+
<property name="bottomMargin" >
169+
<number>0</number>
170+
</property>
142171
<item>
143172
<widget class="QLabel" name="textLabel1" >
144173
<property name="text" >
@@ -179,12 +208,21 @@
179208
</item>
180209
<item row="3" column="2" >
181210
<layout class="QHBoxLayout" >
182-
<property name="margin" >
183-
<number>0</number>
184-
</property>
185211
<property name="spacing" >
186212
<number>6</number>
187213
</property>
214+
<property name="leftMargin" >
215+
<number>0</number>
216+
</property>
217+
<property name="topMargin" >
218+
<number>0</number>
219+
</property>
220+
<property name="rightMargin" >
221+
<number>0</number>
222+
</property>
223+
<property name="bottomMargin" >
224+
<number>0</number>
225+
</property>
188226
<item>
189227
<widget class="QLabel" name="textLabel1_2" >
190228
<property name="text" >
@@ -233,10 +271,10 @@
233271
<item rowspan="7" row="1" column="0" >
234272
<widget class="QLabel" name="pixmapLabel1" >
235273
<property name="pixmap" >
236-
<pixmap resource="delimited_text.qrc" >:/new/prefix1/delimited_text.png</pixmap>
274+
<pixmap resource="delimited_text.qrc" >:/delimited_text.png</pixmap>
237275
</property>
238276
<property name="scaledContents" >
239-
<bool>true</bool>
277+
<bool>false</bool>
240278
</property>
241279
</widget>
242280
</item>
@@ -246,10 +284,22 @@
246284
<string>Sample text</string>
247285
</property>
248286
<layout class="QGridLayout" >
249-
<property name="margin" >
287+
<property name="leftMargin" >
288+
<number>9</number>
289+
</property>
290+
<property name="topMargin" >
291+
<number>9</number>
292+
</property>
293+
<property name="rightMargin" >
250294
<number>9</number>
251295
</property>
252-
<property name="spacing" >
296+
<property name="bottomMargin" >
297+
<number>9</number>
298+
</property>
299+
<property name="horizontalSpacing" >
300+
<number>6</number>
301+
</property>
302+
<property name="verticalSpacing" >
253303
<number>6</number>
254304
</property>
255305
<item row="0" column="0" >
@@ -277,18 +327,25 @@
277327
</item>
278328
<item row="4" column="2" >
279329
<layout class="QHBoxLayout" >
280-
<property name="margin" >
281-
<number>0</number>
282-
</property>
283330
<property name="spacing" >
284331
<number>6</number>
285332
</property>
333+
<property name="leftMargin" >
334+
<number>0</number>
335+
</property>
336+
<property name="topMargin" >
337+
<number>0</number>
338+
</property>
339+
<property name="rightMargin" >
340+
<number>0</number>
341+
</property>
342+
<property name="bottomMargin" >
343+
<number>0</number>
344+
</property>
286345
<item>
287346
<widget class="QLabel" name="textLabel3" >
288347
<property name="sizePolicy" >
289-
<sizepolicy>
290-
<hsizetype>1</hsizetype>
291-
<vsizetype>5</vsizetype>
348+
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
292349
<horstretch>0</horstretch>
293350
<verstretch>0</verstretch>
294351
</sizepolicy>
@@ -301,9 +358,7 @@
301358
<item>
302359
<widget class="QLineEdit" name="txtDelimiter" >
303360
<property name="sizePolicy" >
304-
<sizepolicy>
305-
<hsizetype>7</hsizetype>
306-
<vsizetype>0</vsizetype>
361+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
307362
<horstretch>0</horstretch>
308363
<verstretch>0</verstretch>
309364
</sizepolicy>

0 commit comments

Comments
 (0)
Please sign in to comment.