Skip to content

Commit f282bcf

Browse files
author
brushtyler
committedNov 14, 2010
refactored the addvector, addraster and selectmapset GUI for the GRASS plugin
git-svn-id: http://svn.osgeo.org/qgis/trunk@14630 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 60cb36c commit f282bcf

File tree

3 files changed

+94
-191
lines changed

3 files changed

+94
-191
lines changed
 

‎src/plugins/grass/qgsgrassmodule.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
305305
: QWidget( parent, f ),
306306
QgsGrassModuleOptions( tools, module, iface )
307307
{
308-
QgsDebugMsg( "called." );
308+
//QgsDebugMsg( "called." );
309309
QgsDebugMsg( QString( "PATH = %1" ).arg( getenv( "PATH" ) ) );
310310

311311
// Attention!: sh.exe (MSYS) sets $0 in scripts to file name
@@ -1047,7 +1047,7 @@ QString QgsGrassModule::label( QString path )
10471047

10481048
QPixmap QgsGrassModule::pixmap( QString path, int height )
10491049
{
1050-
QgsDebugMsg( QString( "path = %1" ).arg( path ) );
1050+
//QgsDebugMsg( QString( "path = %1" ).arg( path ) );
10511051

10521052
std::vector<QPixmap> pixmaps;
10531053

‎src/plugins/grass/qgsgrassselect.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ QgsGrassSelect::QgsGrassSelect( int type ): QgsGrassSelectBase()
3434
QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );
3535

3636
setupUi( this );
37+
connect( buttonBox, SIGNAL( accepted() ), SLOT( on_ok_clicked() ) );
38+
connect( buttonBox, SIGNAL( rejected() ), this, SLOT( on_cancel_clicked() ) );
3739

3840
if ( first )
3941
{
@@ -101,7 +103,7 @@ QgsGrassSelect::~QgsGrassSelect()
101103

102104
void QgsGrassSelect::restorePosition()
103105
{
104-
optionsFrame->adjustSize();
106+
//optionsFrame->adjustSize();
105107
adjustSize();
106108

107109
QSettings settings;
@@ -185,7 +187,7 @@ void QgsGrassSelect::setLocations()
185187
{
186188
elocation->setCurrentIndex( sel );
187189
}
188-
ok->setDefault( true );
190+
buttonBox->button(QDialogButtonBox::Ok)->setDefault( true );
189191
GisdbaseBrowse->setDefault( elocation->count() == 0 );
190192

191193
setMapsets();
@@ -228,7 +230,7 @@ void QgsGrassSelect::setMapsets()
228230
}
229231
if ( emap->isHidden() )
230232
{
231-
ok->setDefault( emapset->count() > 0 );
233+
buttonBox->button(QDialogButtonBox::Ok)->setDefault( emapset->count() > 0 );
232234
}
233235

234236
setMaps();
@@ -323,7 +325,7 @@ void QgsGrassSelect::setMaps()
323325
*/
324326
if ( !emap->isHidden() )
325327
{
326-
ok->setDefault( emap->count() > 0 );
328+
buttonBox->button(QDialogButtonBox::Ok)->setDefault( emap->count() > 0 );
327329
}
328330

329331
setLayers();

‎src/plugins/grass/qgsgrassselectbase.ui

Lines changed: 86 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -1,211 +1,112 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsGrassSelectBase</class>
3-
<widget class="QDialog" name="QgsGrassSelectBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsGrassSelectBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>511</width>
9-
<height>175</height>
9+
<width>393</width>
10+
<height>221</height>
1011
</rect>
1112
</property>
12-
<property name="sizePolicy" >
13-
<sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
14-
<horstretch>0</horstretch>
15-
<verstretch>0</verstretch>
16-
</sizepolicy>
17-
</property>
18-
<property name="windowTitle" >
13+
<property name="windowTitle">
1914
<string>Add GRASS Layer</string>
2015
</property>
21-
<property name="sizeGripEnabled" >
22-
<bool>true</bool>
23-
</property>
24-
<property name="modal" >
25-
<bool>true</bool>
26-
</property>
27-
<layout class="QHBoxLayout" >
28-
<property name="spacing" >
29-
<number>5</number>
30-
</property>
31-
<property name="leftMargin" >
32-
<number>5</number>
33-
</property>
34-
<property name="topMargin" >
35-
<number>5</number>
36-
</property>
37-
<property name="rightMargin" >
38-
<number>5</number>
39-
</property>
40-
<property name="bottomMargin" >
41-
<number>5</number>
42-
</property>
43-
<item>
44-
<widget class="QFrame" name="optionsFrame" >
45-
<property name="sizePolicy" >
46-
<sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
47-
<horstretch>0</horstretch>
48-
<verstretch>0</verstretch>
49-
</sizepolicy>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0">
18+
<widget class="QLabel" name="Gisdbase">
19+
<property name="text">
20+
<string>Gisdbase</string>
21+
</property>
22+
</widget>
23+
</item>
24+
<item row="0" column="1">
25+
<widget class="QLineEdit" name="egisdbase">
26+
<property name="text">
27+
<string/>
5028
</property>
51-
<property name="frameShape" >
52-
<enum>QFrame::StyledPanel</enum>
29+
</widget>
30+
</item>
31+
<item row="1" column="0">
32+
<widget class="QLabel" name="Location">
33+
<property name="frameShape">
34+
<enum>QFrame::NoFrame</enum>
5335
</property>
54-
<property name="frameShadow" >
36+
<property name="frameShadow">
5537
<enum>QFrame::Plain</enum>
5638
</property>
57-
<property name="lineWidth" >
58-
<number>0</number>
39+
<property name="text">
40+
<string>Location</string>
5941
</property>
60-
<layout class="QGridLayout" >
61-
<property name="leftMargin" >
62-
<number>5</number>
63-
</property>
64-
<property name="topMargin" >
65-
<number>5</number>
66-
</property>
67-
<property name="rightMargin" >
68-
<number>5</number>
69-
</property>
70-
<property name="bottomMargin" >
71-
<number>5</number>
72-
</property>
73-
<property name="horizontalSpacing" >
74-
<number>5</number>
75-
</property>
76-
<property name="verticalSpacing" >
77-
<number>5</number>
78-
</property>
79-
<item row="0" column="0" >
80-
<widget class="QLabel" name="Gisdbase" >
81-
<property name="text" >
82-
<string>Gisdbase</string>
83-
</property>
84-
</widget>
85-
</item>
86-
<item row="1" column="0" >
87-
<widget class="QLabel" name="Location" >
88-
<property name="frameShape" >
89-
<enum>QFrame::NoFrame</enum>
90-
</property>
91-
<property name="frameShadow" >
92-
<enum>QFrame::Plain</enum>
93-
</property>
94-
<property name="text" >
95-
<string>Location</string>
96-
</property>
97-
</widget>
98-
</item>
99-
<item row="2" column="0" >
100-
<widget class="QLabel" name="Mapset" >
101-
<property name="text" >
102-
<string>Mapset</string>
103-
</property>
104-
</widget>
105-
</item>
106-
<item row="0" column="1" >
107-
<widget class="QLineEdit" name="egisdbase" >
108-
<property name="text" >
109-
<string/>
110-
</property>
111-
</widget>
112-
</item>
113-
<item row="1" column="1" >
114-
<widget class="QComboBox" name="elocation" />
115-
</item>
116-
<item row="3" column="1" >
117-
<widget class="QComboBox" name="emap" >
118-
<property name="toolTip" >
119-
<string>Select or type map name (wildcards '*' and '?' accepted for rasters)</string>
120-
</property>
121-
<property name="editable" >
122-
<bool>true</bool>
123-
</property>
124-
</widget>
125-
</item>
126-
<item row="2" column="1" >
127-
<widget class="QComboBox" name="emapset" />
128-
</item>
129-
<item row="4" column="1" >
130-
<widget class="QComboBox" name="elayer" />
131-
</item>
132-
<item row="3" column="0" >
133-
<widget class="QLabel" name="MapName" >
134-
<property name="text" >
135-
<string>Map name</string>
136-
</property>
137-
</widget>
138-
</item>
139-
<item row="4" column="0" >
140-
<widget class="QLabel" name="Layer" >
141-
<property name="text" >
142-
<string>Layer</string>
143-
</property>
144-
</widget>
145-
</item>
146-
</layout>
14742
</widget>
14843
</item>
149-
<item>
150-
<widget class="QFrame" name="buttonsFrame" >
151-
<property name="sizePolicy" >
152-
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
153-
<horstretch>0</horstretch>
154-
<verstretch>0</verstretch>
155-
</sizepolicy>
44+
<item row="1" column="1" colspan="2">
45+
<widget class="QComboBox" name="elocation"/>
46+
</item>
47+
<item row="2" column="0">
48+
<widget class="QLabel" name="Mapset">
49+
<property name="text">
50+
<string>Mapset</string>
15651
</property>
157-
<property name="frameShape" >
158-
<enum>QFrame::StyledPanel</enum>
52+
</widget>
53+
</item>
54+
<item row="2" column="1" colspan="2">
55+
<widget class="QComboBox" name="emapset"/>
56+
</item>
57+
<item row="3" column="0">
58+
<widget class="QLabel" name="MapName">
59+
<property name="text">
60+
<string>Map name</string>
15961
</property>
160-
<property name="frameShadow" >
161-
<enum>QFrame::Plain</enum>
62+
</widget>
63+
</item>
64+
<item row="3" column="1" colspan="2">
65+
<widget class="QComboBox" name="emap">
66+
<property name="toolTip">
67+
<string>Select or type map name (wildcards '*' and '?' accepted for rasters)</string>
16268
</property>
163-
<property name="lineWidth" >
164-
<number>0</number>
69+
<property name="editable">
70+
<bool>true</bool>
71+
</property>
72+
</widget>
73+
</item>
74+
<item row="4" column="0">
75+
<widget class="QLabel" name="Layer">
76+
<property name="text">
77+
<string>Layer</string>
78+
</property>
79+
</widget>
80+
</item>
81+
<item row="4" column="1" colspan="2">
82+
<widget class="QComboBox" name="elayer"/>
83+
</item>
84+
<item row="6" column="0" colspan="3">
85+
<widget class="QDialogButtonBox" name="buttonBox">
86+
<property name="orientation">
87+
<enum>Qt::Horizontal</enum>
88+
</property>
89+
<property name="standardButtons">
90+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
91+
</property>
92+
</widget>
93+
</item>
94+
<item row="0" column="2">
95+
<widget class="QPushButton" name="GisdbaseBrowse">
96+
<property name="text">
97+
<string>Browse</string>
98+
</property>
99+
</widget>
100+
</item>
101+
<item row="5" column="0" colspan="3">
102+
<widget class="Line" name="line">
103+
<property name="orientation">
104+
<enum>Qt::Horizontal</enum>
165105
</property>
166-
<layout class="QVBoxLayout" >
167-
<property name="spacing" >
168-
<number>5</number>
169-
</property>
170-
<property name="leftMargin" >
171-
<number>5</number>
172-
</property>
173-
<property name="topMargin" >
174-
<number>5</number>
175-
</property>
176-
<property name="rightMargin" >
177-
<number>5</number>
178-
</property>
179-
<property name="bottomMargin" >
180-
<number>5</number>
181-
</property>
182-
<item>
183-
<widget class="QPushButton" name="GisdbaseBrowse" >
184-
<property name="text" >
185-
<string>Browse</string>
186-
</property>
187-
</widget>
188-
</item>
189-
<item>
190-
<widget class="QPushButton" name="cancel" >
191-
<property name="text" >
192-
<string>Cancel</string>
193-
</property>
194-
</widget>
195-
</item>
196-
<item>
197-
<widget class="QPushButton" name="ok" >
198-
<property name="text" >
199-
<string>OK</string>
200-
</property>
201-
</widget>
202-
</item>
203-
</layout>
204106
</widget>
205107
</item>
206108
</layout>
207109
</widget>
208-
<layoutdefault spacing="6" margin="11" />
209110
<resources/>
210111
<connections/>
211112
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.