Author: mhabersack
Date: 2007-06-29 16:29:57 -0400 (Fri, 29 Jun 2007)
New Revision: 81075
Modified:
trunk/moon/desklet/glassymonitor/Makefile
trunk/moon/desklet/glassymonitor/default.xaml
trunk/moon/desklet/glassymonitor/monitor.cs
Log:
added the close button (doesn't work though)
Modified: trunk/moon/desklet/glassymonitor/Makefile
===================================================================
--- trunk/moon/desklet/glassymonitor/Makefile 2007-06-29 20:24:51 UTC (rev
81074)
+++ trunk/moon/desklet/glassymonitor/Makefile 2007-06-29 20:29:57 UTC (rev
81075)
@@ -1,4 +1,8 @@
DESKLET = monitor
SOURCES = monitor.cs
+EXTRA_ASSEMBLIES = ../desklets.dll
include ../rules.make
+
+postcompile:
+ cp -a ../desklets.dll bin/
Modified: trunk/moon/desklet/glassymonitor/default.xaml
===================================================================
--- trunk/moon/desklet/glassymonitor/default.xaml 2007-06-29 20:24:51 UTC
(rev 81074)
+++ trunk/moon/desklet/glassymonitor/default.xaml 2007-06-29 20:29:57 UTC
(rev 81075)
@@ -9,6 +9,11 @@
</Storyboard>
</Canvas.Resources>
+ <!-- close/drag elements -->
+ <Polygon x:Name="desklet-close" Canvas.Left="200" Canvas.Top="4"
+ Points="4 4 8 8 4 12 6 14 10 10 14 14 16 12 12 8 16 4 14 2 10 6 6
2 4 4"
+ Stroke="#66FFFFFF" StrokeThickness="3" Fill="#66FFFFFF" />
+
<Image Source="data/netstatus.png" Canvas.Left="10" Canvas.Top="10"
Opacity="0.5" />
<TextBlock x:Name="device"
Modified: trunk/moon/desklet/glassymonitor/monitor.cs
===================================================================
--- trunk/moon/desklet/glassymonitor/monitor.cs 2007-06-29 20:24:51 UTC (rev
81074)
+++ trunk/moon/desklet/glassymonitor/monitor.cs 2007-06-29 20:29:57 UTC (rev
81075)
@@ -30,10 +30,15 @@
TextBlock received_text;
TextBlock sent_text;
+ Polygon closeButton;
+
+ Brush buttonHilite = new SolidColorBrush (Color.FromArgb (0xAA,
0xFF, 0xFF, 0xFF));
+ Brush buttonNormal = new SolidColorBrush (Color.FromArgb (0x66,
0xFF, 0xFF, 0xFF));
+
public void UpdateInfo (object o, EventArgs e)
{
- using (StreamReader sr = new StreamReader ("/proc/net/dev")) {
- string line;
+ using (StreamReader sr = new StreamReader
("/proc/net/dev")) {
+ string line;
// Ignore two first lines.
sr.ReadLine();
@@ -44,7 +49,7 @@
if ((pieces.Length > 1) && (pieces
[0].Trim() == device)) {
String[] fields = pieces
[1].Split (new char[] {' '},
-
StringSplitOptions.RemoveEmptyEntries);
+
StringSplitOptions.RemoveEmptyEntries);
device_text.Text = device;
received_text.Text = fields [1];
@@ -58,8 +63,30 @@
storyboard.Begin ();
}
+ void HighlightButton (Polygon button)
+ {
+ button.Stroke = buttonHilite;
+ }
+
+ void UnhighlightButton (Polygon button)
+ {
+ button.Stroke = buttonNormal;
+ }
+
public void PageLoaded (object o, EventArgs e)
{
+ Mono.Desklets.Desklet.SetupToolbox (this);
+
+ closeButton = FindName ("desklet-close") as Polygon;
+
+ closeButton.MouseEnter += delegate {
+ HighlightButton (closeButton);
+ };
+
+ closeButton.MouseLeave += delegate {
+ UnhighlightButton (closeButton);
+ };
+
storyboard = FindName ("storyboard") as Storyboard;
device_text = FindName ("device") as TextBlock;
received_text = FindName ("received") as TextBlock;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
