Merge branch 'master' of https://github.com/levinsv/pgadmin3.git

# Conflicts:
#	.gitignore
#	frm/frmStatus.cpp
#	x64/Release_(3.0)/libiconv.dll
#	x64/Release_(3.0)/pgAdmin3.exe
#	x64/Release_(3.0)/textcompare_report.template

.gitignore

@@ -1,6 +1,16 @@
 Debug/*
-x64/*
+x64/Debug_(3.0)/*
 Release/*
+Debug_(3.0)/*
+x64/Release_(3.0)/*.sbr
+x64/Release_(3.0)/*.log
+x64/Release_(3.0)/*.sbr
+x64/Release_(3.0)/*.obj
+x64/Release_(3.0)/*.tlog
+x64/Release_(3.0)/*.res
+x64/Release_(3.0)/*.sbr
+x64/Release_(3.0)/*.ilk
+x64/Release_(3.0)/*.txt
 *.sbr
 *.obj
 *.cod
@@ -8,5 +18,10 @@ Release/*
 *.7z
 *.bsc
 *.pdb
+<<<<<<< HEAD
 include/svnversion.h
+=======
+ctl/ctlMonitorWidget.cpp
+include/ctl/ctlMonitorWidget.h
+>>>>>>> 51a33c6e2f6064e45b405e8e935a5629421460ae
 build/*

.vscode/c_cpp_properties.json

@@ -0,0 +1,21 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${workspaceFolder}",
+                "/usr/include/libxml2",
+                "/usr/include/pgsql/server",
+                "/usr/local/include/wx-3.1"
+            ],
+            "defines": ["__cplusplus"],
+            "compilerPath": "/usr/bin/g++",
+            "cStandard": "c99",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "linux-gcc-x64",
+            "configurationProvider": "ms-vscode.cmake-tools"
+        }
+    ],
+    "version": 4
+}

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        
+        {
+            "name": "pgAdmin3",
+            "program": "${workspaceRoot}/build/pgAdmin3",
+            "request": "launch",
+            "stopAtEntry": false,
+            "type": "cppdbg",
+            "MIMode": "gdb",
+            "cwd": "${workspaceFolder}/build",
+            "setupCommands":[
+              {
+                "description": "Enable pretty-printing for gdb",
+                "text": "-enable-pretty-printing",
+                "ignoreFailures": true
+              }
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "files.associations": {
+        "regex": "cpp",
+        "*.pngc": "cpp"
+    },
+    "cmake.configureArgs": [
+       
+    ]
+}

frm/frmStatus.cpp

@@ -391,7 +391,11 @@ frmStatus::frmStatus(frmMain *form, const wxString &_title, pgConn *conn) : pgFr
 	// Now load the layout
 	wxString perspective;
 	settings->Read(wxT("frmStatus/Perspective-") + wxString(FRMSTATUS_PERSPECTIVE_VER), &perspective, FRMSTATUS_DEFAULT_PERSPECTIVE);
+<<<<<<< HEAD
 	manager.LoadPerspective(perspective, true);
+=======
+//	manager.LoadPerspective(perspective, true);
+>>>>>>> 51a33c6e2f6064e45b405e8e935a5629421460ae
 	// Reset the captions for the current language
 	manager.GetPane(wxT("toolBar")).Caption(_("Tool bar"));
 	manager.GetPane(wxT("Activity")).Caption(_("Activity"));

pgAdmin3.vcxproj

@@ -232,7 +232,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc_dll/mswu/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc_dll/mswu/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR);$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;__WXMSW__;WXUSINGDLL;wxUSE_UNICODE=1;UNICODE;EMBED_XRC;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -1010,7 +1010,13 @@
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="utils\csvfiles.cpp" />
-    <ClCompile Include="utils\diff_match_patch.cc" />
+    <ClCompile Include="utils\diff_match_patch.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
     <ClCompile Include="utils\factory.cpp" />
     <ClCompile Include="utils\favourites.cpp" />
     <ClCompile Include="utils\log\MyDataViewCtrl.cpp" />

ui/embed-xrc_v3.bat

@@ -9,5 +9,5 @@ REM # embed-xrc.bat - convert xrc files to c++ files
 REM #
 REM #######################################################################
 
-"D:\PostgreSQL\pgadmin3\pgadmin\Debug_(3.0)\wxrc.exe" -c -o xrcDialogs.cpp *.xrc
+"C:\Users\lsv\Source\Repos\wxrc\x64\Release\wxrc.exe" -c -o xrcDialogs.cpp *.xrc
 

x64/Release_(3.0)/mail.template

@@ -0,0 +1,31 @@
+To=example@mailserver.org
+Cc=examplecopy@mailserver.org
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>Две колонки</title>
+  <style type="text/css">
+   #maket {
+    width: 70%; /* Ширина всей таблицы */
+   }
+   TD {
+    vertical-align: top; /* Вертикальное выравнивание в ячейках */
+    border: 1px solid; /* Параметры линии */
+    padding: 5px; /* Поля вокруг ячеек */
+   }
+   TD#lc {
+    width: 200px; /* Ширина левой колонки */
+    background: #ccc; /* Цвет фона левой колонки */
+   }
+   TD#rc {
+   }
+  </style>
+ </head>
+ <body>
+ <p> Вот какая ошибка </p>
+  <table cellspacing="0" id="maket">
+<tr><td id="lc">$1</td><td id="rc">$2</td></tr>
+  </table>
+ </body>
+</html>

x64/Release_(3.0)/textcompare_report.template

@@ -0,0 +1,341 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    
+    <meta name="description" content="Text Compare! is an online diff tool that can find the difference between two text documents. Just paste and compare.">
+
+    <title>Compare object DateBase </title>
+
+<body style="zoom: 1;">
+
+        &nbsp;
+
+
+@Diff_EditCost=4
+@Match_Threshold=0.1
+@Match_Distance=300
+
+
+    	<style type="text/css">
+body {
+	/*font-family: monospace;*/
+	width : 100%;
+	text-align:center;
+	background: white;
+	padding: 0;
+	margin: 0;
+}
+div.logo {
+	background-repeat: repeat;
+	/*background-position: top;*/
+	height: 30px;
+	/*overflow: hidden;*/
+    background-color: #5CA96D;
+    background-image: linear-gradient(90deg, #4E905D, #6BC57F);
+}
+div.logocompare {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    color: #f9f9f9;
+    font-size: 20px;
+    font-weight: bold;
+    text-decoration: none;
+    text-shadow:1px 1px grey;
+    padding-top: 10px;
+} 
+.logost {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    color: #f9f9f9;
+    font-size: 16px;
+    font-weight: bold;
+    text-decoration: none;
+    text-shadow:1px 1px grey;
+    padding-top: 5px;
+} 
+
+div.logoheader {
+	background-repeat: repeat;
+	/*background-position: top;*/
+	height: 40px;
+	/*overflow: hidden;*/
+    background-color: #4488C7;
+    background-image: linear-gradient(90deg, #0B70CD, #5C90C0);
+}
+
+.logo_background {
+ /*   background-image:url('tiny_grid-transparent.png'); */
+    width: 100%;
+    height: 100%;
+}
+
+
+div.logo, div.mainContent, .addThisFooter, div.logocompare {
+	text-align:center;
+	/*width: 95%;*/
+	margin-left: auto;
+  	margin-right: auto;
+}
+
+.addThisFooter {
+    margin-bottom: 150px;
+}
+
+.logotext {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    color: #f9f9f9;
+    font-size: 25px;
+    font-weight: bold;
+    text-decoration: none;
+    text-shadow:1px 1px grey;
+    padding-top: 5px;
+} 
+
+
+
+table {
+	font-size: 12px;
+}
+ 
+div.mainContent {
+ 	background: #eee;
+ 	/*background-image:url('tc-bgtop-bottom.png'); */
+	background-repeat: repeat-x; 
+	background-position: top;
+	/*border-bottom: 2px white solid;*/
+	margin-bottom: 15px;
+    border-bottom: 1px solid #ddd;
+    border-top: 1px solid #ddd;
+}
+
+.lineContent {
+	width: 49%;
+}
+
+
+.lineContent pre {
+    /* Undoing bootstrap CSS for PRE tags */
+    padding: 0;
+    margin: 0;
+    background-color: white;
+    border: 0;
+    border-radius: 0;
+    line-height: normal;
+    padding-left: 2px;
+    padding-right: 2px;
+
+    /* Make sure really long strings are wrapped.  */
+    background: white;
+    margin: 0;
+    -ms-word-break: break-all;
+    -ms-word-wrap: break-all;
+    -webkit-word-break: break-word;
+    -webkit-word-wrap: break-word;
+    word-break: break-word;
+    word-wrap: break-word;
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    hyphens: auto;
+    white-space: pre-wrap;
+}
+
+
+.text-compare {
+	font-size: 12px;
+}
+
+
+img {
+	border: none;
+}
+
+.navImage {
+	border:0px;
+	padding-left:5px;
+	padding-right:5px;
+	margin:0px;
+}
+
+.delimiter {
+	heigth:40px;
+	display: inline-block;
+}
+label {
+	font-size: 14px;
+    font-weight: normal !important;
+    margin-bottom: 0px !important;
+}
+
+           h2 { font-size: 130%; padding-bottom: 0.5ex; color: #009ACE; border-bottom-style: solid; border-bottom-width: 2px; }
+           h3 { font-size: 110%; padding-bottom: 0.5ex; color: #000000; }
+
+		.text-compare {
+		    border: 1px solid #ababab;
+		    background: white;
+            line-height: normal;
+		}
+		.text-compare, div.sendEmail {
+			width: 98%;
+			margin-left: auto;
+		    margin-right: auto;
+		}
+		tbody {
+			border: none;
+		}
+        .text-compare td {font-family: monospace;}
+		colgroup {border-color: #ababab;}
+		.link_first {
+			background-image:url('tc-arrow-down-green.png');
+			background-position: top;
+			background-repeat: no-repeat;
+		}
+		.link_next {
+			background-image:url('tc-arrow-down-blue.png');
+			background-position: top;
+			background-repeat: no-repeat;	
+		}
+		.link_top {
+			background-image:url('tc-arrow-up-orange.png');
+			background-position: top;
+			background-repeat: no-repeat;	
+		}
+		.link_top, .link_next, .link_first {
+			height: 12px;
+			width: 11px;
+		}
+		.link_section {
+			height: 18px;
+		}
+		.text-section {
+			font-size: 15px;
+		}
+
+		.diff_next {
+		  width: 11px;
+		 }
+		.text_next, .text_first, .text_top {visibility: hidden;} 
+		td {
+			padding-left: 2px;
+			padding-right: 2px;
+		}
+		.diff_header {	width: 1em;}
+		.difference {
+			width: 1em;
+			background: #A9D0F5;
+		}
+		.differencei {
+			width: 1em;
+			background: Gold;
+		}
+		.differenced {
+			width: 1em;
+			background: #A9D0F5;
+		}
+		.has_difference { 
+			background: #97D397;
+			width: 1em;
+			user-select: none;
+		}
+		.diff_header, .diff_next {
+			vertical-align:top;
+			background: #dedede;
+			user-select: none;
+		}
+		.diff_next {padding-top:2px;}
+		.diff_remove {background: Pink;}
+		.diff_insert {background: SkyBlue;}
+		.diff_eq {background: #eeeeee;}
+		.diff_eqhidden {display: none;}
+		.diff_ne {background: LightGreen;}
+		.lineContent {
+			vertical-align:top;
+			text-align:left;
+		} 
+	</style>
+			
+    <div class="mainContent">
+
+$titleline$
+
+@titleline     <h2 id="group-list" style="text-align: left;">$titleline$</h2>
+$list$
+@[list     <ul type="square" style="text-align: left;">
+@rowlist      <li id="_@idtablecmp@" class="diff_@color@"><a href="#@idtablecmp@"> $rowlist$ </a></li>
+@]list     </ul>
+
+@tableheader@
+    <div class="logoheader">
+        <div class="logo_background">
+            <a id="@idtablecmp@" href="#_@idtablecmp@" class="logotext">$rowlist$</a>
+        </div>
+    </div>
+@tableheader@
+
+@tableheader2     <table class="text-compare" id="t@idtablecmp@" cellspacing="0" cellpadding="0" rules="groups">        <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>        <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>        <tbody>
+
+
+$tables$
+
+    </div>
+
+
+        
+<script>       
+function c(t)
+{
+         console.log(t.parentNode)
+         console.log(t.parentNode.parentNode.parentNode)
+         var myTab= t.parentNode.parentNode.parentNode;
+         var text='';
+         var j=t.cellIndex;
+         console.log('cellIndex='+t.cellIndex);
+ 
+         for (i = 0; i < myTab.rows.length; i++) {
+          text = text + myTab.rows.item(i).cells.item(j+2).innerText +'\n';
+        }
+ 
+var node = document.createElement('textarea');
+          var selection = document.getSelection();
+ 
+          node.textContent = text;
+          document.body.appendChild(node);
+ 
+          selection.removeAllRanges();
+          node.select();
+          document.execCommand('copy');
+ 
+          selection.removeAllRanges();
+          document.body.removeChild(node);
+          alert('SQL copy to clipbord Length: '+text.length);
+}
+function d(t)
+{
+         console.log(t.parentNode)
+         
+         var myTab= t.parentNode.parentNode.parentNode;
+         var text='';
+         var j=t.cellIndex;
+         console.log('cellIndex='+t.cellIndex);
+ 
+         for (i = 0; i < myTab.rows.length; i++) {
+	  var sel=myTab.rows.item(i).cells.item(j+1);
+	  // sel.setAttribute("style", "color:grey; user-select: none;");
+          console.log(sel.style.userSelect);
+	  if (sel.style.userSelect=="") { sel.setAttribute("style", "color:grey; user-select: none;");}
+		 else 
+			{sel.style.userSelect = null; sel.style.color= null;}
+
+	  //console.log(sel.style)
+
+        }
+
+}
+
+ 
+</script>        
+
+
+</body></html>