Skip to content

Commit

Permalink
v2.0.3.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@briandunnington
briandunnington committed May 28, 2010
1 parent b3f54d2 commit 96e4a20
Show file tree
Hide file tree
Showing 117 changed files with 2,393 additions and 1,223 deletions.
25 changes: 24 additions & 1 deletion Growl Connectors/Javascript/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
font-weight:bold;
padding:0 20px;
x-min-width:160px;
x-_width:160px;}
_width:160px;}
input, textarea {width:320px;}
</style>
</head>
Expand Down Expand Up @@ -69,6 +69,8 @@ <h3>Growl for Windows - Javascript Connector Example</h3>
</div>

<script type="text/javascript">
var isGrowlRunning = false;

function register(){
var application = new Growl.Application();
application.name = "Javascript Example App";
Expand Down Expand Up @@ -129,6 +131,7 @@ <h3>Growl for Windows - Javascript Connector Example</h3>

config.oncallback = cb;
config.onerror = onerror;
config.onok = onok;
Growl.init(config);
}

Expand All @@ -147,6 +150,26 @@ <h3>Growl for Windows - Javascript Connector Example</h3>
function onerror(errorCode, errorDescription){
alert("ERROR:\r\n\r\n" + errorCode + " - " + errorDescription);
}

function onok(){
if(!isGrowlRunning){
alert("ok");
isGrowlRunning = true;
}
}

/*
Growl.onconnect = function(){alert("onconnect")};
Growl.ondisconnect = function(){alert("ondisconnect")};
Growl.ondata = function(){alert("ondata")};
Growl.onioerror = function(){alert("onioerror")};
Growl.onsecurityerror = function(){alert("onsecurityerror")};
Growl.onprogressevent = function(){alert("onprogressevent")};
Growl.onok = function(){alert("onok")};
Growl.oncallback = function(){alert("oncallback")};
Growl.onerror = function(){alert("onerror")};
*/

</script>
</body>
</html>
10 changes: 6 additions & 4 deletions Growl Connectors/Javascript/growl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ Growl = function(){
}

function oncallbackInternal(notificationID, action, context, type, timestamp) {}
function onokInternal() {}
function onerrorInternal(response) {}
function onsecurityerrorInternal(){}

return {
oncallback : oncallbackInternal,
onerror : onerrorInternal,

onok : function(){
//alert("ok");
},
onok : onokInternal,
onsecurityerror : onsecurityerrorInternal,

onready : function(){
swf = document.getElementById(swfID);
Expand All @@ -48,8 +48,10 @@ Growl = function(){
if(config && config.passwordHashAlgorithm) passwordHashAlgorithm = config.passwordHashAlgorithm;
if(config && config.encryptionAlgorithm) encryptionAlgorithm = config.encryptionAlgorithm;
if(config && config.oncallback) Growl.oncallback = config.oncallback;
if(config && config.onok) Growl.onok = config.onok;
if(config && config.onerror) Growl.onerror = config.onerror;
if(config && config.onready2) Growl.onready2 = config.onready2;
if(config && config.onnotrunning) Growl.onsecurityerror = config.onnotrunning;

if(!containerID){
var container = document.createElement("div");
Expand Down
Binary file modified Growl Connectors/NET/libraries/Growl.Connector.dll
View file
Binary file not shown.
Binary file modified Growl Connectors/NET/libraries/Growl.CoreLibrary.dll
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion Growl Extras/BlueFlower/BlueFlower/BlueFlowerDisplay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace BlueFlower
{
public class BlueFlowerDisplay : VisualDisplay
public class BlueFlowerDisplay : MultiMonitorVisualDisplay
{
public const string SETTING_DISPLAYLOCATION = "DisplayLocation";

Expand Down Expand Up @@ -65,6 +65,7 @@ public override string Description
protected override void HandleNotification(Notification notification, string displayName)
{
BlueFlowerWindow win = new BlueFlowerWindow();
win.Tag = this;
win.SetNotification(notification);
win.SetDisplayLocation(GetLocationFromSetting());
this.Show(win);
Expand Down
34 changes: 12 additions & 22 deletions Growl Extras/BlueFlower/BlueFlower/BlueFlowerWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public BlueFlowerWindow()
{
InitializeComponent();

this.Load += new EventHandler(BlueFlowerWindow_Load);
this.AfterLoad += new EventHandler(BlueFlowerWindow_AfterLoad);
this.AutoClosing += new FormClosingEventHandler(BlueFlowerWindow_AutoClosing);

Expand All @@ -35,15 +34,6 @@ public BlueFlowerWindow()
SetAutoCloseInterval(4000);
}

void BlueFlowerWindow_Load(object sender, EventArgs e)
{
// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Right - this.Size.Width;
int y = screen.WorkingArea.Bottom - this.Size.Height;
this.Location = new Point(x, y);
}

void BlueFlowerWindow_AfterLoad(object sender, EventArgs e)
{
DoBeforeShow();
Expand Down Expand Up @@ -88,29 +78,29 @@ public override void SetNotification(Notification n)

private void DoBeforeShow()
{
// multiple monitor support
MultiMonitorVisualDisplay d = (MultiMonitorVisualDisplay)this.Tag;
Screen screen = d.GetPreferredDisplay();

// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Width - this.Width;
int y = screen.WorkingArea.Height;
this.leftXLocation = 0;
this.rightXLocation = x;
this.topYLocation = 0;
this.bottomYLocation = y;
this.DesktopLocation = new Point(x, y);
this.leftXLocation = screen.WorkingArea.Left;
this.rightXLocation = screen.WorkingArea.Right - this.Width;
this.topYLocation = screen.WorkingArea.Top;
this.bottomYLocation = screen.WorkingArea.Bottom - this.Height;

switch (location)
{
case BlueFlowerDisplay.Location.TopLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.topYLocation);
this.Location = new Point(this.leftXLocation, this.topYLocation);
break;
case BlueFlowerDisplay.Location.BottomLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.leftXLocation, this.bottomYLocation);
break;
case BlueFlowerDisplay.Location.BottomRight:
this.DesktopLocation = new Point(this.rightXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.rightXLocation, this.bottomYLocation);
break;
default: // TopRight
this.DesktopLocation = new Point(this.rightXLocation, this.topYLocation);
this.Location = new Point(this.rightXLocation, this.topYLocation);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Growl Extras/BlueFlower/BlueFlower/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
3 changes: 2 additions & 1 deletion Growl Extras/Bubbles/Bubbles/BubblesDisplay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Bubbles
{
public class BubblesDisplay : VisualDisplay
public class BubblesDisplay : MultiMonitorVisualDisplay
{
public const string SETTING_DISPLAYLOCATION = "DisplayLocation";

Expand Down Expand Up @@ -65,6 +65,7 @@ public override string Description
protected override void HandleNotification(Notification notification, string displayName)
{
BubblesWindow win = new BubblesWindow();
win.Tag = this;
win.SetNotification(notification);
win.SetDisplayLocation(GetLocationFromSetting());
this.Show(win);
Expand Down
34 changes: 12 additions & 22 deletions Growl Extras/Bubbles/Bubbles/BubblesWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public BubblesWindow()
{
InitializeComponent();

this.Load += new EventHandler(BubblesWindow_Load);
this.AfterLoad += new EventHandler(BubblesWindow_AfterLoad);
this.AutoClosing += new FormClosingEventHandler(BubblesWindow_AutoClosing);

Expand All @@ -35,15 +34,6 @@ public BubblesWindow()
SetAutoCloseInterval(4000);
}

void BubblesWindow_Load(object sender, EventArgs e)
{
// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Right - this.Size.Width;
int y = screen.WorkingArea.Bottom - this.Size.Height;
this.Location = new Point(x, y);
}

void BubblesWindow_AfterLoad(object sender, EventArgs e)
{
DoBeforeShow();
Expand Down Expand Up @@ -85,29 +75,29 @@ public override void SetNotification(Notification n)

private void DoBeforeShow()
{
// multiple monitor support
MultiMonitorVisualDisplay d = (MultiMonitorVisualDisplay)this.Tag;
Screen screen = d.GetPreferredDisplay();

// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Width - this.Width;
int y = screen.WorkingArea.Height;
this.leftXLocation = 0;
this.rightXLocation = x;
this.topYLocation = 0;
this.bottomYLocation = y;
this.DesktopLocation = new Point(x, y);
this.leftXLocation = screen.WorkingArea.Left;
this.rightXLocation = screen.WorkingArea.Right - this.Width;
this.topYLocation = screen.WorkingArea.Top;
this.bottomYLocation = screen.WorkingArea.Bottom - this.Height;

switch (location)
{
case BubblesDisplay.Location.TopLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.topYLocation);
this.Location = new Point(this.leftXLocation, this.topYLocation);
break;
case BubblesDisplay.Location.BottomLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.leftXLocation, this.bottomYLocation);
break;
case BubblesDisplay.Location.BottomRight:
this.DesktopLocation = new Point(this.rightXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.rightXLocation, this.bottomYLocation);
break;
default: // TopRight
this.DesktopLocation = new Point(this.rightXLocation, this.topYLocation);
this.Location = new Point(this.rightXLocation, this.topYLocation);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Growl Extras/Bubbles/Bubbles/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
3 changes: 2 additions & 1 deletion Growl Extras/Degree Display/Degree Display/DegreeDisplay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Degree
{
public class DegreeDisplay : VisualDisplay
public class DegreeDisplay : MultiMonitorVisualDisplay
{
public const string SETTING_DISPLAYLOCATION = "DisplayLocation";

Expand Down Expand Up @@ -65,6 +65,7 @@ public override string Description
protected override void HandleNotification(Notification notification, string displayName)
{
DegreeWindow win = new DegreeWindow();
win.Tag = this;
win.SetNotification(notification);
win.SetDisplayLocation(GetLocationFromSetting());
this.Show(win);
Expand Down
34 changes: 12 additions & 22 deletions Growl Extras/Degree Display/Degree Display/DegreeWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public DegreeWindow()
{
InitializeComponent();

this.Load += new EventHandler(DegreeWindow_Load);
this.AfterLoad += new EventHandler(DegreeWindow_AfterLoad);
this.AutoClosing += new FormClosingEventHandler(DegreeWindow_AutoClosing);

Expand All @@ -35,15 +34,6 @@ public DegreeWindow()
SetAutoCloseInterval(4000);
}

void DegreeWindow_Load(object sender, EventArgs e)
{
// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Right - this.Size.Width;
int y = screen.WorkingArea.Bottom - this.Size.Height;
this.Location = new Point(x, y);
}

void DegreeWindow_AfterLoad(object sender, EventArgs e)
{
DoBeforeShow();
Expand Down Expand Up @@ -85,29 +75,29 @@ public override void SetNotification(Notification n)

private void DoBeforeShow()
{
// multiple monitor support
MultiMonitorVisualDisplay d = (MultiMonitorVisualDisplay)this.Tag;
Screen screen = d.GetPreferredDisplay();

// set initial location
Screen screen = Screen.FromControl(this);
int x = screen.WorkingArea.Width - this.Width;
int y = screen.WorkingArea.Height;
this.leftXLocation = 0;
this.rightXLocation = x;
this.topYLocation = 0;
this.bottomYLocation = y;
this.DesktopLocation = new Point(x, y);
this.leftXLocation = screen.WorkingArea.Left;
this.rightXLocation = screen.WorkingArea.Right - this.Width;
this.topYLocation = screen.WorkingArea.Top;
this.bottomYLocation = screen.WorkingArea.Bottom - this.Height;

switch (location)
{
case DegreeDisplay.Location.TopLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.topYLocation);
this.Location = new Point(this.leftXLocation, this.topYLocation);
break;
case DegreeDisplay.Location.BottomLeft:
this.DesktopLocation = new Point(this.leftXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.leftXLocation, this.bottomYLocation);
break;
case DegreeDisplay.Location.BottomRight:
this.DesktopLocation = new Point(this.rightXLocation, this.bottomYLocation - this.Height);
this.Location = new Point(this.rightXLocation, this.bottomYLocation);
break;
default: // TopRight
this.DesktopLocation = new Point(this.rightXLocation, this.topYLocation);
this.Location = new Point(this.rightXLocation, this.topYLocation);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Growl Extras/Degree Display/Degree Display/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
6 changes: 3 additions & 3 deletions Growl Extras/Feed Monitor/Feed Monitor Deployment/Feed Monitor Deployment.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Feed Monitor"
"ProductCode" = "8:{DC4C593B-CD43-4367-8DB0-0140911B87E3}"
"PackageCode" = "8:{A990284C-9B85-4E9B-8177-4585D19C9224}"
"ProductCode" = "8:{30FE9613-3816-4DC5-AB5C-D40188B96CEE}"
"PackageCode" = "8:{5C4A8712-13E7-4182-93A9-FB9E4D68094C}"
"UpgradeCode" = "8:{E8D784D8-949E-4CC9-BA80-A316D25574D7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.8"
"ProductVersion" = "8:1.0.9"
"Manufacturer" = "8:element code project"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
2 changes: 1 addition & 1 deletion Growl Extras/Feed Monitor/GrowlExtras.FeedMonitor/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.8.0")]
[assembly: AssemblyFileVersion("1.0.9.0")]
1 change: 1 addition & 0 deletions Growl Extras/Feed Monitor/GrowlExtras.FeedMonitor/formats.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<format>yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK</format>
<format>yyyy'-'MM'-'dd'T'HH':'mm':'sszzz</format>
<format>yyyy'-'MM'-'dd'T'HH':'mm':'ss zzz</format>
<format>yyyy'-'MM'-'dd'T'HH':'mm':'ssK</format>
</formats>
<timezones>
<timezone abbr="UT">+00:00</timezone>
Expand Down
2 changes: 1 addition & 1 deletion Growl Extras/Growl Display SDK/Display Installer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
Binary file modified Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll
View file
Binary file not shown.
Binary file modified Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll
View file
Binary file not shown.
Loading

0 comments on commit 96e4a20

Please sign in to comment.