Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavidXanatos
DavidXanatos committed Dec 13, 2019
1 parent 4136aa8 commit 0bcf2af
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 83 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).


## [0.65.2] - 2019-12-13

### Fixed
- fixed crash when deleting program items
- fixed issue with program cleanup ribbon bottons
- fixed issues with manual blocklist update
- fixed inconsistencies with access mode filter
- fixed issue installer was instaling to "Program Files(x86)" instead of "Program Files", uninstall and re install to fix the path
- fixed some translation strings



## [0.65.1] - 2019-12-10

### Added
Expand Down
1 change: 0 additions & 1 deletion PrivateWin10/Controls/DnsBlockListsControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ private void BtnUpdate_Click(object sender, RoutedEventArgs e)
{
foreach (BlocklistItem Item in new List<BlocklistItem>(listGrid.SelectedItems.Cast<BlocklistItem>()))
{
BlocklistList.Remove(Item);
App.client.RefreshDomainBlocklist(Item.Blocklist.Url);
}
}
Expand Down
69 changes: 30 additions & 39 deletions PrivateWin10/Controls/ProgramControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public partial class ProgramControl : UserControl
{
public event RoutedEventHandler Click;

public ProgramSet Program;
public ProgramSet progSet;

private CategoryModel CatModel;

Expand Down Expand Up @@ -77,7 +77,7 @@ public ProgramControl(ProgramSet prog, CategoryModel Categories)

SuspendChange--;

Program = prog;
progSet = prog;

DoUpdate();

Expand Down Expand Up @@ -111,7 +111,7 @@ public void DoUpdate()
{
SuspendChange++;

ImgFunc.GetIconAsync(Program.GetIcon(), icon.Width, (ImageSource src) => {
ImgFunc.GetIconAsync(progSet.GetIcon(), icon.Width, (ImageSource src) => {
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(new Action(() =>
Expand All @@ -123,14 +123,14 @@ public void DoUpdate()
});

//name.Content = process.Name;
name.Text = Program.config.Name;
name.Text = progSet.config.Name;

int blockedConnections = 0;
int allowedConnections = 0;
int socketCount = 0;
UInt64 uploadRate = 0;
UInt64 downloadRate = 0;
foreach (Program prog in Program.Programs.Values)
foreach (Program prog in progSet.Programs.Values)
{
blockedConnections += prog.BlockedCount;
allowedConnections += prog.AllowedCount;
Expand All @@ -143,31 +143,22 @@ public void DoUpdate()
info.Content = Translate.fmt("lbl_prog_info", blockedConnections, allowedConnections, socketCount,
FileOps.FormatSize((decimal)uploadRate), FileOps.FormatSize((decimal)downloadRate));

WpfFunc.CmbSelect(category, Program.config.Category == null ? "" : Program.config.Category);
WpfFunc.CmbSelect(category, progSet.config.Category == null ? "" : progSet.config.Category);

if (Program.config.NetAccess == ProgramSet.Config.AccessLevels.Unconfigured)
{
cmbAccess.Background = GetAccessColor(Program.config.CurAccess);
WpfFunc.CmbSelect(cmbAccess, Program.config.CurAccess.ToString());
}
WpfFunc.CmbSelect(cmbAccess, progSet.config.GetAccess().ToString());
if (progSet.config.NetAccess != ProgramSet.Config.AccessLevels.Unconfigured && progSet.config.NetAccess != progSet.config.CurAccess)
cmbAccess.Background /*grid.Background*/ = FindResource("Stripes") as DrawingBrush;
else
{
if (Program.config.NetAccess != ProgramSet.Config.AccessLevels.Unconfigured && Program.config.NetAccess != Program.config.CurAccess)
cmbAccess.Background /*grid.Background*/ = FindResource("Stripes") as DrawingBrush;
else
cmbAccess.Background = GetAccessColor(Program.config.NetAccess);

WpfFunc.CmbSelect(cmbAccess, Program.config.NetAccess.ToString());
}
cmbAccess.Background = GetAccessColor(progSet.config.GetAccess());

chkNotify.IsChecked = Program.config.GetNotify();
chkNotify.IsChecked = progSet.config.GetNotify();

progGrid.Items.Clear();

foreach (Program prog in Program.Programs.Values)
foreach (Program prog in progSet.Programs.Values)
progGrid.Items.Insert(0, new ProgEntry(prog));

btnSplit.IsEnabled = Program.Programs.Count > 1;
btnSplit.IsEnabled = progSet.Programs.Count > 1;
SuspendChange--;
}

Expand Down Expand Up @@ -249,8 +240,8 @@ private void category_SelectionChanged(object sender, SelectionChangedEventArgs
else
Value = (cat.Content as String);

Program.config.Category = Value;
App.client.UpdateProgram(Program.guid, Program.config);
progSet.config.Category = Value;
App.client.UpdateProgram(progSet.guid, progSet.config);
}

private void name_LostFocus(object sender, RoutedEventArgs e)
Expand All @@ -263,8 +254,8 @@ private void name_LostFocus(object sender, RoutedEventArgs e)
//name.BorderBrush = Brushes.Transparent;
name.IsReadOnly = true;

Program.config.Name = name.Text;
App.client.UpdateProgram(Program.guid, Program.config);
progSet.config.Name = name.Text;
App.client.UpdateProgram(progSet.guid, progSet.config);
}
}

Expand All @@ -285,8 +276,8 @@ private void name_KeyDown(object sender, KeyEventArgs e)
name.IsReadOnly = true;
if (e.Key == Key.Enter)
{
Program.config.Name = name.Text;
App.client.UpdateProgram(Program.guid, Program.config);
progSet.config.Name = name.Text;
App.client.UpdateProgram(progSet.guid, progSet.config);
}
}
}
Expand All @@ -308,12 +299,12 @@ private void icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

if (e.ChangedButton == MouseButton.Left && e.ClickCount == 2) // double click
{
string iconFile = OpenIconPicker(Program.GetIcon());
string iconFile = OpenIconPicker(progSet.GetIcon());
if (iconFile != null)
{
Program.config.Icon = iconFile;
App.client.UpdateProgram(Program.guid, Program.config);
icon.Source = ImgFunc.GetIcon(Program.GetIcon(), icon.Width);
progSet.config.Icon = iconFile;
App.client.UpdateProgram(progSet.guid, progSet.config);
icon.Source = ImgFunc.GetIcon(progSet.GetIcon(), icon.Width);
}
}
}
Expand Down Expand Up @@ -380,7 +371,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
if (progWnd.ShowDialog() != true)
return;

if (!App.client.AddProgram(progWnd.ID, Program.guid))
if (!App.client.AddProgram(progWnd.ID, progSet.guid))
MessageBox.Show(Translate.fmt("msg_already_exist"), App.Title, MessageBoxButton.OK, MessageBoxImage.Exclamation);
}

Expand All @@ -395,7 +386,7 @@ private void btnSplit_Click(object sender, RoutedEventArgs e)
ProgEntry[] Temp = new ProgEntry[progGrid.SelectedItems.Count];
progGrid.SelectedItems.CopyTo(Temp, 0);
foreach (ProgEntry item in Temp)
App.client.SplitPrograms(Program.guid, item.Prog.ID);
App.client.SplitPrograms(progSet.guid, item.Prog.ID);
}

private void btnRemove_Click(object sender, RoutedEventArgs e)
Expand All @@ -406,7 +397,7 @@ private void btnRemove_Click(object sender, RoutedEventArgs e)
ProgEntry[] Temp = new ProgEntry[progGrid.SelectedItems.Count];
progGrid.SelectedItems.CopyTo(Temp, 0);
foreach (ProgEntry item in Temp)
App.client.RemoveProgram(Program.guid, item.Prog.ID);
App.client.RemoveProgram(progSet.guid, item.Prog.ID);
}

private void progGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
Expand All @@ -427,17 +418,17 @@ private void chkNotify_Click(object sender, RoutedEventArgs e)
if (SuspendChange > 0)
return;

Program.config.SetNotify(chkNotify.IsChecked);
App.client.UpdateProgram(Program.guid, Program.config);
progSet.config.SetNotify(chkNotify.IsChecked);
App.client.UpdateProgram(progSet.guid, progSet.config);
}

private void cmbAccess_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (SuspendChange > 0)
return;

Program.config.NetAccess = (ProgramSet.Config.AccessLevels)(cmbAccess.SelectedItem as ComboBoxItem).Tag;
App.client.UpdateProgram(Program.guid, Program.config);
progSet.config.NetAccess = (ProgramSet.Config.AccessLevels)(cmbAccess.SelectedItem as ComboBoxItem).Tag;
App.client.UpdateProgram(progSet.guid, progSet.config);
}

/*private void btnCustimize_Click(object sender, RoutedEventArgs e)
Expand Down
22 changes: 11 additions & 11 deletions PrivateWin10/Controls/ProgramListControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void UpdateProgramList(List<ProgramSet> progs)
ProgramControl item;
if (Programs.TryGetValue(prog.guid, out item))
{
item.Program = prog;
item.progSet = prog;
item.DoUpdate();
OldProcesses.Remove(prog.guid);
}
Expand Down Expand Up @@ -147,7 +147,7 @@ public void UpdateProgramItems(List<ProgramSet> progs)
ProgramControl item;
if (Programs.TryGetValue(prog.guid, out item))
{
item.Program = prog;
item.progSet = prog;
item.DoUpdate();
}
else
Expand All @@ -170,12 +170,12 @@ int DoSort(ProgramControl l, ProgramControl r)
{
switch (SortBy)
{
case Sorts.Name: return l.Program.config.Name.CompareTo(r.Program.config.Name);
case Sorts.NameRev: return r.Program.config.Name.CompareTo(l.Program.config.Name);
case Sorts.LastActivity: return r.Program.GetLastActivity().CompareTo(l.Program.GetLastActivity());
case Sorts.DataRate: return r.Program.GetDataRate().CompareTo(l.Program.GetDataRate());
case Sorts.SocketCount: return r.Program.GetSocketCount().CompareTo(l.Program.GetSocketCount());
case Sorts.ModuleCount: return r.Program.Programs.Count.CompareTo(l.Program.Programs.Count);
case Sorts.Name: return l.progSet.config.Name.CompareTo(r.progSet.config.Name);
case Sorts.NameRev: return r.progSet.config.Name.CompareTo(l.progSet.config.Name);
case Sorts.LastActivity: return r.progSet.GetLastActivity().CompareTo(l.progSet.GetLastActivity());
case Sorts.DataRate: return r.progSet.GetDataRate().CompareTo(l.progSet.GetDataRate());
case Sorts.SocketCount: return r.progSet.GetSocketCount().CompareTo(l.progSet.GetSocketCount());
case Sorts.ModuleCount: return r.progSet.Programs.Count.CompareTo(l.progSet.Programs.Count);
}
return 0;
}
Expand All @@ -194,7 +194,7 @@ int DoSort(ProgramControl l, ProgramControl r)
row.Height = GridLength.Auto; //new GridLength(item.Height + 2);
Grid.SetRow(item, i);

item.Visibility = (CurFilter != null && FirewallPage.DoFilter(CurFilter, item.Program)) ? Visibility.Collapsed : Visibility.Visible;
item.Visibility = (CurFilter != null && FirewallPage.DoFilter(CurFilter, item.progSet)) ? Visibility.Collapsed : Visibility.Visible;
}

while (OrderList.Count < this.processGrid.RowDefinitions.Count)
Expand Down Expand Up @@ -311,15 +311,15 @@ public List<object> GetSelectedItems()
{
List<object> progSets = new List<object>();
foreach (var item in SelectedPrograms)
progSets.Add(item.Program);
progSets.Add(item.progSet);
return progSets;
}

public ProgramSet GetProgSet(Guid guid)
{
ProgramControl item;
if (Programs.TryGetValue(guid, out item))
return item.Program;
return item.progSet;
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion PrivateWin10/Controls/ProgramTreeControl/ProgSetTreeItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ProgSetTreeItem : TreeItem, IBranchItem

// columns BEGIN
public override string Category => progSet.config.Category;
public override string Access => progSet.config.NetAccess.ToString();
public override string Access => progSet.config.GetAccess().ToString(); // progSet.config.NetAccess.ToString();

public override int Rules => progSet.Programs.Values.Sum(t => t.RuleCount);
public override int Allowed => progSet.Programs.Values.Sum(t => t.AllowedCount);
Expand Down
7 changes: 7 additions & 0 deletions PrivateWin10/Core/ProgramSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ public enum AccessLevels
public bool IsSilenced() { return SilenceUntill != 0 && SilenceUntill > MiscFunc.GetUTCTime(); }
public AccessLevels NetAccess = AccessLevels.Unconfigured;
public AccessLevels CurAccess = AccessLevels.Unconfigured;
public AccessLevels GetAccess()
{
if (NetAccess == AccessLevels.Unconfigured)
return CurAccess;
else
return NetAccess;
}

public Config Clone()
{
Expand Down
4 changes: 2 additions & 2 deletions PrivateWin10/IPC/Priv10Host.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected override RemoteCall Process(RemoteCall call)
{
call.args = App.engine.RemoveDomainBlocklist((string)call.args);
}
else if (call.func == "RemoveDomainFilter")
else if (call.func == "RefreshDomainBlocklist")
{
call.args = App.engine.RefreshDomainBlocklist((string)call.args);
}
Expand Down Expand Up @@ -202,7 +202,7 @@ protected override RemoteCall Process(RemoteCall call)

else
{
call.args = new Exception("Unknon FunctionCall");
call.args = new Exception("Unknown FunctionCall");
}
}
/*catch (Exception err)
Expand Down
5 changes: 3 additions & 2 deletions PrivateWin10/Pages/FirewallPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ static public bool DoFilter(FilterPreset Filter, ProgramSet prog)
if ((prog.config.NetAccess == ProgramSet.Config.AccessLevels.Unconfigured || prog.config.CurAccess == prog.config.NetAccess) && prog.Programs.Sum(t => t.Value.ChgedRules) == 0)
return true;
}
else if (Filter.Access != prog.config.CurAccess)
else if (Filter.Access != prog.config.GetAccess())
return true;
}

Expand Down Expand Up @@ -887,7 +887,7 @@ private void btnRemove_Click(object sender, RoutedEventArgs e)
foreach (var item in items)
{
var prog = item as Program;
if (progSets.Contains(prog.ProgSet.guid))
if (prog == null || progSets.Contains(prog.ProgSet.guid))
continue;

App.client.RemoveProgram(prog.ProgSet.guid, prog.ID);
Expand Down Expand Up @@ -982,6 +982,7 @@ private void btnCleanup_Click(object sender, RoutedEventArgs e)

private void btnCleanupEx_Click(object sender, RoutedEventArgs e)
{
e.Handled = true; // or else btnCleanup_Click will be triggered to
if (MessageBox.Show(Translate.fmt("msg_clean_progs_ex"), App.Title, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
return;
int Count = App.client.CleanUpPrograms(true);
Expand Down
Loading

0 comments on commit 0bcf2af

Please sign in to comment.