Skip to content

Commit db469be

Browse files
committedJul 11, 2011
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents bff8e54 + 8e3aca4 commit db469be

19 files changed

+1886
-1160
lines changed
 

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ debian/*.substvars
1212
Makefile
1313
*-stamp
1414
api_doc
15-
build
15+
build*
1616
ms-windows/Installer-Files/postinstall.bat
1717
ms-windows/Installer-Files/preremove.bat
1818
ms-windows/osgeo4w/packages/
@@ -37,3 +37,5 @@ scripts/astyle.exe
3737
doc/CODING.html
3838
doc/CODING.tex
3939
doc/INSTALL.tex
40+
scripts/Debug
41+
scripts/RelWithDebInfo

‎CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ IF (WITH_BINDINGS)
7676
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
7777
ENDIF (WITH_BINDINGS)
7878

79-
SET (WITH_GLOBE TRUE CACHE BOOL "Determines whether Globe plugin should be built")
79+
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
8080
IF (WITH_GLOBE)
81-
FIND_PACKAGE(OSGEARTH)
81+
SET(QT_USE_QTOPENGL 1)
82+
FIND_PACKAGE(OSGEARTH REQUIRED)
8283
ENDIF (WITH_GLOBE)
8384

8485
# Compile flag. Make it possible to turn it off.

‎cmake/FindOSGEARTH.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
2626
$ENV{OSGEARTH_SOURCE_DIR}
2727
$ENV{OSGEARTHDIR}
2828
$ENV{OSGEARTH_DIR}
29+
$ENV{OSGEO4W_ROOT}
2930
/usr/local/
3031
/usr/
3132
/sw/ # Fink
@@ -57,6 +58,7 @@ FIND_LIBRARY(${MYLIBRARY}
5758
$ENV{OSGEARTH_DIR}
5859
$ENV{OSGEARTHDIR}
5960
$ENV{OSGEARTH_ROOT}
61+
$ENV{OSGEO4W_ROOT}
6062
~/Library/Frameworks
6163
/Library/Frameworks
6264
/usr/local
@@ -79,13 +81,13 @@ FIND_LIBRARY(${MYLIBRARY}
7981
ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)
8082

8183
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
82-
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)
84+
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd )
8385

8486
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
85-
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)
87+
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild )
8688

8789
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
88-
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)
90+
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
8991

9092
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
9193
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )

‎i18n/qgis_de.ts

Lines changed: 928 additions & 1017 deletions
Large diffs are not rendered by default.

‎mac/app.info.plist.in

Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleName</key>
8+
<string>QGIS</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.qgis.qgis</string>
11+
<key>CFBundleExecutable</key>
12+
<string>${QGIS_APP_NAME}</string>
13+
<key>CFBundlePackageType</key>
14+
<string>APPL</string>
15+
<key>CFBundleSignature</key>
16+
<string>QGIS</string>
17+
<key>CFBundleGetInfoString</key>
18+
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2011 QGIS Development Team</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>${COMPLETE_VERSION}</string>
21+
<key>CFBundleVersion</key>
22+
<string>${COMPLETE_VERSION} (${REVISION})</string>
23+
<key>CFBundleIconFile</key>
24+
<string>qgis.icns</string>
25+
<key>CFBundleInfoDictionaryVersion</key>
26+
<string>6.0</string>
27+
<key>CSResourcesFileMapped</key>
28+
<true/>
29+
<key>CFBundleDocumentTypes</key>
30+
<array>
31+
<dict>
32+
<key>CFBundleTypeName</key>
33+
<string>QGIS Project document</string>
34+
<key>CFBundleTypeRole</key>
35+
<string>Editor</string>
36+
<key>CFBundleTypeIconFile</key>
37+
<string>qgs.icns</string>
38+
<key>CFBundleTypeExtensions</key>
39+
<array>
40+
<string>qgs</string>
41+
</array>
42+
<key>CFBundleTypeOSTypes</key>
43+
<array>
44+
<string>QGIS</string>
45+
</array>
46+
</dict>
47+
<dict>
48+
<key>CFBundleTypeName</key>
49+
<string>ESRI Shape document</string>
50+
<key>CFBundleTypeRole</key>
51+
<string>Editor</string>
52+
<key>CFBundleTypeIconFile</key>
53+
<string>shp.icns</string>
54+
<key>CFBundleTypeExtensions</key>
55+
<array>
56+
<string>shp</string>
57+
</array>
58+
</dict>
59+
<dict>
60+
<key>CFBundleTypeName</key>
61+
<string>SDTS document</string>
62+
<key>CFBundleTypeRole</key>
63+
<string>Viewer</string>
64+
<key>CFBundleTypeIconFile</key>
65+
<string>ddf.icns</string>
66+
<key>CFBundleTypeExtensions</key>
67+
<array>
68+
<string>ddf</string>
69+
</array>
70+
</dict>
71+
<dict>
72+
<key>CFBundleTypeName</key>
73+
<string>MapInfo document</string>
74+
<key>CFBundleTypeRole</key>
75+
<string>Viewer</string>
76+
<key>CFBundleTypeIconFile</key>
77+
<string>mif.icns</string>
78+
<key>CFBundleTypeExtensions</key>
79+
<array>
80+
<string>mif</string>
81+
</array>
82+
</dict>
83+
<dict>
84+
<key>CFBundleTypeName</key>
85+
<string>GML document</string>
86+
<key>CFBundleTypeRole</key>
87+
<string>Viewer</string>
88+
<key>CFBundleTypeIconFile</key>
89+
<string>gml.icns</string>
90+
<key>CFBundleTypeExtensions</key>
91+
<array>
92+
<string>gml</string>
93+
</array>
94+
</dict>
95+
<dict>
96+
<key>CFBundleTypeName</key>
97+
<string>GeoTIFF image</string>
98+
<key>CFBundleTypeRole</key>
99+
<string>Viewer</string>
100+
<key>CFBundleTypeIconFile</key>
101+
<string>tiff.icns</string>
102+
<key>CFBundleTypeExtensions</key>
103+
<array>
104+
<string>tiff</string>
105+
<string>tif</string>
106+
</array>
107+
<key>CFBundleTypeMIMETypes</key>
108+
<array>
109+
<string>image/tiff</string>
110+
</array>
111+
<key>CFBundleTypeOSTypes</key>
112+
<array>
113+
<string>TIFF</string>
114+
</array>
115+
</dict>
116+
<dict>
117+
<key>CFBundleTypeName</key>
118+
<string>ERDAS IMAGINE document</string>
119+
<key>CFBundleTypeRole</key>
120+
<string>Viewer</string>
121+
<key>CFBundleTypeIconFile</key>
122+
<string>img.icns</string>
123+
<key>CFBundleTypeExtensions</key>
124+
<array>
125+
<string>img</string>
126+
</array>
127+
</dict>
128+
<dict>
129+
<key>CFBundleTypeName</key>
130+
<string>Arc/Info ASCII Grid document</string>
131+
<key>CFBundleTypeRole</key>
132+
<string>Viewer</string>
133+
<key>CFBundleTypeIconFile</key>
134+
<string>asc.icns</string>
135+
<key>CFBundleTypeExtensions</key>
136+
<array>
137+
<string>asc</string>
138+
</array>
139+
</dict>
140+
<dict>
141+
<key>CFBundleTypeName</key>
142+
<string>DTED document</string>
143+
<key>CFBundleTypeRole</key>
144+
<string>Viewer</string>
145+
<key>CFBundleTypeIconFile</key>
146+
<string>dt0.icns</string>
147+
<key>CFBundleTypeExtensions</key>
148+
<array>
149+
<string>dt0</string>
150+
</array>
151+
</dict>
152+
<dict>
153+
<key>CFBundleTypeName</key>
154+
<string>JPEG 2000 image</string>
155+
<key>CFBundleTypeRole</key>
156+
<string>Viewer</string>
157+
<key>CFBundleTypeIconFile</key>
158+
<string>jp2.icns</string>
159+
<key>CFBundleTypeExtensions</key>
160+
<array>
161+
<string>jp2</string>
162+
</array>
163+
<key>CFBundleTypeMIMETypes</key>
164+
<array>
165+
<string>image/jp2</string>
166+
</array>
167+
<key>CFBundleTypeOSTypes</key>
168+
<array>
169+
<string>jp2 </string>
170+
</array>
171+
</dict>
172+
<dict>
173+
<key>CFBundleTypeName</key>
174+
<string>DEM document</string>
175+
<key>CFBundleTypeRole</key>
176+
<string>Viewer</string>
177+
<key>CFBundleTypeIconFile</key>
178+
<string>dem.icns</string>
179+
<key>CFBundleTypeExtensions</key>
180+
<array>
181+
<string>dem</string>
182+
</array>
183+
</dict>
184+
</array>
185+
<key>CFBundleLocalizations</key>
186+
<array>
187+
<string>en</string>
188+
<string>ar</string>
189+
<string>cs_CZ</string>
190+
<string>de</string>
191+
<string>el_GR</string>
192+
<string>es</string>
193+
<string>fr</string>
194+
<string>hu</string>
195+
<string>id</string>
196+
<string>it</string>
197+
<string>ja</string>
198+
<string>lo</string>
199+
<string>lt</string>
200+
<string>lv</string>
201+
<string>ka</string>
202+
<string>mn</string>
203+
<string>nl</string>
204+
<string>pl_PL</string>
205+
<string>pt_BR</string>
206+
<string>ro</string>
207+
<string>ru</string>
208+
<string>sk</string>
209+
<string>sq_AL</string>
210+
<string>sv</string>
211+
<string>th</string>
212+
<string>tr</string>
213+
<string>vi</string>
214+
<string>zh_CN</string>
215+
</array>
216+
</dict>
217+
</plist>

‎mac/framework.info.plist.in

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleExecutable</key>
8+
<string>${MACOSX_FRAMEWORK_NAME}</string>
9+
<key>CFBundleGetInfoString</key>
10+
<string>${MACOSX_FRAMEWORK_NAME} ${COMPLETE_VERSION}</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>${MACOSX_FRAMEWORK_NAME}</string>
17+
<key>CFBundlePackageType</key>
18+
<string>FMWK</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>${MACOSX_FRAMEWORK_SHORT_VERSION_STRING}</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>${MACOSX_FRAMEWORK_NAME} ${COMPLETE_VERSION}</string>
25+
</dict>
26+
</plist>

‎ms-windows/osgeo4w/package.cmd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ cmake -G "Visual Studio 9 2008" ^
8989
-D PEDANTIC=TRUE ^
9090
-D WITH_SPATIALITE=TRUE ^
9191
-D WITH_MAPSERVER=TRUE ^
92+
-D WITH_GLOBE=TRUE ^
9293
-D WITH_INTERNAL_SPATIALITE=TRUE ^
9394
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
9495
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
@@ -157,6 +158,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
157158
--exclude "apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
158159
--exclude "apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
159160
--exclude "apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
161+
--exclude "apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
160162
apps/%PACKAGENAME% ^
161163
bin/%PACKAGENAME%.bat.tmpl ^
162164
bin/%PACKAGENAME%-browser.bat.tmpl ^
@@ -179,6 +181,12 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz
179181
>>%LOG% 2>&1
180182
if errorlevel 1 goto error
181183

184+
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
185+
"apps/%PACKAGENAME%/globe" ^
186+
"apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
187+
>>%LOG% 2>&1
188+
if errorlevel 1 goto error
189+
182190
goto end
183191

184192
:error

‎resources/symbology-ng-style.xml

Lines changed: 656 additions & 114 deletions
Large diffs are not rendered by default.

‎src/app/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,6 @@ INSTALL(TARGETS ${QGIS_APP_NAME}
423423
BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
424424
RUNTIME DESTINATION ${QGIS_BIN_DIR})
425425

426-
IF (MSVC)
427-
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
428-
ENDIF (MSVC)
429-
430426
IF (APPLE)
431427
INSTALL(CODE "EXECUTE_PROCESS(COMMAND /bin/echo -n \"APPLQGIS\" OUTPUT_FILE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../PkgInfo\")")
432428
ENDIF (APPLE)

‎src/app/legend/qgslegendlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ void QgsLegendLayer::updateItemListCount( QgsVectorLayer* layer, const QList<Qgs
662662

663663
//go through all features and count the number of occurrences
664664
int nFeatures = layer->pendingFeatureCount();
665-
QProgressDialog p( tr( "Updating feature count for layer " ) + layer->name(), tr( "Abort" ), 0, nFeatures );
665+
QProgressDialog p( tr( "Updating feature count for layer %1" ).arg( layer->name() ), tr( "Abort" ), 0, nFeatures );
666666
p.setWindowModality( Qt::WindowModal );
667667
int featuresCounted = 0;
668668

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,6 +1917,7 @@ void QgsRasterLayerProperties::refreshHistogram()
19171917
QgsRasterBandStats myRasterBandStats = mRasterLayer->bandStatistics( myIteratorInt );
19181918
mRasterLayer->populateHistogram( myIteratorInt, BINCOUNT, myIgnoreOutOfRangeFlag, myThoroughBandScanFlag );
19191919
QwtPlotCurve * mypCurve = new QwtPlotCurve( tr( "Band %1" ).arg( myIteratorInt ) );
1920+
mypCurve->setCurveAttribute( QwtPlotCurve::Fitted );
19201921
mypCurve->setRenderHint( QwtPlotItem::RenderAntialiased );
19211922
mypCurve->setPen( QPen( myColors.at( myIteratorInt ) ) );
19221923
QwtArray<double> myX2Data;//qwtarray is just a wrapped qvector

‎src/plugins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ IF (GRASS_FOUND)
3737
ENDIF (GRASS_FOUND)
3838

3939
IF (OSGEARTH_FOUND)
40-
SUBDIRS (globe)
40+
ADD_SUBDIRECTORY(globe)
4141
ENDIF (OSGEARTH_FOUND)
4242

4343
# headers installed in qgis_core target

‎src/plugins/globe/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# set path to additional CMake modules
32
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
43

@@ -50,7 +49,7 @@ INCLUDE_DIRECTORIES(
5049
TARGET_LINK_LIBRARIES(globeplugin
5150
qgis_core
5251
qgis_gui
53-
QtOpenGL
52+
${QT_QTOPENGL_LIBRARY}
5453
${OSGDB_LIBRARY}
5554
${OSGGA_LIBRARY}
5655
${OSG_LIBRARY}

‎src/plugins/globe/CMakeModules/FindOSG.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ FIND_LIBRARY(${MYLIBRARY}
5757
$ENV{OSG_DIR}
5858
$ENV{OSGDIR}
5959
$ENV{OSG_ROOT}
60+
$ENV{OSGEO4W_ROOT}
6061
~/Library/Frameworks
6162
/Library/Frameworks
6263
/usr/local

‎src/plugins/globe/CMakeModules/FindOpenThreads.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
7676

7777

7878
FIND_LIBRARY(OPENTHREADS_LIBRARY
79-
NAMES OpenThreads OpenThreadsWin32
79+
NAMES OpenThreads OpenThreadsWin32
8080
PATHS
8181
$ENV{OPENTHREADS_LIBRARY_DIR}
8282
$ENV{OPENTHREADS_DIR}/lib64
@@ -99,7 +99,7 @@ ENDIF(NOT OPENTHREADS_LIBRARY)
9999

100100
IF(NOT OPENTHREADS_LIBRARY)
101101
FIND_LIBRARY(OPENTHREADS_LIBRARY
102-
NAMES OpenThreads OpenThreadsWin32
102+
NAMES OpenThreads OpenThreadsWin32
103103
PATHS
104104
~/Library/Frameworks
105105
/Library/Frameworks

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ void GlobePlugin::setupControls()
440440
moveHControls->setFrame( new RoundedFrame() );
441441
moveHControls->getFrame()->setBackColor(1,1,1,0.5);
442442
moveHControls->setMargin( 0 );
443-
moveHControls->setSpacing( 47 );
443+
moveHControls->setChildSpacing( 47 );
444444
moveHControls->setVertAlign( Control::ALIGN_CENTER );
445445
moveHControls->setHorizAlign( Control::ALIGN_CENTER );
446446
moveHControls->setPosition( 5, 30 );
@@ -462,7 +462,7 @@ void GlobePlugin::setupControls()
462462
moveVControls->setFrame( new RoundedFrame() );
463463
moveVControls->getFrame()->setBackColor(1,1,1,0.5);
464464
moveVControls->setMargin( 0 );
465-
moveVControls->setSpacing( 36 );
465+
moveVControls->setChildSpacing( 36 );
466466
moveVControls->setVertAlign( Control::ALIGN_CENTER );
467467
moveVControls->setHorizAlign( Control::ALIGN_CENTER );
468468
moveVControls->setPosition( 35, 5 );
@@ -492,7 +492,7 @@ void GlobePlugin::setupControls()
492492
rotateControls->setFrame( new RoundedFrame() );
493493
rotateControls->getFrame()->setBackColor(1,1,1,0.5);
494494
rotateControls->setMargin( 0 );
495-
rotateControls->setSpacing( 10 );
495+
rotateControls->setChildSpacing( 10 );
496496
rotateControls->setVertAlign( Control::ALIGN_CENTER );
497497
rotateControls->setHorizAlign( Control::ALIGN_CENTER );
498498
rotateControls->setPosition( 5, 113 );
@@ -526,7 +526,7 @@ void GlobePlugin::setupControls()
526526
tiltControls->setFrame( new RoundedFrame() );
527527
tiltControls->getFrame()->setBackColor(1,1,1,0.5);
528528
tiltControls->setMargin( 0 );
529-
tiltControls->setSpacing( 30 );
529+
tiltControls->setChildSpacing( 30 );
530530
tiltControls->setVertAlign( Control::ALIGN_CENTER );
531531
tiltControls->setHorizAlign( Control::ALIGN_CENTER );
532532
tiltControls->setPosition( 35, 90 );
@@ -554,7 +554,7 @@ void GlobePlugin::setupControls()
554554
zoomControls->setFrame( new RoundedFrame() );
555555
zoomControls->getFrame()->setBackColor(1,1,1,0.5);
556556
zoomControls->setMargin( 0 );
557-
zoomControls->setSpacing( 5 );
557+
zoomControls->setChildSpacing( 5 );
558558
zoomControls->setVertAlign( Control::ALIGN_CENTER );
559559
zoomControls->setHorizAlign( Control::ALIGN_CENTER );
560560
zoomControls->setPosition( 35, 170 );
@@ -582,7 +582,7 @@ void GlobePlugin::setupControls()
582582
extraControls->setFrame( new RoundedFrame() );
583583
extraControls->getFrame()->setBackColor(1,1,1,0.5);
584584
extraControls->setMargin( 0 );
585-
extraControls->setSpacing( 10 );
585+
extraControls->setChildSpacing( 10 );
586586
extraControls->setVertAlign( Control::ALIGN_CENTER );
587587
extraControls->setHorizAlign( Control::ALIGN_CENTER );
588588
extraControls->setPosition( 5, 220 );
@@ -631,7 +631,11 @@ void GlobePlugin::setupProxy()
631631
if( !settings.value( "/proxyUser" ).toString().isEmpty() )
632632
{
633633
QString auth = settings.value( "/proxyUser" ).toString() + ":" + settings.value( "/proxyPassword" ).toString();
634+
#ifdef WIN32
635+
putenv( QString( "OSGEARTH_CURL_PROXYAUTH=%1" ).arg( auth ).toAscii() );
636+
#else
634637
setenv( "OSGEARTH_CURL_PROXYAUTH", auth.toStdString().c_str(), 0 );
638+
#endif
635639
}
636640
//TODO: settings.value("/proxyType")
637641
//TODO: URL exlusions

‎src/plugins/globe/globe_plugin.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ class GlobePlugin : public QObject, public QgisPlugin
5656
//! show the help document
5757
void help();
5858

59-
//! Called when the main canvas is about to be rendered
60-
void renderStarting();
61-
//! Called when the main canvas has rendered.
62-
void renderComplete( QPainter * );
6359
//! Emitted when a new set of layers has been received
6460
void layersChanged();
6561
//! Called when the extents of the map change

‎src/ui/qgsattributetabledialog.ui

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<string>Attribute Table</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17+
<property name="margin">
18+
<number>0</number>
19+
</property>
1720
<item row="0" column="0">
1821
<widget class="QgsAttributeTableView" name="mView">
1922
<property name="alternatingRowColors">
@@ -23,6 +26,12 @@
2326
</item>
2427
<item row="2" column="0">
2528
<layout class="QHBoxLayout">
29+
<property name="leftMargin">
30+
<number>3</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>3</number>
34+
</property>
2635
<item>
2736
<widget class="QCheckBox" name="cbxShowSelectedOnly">
2837
<property name="text">
@@ -93,6 +102,12 @@
93102
</item>
94103
<item row="1" column="0">
95104
<layout class="QHBoxLayout" name="horizontalLayout">
105+
<property name="leftMargin">
106+
<number>3</number>
107+
</property>
108+
<property name="rightMargin">
109+
<number>3</number>
110+
</property>
96111
<item>
97112
<widget class="QToolButton" name="mRemoveSelectionButton">
98113
<property name="toolTip">

‎src/ui/qgswmssourceselectbase.ui

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
<property name="title">
183183
<string>Image encoding</string>
184184
</property>
185-
<zorder>gbCRS</zorder>
186185
</widget>
187186
</item>
188187
<item row="1" column="9">
@@ -274,15 +273,21 @@
274273
<layout class="QGridLayout">
275274
<item row="0" column="0">
276275
<widget class="QPushButton" name="mLayerUpButton">
276+
<property name="toolTip">
277+
<string>Move selected layer UP</string>
278+
</property>
277279
<property name="text">
278-
<string/>
280+
<string>Up</string>
279281
</property>
280282
</widget>
281283
</item>
282284
<item row="0" column="1">
283285
<widget class="QPushButton" name="mLayerDownButton">
286+
<property name="toolTip">
287+
<string>Move selected layer DOWN</string>
288+
</property>
284289
<property name="text">
285-
<string/>
290+
<string>Down</string>
286291
</property>
287292
</widget>
288293
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.