[QGIS Commit] r15378 - in trunk/qgis: cmake_templates src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Mar 7 02:34:23 EST 2011
Author: jef
Date: 2011-03-06 23:34:23 -0800 (Sun, 06 Mar 2011)
New Revision: 15378
Modified:
trunk/qgis/cmake_templates/qgsconfig.h.in
trunk/qgis/src/app/qgisapp.cpp
Log:
- use online API documentation, when no local is found
- remove "set layer CRS" from toolbar
Modified: trunk/qgis/cmake_templates/qgsconfig.h.in
===================================================================
--- trunk/qgis/cmake_templates/qgsconfig.h.in 2011-03-07 07:17:27 UTC (rev 15377)
+++ trunk/qgis/cmake_templates/qgsconfig.h.in 2011-03-07 07:34:23 UTC (rev 15378)
@@ -32,7 +32,5 @@
#cmakedefine HAVE_PYTHON
-#cmakedefine WITH_APIDOC
-
#endif
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2011-03-07 07:17:27 UTC (rev 15377)
+++ trunk/qgis/src/app/qgisapp.cpp 2011-03-07 07:34:23 UTC (rev 15378)
@@ -1257,13 +1257,9 @@
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );
-#ifdef WITH_APIDOC
mActionHelpAPI = new QAction( getThemeIcon( "mActionHelpAPI.png" ), tr( "API documentation" ), this );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
- mActionHelpAPI->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html" ).exists() );
-#endif
-
mActionQgisHomePage = new QAction( getThemeIcon( "mActionQgisHomePage.png" ), tr( "QGIS Home Page" ), this );
#ifndef Q_WS_MAC
shortcuts->registerAction( mActionQgisHomePage, tr( "Ctrl+H", "QGIS Home Page" ) );
@@ -1699,9 +1695,7 @@
mHelpMenu = menuBar()->addMenu( tr( "&Help" ) );
mHelpMenu->addAction( mActionHelpContents );
-#ifdef WITH_APIDOC
mHelpMenu->addAction( mActionHelpAPI );
-#endif
mActionHelpSeparator1 = mHelpMenu->addSeparator();
mHelpMenu->addAction( mActionQgisHomePage );
@@ -1748,7 +1742,6 @@
mLayerToolBar->addAction( mActionAddWmsLayer );
mLayerToolBar->addAction( mActionNewVectorLayer );
mLayerToolBar->addAction( mActionRemoveLayer );
- mLayerToolBar->addAction( mActionSetLayerCRS );
//commented out for QGIS 1.4 by Tim
//mLayerToolBar->addAction( mActionAddToOverview );
//mLayerToolBar->addAction( mActionShowAllLayers );
@@ -1917,9 +1910,6 @@
mHelpToolBar = addToolBar( tr( "Help" ) );
mHelpToolBar->setObjectName( "Help" );
mHelpToolBar->addAction( mActionHelpContents );
-#ifdef WITH_APIDOC
- mHelpToolBar->addAction( mActionHelpAPI );
-#endif
mHelpToolBar->addAction( QWhatsThis::createAction() );
mToolbarMenu->addAction( mHelpToolBar->toggleViewAction() );
@@ -2143,9 +2133,6 @@
mActionOptions->setIcon( getThemeIcon( "/mActionOptions.png" ) );
mActionConfigureShortcuts->setIcon( getThemeIcon( "/mActionOptions.png" ) );
mActionHelpContents->setIcon( getThemeIcon( "/mActionHelpContents.png" ) );
-#ifdef WITH_APIDOC
- mActionHelpAPI->setIcon( getThemeIcon( "/mActionHelpAPI.png" ) );
-#endif
mActionLocalHistogramStretch->setIcon( getThemeIcon( "/mActionLocalHistogramStretch.png" ) );
mActionQgisHomePage->setIcon( getThemeIcon( "/mActionQgisHomePage.png" ) );
mActionAbout->setIcon( getThemeIcon( "/mActionHelpAbout.png" ) );
@@ -5661,7 +5648,14 @@
void QgisApp::apiDocumentation()
{
- openURL( "api/index.html" );
+ if( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html" ).exists() )
+ {
+ openURL( "api/index.html" );
+ }
+ else
+ {
+ openURL( "http://qgis.org/api/", false );
+ }
}
void QgisApp::helpQgisHomePage()
More information about the QGIS-commit
mailing list