beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

windows statusicon: Use '[X] Notifications' menu item. See #640

Browse source
This commit is contained in:
Hylke Bons 2012-03-17 16:23:05 +00:00
parent 12b27f3eb2
commit e848c5a129
3 changed files with 69 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/Windows/SparkleEventLog.cs
View file

@ -99,7 +99,7 @@ namespace SparkleShare {
this.web_browser = new WebBrowser () {
Width = Width - 6,
Height = Height - 36 - 12
Height = Height - 36 - 11
};
this.web_browser.ObjectForScripting = new SparkleScriptingObject ();;

51
SparkleShare/Windows/SparkleStatusIcon.cs
View file

@ -16,13 +16,13 @@
using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Media;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using Drawing = System.Drawing;
using Forms = System.Windows.Forms;
namespace SparkleShare {
@ -32,8 +32,8 @@ namespace SparkleShare {
public SparkleStatusIconController Controller = new SparkleStatusIconController();
private Forms.Timer Animation;
private Bitmap [] AnimationFrames;
private Bitmap ErrorIcon;
private Drawing.Bitmap [] AnimationFrames;
private Drawing.Bitmap ErrorIcon;
private int FrameNumber;
private string StateText;
private ContextMenu context_menu;
@ -138,9 +138,9 @@ namespace SparkleShare {
}
private Bitmap [] CreateAnimationFrames ()
private Drawing.Bitmap [] CreateAnimationFrames ()
{
return new Bitmap [] {
return new Drawing.Bitmap [] {
SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-i"),
SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-ii"),
SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-iii"),
@ -183,14 +183,15 @@ namespace SparkleShare {
IsEnabled = false
};
System.Windows.Controls.Image i = new System.Windows.Controls.Image();
i.Source = SparkleUIHelpers.GetImageSource ("folder-sparkleshare-windows-16");
i.Width = 16;
i.Height = 16;
Image folder_image = new Image () {
Source = SparkleUIHelpers.GetImageSource ("folder-sparkleshare-windows-16"),
Width = 16,
Height = 16
};
SparkleMenuItem folder_item = new SparkleMenuItem () {
Header = "SparkleShare",
Icon = i
Icon = folder_image
};
folder_item.Click += delegate {
@ -214,12 +215,11 @@ namespace SparkleShare {
Controller.OpenRecentEventsClicked ();
};
SparkleMenuItem notify_item = new SparkleMenuItem ();
if (Program.Controller.NotificationsEnabled)
notify_item = new SparkleMenuItem () { Header = "Turn notifications off" };
else
notify_item = new SparkleMenuItem () { Header = "Turn notifications on" };
SparkleMenuItem notify_item = new SparkleMenuItem () {
Header = "Notifications",
IsCheckable = true,
IsChecked = Program.Controller.NotificationsEnabled
};
notify_item.Click += delegate {
Program.Controller.ToggleNotifications ();
@ -246,7 +246,7 @@ namespace SparkleShare {
this.context_menu.Items.Add (status_item);
this.context_menu.Items.Add (new Separator ());
this.context_menu.Items.Add (folder_item);
this.context_menu.Items.Add (folder_item);
if (Program.Controller.Folders.Count > 0) {
foreach (string folder_name in Program.Controller.Folders) {
@ -256,11 +256,14 @@ namespace SparkleShare {
subfolder_item.Click += OpenFolderDelegate (folder_name);
System.Windows.Controls.Image i2 = new System.Windows.Controls.Image();
i2.Source = SparkleUIHelpers.GetImageSource ("folder-windows-16");
i2.Width = 16;
i2.Height = 16;
subfolder_item.Icon = i2;
Image subfolder_image = new Image () {
Source = SparkleUIHelpers.GetImageSource ("folder-windows-16"),
Width = 16,
Height = 16
};
subfolder_item.Icon = subfolder_image;
/* TODO
if (Program.Controller.UnsyncedFolders.Contains (folder_name))
subfolder_item.Icon = Icons.dialog_error_16;
@ -282,9 +285,9 @@ namespace SparkleShare {
this.context_menu.Items.Add (new Separator ());
this.context_menu.Items.Add (add_item);
this.context_menu.Items.Add (new Separator ());
this.context_menu.Items.Add (log_item);
this.context_menu.Items.Add (notify_item);
this.context_menu.Items.Add (new Separator ());
this.context_menu.Items.Add (notify_item);
this.context_menu.Items.Add (new Separator ());
this.context_menu.Items.Add (about_item);
this.context_menu.Items.Add (new Separator ());

45
SparkleShare/Windows/SparkleUIHelpers.cs
View file

@ -16,16 +16,20 @@
using System;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using Drawing = System.Drawing;
namespace SparkleShare {
public static class SparkleUIHelpers {
public static string ToHex (this Color color)
public static string ToHex (this Drawing.Color color)
{
return string.Format ("#{0:X2}{1:X2}{2:X2}", color.R, color.G, color.B);
}
@ -39,13 +43,14 @@ namespace SparkleShare {
}
public static Bitmap GetBitmap (string name)
public static Drawing.Bitmap GetBitmap (string name)
{
Assembly assembly = Assembly.GetExecutingAssembly ();
Stream image_stream = assembly.GetManifestResourceStream ("SparkleShare.Pixmaps." + name + ".png");
return (Bitmap) Bitmap.FromStream (image_stream);
return (Drawing.Bitmap) Drawing.Bitmap.FromStream (image_stream);
}
public static string GetHTML (string name)
{
Assembly assembly = Assembly.GetExecutingAssembly ();
@ -54,5 +59,37 @@ namespace SparkleShare {
return html_reader.ReadToEnd ();
}
public static ImageSource ToImageSource(FrameworkElement obj)
{
// Save current canvas transform
Transform transform = obj.LayoutTransform;
obj.LayoutTransform = null;
// fix margin offset as well
Thickness margin = obj.Margin;
obj.Margin = new Thickness(0, 0,
margin.Right - margin.Left, margin.Bottom - margin.Top);
// Get the size of canvas
Size size = new Size(obj.Width, obj.Height);
// force control to Update
obj.Measure(size);
obj.Arrange(new Rect(size));
RenderTargetBitmap bmp = new RenderTargetBitmap(
(int)obj.Width, (int)obj.Height, 96, 96, PixelFormats.Pbgra32);
bmp.Render(obj);
bmp.Freeze ();
// return values as they were before
obj.LayoutTransform = transform;
obj.Margin = margin;
return bmp;
}
}
}