Skip to content

Commit

Permalink
Beta19 release
Browse files Browse the repository at this point in the history
  • Loading branch information
briandunnington committed Jul 29, 2009
1 parent 2798efc commit 4bd4370
Show file tree
Hide file tree
Showing 50 changed files with 830 additions and 290 deletions.
Binary file modified Growl Connectors/Javascript/GrowlFlashConnector.swf
Binary file not shown.
Binary file modified Growl Connectors/NET/libraries/Growl.Connector.dll
Binary file not shown.
Binary file modified Growl Connectors/NET/libraries/Growl.CoreLibrary.dll
Binary file not shown.
Binary file modified Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll
Binary file not shown.
Binary file modified Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Growl/Growl.Connector/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.CoreLibrary/ImageConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static System.Drawing.Image ImageFromUrl(string url)
}
else
{
System.Net.WebClient wc = new System.Net.WebClient();
System.Net.WebClient wc = new System.Net.WebClient(); // TODO: consider changing this to WebClientEx
using (wc)
{
byte[] bytes = wc.DownloadData(uri);
Expand Down
2 changes: 1 addition & 1 deletion Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Daemon/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.DisplayStyle/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Displays.Plain/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Displays.Smokestack/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Displays.Standard/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Displays.Toast/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.Displays.Visor/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
2 changes: 1 addition & 1 deletion Growl/Growl.UDPLegacy/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0")]
3 changes: 1 addition & 2 deletions Growl/Growl/AddComputer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public partial class AddComputer : Form
{
private Controller controller;
private bool isSubscription;
private IForwardDestinationHandler handler;
private ForwardDestinationSettingsPanel settingsPanel;
private ForwardDestination fdEdit;

Expand Down Expand Up @@ -81,9 +80,9 @@ private void ShowInputs(ForwardDestinationListItem fdli, IForwardDestinationHand
ForwardDestinationSettingsPanel panel = handler.GetSettingsPanel(this.fdEdit);
this.settingsPanel = panel;
panel.ValidChanged += new ForwardDestinationSettingsPanel.ValidChangedEventHandler(panel_ValidChanged);
panel.Initialize(this.isSubscription, fdli, this.fdEdit);
this.panelDetails.Controls.Add(panel);
panel.Visible = true;
panel.Initialize(this.isSubscription, fdli, this.fdEdit);

this.buttonSave.Visible = true;
}
Expand Down
8 changes: 5 additions & 3 deletions Growl/Growl/ChooseForwarding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,18 @@ private void ChooseForwarding_Load(object sender, EventArgs e)

this.BackColor = Color.FromArgb(240, 240, 240);

this.forwardListView1.AllDisabled = false;
if (this.controller != null && this.prefs != null)
{
if (this.controller.ForwardDestinations != null && this.controller.ForwardDestinations.Count > 0)
{
Dictionary<string, ForwardDestination> computers = new Dictionary<string,ForwardDestination>();
foreach (ForwardDestination fc in this.controller.ForwardDestinations.Values)
{
bool enabled = this.prefs.PrefForwardCustomList.Contains(fc.Description);
bool enabled = this.prefs.PrefForwardCustomList.Contains(fc.Key);
ForwardDestination clone = fc.Clone();
fc.Enabled = enabled;
clone.Key = fc.Key;
clone.Enabled = enabled;
computers.Add(clone.Description, clone);
}
this.forwardListView1.Computers = computers;
Expand Down Expand Up @@ -80,7 +82,7 @@ private void buttonSave_Click(object sender, EventArgs e)
List<string> computers = new List<string>();
foreach (ForwardDestination fc in this.forwardListView1.Computers.Values)
{
if (fc.Enabled) computers.Add(fc.Description);
if (fc.Enabled) computers.Add(fc.Key);
}
this.prefs.PrefForwardCustomList = computers;

Expand Down
3 changes: 3 additions & 0 deletions Growl/Growl/Growl.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@
<Compile Include="_source\UDPForwardDestinationHandler.cs" />
<Compile Include="_source\UserSettingsProvider.cs" />
<Compile Include="_source\Utility.cs" />
<Compile Include="_source\WebClientEx.cs">
<SubType>Component</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Resources\Config.png" />
Expand Down
19 changes: 15 additions & 4 deletions Growl/Growl/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,10 @@ private void checkBoxEnableForwarding_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.AllowForwarding = this.checkBoxEnableForwarding.Checked;
Properties.Settings.Default.Save();

this.forwardListView.AllDisabled = !Properties.Settings.Default.AllowForwarding;
this.forwardListView.Refresh();

//this.forwardListView.SelectedIndices.Clear();
//this.forwardListView.Enabled = this.checkBoxEnableForwarding.Checked;
//this.buttonAddComputer.Enabled = this.checkBoxEnableForwarding.Checked;
Expand Down Expand Up @@ -1059,14 +1063,21 @@ private void checkBoxEnableSubscriptions_CheckedChanged(object sender, EventArgs
{
Properties.Settings.Default.EnableSubscriptions = this.checkBoxEnableSubscriptions.Checked;
Properties.Settings.Default.Save();
//this.subscribedListView.SelectedIndices.Clear();
//this.subscribedListView.Enabled = this.checkBoxEnableSubscriptions.Checked;
//this.buttonSubscribe.Enabled = this.checkBoxEnableSubscriptions.Checked;
this.buttonUnsubscribe.Enabled = false;

foreach (Subscription subscription in this.controller.Subscriptions.Values)
{
subscription.Allowed = this.checkBoxEnableSubscriptions.Checked;
}

this.subscribedListView.AllDisabled = !Properties.Settings.Default.EnableSubscriptions;
this.subscribedListView.Refresh();

if (!this.checkBoxEnableSubscriptions.Checked)
this.buttonUnsubscribe.Enabled = false;
else
{
if (this.subscribedListView.SelectedIndices != null && this.subscribedListView.SelectedIndices.Count > 0) this.buttonUnsubscribe.Enabled = true;
}
}

private void subscribedListView_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions Growl/Growl/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
// Revision
//
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.18")]
[assembly: AssemblyInformationalVersion("2.0b18")]
[assembly: AssemblyFileVersion("2.0.0.19")]
[assembly: AssemblyInformationalVersion("2.0b19")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
126 changes: 126 additions & 0 deletions Growl/Growl/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions Growl/Growl/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -892,4 +892,60 @@ to Twitter</value>
<value>Prowl Test</value>
<comment>Title of Prowl confirmation notification sent to confirm successful configuration</comment>
</data>
<data name="AddEmail_AnyPriority" xml:space="preserve">
<value>[Any Priority]</value>
<comment>Configure Email Forwarding: label for combobox choice for forwarding all notification priorities</comment>
</data>
<data name="AddEmail_MinimumPriorityLabel" xml:space="preserve">
<value>Only forward when priority is at least:</value>
<comment>Configure Email Forwarding: label for minimum priority</comment>
</data>
<data name="AddEmail_NameLabel" xml:space="preserve">
<value>Description:</value>
<comment>Configure Email Forwarding: 'Description' label</comment>
</data>
<data name="AddEmail_EmailAddressLabel" xml:space="preserve">
<value>Email Address:</value>
<comment>Configure Email Forwarding: 'Email Address' label</comment>
</data>
<data name="AddEmail_SMTPSettingsLabel" xml:space="preserve">
<value>SMTP Settings:</value>
<comment>Configure Email Forwarding: 'SMTP Settings' label</comment>
</data>
<data name="AddEmail_EditSMTP" xml:space="preserve">
<value>edit</value>
<comment>Configure Email Forwarding: 'edit' link</comment>
</data>
<data name="AddEmail_OnlyWhenIdle" xml:space="preserve">
<value>Only forward when idle or away</value>
<comment>Configure Email forwarding: 'only forward when idle' checkbox text</comment>
</data>
<data name="AddEmail_SMTPServerLabel" xml:space="preserve">
<value>Server:</value>
<comment>Configure Email forwarding SMTP Settings: 'Server' label</comment>
</data>
<data name="AddEmail_SMTPPortLabel" xml:space="preserve">
<value>Port:</value>
<comment>Configure Email forwarding SMTP Settings: 'Port' label</comment>
</data>
<data name="AddEmail_SMTPUseAuthentication" xml:space="preserve">
<value>Use Authentication</value>
<comment>Configure Email forwarding SMTP Settings: 'Use Authentication' checkbox text</comment>
</data>
<data name="AddEmail_SMTPUseSSL" xml:space="preserve">
<value>Use SSL</value>
<comment>Configure Email forwarding SMTP Settings: 'Use SSL' checkbox text</comment>
</data>
<data name="AddEmail_SMTPUsernameLabel" xml:space="preserve">
<value>Username:</value>
<comment>Configure Email forwarding SMTP Settings: 'Username' label</comment>
</data>
<data name="AddEmail_SMTPPasswordLabel" xml:space="preserve">
<value>Password:</value>
<comment>Configure Email forwarding SMTP Settings: 'Password' label</comment>
</data>
<data name="AddEmail_SMTPDone" xml:space="preserve">
<value>done</value>
<comment>Configure Email forwarding SMTP Settings: 'done' link</comment>
</data>
</root>
Loading

0 comments on commit 4bd4370

Please sign in to comment.