Changes in trunk/MacFaceFloat/MainForm.cs [20:30]

File:

• trunk/MacFaceFloat/MainForm.cs (modified) (8 diffs)

trunk/MacFaceFloat/MainForm.cs

@@ -21 +21 @@
         public class MainForm : Misuzilla.Windows.Forms.AlphaForm
         {
+                private System.Windows.Forms.NotifyIcon notifyIcon;
                 private System.Windows.Forms.ContextMenu contextMenu;
                 private System.Windows.Forms.MenuItem menuItemPatternSelect;
@@ -30 +31 @@
                 private FaceDef _currentFaceDef;
                 private Configuration _config;
-                
-                Int32 prevUsage;
-                PerformanceCounter cpuCount;
-                PerformanceCounter pageoutCount;
-                PerformanceCounter pageinCount;
+                private float _patternSize;
+
+                private int prevPattern;
+                private FaceDef.PatternSuite prevSuite;
+                private int prevMarkers;
+
+                private CPUUsageCounter cpuCounter;
+                private MemoryUsageCounter memoryCounter;
 
                 // ƒRƒ“ƒXƒgƒ‰ƒNƒ^
@@ -43 +47 @@
                         this.MoveAtFormDrag = true;
 
-                        prevUsage = -10;
-
-                        cpuCount = new PerformanceCounter();
-                        cpuCount.CategoryName = "Processor";
-                        cpuCount.CounterName  = "% Processor Time";
-                        cpuCount.InstanceName = "_Total";
-
-                        pageoutCount = new PerformanceCounter();
-                        pageoutCount.CategoryName = "Memory";
-                        pageoutCount.CounterName  = "Pages Output/sec";
-
-                        pageinCount = new PerformanceCounter();
-                        pageinCount.CategoryName = "Memory";
-                        pageinCount.CounterName  = "Pages Input/sec";
+                        prevPattern = -1;
+                        prevSuite   = FaceDef.PatternSuite.Normal;
+                        prevMarkers = -1;
+
+                        cpuCounter = new CPUUsageCounter();
+                        memoryCounter = new MemoryUsageCounter();
 
                         _updateTimer = new System.Windows.Forms.Timer();
@@ -65 +61 @@
 
                 void InitializeComponent() {
+                        this.notifyIcon = new System.Windows.Forms.NotifyIcon();
                         this.menuItemPatternSelect = new System.Windows.Forms.MenuItem();
                         this.menuItemConfigure = new System.Windows.Forms.MenuItem();
                         this.menuItemExit = new System.Windows.Forms.MenuItem();
                         this.contextMenu = new System.Windows.Forms.ContextMenu();
+
+                        //
+                        // notifyIcon
+                        //
+                        this.notifyIcon.Text = "MacFace";
+                        this.notifyIcon.Icon = this.Icon;
+                        this.notifyIcon.Visible = true;
+                        this.notifyIcon.ContextMenu = this.contextMenu;
+
                         // 
                         // menuItemPatternSelect
@@ -189 +195 @@
                         _currentFaceDef = newFaceDef;
                         _facePath = _currentFaceDef.Path;
-                        prevUsage = -10;
+                        notifyIcon.Text = "MacFace - " + _currentFaceDef.Title;
+                        prevPattern = -1;
+                        prevMarkers = -1;
 
                         // XVÄŠJ
@@ -199 +207 @@
                 public void CountProcessorUsage(object sender, EventArgs e)
                 {
-                        int usage = (int)cpuCount.NextValue();
-                        int pagein = (int)pageinCount.NextValue();
-                        int pageout = (int)pageoutCount.NextValue();
-
-                        usage /= 10;
-                        if (usage > 10) {
-                                usage = 10;
-                        } else if (usage < 0) {
-                                usage = 0;
+                        CPUUsage cpuUsage = cpuCounter.CurrentUsage();
+                        MemoryUsage memUsage = memoryCounter.CurrentUsage();
+
+                        int pattern = cpuUsage.Active / 10;
+
+                        FaceDef.PatternSuite suite = FaceDef.PatternSuite.Normal;
+                        if (memUsage.Available < (10 * 1024 *1024)) 
+                        {
+                                suite = FaceDef.PatternSuite.MemoryInsufficient;
+                        } 
+                        else if (memUsage.Available < (30 * 1024 *1024)) 
+                        {
+                                suite = FaceDef.PatternSuite.MemoryDecline;
                         }
 
                         int markers = FaceDef.MarkerNone;
-                        if (pagein > 0) markers += FaceDef.MarkerPageIn;
-                        if (pageout > 0) markers += FaceDef.MarkerPageOut;
-
-                        if (prevUsage != usage) 
+                        if (memUsage.Pagein > 0) markers += FaceDef.MarkerPageIn;
+                        if (memUsage.Pageout > 0) markers += FaceDef.MarkerPageOut;
+
+                        if (prevPattern != pattern || prevSuite != suite || prevMarkers != markers) 
                         {
                                 Graphics g = this.Graphics;
                                 g.Clear(Color.FromArgb(0, 0, 0, 0));
-                                _currentFaceDef.DrawPatternImage(g, FaceDef.PatternSuite.Normal, usage, markers);
+                                _currentFaceDef.DrawPatternImage(g, suite, pattern, markers, _patternSize);
                                 this.Update();
                         }
                                 
-                        prevUsage = usage;                      
-                }
-                
+                        prevPattern = pattern;
+                        prevSuite   = suite;
+                        prevMarkers = markers;
+                }
+
+                public float PatternSize
+                {
+                        get { return _patternSize; }
+                        set { _patternSize = value; }
+                }
 
                 //
@@ -260 +279 @@
                 private void MainForm_Closing(object sender, CancelEventArgs e)
                 {
+                        notifyIcon.Visible = false;
+
                         // •Û‘¶
                         _config.Opacity = (int) (this.Opacity * 100);
@@ -297 +318 @@
                 {
                         this.Opacity = (float)_config.Opacity / 100;
+                        this.PatternSize = (float)_config.PatternSize / 100;
                         this.Location = _config.Location;
                         this.TransparentMouseMessage = _config.TransparentMouseMessage;