Skip to content
Permalink
Browse files

[auth] Remove Authentication action from Settings menu

  • Loading branch information
dakcarto committed Sep 24, 2015
1 parent ee5e120 commit b6459b06f1fc53ae698472f014b636c77e414772
Showing with 0 additions and 21 deletions.
  1. +0 −8 src/app/qgisapp.cpp
  2. +0 −3 src/app/qgisapp.h
  3. +0 −10 src/ui/qgisapp.ui
@@ -563,7 +563,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
QgsAuthManager::instance()->init( QgsApplication::pluginPath() );
if ( QgsAuthManager::instance()->isDisabled() )
{
mActionAuthentication->setEnabled( false );
QMessageBox::warning( this, tr( "Authentication System" ),
QgsAuthManager::instance()->disabledMessage() + "\n\n" +
tr( "Resources authenticating via the system can not be accessed." ) );
@@ -1252,8 +1251,6 @@ void QgisApp::createActions()
connect( mActionExit, SIGNAL( triggered() ), this, SLOT( fileExit() ) );
connect( mActionDxfExport, SIGNAL( triggered() ), this, SLOT( dxfExport() ) );

connect( mActionAuthentication, SIGNAL( triggered() ), this, SLOT( editAuthenticationConfigs() ) );

// Edit Menu Items

connect( mActionUndo, SIGNAL( triggered() ), mUndoWidget, SLOT( undo() ) );
@@ -10646,11 +10643,6 @@ void QgisApp::masterPasswordSetup()
this, SLOT( eraseAuthenticationDatabase() ) );
}

void QgisApp::editAuthenticationConfigs()
{
showOptionsDialog( this, QString( "mOptionsPageAuth" ) );
}

void QgisApp::eraseAuthenticationDatabase()
{
// First check if now is a good time to interact with the user, e.g. project is done loading.
@@ -620,9 +620,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
#endif
void namRequestTimedOut( QNetworkReply *reply );

//! Open authentication configs editor (in Options)
void editAuthenticationConfigs();

//! Schedule and erase of the authentication database upon confirmation
void eraseAuthenticationDatabase();

@@ -218,7 +218,6 @@
<addaction name="mActionConfigureShortcuts"/>
<addaction name="mActionCustomization"/>
<addaction name="mActionOptions"/>
<addaction name="mActionAuthentication"/>
<addaction name="mActionSnappingOptions"/>
</widget>
<widget class="QMenu" name="mRasterMenu">
@@ -2377,15 +2376,6 @@ Acts on currently active editable layer</string>
<string>Add circular string by radius</string>
</property>
</action>
<action name="mActionAuthentication">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/locked.svg</normaloff>:/images/themes/default/locked.svg</iconset>
</property>
<property name="text">
<string>Authentication...</string>
</property>
</action>
</widget>
<resources>
<include location="../../images/images.qrc"/>

0 comments on commit b6459b0

Please sign in to comment.
You can’t perform that action at this time.