sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

- use online API documentation, when no local is found

Browse Source 
- remove "set layer CRS" from toolbar


git-svn-id: http://svn.osgeo.org/qgis/trunk@15378 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2011-03-07 07:34:23 +00:00
parent 60bbe12585
commit 4254fcc5e6
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake_templates/qgsconfig.h.in
View File

@ -32,7 +32,5 @@
#cmakedefine HAVE_PYTHON #cmakedefine HAVE_PYTHON
#cmakedefine WITH_APIDOC
#endif #endif

22
src/app/qgisapp.cpp
View File

@ -1257,12 +1257,8 @@ void QgisApp::createActions()
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) ); connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() ); mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );
#ifdef WITH_APIDOC
mActionHelpAPI = new QAction( getThemeIcon( "mActionHelpAPI.png" ), tr( "API documentation" ), this ); mActionHelpAPI = new QAction( getThemeIcon( "mActionHelpAPI.png" ), tr( "API documentation" ), this );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) ); 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 ); mActionQgisHomePage = new QAction( getThemeIcon( "mActionQgisHomePage.png" ), tr( "QGIS Home Page" ), this );
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
@ -1699,9 +1695,7 @@ void QgisApp::createMenus()
mHelpMenu = menuBar()->addMenu( tr( "&Help" ) ); mHelpMenu = menuBar()->addMenu( tr( "&Help" ) );
mHelpMenu->addAction( mActionHelpContents ); mHelpMenu->addAction( mActionHelpContents );
#ifdef WITH_APIDOC
mHelpMenu->addAction( mActionHelpAPI ); mHelpMenu->addAction( mActionHelpAPI );
#endif
mActionHelpSeparator1 = mHelpMenu->addSeparator(); mActionHelpSeparator1 = mHelpMenu->addSeparator();
mHelpMenu->addAction( mActionQgisHomePage ); mHelpMenu->addAction( mActionQgisHomePage );
@ -1748,7 +1742,6 @@ void QgisApp::createToolBars()
mLayerToolBar->addAction( mActionAddWmsLayer ); mLayerToolBar->addAction( mActionAddWmsLayer );
mLayerToolBar->addAction( mActionNewVectorLayer ); mLayerToolBar->addAction( mActionNewVectorLayer );
mLayerToolBar->addAction( mActionRemoveLayer ); mLayerToolBar->addAction( mActionRemoveLayer );
mLayerToolBar->addAction( mActionSetLayerCRS );
//commented out for QGIS 1.4 by Tim //commented out for QGIS 1.4 by Tim
//mLayerToolBar->addAction( mActionAddToOverview ); //mLayerToolBar->addAction( mActionAddToOverview );
//mLayerToolBar->addAction( mActionShowAllLayers ); //mLayerToolBar->addAction( mActionShowAllLayers );
@ -1917,9 +1910,6 @@ void QgisApp::createToolBars()
mHelpToolBar = addToolBar( tr( "Help" ) ); mHelpToolBar = addToolBar( tr( "Help" ) );
mHelpToolBar->setObjectName( "Help" ); mHelpToolBar->setObjectName( "Help" );
mHelpToolBar->addAction( mActionHelpContents ); mHelpToolBar->addAction( mActionHelpContents );
#ifdef WITH_APIDOC
mHelpToolBar->addAction( mActionHelpAPI );
#endif
mHelpToolBar->addAction( QWhatsThis::createAction() ); mHelpToolBar->addAction( QWhatsThis::createAction() );
mToolbarMenu->addAction( mHelpToolBar->toggleViewAction() ); mToolbarMenu->addAction( mHelpToolBar->toggleViewAction() );
@ -2143,9 +2133,6 @@ void QgisApp::setTheme( QString theThemeName )
mActionOptions->setIcon( getThemeIcon( "/mActionOptions.png" ) ); mActionOptions->setIcon( getThemeIcon( "/mActionOptions.png" ) );
mActionConfigureShortcuts->setIcon( getThemeIcon( "/mActionOptions.png" ) ); mActionConfigureShortcuts->setIcon( getThemeIcon( "/mActionOptions.png" ) );
mActionHelpContents->setIcon( getThemeIcon( "/mActionHelpContents.png" ) ); mActionHelpContents->setIcon( getThemeIcon( "/mActionHelpContents.png" ) );
#ifdef WITH_APIDOC
mActionHelpAPI->setIcon( getThemeIcon( "/mActionHelpAPI.png" ) );
#endif
mActionLocalHistogramStretch->setIcon( getThemeIcon( "/mActionLocalHistogramStretch.png" ) ); mActionLocalHistogramStretch->setIcon( getThemeIcon( "/mActionLocalHistogramStretch.png" ) );
mActionQgisHomePage->setIcon( getThemeIcon( "/mActionQgisHomePage.png" ) ); mActionQgisHomePage->setIcon( getThemeIcon( "/mActionQgisHomePage.png" ) );
mActionAbout->setIcon( getThemeIcon( "/mActionHelpAbout.png" ) ); mActionAbout->setIcon( getThemeIcon( "/mActionHelpAbout.png" ) );
@ -5661,7 +5648,14 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation() 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() void QgisApp::helpQgisHomePage()