Navigation Menu

Skip to content

Commit

Permalink
automatic indentation update (r15302-r15567)
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15568 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 22, 2011
1 parent c2a29df commit 716ddeb
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 130 deletions.
2 changes: 1 addition & 1 deletion src/app/legend/qgslegendlayer.cpp
View file
Expand Up @@ -433,7 +433,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )

// set layer crs
theMenu.addAction( QgisApp::getThemeIcon( "/mActionSetCRS.png" ), tr( "&Set layer CRS" ), QgisApp::instance(), SLOT( setLayerCRS() ) );

// assign layer crs to project
theMenu.addAction( QgisApp::getThemeIcon( "/mActionSetProjectCRS.png" ), tr( "Set &project CRS from layer" ), QgisApp::instance(), SLOT( setProjectCRSFromLayer() ) );

Expand Down
152 changes: 76 additions & 76 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -1950,104 +1950,104 @@ void QgisApp::about()
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." );
whatsNew += "</p>";

whatsNew += "<h3>" + tr("Symbology labels and diagrams") + "</h3>";
whatsNew += "<h3>" + tr( "Symbology labels and diagrams" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("New symbology now used by default!") + "</li>";
whatsNew += "<li>" + tr("Diagram system that uses the same smart placement system as labeling-ng") + "</li>";
whatsNew += "<li>" + tr("Export and import of styles (symbology-ng).") + "</li>";
whatsNew += "<li>" + tr("Labels for rules in rule-based renderers.") + "</li>";
whatsNew += "<li>" + tr("Ability to set label distance in map units.") + "</li>";
whatsNew += "<li>" + tr("Rotation for svg fills.") + "</li>";
whatsNew += "<li>" + tr("Font marker can have an X,Y offset.") + "</li>";
whatsNew += "<li>" + tr("Allow the line symbol layers to be used for outline of polygon (fill) symbols.") + "</li>";
whatsNew += "<li>" + tr("Option to put marker on the central point of a line.") + "</li>";
whatsNew += "<li>" + tr("Option to put marker only on first/last vertex of a line.") + "</li>";
whatsNew += "<li>" + tr("Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid.") + "</li>";
whatsNew += "<li>" + tr("Allow the marker line symbol layer to draw markers on each vertex.") + "</li>";
whatsNew += "<li>" + tr("Move/rotate/change label edit tools to interactively change data defined label properties.") + "</li>";
whatsNew += "<li>" + tr( "New symbology now used by default!" ) + "</li>";
whatsNew += "<li>" + tr( "Diagram system that uses the same smart placement system as labeling-ng" ) + "</li>";
whatsNew += "<li>" + tr( "Export and import of styles (symbology-ng)." ) + "</li>";
whatsNew += "<li>" + tr( "Labels for rules in rule-based renderers." ) + "</li>";
whatsNew += "<li>" + tr( "Ability to set label distance in map units." ) + "</li>";
whatsNew += "<li>" + tr( "Rotation for svg fills." ) + "</li>";
whatsNew += "<li>" + tr( "Font marker can have an X,Y offset." ) + "</li>";
whatsNew += "<li>" + tr( "Allow the line symbol layers to be used for outline of polygon (fill) symbols." ) + "</li>";
whatsNew += "<li>" + tr( "Option to put marker on the central point of a line." ) + "</li>";
whatsNew += "<li>" + tr( "Option to put marker only on first/last vertex of a line." ) + "</li>";
whatsNew += "<li>" + tr( "Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid." ) + "</li>";
whatsNew += "<li>" + tr( "Allow the marker line symbol layer to draw markers on each vertex." ) + "</li>";
whatsNew += "<li>" + tr( "Move/rotate/change label edit tools to interactively change data defined label properties." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("New Tools") + "</h3>";
whatsNew += "<h3>" + tr( "New Tools" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Added GUI for gdaldem.") + "</li>";
whatsNew += "<li>" + tr("Added 'Lines to polygons' tool to vector menu.") + "</li>";
whatsNew += "<li>" + tr("Added field calculator with functions like $x, $y and $perimeter.") + "</li>";
whatsNew += "<li>" + tr("Added voronoi polygon tool to Vector menu.") + "</li>";
whatsNew += "<li>" + tr( "Added GUI for gdaldem." ) + "</li>";
whatsNew += "<li>" + tr( "Added 'Lines to polygons' tool to vector menu." ) + "</li>";
whatsNew += "<li>" + tr( "Added field calculator with functions like $x, $y and $perimeter." ) + "</li>";
whatsNew += "<li>" + tr( "Added voronoi polygon tool to Vector menu." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("User interface updates") + "</h3>";
whatsNew += "<h3>" + tr( "User interface updates" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Allow managing missing layers in a list.") + "</li>";
whatsNew += "<li>" + tr("Zoom to group of layers.") + "</li>";
whatsNew += "<li>" + tr("'Tip of the day' on startup. You can en/disable tips in the options panel.") + "</li>";
whatsNew += "<li>" + tr("Better organisation of menus, separate database menu added.") + "</li>";
whatsNew += "<li>" + tr("Add ability to show number of features in "
"legend classes. Accessible via right-click legend menu.") + "</li>";
whatsNew += "<li>" + tr("General clean-ups and usability improvements.") + "</li>";
whatsNew += "<li>" + tr( "Allow managing missing layers in a list." ) + "</li>";
whatsNew += "<li>" + tr( "Zoom to group of layers." ) + "</li>";
whatsNew += "<li>" + tr( "'Tip of the day' on startup. You can en/disable tips in the options panel." ) + "</li>";
whatsNew += "<li>" + tr( "Better organisation of menus, separate database menu added." ) + "</li>";
whatsNew += "<li>" + tr( "Add ability to show number of features in "
"legend classes. Accessible via right-click legend menu." ) + "</li>";
whatsNew += "<li>" + tr( "General clean-ups and usability improvements." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("CRS Handling") + "</h3>";
whatsNew += "<h3>" + tr( "CRS Handling" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Show active crs in status bar.") + "</li>";
whatsNew += "<li>" + tr("Assign layer CRS to project (in the legend context menu).") + "</li>";
whatsNew += "<li>" + tr("Select default CRS for new projects.") + "</li>";
whatsNew += "<li>" + tr("Allow setting CRS for multiple layers at once.") + "</li>";
whatsNew += "<li>" + tr("Default to last selection when prompting for CRS.") + "</li>";
whatsNew += "<li>" + tr( "Show active crs in status bar." ) + "</li>";
whatsNew += "<li>" + tr( "Assign layer CRS to project (in the legend context menu)." ) + "</li>";
whatsNew += "<li>" + tr( "Select default CRS for new projects." ) + "</li>";
whatsNew += "<li>" + tr( "Allow setting CRS for multiple layers at once." ) + "</li>";
whatsNew += "<li>" + tr( "Default to last selection when prompting for CRS." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("Rasters") + "</h3>";
whatsNew += "<h3>" + tr( "Rasters" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Added AND and OR operator for raster calculator") + "</li>";
whatsNew += "<li>" + tr("On-the-fly reprojection of rasters added!") + "</li>";
whatsNew += "<li>" + tr("Proper implementation of raster providers.") + "</li>";
whatsNew += "<li>" + tr("Added raster toolbar with histogram stretch functions.") + "</li>";
whatsNew += "<li>" + tr( "Added AND and OR operator for raster calculator" ) + "</li>";
whatsNew += "<li>" + tr( "On-the-fly reprojection of rasters added!" ) + "</li>";
whatsNew += "<li>" + tr( "Proper implementation of raster providers." ) + "</li>";
whatsNew += "<li>" + tr( "Added raster toolbar with histogram stretch functions." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("Providers and Data Handling") + "</h3>";
whatsNew += "<h3>" + tr( "Providers and Data Handling" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("New SQLAnywhere vector provider.") + "</li>";
whatsNew += "<li>" + tr("Table join support.") + "</li>";
whatsNew += "<li>" + tr("Feature form updates") ;
whatsNew += "<li>" + tr( "New SQLAnywhere vector provider." ) + "</li>";
whatsNew += "<li>" + tr( "Table join support." ) + "</li>";
whatsNew += "<li>" + tr( "Feature form updates" ) ;
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Make NULL value string representation configurable.") + "</li>";
whatsNew += "<li>" + tr("Fix feature updates in feature form from attribute table.") + "</li>";
whatsNew += "<li>" + tr("Add support for NULL values in value maps (comboboxes).") + "</li>";
whatsNew += "<li>" + tr("Use layer names instead of ids in drop down list when loading value maps from layers.") + "</li>";
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>";
whatsNew += "<li>" + tr("Support searching for NULL in attribute table.") + "</li>";
whatsNew += "<li>" + tr("Attribute editing improvements");
whatsNew += "<li>" + tr( "Make NULL value string representation configurable." ) + "</li>";
whatsNew += "<li>" + tr( "Fix feature updates in feature form from attribute table." ) + "</li>";
whatsNew += "<li>" + tr( "Add support for NULL values in value maps (comboboxes)." ) + "</li>";
whatsNew += "<li>" + tr( "Use layer names instead of ids in drop down list when loading value maps from layers." ) + "</li>";
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>";
whatsNew += "<li>" + tr( "Support searching for NULL in attribute table." ) + "</li>";
whatsNew += "<li>" + tr( "Attribute editing improvements" );
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Improved interactive attribute editing in table (adding/deleting features, attribute update).") + "</li>";
whatsNew += "<li>" + tr("Allow adding of geometryless features.") + "</li>";
whatsNew += "<li>" + tr("Fixed attribute undo/redo.") + "</li></ul></li>";
whatsNew += "<li>" + tr("Improved attribute handling.");
whatsNew += "<li>" + tr( "Improved interactive attribute editing in table (adding/deleting features, attribute update)." ) + "</li>";
whatsNew += "<li>" + tr( "Allow adding of geometryless features." ) + "</li>";
whatsNew += "<li>" + tr( "Fixed attribute undo/redo." ) + "</li></ul></li>";
whatsNew += "<li>" + tr( "Improved attribute handling." );
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Optionally re-use entered attribute values for next digitized feature.") + "</li>";
whatsNew += "<li>" + tr("Allow merging/assigning attribute values to a set of features.") + "</li></ul></li>";
whatsNew += "<li>" + tr("Allow OGR 'save as' without attributes (for eg. DGN/DXF).") + "</li>";
whatsNew += "<li>" + tr( "Optionally re-use entered attribute values for next digitized feature." ) + "</li>";
whatsNew += "<li>" + tr( "Allow merging/assigning attribute values to a set of features." ) + "</li></ul></li>";
whatsNew += "<li>" + tr( "Allow OGR 'save as' without attributes (for eg. DGN/DXF)." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("Api and Developer Centric") + "</h3>";
whatsNew += "<h3>" + tr( "Api and Developer Centric" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Refactored attribute dialog calls to QgsFeatureAttribute.") + "</li>";
whatsNew += "<li>" + tr("Added QgsVectorLayer::featureAdded signal.") + "</li>";
whatsNew += "<li>" + tr("Layer menu function added.") + "</li>";
whatsNew += "<li>" + tr("Added option to load c++ plugins from user "
" specified directories. Requires application restart to activate.") +
"</li>";
whatsNew += "<li>" + tr("Completely new geometry checking tool for fTools. Significantly faster, "
"more relevant error messages, and now supports zooming to errors. "
"See the new QgsGeometry.validateGeometry function") + "</li>";
whatsNew += "<li>" + tr( "Refactored attribute dialog calls to QgsFeatureAttribute." ) + "</li>";
whatsNew += "<li>" + tr( "Added QgsVectorLayer::featureAdded signal." ) + "</li>";
whatsNew += "<li>" + tr( "Layer menu function added." ) + "</li>";
whatsNew += "<li>" + tr( "Added option to load c++ plugins from user "
" specified directories. Requires application restart to activate." ) +
"</li>";
whatsNew += "<li>" + tr( "Completely new geometry checking tool for fTools. Significantly faster, "
"more relevant error messages, and now supports zooming to errors. "
"See the new QgsGeometry.validateGeometry function" ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("QGIS Mapserver") + "</h3>";
whatsNew += "<h3>" + tr( "QGIS Mapserver" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Ability to specify wms service capabilities in the properties "
"section of the project file (instead of wms_metadata.xml file).") + "</li>";
whatsNew += "<li>" + tr("Support for wms printing with GetPrint-Request.") + "</li>";
whatsNew += "<li>" + tr( "Ability to specify wms service capabilities in the properties "
"section of the project file (instead of wms_metadata.xml file)." ) + "</li>";
whatsNew += "<li>" + tr( "Support for wms printing with GetPrint-Request." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("Plugins") + "</h3>";
whatsNew += "<h3>" + tr( "Plugins" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Support for icons of plugins in the plugin manager dialog.") + "</li>";
whatsNew += "<li>" + tr("Removed quickprint plugin - use easyprint plugin rather from plugin repo.") + "</li>";
whatsNew += "<li>" + tr("Removed ogr convertor plugin - use 'save as' context menu rather.") + "</li>";
whatsNew += "<li>" + tr( "Support for icons of plugins in the plugin manager dialog." ) + "</li>";
whatsNew += "<li>" + tr( "Removed quickprint plugin - use easyprint plugin rather from plugin repo." ) + "</li>";
whatsNew += "<li>" + tr( "Removed ogr convertor plugin - use 'save as' context menu rather." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr("Printing") + "</h3>";
whatsNew += "<h3>" + tr( "Printing" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr("Undo/Redo support for the print composer") + "</li>";
whatsNew += "<li>" + tr( "Undo/Redo support for the print composer" ) + "</li>";
whatsNew += "</ul>";
whatsNew += "</body></html>";

Expand Down
50 changes: 25 additions & 25 deletions src/app/qgstipfactory.cpp
View file
Expand Up @@ -163,33 +163,33 @@ QgsTipFactory::QgsTipFactory() : QObject()
) );
addGuiTip( myTip );
// Tip contributed by Alister Hood
myTip.setTitle(tr("Join intersected polylines when rendering"));
myTip.setContent(tr("When applying layered styles to a polyline layer, you can join"
" intersecting lines together simply by enabling symbol levels."
" The image below shows a before (left) and after (right) view of"
" an intersection when symbol levels are enabled.") +
QString("<p><center><img src=\":/images/tips/symbol_levels.png\"/></center></p>")
);
addGuiTip(myTip);
myTip.setTitle( tr( "Join intersected polylines when rendering" ) );
myTip.setContent( tr( "When applying layered styles to a polyline layer, you can join"
" intersecting lines together simply by enabling symbol levels."
" The image below shows a before (left) and after (right) view of"
" an intersection when symbol levels are enabled." ) +
QString( "<p><center><img src=\":/images/tips/symbol_levels.png\"/></center></p>" )
);
addGuiTip( myTip );
// by Tim
myTip.setTitle(tr("Auto-enable on the fly projection"));
myTip.setContent(tr("In the options dialog, under the CRS tab, you can set QGIS so that"
" whenever you create a new project, 'on the fly projection' is enabled"
" automatically and a pre-selected Coordinate Reference System of your"
" choice is used."
));
addGuiTip(myTip);
myTip.setTitle( tr( "Auto-enable on the fly projection" ) );
myTip.setContent( tr( "In the options dialog, under the CRS tab, you can set QGIS so that"
" whenever you create a new project, 'on the fly projection' is enabled"
" automatically and a pre-selected Coordinate Reference System of your"
" choice is used."
) );
addGuiTip( myTip );
// by Tim
myTip.setTitle(tr("Sponsor QGIS"));
myTip.setContent(tr("If QGIS is saving you money or you like our work and"
" have the financial ability to help, please consider sponsoring the"
" development of Quantum GIS. We use money from sponsors to pay for"
" travel and costs related to our bi-annual hackfests, and to generally"
" support the goals of our project. Please see the <a"
" href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
" Page</a> for more details."
));
addGenericTip(myTip);
myTip.setTitle( tr( "Sponsor QGIS" ) );
myTip.setContent( tr( "If QGIS is saving you money or you like our work and"
" have the financial ability to help, please consider sponsoring the"
" development of Quantum GIS. We use money from sponsors to pay for"
" travel and costs related to our bi-annual hackfests, and to generally"
" support the goals of our project. Please see the <a"
" href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
" Page</a> for more details."
) );
addGenericTip( myTip );

/* Template for adding more tips
myTip.setTitle(tr(""));
Expand Down

0 comments on commit 716ddeb

Please sign in to comment.