No commit message

DavidXanatos · Feb 18, 2020 · e670176 · e670176
1 parent f50c4f7
commit e670176
Show file tree

Hide file tree

Showing 33 changed files with 1,454 additions and 454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.75] - 2020-02-18
+
+### Added
+- when a firewall rule gets changed a new notification pupup gets displayed
+- notification window has now tabs
+-- added tab with rule changed notifications
+- notification window can now be opened/closed by single clicking on the tray icon, without discarding contents
+
+### Fixed
+- settings backups names dont longer contian ':'
 
 
 ## [0.74] - 2019-12-21

diff --git a/PrivateSetup/PrivateSetup.csproj b/PrivateSetup/PrivateSetup.csproj
@@ -33,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>

diff --git a/PrivateSetup/Resources/icon.ico b/PrivateSetup/Resources/icon.ico
diff --git a/PrivateSetup/SetupWorker.cs b/PrivateSetup/SetupWorker.cs
@@ -147,12 +147,14 @@ private List<String> Extract(bool Install = false)
                     progData = @"C:\ProgramData";
 
                 IniPath = progData + "\\" + SetupData.AppKey;
-                if (!Directory.Exists(IniPath))
-                    Directory.CreateDirectory(IniPath);
-                MiscFunc.SetAnyDirSec(IniPath); // ensure access for non admins
             }
             else // Note: when the ini file ins inside the application directory the app starts in portable mode
-                IniPath = Data.InstallationPath;
+                IniPath = Data.InstallationPath + @"\Data";
+
+            if (!Directory.Exists(IniPath))
+                Directory.CreateDirectory(IniPath);
+            MiscFunc.SetAnyDirSec(IniPath); // ensure access for non admins
+
             IniPath += @"\" + SetupData.AppKey + ".ini";
 
             App.IniWriteValue(IniPath, "Startup", "Usage", Data.Use.ToString());

diff --git a/PrivateWin10/App.xaml.cs b/PrivateWin10/App.xaml.cs
@@ -262,11 +262,12 @@ public static void Main(string[] args)
 
             InitLicense();
 
+            MainWnd = new MainWindow();
+
             TrayIcon = new TrayIcon();
             TrayIcon.Action += TrayAction;
             TrayIcon.Visible = (GetConfigInt("Startup", "Tray", 0) != 0) || App.TestArg("-autorun");
 
-            MainWnd = new MainWindow();
             if (!App.TestArg("-autorun") || !TrayIcon.Visible)
                 MainWnd.Show();
 
@@ -607,6 +608,14 @@ static void TrayAction(object sender, TrayIcon.TrayEventArgs args)
                             MainWnd.Show();
                         break;
                     }
+                case TrayIcon.Actions.ToggleNotify:
+                    {
+                        if (MainWnd.notificationWnd.IsVisible)
+                            MainWnd.notificationWnd.HideWnd();
+                        else if (!MainWnd.notificationWnd.IsEmpty())
+                            MainWnd.notificationWnd.ShowWnd();
+                        break;
+                    }
                 case TrayIcon.Actions.CloseApplication:
                     {
                         if (Priv10Service.IsInstalled() && AdminFunc.IsAdministrator())

diff --git a/PrivateWin10/Controls/ConnectionNotify.xaml b/PrivateWin10/Controls/ConnectionNotify.xaml
@@ -0,0 +1,77 @@
+<UserControl x:Class="PrivateWin10.Controls.ConnectionNotify"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:PrivateWin10.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button x:Name="btnPrev" Grid.Column="0" Content="Previouse" HorizontalAlignment="Left" Margin="2,2,2,2" VerticalAlignment="Stretch" Width="75" Click="btnPrev_Click"/>
+            <TextBlock x:Name="lblIndex" Text="0/0" Grid.Column="1" HorizontalAlignment="Center" Margin="2,2,2,2" VerticalAlignment="Center"/>
+            <Button x:Name="btnNext" Grid.Column="2" Content="Next" HorizontalAlignment="Right" Margin="2,2,2,2" VerticalAlignment="Stretch" Width="75" Click="btnNext_Click"/>
+        </Grid>
+
+        <GroupBox x:Name="grpBox" Grid.Row="1" Header="Name" Margin="2,6,2,2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
+            <Grid Margin="2,0,2,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <Grid Grid.Row="0">
+                    <!--TextBlock Name="lblName" Text="Name" Grid.Column="1" HorizontalAlignment="Stretch" Margin="2,2,38,2" VerticalAlignment="Top"/-->
+                    <Image Name="imgIcon" Grid.Column="0" HorizontalAlignment="Right" Height="48" Margin="2,2,2,2" VerticalAlignment="Top" Width="48"/>
+                    <TextBlock Name="lblPID" Text="PID:1234" Grid.Column="1" HorizontalAlignment="Stretch" Margin="2,2,52,2" VerticalAlignment="Top" />
+                    <TextBlock Name="lblSubName" Text="Sub Name" Grid.Column="1" HorizontalAlignment="Stretch" Margin="2,18,52,2" VerticalAlignment="Top" TextWrapping="Wrap"/>
+                    <ComboBox x:Name="cmbService" Grid.Column="1" Text="" IsEditable="true" IsReadOnly="true" Margin="2,18,52,2" VerticalAlignment="Top" Visibility="Collapsed" SelectionChanged="cmbAccess_SelectionChanged"/>
+                    <TextBlock Name="lblPath" Text="Path" Grid.Column="1" HorizontalAlignment="Stretch" Margin="2,38,52,2" VerticalAlignment="Top" TextWrapping="Wrap"  Cursor="Hand" TextDecorations="Underline" MouseDown="LblPath_MouseDown"/>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <DataGrid x:Name="consGrid" AutoGenerateColumns="False" IsReadOnly="true" HorizontalScrollBarVisibility="Visible" GridLinesVisibility="All" MouseDoubleClick="consGrid_MouseDoubleClick">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Protocol" Binding="{Binding Protocol}" />
+                            <DataGridTextColumn Header="Address:Port" Binding="{Binding Address}" />
+                            <DataGridTextColumn Header="Remote Host" Binding="{Binding RemoteHost}" />
+                            <DataGridTextColumn Header="Time Stamp" Binding="{Binding TimeStamp}" />
+                            <DataGridTextColumn Header="Process ID" Binding="{Binding ProcessID}" />
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Grid>
+            </Grid>
+        </GroupBox>
+
+        <Grid Grid.Row="2">
+            <Label x:Name ="lblRemember" Content="Remember:" HorizontalAlignment="Left" Margin="2,2,2,2" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbRemember"  Margin="100,2,2,2" VerticalAlignment="Center" Text=""/>
+        </Grid>
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Button x:Name="btnIgnore" Grid.Column="0" Content="Ignore" HorizontalAlignment="Left" Margin="2,2,2,2" VerticalAlignment="Stretch" Width="75" Click="btnIgnore_Click"/>
+            <ComboBox x:Name="cmbAccess" Margin="2,2,2,2" Grid.Column="1" VerticalAlignment="Top" SelectionChanged="cmbAccess_SelectionChanged" />
+            <Button x:Name="btnApply" Grid.Column="2" Content="Apply" HorizontalAlignment="Right" Margin="2,2,2,2" VerticalAlignment="Stretch" Width="75" Click="btnApply_Click"/>
+            <!--Controls:SplitButton Name="btnApply" Grid.Column="2" Margin="2,2,2,2" Width="75" HorizontalAlignment="Center" VerticalAlignment="Stretch" HorizontalContentAlignment="Left" DisplayMemberPath="Content">
+                    <Controls:SplitButton.Icon>
+                        <iconPacks:PackIconModern Margin="6" Kind="Alert" />
+                    </Controls:SplitButton.Icon>
+                </Controls:SplitButton-->
+        </Grid>
+
+    </Grid>
+</UserControl>