Fix name of release notes.

This should avoid the common but harmless exception "ValueError: IV must be 16 bytes long while decrypting the password."

.gitignore

@@ -1,31 +1,41 @@
+*.autosave
 *.db
+*.diff
+*.o
+*.patch
+*.psp
 *.pyc
 *.pyo
-*.o
-*.psp
-_build
-build-*
+*.swo
+*.swp
 .DS_Store
 .idea
+.vscode
+/dist
+/docker-build
+/mac-build
+/pip-build
+/src-build
+/win-build
+_build
+build-*
+pgadmin4.log
+pkg/win32/installer.iss
+pkg/mac/codesign.conf
+pkg/mac/framework.conf
 runtime/.qmake.cache
+runtime/.qmake.stash
 runtime/Makefile
+runtime/Makefile.Debug
+runtime/Makefile.Release
 runtime/moc_BrowserWindow.cpp
 runtime/moc_Server.cpp
 runtime/pgAdmin4.app/
 runtime/pgAdmin4.pro.user*
+runtime/pgAdmin4_resource.rc
+runtime/release/
 runtime/ui_BrowserWindow.h
-runtime/.qmake.stash
 web/config_local.py
 web/regression/test_config.json
-pgadmin4.log
-*.swp
-*.swo
-/mac-build
-/src-build
-/pip-build
-/dist
-pkg/win32/win-build
-pkg/win32/installer.iss
-runtime/Makefile.Debug
-runtime/Makefile.Release
-runtime/release/
+node_modules/
+web/pgAdmin/static/js/generated

LICENSE

@@ -1,19 +1,19 @@
-pgAdmin 4
-
-Copyright (c) 2013 - 2016, The pgAdmin Development Team
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement is
-hereby granted, provided that the above copyright notice and this paragraph and
-the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE PGADMIN DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
-PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-THE PGADMIN DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE PGADMIN DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
-THE PGADMIN DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+pgAdmin 4
+
+Copyright (C) 2013 - 2018, The pgAdmin Development Team
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement is
+hereby granted, provided that the above copyright notice and this paragraph and
+the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE PGADMIN DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
+PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+THE PGADMIN DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE PGADMIN DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
+THE PGADMIN DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

Make-MinGW.bat

@@ -0,0 +1,497 @@
+@ECHO off
+SETLOCAL
+REM
+REM ****************************************************************
+SET WD=%CD%
+SET "PGBUILDPATH=%WD%\win-build"
+SET CMDOPTION=""
+IF "%1" == "clean"  SET CMDOPTION="VALID"
+IF "%1" == "x86"    SET CMDOPTION="VALID"
+
+IF NOT %CMDOPTION%=="VALID"  ( GOTO USAGE )
+SET ARCHITECTURE=%1
+
+IF "%ARCHITECTURE%"=="clean" (
+    GOTO CLEAN_RELEASE
+    GOTO EXIT
+)
+
+REM Main Functions
+
+CALL :SET_PGADMIN4_ENVIRONMENT
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :VALIDATE_ENVIRONMENT
+
+CALL :CLEAN_RELEASE
+
+CALL :CREATE_VIRTUAL_ENV
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :CREATE_RUNTIME_ENV
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :CREATE_PYTHON_ENV
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :CLEANUP_ENV
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :CREATE_INSTALLER
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :SIGN_INSTALLER
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CD %WD%
+GOTO EXIT
+REM Main function Ends
+
+:CLEAN_RELEASE
+    ECHO Calling clean target...
+    IF EXIST "%PGBUILDPATH%" rd "%PGBUILDPATH%" /S /Q
+
+    FOR /R "%WD%" %%f in (*.pyc *.pyo) do DEL /q "%%f" > nul
+    IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q
+    IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul
+    CD %WD%
+    GOTO:eof
+
+:SET_PGADMIN4_ENVIRONMENT
+    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
+    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
+    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
+    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\9.6"
+    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
+    IF "%YARNDIR%" == ""       SET "YARNDIR=C:\Program Files\Yarn"
+    IF "%NODEJSDIR%" == ""     SET "NODEJSDIR=C:\Program Files\nodejs"
+    IF "%VCDIR%" == ""         SET "VCDIR=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
+    IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
+    IF "%SIGNTOOL%" == ""      SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
+    SET "VCREDISTNAME=vcredist_x86.exe"
+
+    GOTO:eof
+
+:VALIDATE_ENVIRONMENT
+    REM SET the variables IF not availalbe in windows environment
+    SET "QMAKE=%QTDIR%\bin\qmake.exe"
+    SET "VIRTUALENV=venv"
+    SET "TARGETINSTALLER=%WD%\dist"
+    SET "VCREDIST=%VCDIR%\redist\1033\%VCREDISTNAME%"
+
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_RELEASE=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_REVISION_VERSION=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_SUFFIX_VERSION=%%a
+    REM remove single quote from the string
+    SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=%
+    SET APP_NAME=""
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
+    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
+    
+    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%APP_SUFFIX_VERSION%-%ARCHITECTURE%.exe
+    IF "%APP_SUFFIX_VERSION%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%ARCHITECTURE%.exe
+
+    SET PGADMIN4_VERSION=v%APP_RELEASE%
+    SET PGADMIN4_APP_VERSION=%APP_RELEASE%.%APP_REVISION_VERSION%
+
+    ECHO ****************************************************************
+    ECHO                        S U M M A R Y
+    ECHO ****************************************************************
+    ECHO Target mode = x86
+    ECHO INNOTOOL    = %INNOTOOL%
+    ECHO VCDIR       = %VCDIR%
+    ECHO VCDIST      = %VCREDIST%
+    ECHO SIGNTOOL    = %SIGNTOOL%
+    ECHO QTDIR       = %QTDIR%
+    ECHO QMAKE       = %QMAKE%
+    ECHO QT_VERSION  = %QT_VERSION%
+    ECHO YARNDIR     = %YARNDIR%
+    ECHO NODEJSDIR   = %NODEJSDIR%
+    ECHO BROWSER     = QtWebKit
+    ECHO PYTHON_HOME = %PYTHON_HOME%
+    ECHO PYTHON_DLL  = %PYTHON_DLL%
+    ECHO PGDIR       = %PGDIR%
+    ECHO ****************************************************************
+
+    REM Check IF path SET in enviroments really exist or not ?
+    IF NOT EXIST "%INNOTOOL%"          GOTO err_handle_inno
+    IF NOT EXIST "%VCDIR%"             GOTO err_handle_visualstudio
+    IF NOT EXIST "%VCREDIST%"          GOTO err_handle_visualstudio_dist
+    IF NOT EXIST "%QTDIR%"             GOTO err_handle_qt
+    IF NOT EXIST "%QMAKE%"             GOTO err_handle_qt
+    IF NOT EXIST "%PYTHON_HOME%"       GOTO err_handle_python
+    IF NOT EXIST "%PYTHON_DLL%"        GOTO err_handle_python
+    IF NOT EXIST "%PGDIR%"             GOTO err_handle_pg
+    IF NOT EXIST "%YARNDIR%"           GOTO err_handle_yarn
+    IF NOT EXIST "%NODEJSDIR%"         GOTO err_handle_nodejs
+
+    REM get Python version ex. 2.7.1 will get as 27
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
+    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
+    SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
+
+    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" GOTO err_handle_pythonvirtualenv
+
+    SET PATH=%PGDIR%;%PGDIR%\bin;%QTDIR%\..\..\Tools\mingw530_32\bin;%NODEJSDIR%;%YARNDIR%\bin;%PATH%;
+    GOTO:eof
+
+:CREATE_VIRTUAL_ENV
+    ECHO Creating Virtual Enviroment...
+    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
+
+    CD "%PGBUILDPATH%"
+    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Activating Virtual Enviroment -  %PGBUILDPATH%\%VIRTUALENV%\Scripts\activate...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate"
+    SET PATH=%PGDIR%\bin;%PATH%
+
+    ECHO Installing dependencies...
+    pip install -r "%WD%\requirements.txt"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    pip install sphinx
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Virtual Environment created successfully.
+
+    ECHO Deactivating Virtual Enviroment - %PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate"
+
+    CD %WD%
+    GOTO:eof
+
+:CREATE_RUNTIME_ENV
+    ECHO Compiling source code...
+    MKDIR "%PGBUILDPATH%\runtime" > nul
+
+    REM --- Processing WEB ---
+    CD "%WD%\web"
+
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Install Javascript dependencies
+    call yarn install
+    ECHO Bundle all Javascript
+    call yarn run bundle
+
+    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    REM Clean up .pyc, .pyo, pgadmin4.db, config_local.py
+    ECHO Cleaning up unnecessary files...
+    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f"
+    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f"
+    RD /Q /S "%PGBUILDPATH%\web\regression"
+    RD /Q /S "%PGBUILDPATH%\web\tools"
+    DEL /q "%PGBUILDPATH%\web\pgadmin4.db"
+    DEL /q "%PGBUILDPATH%\web\config_local.py"
+    
+    ECHO Creating config_distro.py
+    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
+    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
+
+    ECHO Activating Virtual Enviroment -  %PGBUILDPATH%\%VIRTUALENV%\Scripts\activate...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate"
+
+    ECHO Building docs...
+    MKDIR "%PGBUILDPATH%\docs\en_US\html"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CD "%WD%\docs\en_US"
+    "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Removing Sphinx
+    pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
+
+    ECHO Fixing backports.csv - adding missing __init__.py
+    type nul >> "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\backports\__init__.py"
+
+    ECHO Assembling runtime environment...
+    CD "%WD%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CALL "%QMAKE%" "DEFINES+=PGADMIN4_USE_WEBKIT"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CALL mingw32-make.exe clean
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CALL mingw32-make.exe
+    IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+    REM Copy binary to Release Folder
+    copy "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime"
+    IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+    REM Copy QT dependences
+    copy "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Sql.dll"    "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Qml.dll"    "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5OpenGL.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Quick.dll"  "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Sensors.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Multimedia.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5WebChannel.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5Positioning.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5PrintSupport.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\Qt5MultimediaWidgets.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    IF %QT_VERSION% GEQ 5.9 (
+        copy "%QTDIR%\bin\Qt5WebKit.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\Qt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ) ELSE (
+        copy "%QTDIR%\bin\libQt5WebKit.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\libQt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    )
+
+    copy "%QTDIR%\bin\icudt57.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\icuin57.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\icuuc57.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\libxml2-2.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\bin\libxslt-1.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    MKDIR "%PGBUILDPATH%\runtime\platforms"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
+    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"
+
+    copy "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    MKDIR "%PGBUILDPATH%\installer"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%VCREDIST%" "%PGBUILDPATH%\installer" > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Runtime built successfully.
+
+    CD %WD%
+    GOTO:eof
+
+:CREATE_PYTHON_ENV
+    copy %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    REM Copy Python interpretor as it's needed to run background processes
+    copy %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime"  > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime"  > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Cleaning up unnecessary files...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f"
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f"
+    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl"
+
+    CD %WD%
+    GOTO:eof
+
+:CREATE_INSTALLER
+    ECHO Preparing for creation of windows installer...
+    IF NOT EXIST "%TARGETINSTALLER%" MKDIR "%TARGETINSTALLER%"
+
+    copy "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CD "%WD%"
+    CD pkg
+    CD win32
+
+    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
+    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%PGADMIN4_APP_VERSION%"""
+    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """%PGADMIN4_VERSION%"""
+
+    set ARCMODE=
+    IF "%ARCHITECTURE%"=="amd64" (
+        set ARCMODE="x64"
+    )
+    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
+    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
+
+
+    DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
+    ECHO Creating windows installer... using INNO tool
+
+    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGETINSTALLER%\%INSTALLERNAME%"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO "Location - %TARGETINSTALLER%\%INSTALLERNAME%"
+    ECHO Installer generated successfully.
+
+    CD %WD%
+    GOTO:eof
+
+:SIGN_INSTALLER
+    ECHO Attempting to sign the installer...
+    "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGETINSTALLER%\%INSTALLERNAME%"
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO
+        ECHO ************************************************************
+        ECHO * Failed to sign the installer
+        ECHO ************************************************************
+        PAUSE
+    )
+
+    CD %WD%
+    GOTO:eof
+
+:CLEANUP_ENV
+    ECHO Cleaning up private environment...
+    rd "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q
+    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json"
+
+    ECHO Cleaned up private environment successfully.
+    CD %WD%
+    GOTO:eof
+
+:err_handle_inno
+    ECHO %INNOTOOL% does not exist
+    ECHO Please Install Innotool and SET INNOTOOL enviroment Variable.
+    ECHO SET "INNOTOOL=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_visualstudio
+    ECHO %VCDIR% does not exist
+    ECHO Please Install Microsoft Visual studio and SET the VCDIR enviroment Variable.
+    ECHO SET "VCDIR=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_visualstudio_dist
+    ECHO %VCREDIST% does not exist
+    ECHO Please Install Microsoft Visual studio and SET the VCDIST enviroment Variable.
+    ECHO SET "VCDIST=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+
+:err_handle_python
+    ECHO %PYTHON_HOME% does not exist, or
+    ECHO PYTHON_VERSION is not SET, or
+    ECHO %PYTHON_DLL% does not exist.
+    ECHO Please install Python and SET the PYTHON_HOME enviroment Variable.
+    ECHO SET "PYTHON_VERSION=<VERSION NUMBER>"
+    ECHO SET "PYTHON_HOME=<PATH>"
+    ECHO SET "PYTHON_DLL=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_qt
+    ECHO %QTDIR% does not exist.
+    ECHO Please Install QT SDK and SET the QTDIR enviroment variable.
+    ECHO SET "QTDIR=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_yarn
+    ECHO %YARNDIR% does not exist.
+	ECHO Please Install YARN and SET the YARNDIR enviroment variable.
+	ECHO SET "YARNDIR=<YARN PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_nodejs
+    ECHO %NODEJSDIR% does not exist.
+	ECHO Please Install NodeJs and SET the NODEJSDIR enviroment variable.
+	ECHO SET "NODEJSDIR=<NODEJS PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_pg
+    ECHO %PGDIR% does not exist.
+    ECHO Please Install Postgres and SET enviroment Variable
+    ECHO SET "PGDIR=<PATH>"
+    exit /B 1
+    GOTO EXIT
+
+:err_handle_pythonvirtualenv
+    ECHO Python virtualenv is missing @ location - %PYTHON_HOME%\Scripts\virtualenv.exe
+    exit /B 1
+    GOTO EXIT
+
+:ERR_HANDLER
+    ECHO.
+    ECHO Aborting build!
+    CD %WD%
+    exit /B 1
+    GOTO EXIT
+
+:USAGE
+    ECHO Invalid command line options....
+    ECHO Usage: "Make.bat <x86 | clean>"
+    ECHO.
+    exit /B 1
+    GOTO EXIT
+
+:EXIT
+

Make.bat

@@ -14,33 +14,38 @@ SET ARCHITECTURE=%1
 
 IF "%ARCHITECTURE%"=="clean" (
     GOTO CLEAN_RELEASE
-    goto:exit
+    GOTO EXIT
 )
 
 REM Main Functions
 
-call :SET_PGADMIN4_ENVIRONMENT
+CALL :SET_PGADMIN4_ENVIRONMENT
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-call :CLEAN_RELEASE
+CALL :VALIDATE_ENVIRONMENT
 
-call :CREATE_VIRTUAL_ENV
+CALL :CLEAN_RELEASE
+
+CALL :CREATE_VIRTUAL_ENV
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-call :CREATE_RUNTIME_ENV
+CALL :CREATE_RUNTIME_ENV
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-call :CREATE_PYTHON_ENV
+CALL :CREATE_PYTHON_ENV
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-call :CLEANUP_ENV
+CALL :CLEANUP_ENV
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-call :CREATE_INSTALLER
+CALL :CREATE_INSTALLER
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+CALL :SIGN_INSTALLER
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
 CD %WD%
-goto:EXIT
+GOTO EXIT
 REM Main function Ends
 
 :CLEAN_RELEASE
@@ -51,7 +56,7 @@ REM Main function Ends
     IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q
     IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul
     CD %WD%
-GOTO:EOF
+    GOTO:eof
 
 :SET_PGADMIN4_ENVIRONMENT
    REM Check os architecture x86 or amd64
@@ -69,29 +74,28 @@ GOTO:EOF
     IF "%OSTYPE%"=="x86" (
         IF "%ARCHITECTURE%"=="amd64" (
             ECHO ARCHITECTURE - %ARCHITECTURE% cannot be run on 32 bit machine
-            goto:exit
+            GOTO EXIT
         )
-        OSVALUE=%OSTYPE%
+        SET OSVALUE=%OSTYPE%
     )
 
     REM Check IF its is windows 32 bit machine and selected architecture is x86
     IF %OSVALUE%=="x86" (
-        IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27123"
+        IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
         IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\System32\python27.dll"
-        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\Qt5.5.1\5.5\msvc2013"
-        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files\PostgreSQL\9.5"
+        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.7\msvc2013"
+        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files\PostgreSQL\9.6"
         IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files\Inno Setup 5"
         IF "%VCDIR%" == ""         SET "VCDIR=C:\Program Files\Microsoft Visual Studio 12.0\VC"
         SET "VCREDISTNAME=vcredist_x86.exe"
-        goto SKIPARCVALIDATION
     )
 
     REM Check IF its is windows 64 bit machine and selected architecture is x86 or amd64
     IF "%ARCHITECTURE%"=="x86" (
         IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
         IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
-        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\Qt5.5.1\5.5\msvc2013"
-        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\9.5"
+        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.7\msvc2013"
+        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\9.6"
         IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
         IF "%VCDIR%" == ""         SET "VCDIR=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
         IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
@@ -101,16 +105,17 @@ GOTO:EOF
     IF "%ARCHITECTURE%"=="amd64" (
         IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27-x64"
         IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\System32\python27.dll"
-        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.5\msvc2013"
-        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files\PostgreSQL\9.5"
+        IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.7\msvc2013"
+        IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files\PostgreSQL\9.6"
         IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files\Inno Setup 5"
         IF "%VCDIR%" == ""         SET "VCDIR=C:\Program Files\Microsoft Visual Studio 12.0\VC"
         IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x64.exe"
         SET "VCREDISTNAME=vcredist_x64.exe"
     )
+    GOTO:eof
 
-:SKIPARCVALIDATION
-    REM SET the variables IF not availalbe in windows enviroment
+:VALIDATE_ENVIRONMENT
+    REM SET the variables IF not availalbe in windows environment
     SET "VCVAR=%VCDIR%\vcvarsall.bat"
     SET "VCNMAKE=%VCDIR%\bin\nmake.exe"
     SET "QMAKE=%QTDIR%\bin\qmake.exe"
@@ -125,8 +130,11 @@ GOTO:EOF
     SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=%
     SET APP_NAME=""
     FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print '%APP_NAME%'.lower().replace(' ', '')"') DO SET APP_SHORTNAME=%%G
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
+    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
+    
     SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%APP_SUFFIX_VERSION%-%ARCHITECTURE%.exe
+    IF "%APP_SUFFIX_VERSION%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%ARCHITECTURE%.exe
 
     SET PGADMIN4_VERSION=v%APP_RELEASE%
     SET PGADMIN4_APP_VERSION=%APP_RELEASE%.%APP_REVISION_VERSION%
@@ -141,6 +149,12 @@ GOTO:EOF
     ECHO NMAKE       = %VCNMAKE%
     ECHO QTDIR       = %QTDIR%
     ECHO QMAKE       = %QMAKE%
+    ECHO QT_VERSION  = %QT_VERSION%
+    IF %QT_VERSION% GEQ 5.5 (
+        ECHO BROWSER     = QtWebEngine
+    ) ELSE (
+        ECHO BROWSER     = QtWebKit
+    )
     ECHO PYTHON_HOME = %PYTHON_HOME%
     ECHO PYTHON_DLL  = %PYTHON_DLL%
     ECHO PGDIR       = %PGDIR%
@@ -159,9 +173,8 @@ GOTO:EOF
     IF NOT EXIST "%PGDIR%"             GOTO err_handle_pg
 
     REM Check for QT and VC dependences
-    FOR /L %%G IN (15,1,19) DO "%VCDIR%\bin\cl.exe" /? 2>&1 | findstr /C:"Version %%G" > nul && SET MSVC_MAJOR_VERSION=%%G && GOTO QT_MSVC
+    FOR /L %%G IN (15,1,19) DO "%VCDIR%\bin\cl.exe" /? 2>&1 | findstr /C:"Version %%G" > nul && SET MSVC_MAJOR_VERSION=%%G
 
-    :QT_MSVC
     IF %MSVC_MAJOR_VERSION%==19     SET QT_MSVC_PATH=msvc2015
     IF %MSVC_MAJOR_VERSION%==18     SET QT_MSVC_PATH=msvc2013
     IF %MSVC_MAJOR_VERSION%==17     SET QT_MSVC_PATH=msvc2012
@@ -182,19 +195,15 @@ GOTO:EOF
     IF NOT EXIST "%QTDIR%\..\%QT_MSVC_PATH%"       GOTO err_handle_qt_mismatch
 
     REM get Python version ex. 2.7.1 will get as 27
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print sys.version.split(' ')[0]"') DO SET PYTHON_MAJOR=%%G
-    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print sys.version.split(' ')[0]"') DO SET PYTHON_MINOR=%%G
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
+    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
     SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
 
     IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" GOTO err_handle_pythonvirtualenv
 
-    SET REQUIRMENTTXT=""
-    IF "%PYTHON_MAJOR%"=="2" SET REQUIRMENTTXT=requirements_py2.txt
-    IF "%PYTHON_MAJOR%"=="3" SET REQUIRMENTTXT=requirements_py3.txt
-    IF %REQUIRMENTTXT% == ""           GOTO err_handle_pythonversion
     SET PATH=%PGDIR%;%PGDIR%\bin;%PATH%
-goto:EXIT
 
+    GOTO:eof
 
 :CREATE_VIRTUAL_ENV
     ECHO Creating Virtual Enviroment...
@@ -209,80 +218,92 @@ goto:EXIT
     SET PATH=%PGDIR%\bin;%PATH%
 
     ECHO Installing dependencies...
-    pip install -r "%WD%\%REQUIRMENTTXT%"
+    pip install -r "%WD%\requirements.txt"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     pip install sphinx
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    ECHO Virtual Enviroment created successfully.
+    ECHO Virtual Environment created successfully.
 
     ECHO Deactivating Virtual Enviroment - %PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate...
     CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate"
 
     CD %WD%
-GOTO:EOF
+    GOTO:eof
 
 :CREATE_RUNTIME_ENV
     ECHO Compiling source code...
     MKDIR "%PGBUILDPATH%\runtime" > nul
 
     REM --- Processing WEB ---
-    CD "%WD%"
-    CD web
+    CD "%WD%\web"
+
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    ECHO Install Javascript dependencies
+    call yarn install
+    ECHO Bundle all Javascript
+    call yarn run bundle
+
     XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
     REM Clean up .pyc, .pyo, pgadmin4.db, config_local.py
     ECHO Cleaning up unnecessary files...
     FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f"
+    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f"
+    RD /Q /S "%PGBUILDPATH%\web\regression"
+    RD /Q /S "%PGBUILDPATH%\web\tools"
     DEL /q "%PGBUILDPATH%\web\pgadmin4.db"
     DEL /q "%PGBUILDPATH%\web\config_local.py"
     
     ECHO Creating config_distro.py
     ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
     ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO MINIFY_HTML = False >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
 
-    ECHO Creating config_local.py
-    ECHO # Add any configuration changes to this file. > "%PGBUILDPATH%\web\config_local.py"
+    ECHO Activating Virtual Enviroment -  %PGBUILDPATH%\%VIRTUALENV%\Scripts\activate...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate"
 
     ECHO Building docs...
     MKDIR "%PGBUILDPATH%\docs\en_US\html"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CD "%WD%\docs\en_US"
+    "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
     "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
     ECHO Removing Sphinx
-    pip uninstall -y sphinx
+    pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
+
+    ECHO Fixing backports.csv - adding missing __init__.py
+    type nul >> "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\backports\__init__.py"
 
     ECHO Assembling runtime environment...
-    CD "%WD%"
-    CD runtime
+    CD "%WD%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-    call "%VCVAR%" %ARCHITECTURE%
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    ECHO Calling -  call "%VCVAR%" %ARCHITECTURE%
-
-    call "%QMAKE%"
+    CALL "%VCVAR%" %ARCHITECTURE%
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-    call "%VCNMAKE%" clean
+    CALL "%QMAKE%"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-    call "%VCNMAKE%"
+    CALL "%VCNMAKE%" clean
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    CALL "%VCNMAKE%"
     IF ERRORLEVEL 1 GOTO ERR_HANDLER
     REM Copy binary to Release Folder
     copy "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime"
     IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
-    REM Copy QTP dependences
-    copy "%QTDIR%\bin\icudt54.dll"   "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\icuin54.dll"   "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\icuuc54.dll"   "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    REM Copy QT dependences
     copy "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5Sql.dll"    "%PGBUILDPATH%\runtime"
@@ -299,8 +320,6 @@ GOTO:EOF
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\Qt5WebKit.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5Multimedia.dll" "%PGBUILDPATH%\runtime"
@@ -311,10 +330,68 @@ GOTO:EOF
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5PrintSupport.dll" "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\Qt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%QTDIR%\bin\Qt5MultimediaWidgets.dll" "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+    REM Install the appropriate browser components. We use QtWebEngine with Qt 5.5+
+    IF %QT_VERSION% GEQ 5.7 (
+        copy "%QTDIR%\bin\Qt5QuickWidgets.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    )
+
+    IF %QT_VERSION% GEQ 5.7 (
+        copy "%QTDIR%\resources\icudtl.dat" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\resources\qtwebengine_resources.pak" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\resources\qtwebengine_devtools_resources.pak" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\resources\qtwebengine_resources_100p.pak" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\resources\qtwebengine_resources_200p.pak" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\Qt5WebEngine.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\Qt5WebEngineCore.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\Qt5WebEngineWidgets.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\QtWebEngineProcess.exe" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        copy "%QTDIR%\bin\opengl32sw.dll" "%PGBUILDPATH%\runtime"
+        IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ) ELSE (
+        IF %QT_VERSION% GEQ 5.5 (
+            copy "%QTDIR%\bin\icudt54.dll"   "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\icuin54.dll"   "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\icuuc54.dll"   "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\icudtl.dat" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\qtwebengine_resources.pak" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\qtwebengine_resources_100p.pak" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\qtwebengine_resources_200p.pak" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\Qt5WebEngine.dll" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\Qt5WebEngineCore.dll" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\Qt5WebEngineWidgets.dll" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\QtWebEngineProcess.exe" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        ) ELSE (
+            copy "%QTDIR%\bin\Qt5WebKit.dll" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+            copy "%QTDIR%\bin\Qt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime"
+            IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+        )
+    )
+
     MKDIR "%PGBUILDPATH%\runtime\platforms"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
@@ -333,6 +410,16 @@ GOTO:EOF
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     copy "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    copy "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime"
+    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
     MKDIR "%PGBUILDPATH%\installer"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
@@ -342,7 +429,7 @@ GOTO:EOF
     ECHO Runtime built successfully.
 
     CD %WD%
-GOTO:EOF
+    GOTO:eof
 
 :CREATE_PYTHON_ENV
     copy %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul
@@ -359,8 +446,13 @@ GOTO:EOF
     XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
+    ECHO Cleaning up unnecessary files...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f"
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f"
+    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl"
+
     CD %WD%
-GOTO:EOF
+    GOTO:eof
 
 :CREATE_INSTALLER
     ECHO Preparing for creation of windows installer...
@@ -398,24 +490,37 @@ GOTO:EOF
     ECHO Installer generated successfully.
 
     CD %WD%
-GOTO:EOF
+    GOTO:eof
+
+:SIGN_INSTALLER
+    ECHO Attempting to sign the installer...
+    signtool sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGETINSTALLER%\%INSTALLERNAME%"
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO
+        ECHO ************************************************************
+        ECHO * Failed to sign the installer
+        ECHO ************************************************************
+        SLEEP 5
+    )
+
+    CD %WD%
+    GOTO:eof
 
 :CLEANUP_ENV
     ECHO Cleaning up private environment...
     rd "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q
-    rd "%PGBUILDPATH%\%VIRTUALENV%\Scripts" /S /Q
     DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json"
 
     ECHO Cleaned up private environment successfully.
     CD %WD%
-GOTO:EOF
+    GOTO:eof
 
 :err_handle_inno
     ECHO %INNOTOOL% does not exist
     ECHO Please Install Innotool and SET INNOTOOL enviroment Variable.
     ECHO SET "INNOTOOL=<PATH>"
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_visualstudio
     ECHO %VCDIR% does not exist, or
@@ -426,14 +531,14 @@ goto EXIT
     ECHO SET "VCVAR%=<PATH>"
     ECHO SET "VCNMAKE%=<PATH>"
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_visualstudio_dist
     ECHO %VCREDIST% does not exist
     ECHO Please Install Microsoft Visual studio and SET the VCDIST enviroment Variable.
     ECHO SET "VCDIST%=<PATH>"
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 
 :err_handle_python
@@ -445,14 +550,14 @@ goto EXIT
     ECHO SET "PYTHON_HOME=<PATH>"
     ECHO SET "PYTHON_DLL=<PATH>"
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_qt
     ECHO %QTDIR% does not exist.
     ECHO Please Install QT SDK and SET the QTDIR enviroment variable.
     ECHO SET "QTDIR=<PATH>"
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_qt_mismatch
     ECHO %QTDIR%\..\%QT_MSVC_PATH%" does not match with your current Visual Studio, version %QT_MSVC_PATH%
@@ -460,46 +565,40 @@ goto EXIT
     ECHO Please use a valid QT installation with a folder %QT_MSVC_PATH%. You can use the Qt Maintenance
     ECHO Tool to add or remove compiler kits.
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_qt_compactissue
     ECHO %QTDIR%" does support the current architecture selected %ARCHITECTURE%
     ECHO Please use a valid QT installation with a folder %QT_MSVC_PATH%. You can use the Qt Maintenance
     ECHO Tool to add or remove compiler kits.
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_pg
     ECHO %PGDIR% does not exist.
     ECHO Please Install Postgres and SET enviroment Variable
     ECHO SET "PGDIR=<PATH>"
     exit /B 1
-goto EXIT
-
-:err_handle_pythonversion
-    ECHO Python version supported Above 2.6, 2.xx and 3.xx only
-    exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :err_handle_pythonvirtualenv
     ECHO Python virtualenv is missing @ location - %PYTHON_HOME%\Scripts\virtualenv.exe
     exit /B 1
-goto EXIT
+    GOTO EXIT
 
 :ERR_HANDLER
     ECHO.
     ECHO Aborting build!
     CD %WD%
     exit /B 1
-GOTO:EOF
+    GOTO EXIT
 
 :USAGE
     ECHO Invalid command line options....
     ECHO Usage: "Make.bat <x86 | amd64 | clean>"
     ECHO.
     exit /B 1
-GOTO EXIT
+    GOTO EXIT
 
 :EXIT
-     endlocal
-    exit /B 0
+

Makefile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2016, The pgAdmin Development Team
+# Copyright (C) 2013 - 2018, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -16,34 +16,79 @@ SHELL = /bin/sh
 # Include only platform-independent builds in all
 all: docs pip src
 
-# Include all clean sub-targets in clean
-clean: clean-dist clean-docs clean-pip clean-appbundle clean-src
-
-pip: docs
-	./pkg/pip/build.sh
-
 appbundle: docs
 	./pkg/mac/build.sh
 
-src:
-	./pkg/src/build.sh
+appbundle-webkit: docs
+	PGADMIN4_USE_WEBKIT=1 ./pkg/mac/build.sh
 
-docs:
-	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html
+install-node:
+	cd web && yarn install
 
-clean-pip:
-	rm -rf pip-build/
+bundle:
+	cd web && yarn run bundle
+
+bundle-dev:
+	cd web && yarn run bundle:dev
+
+linter:
+	cd web && yarn run linter
+
+check: install-node bundle linter
+	cd web && yarn run karma start -- --single-run && python regression/runtests.py
+
+check-python:
+	cd web && python regression/runtests.py --exclude feature_tests
+
+check-feature: install-node bundle
+	cd web && python regression/runtests.py --pkg feature_tests
+
+check-js: install-node linter
+	cd web && yarn run karma start -- --single-run
+
+# Include all clean sub-targets in clean
+clean: clean-appbundle clean-docker clean-dist clean-docs clean-pip clean-src
 
 clean-appbundle:
 	rm -rf mac-build/
 
-clean-src:
-	rm -rf src-build/
-
-clean-docs:
-	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx clean
+clean-docker:
+	rm -rf docker-build/
 
 clean-dist:
 	rm -rf dist/
 
+clean-docs:
+	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx clean
+
+clean-pip:
+	rm -rf pip-build/
+
+clean-src:
+	rm -rf src-build/
+
+docker:
+	./pkg/docker/build.sh
+
+docs:
+	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html
+
+docs-pdf:
+	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx latexpdf
+
+msg-compile:
+	cd web && pybabel compile --statistics -d pgadmin/translations
+
+msg-extract:
+	cd web && pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin
+
+msg-update:
+	cd web && pybabel update -i pgadmin/messages.pot -d pgadmin/translations
+
 .PHONY: docs
+
+pip: docs
+	./pkg/pip/build.sh
+
+src:
+	./pkg/src/build.sh

README

@@ -4,38 +4,43 @@ pgAdmin 4
 pgAdmin 4 is a rewrite of the popular pgAdmin3 management tool for the
 PostgreSQL (http://www.postgresql.org) database. 
 
-At present, it is an experimental/proof of concept project. Use at your own
-risk, and don't blame us if it breaks anything!
+In the following documentation and examples, "$PGADMIN4_SRC/" is used to denote
+the top-level directory of a copy of the pgAdmin source tree, either from a
+tarball or a git checkout.
 
 Architecture
 ------------
 
-pgAdmin 4 is being written as a web application in Python, using jQuery and 
-Bootstrap for the client side processing and UI. On the server side, Flask is
-being utilised.
+pgAdmin 4 is written as a web application in Python, using jQuery and Bootstrap
+for the client side processing and UI. On the server side, Flask is being
+utilised.
 
-Although developed using web technologies, we intend for pgAdmin 4 to be usable
-either on a web server using a browser, or standalone on a workstation. The
-runtime/ subdirectory contains a QT based runtime application intended to allow
-this - it is essentially a browser and Python interpretor in one package which
-will be capable of hosting the Python application and presenting it to the user
-as a desktop application.
+Although developed using web technologies, pgAdmin 4 can be deployed either on
+a web server using a browser, or standalone on a workstation. The runtime/
+subdirectory contains a QT based runtime application intended to allow this -
+it is essentially a browser and Python interpreter in one package which is
+capable of hosting the Python application and presenting it to the user as a
+desktop application.
 
-Building
---------
+Building the Runtime
+--------------------
 
 To build the runtime, the following packages must be installed:
 
-- QT 4.6 or above (older versions may work, but haven't been tested).
-- Python 2.6 or above.
+- QT 4.6 or above, up to 5.5 (older versions may work, but haven't been tested,
+  newer versions are not yet supported as Qt Webkit has been deprecated).
+- Python 2.6, 2.7 or 3.3+
 
 Assuming both qmake and python-config are in the path:
 
-$ cd $PGADMIN4_SRC/runtime
-$ qmake
-Project MESSAGE: Building for QT5+...
-$ make
-...
+   $ cd $PGADMIN4_SRC/runtime
+    $ qmake
+    Project MESSAGE: Building for QT5+...
+    Project MESSAGE: Building for Linux/Mac...
+    Project MESSAGE: Using /usr/bin/python-config
+    Project MESSAGE: Python2 detected.
+    $ make
+    ...
 
 To build the runtime in debug mode, use the option below with qmake
 $ qmake CONFIG+=debug
@@ -51,18 +56,276 @@ app bundle called pgAdmin4.app will be created.
 To build the runtime on a Windows system, export PYTHON_HOME and PYTHON_VERSION 
 variables in the System environment. Specify the PYTHON_VERSION with the major 
 and minor number. Do not specify micro level version.
-For example, given a Python version of A.B.C; A - Major number, B - Minor number, 
-C - Micro level (Bug fix releases).
 
-If Python version is 2.7.2 than specify PYTHON_VERSION=27
+For example, given a Python version of A.B.C; A - Major number, B - Minor
+number, C - Micro level (Bug fix releases).
+
+If Python version is 2.7.12 than specify PYTHON_VERSION=27
 
  e.g. PYTHON_HOME=C:\Python27\
       PYTHON_VERSION=27
 
+You can also use Qt Creator to build, develop and debug the runtime. Simply
+open the $PGADMIN4_SRC/runtime/pgAdmin4.pro project file in Qt Creator and
+configure the project with a supported version of Qt when prompted.
+
+Create Database Migrations
+--------------------------
+
+In order to make changes to the SQLite DB, navigate to the 'web' directory:
+
+(pgadmin4) $ cd $PGADMIN4_SRC/web
+
+Create a migration file with the following command:
+
+(pgadmin4) $ FLASK_APP=pgAdmin4.py flask db revision
+
+This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
+Add any changes to the 'upgrade' function.
+
+There is no need to increment the SETTINGS_SCHEMA_VERSION.
+
+Configuring the Python Environment
+----------------------------------
+
+In order to run the Python code, a suitable runtime environment is required.
+Python versions - Python 2.6, 2.7 or 3.3+ are currently supported. It is
+recommended that a Python Virtual Environment is setup for this purpose,
+rather than using the system Python environment. On Linux and Mac systems, the
+process is fairly simple - adapt as required for your distribution:
+
+1) Install the virtualenv packages into the system Python environment
+
+    $ sudo pip install virtualenv virtualenvwrapper
+
+2) Source the virtualenv wrapper tools script. You may want to add this command
+   to your ~/.bash_profile file for future convenience:
+
+    $ source /usr/local/bin/virtualenvwrapper.sh
+
+3) Create a virtual environment:
+
+    $ mkvirtualenv pgadmin4
+
+   To make use of the virtual environment in the future, use the following
+   command to re-activate it:
+
+    $ workon pgadmin4
+
+4) Ensure that a PostgreSQL installation's bin/ directory is in the path (so
+   pg_config can be found for building psycopg2), and install the required
+   packages:
+
+    (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
+
+   If you are planning to run the regression tests, you also need to install
+   additional requirements from web/regression/requirements.txt:
+
+   (pgadmin4) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
+
+5) Create a local configuration file for pgAdmin. Edit
+   $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
+   (use the config.py file as a reference - any settings duplicated in
+   config_local.py will override those in config.py). A typical development
+   configuration may look like:
+
+    from config import *
+
+    # Debug mode
+    DEBUG = True
+
+    # App mode
+    SERVER_MODE = True
+
+    # Enable the test module
+    MODULE_BLACKLIST.remove('test')
+
+    # Log
+    CONSOLE_LOG_LEVEL = DEBUG
+    FILE_LOG_LEVEL = DEBUG
+
+    DEFAULT_SERVER = '127.0.0.1'
+
+    UPGRADE_CHECK_ENABLED = True
+
+    # Use a different config DB for each server mode.
+    if SERVER_MODE == False:
+        SQLITE_PATH = os.path.join(
+            DATA_DIR,
+            'pgadmin4-desktop.db'
+        )
+    else:
+        SQLITE_PATH = os.path.join(
+            DATA_DIR,
+            'pgadmin4-server.db'
+        )
+
+   This configuration allows easy switching between server and desktop modes
+   for testing.
+
+6) The initial setup of the configuration database is interactive in server
+   mode,  and non-interactive in desktop mode. You can run it either by
+   running:
+
+    (pgadmin4) $ python $PGADMIN4_SRC/web/setup.py
+
+   or by starting pgAdmin 4:
+
+    (pgadmin4) $ python $PGADMIN4_SRC/web/pgAdmin4.py
+
+   Whilst it is possible to automatically run setup in desktop mode by running
+   the runtime, that will not work in server mode as the runtime doesn't allow
+   command line interaction with the setup program.
+
+At this point you will be able to run pgAdmin 4 from the command line in either
+server or desktop mode, and access it from a web browser using the URL shown in
+the terminal once pgAdmin has started up.
+
+Setup of an environment on Windows is somewhat more complicated unfortunately,
+largely due to the lack of a native compiler toolset. Thankfully, Microsoft
+supply a free compiler specifically for Python 2.7 users. Download and install
+it from:
+
+https://www.microsoft.com/en-gb/download/details.aspx?id=44266
+
+A blog detailing the setup of Virtual Environments on Windows can be found
+here:
+
+http://www.tylerbutler.com/2012/05/how-to-install-python-pip-and-virtualenv-on-windows-with-powershell/
+
+Once a virtual environment has been created and enabled, setup can continue
+from step 4 above.
+
+Building the Web Assets
+-----------------------
+
+pgAdmin is dependent on a number of third party Javascript libraries. These,
+along with it's own Javascript code, SCSS/CSS code and images must be
+compiled into a "bundle" which is transferred to the browser for execution
+and rendering. This is far more efficient than simply requesting each
+asset as it's needed by the client.
+
+To create the bundle, you will need the 'yarn' package management tool to be
+installed. Then, you can run the following commands on a *nix system to
+download the required packages and build the bundle:
+
+    (pgadmin4) $ cd $PGADMIN4_SRC
+    (pgadmin4) $ make node-install
+    (pgadmin4) $ make bundle
+
+On Windows systems (where "make" is not available, the following commands
+can be used:
+
+    C:\> cd $PGADMIN4_SRC\web
+    C:\$PGADMIN4_SRC\web> yarn install
+    C:\$PGADMIN4_SRC\web> yarn run bundle
+
+Configuring the Runtime
+-----------------------
+
+The pgAdmin 4 Runtime maintains it's own Python Path to avoid conflicts with
+packages or other issues in the system Python installation. It will also search
+a number of known locations for the pgAdmin4.py file needed to run pgAdmin
+(including relative locations in a source code tree), however you can specify
+an alternate path if needed.
+
+If either a working environment or pgAdmin4.py cannot be found at startup, the
+runtime will prompt for the locations. Alternatively, you can use Alt+Shift+P
+to open the path configuration dialogue.
+
+On a Linux/Mac system, the Python Path will typically consist of a single path
+to the virtual environment's site-packages directory, e.g.
+
+    /Users/<USERNAME>/.virtualenvs/pgadmin4/lib/python2.7/site-packages
+
+On Windows, multiple paths are likely to be required, e.g.
+
+    C:\Users\dpage\.virtualenvs\pgadmin4\Lib\site-packages;C:\Users\dpage\.virtualenvs\pgadmin4\Lib;C:\Users\dpage\.virtualenvs\pgadmin4\Lib\lib-tk;C:\Users\dpage\.virtualenvs\pgadmin4\DLLs
+
+If you wish to specify a specific copy of the Python code to run, you can set
+the  Application Path to a directory containing pgAdmin4.py, e.g.
+
+    /Users/<USERNAME>/git/pgadmin4-test/web/
+
+Building the documentation
+--------------------------
+
+In order to build the docs, an additional Python package is required in the
+virtual environment. This can be installed with the pip package manager:
+
+    $ workon pgadmin4
+    (pgadmin4) $ pip install Sphinx
+
+The docs can then be built using the Makefile in $PGADMIN4_SRC, e.g.
+
+    (pgadmin4) $ make docs
+
+The output can be found in $PGADMIN4_SRC/docs/en_US/_build/html/index.html
+
+Building packages
+-----------------
+
+Most packages can be built using the Makefile in $PGADMIN4_SRC, provided all
+the setup and configuration above has been completed.
+
+To build a source tarball:
+
+    (pgadmin4) $ make src
+
+To build a PIP Wheel, activate either a Python 2 or Python 3 virtual
+environment as desired, configured with all the required packages, and then
+run:
+
+    (pgadmin4) $ make pip
+
+On a Mac, build an application bundle in a disk image (DMG file) with:
+
+    (pgadmin4) $ make appbundle
+
+Configure the framework.conf to match the QT and Python versions the app is
+being built with:
+
+    $ cp $PGADMIN4_SRC/pkg/mac/framework.conf.in $PGADMIN4_SRC/pkg/mac/framework.conf
+    $ vi $PGADMIN4_SRC/pkg/mac/framework.conf
+
+If you have an Apple code signing certificate, both the app bundle and disk
+image can be automatically signed by configuring signing:
+
+    $ cp $PGADMIN4_SRC/pkg/mac/codesign.conf.in $PGADMIN4_SRC/pkg/mac/codesign.conf
+    $ vi $PGADMIN4_SRC/pkg/mac/codesign.conf
+
+Edit the file as appropriate, ensuring the various version numbers are correct
+and that the appropriate developer ID is specified.
+
+On Windows, the InnoSetup tool is required to create an installer. Download the
+Unicode version from:
+
+http://www.jrsoftware.org/isdl.php
+
+A number of environment variables may need to be set to enable the build script
+to function. The defaults will usually work on a typical 64 bit system with
+Qt 5.5.1, Python 2.7 and Visual Studio 2013. The examples below are for a
+similar 32 bit system:
+
+INNOTOOL=C:\Program Files\Inno Setup 5
+PGDIR=C:\Program Files\PostgreSQL\9.6
+PYTHON_DLL=C:\Windows\System32\Python27.dll
+PYTHON_HOME=C:\Python27
+PYTHON_VERSION=27
+QTDIR=C:\Qt\5.5\msvc2013
+VCDIR=C:\Program Files\Microsoft Visual Studio 12.0\VC
+
+To build the installer:
+
+    C:\$PGADMIN4_SRC> make x86
+
+If you have a code signing certificate, this will automatically be used if
+found in the Windows Certificate Store to sign the installer.
+
 Support
 -------
 
-pgAdmin 4 is completely experiemental and unsupported!
+See https://www.pgadmin.org/support/ for support options.
 
 Project info
 ------------

TODO.txt

@@ -1,47 +0,0 @@
-TODO Items
-==========
-
-NOTE: If you intend to work on any of these items, please let the development
-team know by emailing pgadmin-hackers@postgresql.org.=
-
-Foreign Table Module
---------------------
-
-New functionality added in PG 9.5 for this module as below:
-
-- ALTER [ COLUMN ] col_name SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-- DISABLE TRIGGER [ trigger_name | ALL | USER ]
-- ENABLE TRIGGER [ trigger_name | ALL | USER ]
-- ENABLE REPLICA TRIGGER trigger_name
-- ENABLE ALWAYS TRIGGER trigger_name
-- SET WITH OIDS
-- SET WITHOUT OIDS
-
-To add this functionality we need to add Columns, Triggers and Constraints as 
-separate Nodes under the Foreign Table Node.
-
-Query Tool updateable recordset support
----------------------------------------
-
-Add smarts to the Query Tool to allow it to recognise if a query produces a
-data set that would be updateable (e.g. from a single table, all primary key
-columns present), and if so, allow editing.
-
-Backup Object
--------------
-
-Allow to select/deselect objects under the object backup operation.
-
-Restore Object
--------------
-
-List down the objects within the backup file, and allow the user to
-select/deselect the only objects, which user may want to restore.
-
-Graphical Explain
------------------
-* A better zooming/scaling functionality. A minimap for the explain will be
-  very nice.
-* Explanation on the statistic for the graphical explain plan.
-* Arrow colouring based on the percentage of the cost, and time taken on each
-  explain node.

ci/build_docs.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+echo "EXECUTING: Build docs"
+echo
+
+cd $WORKSPACE
+
+. $WORKSPACE/pgadmin-venv/bin/activate
+
+SPHINX_VER=""
+if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+    SPHINX_VER="==1.4.9"
+fi
+
+$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the docs.' ; exit 1; }
+
+make docs || { echo 'ERROR: Failed to build the documentation.' ; exit 1; }

ci/build_pip_wheel.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+echo "EXECUTING: Build PIP wheel"
+echo
+
+cd $WORKSPACE
+
+. $WORKSPACE/pgadmin-venv/bin/activate
+
+SPHINX_VER=""
+if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+    SPHINX_VER="==1.4.9"
+fi
+
+$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the PIP wheel.' ; exit 1; }
+
+make pip || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; }

ci/build_runtime_qt4.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "EXECUTING: Build runtime - QT4"
+echo
+
+cd $WORKSPACE/runtime
+
+make clean
+PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH /bin/qmake-qt4 || { echo 'ERROR: Failed to run the QT4 qmake step.' ; exit 1; }
+make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }

ci/build_runtime_qt5.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "EXECUTING: Build runtime - QT5"
+echo
+
+cd $WORKSPACE/runtime
+
+make clean
+PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH /bin/qmake-qt5 DEFINES+=PGADMIN4_USE_WEBKIT || { echo 'ERROR: Failed to run the QT5 qmake step.' ; exit 1; }
+make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }

ci/build_tarballs.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+echo "EXECUTING: Build Tarballs"
+echo
+
+cd $WORKSPACE
+
+. $WORKSPACE/pgadmin-venv/bin/activate
+
+SPHINX_VER=""
+if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+    SPHINX_VER="==1.4.9"
+fi
+
+$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the tarballs.' ; exit 1; }
+cd $WORKSPACE/
+make src || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; }

ci/ci_runner.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+$WORKSPACE/ci/create_config.sh || { echo 'ERROR: Failed to create the configuration.' ; exit 1; }
+$WORKSPACE/ci/run_python_tests.sh || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }
+$WORKSPACE/ci/run_jasmine_tests.sh || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; }
+$WORKSPACE/ci/build_docs.sh || { echo 'ERROR: Failed to build the documentation.' ; exit 1; }
+$WORKSPACE/ci/build_runtime_qt4.sh || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }
+$WORKSPACE/ci/build_runtime_qt5.sh || { echo 'ERROR: Failed to build the QT5 runtime.' ; exit 1; }
+$WORKSPACE/ci/update_messages.sh || { echo 'ERROR: Failed to update translation message catalogs.' ; exit 1; }
+$WORKSPACE/ci/build_pip_wheel.sh || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; }
+$WORKSPACE/ci/build_tarballs.sh || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; }

ci/create_config.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+echo "EXECUTING: Create pgAdmin config"
+echo
+
+cd $WORKSPACE
+
+cp $JENKINS_HOME/pgadmin-configs/config_local.py $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo LOG_FILE = \"$WORKSPACE/var/pgadmin4.log\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo SESSION_DB_PATH = \"$WORKSPACE/var/sessions\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo STORAGE_DIR = \"$WORKSPACE/var/storage\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo SQLITE_PATH = \"$WORKSPACE/var/pgadmin4.db\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo TEST_SQLITE_PATH = \"$WORKSPACE/var/pgadmin4.db\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+
+cp $JENKINS_HOME/pgadmin-configs/test_config.json $WORKSPACE/web/regression/test_config.json || { echo 'ERROR: Failed to copy the test configuration.' ; exit 1; }

ci/run_feature_tests.sh

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+echo "EXECUTING: Feature tests"
+echo
+
+echo "Starting virtual frame buffer..."
+echo
+
+Xvfb -ac :99 -screen 0 1280x1024x16 &
+FB_PID=$!
+export DISPLAY=:99
+
+echo "Creating Python ${PYTHON_VERSION} virtual environment..."
+echo
+
+cd $WORKSPACE/
+
+PYTHON_SUFFIX=""
+
+if [[ "$PYTHON_VERSION" == 3* ]]; then
+    PYTHON_SUFFIX="3"
+fi
+
+if [ "$PYTHON_VERSION" == 2.6 -o "$PYTHON_VERSION" == 3.3 ]; then
+    /usr/bin/virtualenv --no-wheel -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    $WORKSPACE/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
+else
+    /usr/bin/virtualenv -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+fi
+
+$WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
+$WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }
+
+cd web
+/usr/bin/yarn install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; }
+/usr/bin/yarn run bundle || { echo 'ERROR: Failed to bundle the Javascript code.' ; exit 1; }
+cd ../
+
+echo "Running regression tests..."
+echo
+
+$WORKSPACE/pgadmin-venv/bin/python $WORKSPACE/web/regression/runtests.py  --pkg feature_tests || { echo 'ERROR: Error detected when running the Feature tests.' ; exit 1; }
+
+echo "Cleaning up..."
+echo
+
+kill $FB_PID

ci/run_jasmine_tests.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "EXECUTING: Jasmine tests"
+echo
+
+cd $WORKSPACE/web/
+
+/usr/bin/yarn install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; }
+/usr/bin/yarn run linter  || { echo 'ERROR: Failed to lint the Javascript code.' ; exit 1; }
+./node_modules/.bin/karma start --single-run || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; }

ci/run_python_tests.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+echo "EXECUTING: Python tests"
+echo
+
+echo "Creating Python ${PYTHON_VERSION} virtual environment..."
+echo
+
+cd $WORKSPACE/
+
+PYTHON_SUFFIX=""
+
+if [[ "$PYTHON_VERSION" == 3* ]]; then
+    PYTHON_SUFFIX="3"
+fi
+
+if [ "$PYTHON_VERSION" == 2.6 -o "$PYTHON_VERSION" == 3.3 ]; then
+    /usr/bin/virtualenv --no-wheel -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    $WORKSPACE/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
+else
+    /usr/bin/virtualenv -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+fi
+
+$WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
+$WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }
+
+echo "Running regression tests..."
+echo
+
+$WORKSPACE/pgadmin-venv/bin/python $WORKSPACE/web/regression/runtests.py  --exclude feature_tests || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }
+

ci/update_messages.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "EXECUTING: Compile messages"
+echo
+
+cd $WORKSPACE/web
+
+. $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+
+pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin || { echo 'ERROR: Failed to extract messages from the source code.' ; exit 1; }
+
+pybabel update -i pgadmin/messages.pot -d pgadmin/translations || { echo 'ERROR: Failed to update message catalogs from the template.' ; exit 1; }
+
+pybabel compile -d pgadmin/translations || { echo 'ERROR: Failed to compile the message catalogs.' ; exit 1; }

docs/en_US/Makefile.sphinx

@@ -2,8 +2,9 @@
 #
 
 # You can set these variables from the command line.
+PYTHON        = python
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = sphinx-build -W
 PAPER         =
 BUILDDIR      = _build
 
@@ -18,7 +19,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # development environment).
 code_snippet:
 	@echo "Generating code-snippet.rst for some of the important classes..."
-	-@python build_code_snippet.py
+	-@$(PYTHON) build_code_snippet.py
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"

docs/en_US/backup_globals_dialog.rst

@@ -1,10 +1,10 @@
 .. _backup_globals_dialog:
 
-****************************
-The Backup Globals... Dialog
-****************************
+*************************
+The Backup Globals Dialog
+*************************
 
-Use the *Backup Globals...* dialog to create a plain-text script that recreates all of the database objects within a cluster, and the global objects that are shared by those databases. Global objects include tablespaces, roles, and object properties. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the objects in the backup.
+Use the *Backup Globals* dialog to create a plain-text script that recreates all of the database objects within a cluster, and the global objects that are shared by those databases. Global objects include tablespaces, roles, and object properties. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the objects in the backup.
 
 .. image:: images/backup_globals_general.png
 

docs/en_US/backup_server_dialog.rst

@@ -1,10 +1,10 @@
 .. _backup_server_dialog:
 
-****************************
-The Backup Server... Dialog
-****************************
+*************************
+The Backup Server Dialog
+*************************
 
-Use the *Backup Server...* dialog to create a plain-text script that will recreate the selected server. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the server.
+Use the *Backup Server* dialog to create a plain-text script that will recreate the selected server. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the server.
 
 .. image:: images/backup_server_general.png
 
@@ -24,5 +24,6 @@ Click the *Backup* button to build and execute a command based on your selection
 
 If the backup is successful, a popup window will confirm success. Click *Click here for details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
 
-.. image:: images/backup_server_process_watcher.png
-   ␍If the backup is unsuccessful, review the error message returned by the *Process Watcher* to resolve any issue.
+.. image:: images/backup_server_process_watcher.png
+   
+If the backup is unsuccessful, review the error message returned by the *Process Watcher* to resolve any issue.

docs/en_US/browser.rst

@@ -19,14 +19,14 @@ Features of pgAdmin 4 include:
 * helpful hints
 * online help and information about using pgAdmin dialogs and tools.
 
-When pgAdmin opens, the interface features a menu bar and a window divided into two panes: the *pgAdmin* tree control in the left pane, and the tabbed browser in the right pane.
+When pgAdmin opens, the interface features a menu bar and a window divided into two panes: the *Browser* tree control in the left pane, and a tabbed browser in the right pane.
 
 .. image:: images/pgadmin_welcome.png
 
 Select an icon from the *Quick Links* panel on the *Dashboard* tab to:
 
-* Open the :ref:`Create - Server dialog <server_dialog>` to add a new server definition.
-* Open the :ref:`Preferences dialog <preferences>` to customize your pgAdmin client.
+* Click the *Add New Server* button to open the :ref:`Create - Server dialog <server_dialog>` to add a new server definition.
+* Click the *Configure pgAdmin* button to open the :ref:`Preferences dialog <preferences>` to customize your pgAdmin client.
 
 Links in the *Getting Started* panel open a new browser tab that provide useful information for Postgres users:
 

docs/en_US/build_code_snippet.py

@@ -2,6 +2,14 @@ import os
 import sys
 import inspect
 
+if sys.version_info[0] >= 3:
+    import builtins
+else:
+    import __builtin__ as builtins
+
+# Ensure the global server mode is set.
+builtins.SERVER_MODE = None
+
 root = os.path.realpath(
         os.path.dirname(
             os.path.realpath(__file__)

docs/en_US/change_user_password.rst

@@ -0,0 +1,25 @@
+.. _change_user_password:
+
+***********************************
+The Change User Password - pgAdmin4
+***********************************
+
+It is a good policy to routinely change your password to protect data, even in what you may consider a 'safe' environment. In the workplace, failure to apply an appropriate password policy could leave you in breach of Data Protection laws.
+
+Please consider the following guidelines when selecting a password:
+
+* Ensure that your password is an adequate length; 6 characters should be the absolute minimum number of characters in the password.
+* Ensure that your password is not open to dictionary attacks. Use a mixture of upper and lower case letters and numerics, and avoid words or names. Consider using the first letter from each word in a phrase that you will remember easily but is an unfamiliar acronym.
+* Ensure that your password is changed regularly; at minimum, change it every ninety days.
+
+The above should be considered a starting point: It is not a comprehensive list and it **will not guarantee security**.
+
+.. image:: images/change_user_password.png
+
+Use the *Change Password* dialog to change your password:
+
+* Enter your existing password in the *Current Password* field.
+* Enter the desired password for in the *New Password* field.
+* Re-enter the new password in the *Confirm Password* field.
+
+Click the *Change Password* button to change your password; click *Close* to exit the dialog.

docs/en_US/check_dialog.rst

@@ -12,7 +12,8 @@ The *Check* dialog organizes the development of a check constraint through the *
 
 Use the fields in the *General* tab to identify the check constraint:
 
-* Use the *Name* field to add a descriptive name for the check constraint. The name will be displayed in the *pgAdmin* tree control. With PostgreSQL 9.5 forward, when a table has multiple check constraints, they will be tested for each row in alphabetical order by name and after NOT NULL constraints. 
+* Use the *Name* field to provide a descriptive name for the check constraint that will be displayed in the *pgAdmin* tree control. With PostgreSQL 9.5 forward, when a table has multiple check constraints, they will be tested for each row in alphabetical order by name and after NOT NULL constraints.
+* Store notes about the check constraint in the *Comment* field. 
 
 Click the *Definition* tab to continue.
 

docs/en_US/code_review.rst

@@ -13,7 +13,7 @@ review process for any patches submitted for inclusion in pgAdmin.
   bulk updates every year). The start date should always be 2013, and the end year
   the current year, e.g.
 
-    Copyright (C) 2013 - 2016, The pgAdmin Development Team
+    Copyright (C) 2013 - 2018, The pgAdmin Development Team
  
 * Ensure there's a blank line immediately following any copyright headers.
 

docs/en_US/coding_standards.rst

@@ -167,7 +167,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2015, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2018, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/collation_dialog.rst

@@ -12,7 +12,7 @@ The *Collation* dialog organizes the development of a collation through the foll
 
 Use the fields in the *General* tab to identify the collation:
 
-* Use the *Name* field to add a name for the collation. The collation name must be unique within a schema. The name will be displayed in the *pgAdmin* tree control.
+* Use the *Name* field to provide a name for the collation. The collation name must be unique within a schema. The name will be displayed in the *pgAdmin* tree control.
 * Select the name of the owner from the drop-down listbox in the *Owner* field. 
 * Select the name of the schema in which the collation will reside from the drop-down listbox in the *Schema* field.
 * Store notes about the collation in the *Comment* field.
@@ -39,7 +39,7 @@ The following is an example of the sql command generated by user selections in t
 
 .. image:: images/collation_sql.png
 
-The example shown demonstrates creating a collation named *french* that uses the rules specified for the locale, *fr_FR.utf8.  The collation is owned by *enterprisedb*.
+The example shown demonstrates creating a collation named *french* that uses the rules specified for the locale, *fr_FR.utf8.  The collation is owned by *postgres*.
  
 * Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation. For more information about setting a locale, see Chapter 22.1 Locale Support of the PostgreSQL core documentation: 
 

docs/en_US/column_dialog.rst

@@ -22,35 +22,36 @@ Click the *Definition* tab to continue.
 Use the fields in the *Definition* tab to add parameters for the column. (Fields are disabled if inapplicable.)
 
 * Use the drop-down listbox next to *Data Type* to select a data type for the column. For more information on the data types that are supported by PostgreSQL, refer to Chapter 8 of the Postgres core documentation. This field is required.
-* Use the *Scale* field to specify scale of the value (the number of digits to the right of the decimal point).
-* Use the *Length/Precision* field to specify the maximum number of significant digits in a numeric value, or the maximum number of characters in a text value.
+* Use the *Length* and *Precision* fields to specify the maximum number of significant digits in a numeric value, or the maximum number of characters in a text value.
 * Use the drop-down listbox next to *Collation* to apply a collation setting to the column.
-* Use the *Default* field to specify a default data value.
-* Check the *Not Null* checkbox to specify the column may not contain null values.
+* Use the *Default Value* field to specify a default data value.
+* Move the *Not Null* switch to the *Yes* position to specify the column may not contain null values. The default is *No*.
 
-Click the *Security* tab to continue.
+Click the *Variables* tab to continue.
 
-.. image:: images/column_security.png
+.. image:: images/column_variables.png
 
-Use the *Security* tab to assign attributes and define security labels.  
-
-Use the *Variables* panel to specify the number of distinct values that may be present in the column; this value overrides estimates made by the ANALYZE command. Click *Add* to add an attribute:
+Use the *Variables* tab to to specify the number of distinct values that may be present in the column; this value overrides estimates made by the ANALYZE command. Click the *Add* icon (+) to add a *Name*/*Value* pair:
 
 * Select the name of the variable from the drop-down listbox in the *Name* field. 
     
     * Select *n_distinct* to specify the number of distinct values for the column. 
     * Select *n_distinct_inherited* to specify the number of distinct values for the table and its children.
 
-* Specify the number of distinct values in the *Value* field. For more information, see the documentation for `ALTER TABLE  <http://www.postgresql.org/docs/9.6/static/sql_altertable.html>`_. 
+* Specify the number of distinct values in the *Value* field. For more information, see the documentation for `ALTER TABLE  <http://www.postgresql.org/docs/9.6/static/sql_altertable.html>`_.  
 
-To discard an attribute, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.  
+Click the *Add* icon (+) to specify each additional *Name*/*Value* pair; to discard a variable, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-Use the *Security Labels* panel to define security labels applied to the column. Click *Add* to add each security label selection: 
+Click the *Security* tab to continue.
+
+.. image:: images/column_security.png
+
+Use the *Security* tab to assign attributes and define security labels. Click the *Add* icon (+) to add each security label selection: 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 

docs/en_US/conf.py

@@ -13,6 +13,14 @@
 
 import sys, os
 
+if sys.version_info[0] >= 3:
+    import builtins
+else:
+    import __builtin__ as builtins
+
+# Ensure the global server mode is set.
+builtins.SERVER_MODE = None
+
 # Import the pgAdmin config
 root = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, root + '/../../web/')

docs/en_US/connect_error.rst

@@ -1,8 +1,8 @@
 .. _connect_error:
 
-**************************
-`Connection error`:index:
-**************************
+******************
+`Connection error`
+******************
 
 When connecting to a PostgreSQL server, you may get an error message. If you encounter an error message, please review the message  carefully; each error message attempts to incorporate the information you'll need to resolve the problem.  For more details about specific errors, please locate the error message in the list below:
 

docs/en_US/connecting.rst

@@ -4,21 +4,27 @@
 Connecting to a Server
 **********************
 
-Before you can use the pgAdmin client to manage your Postgres installation, you must define a connection to the server.    
+Before you can use the pgAdmin client to manage the objects that reside on your Postgres server, you must define a connection to the server.  You can (optionally) use the *Server Group* dialog to create server groups to organize the server connections within the tree control for easier management. To open the *Server Group* dialog, right-click on the *Servers* node of the tree control, and select *Server Group* from the *Create* menu.
 
 Contents:
 
 .. toctree::
 
    server_group_dialog
+
+Use the fields on the *Server* dialog to define the connection properties for each new server that you wish to manage with pgAdmin.  To open the *Server* dialog, right-click on the *Servers* node of the tree control, and select *Server* from the *Create* menu. 
+
+Contents:
+
+.. toctree::
+
    server_dialog
+
+After defining a server connection, right-click on the server name, and select *Connect to server* to authenticate with the server, and start using pgAdmin to manage objects that reside on the server.
+
+Contents:
+
+.. toctree::
+
    connect_to_server   
-   connect_error
-
-
-  
-
-
-   
-   
-
+   connect_error

docs/en_US/contributions.rst

@@ -4,7 +4,7 @@
 pgAdmin Project Contributions
 *****************************
 
-pgAdmin is an open-source project that invites you to get involved in the development process.  For more information about contributing to the pgAdmin project, contact the developers on the pgAdmin mailing list <mailto:pgadmin-hackers@postgresql.org> to discuss any ideas you might have for enhancements or bug fixes.
+pgAdmin is an open-source project that invites you to get involved in the development process.  For more information about contributing to the pgAdmin project, contact the developers on the pgAdmin mailing list pgadmin-hackers@postgresql.org to discuss any ideas you might have for enhancements or bug fixes.
 
 In the sections listed below, you'll find detailed information about the development process used to develop, improve, and maintain the pgAdmin client.
 

docs/en_US/database_dialog.rst

@@ -4,7 +4,7 @@
 The Database Dialog
 *******************
 
-Use the *Database* dialog to define a database. To create a database, you must be a database superuser or have the CREATE privilege.  
+Use the *Database* dialog to define or modify a database. To create a database, you must be a database superuser or have the CREATE privilege.  
 
 The *Database* dialog organizes the development of a database through the following dialog tabs: *General*, *Definition*, *Security*, and *Parameters*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
@@ -35,7 +35,7 @@ Click the *Security* tab to continue.
 
 Use the *Security* tab to assign privileges and define security labels.  
 
-Use the *Privileges* panel to assign privileges to a role. Click *Add* to set privileges for database objects:
+Use the *Privileges* panel to assign privileges to a role. Click the *Add* icon (+) to set privileges for database objects:
 
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privilege to the specified user.
@@ -43,7 +43,7 @@ Use the *Privileges* panel to assign privileges to a role. Click *Add* to set pr
 
 Click add to set additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-Use the *Security Labels* panel to define security labels applied to the database. Click *Add* to add each security label selection: 
+Use the *Security Labels* panel to define security labels applied to the database. Click the *Add* icon (+) to add each security label selection: 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
@@ -54,12 +54,11 @@ Click the *Parameters* tab to continue.
 
 .. image:: images/database_parameters.png
 
-Use the *Parameters* tab to set parameters for the database:
+Use the *Parameters* tab to set parameters for the database. Click the *Add* icon (+) to add each parameter:
 
-* Use the drop-down listbox next to *Parameter name* to select a parameter.
-* Use the drop-down listbox next to *Role* to select a role to which the parameter setting specified will apply.
-* Click *Add* to add the parameter definition to the table below.
+* Use the drop-down listbox in the *Name* field to select a parameter.
 * Use the *Value* field to set a value for the parameter.
+* Use the drop-down listbox next to *Role* to select a role to which the parameter setting specified will apply.
 
 Follow these steps to add additional parameter value definitions; to discard a parameter, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
@@ -73,7 +72,7 @@ The following is an example of the sql command generated by user selections in t
 
 .. image:: images/database_sql.png
 
-The example creates a database named *hr* that is owned by *enterprisedb*.  It allows unlimited connections, and is available to all authenticated users. 
+The example creates a database named *hr* that is owned by *postgres*.  It allows unlimited connections, and is available to all authenticated users. 
  
 * Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.

docs/en_US/debugger.rst

@@ -1,8 +1,8 @@
 .. _debugger:
 
-*************************
-`pgAdmin Debugger`:index:
-*************************
+******************
+`pgAdmin Debugger`
+******************
 
 .. image:: images/debug_main.png
 

docs/en_US/desktop_deployment.rst

@@ -16,32 +16,31 @@ packages and users interested in understanding how pgAdmin works.**
 Configuration
 *************
 
-In order to configure pgAdmin to run in desktop mode, it is first necessary to
-configure the Python code to run in single-user mode, and then to configure the
-runtime to find and execute the code.
+From pgAdmin 4 v2 onwards, the default configuration mode is server, however,
+this is overridden by the desktop runtime at startup. In most environments, no
+Python configuration is required unless you wish to override other default
+settings.
 
-Python
-------
+There are multiple configuration files that are read at startup by pgAdmin. These
+are as follows:
 
-In order to configure the Python code, follow these steps:
+* ``config.py``: This is the main configuration file, and should not be modified.
+  It can be used as a reference for configuration settings, that may be overridden
+  in one of the following files.
 
-1. Ensure that any existing configuration database (``pgadmin4.db``) is moved 
-   out of the way in the ``web/`` directory containing the pgAdmin Python code.
+* ``config_distro.py``: This file is read after ``config.py`` and is intended for
+  packagers to change any settings that are required for their pgAdmin distribution.
+  This may typically include certain paths and file locations.
 
-2. Create a ``config_local.py`` file alongside the existing ``config.py`` file.
+* ``config_local.py``: This file is read after ``config_distro.py`` and is intended
+  for end users to change any default or packaging specific settings that they may
+  wish to adjust to meet local preferences or standards.
 
-3. Edit ``config_local.py`` and add the following setting:
+NOTE: If the SERVER_MODE setting is changed in ``config_distro.py`` or ``config_local.py``,
+you will most likely need to re-set the LOG_FILE, SQLITE_PATH, SESSION_DB_PATH
+and STORAGE_DIR values as well as they will have been set based on the default
+configuration or overridden by the runtime.
 
-   .. code-block:: python
-
-       SERVER_MODE = False
-    
-4. Run the following command to create the configuration database:
-
-   .. code-block:: bash
-
-       $ python setup.py
-    
 Runtime
 -------
 
@@ -55,6 +54,25 @@ semi-colon character, for example:
 
      /Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/;/Users/dpage/python-libs/
     
-The configuration settings are stored using the QSettings class in Qt, which 
-will use an INI file on Unix systems, a plist file on Mac OS X, and the registry
-on Windows. The Python Path setting is stored in the ``PythonPath`` key.
+The configuration settings are stored using the QSettings class in Qt, which
+will use an INI file on Unix systems (~/.config/pgadmin/pgadmin4.conf),
+a plist file on Mac OS X (~/Library/Preferences/org.pgadmin.pgadmin4.plist),
+and the registry on Windows (HKEY_CURRENT_USER\\Software\\pgadmin\\pgadmin4).
+
+The configuration settings:
+
++--------------------------+--------------------+---------------------------------------------------------------+
+| Key                      | Type               | Purpose                                                       |
++==========================+====================+===============================================================+
+| ApplicationPath          | String             | The directory containing pgAdmin4.py                          |
++--------------------------+--------------------+---------------------------------------------------------------+
+| ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
++--------------------------+--------------------+---------------------------------------------------------------+
+| PythonPath               | String             | The Python module search path                                 |
++--------------------------+--------------------+---------------------------------------------------------------+
+| Browser/Geometry         | Binary             | The runtime window's size/shape                               |
++--------------------------+--------------------+---------------------------------------------------------------+
+| Browser/WindowState      | Binary             | The runtime window's state                                    |
++--------------------------+--------------------+---------------------------------------------------------------+
+| Browser/Zoom             | String             | The runtime window's zoom level (zoom % / 100)                |
++--------------------------+--------------------+---------------------------------------------------------------+

docs/en_US/developer_tools.rst

@@ -12,3 +12,4 @@ Contents:
    
    debugger
    query_tool
+   editgrid

docs/en_US/domain_constraint_dialog.rst

@@ -1,12 +1,12 @@
 .. _domain_constraint_dialog:
 
-****************************
-The Domain Constraint Dialog
-****************************
+*****************************
+The Domain Constraints Dialog
+*****************************
 
-Use the *Domain Constraint* dialog to create a domain constraint. A domain constraint confirms that the values provided for a domain meet a defined criteria. The *Domain Constraint* dialog implements options of the ALTER DOMAIN command. 
+Use the *Domain Constraints* dialog to create or modify a domain constraint. A domain constraint confirms that the values provided for a domain meet a defined criteria. The *Domain Constraints* dialog implements options of the ALTER DOMAIN command. 
 
-The *Domain Constraint* dialog organizes the development of a domain constraint through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
+The *Domain Constraints* dialog organizes the development of a domain constraint through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/domain_constraint_general.png
    
@@ -21,16 +21,16 @@ Click the *Definition* tab to continue.
    
 Use the fields in the *Definition* tab to define the domain constraint:
 
-* Use the *Check* field to write a CHECK expression. A CHECK clause specifies a constraint that the domain must satisfy. A constraint must be an expression producing a Boolean result; include the key word VALUE to refer to the value being tested. Only those expressions that evaluate to TRUE or UNKNOWN succeed. A CHECK expressions cannot contain subqueries or refer to variables other than VALUE. When a domain has multiple CHECK constraints, they will be tested in alphabetical order by name.
+* Use the *Check* field to provide a CHECK expression. A CHECK expression specifies a constraint that the domain must satisfy. A constraint must produce a Boolean result; include the key word VALUE to refer to the value being tested. Only those expressions that evaluate to TRUE or UNKNOWN will succeed. A CHECK expression cannot contain subqueries or refer to variables other than VALUE. If a domain has multiple CHECK constraints, they will be tested in alphabetical order.
 * Move the *Validate?* switch to the *No* position to mark the constraint NOT VALID. If the constraint is marked NOT VALID, the constraint will not be applied to existing column data. The default value is *Yes*. 
 
 Click the *SQL* tab to continue.
 
-Your entries in the *Domain Constraint* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+Your entries in the *Domain Constraints* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
 
 **Example**
 
-The following is an example of the sql command generated by user selections in the *Domain Constraint* dialog: 
+The following is an example of the sql command generated by user selections in the *Domain Constraints* dialog: 
 
 .. image:: images/domain_constraint_sql.png
 

docs/en_US/domain_dialog.rst

@@ -13,8 +13,8 @@ The *Domain* dialog organizes the development of a domain through the following
 Use the fields on the *General* tab to identify a domain:
 
 * Use the *Name* field to add a descriptive name for the domain. The name will be displayed in the *pgAdmin* tree control.
-* Use the drop-down listbox next to *Owner* to select a role.
-* Select the name of the schema in which the collation will reside from the drop-down listbox in the *Schema* field.
+* Use the drop-down listbox next to *Owner* to select a role that will own the domain.
+* Select the name of the schema in which the domain will reside from the drop-down listbox in the *Schema* field.
 * Store notes about the domain in the *Comment* field.
 
 Click the *Definition* tab to continue.
@@ -34,30 +34,26 @@ Click the *Constraints* tab to continue.
 
 .. image:: images/domain_constraints.png
 
-Use the fields in the *Constraints* tab to specify rules for the domain. Click *Add* to set constraints:
+Use the fields in the *Constraints* tab to specify rules for the domain. Click the *Add* icon (+) to set constraints:
 
 * Use the *Name* field to specify a name for the constraint.
 * Use the *Check* field to provide an expression for the constraint.
 * Use the *Validate* checkbox to determine whether the constraint will be validated. The default checkbox is checked and sets a validation requirement. 
 
-CHECK clauses specify integrity constraints or tests which values of the domain must satisfy. Each constraint must be an expression producing a Boolean result. It should use the key word VALUE to refer to the value being tested. Expressions evaluating to TRUE or UNKNOWN succeed. If the expression produces a FALSE result, an error is reported and the value is not allowed to be converted to the domain type.
+A CHECK clause specifies an integrity test which values of the domain must satisfy. Each constraint must be an expression that produces a Boolean result. Use the key word VALUE to refer to the value being tested. Expressions evaluating to TRUE or UNKNOWN succeed. If the expression produces a FALSE result, an error is reported and the value is not allowed to be converted to the domain type.  A CHECK expression cannot contain subqueries nor refer to variables other than VALUE.  If a domain has multiple CHECK constraints, they will be tested in alphabetical order by name. 
 
-CHECK expressions cannot contain subqueries nor refer to variables other than VALUE.
-
-If a domain has multiple CHECK constraints, they will be tested in alphabetical order by name. 
-
-Click *Add* to set additional constraints; to discard a constraint, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to set additional constraints; to discard a constraint, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Security* tab to continue.
 
 .. image:: images/domain_security.png
 
-Use the *Security Labels* panel to assign security labels. Click *Add* to add a label:
+Use the *Security Labels* panel to assign security labels. Click the *Add* icon (+) to add a label:
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them.
 
-Click *Add* to specify each additional label; to discard a label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional label; to discard a label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 

docs/en_US/editgrid.rst

@@ -0,0 +1,98 @@
+.. _editgrid:
+
+
+***********************************
+`Reviewing and Editing Data`:index:
+***********************************
+
+To review or modify data, right click on a table or view name in the *Browser* tree control.  When the context menu opens, use the *View/Edit Data* menu to specify the number of rows you would like to display in the editor panel. 
+
+.. image:: images/editgrid.png
+
+To modify the content of a table, each row in the table must be uniquely identifiable. If the table definition does not include an OID or a primary key, the displayed data is read only. Note that views cannot be edited; updatable views (using rules) are not supported.
+
+The editor features a toolbar that allows quick access to frequently used options, and a work environment divided into two panels: 
+
+* The upper panel displays the SQL command that was used to select the content displayed in the lower panel. 
+* The lower panel (the Data Grid) displays the data selected from the table or view.
+
+**The View/Edit Data Toolbar**
+
+The toolbar includes context-sensitive icons that provide shortcuts to frequently performed tasks.  
+
+.. image:: images/editgrid_toolbar.png 
+
+Hover over an icon to display a tooltip that describes the icon's functionality.
+
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| Icon                 | Behavior                                                                                          | Shortcut    |
++======================+===================================================================================================+=============+
+| *Save*               | Use the *Save* icon to save your changes to the currently displayed table contents.               |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Find*               | Use options on the *Find* menu to access Search and Replace functionality or to Jump to another   | Ctrl/Cmd +F |
+|                      | line.                                                                                             |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Copy*               | Click the *Copy* icon to copy the currently selected data.                                        | Ctrl+C      |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Paste Row*          | Click the *Paste Row* icon to paste the content that is currently on the clipboard.               |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Delete Row*         | Use the *Delete Row* icon to add a new row in the output panel.                                   |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Filter*             | Click the *Filter* icon to open a dialog that allows you to write and apply a filter for the      |             |    
+|                      | content currently displayed in the output panel.  Click the down arrow to open the *Filter* drop- |             |
+|                      | down menu and select from pre-defined options:                                                    |             |
+|                      |                                                                                                   |             |
+|                      |  Use options on the *Filter* menu to quick-sort or quick-filter the data set:                     |             |
+|                      |                                                                                                   |             |
+|                      |    * Filter: This option opens a dialog that allows you to define a filter.  A filter is a        |             |
+|                      |      condition that is supplied to an arbitrary WHERE clause that restricts the result set.       |             |
+|                      |                                                                                                   |             |
+|                      |    * Remove Filter: This option removes all selection / exclusion filter conditions.              |             |
+|                      |                                                                                                   |             |
+|                      |    * By Selection: This option refreshes the data set and displays only those rows whose          |             |
+|                      |      column value matches the value in the cell currently selected.                               |             |
+|                      |                                                                                                   |             |
+|                      |    * Exclude Selection: This option refreshes the data set and excludes those rows whose          |             |
+|                      |      column value matches the value in the cell currently selected.                               |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *No limit*           | Use the *No limit* drop-down listbox to specify how many rows to display in the output panel.     |             |
+|                      | Select from: *No limit* (the default), *1000 rows*, *500 rows*, or *100 rows*.                    |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Execute/Refresh*    | Click the *Execute/Refresh* icon to execute the SQL command that is displayed in the top panel.   | F5          |
+|                      | If you have not saved modifications to the content displayed in the data grid, you will be        |             |
+|                      | prompted to confirm the execution.  To preserve your changes before refreshing the content, click |             |
+|                      | the *Save* toolbar button before executing the refresh.                                           |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Clear query window* | Use the *Clear query window* drop-down menu to erase the contents of the *History* tab.           |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+| *Download as CSV*    | Click the *Download as CSV* icon to download the result set of the current query to a             | F8          |
+|                      | comma-separated list. You can control the CSV settings through                                    |             |
+|                      | *Preferences -> SQL Editor -> CSV output* dialogue.                                               |             |
++----------------------+---------------------------------------------------------------------------------------------------+-------------+
+
+**The Data Grid**
+
+The top row of the data grid displays the name of each column, the data type, and if applicable, the number of characters allowed. A column that is part of the primary key will additionally be marked with [PK].  
+
+To modify the displayed data:
+
+* To change a numeric value within the grid, double-click the value to select the field.  Modify the content in the square in which it is displayed.  
+* To change a non-numeric value within the grid, double-click the content to access the edit bubble.  After modifying the contentof the edit bubble, click the *Save* button to display your changes in the data grid, or *Cancel* to exit the edit bubble without saving.  
+
+To enter a newline character, click Ctrl-Enter or Shift-Enter.  Newline formatting is only displayed when the field content is accessed via an edit bubble.
+
+To add a new row to the table, enter data into the last (unnumbered) row of the table. As soon as you store the data, the row is assigned a row number, and a fresh empty line is added to the data grid.
+
+To write a SQL NULL to the table, simply leave the field empty. When you store the new row, the will server fill in the default value for that column. If you store a change to an existing row, the value NULL will explicitly be written.
+
+To write an empty string to the table, enter the special string '' (two single quotes) in the field. If you want to write a string containing solely two single quotes to the table, you need to escape these quotes, by typing \'\' 
+
+To delete a row, press the *Delete* toolbar button.  A popup will open, asking you to confirm the deletion.
+
+To commit the changes to the server, select the *Save* toolbar button.  Modifications to a row are written to the server automatically when you select a different row.
+
+
+
+

docs/en_US/event_trigger_dialog.rst

@@ -31,12 +31,12 @@ Click the *Security Labels* tab to continue.
 
 .. image:: images/event_trigger_security.png
 
-Use the *Security* tab to define security labels applied to the trigger. Click *Add* to add each security label. 
+Use the *Security* tab to define security labels applied to the trigger. Click the *Add* icon (+) to add each security label. 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
@@ -48,7 +48,7 @@ The following is an example of the sql command generated by user selections in t
 
 .. image:: images/event_trigger_sql.png
 
-The command creates an event trigger named *accounts* which uses the trigger function *acct_due*.
+The command creates an event trigger named *accounts* that invokes the procedure named *acct_due*.
  
 * Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.

docs/en_US/exclusion_constraint_dialog.rst

@@ -23,7 +23,7 @@ Use the fields in the *Definition* tab to define the exclusion constraint:
 * Use the drop-down listbox next to *Tablespace* to select the tablespace in which the index associated with the exclude constraint will reside. 
 * Use the drop-down listbox next to *Access method* to specify the type of index that will be used when implementing the exclusion constraint: 
 
-    * Select *gist* to specify a GiST index (the default).  
+    * Select *gist* to specify a GiST index.  
     * Select *spgist* to specify a space-partitioned GiST index. 
     * Select *btree* to specify a B-tree index.  
     * Select *hash* to specify a hash index.  
@@ -37,11 +37,12 @@ Click the *Columns* tab to continue.
 
 .. image:: images/exclusion_constraint_columns.png
 
-Use the fields in the *Columns* tab to to specify the column(s) to which the constraint applies. Use the drop-down listbox next to *Column* to select a column and click *Add* to provide details of the action on the column: 
+Use the fields in the *Columns* tab to to specify the column(s) to which the constraint applies. Use the drop-down listbox next to *Column* to select a column and click the *Add* icon (+) to provide details of the action on the column: 
 
 * The *Column* field is populated with the selection made in the *Column* drop-down listbox.
 * If applicable, use the drop-down listbox in the *Operator class* to specify the operator class that will be used by the index for the column.
 * Move the *DESC* switch to *DESC* to specify a descending sort order. The default is *ASC* which specifies an ascending sort order.
+* Use the *NULLs order* column to specify the placement of NULL values (when sorted).  Specify *FIRST* or *LAST*.
 * Use the drop-down list next to *Operator* to specify a comparison or conditional operator.
 
 Click the *SQL* tab to continue.

docs/en_US/foreign_data_wrapper_dialog.rst

@@ -4,7 +4,7 @@
 The Foreign Data Wrapper Dialog
 *******************************
 
-Use the *Foreign Data Wrapper* dialog to create a foreign data wrapper. A foreign data wrapper is an adapter between a Postgres database and data stored on another data source.  
+Use the *Foreign Data Wrapper* dialog to create or modify a foreign data wrapper. A foreign data wrapper is an adapter between a Postgres database and data stored on another data source.  
 
 You must be a superuser to create a foreign data wrapper.
 
@@ -24,8 +24,8 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to set parameters:
 
-* Select the name of the handler from the drop-down listbox in the *Handler* field. This is the name of an existing function that will be called to retrieve the execution functions for foreign tables. 
-* Select the name of the validator from the drop-down listbox in the *Validator* field. This is the name of an existing function that will be called to check the generic options given to the foreign data wrapper, as well as options for foreign servers, user mappings and foreign tables using the foreign data wrapper.
+* Select the name of the handler function from the drop-down listbox in the *Handler* field. This is the name of an existing function that will be called to retrieve the execution functions for foreign tables. 
+* Select the name of the validator function from the drop-down listbox in the *Validator* field. This is the name of an existing function that will be called to check the generic options given to the foreign data wrapper, as well as options for foreign servers, user mappings and foreign tables using the foreign data wrapper.
 
 Click the *Options* tab to continue.
 
@@ -33,16 +33,16 @@ Click the *Options* tab to continue.
 
 Use the fields in the *Options* tab to specify options:
 
-* Click the *Add* button to add an option/value pair for the foreign data wrapper. Supported option/value pairs will be specific to the selected foreign data wrapper.
+* Click the the *Add* icon (+) button to add an option/value pair for the foreign data wrapper. Supported option/value pairs will be specific to the selected foreign data wrapper.
 * Specify the option name in the *Option* field and provide a corresponding value in the *Value* field.  
 
-Click *Add* to specify each additional pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Security* tab to continue.
 
 .. image:: images/foreign_data_wrapper_security.png
 
-Use the *Security* tab to assign security privileges. Click *Add* to assign a set of privileges.
+Use the *Security* tab to assign security privileges. Click the *Add* icon (+) to assign a set of privileges.
 
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user.
@@ -60,7 +60,7 @@ The following is an example of the sql command generated by user selections in t
 
 .. image:: images/foreign_data_wrapper_sql.png
 
-The example creates a foreign data wrapper named *libpq_debug* that uses pre-existing validator and handler functions, *dblink_fdw_validator* and *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to *true*.  The foreign data wrapper is owned by *enterprisedb*.
+The example creates a foreign data wrapper named *libpq_debug* that uses pre-existing validator and handler functions, *dblink_fdw_validator* and *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to *true*.  The foreign data wrapper is owned by *postgres*.
  
 * Click the *Help* button (?) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.

docs/en_US/foreign_key_dialog.rst

@@ -4,7 +4,7 @@
 The Foreign key Dialog
 **********************
 
-Use the *Foreign key* dialog to specify the behavior of a foreign key. A foreign key constraint maintains referential integrity between two tables.  A foreign key constraint cannot be defined between a temporary table and a permanent table.
+Use the *Foreign key* dialog to specify the behavior of a foreign key constraint. A foreign key constraint maintains referential integrity between two tables.  A foreign key constraint cannot be defined between a temporary table and a permanent table.
 
 The *Foreign key* dialog organizes the development of a foreign key constraint through the following dialog tabs: *General*, *Definition*, *Columns*, and *Action*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
@@ -12,7 +12,8 @@ The *Foreign key* dialog organizes the development of a foreign key constraint t
 
 Use the fields in the *General* tab to identify the foreign key constraint:
 
-* Use the *Name* field to add a descriptive name for the foreign key constraint. The name will be displayed in the *pgAdmin* tree control.
+* Use the *Name* field to add a descriptive name for the foreign key. The name will be displayed in the *pgAdmin* tree control.
+* Store notes about the foreign key constraint in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -41,7 +42,7 @@ Use the fields in the *Columns* tab to specify one or more reference column(s).
 * Use the drop-down listbox next to *References* to specify the name of the table in which the comparison column(s) resides.
 * Use the drop-down listbox next to *Referencing* to specify a column in the foreign table.
 
-Click *Add* to add a column to the list; repeat the steps above and click *Add* to add additional columns. To discard an entry, click the trash icon to the left of the entry and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to add a column to the list; repeat the steps above and click the *Add* icon (+) to add additional columns. To discard an entry, click the trash icon to the left of the entry and confirm deletion in the *Delete Row* popup.
 
 Click the *Action* tab to continue.
 
@@ -81,7 +82,7 @@ The following is an example of the sql command generated by user selections in t
 
 .. image:: images/foreign_key_sql.png
 
-The example shown demonstrates creating a foreign key constraint named *territory_fkey* that matches values in the *distributors* *territory* column with those of the *sales_territories* *region* column.  
+The example shown demonstrates creating a foreign key constraint named *territory_fkey* that matches values in the *distributors* table *territory* column with those of the *sales_territories* table *region* column.  
  
 * Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.

docs/en_US/foreign_table_dialog.rst

@@ -30,42 +30,36 @@ Click the *Columns* tab to continue.
 
 .. image:: images/foreign_table_columns.png
 
-Use the fields in the *Columns* tab to to add columns and their attributes to the table. Click *Add* to define a column:
+Use the fields in the *Columns* tab to to add columns and their attributes to the table. Click the *Add* icon (+) to define a column:
 
 * Use the *Name* field to add a descriptive name for the column.
-* Use the drop-down listbox next to *Data Type* to select a data type for the column. This can include array specifiers. For more information on which data types are supported by PostgreSQL, refer to Chapter 8 of the core documentation.
-* Use the *Length* field to specify the length of a data string.
-* Use the *Precision* field to specify the total number of significant digits.
-* Use the *Default* field to specify a default data value.
-* Check the *Not Null* checkbox to specify the column may not contain null values.
-* Use the *Statistics* field to specify *true* or *false* if the foreign data wrapper can collect statistics for the foreign table. 
-* Use the drop-down listbox next to *Collation* to apply a collation setting to the foreign table.
+* Use the drop-down listbox in the *Data Type* field to select a data type for the column. This can include array specifiers. For more information on which data types are supported by PostgreSQL, refer to Chapter 8 of the core documentation.
 
-Click *Add* to specify each additional column; to discard a column, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional column; to discard a column, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Constraints* tab to continue.
 
 .. image:: images/foreign_table_constraints.png
 
-Use the fields in the *Constraints* tab to apply a table constraint to the foreign table. Click *Add* to define a constraint:
+Use the fields in the *Constraints* tab to apply a table constraint to the foreign table. Click the *Add* icon (+) to define a constraint:
 
 * Use the *Name* field to add a descriptive name for the constraint. If the constraint is violated, the constraint name is present in error messages, so constraint names like *col must be positive* can be used to communicate helpful information.
 * Use the *Check* field to write a check expression producing a Boolean result. Each row in the foreign table is expected to satisfy the check expression.
 * Check the *No Inherit* checkbox to specify that the constraint will not propagate to child tables.
 * Uncheck the *Validate* checkbox to disable validation. The database will not assume that the constraint holds for all rows in the table.
 
-Click *Add* to specify each additional constraint; to discard a constraint, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional constraint; to discard a constraint, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Options* tab to continue.
 
 .. image:: images/foreign_table_options.png
 
-Use the fields in the *Options* tab to specify options to be associated with the new foreign table or one of its columns; the accepted option names and values are specific to the foreign data wrapper associated with the foreign server. Click the *Add* button to add an option/value pair. 
+Use the fields in the *Options* tab to specify options to be associated with the new foreign table or one of its columns; the accepted option names and values are specific to the foreign data wrapper associated with the foreign server. Click the *Add* icon (+) to add an option/value pair. 
 
 * Specify the option name in the *Option* field. Duplicate option names are not allowed.
 * Provide a corresponding value in the *Value* field.  
 
-Click *Add* to specify each additional option/value pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional option/value pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Security* tab to continue.
 
@@ -73,20 +67,20 @@ Click the *Security* tab to continue.
 
 Use the *Security* tab to assign privileges and define security labels.  
 
-Use the *Privileges* panel to assign privileges to a role. Click *Add* to set privileges for database objects:
+Use the *Privileges* panel to assign privileges to a role. Click the *Add* icon (+) to set privileges for database objects:
 
 * Select the name of the role to which privileges will be assigned from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privilege to the specified user.
 * Select the name of the role that owns the foreign table from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the database.
 
-Click *Add* to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-Use the *Security Labels* panel to define security labels applied to the function. Click *Add* to add each security label selection: 
+Use the *Security Labels* panel to define security labels applied to the function. Click the *Add* icon (+) to add each security label selection: 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 

docs/en_US/fts_configuration_dialog.rst

@@ -35,8 +35,8 @@ Click the *Tokens* tab to continue.
 Use the fields in the *Tokens* tab to add a token:
 
 * Use the *Tokens* field to specify the name of a token.
-* Click *Add* to create a token.
-* Use the *Dictionary* field to specify a dictionary. 
+* Click the *Add* icon (+) to create a token.
+* Use the *Dictionaries* field to specify a dictionary. 
 
 Repeat these steps to add additional tokens; to discard a token, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 

docs/en_US/fts_dictionary_dialog.rst

@@ -13,7 +13,7 @@ The *FTS Dictionary* dialog organizes the development of a FTS dictionary throug
 Use the fields in the *General* tab to identify the dictionary:
 
 * Use the *Name* field to add a descriptive name for the dictionary. The name will be displayed in the *pgAdmin* tree control.
-* Use the drop-down listbox next to *Owner* to select a role.
+* Use the drop-down listbox next to *Owner* to select the role that will own the FTS Dictionary.
 * Select the name of the schema in which the dictionary will reside from the drop-down listbox in the *Schema* field.
 * Store notes about the dictionary in the *Comment* field.
 
@@ -33,16 +33,16 @@ Click the *Options* tab to continue.
 
 .. image:: images/fts_dictionary_options.png
    
-Use the fields in the *Options* tab to provide template-specific options. Click *Add* to add an option clause:
+Use the fields in the *Options* tab to provide template-specific options. Click the *Add* icon (+) to add an option clause:
 
 * Specify the name of an option in the *Option* field
-* Provide a value in the *Value* field.
+* Provide a value for the option in the *Value* field.
 
-Click *Add* to specify each additional option/value pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to specify each additional option/value pair; to discard an option, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
   
-Your entries in the *FTS Dictionary* dialog generate a generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+Your entries in the *FTS Dictionary* dialog generate a generate a SQL command. Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
 
 **Example**
 

docs/en_US/function_dialog.rst

@@ -54,23 +54,22 @@ Click the *Arguments* tab to continue.
 
 .. image:: images/function_arguments.png
 
-Use the fields in the *Arguments* tab to define an argument. Click *Add* to set parameters and values for the argument:
+Use the fields in the *Arguments* tab to define an argument. Click the *Add* icon (+) to set parameters and values for the argument:
 
-* Use the drop-down listbox next to *Data type* to select a data type.
-* Use the drop-down listbox next to *Mode* to select a mode. Select *IN* for an input parameter; select *OUT* for an output parameter; select *INOUT* for both an input and an output parameter; or, select *VARIADIC* to specify a VARIADIC parameter.
-* Write a name for the argument in the *Argument Name* field.
+* Use the drop-down listbox in the *Data type* field to select a data type.
+* Use the drop-down listbox in the *Mode* field to select a mode. Select *IN* for an input parameter; select *OUT* for an output parameter; select *INOUT* for both an input and an output parameter; or, select *VARIADIC* to specify a VARIADIC parameter.
+* Provide a name for the argument in the *Argument Name* field.
 * Specify a default value for the argument in the *Default Value* field.
 
-Click *Add* to define another argument; to discard an argument, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to define another argument; to discard an argument, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *Parameters* tab to continue.
 
 .. image:: images/function_parameters.png
 
-Use the fields in the *Parameters* tab to specify settings that will be applied when the function is invoked:
+Use the fields in the *Parameters* tab to specify settings that will be applied when the function is invoked. Click the *Add* icon (+) to add a *Name*/*Value* field in the table.
 
-* Use the drop-down listbox next to *Parameter Name* in the *Parameters* panel to select a parameter. 
-* Click the *Add* button to add the variable to *Name* field in the table.
+* Use the drop-down listbox in the *Name* column in the *Parameters* panel to select a parameter. 
 * Use the *Value* field to specify the value that will be associated with the selected variable. This field is context-sensitive.
 
 Click the *Security* tab to continue.
@@ -85,14 +84,14 @@ Use the *Privileges* panel to assign usage privileges for the function to a role
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privilege to the specified user.
 * Select the name of the role from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the database.
 
-Click *Add* to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-Use the *Security Labels* panel to define security labels applied to the function. Click *Add* to add each security label selection: 
+Use the *Security Labels* panel to define security labels applied to the function. Click the *Add* icon (+) to add each security label selection: 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click the *Add* icon (+) to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 

docs/en_US/getting_started.rst

@@ -4,27 +4,54 @@
 Getting Started
 ***************
 
-pgAdmin 4 features a highly-customizable display that features drag-and-drop panels that you can arrange to make the best use of your desktop environment.  
+Pre-compiled and configured installation packages for pgAdmin 4 are available for a number of desktop environments; we recommend using an installer whenever possible.  A standard installation using the pgAdmin installer is a server deployment.
 
-When you install pgAdmin in server mode, you will be prompted to provide a role name and pgAdmin password.  The first role registered with pgAdmin will be an administrative user.  When you authenticate with pgAdmin, pgAdmin displays the server definitions associated with that login role in the tree control. The tree control provides an elegant overview of the managed servers, and the objects that reside on each server. Right-click on a node within the tree control to access context-sensitive menus that provide quick access to management tasks for the selected object.
-
-The tabbed browser provide quick access to statistical information about each object in the tree control, and pgAdmin tools and utilities (such as the Query tool and the debugger). pgAdmin opens additional feature tabs each time you access the extended functionality offered by pgAdmin tools; you can open, close, and re-arrange feature tabs as needed. 
-
-Use the *Preferences* dialog to customize the content and colors of the pgAdmin display.  To open the *Preferences* dialog, select *Preferences* from the *File* menu.
-
-*Help* buttons in the lower-left corner of each dialog will open the online help for the dialog.  You can access additional Postgres help by navigating through the *Help* menu, and selecting the name of the resource that you wish to open. 
-
-An administrative role can use the pgAdmin User Management dialog to create and manage additional pgAdmin user accounts.
+In a Server Deployment, the pgAdmin application is deployed behind a webserver or with the WSGI interface.
+If you install pgAdmin in server mode, you will be prompted to provide a role name and pgAdmin password when you initially connect to pgAdmin.  The first role registered with pgAdmin will be an administrative user; the administrative role can use the pgAdmin *User Management* dialog to create and manage additional pgAdmin user accounts.  When a user authenticates with pgAdmin, the pgAdmin tree control displays the server definitions associated with that login role.
 
 Contents:
 
 .. toctree::
 
+   server_deployment
    pgadmin_login
+   pgadmin_user
+   change_user_password
+
+In a Desktop Deployment, the pgAdmin application is configured to use the desktop runtime environment to host and display the program on a supported platform. Typically, users will install a pre-built package to run pgAdmin in desktop mode, but a manual desktop deployment can be installed and though it is more difficult to setup, it may be useful for developers interested in understanding how pgAdmin works.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   desktop_deployment
+
+The pgAdmin 4 client features a highly-customizable display that features drag-and-drop panels that you can arrange to make the best use of your desktop environment.
+
+The tree control provides an elegant overview of the managed servers, and the objects that reside on each server. Right-click on a node within the tree control to access context-sensitive menus that provide quick access to management tasks for the selected object.
+
+The tabbed browser provide quick access to statistical information about each object in the tree control, and pgAdmin tools and utilities (such as the Query tool and the debugger). pgAdmin opens additional feature tabs each time you access the extended functionality offered by pgAdmin tools; you can open, close, and re-arrange feature tabs as needed.
+
+Use the *Preferences* dialog to customize the content and colors of the pgAdmin display.  To open the *Preferences* dialog, select *Preferences* from the *File* menu.
+
+*Help* buttons in the lower-left corner of each dialog will open the online help for the dialog.  You can access additional Postgres help by navigating through the *Help* menu, and selecting the name of the resource that you wish to open.
+
+Contents:
+
+.. toctree::
+
    browser
    pgadmin_menu_bar
    pgadmin_tabbed_browser
    pgadmin_tree_control
    preferences
-   pgadmin_user
+   keyboard_shortcuts
 
+Before using pgAdmin to manage objects that reside on a server, you must define a connection to the server; for more information please see *Connecting to a Server*:
+
+Contents:
+
+.. toctree::
+
+   connecting

docs/en_US/grant_wizard.rst

@@ -26,11 +26,11 @@ Click the *Next* button to continue, or the *Cancel* button to close the wizard
 
 Use the fields in the *Privileges Selection (step 2 of 3)* window to grant privileges. If you grant a privilege WITH GRANT OPTION, the Grantee will have the right to grant privileges on the object to others. If WITH GRANT OPTION is subsequently revoked, any role who received access to that object from that Grantee (directly or through a chain of grants) will lose thier privileges on the object.
 
-* Click *Add* to assign a set of privileges.
+* Click the *Add* icon (+) to assign a set of privileges.
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user. If privileges have previously been granted on a database object, unchecking a privilege for a group or user will result in revoking that privilege.
 * If enabled, select the name of the role from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the database.
-* Click *Add* to assign a set of privileges to another role; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* dialog.
+* Click the *Add* icon (+) to assign a set of privileges to another role; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* dialog.
 
 For more information about granting privileges on database objects, see the `PostgreSQL core documentation <http://www.postgresql.org/docs/9.5/static/sql-grant.html>`_.