diff --git a/RedisExplorer.sln b/RedisExplorer.sln
index dc0db70..4a2273c 100644
--- a/RedisExplorer.sln
+++ b/RedisExplorer.sln
@@ -7,18 +7,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisExplorer", "RedisExplo
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "RedisExplorerSetup", "RedisExplorerSetup\RedisExplorerSetup.vdproj", "{B5CF8FD0-6819-4FEF-95FD-11E152086CE3}"
EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisExplorerInstaller", "RedisExplorerInstaller\RedisExplorerInstaller.wixproj", "{FEEAA91E-2A74-4B9A-B272-D1670069B4CC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{40C37D45-2DDB-482F-A893-4748B92D8D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40C37D45-2DDB-482F-A893-4748B92D8D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {40C37D45-2DDB-482F-A893-4748B92D8D3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {40C37D45-2DDB-482F-A893-4748B92D8D3F}.Debug|x86.Build.0 = Debug|Any CPU
{40C37D45-2DDB-482F-A893-4748B92D8D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40C37D45-2DDB-482F-A893-4748B92D8D3F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {40C37D45-2DDB-482F-A893-4748B92D8D3F}.Release|x86.ActiveCfg = Release|Any CPU
+ {40C37D45-2DDB-482F-A893-4748B92D8D3F}.Release|x86.Build.0 = Release|Any CPU
{B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Debug|Any CPU.ActiveCfg = Debug
+ {B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Debug|x86.ActiveCfg = Debug
+ {B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Debug|x86.Build.0 = Debug
{B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Release|Any CPU.ActiveCfg = Release
+ {B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Release|x86.ActiveCfg = Release
+ {B5CF8FD0-6819-4FEF-95FD-11E152086CE3}.Release|x86.Build.0 = Release
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Debug|x86.ActiveCfg = Debug|x86
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Debug|x86.Build.0 = Debug|x86
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Release|Any CPU.ActiveCfg = Release|x86
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Release|x86.ActiveCfg = Release|x86
+ {FEEAA91E-2A74-4B9A-B272-D1670069B4CC}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/RedisExplorer/AppWindowManager.cs b/RedisExplorer/AppWindowManager.cs
index 99a22df..8e6e616 100644
--- a/RedisExplorer/AppWindowManager.cs
+++ b/RedisExplorer/AppWindowManager.cs
@@ -10,17 +10,9 @@ protected override Window EnsureWindow(object model, object view, bool isDialog)
{
var window = base.EnsureWindow(model, view, isDialog);
- var m = model as AppViewModel;
-
window.SizeToContent = SizeToContent.Manual;
window.Title = "Redis Explorer";
- //window.Icon = new BitmapImage(new Uri("pack://application:,,,/RedisExplorer;component/Assets/Images/arrows.ico"));
-
- //window.Top = appsettings.Top;
- //window.Left = appsettings.Left;
- //window.Width = 600d;
- //window.Height = 400d;
return window;
}
diff --git a/RedisExplorer/Controls/KeyStringViewModel.cs b/RedisExplorer/Controls/KeyStringViewModel.cs
index e01b5cc..3b4a753 100644
--- a/RedisExplorer/Controls/KeyStringViewModel.cs
+++ b/RedisExplorer/Controls/KeyStringViewModel.cs
@@ -36,7 +36,7 @@ public void Handle(TreeItemSelectedMessage message)
{
if (message?.SelectedItem is RedisKeyString && !message.SelectedItem.HasChildren)
{
- DisplayStringValue(message.SelectedItem as RedisKeyString);
+ DisplayStringValue((RedisKeyString) message.SelectedItem);
}
}
@@ -50,7 +50,7 @@ public void Handle(RedisKeyReloadMessage message)
var redisKeyString = message.Item as RedisKeyString;
if (redisKeyString != null)
{
- KeyValue = (redisKeyString.KeyValue);
+ DisplayStringValue(redisKeyString);
}
}
@@ -59,20 +59,22 @@ public void Handle(RedisKeyReloadMessage message)
#region Private
private void DisplayStringValue(RedisKeyString item)
- {
- if (item != null)
- {
- var value = item.KeyValue;
+ {
+ if (item == null)
+ {
+ return;
+ }
+
+ var value = item.KeyValue;
- try
- {
- KeyValue = JObject.Parse(value).ToString(Formatting.Indented);
- }
- catch (JsonReaderException)
- {
- KeyValue = value;
- }
+ try
+ {
+ KeyValue = JObject.Parse(value).ToString(Formatting.Indented);
}
+ catch (JsonReaderException)
+ {
+ KeyValue = value;
+ }
}
#endregion
diff --git a/RedisExplorerInstaller/RedisExplorerInstaller.wixproj b/RedisExplorerInstaller/RedisExplorerInstaller.wixproj
new file mode 100644
index 0000000..d4be442
--- /dev/null
+++ b/RedisExplorerInstaller/RedisExplorerInstaller.wixproj
@@ -0,0 +1,45 @@
+
+
+
+ Debug
+ x86
+ 3.9
+ feeaa91e-2a74-4b9a-b272-d1670069b4cc
+ 2.0
+ RedisExplorerInstaller
+ Package
+ $(MSBuildExtensionsPath32)\WiX Toolset\v4\Wix.targets
+ $(MSBuildExtensionsPath)\WiX Toolset\v4\Wix.targets
+
+
+ bin\$(Configuration)\
+ obj\$(Configuration)\
+ Debug
+
+
+ bin\$(Configuration)\
+ obj\$(Configuration)\
+
+
+
+ RedisExplorer
+ {40c37d45-2ddb-482f-a893-4748b92d8d3f}
+ True
+ True
+ Binaries;Content;Satellites
+ INSTALLFOLDER
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RedisExplorerInstaller/RedisExplorerInstaller.wxs b/RedisExplorerInstaller/RedisExplorerInstaller.wxs
new file mode 100644
index 0000000..60deb06
--- /dev/null
+++ b/RedisExplorerInstaller/RedisExplorerInstaller.wxs
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file