Skip to content

Commit 08d8ea2

Browse files
timlinuxtimlinux
committed
Merge branch 'master' of ../Quantum-GIS
2 parents 2831968 + b54f668 commit 08d8ea2

12 files changed

+6155
-830
lines changed

‎CHANGELOG

+1,612
Large diffs are not rendered by default.

‎doc/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
2020
)
2121
ENDIF(TXT2TAGS_EXECUTABLE)
2222

23-
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
23+
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS
2424

2525
INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
2626
INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

‎doc/SPONSORS

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
Please consider sponsoring the development of QuantumGIS.
1616
See: http://qgis.org/en/sponsorship.html
1717

18+
SILVER
19+
Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/
20+
1821
BRONZE
1922
Studio Associato Gfosservices|http://www.gfosservices.com
2023
NEXTGIS|http://nextgis.org

‎doc/changelog.html

+2,339
Large diffs are not rendered by default.

‎doc/changelog.t2t

+2,091
Large diffs are not rendered by default.

‎doc/index.html

+4-673
Large diffs are not rendered by default.

‎doc/style.css

+56-21
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,65 @@
1-
body {
2-
padding: 2em 1em 2em 70px;
3-
margin: 0;
4-
font-family: sans-serif;
1+
body{ background: white;
52
color: black;
6-
background: white;
3+
font-family: arial,sans-serif;
74
}
8-
:link { color: #00C; background: transparent }
9-
:visited { color: #609; background: transparent }
10-
a:active { color: #C00; background: transparent }
11-
12-
a:link img, a:visited img { border-style: none }
13-
14-
15-
h1, h2, h3, h4, h5, h6 { text-align: left }
16-
h1, h2, h3 { color: #005A9C; background: white }
17-
h1 { font: 170% sans-serif }
18-
h2 { font: 140% sans-serif }
19-
h3 { font: 120% sans-serif }
20-
h4 { font: bold 100% sans-serif }
21-
h5 { font: italic 100% sans-serif }
22-
h6 { font: small-caps 100% sans-serif }
23-
245
pre { margin-left: 2em;
256
border: 1;
267
padding: 4px;
278
background: #ececec; }
289
pre, code { font-family: monospace }
2910

3011

12+
.overview{ font: 1.82em; font-weight: bold;}
13+
14+
h1{ background-color: #F6F6F6;
15+
color: #8FB171;
16+
font-size: large;
17+
font-weight: bold;
18+
font-family: luxi serif, georgia, times new roman, times, serif;
19+
background: none;
20+
padding: 0.75em 0 0;
21+
margin: 0;
22+
line-height: 1.1em;
23+
}
24+
h2{ background-color: #F6F6F6;
25+
color: #8FB171;
26+
font-size: medium;
27+
font-weight: normal;
28+
font-family: luxi serif, georgia, times new roman, times, serif;
29+
background: none;
30+
padding: 0.75em 0 0;
31+
margin: 0;
32+
line-height: 1.1em;
33+
}
34+
h3{ background-color: #F6F6F6;
35+
color: #729FCF;
36+
font-family: luxi serif, georgia, times new roman, times, serif;
37+
font-weight: bold;
38+
font-size: large;
39+
text-align: right;
40+
border-bottom: 5px solid #DCEB5C;
41+
}
42+
h4{ background-color: #F6F6F6;
43+
color: #729FCF;
44+
font-family: luxi serif, georgia, times new roman, times, serif;
45+
font-weight: bold;
46+
font-size: medium;
47+
text-align: right;
48+
}
49+
h5{ background-color: #F6F6F6;
50+
color: #729FCF;
51+
font-family: luxi serif, georgia, times new roman, times, serif;
52+
font-weight: bold;
53+
font-size: small;
54+
text-align: right;
55+
}
56+
a{ color: #729FCF;
57+
font-family: arial,sans-serif;
58+
font-size: small;
59+
}
60+
label{ background-color: #FFFFCC;
61+
border: 1px solid black;
62+
margin: 1px;
63+
padding: 0px 3px;
64+
font-size: small;
65+
}

‎src/app/qgisapp.cpp

+15-105
Original file line numberDiff line numberDiff line change
@@ -2001,118 +2001,15 @@ void QgisApp::about()
20012001

20022002
QString whatsNew = "<html><body>" ;
20032003
whatsNew += "<h3>" + tr( "Version" ) + " " + QString( QGis::QGIS_VERSION ) + "</h3>";
2004-
whatsNew += "<h2>" + trUtf8( "What's new in Version 1.7.0 'Wrocław'?" ) + "</h2>";
2004+
whatsNew += "<h2>" + trUtf8( "What's new in Version 1.7.0 'Wroclaw'?" ) + "</h2>";
20052005
whatsNew += "<p>";
2006-
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." );
2006+
whatsNew += trUtf8( "This release is named after the town of Wroclaw in Poland. The Department of Climatology and Atmosphere Protection, University of Wroclaw 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." );
20072007
whatsNew += "</p>";
20082008
whatsNew += "<p>";
20092009
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." );
20102010
whatsNew += "</p>";
20112011

20122012
whatsNew += "<h3>" + tr( "Symbology labels and diagrams" ) + "</h3>";
2013-
whatsNew += "<ul>";
2014-
whatsNew += "<li>" + tr( "New symbology now used by default!" ) + "</li>";
2015-
whatsNew += "<li>" + tr( "Diagram system that uses the same smart placement system as labeling-ng" ) + "</li>";
2016-
whatsNew += "<li>" + tr( "Export and import of styles (symbology-ng)." ) + "</li>";
2017-
whatsNew += "<li>" + tr( "Labels for rules in rule-based renderers." ) + "</li>";
2018-
whatsNew += "<li>" + tr( "Ability to set label distance in map units." ) + "</li>";
2019-
whatsNew += "<li>" + tr( "Rotation for svg fills." ) + "</li>";
2020-
whatsNew += "<li>" + tr( "Font marker can have an X,Y offset." ) + "</li>";
2021-
whatsNew += "<li>" + tr( "Allow the line symbol layers to be used for outline of polygon (fill) symbols." ) + "</li>";
2022-
whatsNew += "<li>" + tr( "Option to put marker on the central point of a line." ) + "</li>";
2023-
whatsNew += "<li>" + tr( "Option to put marker only on first/last vertex of a line." ) + "</li>";
2024-
whatsNew += "<li>" + tr( "Added \"centroid fill\" symbol layer which draws a marker on polygon's centroid." ) + "</li>";
2025-
whatsNew += "<li>" + tr( "Allow the marker line symbol layer to draw markers on each vertex." ) + "</li>";
2026-
whatsNew += "<li>" + tr( "Move/rotate/change label edit tools to interactively change data defined label properties." ) + "</li>";
2027-
whatsNew += "</ul>";
2028-
whatsNew += "<h3>" + tr( "New Tools" ) + "</h3>";
2029-
whatsNew += "<ul>";
2030-
whatsNew += "<li>" + tr( "Added GUI for gdaldem." ) + "</li>";
2031-
whatsNew += "<li>" + tr( "Added 'Lines to polygons' tool to vector menu." ) + "</li>";
2032-
whatsNew += "<li>" + tr( "Added field calculator with functions like $x, $y and $perimeter." ) + "</li>";
2033-
whatsNew += "<li>" + tr( "Added voronoi polygon tool to Vector menu." ) + "</li>";
2034-
whatsNew += "</ul>";
2035-
whatsNew += "<h3>" + tr( "User interface updates" ) + "</h3>";
2036-
whatsNew += "<ul>";
2037-
whatsNew += "<li>" + tr( "Allow managing missing layers in a list." ) + "</li>";
2038-
whatsNew += "<li>" + tr( "Zoom to group of layers." ) + "</li>";
2039-
whatsNew += "<li>" + tr( "'Tip of the day' on startup. You can en/disable tips in the options panel." ) + "</li>";
2040-
whatsNew += "<li>" + tr( "Better organisation of menus, separate database menu added." ) + "</li>";
2041-
whatsNew += "<li>" + tr( "Add ability to show number of features in "
2042-
"legend classes. Accessible via right-click legend menu." ) + "</li>";
2043-
whatsNew += "<li>" + tr( "General clean-ups and usability improvements." ) + "</li>";
2044-
whatsNew += "</ul>";
2045-
whatsNew += "<h3>" + tr( "CRS Handling" ) + "</h3>";
2046-
whatsNew += "<ul>";
2047-
whatsNew += "<li>" + tr( "Show active crs in status bar." ) + "</li>";
2048-
whatsNew += "<li>" + tr( "Assign layer CRS to project (in the legend context menu)." ) + "</li>";
2049-
whatsNew += "<li>" + tr( "Select default CRS for new projects." ) + "</li>";
2050-
whatsNew += "<li>" + tr( "Allow setting CRS for multiple layers at once." ) + "</li>";
2051-
whatsNew += "<li>" + tr( "Default to last selection when prompting for CRS." ) + "</li>";
2052-
whatsNew += "</ul>";
2053-
whatsNew += "<h3>" + tr( "Rasters" ) + "</h3>";
2054-
whatsNew += "<ul>";
2055-
whatsNew += "<li>" + tr( "Added AND and OR operator for raster calculator" ) + "</li>";
2056-
whatsNew += "<li>" + tr( "On-the-fly reprojection of rasters added!" ) + "</li>";
2057-
whatsNew += "<li>" + tr( "Proper implementation of raster providers." ) + "</li>";
2058-
whatsNew += "<li>" + tr( "Added raster toolbar with histogram stretch functions." ) + "</li>";
2059-
whatsNew += "</ul>";
2060-
whatsNew += "<h3>" + tr( "Providers and Data Handling" ) + "</h3>";
2061-
whatsNew += "<ul>";
2062-
whatsNew += "<li>" + tr( "New SQLAnywhere vector provider." ) + "</li>";
2063-
whatsNew += "<li>" + tr( "Table join support." ) + "</li>";
2064-
whatsNew += "<li>" + tr( "Feature form updates" ) ;
2065-
whatsNew += "<ul>";
2066-
whatsNew += "<li>" + tr( "Make NULL value string representation configurable." ) + "</li>";
2067-
whatsNew += "<li>" + tr( "Fix feature updates in feature form from attribute table." ) + "</li>";
2068-
whatsNew += "<li>" + tr( "Add support for NULL values in value maps (comboboxes)." ) + "</li>";
2069-
whatsNew += "<li>" + tr( "Use layer names instead of ids in drop down list when loading value maps from layers." ) + "</li>";
2070-
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>";
2071-
whatsNew += "<li>" + tr( "Support searching for NULL in attribute table." ) + "</li>";
2072-
whatsNew += "<li>" + tr( "Attribute editing improvements" );
2073-
whatsNew += "<ul>";
2074-
whatsNew += "<li>" + tr( "Improved interactive attribute editing in table (adding/deleting features, attribute update)." ) + "</li>";
2075-
whatsNew += "<li>" + tr( "Allow adding of geometryless features." ) + "</li>";
2076-
whatsNew += "<li>" + tr( "Fixed attribute undo/redo." ) + "</li></ul></li>";
2077-
whatsNew += "<li>" + tr( "Improved attribute handling." );
2078-
whatsNew += "<ul>";
2079-
whatsNew += "<li>" + tr( "Optionally re-use entered attribute values for next digitized feature." ) + "</li>";
2080-
whatsNew += "<li>" + tr( "Allow merging/assigning attribute values to a set of features." ) + "</li></ul></li>";
2081-
whatsNew += "<li>" + tr( "Allow OGR 'save as' without attributes (for eg. DGN/DXF)." ) + "</li>";
2082-
whatsNew += "</ul>";
2083-
whatsNew += "<h3>" + tr( "Api and Developer Centric" ) + "</h3>";
2084-
whatsNew += "<ul>";
2085-
whatsNew += "<li>" + tr( "Refactored attribute dialog calls to QgsFeatureAttribute." ) + "</li>";
2086-
whatsNew += "<li>" + tr( "Added QgsVectorLayer::featureAdded signal." ) + "</li>";
2087-
whatsNew += "<li>" + tr( "Layer menu function added." ) + "</li>";
2088-
whatsNew += "<li>" + tr( "Added option to load c++ plugins from user "
2089-
" specified directories. Requires application restart to activate." ) +
2090-
"</li>";
2091-
whatsNew += "<li>" + tr( "Completely new geometry checking tool for fTools. Significantly faster, "
2092-
"more relevant error messages, and now supports zooming to errors. "
2093-
"See the new QgsGeometry.validateGeometry function" ) + "</li>";
2094-
whatsNew += "</ul>";
2095-
whatsNew += "<h3>" + tr( "QGIS Mapserver" ) + "</h3>";
2096-
whatsNew += "<ul>";
2097-
whatsNew += "<li>" + tr( "Ability to specify wms service capabilities in the properties "
2098-
"section of the project file (instead of wms_metadata.xml file)." ) + "</li>";
2099-
whatsNew += "<li>" + tr( "Support for wms printing with GetPrint-Request." ) + "</li>";
2100-
whatsNew += "</ul>";
2101-
whatsNew += "<h3>" + tr( "Plugins" ) + "</h3>";
2102-
whatsNew += "<ul>";
2103-
whatsNew += "<li>" + tr( "Support for icons of plugins in the plugin manager dialog." ) + "</li>";
2104-
whatsNew += "<li>" + tr( "Removed quickprint plugin - use easyprint plugin rather from plugin repo." ) + "</li>";
2105-
whatsNew += "<li>" + tr( "Removed ogr converter plugin - use 'save as' context menu rather." ) + "</li>";
2106-
whatsNew += "</ul>";
2107-
whatsNew += "<h3>" + tr( "Printing" ) + "</h3>";
2108-
whatsNew += "<ul>";
2109-
whatsNew += "<li>" + tr( "Undo/Redo support for the print composer" ) + "</li>";
2110-
whatsNew += "</ul>";
2111-
whatsNew += "</body></html>";
2112-
2113-
abt->setWhatsNew( whatsNew );
2114-
2115-
QApplication::restoreOverrideCursor();
21162013
}
21172014
abt->show();
21182015
abt->raise();
@@ -4693,12 +4590,25 @@ void QgisApp::checkQgisVersion()
46934590
QApplication::setOverrideCursor( Qt::WaitCursor );
46944591

46954592
QNetworkReply *reply = QgsNetworkAccessManager::instance()->get( QNetworkRequest( QUrl( "http://qgis.org/version.txt" ) ) );
4593+
op.get(); */
46964594
connect( reply, SIGNAL( finished() ), this, SLOT( versionReplyFinished() ) );
4595+
mSocket = new QTcpSocket( this );
4596+
connect( mSocket, SIGNAL( connected() ), SLOT( socketConnected() ) );
4597+
connect( mSocket, SIGNAL( connectionClosed() ), SLOT( socketConnectionClosed() ) );
4598+
connect( mSocket, SIGNAL( readyRead() ), SLOT( socketReadyRead() ) );
4599+
connect( mSocket, SIGNAL( error( QAbstractSocket::SocketError ) ),
4600+
SLOT( socketError( QAbstractSocket::SocketError ) ) );
4601+
mSocket->connectToHost( "qgis.org", 80 );
46974602
}
46984603

46994604
void QgisApp::versionReplyFinished()
47004605
{
47014606
QApplication::restoreOverrideCursor();
4607+
QTextStream os( mSocket );
4608+
mVersionMessage = "";
4609+
// send the qgis version string
4610+
// os << QGIS_VERSION << "\r\n";
4611+
os << "GET /version.txt HTTP/1.0\n\n";
47024612

47034613
QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
47044614
if ( !reply )

‎src/app/qgsabout.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ void QgsAbout::init()
216216
QgsDebugMsg( QString( "translatorHTML:%1" ).arg( translatorHTML.toAscii().constData() ) );
217217
QgsDebugMsg( QString( "txtTranslators:%1" ).arg( txtTranslators->toHtml().toAscii().constData() ) );
218218
}
219+
setWhatsNew();
219220
}
220221

221222
void QgsAbout::setVersion( QString v )
@@ -225,12 +226,12 @@ void QgsAbout::setVersion( QString v )
225226
txtVersion->setHtml( v );
226227
}
227228

228-
void QgsAbout::setWhatsNew( QString txt )
229+
void QgsAbout::setWhatsNew( )
229230
{
230231
QString myStyle = QgsApplication::reportStyleSheet();
231232
txtWhatsNew->clear();
232233
txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
233-
txtWhatsNew->setHtml( txt );
234+
txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/changelog.html" );
234235
}
235236

236237
void QgsAbout::setPluginInfo()

‎src/app/qgsabout.h

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

3231
private:
32+
void setWhatsNew( );
3333
void setPluginInfo();
3434
void init();
3535
void openUrl( QString url );

‎src/ui/qgsabout.ui

+1-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>

0 commit comments

Comments
 (0)