diff --git a/.gitmodules b/.gitmodules
index b3a6267..d1d3fe6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "LiteDB"]
path = LiteDB
- url = git@github.com:mbdavid/LiteDB.git
+ url = https://github.com/mbdavid/LiteDB.git
diff --git a/LiteDB.Studio/Forms/MainForm.cs b/LiteDB.Studio/Forms/MainForm.cs
index 012d0dc..3040c55 100644
--- a/LiteDB.Studio/Forms/MainForm.cs
+++ b/LiteDB.Studio/Forms/MainForm.cs
@@ -293,7 +293,7 @@ private void LoadTreeView()
col.ContextMenuStrip = ctxMenu;
}
}
-
+ public string LastExecCollection = string.Empty;
private void CreateThread(TaskData task)
{
while (true)
@@ -330,6 +330,7 @@ private void CreateThread(TaskData task)
using (var reader = _db.Execute(sql, task.Parameters))
{
task.ReadResult(reader);
+ LastExecCollection = reader.Collection;
}
}
@@ -592,13 +593,22 @@ private void MainForm_KeyDown(object sender, KeyEventArgs e)
}
}
- private void BtnRun_Click(object sender, EventArgs e)
+ private async void BtnRun_Click(object sender, EventArgs e)
{
var sql = txtSql.ActiveTextAreaControl.SelectionManager.SelectedText.Length > 0 ?
txtSql.ActiveTextAreaControl.SelectionManager.SelectedText :
txtSql.Text;
-
+ btnRun.Enabled = false;
+ LastExecCollection= string.Empty;
this.ExecuteSql(sql);
+ await Task.Factory.StartNew(() =>
+ {
+ while (LastExecCollection == string.Empty) {
+ Thread.Sleep(100);
+ }
+ });
+ btnRun.Enabled = true;
+ tabSql.SelectedTab.Text = LastExecCollection+ TAB_SPACES;
}
private void BtnBegin_Click(object sender, EventArgs e)
@@ -876,6 +886,7 @@ private void TabSql_DrawItem(object sender, DrawItemEventArgs e)
}
else
{
+ var size= e.Graphics.MeasureString(tab.Text, font);
e.Graphics.DrawString("×", font, Brushes.SlateGray, e.Bounds.Right - 19, e.Bounds.Top - 1);
e.Graphics.DrawString(tab.Text, e.Font, Brushes.Black, e.Bounds.Left + 12, e.Bounds.Top + 2);
}
diff --git a/LiteDB.Studio/LiteDB.Studio.csproj b/LiteDB.Studio/LiteDB.Studio.csproj
index a5b957d..5e440c8 100644
--- a/LiteDB.Studio/LiteDB.Studio.csproj
+++ b/LiteDB.Studio/LiteDB.Studio.csproj
@@ -1,6 +1,6 @@
-
+
@@ -40,19 +40,67 @@
LiteDB.Studio.ico
+
+ ..\packages\LiteDB.5.0.21\lib\net45\LiteDB.dll
+
- ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+
-
+
+ ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll
+ True
+ True
+
+
+ ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll
+ True
+ True
+
+
+ ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+ True
+ True
+
+
+ ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll
+ True
+ True
+
-
@@ -352,12 +400,6 @@
-
-
- {70e32ff1-6e08-4bf0-9c99-33e1f3711dd7}
- LiteDB
-
-
@@ -365,7 +407,7 @@
-
+
\ No newline at end of file
diff --git a/LiteDB.Studio/packages.config b/LiteDB.Studio/packages.config
index 5365317..daa4076 100644
--- a/LiteDB.Studio/packages.config
+++ b/LiteDB.Studio/packages.config
@@ -1,7 +1,17 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file