Skip to content

Commit a8547c7

Browse files
author
jef
committed
automatic indentation update (r15302-r15567)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15568 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 05fe473 commit a8547c7

File tree

6 files changed

+132
-130
lines changed

6 files changed

+132
-130
lines changed

‎src/app/legend/qgslegendlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
433433

434434
// set layer crs
435435
theMenu.addAction( QgisApp::getThemeIcon( "/mActionSetCRS.png" ), tr( "&Set layer CRS" ), QgisApp::instance(), SLOT( setLayerCRS() ) );
436-
436+
437437
// assign layer crs to project
438438
theMenu.addAction( QgisApp::getThemeIcon( "/mActionSetProjectCRS.png" ), tr( "Set &project CRS from layer" ), QgisApp::instance(), SLOT( setProjectCRSFromLayer() ) );
439439

‎src/app/qgisapp.cpp

+76-76
Original file line numberDiff line numberDiff line change
@@ -1950,104 +1950,104 @@ void QgisApp::about()
19501950
whatsNew += tr( "This release includes over 277 bug fixes and many new features and enhancements. Once again it is impossible to document everything here that has changed so we will just provide a bullet list of key new features here." );
19511951
whatsNew += "</p>";
19521952

1953-
whatsNew += "<h3>" + tr("Symbology labels and diagrams") + "</h3>";
1953+
whatsNew += "<h3>" + tr( "Symbology labels and diagrams" ) + "</h3>";
19541954
whatsNew += "<ul>";
1955-
whatsNew += "<li>" + tr("New symbology now used by default!") + "</li>";
1956-
whatsNew += "<li>" + tr("Diagram system that uses the same smart placement system as labeling-ng") + "</li>";
1957-
whatsNew += "<li>" + tr("Export and import of styles (symbology-ng).") + "</li>";
1958-
whatsNew += "<li>" + tr("Labels for rules in rule-based renderers.") + "</li>";
1959-
whatsNew += "<li>" + tr("Ability to set label distance in map units.") + "</li>";
1960-
whatsNew += "<li>" + tr("Rotation for svg fills.") + "</li>";
1961-
whatsNew += "<li>" + tr("Font marker can have an X,Y offset.") + "</li>";
1962-
whatsNew += "<li>" + tr("Allow the line symbol layers to be used for outline of polygon (fill) symbols.") + "</li>";
1963-
whatsNew += "<li>" + tr("Option to put marker on the central point of a line.") + "</li>";
1964-
whatsNew += "<li>" + tr("Option to put marker only on first/last vertex of a line.") + "</li>";
1965-
whatsNew += "<li>" + tr("Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid.") + "</li>";
1966-
whatsNew += "<li>" + tr("Allow the marker line symbol layer to draw markers on each vertex.") + "</li>";
1967-
whatsNew += "<li>" + tr("Move/rotate/change label edit tools to interactively change data defined label properties.") + "</li>";
1955+
whatsNew += "<li>" + tr( "New symbology now used by default!" ) + "</li>";
1956+
whatsNew += "<li>" + tr( "Diagram system that uses the same smart placement system as labeling-ng" ) + "</li>";
1957+
whatsNew += "<li>" + tr( "Export and import of styles (symbology-ng)." ) + "</li>";
1958+
whatsNew += "<li>" + tr( "Labels for rules in rule-based renderers." ) + "</li>";
1959+
whatsNew += "<li>" + tr( "Ability to set label distance in map units." ) + "</li>";
1960+
whatsNew += "<li>" + tr( "Rotation for svg fills." ) + "</li>";
1961+
whatsNew += "<li>" + tr( "Font marker can have an X,Y offset." ) + "</li>";
1962+
whatsNew += "<li>" + tr( "Allow the line symbol layers to be used for outline of polygon (fill) symbols." ) + "</li>";
1963+
whatsNew += "<li>" + tr( "Option to put marker on the central point of a line." ) + "</li>";
1964+
whatsNew += "<li>" + tr( "Option to put marker only on first/last vertex of a line." ) + "</li>";
1965+
whatsNew += "<li>" + tr( "Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid." ) + "</li>";
1966+
whatsNew += "<li>" + tr( "Allow the marker line symbol layer to draw markers on each vertex." ) + "</li>";
1967+
whatsNew += "<li>" + tr( "Move/rotate/change label edit tools to interactively change data defined label properties." ) + "</li>";
19681968
whatsNew += "</ul>";
1969-
whatsNew += "<h3>" + tr("New Tools") + "</h3>";
1969+
whatsNew += "<h3>" + tr( "New Tools" ) + "</h3>";
19701970
whatsNew += "<ul>";
1971-
whatsNew += "<li>" + tr("Added GUI for gdaldem.") + "</li>";
1972-
whatsNew += "<li>" + tr("Added 'Lines to polygons' tool to vector menu.") + "</li>";
1973-
whatsNew += "<li>" + tr("Added field calculator with functions like $x, $y and $perimeter.") + "</li>";
1974-
whatsNew += "<li>" + tr("Added voronoi polygon tool to Vector menu.") + "</li>";
1971+
whatsNew += "<li>" + tr( "Added GUI for gdaldem." ) + "</li>";
1972+
whatsNew += "<li>" + tr( "Added 'Lines to polygons' tool to vector menu." ) + "</li>";
1973+
whatsNew += "<li>" + tr( "Added field calculator with functions like $x, $y and $perimeter." ) + "</li>";
1974+
whatsNew += "<li>" + tr( "Added voronoi polygon tool to Vector menu." ) + "</li>";
19751975
whatsNew += "</ul>";
1976-
whatsNew += "<h3>" + tr("User interface updates") + "</h3>";
1976+
whatsNew += "<h3>" + tr( "User interface updates" ) + "</h3>";
19771977
whatsNew += "<ul>";
1978-
whatsNew += "<li>" + tr("Allow managing missing layers in a list.") + "</li>";
1979-
whatsNew += "<li>" + tr("Zoom to group of layers.") + "</li>";
1980-
whatsNew += "<li>" + tr("'Tip of the day' on startup. You can en/disable tips in the options panel.") + "</li>";
1981-
whatsNew += "<li>" + tr("Better organisation of menus, separate database menu added.") + "</li>";
1982-
whatsNew += "<li>" + tr("Add ability to show number of features in "
1983-
"legend classes. Accessible via right-click legend menu.") + "</li>";
1984-
whatsNew += "<li>" + tr("General clean-ups and usability improvements.") + "</li>";
1978+
whatsNew += "<li>" + tr( "Allow managing missing layers in a list." ) + "</li>";
1979+
whatsNew += "<li>" + tr( "Zoom to group of layers." ) + "</li>";
1980+
whatsNew += "<li>" + tr( "'Tip of the day' on startup. You can en/disable tips in the options panel." ) + "</li>";
1981+
whatsNew += "<li>" + tr( "Better organisation of menus, separate database menu added." ) + "</li>";
1982+
whatsNew += "<li>" + tr( "Add ability to show number of features in "
1983+
"legend classes. Accessible via right-click legend menu." ) + "</li>";
1984+
whatsNew += "<li>" + tr( "General clean-ups and usability improvements." ) + "</li>";
19851985
whatsNew += "</ul>";
1986-
whatsNew += "<h3>" + tr("CRS Handling") + "</h3>";
1986+
whatsNew += "<h3>" + tr( "CRS Handling" ) + "</h3>";
19871987
whatsNew += "<ul>";
1988-
whatsNew += "<li>" + tr("Show active crs in status bar.") + "</li>";
1989-
whatsNew += "<li>" + tr("Assign layer CRS to project (in the legend context menu).") + "</li>";
1990-
whatsNew += "<li>" + tr("Select default CRS for new projects.") + "</li>";
1991-
whatsNew += "<li>" + tr("Allow setting CRS for multiple layers at once.") + "</li>";
1992-
whatsNew += "<li>" + tr("Default to last selection when prompting for CRS.") + "</li>";
1988+
whatsNew += "<li>" + tr( "Show active crs in status bar." ) + "</li>";
1989+
whatsNew += "<li>" + tr( "Assign layer CRS to project (in the legend context menu)." ) + "</li>";
1990+
whatsNew += "<li>" + tr( "Select default CRS for new projects." ) + "</li>";
1991+
whatsNew += "<li>" + tr( "Allow setting CRS for multiple layers at once." ) + "</li>";
1992+
whatsNew += "<li>" + tr( "Default to last selection when prompting for CRS." ) + "</li>";
19931993
whatsNew += "</ul>";
1994-
whatsNew += "<h3>" + tr("Rasters") + "</h3>";
1994+
whatsNew += "<h3>" + tr( "Rasters" ) + "</h3>";
19951995
whatsNew += "<ul>";
1996-
whatsNew += "<li>" + tr("Added AND and OR operator for raster calculator") + "</li>";
1997-
whatsNew += "<li>" + tr("On-the-fly reprojection of rasters added!") + "</li>";
1998-
whatsNew += "<li>" + tr("Proper implementation of raster providers.") + "</li>";
1999-
whatsNew += "<li>" + tr("Added raster toolbar with histogram stretch functions.") + "</li>";
1996+
whatsNew += "<li>" + tr( "Added AND and OR operator for raster calculator" ) + "</li>";
1997+
whatsNew += "<li>" + tr( "On-the-fly reprojection of rasters added!" ) + "</li>";
1998+
whatsNew += "<li>" + tr( "Proper implementation of raster providers." ) + "</li>";
1999+
whatsNew += "<li>" + tr( "Added raster toolbar with histogram stretch functions." ) + "</li>";
20002000
whatsNew += "</ul>";
2001-
whatsNew += "<h3>" + tr("Providers and Data Handling") + "</h3>";
2001+
whatsNew += "<h3>" + tr( "Providers and Data Handling" ) + "</h3>";
20022002
whatsNew += "<ul>";
2003-
whatsNew += "<li>" + tr("New SQLAnywhere vector provider.") + "</li>";
2004-
whatsNew += "<li>" + tr("Table join support.") + "</li>";
2005-
whatsNew += "<li>" + tr("Feature form updates") ;
2003+
whatsNew += "<li>" + tr( "New SQLAnywhere vector provider." ) + "</li>";
2004+
whatsNew += "<li>" + tr( "Table join support." ) + "</li>";
2005+
whatsNew += "<li>" + tr( "Feature form updates" ) ;
20062006
whatsNew += "<ul>";
2007-
whatsNew += "<li>" + tr("Make NULL value string representation configurable.") + "</li>";
2008-
whatsNew += "<li>" + tr("Fix feature updates in feature form from attribute table.") + "</li>";
2009-
whatsNew += "<li>" + tr("Add support for NULL values in value maps (comboboxes).") + "</li>";
2010-
whatsNew += "<li>" + tr("Use layer names instead of ids in drop down list when loading value maps from layers.") + "</li>";
2011-
whatsNew += "<li>" + tr("Support feature form expression fields: line edits on the form which name prefix \"expr_\" are evaluated. Their value is interpreted as field calculator string and replaced with the calculated value.") + "</li></ul></li>";
2012-
whatsNew += "<li>" + tr("Support searching for NULL in attribute table.") + "</li>";
2013-
whatsNew += "<li>" + tr("Attribute editing improvements");
2007+
whatsNew += "<li>" + tr( "Make NULL value string representation configurable." ) + "</li>";
2008+
whatsNew += "<li>" + tr( "Fix feature updates in feature form from attribute table." ) + "</li>";
2009+
whatsNew += "<li>" + tr( "Add support for NULL values in value maps (comboboxes)." ) + "</li>";
2010+
whatsNew += "<li>" + tr( "Use layer names instead of ids in drop down list when loading value maps from layers." ) + "</li>";
2011+
whatsNew += "<li>" + tr( "Support feature form expression fields: line edits on the form which name prefix \"expr_\" are evaluated. Their value is interpreted as field calculator string and replaced with the calculated value." ) + "</li></ul></li>";
2012+
whatsNew += "<li>" + tr( "Support searching for NULL in attribute table." ) + "</li>";
2013+
whatsNew += "<li>" + tr( "Attribute editing improvements" );
20142014
whatsNew += "<ul>";
2015-
whatsNew += "<li>" + tr("Improved interactive attribute editing in table (adding/deleting features, attribute update).") + "</li>";
2016-
whatsNew += "<li>" + tr("Allow adding of geometryless features.") + "</li>";
2017-
whatsNew += "<li>" + tr("Fixed attribute undo/redo.") + "</li></ul></li>";
2018-
whatsNew += "<li>" + tr("Improved attribute handling.");
2015+
whatsNew += "<li>" + tr( "Improved interactive attribute editing in table (adding/deleting features, attribute update)." ) + "</li>";
2016+
whatsNew += "<li>" + tr( "Allow adding of geometryless features." ) + "</li>";
2017+
whatsNew += "<li>" + tr( "Fixed attribute undo/redo." ) + "</li></ul></li>";
2018+
whatsNew += "<li>" + tr( "Improved attribute handling." );
20192019
whatsNew += "<ul>";
2020-
whatsNew += "<li>" + tr("Optionally re-use entered attribute values for next digitized feature.") + "</li>";
2021-
whatsNew += "<li>" + tr("Allow merging/assigning attribute values to a set of features.") + "</li></ul></li>";
2022-
whatsNew += "<li>" + tr("Allow OGR 'save as' without attributes (for eg. DGN/DXF).") + "</li>";
2020+
whatsNew += "<li>" + tr( "Optionally re-use entered attribute values for next digitized feature." ) + "</li>";
2021+
whatsNew += "<li>" + tr( "Allow merging/assigning attribute values to a set of features." ) + "</li></ul></li>";
2022+
whatsNew += "<li>" + tr( "Allow OGR 'save as' without attributes (for eg. DGN/DXF)." ) + "</li>";
20232023
whatsNew += "</ul>";
2024-
whatsNew += "<h3>" + tr("Api and Developer Centric") + "</h3>";
2024+
whatsNew += "<h3>" + tr( "Api and Developer Centric" ) + "</h3>";
20252025
whatsNew += "<ul>";
2026-
whatsNew += "<li>" + tr("Refactored attribute dialog calls to QgsFeatureAttribute.") + "</li>";
2027-
whatsNew += "<li>" + tr("Added QgsVectorLayer::featureAdded signal.") + "</li>";
2028-
whatsNew += "<li>" + tr("Layer menu function added.") + "</li>";
2029-
whatsNew += "<li>" + tr("Added option to load c++ plugins from user "
2030-
" specified directories. Requires application restart to activate.") +
2031-
"</li>";
2032-
whatsNew += "<li>" + tr("Completely new geometry checking tool for fTools. Significantly faster, "
2033-
"more relevant error messages, and now supports zooming to errors. "
2034-
"See the new QgsGeometry.validateGeometry function") + "</li>";
2026+
whatsNew += "<li>" + tr( "Refactored attribute dialog calls to QgsFeatureAttribute." ) + "</li>";
2027+
whatsNew += "<li>" + tr( "Added QgsVectorLayer::featureAdded signal." ) + "</li>";
2028+
whatsNew += "<li>" + tr( "Layer menu function added." ) + "</li>";
2029+
whatsNew += "<li>" + tr( "Added option to load c++ plugins from user "
2030+
" specified directories. Requires application restart to activate." ) +
2031+
"</li>";
2032+
whatsNew += "<li>" + tr( "Completely new geometry checking tool for fTools. Significantly faster, "
2033+
"more relevant error messages, and now supports zooming to errors. "
2034+
"See the new QgsGeometry.validateGeometry function" ) + "</li>";
20352035
whatsNew += "</ul>";
2036-
whatsNew += "<h3>" + tr("QGIS Mapserver") + "</h3>";
2036+
whatsNew += "<h3>" + tr( "QGIS Mapserver" ) + "</h3>";
20372037
whatsNew += "<ul>";
2038-
whatsNew += "<li>" + tr("Ability to specify wms service capabilities in the properties "
2039-
"section of the project file (instead of wms_metadata.xml file).") + "</li>";
2040-
whatsNew += "<li>" + tr("Support for wms printing with GetPrint-Request.") + "</li>";
2038+
whatsNew += "<li>" + tr( "Ability to specify wms service capabilities in the properties "
2039+
"section of the project file (instead of wms_metadata.xml file)." ) + "</li>";
2040+
whatsNew += "<li>" + tr( "Support for wms printing with GetPrint-Request." ) + "</li>";
20412041
whatsNew += "</ul>";
2042-
whatsNew += "<h3>" + tr("Plugins") + "</h3>";
2042+
whatsNew += "<h3>" + tr( "Plugins" ) + "</h3>";
20432043
whatsNew += "<ul>";
2044-
whatsNew += "<li>" + tr("Support for icons of plugins in the plugin manager dialog.") + "</li>";
2045-
whatsNew += "<li>" + tr("Removed quickprint plugin - use easyprint plugin rather from plugin repo.") + "</li>";
2046-
whatsNew += "<li>" + tr("Removed ogr convertor plugin - use 'save as' context menu rather.") + "</li>";
2044+
whatsNew += "<li>" + tr( "Support for icons of plugins in the plugin manager dialog." ) + "</li>";
2045+
whatsNew += "<li>" + tr( "Removed quickprint plugin - use easyprint plugin rather from plugin repo." ) + "</li>";
2046+
whatsNew += "<li>" + tr( "Removed ogr convertor plugin - use 'save as' context menu rather." ) + "</li>";
20472047
whatsNew += "</ul>";
2048-
whatsNew += "<h3>" + tr("Printing") + "</h3>";
2048+
whatsNew += "<h3>" + tr( "Printing" ) + "</h3>";
20492049
whatsNew += "<ul>";
2050-
whatsNew += "<li>" + tr("Undo/Redo support for the print composer") + "</li>";
2050+
whatsNew += "<li>" + tr( "Undo/Redo support for the print composer" ) + "</li>";
20512051
whatsNew += "</ul>";
20522052
whatsNew += "</body></html>";
20532053

‎src/app/qgstipfactory.cpp

+25-25
Original file line numberDiff line numberDiff line change
@@ -163,33 +163,33 @@ QgsTipFactory::QgsTipFactory() : QObject()
163163
) );
164164
addGuiTip( myTip );
165165
// Tip contributed by Alister Hood
166-
myTip.setTitle(tr("Join intersected polylines when rendering"));
167-
myTip.setContent(tr("When applying layered styles to a polyline layer, you can join"
168-
" intersecting lines together simply by enabling symbol levels."
169-
" The image below shows a before (left) and after (right) view of"
170-
" an intersection when symbol levels are enabled.") +
171-
QString("<p><center><img src=\":/images/tips/symbol_levels.png\"/></center></p>")
172-
);
173-
addGuiTip(myTip);
166+
myTip.setTitle( tr( "Join intersected polylines when rendering" ) );
167+
myTip.setContent( tr( "When applying layered styles to a polyline layer, you can join"
168+
" intersecting lines together simply by enabling symbol levels."
169+
" The image below shows a before (left) and after (right) view of"
170+
" an intersection when symbol levels are enabled." ) +
171+
QString( "<p><center><img src=\":/images/tips/symbol_levels.png\"/></center></p>" )
172+
);
173+
addGuiTip( myTip );
174174
// by Tim
175-
myTip.setTitle(tr("Auto-enable on the fly projection"));
176-
myTip.setContent(tr("In the options dialog, under the CRS tab, you can set QGIS so that"
177-
" whenever you create a new project, 'on the fly projection' is enabled"
178-
" automatically and a pre-selected Coordinate Reference System of your"
179-
" choice is used."
180-
));
181-
addGuiTip(myTip);
175+
myTip.setTitle( tr( "Auto-enable on the fly projection" ) );
176+
myTip.setContent( tr( "In the options dialog, under the CRS tab, you can set QGIS so that"
177+
" whenever you create a new project, 'on the fly projection' is enabled"
178+
" automatically and a pre-selected Coordinate Reference System of your"
179+
" choice is used."
180+
) );
181+
addGuiTip( myTip );
182182
// by Tim
183-
myTip.setTitle(tr("Sponsor QGIS"));
184-
myTip.setContent(tr("If QGIS is saving you money or you like our work and"
185-
" have the financial ability to help, please consider sponsoring the"
186-
" development of Quantum GIS. We use money from sponsors to pay for"
187-
" travel and costs related to our bi-annual hackfests, and to generally"
188-
" support the goals of our project. Please see the <a"
189-
" href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
190-
" Page</a> for more details."
191-
));
192-
addGenericTip(myTip);
183+
myTip.setTitle( tr( "Sponsor QGIS" ) );
184+
myTip.setContent( tr( "If QGIS is saving you money or you like our work and"
185+
" have the financial ability to help, please consider sponsoring the"
186+
" development of Quantum GIS. We use money from sponsors to pay for"
187+
" travel and costs related to our bi-annual hackfests, and to generally"
188+
" support the goals of our project. Please see the <a"
189+
" href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
190+
" Page</a> for more details."
191+
) );
192+
addGenericTip( myTip );
193193

194194
/* Template for adding more tips
195195
myTip.setTitle(tr(""));

0 commit comments

Comments
 (0)