Skip to content

Commit ba0fdfa

Browse files
nyalldawsonnyalldawson
committedJun 1, 2016
Clarify use of the term "OTF"
- change button tooltip from referring to "OTFR" to "OTF" to match button text - change wording of enable CRS transformation option to make it more obvious that this option is what "OTF" refers to Inspired by @rouault
·
ltr-3_40archive/master_2
1 parent 062aa9a commit ba0fdfa

File tree

2 files changed

+135
-45
lines changed

2 files changed

+135
-45
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9704,13 +9704,13 @@ void QgisApp::updateCRSStatusBar()
97049704
{
97059705
mOnTheFlyProjectionStatusButton->setText( tr( "%1 (OTF)" ).arg( mOnTheFlyProjectionStatusButton->text() ) );
97069706
mOnTheFlyProjectionStatusButton->setToolTip(
9707-
tr( "Current CRS: %1 (OTFR enabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
9707+
tr( "Current CRS: %1 (OTF enabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
97089708
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( "mIconProjectionEnabled.png" ) );
97099709
}
97109710
else
97119711
{
97129712
mOnTheFlyProjectionStatusButton->setToolTip(
9713-
tr( "Current CRS: %1 (OTFR disabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
9713+
tr( "Current CRS: %1 (OTF disabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
97149714
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( "mIconProjectionDisabled.png" ) );
97159715
}
97169716
}

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 133 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,16 @@
4242
<enum>QFrame::Raised</enum>
4343
</property>
4444
<layout class="QVBoxLayout" name="verticalLayout_2">
45-
<property name="margin">
45+
<property name="leftMargin">
46+
<number>0</number>
47+
</property>
48+
<property name="topMargin">
49+
<number>0</number>
50+
</property>
51+
<property name="rightMargin">
52+
<number>0</number>
53+
</property>
54+
<property name="bottomMargin">
4655
<number>0</number>
4756
</property>
4857
<item>
@@ -197,7 +206,16 @@
197206
<enum>QFrame::Raised</enum>
198207
</property>
199208
<layout class="QVBoxLayout" name="verticalLayout_3">
200-
<property name="margin">
209+
<property name="leftMargin">
210+
<number>0</number>
211+
</property>
212+
<property name="topMargin">
213+
<number>0</number>
214+
</property>
215+
<property name="rightMargin">
216+
<number>0</number>
217+
</property>
218+
<property name="bottomMargin">
201219
<number>0</number>
202220
</property>
203221
<item>
@@ -209,11 +227,20 @@
209227
</sizepolicy>
210228
</property>
211229
<property name="currentIndex">
212-
<number>3</number>
230+
<number>1</number>
213231
</property>
214232
<widget class="QWidget" name="mProjOpts_01">
215233
<layout class="QVBoxLayout" name="verticalLayout_6">
216-
<property name="margin">
234+
<property name="leftMargin">
235+
<number>0</number>
236+
</property>
237+
<property name="topMargin">
238+
<number>0</number>
239+
</property>
240+
<property name="rightMargin">
241+
<number>0</number>
242+
</property>
243+
<property name="bottomMargin">
217244
<number>0</number>
218245
</property>
219246
<item>
@@ -229,8 +256,8 @@
229256
<rect>
230257
<x>0</x>
231258
<y>0</y>
232-
<width>455</width>
233-
<height>556</height>
259+
<width>683</width>
260+
<height>779</height>
234261
</rect>
235262
</property>
236263
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -245,7 +272,7 @@
245272
<property name="title">
246273
<string>General settings</string>
247274
</property>
248-
<property name="syncGroup">
275+
<property name="syncGroup" stdset="0">
249276
<string notr="true">projgeneral</string>
250277
</property>
251278
<layout class="QGridLayout" name="gridLayout_26">
@@ -455,7 +482,7 @@
455482
<property name="title">
456483
<string>Measurements</string>
457484
</property>
458-
<property name="syncGroup">
485+
<property name="syncGroup" stdset="0">
459486
<string notr="true">projgeneral</string>
460487
</property>
461488
<layout class="QGridLayout" name="gridLayoutMeasureTool">
@@ -524,7 +551,7 @@
524551
<property name="title">
525552
<string>Coordinate display</string>
526553
</property>
527-
<property name="syncGroup">
554+
<property name="syncGroup" stdset="0">
528555
<string notr="true">projgeneral</string>
529556
</property>
530557
<layout class="QGridLayout" name="gridLayout_18">
@@ -614,7 +641,7 @@
614641
<property name="checked">
615642
<bool>false</bool>
616643
</property>
617-
<property name="syncGroup">
644+
<property name="syncGroup" stdset="0">
618645
<string notr="true">projgeneral</string>
619646
</property>
620647
<layout class="QGridLayout" name="gridLayout_7">
@@ -706,7 +733,16 @@
706733
</widget>
707734
<widget class="QWidget" name="mProjOpts_02">
708735
<layout class="QVBoxLayout" name="verticalLayout_5">
709-
<property name="margin">
736+
<property name="leftMargin">
737+
<number>0</number>
738+
</property>
739+
<property name="topMargin">
740+
<number>0</number>
741+
</property>
742+
<property name="rightMargin">
743+
<number>0</number>
744+
</property>
745+
<property name="bottomMargin">
710746
<number>0</number>
711747
</property>
712748
<item>
@@ -722,8 +758,8 @@
722758
<rect>
723759
<x>0</x>
724760
<y>0</y>
725-
<width>238</width>
726-
<height>43</height>
761+
<width>683</width>
762+
<height>779</height>
727763
</rect>
728764
</property>
729765
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -736,7 +772,7 @@
736772
<item>
737773
<widget class="QGroupBox" name="cbxProjectionEnabled">
738774
<property name="title">
739-
<string>Enable 'on the fly' CRS transformation</string>
775+
<string>Enable 'on the fly' CRS transformation (OTF)</string>
740776
</property>
741777
<property name="checkable">
742778
<bool>true</bool>
@@ -756,7 +792,16 @@
756792
</widget>
757793
<widget class="QWidget" name="mProjOpts_03">
758794
<layout class="QVBoxLayout" name="verticalLayout_9">
759-
<property name="margin">
795+
<property name="leftMargin">
796+
<number>0</number>
797+
</property>
798+
<property name="topMargin">
799+
<number>0</number>
800+
</property>
801+
<property name="rightMargin">
802+
<number>0</number>
803+
</property>
804+
<property name="bottomMargin">
760805
<number>0</number>
761806
</property>
762807
<item>
@@ -772,7 +817,7 @@
772817
<rect>
773818
<x>0</x>
774819
<y>0</y>
775-
<width>109</width>
820+
<width>133</width>
776821
<height>100</height>
777822
</rect>
778823
</property>
@@ -833,7 +878,16 @@
833878
</widget>
834879
<widget class="QWidget" name="mProjOpts_04">
835880
<layout class="QVBoxLayout" name="verticalLayout_11">
836-
<property name="margin">
881+
<property name="leftMargin">
882+
<number>0</number>
883+
</property>
884+
<property name="topMargin">
885+
<number>0</number>
886+
</property>
887+
<property name="rightMargin">
888+
<number>0</number>
889+
</property>
890+
<property name="bottomMargin">
837891
<number>0</number>
838892
</property>
839893
<item>
@@ -849,8 +903,8 @@
849903
<rect>
850904
<x>0</x>
851905
<y>0</y>
852-
<width>684</width>
853-
<height>783</height>
906+
<width>683</width>
907+
<height>779</height>
854908
</rect>
855909
</property>
856910
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -859,7 +913,7 @@
859913
<property name="title">
860914
<string>Default symbols</string>
861915
</property>
862-
<property name="syncGroup">
916+
<property name="syncGroup" stdset="0">
863917
<string notr="true">projstyles</string>
864918
</property>
865919
<layout class="QGridLayout" name="gridLayout_11">
@@ -1074,7 +1128,7 @@
10741128
<property name="title">
10751129
<string>Options</string>
10761130
</property>
1077-
<property name="syncGroup">
1131+
<property name="syncGroup" stdset="0">
10781132
<string notr="true">projstyles</string>
10791133
</property>
10801134
<layout class="QVBoxLayout" name="verticalLayout_18">
@@ -1291,7 +1345,16 @@
12911345
</widget>
12921346
<widget class="QWidget" name="mProjOpts_05">
12931347
<layout class="QVBoxLayout" name="verticalLayout_14">
1294-
<property name="margin">
1348+
<property name="leftMargin">
1349+
<number>0</number>
1350+
</property>
1351+
<property name="topMargin">
1352+
<number>0</number>
1353+
</property>
1354+
<property name="rightMargin">
1355+
<number>0</number>
1356+
</property>
1357+
<property name="bottomMargin">
12951358
<number>0</number>
12961359
</property>
12971360
<item>
@@ -1307,8 +1370,8 @@
13071370
<rect>
13081371
<x>0</x>
13091372
<y>0</y>
1310-
<width>474</width>
1311-
<height>1993</height>
1373+
<width>667</width>
1374+
<height>2249</height>
13121375
</rect>
13131376
</property>
13141377
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1329,13 +1392,13 @@
13291392
<property name="checked">
13301393
<bool>false</bool>
13311394
</property>
1332-
<property name="collapsed">
1395+
<property name="collapsed" stdset="0">
13331396
<bool>false</bool>
13341397
</property>
1335-
<property name="syncGroup">
1398+
<property name="syncGroup" stdset="0">
13361399
<string notr="true">projowsserver</string>
13371400
</property>
1338-
<property name="saveCollapsedState">
1401+
<property name="saveCollapsedState" stdset="0">
13391402
<bool>true</bool>
13401403
</property>
13411404
<layout class="QGridLayout" name="gridLayout_6">
@@ -1572,7 +1635,7 @@
15721635
<property name="title">
15731636
<string>WMS capabilities</string>
15741637
</property>
1575-
<property name="syncGroup">
1638+
<property name="syncGroup" stdset="0">
15761639
<string notr="true">projowsserver</string>
15771640
</property>
15781641
<layout class="QGridLayout" name="gridLayout_13">
@@ -1587,10 +1650,10 @@
15871650
<property name="checked">
15881651
<bool>false</bool>
15891652
</property>
1590-
<property name="collapsed">
1653+
<property name="collapsed" stdset="0">
15911654
<bool>false</bool>
15921655
</property>
1593-
<property name="saveCollapsedState">
1656+
<property name="saveCollapsedState" stdset="0">
15941657
<bool>true</bool>
15951658
</property>
15961659
<layout class="QGridLayout" name="gridLayout_4">
@@ -1696,10 +1759,10 @@
16961759
<property name="checked">
16971760
<bool>false</bool>
16981761
</property>
1699-
<property name="collapsed">
1762+
<property name="collapsed" stdset="0">
17001763
<bool>false</bool>
17011764
</property>
1702-
<property name="saveCollapsedState">
1765+
<property name="saveCollapsedState" stdset="0">
17031766
<bool>true</bool>
17041767
</property>
17051768
<layout class="QGridLayout" name="gridLayout_10">
@@ -1755,10 +1818,10 @@
17551818
<property name="checked">
17561819
<bool>false</bool>
17571820
</property>
1758-
<property name="collapsed">
1821+
<property name="collapsed" stdset="0">
17591822
<bool>false</bool>
17601823
</property>
1761-
<property name="saveCollapsedState">
1824+
<property name="saveCollapsedState" stdset="0">
17621825
<bool>true</bool>
17631826
</property>
17641827
<layout class="QGridLayout" name="gridLayout">
@@ -1814,10 +1877,10 @@
18141877
<property name="checked">
18151878
<bool>false</bool>
18161879
</property>
1817-
<property name="collapsed">
1880+
<property name="collapsed" stdset="0">
18181881
<bool>false</bool>
18191882
</property>
1820-
<property name="saveCollapsedState">
1883+
<property name="saveCollapsedState" stdset="0">
18211884
<bool>true</bool>
18221885
</property>
18231886
<layout class="QGridLayout" name="gridLayout_5">
@@ -2122,7 +2185,7 @@
21222185
<property name="title">
21232186
<string>WFS capabilities (also influences DXF export)</string>
21242187
</property>
2125-
<property name="syncGroup">
2188+
<property name="syncGroup" stdset="0">
21262189
<string notr="true">projowsserver</string>
21272190
</property>
21282191
<layout class="QGridLayout" name="gridLayout_8">
@@ -2208,7 +2271,7 @@
22082271
<property name="title">
22092272
<string>WCS capabilities</string>
22102273
</property>
2211-
<property name="syncGroup">
2274+
<property name="syncGroup" stdset="0">
22122275
<string notr="true">projowsserver</string>
22132276
</property>
22142277
<layout class="QGridLayout" name="gridLayout_9">
@@ -2348,7 +2411,16 @@
23482411
</widget>
23492412
<widget class="QWidget" name="mProjOpts_06">
23502413
<layout class="QVBoxLayout" name="verticalLayout_15">
2351-
<property name="margin">
2414+
<property name="leftMargin">
2415+
<number>0</number>
2416+
</property>
2417+
<property name="topMargin">
2418+
<number>0</number>
2419+
</property>
2420+
<property name="rightMargin">
2421+
<number>0</number>
2422+
</property>
2423+
<property name="bottomMargin">
23522424
<number>0</number>
23532425
</property>
23542426
<item>
@@ -2364,8 +2436,8 @@
23642436
<rect>
23652437
<x>0</x>
23662438
<y>0</y>
2367-
<width>127</width>
2368-
<height>43</height>
2439+
<width>683</width>
2440+
<height>779</height>
23692441
</rect>
23702442
</property>
23712443
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2401,7 +2473,16 @@
24012473
</widget>
24022474
<widget class="QWidget" name="mTabRelations">
24032475
<layout class="QGridLayout" name="gridLayout_16">
2404-
<property name="margin">
2476+
<property name="leftMargin">
2477+
<number>0</number>
2478+
</property>
2479+
<property name="topMargin">
2480+
<number>0</number>
2481+
</property>
2482+
<property name="rightMargin">
2483+
<number>0</number>
2484+
</property>
2485+
<property name="bottomMargin">
24052486
<number>0</number>
24062487
</property>
24072488
</layout>
@@ -2458,7 +2539,16 @@
24582539
<enum>QFrame::Raised</enum>
24592540
</property>
24602541
<layout class="QHBoxLayout" name="horizontalLayout">
2461-
<property name="margin">
2542+
<property name="leftMargin">
2543+
<number>0</number>
2544+
</property>
2545+
<property name="topMargin">
2546+
<number>0</number>
2547+
</property>
2548+
<property name="rightMargin">
2549+
<number>0</number>
2550+
</property>
2551+
<property name="bottomMargin">
24622552
<number>0</number>
24632553
</property>
24642554
<item>

1 commit comments

Comments
 (1)

NathanW2 commented on Jun 1, 2016

@NathanW2
NathanW2
on Jun 1, 2016
Member

Good move!

Please sign in to comment.