Skip to content

Commit 36d86b0

Browse files
timlinuxtimlinux
committed
Remove hard coded whats new content from source code and make it use changelog from t2t rather. Note teh changelog is currently not translatable.
1 parent 29f93f1 commit 36d86b0

File tree

4 files changed

+6
-129
lines changed

4 files changed

+6
-129
lines changed

‎src/app/qgisapp.cpp

-112
Original file line numberDiff line numberDiff line change
@@ -1944,118 +1944,6 @@ void QgisApp::about()
19441944
.arg( qVersion() );
19451945

19461946
abt->setVersion( versionString );
1947-
QString whatsNew = "<html><body>" ;
1948-
whatsNew += "<h3>" + tr( "Version" ) + " " + QString( QGis::QGIS_VERSION ) + "</h3>";
1949-
whatsNew += "<h2>" + trUtf8( "What's new in Version 1.7.0 'Wrocław'?" ) + "</h2>";
1950-
whatsNew += "<p>";
1951-
whatsNew += trUtf8( "This release is named after the town of Wrocław in Poland. The Department of Climatology and Atmosphere Protection, University of Wrocław kindly hosted our last developer meeting in November 2010. Please note that this is a release in our 'cutting edge' release series. As such it contains new features and extends the programmatic interface over QGIS 1.0.x and QGIS 1.6.0. As with any software, there may be bugs and issues that we were not able to fix in time for the release. We therefore recommend that you test this version before rolling it out en-masse to your users." );
1952-
whatsNew += "</p>";
1953-
whatsNew += "<p>";
1954-
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." );
1955-
whatsNew += "</p>";
1956-
1957-
whatsNew += "<h3>" + tr( "Symbology labels and diagrams" ) + "</h3>";
1958-
whatsNew += "<ul>";
1959-
whatsNew += "<li>" + tr( "New symbology now used by default!" ) + "</li>";
1960-
whatsNew += "<li>" + tr( "Diagram system that uses the same smart placement system as labeling-ng" ) + "</li>";
1961-
whatsNew += "<li>" + tr( "Export and import of styles (symbology-ng)." ) + "</li>";
1962-
whatsNew += "<li>" + tr( "Labels for rules in rule-based renderers." ) + "</li>";
1963-
whatsNew += "<li>" + tr( "Ability to set label distance in map units." ) + "</li>";
1964-
whatsNew += "<li>" + tr( "Rotation for svg fills." ) + "</li>";
1965-
whatsNew += "<li>" + tr( "Font marker can have an X,Y offset." ) + "</li>";
1966-
whatsNew += "<li>" + tr( "Allow the line symbol layers to be used for outline of polygon (fill) symbols." ) + "</li>";
1967-
whatsNew += "<li>" + tr( "Option to put marker on the central point of a line." ) + "</li>";
1968-
whatsNew += "<li>" + tr( "Option to put marker only on first/last vertex of a line." ) + "</li>";
1969-
whatsNew += "<li>" + tr( "Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid." ) + "</li>";
1970-
whatsNew += "<li>" + tr( "Allow the marker line symbol layer to draw markers on each vertex." ) + "</li>";
1971-
whatsNew += "<li>" + tr( "Move/rotate/change label edit tools to interactively change data defined label properties." ) + "</li>";
1972-
whatsNew += "</ul>";
1973-
whatsNew += "<h3>" + tr( "New Tools" ) + "</h3>";
1974-
whatsNew += "<ul>";
1975-
whatsNew += "<li>" + tr( "Added GUI for gdaldem." ) + "</li>";
1976-
whatsNew += "<li>" + tr( "Added 'Lines to polygons' tool to vector menu." ) + "</li>";
1977-
whatsNew += "<li>" + tr( "Added field calculator with functions like $x, $y and $perimeter." ) + "</li>";
1978-
whatsNew += "<li>" + tr( "Added voronoi polygon tool to Vector menu." ) + "</li>";
1979-
whatsNew += "</ul>";
1980-
whatsNew += "<h3>" + tr( "User interface updates" ) + "</h3>";
1981-
whatsNew += "<ul>";
1982-
whatsNew += "<li>" + tr( "Allow managing missing layers in a list." ) + "</li>";
1983-
whatsNew += "<li>" + tr( "Zoom to group of layers." ) + "</li>";
1984-
whatsNew += "<li>" + tr( "'Tip of the day' on startup. You can en/disable tips in the options panel." ) + "</li>";
1985-
whatsNew += "<li>" + tr( "Better organisation of menus, separate database menu added." ) + "</li>";
1986-
whatsNew += "<li>" + tr( "Add ability to show number of features in "
1987-
"legend classes. Accessible via right-click legend menu." ) + "</li>";
1988-
whatsNew += "<li>" + tr( "General clean-ups and usability improvements." ) + "</li>";
1989-
whatsNew += "</ul>";
1990-
whatsNew += "<h3>" + tr( "CRS Handling" ) + "</h3>";
1991-
whatsNew += "<ul>";
1992-
whatsNew += "<li>" + tr( "Show active crs in status bar." ) + "</li>";
1993-
whatsNew += "<li>" + tr( "Assign layer CRS to project (in the legend context menu)." ) + "</li>";
1994-
whatsNew += "<li>" + tr( "Select default CRS for new projects." ) + "</li>";
1995-
whatsNew += "<li>" + tr( "Allow setting CRS for multiple layers at once." ) + "</li>";
1996-
whatsNew += "<li>" + tr( "Default to last selection when prompting for CRS." ) + "</li>";
1997-
whatsNew += "</ul>";
1998-
whatsNew += "<h3>" + tr( "Rasters" ) + "</h3>";
1999-
whatsNew += "<ul>";
2000-
whatsNew += "<li>" + tr( "Added AND and OR operator for raster calculator" ) + "</li>";
2001-
whatsNew += "<li>" + tr( "On-the-fly reprojection of rasters added!" ) + "</li>";
2002-
whatsNew += "<li>" + tr( "Proper implementation of raster providers." ) + "</li>";
2003-
whatsNew += "<li>" + tr( "Added raster toolbar with histogram stretch functions." ) + "</li>";
2004-
whatsNew += "</ul>";
2005-
whatsNew += "<h3>" + tr( "Providers and Data Handling" ) + "</h3>";
2006-
whatsNew += "<ul>";
2007-
whatsNew += "<li>" + tr( "New SQLAnywhere vector provider." ) + "</li>";
2008-
whatsNew += "<li>" + tr( "Table join support." ) + "</li>";
2009-
whatsNew += "<li>" + tr( "Feature form updates" ) ;
2010-
whatsNew += "<ul>";
2011-
whatsNew += "<li>" + tr( "Make NULL value string representation configurable." ) + "</li>";
2012-
whatsNew += "<li>" + tr( "Fix feature updates in feature form from attribute table." ) + "</li>";
2013-
whatsNew += "<li>" + tr( "Add support for NULL values in value maps (comboboxes)." ) + "</li>";
2014-
whatsNew += "<li>" + tr( "Use layer names instead of ids in drop down list when loading value maps from layers." ) + "</li>";
2015-
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>";
2016-
whatsNew += "<li>" + tr( "Support searching for NULL in attribute table." ) + "</li>";
2017-
whatsNew += "<li>" + tr( "Attribute editing improvements" );
2018-
whatsNew += "<ul>";
2019-
whatsNew += "<li>" + tr( "Improved interactive attribute editing in table (adding/deleting features, attribute update)." ) + "</li>";
2020-
whatsNew += "<li>" + tr( "Allow adding of geometryless features." ) + "</li>";
2021-
whatsNew += "<li>" + tr( "Fixed attribute undo/redo." ) + "</li></ul></li>";
2022-
whatsNew += "<li>" + tr( "Improved attribute handling." );
2023-
whatsNew += "<ul>";
2024-
whatsNew += "<li>" + tr( "Optionally re-use entered attribute values for next digitized feature." ) + "</li>";
2025-
whatsNew += "<li>" + tr( "Allow merging/assigning attribute values to a set of features." ) + "</li></ul></li>";
2026-
whatsNew += "<li>" + tr( "Allow OGR 'save as' without attributes (for eg. DGN/DXF)." ) + "</li>";
2027-
whatsNew += "</ul>";
2028-
whatsNew += "<h3>" + tr( "Api and Developer Centric" ) + "</h3>";
2029-
whatsNew += "<ul>";
2030-
whatsNew += "<li>" + tr( "Refactored attribute dialog calls to QgsFeatureAttribute." ) + "</li>";
2031-
whatsNew += "<li>" + tr( "Added QgsVectorLayer::featureAdded signal." ) + "</li>";
2032-
whatsNew += "<li>" + tr( "Layer menu function added." ) + "</li>";
2033-
whatsNew += "<li>" + tr( "Added option to load c++ plugins from user "
2034-
" specified directories. Requires application restart to activate." ) +
2035-
"</li>";
2036-
whatsNew += "<li>" + tr( "Completely new geometry checking tool for fTools. Significantly faster, "
2037-
"more relevant error messages, and now supports zooming to errors. "
2038-
"See the new QgsGeometry.validateGeometry function" ) + "</li>";
2039-
whatsNew += "</ul>";
2040-
whatsNew += "<h3>" + tr( "QGIS Mapserver" ) + "</h3>";
2041-
whatsNew += "<ul>";
2042-
whatsNew += "<li>" + tr( "Ability to specify wms service capabilities in the properties "
2043-
"section of the project file (instead of wms_metadata.xml file)." ) + "</li>";
2044-
whatsNew += "<li>" + tr( "Support for wms printing with GetPrint-Request." ) + "</li>";
2045-
whatsNew += "</ul>";
2046-
whatsNew += "<h3>" + tr( "Plugins" ) + "</h3>";
2047-
whatsNew += "<ul>";
2048-
whatsNew += "<li>" + tr( "Support for icons of plugins in the plugin manager dialog." ) + "</li>";
2049-
whatsNew += "<li>" + tr( "Removed quickprint plugin - use easyprint plugin rather from plugin repo." ) + "</li>";
2050-
whatsNew += "<li>" + tr( "Removed ogr convertor plugin - use 'save as' context menu rather." ) + "</li>";
2051-
whatsNew += "</ul>";
2052-
whatsNew += "<h3>" + tr( "Printing" ) + "</h3>";
2053-
whatsNew += "<ul>";
2054-
whatsNew += "<li>" + tr( "Undo/Redo support for the print composer" ) + "</li>";
2055-
whatsNew += "</ul>";
2056-
whatsNew += "</body></html>";
2057-
2058-
abt->setWhatsNew( whatsNew );
20591947

20601948
QApplication::restoreOverrideCursor();
20611949
}

‎src/app/qgsabout.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,20 @@ void QgsAbout::init()
211211
QgsDebugMsg( QString( "translatorHTML:%1" ).arg( translatorHTML.toAscii().constData() ) );
212212
QgsDebugMsg( QString( "txtTranslators:%1" ).arg( txtTranslators->toHtml().toAscii().constData() ) );
213213
}
214+
setWhatsNew();
214215
}
215216

216217
void QgsAbout::setVersion( QString v )
217218
{
218219
lblVersion->setText( v );
219220
}
220221

221-
void QgsAbout::setWhatsNew( QString txt )
222+
void QgsAbout::setWhatsNew( )
222223
{
223224
QString myStyle = QgsApplication::reportStyleSheet();
224225
txtWhatsNew->clear();
225226
txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
226-
txtWhatsNew->setHtml( txt );
227+
txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/changelog.html" );
227228
}
228229

229230
void QgsAbout::setPluginInfo()

‎src/app/qgsabout.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class QgsAbout : public QDialog, private Ui::QgsAbout
2727
QgsAbout();
2828
~QgsAbout();
2929
void setVersion( QString v );
30-
void setWhatsNew( QString txt );
3130
static QString fileSystemSafe( QString string );
3231

3332
private:
33+
void setWhatsNew( );
3434
void setPluginInfo();
3535
void init();
3636
void openUrl( QString url );

‎src/ui/qgsabout.ui

+2-14
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,7 @@ p, li { white-space: pre-wrap; }
161161
</attribute>
162162
<layout class="QGridLayout">
163163
<item row="0" column="0">
164-
<widget class="QTextEdit" name="txtWhatsNew">
165-
<property name="focusPolicy">
166-
<enum>Qt::NoFocus</enum>
167-
</property>
168-
<property name="acceptDrops">
169-
<bool>false</bool>
170-
</property>
171-
<property name="lineWidth">
172-
<number>2</number>
173-
</property>
174-
<property name="readOnly">
175-
<bool>true</bool>
176-
</property>
177-
</widget>
164+
<widget class="QTextBrowser" name="txtWhatsNew"/>
178165
</item>
179166
</layout>
180167
</widget>
@@ -264,6 +251,7 @@ p, li { white-space: pre-wrap; }
264251
</tabstops>
265252
<resources>
266253
<include location="../../images/images.qrc"/>
254+
<include location="../../images/images.qrc"/>
267255
</resources>
268256
<connections>
269257
<connection>

0 commit comments

Comments
 (0)