Skip to content

Commit dbc9725

Browse files
author
macho
committedNov 8, 2009
translation update by jean roc and another ui cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@12007 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3b2de2d commit dbc9725

File tree

3 files changed

+533
-437
lines changed

3 files changed

+533
-437
lines changed
 

‎i18n/qgis_fr.ts

Lines changed: 376 additions & 336 deletions
Large diffs are not rendered by default.

‎src/app/qgsoptions.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
4646
connect( cmbTheme, SIGNAL( activated( const QString& ) ), this, SLOT( themeChanged( const QString& ) ) );
4747
connect( cmbTheme, SIGNAL( highlighted( const QString& ) ), this, SLOT( themeChanged( const QString& ) ) );
4848
connect( cmbTheme, SIGNAL( textChanged( const QString& ) ), this, SLOT( themeChanged( const QString& ) ) );
49-
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
50-
connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
5149
connect( this, SIGNAL( accepted() ), this, SLOT( saveOptions() ) );
5250

5351
cmbIdentifyMode->addItem( tr( "Current layer" ), 0 );

‎src/ui/qgsoptionsbase.ui

Lines changed: 157 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,10 @@
2020
<bool>true</bool>
2121
</property>
2222
<layout class="QGridLayout">
23-
<item row="1" column="0">
24-
<widget class="QDialogButtonBox" name="buttonBox">
25-
<property name="orientation">
26-
<enum>Qt::Horizontal</enum>
27-
</property>
28-
<property name="standardButtons">
29-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
30-
</property>
31-
</widget>
32-
</item>
3323
<item row="0" column="0">
3424
<widget class="QTabWidget" name="tabWidget">
3525
<property name="currentIndex">
36-
<number>0</number>
26+
<number>7</number>
3727
</property>
3828
<widget class="QWidget" name="tabGeneral">
3929
<attribute name="title">
@@ -78,7 +68,7 @@
7868
<string>Selection color</string>
7969
</property>
8070
<property name="buddy">
81-
<cstring>pbnMeasureColour</cstring>
71+
<cstring>pbnSelectionColour</cstring>
8272
</property>
8373
</widget>
8474
</item>
@@ -131,7 +121,7 @@
131121
</property>
132122
</widget>
133123
</item>
134-
<item row="0" column="1">
124+
<item row="0" column="2">
135125
<spacer>
136126
<property name="orientation">
137127
<enum>Qt::Horizontal</enum>
@@ -169,18 +159,6 @@
169159
</property>
170160
</widget>
171161
</item>
172-
<item row="0" column="1">
173-
<widget class="QComboBox" name="cmbTheme">
174-
<property name="duplicatesEnabled">
175-
<bool>false</bool>
176-
</property>
177-
<item>
178-
<property name="text">
179-
<string/>
180-
</property>
181-
</item>
182-
</widget>
183-
</item>
184162
<item row="1" column="0" colspan="2">
185163
<spacer>
186164
<property name="orientation">
@@ -239,6 +217,18 @@
239217
</property>
240218
</widget>
241219
</item>
220+
<item row="0" column="1">
221+
<widget class="QComboBox" name="cmbTheme">
222+
<property name="duplicatesEnabled">
223+
<bool>false</bool>
224+
</property>
225+
<item>
226+
<property name="text">
227+
<string/>
228+
</property>
229+
</item>
230+
</widget>
231+
</item>
242232
</layout>
243233
</widget>
244234
</item>
@@ -425,13 +415,19 @@
425415
<property name="text">
426416
<string>Zoom factor</string>
427417
</property>
418+
<property name="buddy">
419+
<cstring>spinZoomFactor</cstring>
420+
</property>
428421
</widget>
429422
</item>
430423
<item row="0" column="0">
431424
<widget class="QLabel" name="label_2">
432425
<property name="text">
433426
<string>Mouse wheel action</string>
434427
</property>
428+
<property name="buddy">
429+
<cstring>cmbWheelAction</cstring>
430+
</property>
435431
</widget>
436432
</item>
437433
<item row="1" column="1">
@@ -450,6 +446,80 @@
450446
</layout>
451447
</widget>
452448
</item>
449+
<item row="0" column="0">
450+
<widget class="QGroupBox" name="groupBox_7">
451+
<property name="title">
452+
<string>Identify</string>
453+
</property>
454+
<layout class="QGridLayout">
455+
<property name="margin">
456+
<number>11</number>
457+
</property>
458+
<item row="2" column="0" colspan="2">
459+
<widget class="QLabel" name="textLabel2">
460+
<property name="text">
461+
<string>&lt;b&gt;Note:&lt;/b&gt; Specify the search radius as a percentage of the map width</string>
462+
</property>
463+
<property name="wordWrap">
464+
<bool>true</bool>
465+
</property>
466+
</widget>
467+
</item>
468+
<item row="1" column="0">
469+
<widget class="QLabel" name="textLabel1_3">
470+
<property name="text">
471+
<string>Search radius for identifying features and displaying map tips</string>
472+
</property>
473+
<property name="buddy">
474+
<cstring>spinBoxIdentifyValue</cstring>
475+
</property>
476+
</widget>
477+
</item>
478+
<item row="1" column="1">
479+
<widget class="QDoubleSpinBox" name="spinBoxIdentifyValue">
480+
<property name="suffix">
481+
<string>%</string>
482+
</property>
483+
<property name="maximum">
484+
<double>100.000000000000000</double>
485+
</property>
486+
<property name="singleStep">
487+
<double>0.010000000000000</double>
488+
</property>
489+
<property name="value">
490+
<double>5.000000000000000</double>
491+
</property>
492+
</widget>
493+
</item>
494+
<item row="0" column="1">
495+
<widget class="QComboBox" name="cmbIdentifyMode"/>
496+
</item>
497+
<item row="0" column="0">
498+
<widget class="QLabel" name="label_4">
499+
<property name="text">
500+
<string>Mode</string>
501+
</property>
502+
<property name="buddy">
503+
<cstring>cmbIdentifyMode</cstring>
504+
</property>
505+
</widget>
506+
</item>
507+
</layout>
508+
</widget>
509+
</item>
510+
<item row="3" column="0">
511+
<spacer>
512+
<property name="orientation">
513+
<enum>Qt::Vertical</enum>
514+
</property>
515+
<property name="sizeHint" stdset="0">
516+
<size>
517+
<width>20</width>
518+
<height>40</height>
519+
</size>
520+
</property>
521+
</spacer>
522+
</item>
453523
<item row="1" column="0">
454524
<widget class="QGroupBox" name="groupBox_6">
455525
<property name="title">
@@ -494,7 +564,7 @@
494564
<string>Rubberband color</string>
495565
</property>
496566
<property name="buddy">
497-
<cstring>cmbEllipsoid</cstring>
567+
<cstring>pbnMeasureColour</cstring>
498568
</property>
499569
</widget>
500570
</item>
@@ -513,6 +583,9 @@
513583
<property name="text">
514584
<string>Preferred measurements units</string>
515585
</property>
586+
<property name="buddy">
587+
<cstring>radMeters</cstring>
588+
</property>
516589
</widget>
517590
</item>
518591
<item row="2" column="1">
@@ -532,77 +605,6 @@
532605
</layout>
533606
</widget>
534607
</item>
535-
<item row="0" column="0">
536-
<widget class="QGroupBox" name="groupBox_7">
537-
<property name="title">
538-
<string>Identify</string>
539-
</property>
540-
<layout class="QGridLayout">
541-
<property name="margin">
542-
<number>11</number>
543-
</property>
544-
<item row="2" column="0" colspan="2">
545-
<widget class="QLabel" name="textLabel2">
546-
<property name="text">
547-
<string>&lt;b&gt;Note:&lt;/b&gt; Specify the search radius as a percentage of the map width</string>
548-
</property>
549-
<property name="wordWrap">
550-
<bool>true</bool>
551-
</property>
552-
</widget>
553-
</item>
554-
<item row="1" column="0">
555-
<widget class="QLabel" name="textLabel1_3">
556-
<property name="text">
557-
<string>Search radius for identifying features and displaying map tips</string>
558-
</property>
559-
<property name="buddy">
560-
<cstring>spinBoxIdentifyValue</cstring>
561-
</property>
562-
</widget>
563-
</item>
564-
<item row="1" column="1">
565-
<widget class="QDoubleSpinBox" name="spinBoxIdentifyValue">
566-
<property name="suffix">
567-
<string>%</string>
568-
</property>
569-
<property name="maximum">
570-
<double>100.000000000000000</double>
571-
</property>
572-
<property name="singleStep">
573-
<double>0.010000000000000</double>
574-
</property>
575-
<property name="value">
576-
<double>5.000000000000000</double>
577-
</property>
578-
</widget>
579-
</item>
580-
<item row="0" column="1">
581-
<widget class="QComboBox" name="cmbIdentifyMode"/>
582-
</item>
583-
<item row="0" column="0">
584-
<widget class="QLabel" name="label_4">
585-
<property name="text">
586-
<string>Mode</string>
587-
</property>
588-
</widget>
589-
</item>
590-
</layout>
591-
</widget>
592-
</item>
593-
<item row="3" column="0">
594-
<spacer>
595-
<property name="orientation">
596-
<enum>Qt::Vertical</enum>
597-
</property>
598-
<property name="sizeHint" stdset="0">
599-
<size>
600-
<width>20</width>
601-
<height>40</height>
602-
</size>
603-
</property>
604-
</spacer>
605-
</item>
606608
</layout>
607609
</widget>
608610
<widget class="QWidget" name="mOverlayTab">
@@ -1127,6 +1129,9 @@
11271129
<property name="text">
11281130
<string>Timeout for network requests (ms):</string>
11291131
</property>
1132+
<property name="buddy">
1133+
<cstring>mNetworkTimeoutSpinBox</cstring>
1134+
</property>
11301135
</widget>
11311136
</item>
11321137
<item>
@@ -1218,6 +1223,9 @@
12181223
<property name="text">
12191224
<string>Proxy type</string>
12201225
</property>
1226+
<property name="buddy">
1227+
<cstring>mProxyTypeComboBox</cstring>
1228+
</property>
12211229
</widget>
12221230
</item>
12231231
<item row="4" column="1" colspan="2">
@@ -1241,6 +1249,9 @@
12411249
<property name="text">
12421250
<string>Exclude URLs (starting with):</string>
12431251
</property>
1252+
<property name="buddy">
1253+
<cstring>mAddUrlPushButton</cstring>
1254+
</property>
12441255
</widget>
12451256
</item>
12461257
<item row="5" column="2" colspan="2">
@@ -1280,6 +1291,16 @@
12801291
</widget>
12811292
</widget>
12821293
</item>
1294+
<item row="1" column="0">
1295+
<widget class="QDialogButtonBox" name="buttonBox">
1296+
<property name="orientation">
1297+
<enum>Qt::Horizontal</enum>
1298+
</property>
1299+
<property name="standardButtons">
1300+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
1301+
</property>
1302+
</widget>
1303+
</item>
12831304
</layout>
12841305
</widget>
12851306
<layoutdefault spacing="6" margin="11"/>
@@ -1308,6 +1329,9 @@
13081329
<tabstop>chkUseRenderCaching</tabstop>
13091330
<tabstop>chkAntiAliasing</tabstop>
13101331
<tabstop>chkUseQPixmap</tabstop>
1332+
<tabstop>mBtnAddSVGPath</tabstop>
1333+
<tabstop>mBtnRemoveSVGPath</tabstop>
1334+
<tabstop>mListSVGPaths</tabstop>
13111335
<tabstop>cmbIdentifyMode</tabstop>
13121336
<tabstop>spinBoxIdentifyValue</tabstop>
13131337
<tabstop>cmbEllipsoid</tabstop>
@@ -1321,8 +1345,8 @@
13211345
<tabstop>mLineColourToolButton</tabstop>
13221346
<tabstop>mDefaultSnapModeComboBox</tabstop>
13231347
<tabstop>mDefaultSnappingToleranceSpinBox</tabstop>
1324-
<tabstop>mSearchRadiusVertexEditSpinBox</tabstop>
13251348
<tabstop>mDefaultSnappingToleranceComboBox</tabstop>
1349+
<tabstop>mSearchRadiusVertexEditSpinBox</tabstop>
13261350
<tabstop>mSearchRadiusVertexEditComboBox</tabstop>
13271351
<tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
13281352
<tabstop>mMarkerStyleComboBox</tabstop>
@@ -1335,6 +1359,7 @@
13351359
<tabstop>pbnSelectProjection</tabstop>
13361360
<tabstop>grpLocale</tabstop>
13371361
<tabstop>cboLocale</tabstop>
1362+
<tabstop>mNetworkTimeoutSpinBox</tabstop>
13381363
<tabstop>grpProxy</tabstop>
13391364
<tabstop>leProxyHost</tabstop>
13401365
<tabstop>leProxyPort</tabstop>
@@ -1347,5 +1372,38 @@
13471372
<tabstop>buttonBox</tabstop>
13481373
</tabstops>
13491374
<resources/>
1350-
<connections/>
1375+
<connections>
1376+
<connection>
1377+
<sender>buttonBox</sender>
1378+
<signal>rejected()</signal>
1379+
<receiver>QgsOptionsBase</receiver>
1380+
<slot>reject()</slot>
1381+
<hints>
1382+
<hint type="sourcelabel">
1383+
<x>611</x>
1384+
<y>531</y>
1385+
</hint>
1386+
<hint type="destinationlabel">
1387+
<x>730</x>
1388+
<y>311</y>
1389+
</hint>
1390+
</hints>
1391+
</connection>
1392+
<connection>
1393+
<sender>buttonBox</sender>
1394+
<signal>accepted()</signal>
1395+
<receiver>QgsOptionsBase</receiver>
1396+
<slot>accept()</slot>
1397+
<hints>
1398+
<hint type="sourcelabel">
1399+
<x>686</x>
1400+
<y>525</y>
1401+
</hint>
1402+
<hint type="destinationlabel">
1403+
<x>731</x>
1404+
<y>353</y>
1405+
</hint>
1406+
</hints>
1407+
</connection>
1408+
</connections>
13511409
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.