Skip to content

Commit

Permalink
Resolved merge conflicts from applying 36d86b0 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@timlinux
timlinux committed Sep 24, 2011
1 parent 38cb294 commit 6a072a2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 120 deletions.
103 changes: 0 additions & 103 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -2009,109 +2009,6 @@ void QgisApp::about()
whatsNew += "</p>";

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 += "</ul>";
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 += "</ul>";
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 += "</ul>";
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 += "</ul>";
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 += "</ul>";
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 += "<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 += "<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 += "<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 += "</ul>";
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 += "</ul>";
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 += "</ul>";
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 converter plugin - use 'save as' context menu rather." ) + "</li>";
whatsNew += "</ul>";
whatsNew += "<h3>" + tr( "Printing" ) + "</h3>";
whatsNew += "<ul>";
whatsNew += "<li>" + tr( "Undo/Redo support for the print composer" ) + "</li>";
whatsNew += "</ul>";
whatsNew += "</body></html>";

abt->setWhatsNew( whatsNew );

QApplication::restoreOverrideCursor();
}
abt->show();
abt->raise();
Expand Down
5 changes: 3 additions & 2 deletions src/app/qgsabout.cpp
View file
Expand Up @@ -216,6 +216,7 @@ void QgsAbout::init()
QgsDebugMsg( QString( "translatorHTML:%1" ).arg( translatorHTML.toAscii().constData() ) );
QgsDebugMsg( QString( "txtTranslators:%1" ).arg( txtTranslators->toHtml().toAscii().constData() ) );
}
setWhatsNew();
}

void QgsAbout::setVersion( QString v )
Expand All @@ -225,12 +226,12 @@ void QgsAbout::setVersion( QString v )
txtVersion->setHtml( v );
}

void QgsAbout::setWhatsNew( QString txt )
void QgsAbout::setWhatsNew( )
{
QString myStyle = QgsApplication::reportStyleSheet();
txtWhatsNew->clear();
txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
txtWhatsNew->setHtml( txt );
txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/changelog.html" );
}

void QgsAbout::setPluginInfo()
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsabout.h
View file
Expand Up @@ -26,10 +26,10 @@ class QgsAbout : public QDialog, private Ui::QgsAbout
QgsAbout();
~QgsAbout();
void setVersion( QString v );
void setWhatsNew( QString txt );
static QString fileSystemSafe( QString string );

private:
void setWhatsNew( );
void setPluginInfo();
void init();
void openUrl( QString url );
Expand Down
15 changes: 1 addition & 14 deletions src/ui/qgsabout.ui
View file
Expand Up @@ -161,20 +161,7 @@ p, li { white-space: pre-wrap; }
</attribute>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QTextEdit" name="txtWhatsNew">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="QTextBrowser" name="txtWhatsNew"/>
</item>
</layout>
</widget>
Expand Down

0 comments on commit 6a072a2

Please sign in to comment.