Home / Browse / Emerge Desktop / Mail / Archive

Donate

Emerge Desktop

Email Archive: emerge-svn (read-only)

[Emerge-svn] SF.net SVN: emerge: [1801] trunk/Source

From: <ir0nh34d@us...> - 2008-05-24 01:12

Revision: 1801
          http://emerge.svn.sourceforge.net/emerge/?rev=1801&view=rev
Author:   ir0nh34d
Date:     2008-05-23 18:12:09 -0700 (Fri, 23 May 2008)

Log Message:
-----------
Add context menus for file folder submenus

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeDesktop/MenuBuilder.cpp
    trunk/Source/emergeDesktop/MenuBuilder.h

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2008-05-23 14:21:38 UTC (rev 1800)
+++ trunk/Source/emergeAppletEngine/main.cpp	2008-05-24 01:12:09 UTC (rev 1801)
@@ -450,8 +450,11 @@
       return command;
     }
 
-  AppendMenu(menu, MF_SEPARATOR, 0x8000, NULL);
-  AppendMenu(menu, MF_STRING, 0x8001, TEXT("Open Directory"));
+  if (!PathIsDirectory(file))
+    {
+      AppendMenu(menu, MF_SEPARATOR, 0x8000, NULL);
+      AppendMenu(menu, MF_STRING, 0x8001, TEXT("Open Directory"));
+    }
 
   // Display menu
   command = TrackPopupMenuEx(menu,
@@ -471,11 +474,11 @@
       hr = contextMenu->InvokeCommand(&commandInfo);
     }
   else if (command == 0x8001)
-  {
-    wcscpy(directory, file);
-    PathRemoveFileSpec(directory);
-    ELExecute(directory, directory);
-  }
+    {
+      wcscpy(directory, file);
+      PathRemoveFileSpec(directory);
+      ELExecute(directory, directory);
+    }
 
   contextMenu->Release();
   appObject->Release();

Modified: trunk/Source/emergeDesktop/MenuBuilder.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuBuilder.cpp	2008-05-23 14:21:38 UTC (rev 1800)
+++ trunk/Source/emergeDesktop/MenuBuilder.cpp	2008-05-24 01:12:09 UTC (rev 1801)
@@ -133,7 +133,7 @@
       return pMenuBuilder->DoInitMenu((HMENU)wParam);
 
     case WM_MENUSELECT:
-      return pMenuBuilder->DoMenuSelect((HMENU)lParam);
+      return pMenuBuilder->DoMenuSelect((HMENU)lParam, HIWORD(wParam), LOWORD(wParam));
 
     case WM_MEASUREITEM:
       return pMenuBuilder->DoMeasureItem((LPMEASUREITEMSTRUCT)lParam);
@@ -141,11 +141,10 @@
     case WM_DRAWITEM:
       return pMenuBuilder->DoDrawItem((LPDRAWITEMSTRUCT)lParam);
 
-    case WM_MENURBUTTONUP:
-      return pMenuBuilder->DoContextMenu((HMENU)lParam, (UINT)wParam);
+    case WM_CONTEXTMENU:
+      return pMenuBuilder->DoContextMenu();
       break;
 
-
     case WM_DISPLAYCHANGE:
       pMenuBuilder->SetWorkArea();
       break;
@@ -184,17 +183,24 @@
   return 0;
 }
 
-LRESULT MenuBuilder::DoContextMenu(HMENU menu, UINT item)
+LRESULT MenuBuilder::DoContextMenu()
 {
   MenuMap::iterator iter;
-  MenuItem *menuItem;
+  HMENU menu;
   HWND task;
   int res;
   POINT pt;
-  int itemID = GetMenuItemID(menu, item);
-  if (itemID < 1)
-    return 0;
+  int itemID = SelectedItem;
+  bool subMenu = (SelectedItemType & MF_POPUP) == MF_POPUP;
+  WCHAR value[MAX_LINE_LENGTH];
 
+  itemID--;
+
+  if (subMenu)
+    menu = GetSubMenu(SelectedMenu, SelectedItem);
+  else
+    menu = SelectedMenu;
+
   iter = menuMap.find(menu);
   if (iter == menuMap.end())
     {
@@ -203,10 +209,11 @@
         return 0;
     }
 
-  itemID--;
+  if (subMenu)
+    wcscpy(value, iter->second->GetValue());
+  else
+    wcscpy(value, iter->second->GetMenuItem(itemID)->GetValue());
 
-  menuItem = iter->second->GetMenuItem(itemID);
-
   switch (iter->second->GetType())
     {
       /*    case 100:
@@ -215,18 +222,18 @@
                                menuItem->GetWorkingDir());
             break;*/
     case 101:
-      res = EAEDisplayFileMenu(menuItem->GetValue(), menuWnd);
+      res = EAEDisplayFileMenu(value, menuWnd);
       if (res != 0)
         SendMessage(menuWnd, WM_CANCELMODE, 0, 0);
       break;
     case 102:
       GetCursorPos(&pt);
-      task = (HWND)_wtoi(menuItem->GetValue());
+      task = (HWND)_wtoi(value);
       res = EAEDisplayMenu(menuWnd, task);
       switch (res)
         {
         case SC_CLOSE:
-          DeleteMenu(iter->first, item, MF_BYPOSITION);
+          DeleteMenu(iter->first, itemID, MF_BYPOSITION);
           break;
         case SC_SIZE:
         case SC_MOVE:
@@ -247,7 +254,7 @@
   return 1;
 }
 
-LRESULT MenuBuilder::DoMenuSelect(HMENU menu)
+LRESULT MenuBuilder::DoMenuSelect(HMENU menu, WORD itemType, WORD item)
 {
   MenuMap::iterator iter;
 
@@ -261,6 +268,8 @@
     }
 
   SelectedMenu = menu;
+  SelectedItem = item;
+  SelectedItemType = itemType;
 
   return 1;
 }

Modified: trunk/Source/emergeDesktop/MenuBuilder.h
===================================================================
--- trunk/Source/emergeDesktop/MenuBuilder.h	2008-05-23 14:21:38 UTC (rev 1800)
+++ trunk/Source/emergeDesktop/MenuBuilder.h	2008-05-24 01:12:09 UTC (rev 1801)
@@ -54,6 +54,8 @@
     bool MButtonDown;
     UINT SelectedMenuType, SelectedMenuIndex;
     HMENU SelectedMenu;
+    WORD SelectedItem;
+    WORD SelectedItemType;
     UINT ShellMessage;
     void BuildMenu(MenuMap::iterator iter);
     void BuildRegMenu(MenuMap::iterator iter);
@@ -87,11 +89,11 @@
     LRESULT DoButtonDown(UINT button);
     LRESULT DoInitMenu(HMENU menu);
     LRESULT ExecuteMenuItem(UINT itemID);
-    LRESULT DoContextMenu(HMENU menu, UINT item);
+    LRESULT DoContextMenu();
     void AddTaskItem(HMENU menu, HWND hwnd);
     BOOL DoDrawItem(LPDRAWITEMSTRUCT lpDrawItem);
     BOOL DoMeasureItem(LPMEASUREITEMSTRUCT lpMeasureItem);
-    LRESULT DoMenuSelect(HMENU menu);
+    LRESULT DoMenuSelect(HMENU menu, WORD itemType, WORD item);
     void ClearAllMenus(MenuMap::iterator iter);
     HWND GetWnd();
     void SetWorkArea();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Emerge-svn] SF.net SVN: emerge: [1339] trunk/Source	<ir0nh34d@us...>

[Emerge-svn] SF.net SVN: emerge: [1341] trunk/Source

From: <ir0nh34d@us...> - 2007-07-07 22:22

Revision: 1341
          http://emerge.svn.sourceforge.net/emerge/?rev=1341&view=rev
Author:   ir0nh34d
Date:     2007-07-07 15:22:53 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
Implemented true alpha blended text

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeSchemeEngine/main.cpp

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-06 22:41:36 UTC (rev 1340)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-07 22:22:53 UTC (rev 1341)
@@ -340,7 +340,7 @@
   CopyRect(&clientInfo.rt, &clientrt);
   clientInfo.bgAlpha = guiInfo.alphaBackground;
 
-  EGDrawAlphaText(clientInfo, formatInfo, commandText);
+  EGDrawAlphaText(guiInfo.alphaText, clientInfo, formatInfo, commandText);
 
   bf.BlendOp = AC_SRC_OVER;
   bf.BlendFlags = 0;

Modified: trunk/Source/emergeGraphics/emergeGraphics.h
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-06 22:41:36 UTC (rev 1340)
+++ trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-07 22:22:53 UTC (rev 1341)
@@ -97,6 +97,7 @@
     BYTE alphaFrame;
     BYTE alphaSelected;
     BYTE alphaBorder;
+    BYTE alphaText;
     COLORREF colorBackground;
     COLORREF colorForeground;
     COLORREF colorFrame;
@@ -125,11 +126,12 @@
     DLL_EXPORT HICON EGGetFileIcon(WCHAR *file, UINT iconSize);
     DLL_EXPORT HICON EGGetWindowIcon(HWND hwnd, bool smallIcon);
     DLL_EXPORT HICON EGGetSystemIcon(UINT iconIndex, UINT iconSize);
-    DLL_EXPORT bool EGDrawAlphaText(CLIENTINFO clientInfo, FORMATINFO formatInfo, WCHAR *commandText);
+    DLL_EXPORT bool EGDrawAlphaText(BYTE alpha, CLIENTINFO clientInfo, FORMATINFO formatInfo, WCHAR *commandText);
     DLL_EXPORT HDC EGBeginPaint(HWND wnd);
     DLL_EXPORT void EGEndPaint();
     DLL_EXPORT bool EGFillRect(HDC hdc, RECT *rect, BYTE alpha, COLORREF colour);
     DLL_EXPORT bool EGFrameRect(HDC hdc, RECT *rect, BYTE alpha, COLORREF colour);
+    DLL_EXPORT UINT32 EGGetPixel(BYTE alpha, COLORREF colour);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp	2007-07-06 22:41:36 UTC (rev 1340)
+++ trunk/Source/emergeGraphics/main.cpp	2007-07-07 22:22:53 UTC (rev 1341)
@@ -203,13 +203,9 @@
   VOID *bits;
   HDC hdc;
   BITMAPINFO bmi;
-  UCHAR ubRed, ubGreen, ubBlue;
-  float fAlphaFactor;
+  UINT32 pixel;
 
-  fAlphaFactor = (float)alpha / (float)0xff;
-  ubRed = (UCHAR)(GetRValue(colour) * fAlphaFactor);
-  ubGreen = (UCHAR)(GetGValue(colour) * fAlphaFactor);
-  ubBlue = (UCHAR)(GetBValue(colour) * fAlphaFactor);
+  pixel = EGGetPixel(alpha, colour);
 
   hdc = CreateCompatibleDC(NULL);
 
@@ -230,10 +226,7 @@
   // create our DIB section and select the bitmap into the dc
   bmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0x0);
   ((UINT32 *)bits)[0] =
-    (alpha << 24) |
-    (ubRed  << 16) |
-    (ubGreen << 8) |
-    ubBlue;
+    pixel;
 
   brush = CreatePatternBrush(bmp);
 
@@ -251,13 +244,9 @@
   VOID *bits;
   HDC hdc;
   BITMAPINFO bmi;
-  UCHAR ubRed, ubGreen, ubBlue;
-  float fAlphaFactor;
+  UINT32 pixel;
 
-  fAlphaFactor = (float)alpha / (float)0xff;
-  ubRed = (UCHAR)(GetRValue(colour) * fAlphaFactor);
-  ubGreen = (UCHAR)(GetGValue(colour) * fAlphaFactor);
-  ubBlue = (UCHAR)(GetBValue(colour) * fAlphaFactor);
+  pixel = EGGetPixel(alpha, colour);
 
   hdc = CreateCompatibleDC(NULL);
 
@@ -278,10 +267,7 @@
   // create our DIB section and select the bitmap into the dc
   bmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0x0);
   ((UINT32 *)bits)[0] =
-    (alpha << 24) |
-    (ubRed  << 16) |
-    (ubGreen << 8) |
-    ubBlue;
+    pixel;
 
   lb.lbStyle = BS_DIBPATTERN;
   lb.lbColor = DIB_RGB_COLORS;
@@ -402,20 +388,31 @@
   return (ret == TRUE);
 }
 
+UINT32 EGGetPixel(BYTE alpha, COLORREF colour)
+{
+  UINT32 pixel;
+  float fAlphaFactor;
+
+  fAlphaFactor = (float)alpha / (float)0xff;
+
+  pixel = (alpha << 24) |
+    ((UCHAR)(GetRValue(colour) * fAlphaFactor) << 16) |
+    ((UCHAR)(GetGValue(colour) * fAlphaFactor) << 8) |
+    (UCHAR)(GetBValue(colour) * fAlphaFactor);
+
+  return pixel;
+}
+
 HBITMAP EGCreateBitmap(BYTE alpha, COLORREF colour, RECT wndRect)
 {
   HBITMAP bmp;
   HDC hdc;
   VOID *bits;
   BITMAPINFO bmi;
-  UCHAR ubRed, ubGreen, ubBlue;
-  float fAlphaFactor;
+  UINT32 pixel;
   ULONG ulWindowWidth, ulWindowHeight, x, y;
 
-  fAlphaFactor = (float)alpha / (float)0xff;
-  ubRed = (UCHAR)(GetRValue(colour) * fAlphaFactor);
-  ubGreen = (UCHAR)(GetGValue(colour) * fAlphaFactor);
-  ubBlue = (UCHAR)(GetBValue(colour) * fAlphaFactor);
+  pixel = EGGetPixel(alpha, colour);
 
   hdc = CreateCompatibleDC(NULL);
 
@@ -443,10 +440,7 @@
   for (y = 0; y < ulWindowHeight; y++)
     for (x = 0; x < ulWindowWidth; x++)
       ((UINT32 *)bits)[x + y * ulWindowWidth] =
-        (alpha << 24) |
-        (ubRed  << 16) |
-        (ubGreen << 8) |
-        ubBlue;
+        pixel;
 
   DeleteDC(hdc);
 
@@ -676,10 +670,10 @@
   return icon;
 }
 
-bool EGDrawAlphaText(CLIENTINFO clientInfo, FORMATINFO formatInfo, WCHAR *commandText)
+bool EGDrawAlphaText(BYTE alpha, CLIENTINFO clientInfo, FORMATINFO formatInfo, WCHAR *commandText)
 {
-  HDC maskdc;
-  HBITMAP hmask, hbitmap;
+  HDC maskdc, fillDC;
+  HBITMAP hmask, fillBMP;
   BITMAPINFO bmi;
   char *bmpBits;
   char *maskBits;
@@ -688,7 +682,25 @@
   UCHAR alphaValue;
   DRAWTEXTPARAMS dtp;
   UINT32 pixel;
+  BLENDFUNCTION bf;
+  BOOL ret;
 
+  bf.BlendOp = AC_SRC_OVER;
+  bf.BlendFlags = 0;
+  bf.SourceConstantAlpha = alpha;
+  bf.AlphaFormat = AC_SRC_ALPHA;
+
+  int width = clientInfo.rt.right - clientInfo.rt.left;
+  int height = clientInfo.rt.bottom - clientInfo.rt.top;
+
+  if ((width <= 0) || (height <= 0))
+    return false;
+
+  fillDC = CreateCompatibleDC(NULL);
+
+  fillBMP = EGCreateBitmap(0x00, formatInfo.color, clientInfo.rt);
+  SelectObject(fillDC, fillBMP);
+
   maskdc = CreateCompatibleDC(NULL);
   hmask = EGCreateBitmap(0x00, RGB(0, 0, 0), clientInfo.rt);
   SelectObject(maskdc, hmask);
@@ -710,22 +722,15 @@
   else
     drawFlags |= DT_LEFT;
 
-  SetBkMode(clientInfo.hdc, TRANSPARENT);
-  SetTextColor(clientInfo.hdc, formatInfo.color);
-  SelectObject(clientInfo.hdc, formatInfo.font);
-  DrawTextEx(clientInfo.hdc, commandText, (int)wcslen(commandText), &clientInfo.rt, drawFlags , &dtp);
-
   SetBkMode(maskdc, TRANSPARENT);
   SetTextColor(maskdc, RGB(255, 255, 255));
   SelectObject(maskdc, formatInfo.font);
   DrawTextEx(maskdc, commandText, (int)wcslen(commandText), &clientInfo.rt, drawFlags , &dtp);
 
-  hbitmap = (HBITMAP)GetCurrentObject(clientInfo.hdc, OBJ_BITMAP);
-
-  GetDIBits(clientInfo.hdc, hbitmap, 0, clientInfo.rt.bottom, NULL, &bmi, DIB_RGB_COLORS);
+  GetDIBits(fillDC, fillBMP, 0, clientInfo.rt.bottom, NULL, &bmi, DIB_RGB_COLORS);
   bmpBits = new char[bmi.bmiHeader.biSizeImage];
   maskBits = new char[bmi.bmiHeader.biSizeImage];
-  GetDIBits(clientInfo.hdc, hbitmap, 0, clientInfo.rt.bottom, bmpBits, &bmi, DIB_RGB_COLORS);
+  GetDIBits(fillDC, fillBMP, 0, clientInfo.rt.bottom, bmpBits, &bmi, DIB_RGB_COLORS);
   GetDIBits(maskdc, hmask, 0, clientInfo.rt.bottom, maskBits, &bmi, DIB_RGB_COLORS);
 
   for (y = 0; y < bmi.bmiHeader.biHeight; y++)
@@ -742,20 +747,23 @@
               alphaValue = clientInfo.bgAlpha;
 
             ((UINT32 *)bmpBits)
-            [x + ((bmi.bmiHeader.biHeight - (y + 1)) * bmi.bmiHeader.biWidth)] |=
-              (alphaValue << 24);
+            [x + ((bmi.bmiHeader.biHeight - (y + 1)) * bmi.bmiHeader.biWidth)] =
+              EGGetPixel(alphaValue, formatInfo.color);
           }
       }
 
-  SetDIBits(clientInfo.hdc, hbitmap, 0, clientInfo.rt.bottom, bmpBits, &bmi, DIB_RGB_COLORS);
+  SetDIBits(fillDC, fillBMP, 0, clientInfo.rt.bottom, bmpBits, &bmi, DIB_RGB_COLORS);
+  ret = AlphaBlend(clientInfo.hdc, clientInfo.rt.left, clientInfo.rt.top, width, height, fillDC, 0, 0, width, height, bf);
 
   // do cleanup
+  DeleteObject(fillBMP);
+  DeleteDC(fillDC);
   DeleteObject(hmask);
   DeleteDC(maskdc);
   delete bmpBits;
   delete maskBits;
 
-  return true;
+  return ret = TRUE;
 }
 
 HDC EGBeginPaint(HWND wnd)

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-07-06 22:41:36 UTC (rev 1340)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-07-07 22:22:53 UTC (rev 1341)
@@ -99,6 +99,7 @@
   ELWriteFileInt(schemeFile, TEXT("alpha.frame:"), (int)guiInfo->alphaFrame);
   ELWriteFileInt(schemeFile, TEXT("alpha.selected:"), (int)guiInfo->alphaSelected);
   ELWriteFileInt(schemeFile, TEXT("alpha.border:"), (int)guiInfo->alphaBorder);
+  ELWriteFileInt(schemeFile, TEXT("alpha.text:"), (int)guiInfo->alphaText);
   ELWriteFileColor(schemeFile, TEXT("color.background:"), guiInfo->colorBackground);
   ELWriteFileColor(schemeFile, TEXT("color.selected:"), guiInfo->colorSelected);
   ELWriteFileColor(schemeFile, TEXT("color.foreground:"), guiInfo->colorForeground);
@@ -124,6 +125,7 @@
   ELReadFileInt(schemeFile, TEXT("alpha.frame:"), (int*)&guiInfo->alphaFrame, 100);
   ELReadFileInt(schemeFile, TEXT("alpha.selected:"), (int*)&guiInfo->alphaSelected, 100);
   ELReadFileInt(schemeFile, TEXT("alpha.border:"), (int*)&guiInfo->alphaBorder, 100);
+  ELReadFileInt(schemeFile, TEXT("alpha.text:"), (int*)&guiInfo->alphaText, 100);
   ELReadFileColor(schemeFile, TEXT("color.background:"), &guiInfo->colorBackground,
                   GetSysColor(COLOR_BTNFACE));
   ELReadFileColor(schemeFile, TEXT("color.selected:"), &guiInfo->colorSelected,
@@ -219,6 +221,14 @@
   tmpAlpha /= 100;
   guiInfo->alphaBorder = tmpAlpha;
 
+  if (guiInfo->alphaText <= 0)
+    guiInfo->alphaText = 1;
+
+  tmpAlpha = guiInfo->alphaText;
+  tmpAlpha *= 255;
+  tmpAlpha /= 100;
+  guiInfo->alphaText = tmpAlpha;
+
   if (!guiInfo->clickThrough)
     {
       if (guiInfo->alphaInactive < guiInfo->alphaActive)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1351] trunk/Source

From: <roblarky@us...> - 2007-07-12 21:33

Revision: 1351
          http://emerge.svn.sourceforge.net/emerge/?rev=1351&view=rev
Author:   roblarky
Date:     2007-07-12 14:33:34 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
Merged into all Applets, I feel quite comfortable with the changes now :-)

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-12 21:33:34 UTC (rev 1351)
@@ -404,6 +404,12 @@
 
 LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
 {
+  int height;
+  int width;
+
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
   if (pSettings->GetSnapSize())
     {
       SNAPSIZEINFO ssi;
@@ -414,6 +420,43 @@
       ELSnapSize(&ssi);
     }
 
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+
   DrawAlphaBlend(false);
   return 0;
 }

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeCommand/Applet.h	2007-07-12 21:33:34 UTC (rev 1351)
@@ -41,6 +41,8 @@
 #define FULLSCREEN_TIMER 1
 #define FULLSCREEN_POLL_TIME 100
 
+#define MIN_APPLET_SIZE 10
+
 #include "AppletMenu.h"
 #include <locale.h>
 #include <vector>

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-12 21:33:34 UTC (rev 1351)
@@ -574,7 +574,6 @@
 
 LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
 {
-  SNAPSIZEINFO ssi;
   int height;
   int width;
 
@@ -583,6 +582,7 @@
 
   if (!pSettings->GetAutoSize() && pSettings->GetSnapSize())
     {
+      SNAPSIZEINFO ssi;
       ssi.AppletWindow = hwnd;
       ssi.AppletEdge = edge;
       ssi.AppletRect = rect;

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-12 21:33:34 UTC (rev 1351)
@@ -844,10 +844,15 @@
 
 LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
 {
-  SNAPSIZEINFO ssi;
+  int height;
+  int width;
 
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
   if (!pSettings->GetAutoSize() && pSettings->GetSnapSize())
     {
+      SNAPSIZEINFO ssi;
       ssi.AppletWindow = hwnd;
       ssi.AppletEdge = edge;
       ssi.AppletRect = rect;
@@ -855,6 +860,43 @@
       ELSnapSize(&ssi);
     }
 
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+
   UpdateIcons();
   DrawAlphaBlend(false);
   return 0;

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeTasks/Applet.h	2007-07-12 21:33:34 UTC (rev 1351)
@@ -37,6 +37,8 @@
 #define MOUSE_TIMER 0
 #define MOUSE_POLL_TIME 250
 
+#define MIN_APPLET_SIZE 10
+
 #include "AppletMenu.h"
 #include <vector>
 #include <process.h>

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-12 21:33:34 UTC (rev 1351)
@@ -696,10 +696,15 @@
 
 LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
 {
-  SNAPSIZEINFO ssi;
+  int height;
+  int width;
 
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
   if (!pSettings->GetAutoSize() && pSettings->GetSnapSize())
     {
+      SNAPSIZEINFO ssi;
       ssi.AppletWindow = hwnd;
       ssi.AppletEdge = edge;
       ssi.AppletRect = rect;
@@ -707,6 +712,42 @@
       ELSnapSize(&ssi);
     }
 
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
   AdjustIcons();
   UpdateIcons();
   DrawAlphaBlend(false);

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeTray/Applet.h	2007-07-12 21:33:34 UTC (rev 1351)
@@ -37,6 +37,8 @@
 #define MOUSE_TIMER 0
 #define MOUSE_POLL_TIME 250
 
+#define MIN_APPLET_SIZE 10
+
 #include "AppletMenu.h"
 #include <vector>
 #include <process.h>

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-12 21:33:34 UTC (rev 1351)
@@ -918,6 +918,12 @@
 
 LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
 {
+  int height;
+  int width;
+
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
   if (pSettings->GetSnapSize())
     {
       SNAPSIZEINFO ssi;
@@ -929,6 +935,43 @@
       ELSnapSize(&ssi);
     }
 
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+
   DrawAlphaBlend(false);
   return 0;
 }

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-07-12 21:15:00 UTC (rev 1350)
+++ trunk/Source/emergeVWM/Applet.h	2007-07-12 21:33:34 UTC (rev 1351)
@@ -37,6 +37,8 @@
 #define MOUSE_TIMER 0
 #define MOUSE_POLL_TIME 250
 
+#define MIN_APPLET_SIZE 10
+
 #define NEW_TASK_TIMER 1
 #define NEW_TASK_POLL_TIME 250
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1353] trunk/Source

From: <ir0nh34d@us...> - 2007-07-20 13:15

Revision: 1353
          http://emerge.svn.sourceforge.net/emerge/?rev=1353&view=rev
Author:   ir0nh34d
Date:     2007-07-20 06:15:18 -0700 (Fri, 20 Jul 2007)

Log Message:
-----------
Fixed transparency bug with zero background and zero active or inactive settings

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -70,7 +70,7 @@
       pApplet->UpdateTip(tstring);
 
       if (IsWindowVisible(hWnd))
-        pApplet->DrawAlphaBlend(false);
+        pApplet->DrawAlphaBlend();
     }
 }
 
@@ -154,7 +154,7 @@
 
     case WM_SHOWWINDOW:
       if (wParam)
-        pApplet->DrawAlphaBlend(false);
+        pApplet->DrawAlphaBlend();
       break;
 
     case WM_TIMER:
@@ -219,7 +219,9 @@
   mainFont = NULL;
   appletMonitor = NULL;
 
-  BackgroundDC = NULL;
+  activeBackgroundDC = NULL;
+  inactiveBackgroundDC = NULL;
+
   ZeroMemory(&oldrt, sizeof(RECT));
 }
 
@@ -230,6 +232,11 @@
   // Unregister the specified Emerge Desktop messages
   PostMessage(ELGetCoreWindow(), EMERGE_UNREGISTER, (WPARAM)mainWnd, (LPARAM)EMERGE_CORE);
 
+  if (activeBackgroundDC != NULL)
+    DeleteDC(activeBackgroundDC);
+  if (inactiveBackgroundDC != NULL)
+    DeleteDC(inactiveBackgroundDC);
+
   // Destroy mainMenu
   if (pAppletMenu)
     delete pAppletMenu;
@@ -299,7 +306,7 @@
   return 1;
 }
 
-void Applet::DrawAlphaBlend(bool forceRefresh)
+void Applet::DrawAlphaBlend()
 {
   HDC hdc;            // handle of the DC we will create
   BLENDFUNCTION bf;   // structure for alpha blending
@@ -316,16 +323,23 @@
   // create a DC for our bitmap -- the source DC for AlphaBlend
   hdc = EGBeginPaint(mainWnd);
 
-  if ((!EqualRect(&clientrt, &oldrt)) || forceRefresh)
+  if (!EqualRect(&clientrt, &oldrt))
   {
     CopyRect(&oldrt, &clientrt);
-    if (BackgroundDC != NULL)
-      DeleteDC(BackgroundDC);
-    BackgroundDC = ESEPaintBackground(clientrt);
+    if (activeBackgroundDC != NULL)
+      DeleteDC(activeBackgroundDC);
+    if (inactiveBackgroundDC != NULL)
+      DeleteDC(inactiveBackgroundDC);
+    activeBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, true);
+    inactiveBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, false);
   }
 
-  BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
-      BackgroundDC, 0, 0, SRCCOPY);
+  if (mouseOver)
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           activeBackgroundDC, 0, 0, SRCCOPY);
+  else
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           inactiveBackgroundDC, 0, 0, SRCCOPY);
 
   if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("center")) == 0)
     formatInfo.alignment = EGDAT_CENTER;
@@ -373,7 +387,7 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          DrawAlphaBlend(false);
+          DrawAlphaBlend();
           KillTimer(mainWnd, timerID);
         }
 
@@ -457,7 +471,7 @@
     }
 
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
   return 0;
 }
 
@@ -491,7 +505,7 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
 
@@ -662,7 +676,8 @@
 
   pCommand->UpdateGUI();
 
-  DrawAlphaBlend(true);
+  ZeroMemory(&oldrt, sizeof(RECT));
+  DrawAlphaBlend();
 }
 
 LRESULT Applet::ShowCommand()

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeCommand/Applet.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -62,7 +62,7 @@
     bool fullScreen;
     HFONT mainFont;
     POINT anchor;
-    HDC BackgroundDC;
+    HDC activeBackgroundDC, inactiveBackgroundDC;
     RECT oldrt;
     HMONITOR appletMonitor;
     UINT ShellMessage;
@@ -90,7 +90,7 @@
     LRESULT DoEmergeNotify(UINT messageClass, UINT message);
     LRESULT DoDisplayChange(HWND hwnd);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
-    void DrawAlphaBlend(bool forceRefresh);
+    void DrawAlphaBlend();
     void UpdateGUI();
     LRESULT ShowCommand();
     void SetCommandText(WCHAR *commandText);

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -172,7 +172,9 @@
   activeBrush = NULL;
   appletMonitor = NULL;
 
-  BackgroundDC = NULL;
+  activeBackgroundDC = NULL;
+  inactiveBackgroundDC = NULL;
+
   ZeroMemory(&oldrt, sizeof(RECT));
 }
 
@@ -181,6 +183,11 @@
   // Unregister the specified Emerge Desktop messages
   PostMessage(ELGetCoreWindow(), EMERGE_UNREGISTER, (WPARAM)mainWnd, (LPARAM)EMERGE_CORE);
 
+  if (activeBackgroundDC != NULL)
+    DeleteDC(activeBackgroundDC);
+  if (inactiveBackgroundDC != NULL)
+    DeleteDC(inactiveBackgroundDC);
+
   // Destroy mainMenu
   delete pAppletMenu;
 }
@@ -430,7 +437,7 @@
   UpdateIcons();
 }
 
-void Applet::DrawAlphaBlend(bool forceRefresh)
+void Applet::DrawAlphaBlend()
 {
   HDC hdc;
   BLENDFUNCTION bf;
@@ -445,16 +452,23 @@
   // create a DC for our bitmap -- the source DC for AlphaBlend
   hdc = EGBeginPaint(mainWnd);
 
-  if ((!EqualRect(&clientrt, &oldrt)) || forceRefresh)
-    {
-      CopyRect(&oldrt, &clientrt);
-      if (BackgroundDC != NULL)
-        DeleteDC(BackgroundDC);
-      BackgroundDC = ESEPaintBackground(clientrt);
-    }
+  if (!EqualRect(&clientrt, &oldrt))
+  {
+    CopyRect(&oldrt, &clientrt);
+    if (activeBackgroundDC != NULL)
+      DeleteDC(activeBackgroundDC);
+    if (inactiveBackgroundDC != NULL)
+      DeleteDC(inactiveBackgroundDC);
+    activeBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, true);
+    inactiveBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, false);
+  }
 
-  BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
-         BackgroundDC, 0, 0, SRCCOPY);
+  if (mouseOver)
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           activeBackgroundDC, 0, 0, SRCCOPY);
+  else
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           inactiveBackgroundDC, 0, 0, SRCCOPY);
   PaintItems(hdc, clientrt);
 
   bf.BlendOp = AC_SRC_OVER;
@@ -488,7 +502,7 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          DrawAlphaBlend(false);
+          DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
         }
 
@@ -534,7 +548,7 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
 
@@ -627,7 +641,7 @@
     }
 
   UpdateIcons();
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
   return 0;
 }
 
@@ -751,7 +765,8 @@
   if (pAppletMenu)
     pAppletMenu->UpdateHook();
 
-  DrawAlphaBlend(true);
+  ZeroMemory(&oldrt, sizeof(RECT));
+  DrawAlphaBlend();
 }
 
 void Applet::UpdateIcons()

Modified: trunk/Source/emergeLauncher/Applet.h
===================================================================
--- trunk/Source/emergeLauncher/Applet.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeLauncher/Applet.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -56,7 +56,7 @@
     HWND mainWnd, toolWnd, activeWnd;
     HMENU mainMenu;
     HHOOK menuHook;
-    HDC BackgroundDC;
+    HDC activeBackgroundDC, inactiveBackgroundDC;
     RECT oldrt;
     bool fullScreen;
     HBRUSH activeBrush;
@@ -92,7 +92,7 @@
     void CreateBrushes();
     void DestroyBrushes();
     void AdjustRect(RECT *wndRect);
-    void DrawAlphaBlend(bool forceRefresh);
+    void DrawAlphaBlend();
     void UpdateGUI();
     void UpdateTip(UINT index);
     void DeleteTip(UINT index);

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -47,7 +47,7 @@
     DLL_EXPORT void ESEReadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo);
     DLL_EXPORT void ESELoadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo);
     DLL_EXPORT int ESEEditScheme(HWND wnd, WCHAR *schemeFile);
-    DLL_EXPORT HDC ESEPaintBackground(RECT clientRect);
+    DLL_EXPORT HDC ESEPaintBackground(RECT clientRect, LPGUIINFO guiInfo, bool active);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -36,15 +36,7 @@
 // Globals
 WCHAR scheme[MAX_PATH];
 HBRUSH bgBrush = NULL;
-BYTE bgAlpha;
-BYTE borderAlpha;
-COLORREF bgColor;
-COLORREF borderColor;
-COLORREF gradientFrom;
-COLORREF gradientTo;
-WCHAR gradientMethod[MAX_PATH];
 bool paintBorder = false;
-UINT dragBorder, bevelWidth;
 
 // Globals
 HINSTANCE dllInstance;
@@ -150,9 +142,7 @@
 
 void ESELoadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
 {
-  float srcAlphaCheck, checkValue;
-  int testAlpha, tmpAlpha;
-  HDC hdc;
+  int tmpAlpha;
 
   ESESetScheme(schemeFile);
   ESEReadScheme(scheme, guiInfo);
@@ -182,12 +172,14 @@
   guiInfo->alphaInactive = tmpAlpha;
 
   if ((guiInfo->alphaBackground <= 0) && !guiInfo->clickThrough)
-    guiInfo->alphaBackground = 1;
+    {
+      guiInfo->alphaBackground = 1;
 
-  tmpAlpha = guiInfo->alphaBackground;
-  tmpAlpha *= 255;
-  tmpAlpha /= 100;
-  guiInfo->alphaBackground = tmpAlpha;
+      tmpAlpha = guiInfo->alphaBackground;
+      tmpAlpha *= 255;
+      tmpAlpha /= 100;
+      guiInfo->alphaBackground = tmpAlpha;
+    }
 
   if (guiInfo->alphaForeground <= 0)
     guiInfo->alphaForeground = 1;
@@ -228,52 +220,16 @@
   tmpAlpha *= 255;
   tmpAlpha /= 100;
   guiInfo->alphaText = tmpAlpha;
-
-  if (!guiInfo->clickThrough)
-    {
-      if (guiInfo->alphaInactive < guiInfo->alphaActive)
-        testAlpha = guiInfo->alphaInactive;
-      else
-        testAlpha = guiInfo->alphaActive;
-
-      srcAlphaCheck = (float)guiInfo->alphaBackground * (float)(testAlpha / 255.0);
-
-      // Base check on colour depth of display
-      hdc = CreateCompatibleDC(NULL);
-      if (GetDeviceCaps(hdc, BITSPIXEL) == 32)
-        checkValue = 0.5;
-      else
-        checkValue = 3.5;
-      DeleteDC(hdc);
-
-      while (srcAlphaCheck < checkValue)
-        {
-          guiInfo->alphaBackground++;
-          srcAlphaCheck = (float)guiInfo->alphaBackground * (float)(testAlpha / 255.0);
-        }
-    }
-
-  bgAlpha = guiInfo->alphaBackground;
-  borderAlpha = guiInfo->alphaBorder;
-  bgColor = guiInfo->colorBackground;
-  borderColor = guiInfo->colorBorder;
-
-  dragBorder = guiInfo->dragBorder;
-  bevelWidth = guiInfo->bevelWidth;
-
-  gradientFrom = guiInfo->gradientFrom;
-  gradientTo = guiInfo->gradientTo;
-  wcscpy(gradientMethod, guiInfo->gradientMethod);
 }
 
-HDC ESEPaintBackground(RECT clientRect)
+HDC ESEPaintBackground(RECT clientRect, LPGUIINFO guiInfo, bool active)
 {
   bool interlaced = false, bevelled = false, sunken = false;
   BLENDFUNCTION bf;
   BITMAPINFO bmi;
   VOID *gradientBits, *bgBits;
-  COLORREF colorTo = gradientTo;
-  COLORREF colorFrom = gradientFrom;
+  COLORREF colorTo = guiInfo->gradientTo;
+  COLORREF colorFrom = guiInfo->gradientFrom;
   HDC bgDC = CreateCompatibleDC(NULL);
   HDC gradientDC = CreateCompatibleDC(NULL);
 
@@ -296,12 +252,12 @@
 
   if (paintBorder)
     {
-      CreateBorder(bgDC, clientRect, borderColor, borderAlpha, dragBorder);
+      CreateBorder(bgDC, clientRect, guiInfo->colorBorder, guiInfo->alphaBorder, guiInfo->dragBorder);
 
-      x += dragBorder;
-      y += dragBorder;
-      width -= 2 * dragBorder;
-      height -= 2 * dragBorder;
+      x += guiInfo->dragBorder;
+      y += guiInfo->dragBorder;
+      width -= 2 * guiInfo->dragBorder;
+      height -= 2 * guiInfo->dragBorder;
     }
 
   bmi.bmiHeader.biWidth = width;
@@ -313,41 +269,44 @@
 
   bf.BlendOp = AC_SRC_OVER;
   bf.BlendFlags = 0;
-  bf.SourceConstantAlpha = bgAlpha;
+  if (active)
+    bf.SourceConstantAlpha = EGGetMinAlpha(guiInfo->alphaBackground, guiInfo->alphaActive);
+  else
+    bf.SourceConstantAlpha = EGGetMinAlpha(guiInfo->alphaBackground, guiInfo->alphaInactive);
   bf.AlphaFormat = AC_SRC_ALPHA;
 
-  if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("interlaced")) != NULL)
+  if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("interlaced")) != NULL)
     interlaced = true;
 
-  if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("raised")) != NULL)
+  if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("raised")) != NULL)
     bevelled = true;
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("sunken")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("sunken")) != NULL)
     {
       bevelled = true;
       sunken = true;
     }
 
-  if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("vertical")) != NULL)
+  if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("vertical")) != NULL)
     vgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("horizontal")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("horizontal")) != NULL)
     hgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("crossdiagonal")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("crossdiagonal")) != NULL)
     cdgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("diagonal")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("diagonal")) != NULL)
     dgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("pipecross")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("pipecross")) != NULL)
     pcgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("elliptic")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("elliptic")) != NULL)
     egradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("rectangle")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("rectangle")) != NULL)
     rgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
-  else if (wcsstr(wcslwr(wcsdup(gradientMethod)), TEXT("pyramid")) != NULL)
+  else if (wcsstr(wcslwr(wcsdup(guiInfo->gradientMethod)), TEXT("pyramid")) != NULL)
     pgradient(width, height, colorFrom, colorTo, (BYTE*)gradientBits, interlaced);
   else
-    vgradient(width, height, bgColor, bgColor, (BYTE*)gradientBits, interlaced);
+    vgradient(width, height, guiInfo->colorBackground, guiInfo->colorBackground, (BYTE*)gradientBits, interlaced);
 
   if (bevelled)
-    bevel(width, height, bevelWidth, (BYTE*)gradientBits, sunken);
+    bevel(width, height, guiInfo->bevelWidth, (BYTE*)gradientBits, sunken);
 
   AlphaBlend(bgDC, x, y, width, height, gradientDC, 0, 0, width, height, bf);
 

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -137,7 +137,8 @@
   activeWnd = NULL;
   appletMonitor = NULL;
 
-  BackgroundDC = NULL;
+  activeBackgroundDC = NULL;
+  inactiveBackgroundDC = NULL;
 
   ZeroMemory(&oldrt, sizeof(RECT));
 }
@@ -153,8 +154,10 @@
   // Unregister as a Shell window
   ELRegisterShellHookWindow(mainWnd, false);
 
-  if (BackgroundDC != NULL)
-    DeleteDC(BackgroundDC);
+  if (activeBackgroundDC != NULL)
+    DeleteDC(activeBackgroundDC);
+  if (inactiveBackgroundDC != NULL)
+    DeleteDC(inactiveBackgroundDC);
 
   // Cleanup the icon vectors
   while (!taskList.empty())
@@ -374,7 +377,7 @@
                    SWP_NOZORDER | SWP_NOACTIVATE);
     }
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
 
   return 0;
 }
@@ -399,7 +402,7 @@
     icon = EGGetWindowIcon(task, true);
 
   (*iter)->SetIcon(icon);
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
 
   return 0;
 }
@@ -431,7 +434,7 @@
                    SWP_NOZORDER | SWP_NOACTIVATE);
     }
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
 
   return 0;
 }
@@ -611,7 +614,7 @@
     }
 
   if (refresh)
-    DrawAlphaBlend(false);
+    DrawAlphaBlend();
 
   return 0;
 }
@@ -670,7 +673,7 @@
   UpdateIcons();
 }
 
-void Applet::DrawAlphaBlend(bool forceRefresh)
+void Applet::DrawAlphaBlend()
 {
   HDC hdc;
   RECT clientrt, rt;
@@ -683,16 +686,23 @@
 
   hdc = EGBeginPaint(mainWnd);
 
-  if ((!EqualRect(&clientrt, &oldrt)) || forceRefresh)
-    {
-      CopyRect(&oldrt, &clientrt);
-      if (BackgroundDC != NULL)
-        DeleteDC(BackgroundDC);
-      BackgroundDC = ESEPaintBackground(clientrt);
-    }
+  if (!EqualRect(&clientrt, &oldrt))
+  {
+    CopyRect(&oldrt, &clientrt);
+    if (activeBackgroundDC != NULL)
+      DeleteDC(activeBackgroundDC);
+    if (inactiveBackgroundDC != NULL)
+      DeleteDC(inactiveBackgroundDC);
+    activeBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, true);
+    inactiveBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, false);
+  }
 
-  BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
-         BackgroundDC, 0, 0, SRCCOPY);
+  if (mouseOver)
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           activeBackgroundDC, 0, 0, SRCCOPY);
+  else
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           inactiveBackgroundDC, 0, 0, SRCCOPY);
   PaintTasks(hdc, clientrt);
 
   bf.BlendOp = AC_SRC_OVER;
@@ -728,7 +738,7 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          DrawAlphaBlend(false);
+          DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
         }
 
@@ -757,7 +767,7 @@
               if (refresh)
                 {
                   (*iter)->ToggleVisible();
-                  DrawAlphaBlend(false);
+                  DrawAlphaBlend();
                 }
 
               return 0;
@@ -804,7 +814,7 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
 
@@ -898,7 +908,7 @@
 
 
   UpdateIcons();
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
   return 0;
 }
 
@@ -972,7 +982,7 @@
   if (messageClass & EMERGE_VWM)
     {
       activeWnd = NULL;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
 
       return 0;
     }
@@ -1013,7 +1023,7 @@
           if ((task != mainWnd) && (task != activeWnd))
             {
               activeWnd = task;
-              DrawAlphaBlend(false);
+              DrawAlphaBlend();
             }
           return SetFlash(task, false);
 
@@ -1026,7 +1036,7 @@
           if ((task != mainWnd) && (task != activeWnd))
             {
               activeWnd = task;
-              DrawAlphaBlend(false);
+              DrawAlphaBlend();
             }
           return SetFlash(task, false);
 
@@ -1116,6 +1126,7 @@
   if (pAppletMenu)
     pAppletMenu->UpdateHook();
 
-  DrawAlphaBlend(true);
+  ZeroMemory(&oldrt, sizeof(RECT));
+  DrawAlphaBlend();
 }
 

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeTasks/Applet.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -57,7 +57,7 @@
     HWND mainWnd, toolWnd, activeWnd;
     HMENU mainMenu;
     HHOOK menuHook;
-    HDC BackgroundDC;
+    HDC activeBackgroundDC, inactiveBackgroundDC;
     bool fullScreen;
     void ResetTaskIcons();
     POINT anchor;
@@ -99,7 +99,7 @@
     void AdjustRect(RECT *wndRect);
     void BuildTasksList();
     std::vector<Task*>::iterator FindTask(HWND hwnd);
-    void DrawAlphaBlend(bool forceRefresh);
+    void DrawAlphaBlend();
     void UpdateGUI();
     void SetActive(HWND hwnd);
     GUIINFO guiInfo;

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -198,7 +198,8 @@
 
   appletMonitor = NULL;
 
-  BackgroundDC = NULL;
+  activeBackgroundDC = NULL;
+  inactiveBackgroundDC = NULL;
 
 //  activeIcon = NULL;
 
@@ -216,8 +217,10 @@
   // Destroy mainMenu
   delete pAppletMenu;
 
-  if (BackgroundDC != NULL)
-    DeleteDC(BackgroundDC);
+  if (activeBackgroundDC != NULL)
+    DeleteDC(activeBackgroundDC);
+  if (inactiveBackgroundDC != NULL)
+    DeleteDC(inactiveBackgroundDC);
 
   // Cleanup the icon vectors
   while (!trayIconList.empty())
@@ -510,7 +513,7 @@
   EAEAutoSize(autoSizeInfo);
 }
 
-void Applet::DrawAlphaBlend(bool forceRefresh)
+void Applet::DrawAlphaBlend()
 {
   HDC hdc;            // handle of the DC we will create
   BLENDFUNCTION bf;   // structure for alpha blending
@@ -525,16 +528,23 @@
   // create a DC for our bitmap -- the source DC for AlphaBlend
   hdc = EGBeginPaint(mainWnd);
 
-  if ((!EqualRect(&clientrt, &oldrt)) || forceRefresh)
-    {
-      CopyRect(&oldrt, &clientrt);
-      if (BackgroundDC != NULL)
-        DeleteDC(BackgroundDC);
-      BackgroundDC = ESEPaintBackground(clientrt);
-    }
+  if (!EqualRect(&clientrt, &oldrt))
+  {
+    CopyRect(&oldrt, &clientrt);
+    if (activeBackgroundDC != NULL)
+      DeleteDC(activeBackgroundDC);
+    if (inactiveBackgroundDC != NULL)
+      DeleteDC(inactiveBackgroundDC);
+    activeBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, true);
+    inactiveBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, false);
+  }
 
-  BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
-         BackgroundDC, 0, 0, SRCCOPY);
+  if (mouseOver)
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           activeBackgroundDC, 0, 0, SRCCOPY);
+  else
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           inactiveBackgroundDC, 0, 0, SRCCOPY);
   PaintIcons(hdc, clientrt);
 
   bf.BlendOp = AC_SRC_OVER;
@@ -586,7 +596,7 @@
                       }*/
 
           mouseOver = false;
-          DrawAlphaBlend(false);
+          DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
           ShowHiddenIcons(false, false);  // roblarky
         }
@@ -646,7 +656,7 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
       ShowHiddenIcons(true, false);  // roblarky
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
@@ -750,7 +760,7 @@
 
   AdjustIcons();
   UpdateIcons();
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
   return 0;
 }
 
@@ -875,7 +885,8 @@
   if (pAppletMenu)
     pAppletMenu->UpdateHook();
 
-  DrawAlphaBlend(true);
+  ZeroMemory(&oldrt, sizeof(RECT));
+  DrawAlphaBlend();
 }
 
 //-----
@@ -1069,7 +1080,7 @@
 
               AdjustIcons();
 
-              DrawAlphaBlend(false);
+              DrawAlphaBlend();
             }
         }
     }
@@ -1140,7 +1151,7 @@
 
       AdjustIcons();
 
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
     }
 
   return 1;
@@ -1223,7 +1234,7 @@
       AdjustIcons();
     }
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
 
   return 1;
 }
@@ -1276,7 +1287,7 @@
 
       AdjustIcons();
 
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
     }
 
   return 1;

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeTray/Applet.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -249,7 +249,7 @@
     HWND mainWnd, toolWnd, trayWnd, notifyWnd;
     HMENU mainMenu;
     HHOOK menuHook;
-    HDC BackgroundDC;
+    HDC activeBackgroundDC, inactiveBackgroundDC;
     bool fullScreen;
     bool baseClassRegistered, trayClassRegistered, notifyClassRegistered;
     RECT HoverRect, oldrt;
@@ -287,7 +287,7 @@
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
     void AdjustIcons();
     void AdjustRect(RECT *wndRect);
-    void DrawAlphaBlend(bool forceRefresh);
+    void DrawAlphaBlend();
     void UpdateGUI();
     void UnloadSSO();
     void LoadSSO();

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-20 13:15:18 UTC (rev 1353)
@@ -152,7 +152,9 @@
 
   appletMonitor = NULL;
 
-  BackgroundDC = NULL;
+  activeBackgroundDC = NULL;
+  inactiveBackgroundDC = NULL;
+
   ZeroMemory(&oldrt, sizeof(RECT));
 }
 
@@ -175,6 +177,11 @@
 
   ELRegisterShellHookWindow(mainWnd, false);
 
+  if (activeBackgroundDC != NULL)
+    DeleteDC(activeBackgroundDC);
+  if (inactiveBackgroundDC != NULL)
+    DeleteDC(inactiveBackgroundDC);
+
   // Destroy mainMenu
   delete pAppletMenu;
 
@@ -501,7 +508,7 @@
 
   EndDeferWindowPos(dwp);
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
 }
 
 //-----
@@ -662,7 +669,7 @@
   return 1;
 }
 
-void Applet::DrawAlphaBlend(bool forceRefresh)
+void Applet::DrawAlphaBlend()
 {
   HDC hdc;                        // handle of the DC we will create
   BLENDFUNCTION bf;               // structure for alpha blending
@@ -681,16 +688,23 @@
   // create a DC for our bitmap -- the source DC for AlphaBlend
   hdc = EGBeginPaint(mainWnd);
 
-  if ((!EqualRect(&clientrt, &oldrt)) || forceRefresh)
-    {
-      CopyRect(&oldrt, &clientrt);
-      if (BackgroundDC != NULL)
-        DeleteDC(BackgroundDC);
-      BackgroundDC = ESEPaintBackground(clientrt);
-    }
+  if (!EqualRect(&clientrt, &oldrt))
+  {
+    CopyRect(&oldrt, &clientrt);
+    if (activeBackgroundDC != NULL)
+      DeleteDC(activeBackgroundDC);
+    if (inactiveBackgroundDC != NULL)
+      DeleteDC(inactiveBackgroundDC);
+    activeBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, true);
+    inactiveBackgroundDC = ESEPaintBackground(clientrt, &guiInfo, false);
+  }
 
-  BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
-         BackgroundDC, 0, 0, SRCCOPY);
+  if (mouseOver)
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           activeBackgroundDC, 0, 0, SRCCOPY);
+  else
+    BitBlt(hdc, clientrt.left, clientrt.top, clientrt.right - clientrt.left, clientrt.bottom - clientrt.top,
+           inactiveBackgroundDC, 0, 0, SRCCOPY);
 
   rowScalar = (float)(clientrt.bottom - (2 * dragBorder)) /
               (float)pSettings->GetDesktopRows();
@@ -772,7 +786,7 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          DrawAlphaBlend(false);
+          DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
         }
 
@@ -800,7 +814,7 @@
       // Add new tasks
       EnumWindows(BuildTasksList, 0);
 
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
 
       SetTimer(mainWnd, NEW_TASK_TIMER, NEW_TASK_POLL_TIME, NULL);
 
@@ -878,7 +892,7 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      DrawAlphaBlend(false);
+      DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
 
@@ -972,7 +986,7 @@
     }
 
 
-  DrawAlphaBlend(false);
+  DrawAlphaBlend();
   return 0;
 }
 
@@ -1103,7 +1117,8 @@
   if (pAppletMenu)
     pAppletMenu->UpdateHook();
 
-  DrawAlphaBlend(true);
+  ZeroMemory(&oldrt, sizeof(RECT));
+  DrawAlphaBlend();
 }
 
 LRESULT Applet::DoNotify(HWND hwnd, LPARAM lParam)

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-07-20 13:14:19 UTC (rev 1352)
+++ trunk/Source/emergeVWM/Applet.h	2007-07-20 13:15:18 UTC (rev 1353)
@@ -63,7 +63,7 @@
     HWND mainWnd, toolWnd, oldActiveWindow, selectedWindow, oldTipWindow;
     HMENU mainMenu;
     HHOOK menuHook;
-    HDC BackgroundDC;
+    HDC activeBackgroundDC, inactiveBackgroundDC;
     RECT oldrt;
     TOOLINFO ti;
     POINT referencePt;
@@ -96,7 +96,7 @@
     LRESULT DesktopMouseEvent(HWND hwnd, UINT message, LPARAM lParam);
     LRESULT DoDisplayChange(HWND hwnd);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
-    void DrawAlphaBlend(bool forceRefresh);
+    void DrawAlphaBlend();
     void UpdateGUI();
     bool IsWindowValidTask(HWND hwnd);
     void SwitchDesktop(UINT row, UINT column, bool gather);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1355] trunk/Source

From: <ir0nh34d@us...> - 2007-07-21 11:55

Revision: 1355
          http://emerge.svn.sourceforge.net/emerge/?rev=1355&view=rev
Author:   ir0nh34d
Date:     2007-07-21 04:55:35 -0700 (Sat, 21 Jul 2007)

Log Message:
-----------
Added window.padding

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeSchemeEngine/resource.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -566,7 +566,7 @@
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
-  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (!IsWindowVisible(mainWnd))
     return 1;
@@ -649,7 +649,7 @@
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
-  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (mainFont != NULL)
     DeleteObject(mainFont);

Modified: trunk/Source/emergeGraphics/emergeGraphics.h
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-21 11:55:35 UTC (rev 1355)
@@ -119,6 +119,7 @@
     WCHAR gradientMethod[MAX_PATH];
     UINT bevelWidth;
     bool clickThrough;
+    UINT padding;
   }
 GUIINFO, *LPGUIINFO;
 

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -251,7 +251,7 @@
 {
   UINT i;
   RECT rect;
-  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
     x = r.right - pSettings->GetIconSize() - dragBorder;
@@ -418,7 +418,7 @@
 
   autoSizeInfo.hwnd = mainWnd;
   autoSizeInfo.rect = wndRect;
-  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   autoSizeInfo.iconSize = pSettings->GetIconSize();
   autoSizeInfo.iconSpacing = pSettings->GetIconSpacing();
   autoSizeInfo.visibleIconCount = pSettings->GetItemListSize();
@@ -675,7 +675,7 @@
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
-  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (!IsWindowVisible(mainWnd))
     return 1;
@@ -721,7 +721,7 @@
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
-  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   ShowWindow(mainWnd, SW_HIDE);
 

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -185,8 +185,8 @@
     SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
 
   SetDlgItemInt(hwndDlg, IDC_BEVEL, guiInfo.bevelWidth, false);
-
   SetDlgItemInt(hwndDlg, IDC_BORDER, guiInfo.dragBorder, false);
+  SetDlgItemInt(hwndDlg, IDC_PADDING, guiInfo.padding, false);
 
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Solid"));
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Vertical"));
@@ -500,6 +500,7 @@
 
   guiInfo.bevelWidth = GetDlgItemInt(hwndDlg, IDC_BEVEL, NULL, FALSE);
   guiInfo.dragBorder = GetDlgItemInt(hwndDlg, IDC_BORDER, NULL, FALSE);
+  guiInfo.padding = GetDlgItemInt(hwndDlg, IDC_PADDING, NULL, FALSE);
 
   guiInfo.gradientTo = colourTo;
   guiInfo.gradientFrom = colourFrom;

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-21 11:55:35 UTC (rev 1355)
@@ -93,6 +93,8 @@
 	EDITTEXT	IDC_BEVEL,240,183,20,12,ES_AUTOHSCROLL
   LTEXT "Border:",IDC_STATIC,275,185,30,8
 	EDITTEXT	IDC_BORDER,305,183,20,12,ES_AUTOHSCROLL
+  LTEXT "Padding:",IDC_STATIC,235,205,30,8
+	EDITTEXT	IDC_PADDING,265,203,20,12,ES_AUTOHSCROLL
 
 	GROUPBOX	"Gradient Settings",IDC_STATIC,5,220,320,50,WS_GROUP
   LTEXT "Method:",IDC_STATIC,10,235,30,8

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -36,7 +36,6 @@
 // Globals
 WCHAR scheme[MAX_PATH];
 HBRUSH bgBrush = NULL;
-bool paintBorder = false;
 
 // Globals
 HINSTANCE dllInstance;
@@ -102,6 +101,7 @@
   ELWriteFileBool(schemeFile, TEXT("window.clickThrough:"), guiInfo->clickThrough);
   ELWriteFileInt(schemeFile, TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
   ELWriteFileInt(schemeFile, TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
+  ELWriteFileInt(schemeFile, TEXT("window.padding:"), (int)guiInfo->padding);
   ELWriteFileColor(schemeFile, TEXT("gradient.colorFrom:"), guiInfo->gradientFrom);
   ELWriteFileColor(schemeFile, TEXT("gradient.colorTo:"), guiInfo->gradientTo);
   ELWriteFileString(schemeFile, TEXT("gradient.method:"), guiInfo->gradientMethod);
@@ -128,11 +128,12 @@
                   GetSysColor(COLOR_ACTIVECAPTION));
   ELReadFileColor(schemeFile, TEXT("color.font:"), &guiInfo->colorFont,
                   GetSysColor(COLOR_BTNTEXT));
-  paintBorder = ELReadFileColor(schemeFile, TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
+  ELReadFileColor(schemeFile, TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
   ELReadFileBool(schemeFile, TEXT("window.shadow:"), &guiInfo->windowShadow, true);
   ELReadFileBool(schemeFile, TEXT("window.clickThrough:"), &guiInfo->clickThrough, false);
   ELReadFileInt(schemeFile, TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
   ELReadFileInt(schemeFile, TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
+  ELReadFileInt(schemeFile, TEXT("window.padding:"), (int*)&guiInfo->padding, 0);
   ELReadFileColor(schemeFile, TEXT("gradient.colorFrom:"), &guiInfo->gradientFrom,
                   GetSysColor(COLOR_ACTIVECAPTION));
   ELReadFileColor(schemeFile, TEXT("gradient.colorTo:"), &guiInfo->gradientTo,
@@ -248,7 +249,7 @@
   HBITMAP bgBMP = CreateDIBSection(bgDC, &bmi, DIB_RGB_COLORS, &bgBits, NULL, 0x0);
   SelectObject(bgDC, bgBMP);
 
-  if (paintBorder)
+  if (guiInfo->dragBorder > 0)
     {
       CreateBorder(bgDC, clientRect, guiInfo->colorBorder, guiInfo->alphaBorder, guiInfo->dragBorder);
 

Modified: trunk/Source/emergeSchemeEngine/resource.h
===================================================================
--- trunk/Source/emergeSchemeEngine/resource.h	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeSchemeEngine/resource.h	2007-07-21 11:55:35 UTC (rev 1355)
@@ -41,6 +41,7 @@
 #define IDC_SHADOW              402
 #define IDC_BEVEL               403
 #define IDC_BORDER              404
+#define IDC_PADDING             405
 
 #define IDC_METHOD              500
 #define IDC_INTERLACED          501

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -233,7 +233,7 @@
 {
   UINT i;
   RECT rect;
-  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   WCHAR windowTitle[MAX_LINE_LENGTH];
 
   if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
@@ -654,7 +654,7 @@
 
   autoSizeInfo.hwnd = mainWnd;
   autoSizeInfo.rect = wndRect;
-  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   autoSizeInfo.iconSize = pSettings->GetIconSize();
   autoSizeInfo.iconSpacing = pSettings->GetIconSpacing();
   autoSizeInfo.visibleIconCount = (UINT)taskList.size();
@@ -943,7 +943,7 @@
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
-  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (!IsWindowVisible(mainWnd))
     return 1;
@@ -1079,7 +1079,7 @@
 
   ResetTaskIcons();
 
-  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   ShowWindow(mainWnd, SW_HIDE);
 

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -339,7 +339,7 @@
 void Applet::AdjustIcons()
 {
   RECT r, rect;
-  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   std::vector<TrayIcon*>::iterator iter;
 
   GetClientRect(mainWnd, &r);
@@ -497,7 +497,7 @@
 
   autoSizeInfo.hwnd = mainWnd;
   autoSizeInfo.rect = wndRect;
-  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   autoSizeInfo.iconSize = ICON_SIZE;
   autoSizeInfo.iconSpacing = pSettings->GetIconSpacing();
 
@@ -798,7 +798,7 @@
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
-  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   movesizeinprogress = false;
 
@@ -846,7 +846,7 @@
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
-  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   ShowWindow(mainWnd, SW_HIDE);
 

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-20 22:58:56 UTC (rev 1354)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-21 11:55:35 UTC (rev 1355)
@@ -524,7 +524,7 @@
   POINT pt;
   RECT clientRect, desktopRect;
   bool found = false;
-  UINT dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  UINT dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   int screenWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN),
                     screenHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
 
@@ -679,7 +679,7 @@
   std::vector<Task*>::iterator iter;
   UINT row, column;
   float columnScalar, rowScalar;
-  UINT dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  UINT dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   // get window dimensions
   GetWindowRect(mainWnd, &rt);
@@ -1011,7 +1011,7 @@
 {
   std::vector<Task*>::iterator iter;
   RECT emptyRect;
-  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   if (!IsWindowVisible(mainWnd))
     return 1;
@@ -1087,7 +1087,7 @@
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
-  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth;
+  dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
   ShowWindow(mainWnd, SW_HIDE);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1357] trunk/Source

From: <ir0nh34d@us...> - 2007-07-22 00:16

Revision: 1357
          http://emerge.svn.sourceforge.net/emerge/?rev=1357&view=rev
Author:   ir0nh34d
Date:     2007-07-21 17:16:35 -0700 (Sat, 21 Jul 2007)

Log Message:
-----------
Implemented click through regardless of alpha level

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -270,3 +270,4 @@
 
   return tooltipWindow;
 }
+

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -122,8 +122,13 @@
 
       // Handles the resizing of the window
     case WM_NCHITTEST:
-      return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
-                        LOWORD(lParam), HIWORD(lParam));
+      if (!pApplet->ClickThrough())
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
+                          LOWORD(lParam), HIWORD(lParam));
+      else
+        SetWindowLong(hwnd, GWL_EXSTYLE,
+                      GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
+      break;
 
       // Repaint the icons as the window size is changing
     case WM_WINDOWPOSCHANGING:
@@ -177,6 +182,17 @@
   return 0;
 }
 
+bool Applet::ClickThrough()
+{
+  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
+    return false;
+
+  if (!guiInfo.clickThrough)
+    return false;
+
+  return true;
+}
+
 LRESULT Applet::DoDefault(UINT message, UINT shellMessage, HWND task)
 {
   if (message == ShellMessage)
@@ -378,6 +394,8 @@
 
 LRESULT Applet::DoTimer(UINT timerID)
 {
+  bool clickThrough = ClickThrough();
+
   if (timerID == MOUSE_TIMER)
     {
       POINT pt;
@@ -389,27 +407,19 @@
           mouseOver = false;
           DrawAlphaBlend();
           KillTimer(mainWnd, timerID);
+          clickThrough = false;
         }
 
+      if (!clickThrough)
+        SetWindowLong(mainWnd, GWL_EXSTYLE,
+                      GetWindowLong(mainWnd, GWL_EXSTYLE) & ~WS_EX_TRANSPARENT);
+
       return 0;
     }
 
   return 1;
 }
 
-BOOL CALLBACK Applet::EnumFullScreenWindows(HWND hwnd, LPARAM lParam)
-{
-  UNREFERENCED_PARAMETER(lParam);
-
-  if (ELIsFullScreen(hwnd))
-    {
-      SetLastError(ERROR_SUCCESS);
-      return false;
-    }
-
-  return true;
-}
-
 LRESULT Applet::DoSysColorChange()
 {
   UpdateGUI();

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeCommand/Applet.h	2007-07-22 00:16:35 UTC (rev 1357)
@@ -92,9 +92,11 @@
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
     void DrawAlphaBlend();
     void UpdateGUI();
+    LRESULT DoButtonDown(UINT message, WPARAM wParam, LPARAM lParam);
     LRESULT ShowCommand();
     void SetCommandText(WCHAR *commandText);
     void UpdateTip(WCHAR *tip);
+    bool ClickThrough();
     GUIINFO guiInfo;
   };
 

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -78,8 +78,13 @@
 
       // Handles the resizing of the window
     case WM_NCHITTEST:
-      return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
-                        LOWORD(lParam), HIWORD(lParam));
+      if (!pApplet->ClickThrough())
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+                          LOWORD(lParam), HIWORD(lParam));
+      else
+        SetWindowLong(hwnd, GWL_EXSTYLE,
+                      GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
+      break;
 
       // Repaint the icons as the window size is changing
     case WM_WINDOWPOSCHANGING:
@@ -388,19 +393,6 @@
   return 1;
 }
 
-BOOL CALLBACK Applet::EnumFullScreenWindows(HWND hwnd, LPARAM lParam)
-{
-  UNREFERENCED_PARAMETER(lParam);
-
-  if (ELIsFullScreen(hwnd))
-    {
-      SetLastError(ERROR_SUCCESS);
-      return false;
-    }
-
-  return true;
-}
-
 //-----
 // Function:	AdjustRect
 // Required:	Nothing
@@ -493,6 +485,8 @@
 
 LRESULT Applet::DoTimer(UINT timerID)
 {
+  bool clickThrough = ClickThrough();
+
   if (timerID == MOUSE_TIMER)
     {
       POINT pt;
@@ -504,14 +498,30 @@
           mouseOver = false;
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
+          clickThrough = false;
         }
 
+      if (!clickThrough)
+        SetWindowLong(mainWnd, GWL_EXSTYLE,
+                      GetWindowLong(mainWnd, GWL_EXSTYLE) & ~WS_EX_TRANSPARENT);
+
       return 0;
     }
 
   return 1;
 }
 
+bool Applet::ClickThrough()
+{
+  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
+    return false;
+
+  if (!guiInfo.clickThrough)
+    return false;
+
+  return true;
+}
+
 LRESULT Applet::DoSysColorChange()
 {
   UpdateGUI();

Modified: trunk/Source/emergeLauncher/Applet.h
===================================================================
--- trunk/Source/emergeLauncher/Applet.h	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeLauncher/Applet.h	2007-07-22 00:16:35 UTC (rev 1357)
@@ -89,6 +89,7 @@
     LRESULT PaintItems(HDC hdc, RECT r);
     LRESULT DoDisplayChange(HWND hwnd);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
+    bool ClickThrough();
     void CreateBrushes();
     void DestroyBrushes();
     void AdjustRect(RECT *wndRect);

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -172,7 +172,7 @@
   tmpAlpha /= 100;
   guiInfo->alphaInactive = tmpAlpha;
 
-  if ((guiInfo->alphaBackground <= 0) && !guiInfo->clickThrough)
+  if (guiInfo->alphaBackground <= 0)
     guiInfo->alphaBackground = 1;
 
   tmpAlpha = guiInfo->alphaBackground;

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -77,8 +77,13 @@
 
       // Handles the resizing of the window
     case WM_NCHITTEST:
-      return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
-                        LOWORD(lParam), HIWORD(lParam));
+      if (!pApplet->ClickThrough())
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+                          LOWORD(lParam), HIWORD(lParam));
+      else
+        SetWindowLong(hwnd, GWL_EXSTYLE,
+                      GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
+      break;
 
       // Repaint the icons as the window size is changing
     case WM_WINDOWPOSCHANGING:
@@ -216,6 +221,17 @@
   return 1;
 }
 
+bool Applet::ClickThrough()
+{
+  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
+    return false;
+
+  if (!guiInfo.clickThrough)
+    return false;
+
+  return true;
+}
+
 void Applet::UpdateIcons()
 {
   for (UINT i = 0; i < taskList.size(); i++)
@@ -563,19 +579,6 @@
   return true;
 }
 
-BOOL CALLBACK Applet::EnumFullScreenWindows(HWND hwnd, LPARAM lParam)
-{
-  UNREFERENCED_PARAMETER(lParam);
-
-  if (ELIsFullScreen(hwnd))
-    {
-      SetLastError(ERROR_SUCCESS);
-      return false;
-    }
-
-  return true;
-}
-
 //-----
 // Function:	SetFlash
 // Required:	HWND task - handle to the task's window
@@ -727,6 +730,8 @@
 
 LRESULT Applet::DoTimer(UINT timerID)
 {
+  bool clickThrough = ClickThrough();
+
   if (timerID == MOUSE_TIMER)
     {
       CleanTasks();
@@ -740,8 +745,13 @@
           mouseOver = false;
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
+          clickThrough = false;
         }
 
+      if (!clickThrough)
+        SetWindowLong(mainWnd, GWL_EXSTYLE,
+                      GetWindowLong(mainWnd, GWL_EXSTYLE) & ~WS_EX_TRANSPARENT);
+
       return 0;
     }
   else

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeTasks/Applet.h	2007-07-22 00:16:35 UTC (rev 1357)
@@ -93,6 +93,7 @@
     LRESULT RemoveTask(HWND task);
     LRESULT SetFlash(HWND task, bool flash);
     LRESULT DoDisplayChange(HWND hwnd);
+    bool ClickThrough();
     void CreateBrushes();
     void DestroyBrushes();
     bool CleanTasks();

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -102,8 +102,13 @@
 
       // Handles the resizing of the window
     case WM_NCHITTEST:
-      return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
-                        LOWORD(lParam), HIWORD(lParam));
+      if (!pApplet->ClickThrough())
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+                          LOWORD(lParam), HIWORD(lParam));
+      else
+        SetWindowLong(hwnd, GWL_EXSTYLE,
+                      GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
+      break;
 
       // Repaint the icons as the window size is changing
     case WM_WINDOWPOSCHANGING:
@@ -569,6 +574,8 @@
 
 LRESULT Applet::DoTimer(UINT timerID)
 {
+  bool clickThrough = ClickThrough();
+
   if (timerID == MOUSE_TIMER)
     {
       CleanTray();
@@ -599,23 +606,26 @@
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
           ShowHiddenIcons(false, false);  // roblarky
+          clickThrough = false;
         }
 
+      if (!clickThrough)
+        SetWindowLong(mainWnd, GWL_EXSTYLE,
+                      GetWindowLong(mainWnd, GWL_EXSTYLE) & ~WS_EX_TRANSPARENT);
+
       return 0;
     }
 
   return 1;
 }
 
-BOOL CALLBACK Applet::EnumFullScreenWindows(HWND hwnd, LPARAM lParam)
+bool Applet::ClickThrough()
 {
-  UNREFERENCED_PARAMETER(lParam);
+  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
+    return false;
 
-  if (ELIsFullScreen(hwnd))
-    {
-      SetLastError(ERROR_SUCCESS);
-      return false;
-    }
+  if (!guiInfo.clickThrough)
+    return false;
 
   return true;
 }

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeTray/Applet.h	2007-07-22 00:16:35 UTC (rev 1357)
@@ -292,6 +292,7 @@
     void UnloadSSO();
     void LoadSSO();
     void CleanTray();
+    bool ClickThrough();
     std::vector<TrayIcon*>::iterator FindTrayIcon(NOTIFYICONDATA *iconData);
     LRESULT RemoveTrayIcon(NOTIFYICONDATA *iconData);
     LRESULT ModifyTrayIcon(NOTIFYICONDATA *iconData, LPTSTR newTip, bool hidden, bool shared);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
@@ -80,8 +80,13 @@
 
       // Handles the resizing of the window
     case WM_NCHITTEST:
-      return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
-                        LOWORD(lParam), HIWORD(lParam));
+      if (!pApplet->ClickThrough())
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
+                          LOWORD(lParam), HIWORD(lParam));
+      else
+        SetWindowLong(hwnd, GWL_EXSTYLE,
+                      GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
+      break;
 
       // Repaint the icons as the window size is changing
     case WM_WINDOWPOSCHANGING:
@@ -256,19 +261,6 @@
   return pApplet->AddTasks(hwnd);
 }
 
-BOOL CALLBACK Applet::EnumFullScreenWindows(HWND hwnd, LPARAM lParam)
-{
-  UNREFERENCED_PARAMETER(lParam);
-
-  if (ELIsFullScreen(hwnd))
-    {
-      SetLastError(ERROR_SUCCESS);
-      return false;
-    }
-
-  return true;
-}
-
 bool Applet::AddTasks(HWND hwnd)
 {
   std::vector<Task*>::iterator iter;
@@ -777,6 +769,8 @@
 
 LRESULT Applet::DoTimer(UINT timerID)
 {
+  bool clickThrough = ClickThrough();
+
   if (timerID == MOUSE_TIMER)
     {
       POINT pt;
@@ -788,8 +782,13 @@
           mouseOver = false;
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
+          clickThrough = false;
         }
 
+      if (!clickThrough)
+        SetWindowLong(mainWnd, GWL_EXSTYLE,
+                      GetWindowLong(mainWnd, GWL_EXSTYLE) & ~WS_EX_TRANSPARENT);
+
       return 0;
     }
   else if (timerID == NEW_TASK_TIMER)
@@ -824,6 +823,17 @@
   return 1;
 }
 
+bool Applet::ClickThrough()
+{
+  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
+    return false;
+
+  if (!guiInfo.clickThrough)
+    return false;
+
+  return true;
+}
+
 LRESULT Applet::DoDefault(UINT message, UINT shellMessage, HWND task)
 {
   if (message == ShellMessage)

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-07-21 15:22:07 UTC (rev 1356)
+++ trunk/Source/emergeVWM/Applet.h	2007-07-22 00:16:35 UTC (rev 1357)
@@ -96,6 +96,7 @@
     LRESULT DesktopMouseEvent(HWND hwnd, UINT message, LPARAM lParam);
     LRESULT DoDisplayChange(HWND hwnd);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
+    bool ClickThrough();
     void DrawAlphaBlend();
     void UpdateGUI();
     bool IsWindowValidTask(HWND hwnd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1358] trunk/Source

From: <ir0nh34d@us...> - 2007-07-22 16:17

Revision: 1358
          http://emerge.svn.sourceforge.net/emerge/?rev=1358&view=rev
Author:   ir0nh34d
Date:     2007-07-22 09:17:04 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
Implemented per-applet click through

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Config.cpp
    trunk/Source/emergeCommand/Settings.cpp
    trunk/Source/emergeCommand/Settings.h
    trunk/Source/emergeCommand/emergeCommand.rc
    trunk/Source/emergeCommand/resource.h
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Config.cpp
    trunk/Source/emergeLauncher/Settings.cpp
    trunk/Source/emergeLauncher/Settings.h
    trunk/Source/emergeLauncher/emergeLauncher.rc
    trunk/Source/emergeLauncher/resource.h
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeSchemeEngine/resource.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Config.cpp
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTasks/emergeTasks.rc
    trunk/Source/emergeTasks/resource.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Config.cpp
    trunk/Source/emergeTray/Settings.cpp
    trunk/Source/emergeTray/Settings.h
    trunk/Source/emergeTray/emergeTray.rc
    trunk/Source/emergeTray/resource.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Config.cpp
    trunk/Source/emergeVWM/Settings.cpp
    trunk/Source/emergeVWM/Settings.h
    trunk/Source/emergeVWM/emergeVWM.rc
    trunk/Source/emergeVWM/resource.h

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -187,7 +187,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (!guiInfo.clickThrough)
+  if (!pSettings->GetClickThrough())
     return false;
 
   return true;

Modified: trunk/Source/emergeCommand/Config.cpp
===================================================================
--- trunk/Source/emergeCommand/Config.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/Config.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -73,6 +73,9 @@
   if (pSettings->GetSnapSize())
     SendDlgItemMessage(hwndDlg, IDC_SNAPSIZE, BM_SETCHECK, BST_CHECKED, 0);
 
+  if (pSettings->GetClickThrough())
+    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
+
   SetDlgItemText(hwndDlg, IDC_CLOCKTEXT, pSettings->GetTimeFormat());
 
   SetDlgItemText(hwndDlg, IDC_TIPTEXT, pSettings->GetTipFormat());
@@ -180,6 +183,17 @@
         pSettings->SetSnapSize(false);
     }
 
+  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+      if (!pSettings->GetClickThrough())
+        pSettings->SetClickThrough(true);
+    }
+  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+    {
+      if (pSettings->GetClickThrough())
+        pSettings->SetClickThrough(false);
+    }
+
   GetDlgItemText(hwndDlg, IDC_CLOCKTEXT, tmp, MAX_LINE_LENGTH);
   if (wcscmp(tmp, pSettings->GetTimeFormat()) != 0)
     pSettings->SetTimeFormat(tmp);

Modified: trunk/Source/emergeCommand/Settings.cpp
===================================================================
--- trunk/Source/emergeCommand/Settings.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/Settings.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -48,6 +48,7 @@
   ELReadRegString(key, TEXT("TipFormat"), tipFormat, TEXT("%m/%d/%y %I:%M:%S %p"));
   ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
   ELReadRegString(key, TEXT("Font"), fontString, TEXT("Tahoma-12"));
+  ELReadRegDWord(key, TEXT("ClickThrough"), (DWORD*)&clickThrough, 0);
 
   tmpRect.left = x;
   tmpRect.top = y;
@@ -168,6 +169,11 @@
   return (snapSize == 1);
 }
 
+bool Settings::GetClickThrough()
+{
+  return (clickThrough == 1);
+}
+
 int Settings::GetX()
 {
   return x;
@@ -218,6 +224,25 @@
   return tipFormat;
 }
 
+void Settings::SetClickThrough(bool clickThrough)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (clickThrough)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).clickThrough = tmp;
+
+  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+    {
+      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
 void Settings::SetSnapMove(bool snapMove)
 {
   HKEY key;

Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/Settings.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -45,7 +45,9 @@
     WCHAR *GetTipFormat();
     WCHAR *GetClockTextAlign();
     WCHAR *GetCommandTextAlign();
+    RECT *GetResolution();
     LOGFONT *GetFont();
+    bool GetClickThrough();
     void SetFont(LOGFONT *logFont);
     void SetPosition(int x, int y);
     void SetSize(DWORD width, DWORD height);
@@ -55,10 +57,11 @@
     void SetTipFormat(WCHAR *timeFormat);
     void SetClockTextAlign(WCHAR *clockTextAlign);
     void SetCommandTextAlign(WCHAR *commandTextAlign);
-    RECT *GetResolution();
     void SetResolution(RECT *deskRect);
+    void SetClickThrough(bool clickThrough);
 
   private:
+    DWORD clickThrough;
     DWORD width, height;
     int x, y;
     DWORD snapSize, snapMove;

Modified: trunk/Source/emergeCommand/emergeCommand.rc
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/emergeCommand.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -46,7 +46,8 @@
 FONT 8, "MS Sans Serif"
 BEGIN
 	CONTROL	"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,5,55,10
-	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,205,5,55,10
+	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,105,5,55,10
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,200,5,55,10
 
 	LTEXT		"Time Format",IDC_STATIC,5,20,50,8
 	EDITTEXT	IDC_CLOCKTEXT,55,19,200,12,ES_AUTOHSCROLL

Modified: trunk/Source/emergeCommand/resource.h
===================================================================
--- trunk/Source/emergeCommand/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeCommand/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -23,5 +23,6 @@
 
 #define IDC_SNAPMOVE        700
 #define IDC_SNAPSIZE        701
+#define IDC_CLICKTHROUGH    702
 
 #define IDI_DEFAULT		    1000

Modified: trunk/Source/emergeGraphics/emergeGraphics.h
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeGraphics/emergeGraphics.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -118,7 +118,6 @@
     UINT dragBorder;
     WCHAR gradientMethod[MAX_PATH];
     UINT bevelWidth;
-    bool clickThrough;
     UINT padding;
   }
 GUIINFO, *LPGUIINFO;

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -516,7 +516,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (!guiInfo.clickThrough)
+  if (!pSettings->GetClickThrough())
     return false;
 
   return true;

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -232,6 +232,9 @@
   if (pSettings->GetAutoSize())
     SendDlgItemMessage(hwndDlg, IDC_AUTOSIZE, BM_SETCHECK, BST_CHECKED, 0);
 
+  if (pSettings->GetClickThrough())
+    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
+
   SetDlgItemInt(hwndDlg, IDC_ICONSPACING, pSettings->GetIconSpacing(), false);
 
   SendMessage(iconSizeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("16x16"));
@@ -504,6 +507,17 @@
         pSettings->SetAutoSize(false);
     }
 
+  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+      if (!pSettings->GetClickThrough())
+        pSettings->SetClickThrough(true);
+    }
+  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+    {
+      if (pSettings->GetClickThrough())
+        pSettings->SetClickThrough(false);
+    }
+
   result = GetDlgItemInt(hwndDlg, IDC_ICONSPACING, &success, false);
   if (success && (result != pSettings->GetIconSpacing()))
     pSettings->SetIconSpacing(result);

Modified: trunk/Source/emergeLauncher/Settings.cpp
===================================================================
--- trunk/Source/emergeLauncher/Settings.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/Settings.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -62,6 +62,7 @@
   ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
   ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
   ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
+  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
   ELCloseRegKey(key);
 }
 
@@ -163,6 +164,11 @@
   return (autoSize == 1);
 }
 
+bool Settings::GetClickThrough()
+{
+  return (clickThrough == 1);
+}
+
 bool Settings::GetSnapMove()
 {
   return (snapMove == 1);
@@ -235,6 +241,25 @@
     }
 }
 
+void Settings::SetClickThrough(bool clickThrough)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (clickThrough)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).clickThrough = tmp;
+
+  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+    {
+      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
 void Settings::SetAutoSize(bool autoSize)
 {
   HKEY key;

Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/Settings.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -42,6 +42,7 @@
     bool GetAutoSize();
     bool GetSnapMove();
     bool GetSnapSize();
+    bool GetClickThrough();
     DWORD GetIconSize();
     DWORD GetIconSpacing();
     WCHAR *GetSchemeFile();
@@ -59,6 +60,7 @@
     void SetIconSize(DWORD iconSize);
     void SetIconSpacing(DWORD iconSpacing);
     void SetSchemeFile(WCHAR *schemeFile);
+    void SetClickThrough(bool clickThrough);
     UINT GetItemListSize();
     Item *GetItem(UINT index);
     void PopulateItems();
@@ -72,7 +74,7 @@
     WCHAR zPosition[MAX_LINE_LENGTH];
     WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
     directionOrientation[MAX_LINE_LENGTH];
-    DWORD autoSize, iconSize, snapMove, snapSize, iconSpacing;
+    DWORD autoSize, iconSize, snapMove, snapSize, iconSpacing, clickThrough;
     WCHAR schemeFile[MAX_LINE_LENGTH];
     HINSTANCE mainInstance;
     RECT resolution;

Modified: trunk/Source/emergeLauncher/emergeLauncher.rc
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -48,7 +48,7 @@
 IDI_ABORT   ICON    "icons\\abort.ico"
 IDI_BROWSE  ICON    "icons\\folder.ico"
 
-IDD_CONFIG DIALOGEX 0, 0, 365, 220
+IDD_CONFIG DIALOGEX 0, 0, 365, 235
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "emergeLauncher Configuration"
 FONT 8, "MS Sans Serif"
@@ -56,61 +56,60 @@
 	CONTROL		"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,10,50,10
 	CONTROL		"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,60,10,50,10
 	CONTROL		"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,115,10,50,10
+	CONTROL		"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,25,60,10
 
-  LTEXT		"Icon Size:",IDC_STATIC,5,25,35,8
-	COMBOBOX	IDC_ICONSIZE,40,23,50,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
-  LTEXT		"Icon Spacing:",IDC_STATIC,95,26,45,8
-	EDITTEXT	IDC_ICONSPACING,140,25,20,10,ES_AUTOHSCROLL
+  LTEXT		"Icon Size:",IDC_STATIC,5,40,35,8
+	COMBOBOX	IDC_ICONSIZE,40,38,50,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+  LTEXT		"Icon Spacing:",IDC_STATIC,95,41,45,8
+	EDITTEXT	IDC_ICONSPACING,140,40,20,10,ES_AUTOHSCROLL
 
-	GROUPBOX	"ZPosition",IDC_STATIC,5,42,160,25,WS_GROUP
-	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,52,40,10
-	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,52,40,10
-	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,52,40,10
+	GROUPBOX	"ZPosition",IDC_STATIC,5,57,160,25,WS_GROUP
+	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,67,40,10
+	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,67,40,10
+	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,67,40,10
 
-	GROUPBOX	"Direction",IDC_STATIC,5,75,160,110,WS_GROUP
+	GROUPBOX	"Direction",IDC_STATIC,5,90,160,110,WS_GROUP
 
-	GROUPBOX	"Orientation",IDC_STATIC,10,85,150,25,WS_GROUP
-	CONTROL		"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,95,50,10
-	CONTROL		"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,95,50,10
+	GROUPBOX	"Orientation",IDC_STATIC,10,100,150,25,WS_GROUP
+	CONTROL		"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,110,50,10
+	CONTROL		"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,110,50,10
 
-	GROUPBOX	"Horizontal",IDC_STATIC,10,120,150,25,WS_GROUP
-	CONTROL		"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,130,60,10
-	CONTROL		"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,130,60,10
+	GROUPBOX	"Horizontal",IDC_STATIC,10,135,150,25,WS_GROUP
+	CONTROL		"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,145,60,10
+	CONTROL		"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,145,60,10
 
-	GROUPBOX	"Vertical",IDC_STATIC,10,155,150,25,WS_GROUP
-	CONTROL		"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,165,60,10
-	CONTROL		"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,165,60,10
+	GROUPBOX	"Vertical",IDC_STATIC,10,170,150,25,WS_GROUP
+	CONTROL		"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,180,60,10
+	CONTROL		"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,180,60,10
 
-	GROUPBOX	"Applications",IDC_STATIC,170,5,190,180,WS_GROUP
+	GROUPBOX	"Applications",IDC_STATIC,170,5,190,195,WS_GROUP
 
 	CONTROL		"AppList",IDC_APPLIST,"SysListView32",LVS_REPORT|LVS_SHOWSELALWAYS|
-			WS_BORDER|WS_TABSTOP,175,15,180,75
+			WS_BORDER|WS_TABSTOP,175,15,180,90
 
-	PUSHBUTTON	"",IDC_ADDITEM,175,93,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_EDITITEM,193,93,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_DELITEM,211,93,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_UPITEM,229,93,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_DOWNITEM,247,93,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_ADDITEM,175,108,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_EDITITEM,193,108,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_DELITEM,211,108,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_UPITEM,229,108,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_DOWNITEM,247,108,16,14,BS_ICON|BS_FLAT
 
-	PUSHBUTTON	"",IDC_SAVEITEM,321,93,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_ABORTITEM,339,93,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_SAVEITEM,321,108,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_ABORTITEM,339,108,16,14,BS_ICON|BS_FLAT
 
-	CONTROL		"Execute:",IDC_EXEBUTTON,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,175,113,45,8
-//	LTEXT		"Execute:",IDC_STATIC,186,113,40,8
-	EDITTEXT	IDC_COMMAND,240,111,101,12,ES_AUTOHSCROLL
-	PUSHBUTTON	"",IDC_BROWSECOMMAND,341,111,14,12,BS_ICON
-	CONTROL		"Command:",IDC_COMBUTTON,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,175,127,45,8
-//	LTEXT		"Command:",IDC_STATIC,186,127,40,8
-	COMBOBOX	IDC_INTERNAL,240,125,115,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
-	LTEXT		"Working Directory:",IDC_WORKINGDIRTEXT,175,141,60,8
-	EDITTEXT	IDC_WORKINGDIR,240,139,101,12,ES_AUTOHSCROLL
-	PUSHBUTTON	"",IDC_BROWSEWORKINGDIR,341,139,14,12,BS_ICON
-	LTEXT		"Icon:",IDC_ICONTEXT,175,155,35,8
-	EDITTEXT	IDC_ICONPATH,240,153,101,12,ES_AUTOHSCROLL
-	PUSHBUTTON	"",IDC_BROWSEICON,341,153,14,12,BS_ICON
-	LTEXT		"Tip:",IDC_TIPTEXT,175,169,35,8
-	EDITTEXT	IDC_TIP,240,167,115,12,ES_AUTOHSCROLL
+	CONTROL		"Execute:",IDC_EXEBUTTON,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,175,128,45,8
+	EDITTEXT	IDC_COMMAND,240,126,101,12,ES_AUTOHSCROLL
+	PUSHBUTTON	"",IDC_BROWSECOMMAND,341,126,14,12,BS_ICON
+	CONTROL		"Command:",IDC_COMBUTTON,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,175,142,45,8
+	COMBOBOX	IDC_INTERNAL,240,140,115,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+	LTEXT		"Working Directory:",IDC_WORKINGDIRTEXT,175,156,60,8
+	EDITTEXT	IDC_WORKINGDIR,240,154,101,12,ES_AUTOHSCROLL
+	PUSHBUTTON	"",IDC_BROWSEWORKINGDIR,341,154,14,12,BS_ICON
+	LTEXT		"Icon:",IDC_ICONTEXT,175,170,35,8
+	EDITTEXT	IDC_ICONPATH,240,168,101,12,ES_AUTOHSCROLL
+	PUSHBUTTON	"",IDC_BROWSEICON,341,168,14,12,BS_ICON
+	LTEXT		"Tip:",IDC_TIPTEXT,175,184,35,8
+	EDITTEXT	IDC_TIP,240,182,115,12,ES_AUTOHSCROLL
 
-	PUSHBUTTON	"OK",IDOK,5,200,70,14
-	PUSHBUTTON	"Cancel",IDCANCEL,290,200,70,14
+	PUSHBUTTON	"OK",IDOK,5,215,70,14
+	PUSHBUTTON	"Cancel",IDCANCEL,290,215,70,14
 END

Modified: trunk/Source/emergeLauncher/resource.h
===================================================================
--- trunk/Source/emergeLauncher/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeLauncher/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -13,6 +13,7 @@
 #define IDC_SNAPMOVE            202
 #define IDC_SNAPSIZE            203
 #define IDC_ICONSPACING         204
+#define IDC_CLICKTHROUGH        205
 
 #define IDC_APPLIST             300
 #define IDC_COMMAND             301

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -181,9 +181,6 @@
   if (guiInfo.windowShadow)
     SendDlgItemMessage(hwndDlg, IDC_SHADOW, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (guiInfo.clickThrough)
-    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
-
   SetDlgItemInt(hwndDlg, IDC_BEVEL, guiInfo.bevelWidth, false);
   SetDlgItemInt(hwndDlg, IDC_BORDER, guiInfo.dragBorder, false);
   SetDlgItemInt(hwndDlg, IDC_PADDING, guiInfo.padding, false);
@@ -488,11 +485,6 @@
   guiInfo.colorFont = colourFont;
   guiInfo.colorBorder = colourBorder;
 
-  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    guiInfo.clickThrough = true;
-  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    guiInfo.clickThrough = false;
-
   if (SendDlgItemMessage(hwndDlg, IDC_SHADOW, BM_GETCHECK, 0, 0) == BST_CHECKED)
     guiInfo.windowShadow = true;
   else if (SendDlgItemMessage(hwndDlg, IDC_SHADOW, BM_GETCHECK, 0, 0) == BST_UNCHECKED)

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -87,14 +87,13 @@
   LTEXT "Border:",IDC_STATIC,200,139,40,8
 	PUSHBUTTON	"",IDC_BORDERCOLOUR,300,135,16,16,BS_BITMAP|BS_FLAT
 
-	PUSHBUTTON	"Click Through",IDC_CLICKTHROUGH,200,165,80,10,BS_AUTOCHECKBOX
-	PUSHBUTTON	"Shadow",IDC_SHADOW,285,165,40,10,BS_AUTOCHECKBOX
-  LTEXT "Bevel:",IDC_STATIC,200,185,40,8
-	EDITTEXT	IDC_BEVEL,240,183,20,12,ES_AUTOHSCROLL
-  LTEXT "Border:",IDC_STATIC,275,185,30,8
-	EDITTEXT	IDC_BORDER,305,183,20,12,ES_AUTOHSCROLL
-  LTEXT "Padding:",IDC_STATIC,235,205,30,8
-	EDITTEXT	IDC_PADDING,265,203,20,12,ES_AUTOHSCROLL
+  PUSHBUTTON  "Shadow",IDC_SHADOW,200,175,40,10,BS_AUTOCHECKBOX
+  LTEXT "Padding:",IDC_STATIC,275,175,30,8
+	EDITTEXT	IDC_PADDING,305,173,20,12,ES_AUTOHSCROLL
+  LTEXT "Bevel:",IDC_STATIC,200,195,40,8
+	EDITTEXT	IDC_BEVEL,240,193,20,12,ES_AUTOHSCROLL
+  LTEXT "Border:",IDC_STATIC,275,195,30,8
+	EDITTEXT	IDC_BORDER,305,193,20,12,ES_AUTOHSCROLL
 
 	GROUPBOX	"Gradient Settings",IDC_STATIC,5,220,320,50,WS_GROUP
   LTEXT "Method:",IDC_STATIC,10,235,30,8

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -98,7 +98,6 @@
   ELWriteFileColor(schemeFile, TEXT("color.font:"), guiInfo->colorFont);
   ELWriteFileColor(schemeFile, TEXT("color.border:"), guiInfo->colorBorder);
   ELWriteFileBool(schemeFile, TEXT("window.shadow:"), guiInfo->windowShadow);
-  ELWriteFileBool(schemeFile, TEXT("window.clickThrough:"), guiInfo->clickThrough);
   ELWriteFileInt(schemeFile, TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
   ELWriteFileInt(schemeFile, TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
   ELWriteFileInt(schemeFile, TEXT("window.padding:"), (int)guiInfo->padding);
@@ -130,7 +129,6 @@
                   GetSysColor(COLOR_BTNTEXT));
   ELReadFileColor(schemeFile, TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
   ELReadFileBool(schemeFile, TEXT("window.shadow:"), &guiInfo->windowShadow, true);
-  ELReadFileBool(schemeFile, TEXT("window.clickThrough:"), &guiInfo->clickThrough, false);
   ELReadFileInt(schemeFile, TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
   ELReadFileInt(schemeFile, TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
   ELReadFileInt(schemeFile, TEXT("window.padding:"), (int*)&guiInfo->padding, 0);

Modified: trunk/Source/emergeSchemeEngine/resource.h
===================================================================
--- trunk/Source/emergeSchemeEngine/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeSchemeEngine/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -37,7 +37,6 @@
 #define IDC_BORDERCOLOUR        305
 
 #define IDC_FONT                400
-#define IDC_CLICKTHROUGH        401
 #define IDC_SHADOW              402
 #define IDC_BEVEL               403
 #define IDC_BORDER              404

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -226,7 +226,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (!guiInfo.clickThrough)
+  if (!pSettings->GetClickThrough())
     return false;
 
   return true;

Modified: trunk/Source/emergeTasks/Config.cpp
===================================================================
--- trunk/Source/emergeTasks/Config.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/Config.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -82,6 +82,9 @@
   if (pSettings->GetEnableFlash())
     SendDlgItemMessage(hwndDlg, IDC_ENABLEFLASH, BM_SETCHECK, BST_CHECKED, 0);
 
+  if (pSettings->GetClickThrough())
+    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
+
   if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_SETCHECK, BST_CHECKED, 0);
   else
@@ -193,6 +196,17 @@
         pSettings->SetEnableFlash(false);
     }
 
+  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+      if (!pSettings->GetClickThrough())
+        pSettings->SetClickThrough(true);
+    }
+  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+    {
+      if (pSettings->GetClickThrough())
+        pSettings->SetClickThrough(false);
+    }
+
   result = GetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, &success, false);
   if (success && (result != pSettings->GetFlashInterval()))
     pSettings->SetFlashInterval(result);

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -50,6 +50,7 @@
   ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
   ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
   ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
 
   tmpRect.left = x;
   tmpRect.right = tmpRect.left + width;
@@ -195,6 +196,11 @@
   return flashInterval;
 }
 
+bool Settings::GetClickThrough()
+{
+  return (clickThrough == 1);
+}
+
 bool Settings::GetEnableFlash()
 {
   return (enableFlash == 1);
@@ -322,6 +328,25 @@
     }
 }
 
+void Settings::SetClickThrough(bool clickThrough)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (clickThrough)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).clickThrough = tmp;
+
+  if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+    {
+      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
 void Settings::SetAutoSize(bool autoSize)
 {
   HKEY key;

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/Settings.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -48,6 +48,7 @@
     bool GetSnapSize();
     bool GetHiliteActive();
     WCHAR *GetSchemeFile();
+    bool GetClickThrough();
     void SetPosition(int x, int y);
     void SetSize(DWORD width, DWORD height);
     void SetZPosition(WCHAR *zPosition);
@@ -66,9 +67,10 @@
     void SetIconSpacing(DWORD iconSpacing);
     RECT *GetResolution();
     void SetResolution(RECT *deskRect);
+    void SetClickThrough(bool clickThrough);
 
   private:
-    DWORD x, y, width, height, iconSize, iconSpacing;
+    DWORD x, y, width, height, iconSize, iconSpacing, clickThrough;
     WCHAR zPosition[MAX_LINE_LENGTH];
     WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
     directionOrientation[MAX_LINE_LENGTH];

Modified: trunk/Source/emergeTasks/emergeTasks.rc
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/emergeTasks.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -40,7 +40,7 @@
 
 IDI_DEFAULT	ICON	"icons\\emerge.ico"
 
-IDD_CONFIG DIALOGEX 0, 0, 170, 250
+IDD_CONFIG DIALOGEX 0, 0, 170, 265
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "emergeTasks Configuration"
 FONT 8, "MS Sans Serif"
@@ -51,39 +51,41 @@
 	CONTROL	"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,20,55,10
 	CONTROL	"Highlight Active Task",IDC_ACTIVETASK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,70,20,90,10
 
-	LTEXT		"Icon Size:",IDC_STATIC,5,35,35,8
-	COMBOBOX	IDC_ICONSIZE,40,33,50,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,35,55,10
 
-	LTEXT		"Icon Spacing:",IDC_STATIC,95,36,45,8
-	EDITTEXT	IDC_ICONSPACING,145,35,20,10,ES_AUTOHSCROLL
+	LTEXT		"Icon Size:",IDC_STATIC,5,50,35,8
+	COMBOBOX	IDC_ICONSIZE,40,48,50,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
 
-	GROUPBOX	"Flash",IDC_STATIC,5,50,160,25,WS_GROUP
-	CONTROL	"Enable",IDC_ENABLEFLASH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,10,60,40,10
-	LTEXT		"Interval",IDC_STATIC,65,60,25,8
-	EDITTEXT	IDC_FLASHINTERVAL,90,60,20,10,ES_AUTOHSCROLL
-	LTEXT		"Count",IDC_STATIC,120,60,20,8
-	EDITTEXT	IDC_FLASHCOUNT,140,60,20,10,ES_AUTOHSCROLL
+	LTEXT		"Icon Spacing:",IDC_STATIC,95,51,45,8
+	EDITTEXT	IDC_ICONSPACING,145,50,20,10,ES_AUTOHSCROLL
 
-	GROUPBOX	"ZPosition",IDC_STATIC,5,80,160,25,WS_GROUP
-	CONTROL	"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,90,40,10
-	CONTROL	"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,90,40,10
-	CONTROL	"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,90,40,10
+	GROUPBOX	"Flash",IDC_STATIC,5,65,160,25,WS_GROUP
+	CONTROL	"Enable",IDC_ENABLEFLASH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,10,75,40,10
+	LTEXT		"Interval",IDC_STATIC,65,75,25,8
+	EDITTEXT	IDC_FLASHINTERVAL,90,75,20,10,ES_AUTOHSCROLL
+	LTEXT		"Count",IDC_STATIC,120,75,20,8
+	EDITTEXT	IDC_FLASHCOUNT,140,75,20,10,ES_AUTOHSCROLL
 
-	GROUPBOX	"Direction",IDC_STATIC,5,110,160,110,WS_GROUP
+	GROUPBOX	"ZPosition",IDC_STATIC,5,95,160,25,WS_GROUP
+	CONTROL	"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,105,40,10
+	CONTROL	"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,105,40,10
+	CONTROL	"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,105,40,10
 
-	GROUPBOX	"Orientation",IDC_STATIC,10,120,150,25,WS_GROUP
-	CONTROL	"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,130,50,10
-	CONTROL	"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,130,50,10
+	GROUPBOX	"Direction",IDC_STATIC,5,125,160,110,WS_GROUP
 
-	GROUPBOX	"Horizontal",IDC_STATIC,10,155,150,25,WS_GROUP
-	CONTROL	"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,165,60,10
-	CONTROL	"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,165,60,10
+	GROUPBOX	"Orientation",IDC_STATIC,10,135,150,25,WS_GROUP
+	CONTROL	"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,145,50,10
+	CONTROL	"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,145,50,10
 
-	GROUPBOX	"Vertical",IDC_STATIC,10,190,150,25,WS_GROUP
-	CONTROL	"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,200,60,10
-	CONTROL	"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,200,60,10
+	GROUPBOX	"Horizontal",IDC_STATIC,10,170,150,25,WS_GROUP
+	CONTROL	"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,180,60,10
+	CONTROL	"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,180,60,10
 
-	PUSHBUTTON	"OK",IDOK,5,230,70,14
-	PUSHBUTTON	"Cancel",IDCANCEL,95,230,70,14
+	GROUPBOX	"Vertical",IDC_STATIC,10,205,150,25,WS_GROUP
+	CONTROL	"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,215,60,10
+	CONTROL	"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,215,60,10
+
+	PUSHBUTTON	"OK",IDOK,5,245,70,14
+	PUSHBUTTON	"Cancel",IDCANCEL,95,245,70,14
 END
 

Modified: trunk/Source/emergeTasks/resource.h
===================================================================
--- trunk/Source/emergeTasks/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTasks/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -4,10 +4,11 @@
 #define IDD_CONFIG		    100
 #define IDC_STATIC		    101
 
-#define IDC_AUTOSIZE		200
-#define IDC_ACTIVETASK		201
-#define IDC_SNAPMOVE		202
-#define IDC_SNAPSIZE		203
+#define IDC_AUTOSIZE      200
+#define IDC_ACTIVETASK    201
+#define IDC_SNAPMOVE      202
+#define IDC_SNAPSIZE      203
+#define IDC_CLICKTHROUGH  204
 
 #define IDC_ENABLEFLASH	    300
 #define IDC_FLASHINTERVAL	301

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -624,7 +624,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (!guiInfo.clickThrough)
+  if (!pSettings->GetClickThrough())
     return false;
 
   return true;

Modified: trunk/Source/emergeTray/Config.cpp
===================================================================
--- trunk/Source/emergeTray/Config.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/Config.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -139,6 +139,9 @@
     SendDlgItemMessage(hwndDlg, IDC_UNHIDE, BM_SETCHECK, BST_CHECKED, 0);
   // END roblarky
 
+  if (pSettings->GetClickThrough())
+    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
+
   if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_SETCHECK, BST_CHECKED, 0);
   else
@@ -216,7 +219,6 @@
   return TRUE;
 }
 
-
 // BEGIN  roblarky
 bool Config::PopulateList(HWND listWnd)
 {
@@ -350,6 +352,17 @@
     }
 // END roblarky
 
+  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+      if (!pSettings->GetClickThrough())
+        pSettings->SetClickThrough(true);
+    }
+  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+    {
+      if (pSettings->GetClickThrough())
+        pSettings->SetClickThrough(false);
+    }
+
   if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
       pSettings->SetVerticalDirection(TEXT("Up"));
@@ -453,7 +466,6 @@
   return ret;
 }
 
-
 //roblarky
 bool Config::DoDelete(HWND hwndDlg)
 {

Modified: trunk/Source/emergeTray/Settings.cpp
===================================================================
--- trunk/Source/emergeTray/Settings.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/Settings.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -50,6 +50,7 @@
   ELReadRegDWord(key, TEXT("AutoSize"), &autoSize, 0);
   ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
   ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
   ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
   ELReadRegDWord(key, TEXT("UnhideIcons"), &unhideIcons, 1); // roblarky
 
@@ -176,6 +177,11 @@
   return (autoSize == 1);
 }
 
+bool Settings::GetClickThrough()
+{
+  return (clickThrough == 1);
+}
+
 bool Settings::GetSnapMove()
 {
   return (snapMove == 1);
@@ -210,6 +216,25 @@
     }
 }
 
+void Settings::SetClickThrough(bool clickThrough)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (clickThrough)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).clickThrough = tmp;
+
+  if (ELOpenRegKey(TEXT("emergeTray\\Settings"), &key, true))
+    {
+      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
 void Settings::SetSnapMove(bool snapMove)
 {
   HKEY key;

Modified: trunk/Source/emergeTray/Settings.h
===================================================================
--- trunk/Source/emergeTray/Settings.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/Settings.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -47,6 +47,7 @@
     bool GetAutoSize();
     bool GetSnapMove();
     bool GetSnapSize();
+    bool GetClickThrough();
     bool GetUnhideIcons(); // roblarky
     WCHAR *GetSchemeFile();
     void SetPosition(int x, int y);
@@ -61,6 +62,7 @@
     void SetSnapSize(bool snapSize);
     void SetIconSpacing(DWORD iconSpacing);
     void SetUnhideIcons(bool unhideIcons); // roblarky
+    void SetClickThrough(bool clickThrough);
     RECT *GetResolution();
     void SetResolution(RECT *deskRect);
     // BEGIN roblarky
@@ -81,6 +83,7 @@
     WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
     directionOrientation[MAX_LINE_LENGTH];
     DWORD autoSize, snapSize, snapMove, iconSpacing, unhideIcons; // roblarky
+    DWORD clickThrough;
     WCHAR schemeFile[MAX_LINE_LENGTH];
     RECT resolution;
   };

Modified: trunk/Source/emergeTray/emergeTray.rc
===================================================================
--- trunk/Source/emergeTray/emergeTray.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/emergeTray.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -46,7 +46,7 @@
 IDI_ABORT   ICON    "icons\\abort.ico"
 // END roblarky
 
-IDD_CONFIG DIALOGEX 0, 0, 350, 205  // roblarky
+IDD_CONFIG DIALOGEX 0, 0, 340, 220  // roblarky
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "emergeTray Configuration"
 FONT 8, "MS Sans Serif"
@@ -54,44 +54,43 @@
 	CONTROL	"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,5,50,10
 	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,65,5,50,10
 	CONTROL		"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,125,5,65,10
-
 	LTEXT		"Icon Spacing:",IDC_STATIC,5,21,45,8
 	EDITTEXT	IDC_ICONSPACING,50,20,20,10,ES_AUTOHSCROLL
   // roblarky
   CONTROL		"Show Icons on Hover",IDC_UNHIDE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,85,20,90,10
+	CONTROL		"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,35,65,10
 
-	GROUPBOX	"ZPosition",IDC_STATIC,5,35,160,25,WS_GROUP
-	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,45,40,10
-	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,45,40,10
-	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,45,40,10
+	GROUPBOX	"ZPosition",IDC_STATIC,5,50,160,25,WS_GROUP
+	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,60,40,10
+	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,60,40,10
+	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,60,40,10
 
-	GROUPBOX	"Direction",IDC_STATIC,5,65,160,110,WS_GROUP
+	GROUPBOX	"Direction",IDC_STATIC,5,80,160,110,WS_GROUP
 
-	GROUPBOX	"Orientation",IDC_STATIC,10,75,150,25,WS_GROUP
-	CONTROL		"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,85,50,10
-	CONTROL		"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,85,50,10
+	GROUPBOX	"Orientation",IDC_STATIC,10,90,150,25,WS_GROUP
+	CONTROL		"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,100,50,10
+	CONTROL		"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,100,50,10
 
-	GROUPBOX	"Horizontal",IDC_STATIC,10,110,150,25,WS_GROUP
-	CONTROL		"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,120,60,10
-	CONTROL		"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,120,60,10
+	GROUPBOX	"Horizontal",IDC_STATIC,10,125,150,25,WS_GROUP
+	CONTROL		"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,135,60,10
+	CONTROL		"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,135,60,10
 
-	GROUPBOX	"Vertical",IDC_STATIC,10,145,150,25,WS_GROUP
-	CONTROL		"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,155,60,10
-	CONTROL		"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,155,60,10
+	GROUPBOX	"Vertical",IDC_STATIC,10,160,150,25,WS_GROUP
+	CONTROL		"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,170,60,10
+	CONTROL		"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,90,170,60,10
 
-	PUSHBUTTON	"OK",IDOK,5,185,70,14
-	PUSHBUTTON	"Cancel",IDCANCEL,95,185,70,14
+	PUSHBUTTON	"OK",IDOK,5,200,70,14
+	PUSHBUTTON	"Cancel",IDCANCEL,265,200,70,14
 
 // BEGIN roblarky
-    GROUPBOX        "Hidden Icons",IDC_STATIC,181,6,160,185,WS_GROUP
-    CONTROL         "HideList",IDC_HIDELIST,"SysListView32",LVS_REPORT|LVS_SHOWSELALWAYS|WS_BORDER|WS_TABSTOP,186,16,150,
-                    115
-    PUSHBUTTON      "",IDC_ADDTIP,186,136,16,14,BS_ICON | BS_FLAT
-    PUSHBUTTON      "",IDC_DELTIP,204,136,16,14,BS_ICON | BS_FLAT
-    PUSHBUTTON      "",IDC_SAVETIP,302,136,16,14,BS_ICON | BS_FLAT
-    PUSHBUTTON      "",IDC_ABORTTIP,320,136,16,14,BS_ICON | BS_FLAT
-    GROUPBOX        "Icon Text",IDC_STATIC,186,156,150,30,WS_GROUP
-    EDITTEXT        IDC_ICONTEXT,191,166,140,12,ES_AUTOHSCROLL
+    GROUPBOX        "Hidden Icons",IDC_STATIC,175,5,160,185,WS_GROUP
+    CONTROL         "HideList",IDC_HIDELIST,"SysListView32",LVS_REPORT|LVS_SHOWSELALWAYS|WS_BORDER|WS_TABSTOP,180,16,150,115
+    PUSHBUTTON      "",IDC_ADDTIP,180,136,16,14,BS_ICON | BS_FLAT
+    PUSHBUTTON      "",IDC_DELTIP,198,136,16,14,BS_ICON | BS_FLAT
+    PUSHBUTTON      "",IDC_SAVETIP,296,136,16,14,BS_ICON | BS_FLAT
+    PUSHBUTTON      "",IDC_ABORTTIP,314,136,16,14,BS_ICON | BS_FLAT
+    GROUPBOX        "Icon Text",IDC_STATIC,180,156,150,30,WS_GROUP
+    EDITTEXT        IDC_ICONTEXT,185,166,140,12,ES_AUTOHSCROLL
 // END roblarky
 
 END

Modified: trunk/Source/emergeTray/resource.h
===================================================================
--- trunk/Source/emergeTray/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeTray/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -5,11 +5,12 @@
 #define IDD_CONFIG		100
 #define IDC_STATIC		101
 
-#define IDC_AUTOSIZE	200
-#define IDC_SNAPMOVE	201
-#define IDC_SNAPSIZE	202
-#define IDC_ICONSPACING 203
-#define IDC_UNHIDE      204  //roblarky
+#define IDC_AUTOSIZE      200
+#define IDC_SNAPMOVE      201
+#define IDC_SNAPSIZE      202
+#define IDC_ICONSPACING   203
+#define IDC_UNHIDE        204  //roblarky
+#define IDC_CLICKTHROUGH  205
 
 #define IDC_TOP			400
 #define IDC_NORMAL		401

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -828,7 +828,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (!guiInfo.clickThrough)
+  if (!pSettings->GetClickThrough())
     return false;
 
   return true;

Modified: trunk/Source/emergeVWM/Config.cpp
===================================================================
--- trunk/Source/emergeVWM/Config.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/Config.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -159,6 +159,9 @@
   if (pSettings->GetSnapSize())
     SendDlgItemMessage(hwndDlg, IDC_SNAPSIZE, BM_SETCHECK, BST_CHECKED, 0);
 
+  if (pSettings->GetClickThrough())
+    SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
+
   ti.cbSize = sizeof(TOOLINFO);
   ti.uFlags = TTF_SUBCLASS;
   ti.hwnd = addWnd;
@@ -288,6 +291,17 @@
         pSettings->SetSnapSize(false);
     }
 
+  if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+      if (!pSettings->GetClickThrough())
+        pSettings->SetClickThrough(true);
+    }
+  else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+    {
+      if (pSettings->GetClickThrough())
+        pSettings->SetClickThrough(false);
+    }
+
   result = GetDlgItemInt(hwndDlg, IDC_DESKTOPROWS, &success, false);
   if (success && (result != pSettings->GetDesktopRows()))
     pSettings->SetDesktopRows(result);

Modified: trunk/Source/emergeVWM/Settings.cpp
===================================================================
--- trunk/Source/emergeVWM/Settings.cpp	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/Settings.cpp	2007-07-22 16:17:04 UTC (rev 1358)
@@ -45,6 +45,7 @@
   ELReadRegDWord(key, TEXT("DesktopColumns"), &columns, 2);
   ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
   ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
 
   tmpRect.left = x;
   tmpRect.right = tmpRect.left + width;
@@ -106,6 +107,11 @@
   return &resolution;
 }
 
+bool Settings::GetClickThrough()
+{
+  return (clickThrough == 1);
+}
+
 bool Settings::GetSnapMove()
 {
   return (snapMove == 1);
@@ -156,6 +162,25 @@
   return schemeFile;
 }
 
+void Settings::SetClickThrough(bool clickThrough)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (clickThrough)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).clickThrough = tmp;
+
+  if (ELOpenRegKey(TEXT("emergeVWM\\Settings"), &key, true))
+    {
+      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
 void Settings::SetSnapMove(bool snapMove)
 {
   HKEY key;

Modified: trunk/Source/emergeVWM/Settings.h
===================================================================
--- trunk/Source/emergeVWM/Settings.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/Settings.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -54,8 +54,10 @@
     void WriteStickyList();
     bool GetSnapMove();
     bool GetSnapSize();
+    bool GetClickThrough();
     void SetSnapMove(bool snapMove);
     void SetSnapSize(bool snapSize);
+    void SetClickThrough(bool clickThrough);
     RECT *GetResolution();
     void SetResolution(RECT *deskRect);
 
@@ -68,6 +70,7 @@
     WCHAR schemeFile[MAX_LINE_LENGTH];
     DWORD rows, columns;
     DWORD snapMove, snapSize;
+    DWORD clickThrough;
     RECT resolution;
   };
 

Modified: trunk/Source/emergeVWM/emergeVWM.rc
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.rc	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/emergeVWM.rc	2007-07-22 16:17:04 UTC (rev 1358)
@@ -45,39 +45,40 @@
 IDI_SAVE    ICON    "icons\\save.ico"
 IDI_ABORT   ICON    "icons\\abort.ico"
 
-IDD_CONFIG DIALOGEX 0, 0, 170, 290
+IDD_CONFIG DIALOGEX 0, 0, 170, 305
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "emergeVWM Configuration"
 FONT 8, "MS Sans Serif"
 BEGIN
 	CONTROL	"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,5,55,10
 	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,80,5,90,10
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,20,55,10
 
-	GROUPBOX	"Desktops",IDC_STATIC,5,20,160,25,WS_GROUP
-	LTEXT		"Rows",IDC_STATIC,10,30,30,8
-	EDITTEXT	IDC_DESKTOPROWS,40,30,20,10,ES_AUTOHSCROLL
-	LTEXT		"Columns",IDC_STATIC,110,30,30,8
-	EDITTEXT	IDC_DESKTOPCOLUMNS,140,30,20,10,ES_AUTOHSCROLL
+	GROUPBOX	"Desktops",IDC_STATIC,5,35,160,25,WS_GROUP
+	LTEXT		"Rows",IDC_STATIC,10,45,30,8
+	EDITTEXT	IDC_DESKTOPROWS,40,45,20,10,ES_AUTOHSCROLL
+	LTEXT		"Columns",IDC_STATIC,110,45,30,8
+	EDITTEXT	IDC_DESKTOPCOLUMNS,140,45,20,10,ES_AUTOHSCROLL
 
-	GROUPBOX	"ZPosition",IDC_STATIC,5,50,160,25,WS_GROUP
-	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,60,40,10
-	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,60,40,10
-	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,60,40,10
+	GROUPBOX	"ZPosition",IDC_STATIC,5,65,160,25,WS_GROUP
+	CONTROL		"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,75,40,10
+	CONTROL		"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,65,75,40,10
+	CONTROL		"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,120,75,40,10
 
-	GROUPBOX	"Sticky Applications",IDC_STATIC,5,80,160,185,WS_GROUP
-	CONTROL		"StickyList",IDC_STICKYLIST,"SysListView32",LVS_REPORT|LVS_SHOWSELALWAYS|WS_BORDER|WS_TABSTOP,10,90,150,115
+	GROUPBOX	"Sticky Applications",IDC_STATIC,5,95,160,185,WS_GROUP
+	CONTROL		"StickyList",IDC_STICKYLIST,"SysListView32",LVS_REPORT|LVS_SHOWSELALWAYS|WS_BORDER|WS_TABSTOP,10,105,150,115
 
-	PUSHBUTTON	"",IDC_ADDAPP,10,210,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_DELAPP,28,210,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_ADDAPP,10,225,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_DELAPP,28,225,16,14,BS_ICON|BS_FLAT
 
-	PUSHBUTTON	"",IDC_SAVEAPP,126,210,16,14,BS_ICON|BS_FLAT
-	PUSHBUTTON	"",IDC_ABORTAPP,144,210,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_SAVEAPP,126,225,16,14,BS_ICON|BS_FLAT
+	PUSHBUTTON	"",IDC_ABORTAPP,144,225,16,14,BS_ICON|BS_FLAT
 
-	GROUPBOX	"Application",IDC_STATIC,10,230,150,30,WS_GROUP
-	EDITTEXT	IDC_APPLICATION,15,240,120,12,ES_AUTOHSCROLL
-	PUSHBUTTON	"",IDC_BROWSE,139,239,16,14,BS_ICON|BS_FLAT
+	GROUPBOX	"Application",IDC_STATIC,10,245,150,30,WS_GROUP
+	EDITTEXT	IDC_APPLICATION,15,255,120,12,ES_AUTOHSCROLL
+	PUSHBUTTON	"",IDC_BROWSE,139,254,16,14,BS_ICON|BS_FLAT
 
-	PUSHBUTTON	"OK",IDOK,5,270,70,14
-	PUSHBUTTON	"Cancel",IDCANCEL,95,270,70,14
+	PUSHBUTTON	"OK",IDOK,5,285,70,14
+	PUSHBUTTON	"Cancel",IDCANCEL,95,285,70,14
 END
 

Modified: trunk/Source/emergeVWM/resource.h
===================================================================
--- trunk/Source/emergeVWM/resource.h	2007-07-22 00:16:35 UTC (rev 1357)
+++ trunk/Source/emergeVWM/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
@@ -22,6 +22,7 @@
 
 #define IDC_SNAPMOVE        600
 #define IDC_SNAPSIZE        601
+#define IDC_CLICKTHROUGH    602
 
 #define IDI_DEFAULT		    1000
 #define IDI_ADD             1001


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1363] trunk/Source

From: <ir0nh34d@us...> - 2007-07-24 00:07

Revision: 1363
          http://emerge.svn.sourceforge.net/emerge/?rev=1363&view=rev
Author:   ir0nh34d
Date:     2007-07-23 17:07:33 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
Ensure only numbers can be entered

Modified Paths:
--------------
    trunk/Source/emergeDesktop/emergeDesktop.rc
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc

Modified: trunk/Source/emergeDesktop/emergeDesktop.rc
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.rc	2007-07-23 23:43:39 UTC (rev 1362)
+++ trunk/Source/emergeDesktop/emergeDesktop.rc	2007-07-24 00:07:33 UTC (rev 1363)
@@ -53,16 +53,16 @@
 BEGIN
 	GROUPBOX	"Desktop Borders",IDC_STATIC,5,5,160,80,WS_GROUP
 	LTEXT		"Top:",IDC_STATIC,60,17,25,8
-	EDITTEXT	IDC_TOPBORDER,85,15,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_TOPBORDER,85,15,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_TOPUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
 	LTEXT		"Left:",IDC_STATIC,10,37,25,8
-	EDITTEXT	IDC_LEFTBORDER,35,35,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_LEFTBORDER,35,35,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_LEFTUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
 	LTEXT		"Right:",IDC_STATIC,105,37,25,8
-	EDITTEXT	IDC_RIGHTBORDER,130,35,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_RIGHTBORDER,130,35,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_RIGHTUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
 	LTEXT		"Bottom:",IDC_STATIC,60,57,25,8
-	EDITTEXT	IDC_BOTTOMBORDER,85,55,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_BOTTOMBORDER,85,55,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_BOTTOMUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
 
 	// roblarky
@@ -71,7 +71,7 @@
 	GROUPBOX	"Menu Opacity",IDC_STATIC,5,87,160,40,WS_GROUP
 	CONTROL		"AlphaSlider",IDC_SLIDER,"msctls_trackbar32",TBS_NOTICKS|TBS_TOP|
 			WS_TABSTOP,10,98,125,26
-	EDITTEXT	IDC_MENUALPHA,140,105,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_MENUALPHA,140,105,20,10,ES_AUTOHSCROLL|ES_NUMBER
 
 	CONTROL		"Menu Icons",IDC_MENUICONS,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,130,50,10
 

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-23 23:43:39 UTC (rev 1362)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-24 00:07:33 UTC (rev 1363)
@@ -47,31 +47,31 @@
 	GROUPBOX	"Opacity Settings",IDC_STATIC,5,25,185,190,WS_GROUP
   LTEXT "Active:",IDC_STATIC,10,37,30,8
 	CONTROL		"ActiveSlider",IDC_ACTIVESLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,35,100,15
-	EDITTEXT	IDC_ACTIVEALPHA,160,36,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_ACTIVEALPHA,160,36,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Inactive:",IDC_STATIC,10,57,30,8
 	CONTROL		"InactiveSlider",IDC_INACTIVESLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,55,100,15
-	EDITTEXT	IDC_INACTIVEALPHA,160,56,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_INACTIVEALPHA,160,56,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Background:",IDC_STATIC,10,77,40,8
 	CONTROL		"BackgroundSlider",IDC_BACKGROUNDSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,75,100,15
-	EDITTEXT	IDC_BACKGROUNDALPHA,160,76,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_BACKGROUNDALPHA,160,76,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Menu:",IDC_STATIC,10,97,30,8
 	CONTROL		"MenuSlider",IDC_MENUSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,95,100,15
 	EDITTEXT	IDC_MENUALPHA,160,96,20,10,ES_AUTOHSCROLL
   LTEXT "Foreground:",IDC_STATIC,10,117,40,8
 	CONTROL		"ForegroundSlider",IDC_FOREGROUNDSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,115,100,15
-	EDITTEXT	IDC_FOREGROUNDALPHA,160,116,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_FOREGROUNDALPHA,160,116,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Frame:",IDC_STATIC,10,137,30,8
 	CONTROL		"FrameSlider",IDC_FRAMESLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,135,100,15
-	EDITTEXT	IDC_FRAMEALPHA,160,136,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_FRAMEALPHA,160,136,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Selected:",IDC_STATIC,10,157,30,8
 	CONTROL		"SelectedSlider",IDC_SELECTEDSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,155,100,15
-	EDITTEXT	IDC_SELECTEDALPHA,160,156,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_SELECTEDALPHA,160,156,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Border:",IDC_STATIC,10,177,30,8
 	CONTROL		"BorderSlider",IDC_BORDERSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,175,100,15
-	EDITTEXT	IDC_BORDERALPHA,160,176,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_BORDERALPHA,160,176,20,10,ES_AUTOHSCROLL|ES_NUMBER
   LTEXT "Text:",IDC_STATIC,10,197,30,8
 	CONTROL		"TextSlider",IDC_TEXTSLIDER,"msctls_trackbar32",TBS_NOTICKS|WS_TABSTOP,55,195,100,15
-	EDITTEXT	IDC_TEXTALPHA,160,196,20,10,ES_AUTOHSCROLL
+	EDITTEXT	IDC_TEXTALPHA,160,196,20,10,ES_AUTOHSCROLL|ES_NUMBER
 
 	GROUPBOX	"Color Settings",IDC_STATIC,195,25,130,135,WS_GROUP
   LTEXT "Background:",IDC_STATIC,200,39,40,8
@@ -92,10 +92,10 @@
 	EDITTEXT	IDC_PADDING,295,173,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_PADDINGUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
   LTEXT "Bevel:",IDC_STATIC,200,195,40,8
-	EDITTEXT	IDC_BEVEL,230,193,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_BEVEL,230,193,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_BEVELUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
   LTEXT "Border:",IDC_STATIC,265,195,30,8
-	EDITTEXT	IDC_BORDER,295,193,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_BORDER,295,193,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_BORDERUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT,0,0,10,12
 
 	GROUPBOX	"Gradient Settings",IDC_STATIC,5,220,320,50,WS_GROUP


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1366] trunk/Source

From: <ir0nh34d@us...> - 2007-07-24 15:22

Revision: 1366
          http://emerge.svn.sourceforge.net/emerge/?rev=1366&view=rev
Author:   ir0nh34d
Date:     2007-07-24 08:22:14 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Remove temporary move / size code

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-07-24 02:41:26 UTC (rev 1365)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-07-24 15:22:14 UTC (rev 1366)
@@ -557,9 +557,6 @@
 {
   RECT deskRect, wndRect;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (!GetWindowRect(mainWnd, &wndRect))
     return 1;
 
@@ -581,9 +578,6 @@
   if (!IsWindowVisible(mainWnd))
     return 1;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (pCommand)
     {
       SetWindowPos(pCommand->GetCommandWnd(), NULL, 0, 0, width, height,

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-07-24 02:41:26 UTC (rev 1365)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-07-24 15:22:14 UTC (rev 1366)
@@ -659,9 +659,6 @@
 {
   int x, y;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   RECT mainRect, deskRect;
   if (!GetWindowRect(mainWnd, &mainRect))
     return 1;
@@ -690,9 +687,6 @@
   if (!IsWindowVisible(mainWnd))
     return 1;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (pSettings->GetAutoSize())
     return 1;
 

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-07-24 02:41:26 UTC (rev 1365)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-07-24 15:22:14 UTC (rev 1366)
@@ -927,9 +927,6 @@
   int x, y;
   RECT deskRect;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   RECT mainRect;
   if (!GetWindowRect(mainWnd, &mainRect))
     return 1;
@@ -958,9 +955,6 @@
   if (!IsWindowVisible(mainWnd))
     return 1;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (pSettings->GetAutoSize())
     return 1;
 

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-07-24 02:41:26 UTC (rev 1365)
+++ trunk/Source/emergeTray/Applet.cpp	2007-07-24 15:22:14 UTC (rev 1366)
@@ -781,9 +781,6 @@
 
   movesizeinprogress = false;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   RECT mainRect;
   if (!GetWindowRect(mainWnd, &mainRect))
     return 1;
@@ -815,9 +812,6 @@
   if (!IsWindowVisible(mainWnd))
     return 1;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (pSettings->GetAutoSize())
     return 1;
 

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-07-24 02:41:26 UTC (rev 1365)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-07-24 15:22:14 UTC (rev 1366)
@@ -1004,9 +1004,6 @@
 {
   RECT deskRect, wndRect;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   if (!GetWindowRect(mainWnd, &wndRect))
     return 1;
 
@@ -1026,9 +1023,6 @@
   if (!IsWindowVisible(mainWnd))
     return 1;
 
-  if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-    return 1;
-
   pSettings->SetSize(width - (2 * dragBorder), height - (2 * dragBorder));
 
   emptyRect.top = emptyRect.bottom = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1367] trunk/Source

From: <ir0nh34d@us...> - 2007-07-24 15:46

Revision: 1367
          http://emerge.svn.sourceforge.net/emerge/?rev=1367&view=rev
Author:   ir0nh34d
Date:     2007-07-24 08:46:48 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Bump version number

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
    trunk/Source/emergeCommand/emergeCommand.rc
    trunk/Source/emergeCore/emergeCore.rc
    trunk/Source/emergeGraphics/emergeGraphics.rc
    trunk/Source/emergeHotkeys/emergeHotkeys.rc
    trunk/Source/emergeLauncher/emergeLauncher.rc
    trunk/Source/emergeLib/emergeLib.rc
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeTasks/emergeTasks.rc
    trunk/Source/emergeTray/emergeTray.rc
    trunk/Source/emergeVWM/emergeVWM.rc

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeAppletEngine - Emerge Desktop application library\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeAppletEngine\0"
             VALUE "LegalCopyright", "Copyright (C) 2006\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeAppletEngine.dll\0"
             VALUE "ProductName", "emergeAppletEngine\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeCommand/emergeCommand.rc
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeCommand/emergeCommand.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeCommand - applet for the Emerge Desktop\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeCommand\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeCommand.exe\0"
             VALUE "ProductName", "emergeCommand\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -47,7 +47,7 @@
 BEGIN
 	CONTROL	"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,5,55,10
 	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,105,5,55,10
-	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,200,5,55,10
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,195,5,60,10
 
 	LTEXT		"Time Format",IDC_STATIC,5,20,50,8
 	EDITTEXT	IDC_CLOCKTEXT,55,19,200,12,ES_AUTOHSCROLL

Modified: trunk/Source/emergeCore/emergeCore.rc
===================================================================
--- trunk/Source/emergeCore/emergeCore.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeCore/emergeCore.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,1,0
- PRODUCTVERSION 3,0,1,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeCore - the core of the Emerge Desktop\0"
-            VALUE "FileVersion", "3.0.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeCore\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeCore.exe\0"
             VALUE "ProductName", "emergeCore\0"
-            VALUE "ProductVersion", "3.0.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeGraphics/emergeGraphics.rc
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeGraphics/emergeGraphics.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeGraphics - Emerge Desktop graphics library\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeGraphics\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeGraphics.dll\0"
             VALUE "ProductName", "emergeGraphics\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeHotkeys/emergeHotkeys.rc
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeHotkeys - applet for the Emerge Desktop\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeHotkeys\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeHotkeys.exe\0"
             VALUE "ProductName", "emergeHotkeys\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
 

Modified: trunk/Source/emergeLauncher/emergeLauncher.rc
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeLauncher - applet for the Emerge Desktop\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeLauncher\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeLauncher.exe\0"
             VALUE "ProductName", "emergeLauncher\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeLib/emergeLib.rc
===================================================================
--- trunk/Source/emergeLib/emergeLib.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeLib/emergeLib.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeLib - Emerge Desktop utility library\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeLib\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeLib.dll\0"
             VALUE "ProductName", "emergeLib\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeSchemeEngine - Emerge Desktop graphics library\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeSchemeEngine\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeSchemeEngine.dll\0"
             VALUE "ProductName", "emergeSchemeEngine\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeTasks/emergeTasks.rc
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeTasks/emergeTasks.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -51,7 +51,7 @@
 	CONTROL	"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,20,55,10
 	CONTROL	"Highlight Active Task",IDC_ACTIVETASK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,80,20,90,10
 
-	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,35,55,10
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,35,60,10
 
 	LTEXT		"Icon Size:",IDC_STATIC,5,50,35,8
 	COMBOBOX	IDC_ICONSIZE,40,48,50,150,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP

Modified: trunk/Source/emergeTray/emergeTray.rc
===================================================================
--- trunk/Source/emergeTray/emergeTray.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeTray/emergeTray.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeTray - applet for the Emerge Desktop\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeTray\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeTray.exe\0"
             VALUE "ProductName", "emergeTray\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Source/emergeVWM/emergeVWM.rc
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.rc	2007-07-24 15:22:14 UTC (rev 1366)
+++ trunk/Source/emergeVWM/emergeVWM.rc	2007-07-24 15:46:48 UTC (rev 1367)
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,13 +19,13 @@
         BEGIN
             VALUE "CompanyName", "The Emerge Desktop Development Team\0"
             VALUE "FileDescription", "emergeVWM - applet for the Emerge Desktop\0"
-            VALUE "FileVersion", "3.1\0"
+            VALUE "FileVersion", "4.0\0"
             VALUE "InternalName", "emergeVWM\0"
             VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emergeVWM.exe\0"
             VALUE "ProductName", "emergeVWM\0"
-            VALUE "ProductVersion", "3.1\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -52,7 +52,7 @@
 BEGIN
 	CONTROL	"SnapMove",IDC_SNAPMOVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,5,55,10
 	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,80,5,90,10
-	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,20,55,10
+	CONTROL	"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,20,60,10
 
 	GROUPBOX	"Desktops",IDC_STATIC,5,35,160,25,WS_GROUP
 	LTEXT		"Rows",IDC_STATIC,10,45,30,8


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1372] trunk/Source

From: <ir0nh34d@us...> - 2007-07-24 17:35

Revision: 1372
          http://emerge.svn.sourceforge.net/emerge/?rev=1372&view=rev
Author:   ir0nh34d
Date:     2007-07-24 10:35:44 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Make sure only numbers are allowed

Modified Paths:
--------------
    trunk/Source/emergeLauncher/emergeLauncher.rc
    trunk/Source/emergeTray/emergeTray.rc
    trunk/Source/emergeVWM/emergeVWM.rc

Modified: trunk/Source/emergeLauncher/emergeLauncher.rc
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-24 17:27:45 UTC (rev 1371)
+++ trunk/Source/emergeLauncher/emergeLauncher.rc	2007-07-24 17:35:44 UTC (rev 1372)
@@ -58,7 +58,7 @@
 	CONTROL		"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,115,10,50,10
 	CONTROL		"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,25,60,10
   LTEXT		"Icon Spacing:",IDC_STATIC,85,25,45,8
-	EDITTEXT	IDC_ICONSPACING,130,23,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_ICONSPACING,130,23,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_ICONSPACINGUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 
   LTEXT		"Icon Size:",IDC_STATIC,5,40,35,8

Modified: trunk/Source/emergeTray/emergeTray.rc
===================================================================
--- trunk/Source/emergeTray/emergeTray.rc	2007-07-24 17:27:45 UTC (rev 1371)
+++ trunk/Source/emergeTray/emergeTray.rc	2007-07-24 17:35:44 UTC (rev 1372)
@@ -55,7 +55,7 @@
 	CONTROL	"SnapSize",IDC_SNAPSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,65,5,50,10
 	CONTROL		"AutoSize",IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,125,5,65,10
 	LTEXT		"Icon Spacing:",IDC_STATIC,5,21,45,8
-	EDITTEXT	IDC_ICONSPACING,50,18,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_ICONSPACING,50,18,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_SPACINGUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 	CONTROL		"Click Through",IDC_CLICKTHROUGH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,35,65,10
   // roblarky

Modified: trunk/Source/emergeVWM/emergeVWM.rc
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.rc	2007-07-24 17:27:45 UTC (rev 1371)
+++ trunk/Source/emergeVWM/emergeVWM.rc	2007-07-24 17:35:44 UTC (rev 1372)
@@ -56,10 +56,10 @@
 
 	GROUPBOX	"Desktops",IDC_STATIC,5,33,160,27,WS_GROUP
 	LTEXT		"Rows",IDC_STATIC,10,45,30,8
-	EDITTEXT	IDC_DESKTOPROWS,40,43,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_DESKTOPROWS,40,43,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_ROWSUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 	LTEXT		"Columns",IDC_STATIC,100,45,30,8
-	EDITTEXT	IDC_DESKTOPCOLUMNS,130,43,30,12,ES_AUTOHSCROLL
+	EDITTEXT	IDC_DESKTOPCOLUMNS,130,43,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_COLUMNSUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 
 	GROUPBOX	"ZPosition",IDC_STATIC,5,65,160,25,WS_GROUP


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1387] trunk/Source

From: <ir0nh34d@us...> - 2007-07-31 03:05

Revision: 1387
          http://emerge.svn.sourceforge.net/emerge/?rev=1387&view=rev
Author:   ir0nh34d
Date:     2007-07-30 20:05:56 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Optimized Makefile

Modified Paths:
--------------
    trunk/Source/emergeCore/Makefile

Added Paths:
-----------
    trunk/Source/applet_globals.in

Added: trunk/Source/applet_globals.in
===================================================================
--- trunk/Source/applet_globals.in	                        (rev 0)
+++ trunk/Source/applet_globals.in	2007-07-31 03:05:56 UTC (rev 1387)
@@ -0,0 +1,50 @@
+CC = g++
+AR = ar
+WINDRES = windres
+WINDRESFLAGS = -O COFF
+BIN_DIR = bin
+OBJ_DIR = .objs
+BUILD = release
+LDFLAGS = -Wall -mwindows -mno-cygwin
+CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
+
+msystem = $(shell echo %WINDIR%)
+
+all: makedir $(OBJS) ../$(BIN_DIR)/$(TARGET).exe
+
+rebuild: clean all
+
+ifeq ($(BUILD), debug)
+CFLAGS += -g
+endif
+ifeq ($(BUILD), profile)
+LDFLAGS += -pg
+CFLAGS += -pg
+endif
+ifeq ($(BUILD), release)
+LDFLAGS += -s
+endif
+
+ifeq ($(msystem), %WINDIR%)
+makedir:
+	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+clean:
+	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
+else
+makedir:
+	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
+	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
+clean:
+	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
+endif
+
+$(OBJ_DIR)/%.o: %.cpp
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
+	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
+
+../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+

Modified: trunk/Source/emergeCore/Makefile
===================================================================
--- trunk/Source/emergeCore/Makefile	2007-07-31 02:52:08 UTC (rev 1386)
+++ trunk/Source/emergeCore/Makefile	2007-07-31 03:05:56 UTC (rev 1387)
@@ -1,11 +1,5 @@
-CC = g++
-AR = ar
-WINDRES = windres
-WINDRESFLAGS = -O COFF
-LIBS = -L../bin -lshell32 -lemergeLib -lshlwapi -lole32 -lcomctl32 -luuid -lwtsapi32
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeCore
+LIBS = -L../bin -lshell32 -lemergeLib -lshlwapi -lole32 -lcomctl32 -luuid -lwtsapi32
 OBJS = $(OBJ_DIR)/MessageControl.o \
 			 $(OBJ_DIR)/LaunchEditor.o \
 			 $(OBJ_DIR)/Core.o \
@@ -15,47 +9,6 @@
 			 $(OBJ_DIR)/DDEService.o \
 			 $(OBJ_DIR)/DDEWorker.o \
 			 $(OBJ_DIR)/$(TARGET).res
-BUILD = release
-LDFLAGS = -Wall -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir $(OBJS) ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-CFLAGS += -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS += -pg
-CFLAGS += -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS += -s
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/%.o: %.cpp
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1389] trunk/Source

From: <ir0nh34d@us...> - 2007-07-31 03:17

Revision: 1389
          http://emerge.svn.sourceforge.net/emerge/?rev=1389&view=rev
Author:   ir0nh34d
Date:     2007-07-30 20:16:59 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Optimized Makefiles

Modified Paths:
--------------
    trunk/Source/emergeCommand/Makefile
    trunk/Source/emergeHotkeys/Makefile
    trunk/Source/emergeLauncher/Makefile
    trunk/Source/emergeTasks/Makefile
    trunk/Source/emergeTray/Makefile
    trunk/Source/emergeVWM/Makefile

Modified: trunk/Source/emergeCommand/Makefile
===================================================================
--- trunk/Source/emergeCommand/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeCommand/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,71 +1,13 @@
-CC = g++
-AR = ar
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lemergeLib -lole32 -luuid -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeCommand
-OBJS = $(OBJ_DIR)/Command.o $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/AppletMenu.o \
-	   $(OBJ_DIR)/Settings.o $(OBJ_DIR)/Config.o $(OBJ_DIR)/CustomSource.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/Command.o \
+			 $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/AppletMenu.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/Config.o \
+			 $(OBJ_DIR)/CustomSource.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/Command.o: Command.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/AppletMenu.o: AppletMenu.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Config.o: Config.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/CustomSource.o: CustomSource.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

Modified: trunk/Source/emergeHotkeys/Makefile
===================================================================
--- trunk/Source/emergeHotkeys/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeHotkeys/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,65 +1,11 @@
-CC = g++
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lemergeLib -lcomctl32 -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeHotkeys
-OBJS = $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/Actions.o $(OBJ_DIR)/Settings.o $(OBJ_DIR)/HotkeyCombo.o \
-	   $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/Actions.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/HotkeyCombo.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Actions.o: Actions.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/HotkeyCombo.o: HotkeyCombo.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-

Modified: trunk/Source/emergeLauncher/Makefile
===================================================================
--- trunk/Source/emergeLauncher/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeLauncher/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,68 +1,12 @@
-CC = g++
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lshell32 -lcomctl32 -lemergeLib -lemergeGraphics -luuid -lemergeSchemeEngine -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeLauncher
-OBJS = $(OBJ_DIR)/Item.o $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/AppletMenu.o \
-	   $(OBJ_DIR)/Settings.o $(OBJ_DIR)/Config.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/Item.o \
+			 $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/AppletMenu.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/Config.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/Item.o: Item.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/AppletMenu.o: AppletMenu.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Config.o: Config.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-

Modified: trunk/Source/emergeTasks/Makefile
===================================================================
--- trunk/Source/emergeTasks/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeTasks/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,68 +1,12 @@
-CC = g++
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lshell32 -lcomctl32 -lemergeLib -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeTasks
-OBJS = $(OBJ_DIR)/Task.o $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/AppletMenu.o \
-	   $(OBJ_DIR)/Settings.o $(OBJ_DIR)/Config.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/Task.o \
+			 $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/AppletMenu.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/Config.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/Task.o: Task.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/AppletMenu.o: AppletMenu.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Config.o: Config.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-

Modified: trunk/Source/emergeTray/Makefile
===================================================================
--- trunk/Source/emergeTray/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeTray/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,69 +1,12 @@
-CC = g++
-AR = ar
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -luuid -lole32 -lcomctl32 -lemergeLib -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeTray
-BUILD = release
-OBJS = $(OBJ_DIR)/TrayIcon.o $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/AppletMenu.o \
-	   $(OBJ_DIR)/Settings.o $(OBJ_DIR)/Config.o $(OBJ_DIR)/$(TARGET).res
+OBJS = $(OBJ_DIR)/TrayIcon.o \
+			 $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/AppletMenu.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/Config.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-    LDFLAGS = -Wall -mwindows -mno-cygwin
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-    LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-    LDFLAGS = -Wall -mwindows -mno-cygwin -s
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/TrayIcon.o: TrayIcon.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/AppletMenu.o: AppletMenu.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Config.o: Config.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-

Modified: trunk/Source/emergeVWM/Makefile
===================================================================
--- trunk/Source/emergeVWM/Makefile	2007-07-31 03:07:21 UTC (rev 1388)
+++ trunk/Source/emergeVWM/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
@@ -1,69 +1,13 @@
-CC = g++
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lshell32 -lcomctl32 -lshlwapi -lemergeLib -lemergeGraphics -lemergeSchemeEngine \
 			 -lemergeAppletEngine
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeVWM
-OBJS = $(OBJ_DIR)/Task.o $(OBJ_DIR)/main.o $(OBJ_DIR)/Applet.o $(OBJ_DIR)/AppletMenu.o \
-	   $(OBJ_DIR)/Settings.o $(OBJ_DIR)/Config.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/Task.o \
+			 $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Applet.o \
+			 $(OBJ_DIR)/AppletMenu.o \
+			 $(OBJ_DIR)/Settings.o \
+			 $(OBJ_DIR)/Config.o \
+			 $(OBJ_DIR)/$(TARGET).res
 
-msystem = $(shell echo %WINDIR%)
+include ../applet_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).exe
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-    LDFLAGS = -Wall -mwindows -mno-cygwin
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-    LDFLAGS = -Wall -mwindows -mno-cygwin -pg
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-    LDFLAGS = -Wall -mwindows -mno-cygwin -s
-    CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/Task.o: Task.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Applet.o: Applet.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/AppletMenu.o: AppletMenu.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Settings.o: Settings.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Config.o: Config.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).exe: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1390] trunk/Source

From: <ir0nh34d@us...> - 2007-07-31 03:28

Revision: 1390
          http://emerge.svn.sourceforge.net/emerge/?rev=1390&view=rev
Author:   ir0nh34d
Date:     2007-07-30 20:27:58 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Optimized Makefiles

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/Makefile
    trunk/Source/emergeGraphics/Makefile
    trunk/Source/emergeLib/Makefile
    trunk/Source/emergeSchemeEngine/Makefile

Added Paths:
-----------
    trunk/Source/lib_globals.in

Modified: trunk/Source/emergeAppletEngine/Makefile
===================================================================
--- trunk/Source/emergeAppletEngine/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
+++ trunk/Source/emergeAppletEngine/Makefile	2007-07-31 03:27:58 UTC (rev 1390)
@@ -1,55 +1,8 @@
-CC = g++
-AR = ar
-DLLTOOL = dlltool
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lversion -lcomctl32 -lemergeLib
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeAppletEngine
-OBJS = $(OBJ_DIR)/main.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/$(TARGET).res
+EXPORTS = -DEMERGEAPPLETENGINE_EXPORTS
 
-msystem = $(shell echo %WINDIR%)
+include ../lib_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).dll
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -DEMERGEAPPLETENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -DEMERGEAPPLETENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -DEMERGEAPPLETENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).dll: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,--out-implib,../$(BIN_DIR)/lib$(TARGET).a \
-		-Wl,--output-def,../$(BIN_DIR)/lib$(TARGET).def
-

Modified: trunk/Source/emergeGraphics/Makefile
===================================================================
--- trunk/Source/emergeGraphics/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
+++ trunk/Source/emergeGraphics/Makefile	2007-07-31 03:27:58 UTC (rev 1390)
@@ -1,55 +1,8 @@
-CC = g++
-AR = ar
-DLLTOOL = dlltool
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lversion -lole32 -lemergeLib -lmsimg32
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeGraphics
-OBJS = $(OBJ_DIR)/main.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/$(TARGET).res
+EXPORTS = -DEMERGEGRAPHICS_EXPORTS
 
-msystem = $(shell echo %WINDIR%)
+include ../lib_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).dll
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -DEMERGEGRAPHICS_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -DEMERGEGRAPHICS_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -DEMERGEGRAPHICS_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).dll: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,--out-implib,../$(BIN_DIR)/lib$(TARGET).a \
-		-Wl,--output-def,../$(BIN_DIR)/lib$(TARGET).def
-

Modified: trunk/Source/emergeLib/Makefile
===================================================================
--- trunk/Source/emergeLib/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
+++ trunk/Source/emergeLib/Makefile	2007-07-31 03:27:58 UTC (rev 1390)
@@ -1,58 +1,8 @@
-CC = g++
-AR = ar
-DLLTOOL = dlltool
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -lshlwapi -lole32 -luuid -lversion -lpsapi
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeLib
-OBJS = $(OBJ_DIR)/main.o $(OBJ_DIR)/Shutdown.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/Shutdown.o \
+			 $(OBJ_DIR)/$(TARGET).res
+EXPORTS = -DEMERGELIB_EXPORTS
 
-msystem = $(shell echo %WINDIR%)
-
-all: makedir ../$(BIN_DIR)/$(TARGET).dll
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -DEMERGELIB_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -DEMERGELIB_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -DEMERGELIB_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/Shutdown.o: Shutdown.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).dll: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,--out-implib,../$(BIN_DIR)/lib$(TARGET).a \
-		-Wl,--output-def,../$(BIN_DIR)/lib$(TARGET).def
-
+include ../lib_globals.in

Modified: trunk/Source/emergeSchemeEngine/Makefile
===================================================================
--- trunk/Source/emergeSchemeEngine/Makefile	2007-07-31 03:16:59 UTC (rev 1389)
+++ trunk/Source/emergeSchemeEngine/Makefile	2007-07-31 03:27:58 UTC (rev 1390)
@@ -1,61 +1,10 @@
-CC = g++
-AR = ar
-DLLTOOL = dlltool
-WINDRES = windres
-WINDRESFLAGS = -O COFF
 LIBS = -L../bin -lversion -lmsimg32 -lshlwapi -lemergeLib -lemergeGraphics
-BIN_DIR = bin
-OBJ_DIR = .objs
 TARGET = emergeSchemeEngine
-OBJS = $(OBJ_DIR)/main.o $(OBJ_DIR)/BImage.o $(OBJ_DIR)/SchemeEditor.o $(OBJ_DIR)/$(TARGET).res
-BUILD = release
+OBJS = $(OBJ_DIR)/main.o \
+			 $(OBJ_DIR)/BImage.o \
+			 $(OBJ_DIR)/SchemeEditor.o \
+			 $(OBJ_DIR)/$(TARGET).res
+EXPORTS = -DEMERGESCHEMEENGINE_EXPORTS
 
-msystem = $(shell echo %WINDIR%)
+include ../lib_globals.in
 
-all: makedir ../$(BIN_DIR)/$(TARGET).dll
-
-rebuild: clean all
-
-ifeq ($(BUILD), debug)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin
-CFLAGS = -Wall -pedantic -DEMERGESCHEMEENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -g
-endif
-ifeq ($(BUILD), profile)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -pg
-CFLAGS = -Wall -pedantic -DEMERGESCHEMEENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2 -pg
-endif
-ifeq ($(BUILD), release)
-LDFLAGS = -Wall -shared -mwindows -mno-cygwin -s
-CFLAGS = -Wall -pedantic -DEMERGESCHEMEENGINE_EXPORTS -mno-cygwin -frtti -fexceptions -march=i686 -O2
-endif
-
-ifeq ($(msystem), %WINDIR%)
-makedir:
-	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
-else
-makedir:
-	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
-	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
-endif
-
-$(OBJ_DIR)/main.o: main.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/BImage.o: BImage.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/SchemeEditor.o: SchemeEditor.cpp
-	$(CC) $(CFLAGS) -c $? -o $@
-
-$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
-	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
-
-../$(BIN_DIR)/$(TARGET).dll: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,--out-implib,../$(BIN_DIR)/lib$(TARGET).a \
-		-Wl,--output-def,../$(BIN_DIR)/lib$(TARGET).def
-

Added: trunk/Source/lib_globals.in
===================================================================
--- trunk/Source/lib_globals.in	                        (rev 0)
+++ trunk/Source/lib_globals.in	2007-07-31 03:27:58 UTC (rev 1390)
@@ -0,0 +1,52 @@
+CC = g++
+AR = ar
+DLLTOOL = dlltool
+WINDRES = windres
+WINDRESFLAGS = -O COFF
+BIN_DIR = bin
+OBJ_DIR = .objs
+BUILD = release
+LDFLAGS = -Wall -shared -mwindows -mno-cygwin
+CFLAGS = -Wall -pedantic $(EXPORTS) -mno-cygwin -frtti -fexceptions -march=i686 -O2
+
+msystem = $(shell echo %WINDIR%)
+
+all: makedir ../$(BIN_DIR)/$(TARGET).dll
+
+rebuild: clean all
+
+ifeq ($(BUILD), debug)
+CFLAGS += -g
+endif
+ifeq ($(BUILD), profile)
+LDFLAGS += -pg
+CFLAGS += -pg
+endif
+ifeq ($(BUILD), release)
+LDFLAGS += -s
+endif
+
+ifeq ($(msystem), %WINDIR%)
+makedir:
+	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+clean:
+	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
+else
+makedir:
+	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
+	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
+clean:
+	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
+endif
+
+$(OBJ_DIR)/%.o: %.cpp
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
+	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
+
+../$(BIN_DIR)/$(TARGET).dll: $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,--out-implib,../$(BIN_DIR)/lib$(TARGET).a \
+		-Wl,--output-def,../$(BIN_DIR)/lib$(TARGET).def
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1391] trunk/Source

From: <ir0nh34d@us...> - 2007-07-31 18:00

Revision: 1391
          http://emerge.svn.sourceforge.net/emerge/?rev=1391&view=rev
Author:   ir0nh34d
Date:     2007-07-31 11:00:23 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Added 'Disconnect' internal command to disconnect from Terminal Servers

Modified Paths:
--------------
    trunk/Source/emergeCore/Core.cpp
    trunk/Source/emergeDesktop/MenuEditor.cpp
    trunk/Source/emergeHotkeys/Actions.cpp
    trunk/Source/emergeLib/Makefile
    trunk/Source/emergeLib/Shutdown.cpp
    trunk/Source/emergeLib/emergeLib.h
    trunk/Source/emergeLib/main.cpp

Modified: trunk/Source/emergeCore/Core.cpp
===================================================================
--- trunk/Source/emergeCore/Core.cpp	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeCore/Core.cpp	2007-07-31 18:00:23 UTC (rev 1391)
@@ -265,6 +265,10 @@
               ELExit(EMERGE_HIBERNATE, true);
               break;
 
+            case CORE_DISCONNECT:
+              ELExit(EMERGE_DISCONNECT, true);
+              break;
+
             case CORE_DESKTOP:
               ELShowDesktop();
               break;

Modified: trunk/Source/emergeDesktop/MenuEditor.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.cpp	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeDesktop/MenuEditor.cpp	2007-07-31 18:00:23 UTC (rev 1391)
@@ -263,6 +263,7 @@
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Halt"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Suspend"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Hibernate"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop"));
 }
 

Modified: trunk/Source/emergeHotkeys/Actions.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Actions.cpp	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeHotkeys/Actions.cpp	2007-07-31 18:00:23 UTC (rev 1391)
@@ -906,6 +906,7 @@
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Halt"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Suspend"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Hibernate"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopSettings"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor"));

Modified: trunk/Source/emergeLib/Makefile
===================================================================
--- trunk/Source/emergeLib/Makefile	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeLib/Makefile	2007-07-31 18:00:23 UTC (rev 1391)
@@ -1,4 +1,4 @@
-LIBS = -lshlwapi -lole32 -luuid -lversion -lpsapi
+LIBS = -lshlwapi -lole32 -luuid -lversion -lpsapi -lwtsapi32
 TARGET = emergeLib
 OBJS = $(OBJ_DIR)/main.o \
 			 $(OBJ_DIR)/Shutdown.o \

Modified: trunk/Source/emergeLib/Shutdown.cpp
===================================================================
--- trunk/Source/emergeLib/Shutdown.cpp	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeLib/Shutdown.cpp	2007-07-31 18:00:23 UTC (rev 1391)
@@ -78,6 +78,7 @@
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Restart"));
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Stand By"));
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Logoff"));
+  SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Quit Emerge Desktop"));
 
   SendDlgItemMessage(hwndDlg, IDC_METHOD, CB_SETCURSEL, (WPARAM)0, 0);
@@ -123,6 +124,9 @@
       method = EWX_LOGOFF;
       break;
     case 4:
+      method = EMERGE_DISCONNECT;
+      break;
+    case 5:
       ELQuit(false);
       return true;
     default:

Modified: trunk/Source/emergeLib/emergeLib.h
===================================================================
--- trunk/Source/emergeLib/emergeLib.h	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeLib/emergeLib.h	2007-07-31 18:00:23 UTC (rev 1391)
@@ -64,6 +64,7 @@
 // Emerge exit types
 #define EMERGE_SUSPEND      WM_USER + 500
 #define EMERGE_HIBERNATE    WM_USER + 501
+#define EMERGE_DISCONNECT   WM_USER + 502
 
 // Emerge Desktop function defines
 #define EMERGE_CORE     0x00000001
@@ -89,6 +90,7 @@
 #define CORE_HIBERNATE  116
 #define CORE_DESKTOP    117
 #define CORE_REFRESH    118
+#define CORE_DISCONNECT 119
 
 // EMERGE_VWM Messages
 #define VWM_UP          200

Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp	2007-07-31 03:27:58 UTC (rev 1390)
+++ trunk/Source/emergeLib/main.cpp	2007-07-31 18:00:23 UTC (rev 1391)
@@ -36,6 +36,7 @@
 #include <string>
 #include <shlobj.h>
 #include <psapi.h>
+#include <WtsApi32.h>
 
 // Helper functions
 BOOL CALLBACK MinimizeAll(HWND hwnd, LPARAM lParam);
@@ -400,6 +401,11 @@
       ELExit(EWX_LOGOFF, true);
       return true;
     }
+  else if (_wcsicmp(command, TEXT("Disconnect")) == 0)
+    {
+      ELExit(EMERGE_DISCONNECT, true);
+      return true;
+    }
   else if (_wcsicmp(command, TEXT("Reboot")) == 0)
     {
       ELExit(EWX_REBOOT, true);
@@ -1687,9 +1693,12 @@
     case EMERGE_HIBERNATE:
       wcscpy(method, TEXT("Hibernate"));
       break;
+    case EMERGE_DISCONNECT:
+      wcscpy(method, TEXT("Disconnect"));
+      break;
     }
 
-  if (uFlag != EWX_LOGOFF)
+  if ((uFlag != EWX_LOGOFF) && (uFlag != EMERGE_DISCONNECT))
     {
       /* Obtain the privileges necessary to shutdown the computer */
       if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
@@ -1729,6 +1738,13 @@
           if (!SetSystemPowerState(false, false))
             exitStatus = false;
         }
+      else if (uFlag == EMERGE_DISCONNECT)
+        {
+          if (!WTSDisconnectSession(WTS_CURRENT_SERVER_HANDLE,
+                                    WTS_CURRENT_SESSION,
+                                    FALSE))
+            exitStatus = false;
+        }
       else
         {
           if (!ExitWindowsEx(uFlag, SHTDN_REASON_FLAG_PLANNED))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1394] trunk/Source

From: <ir0nh34d@us...> - 2007-08-01 01:59

Revision: 1394
          http://emerge.svn.sourceforge.net/emerge/?rev=1394&view=rev
Author:   ir0nh34d
Date:     2007-07-31 18:59:23 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Made sure all Internal Commands are available for all configuration dialogues

Modified Paths:
--------------
    trunk/Source/emergeDesktop/MenuEditor.cpp
    trunk/Source/emergeHotkeys/Actions.cpp
    trunk/Source/emergeLauncher/Config.cpp

Modified: trunk/Source/emergeDesktop/MenuEditor.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.cpp	2007-08-01 01:44:58 UTC (rev 1393)
+++ trunk/Source/emergeDesktop/MenuEditor.cpp	2007-08-01 01:59:23 UTC (rev 1394)
@@ -265,6 +265,10 @@
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Hibernate"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopSettings"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreShellChanger"));
 }
 
 void MenuEditor::PopulateSpecialFolders(HWND specialFoldersWnd)

Modified: trunk/Source/emergeHotkeys/Actions.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Actions.cpp	2007-08-01 01:44:58 UTC (rev 1393)
+++ trunk/Source/emergeHotkeys/Actions.cpp	2007-08-01 01:59:23 UTC (rev 1394)
@@ -909,8 +909,8 @@
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopSettings"));
+  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor"));
-  SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
   SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreShellChanger"));
 }
 

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-08-01 01:44:58 UTC (rev 1393)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-08-01 01:59:23 UTC (rev 1394)
@@ -428,8 +428,8 @@
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopSettings"));
+  SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor"));
-  SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreShellChanger"));
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1397] trunk/Source

From: <ir0nh34d@us...> - 2007-08-03 12:36

Revision: 1397
          http://emerge.svn.sourceforge.net/emerge/?rev=1397&view=rev
Author:   ir0nh34d
Date:     2007-08-03 05:36:25 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
Use global project file

Removed Paths:
-------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.cbp
    trunk/Source/emergeCommand/emergeCommand.cbp
    trunk/Source/emergeCore/emergeCore.cbp
    trunk/Source/emergeDesktop/emergeDesktop.cbp
    trunk/Source/emergeGraphics/emergeGraphics.cbp
    trunk/Source/emergeHotkeys/emergeHotkeys.cbp
    trunk/Source/emergeLauncher/emergeLauncher.cbp
    trunk/Source/emergeLib/emergeLib.cbp
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.cbp
    trunk/Source/emergeTasks/emergeTasks.cbp
    trunk/Source/emergeTray/emergeTray.cbp
    trunk/Source/emergeVWM/emergeVWM.cbp

Deleted: trunk/Source/emergeAppletEngine/emergeAppletEngine.cbp
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeAppletEngine" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeAppletEngine.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeAppletEngine.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="emergeLib" />
-			<Add library="comctl32" />
-		</Linker>
-		<Unit filename="Makefile" />
-		<Unit filename="emergeAppletEngine.h" />
-		<Unit filename="emergeAppletEngine.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeCommand/emergeCommand.cbp
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeCommand/emergeCommand.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeCommand" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeCommand.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="ole32" />
-			<Add library="uuid" />
-			<Add library="emergeLib" />
-			<Add library="emergeGraphics" />
-			<Add library="emergeSchemeEngine" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="AppletMenu.cpp" />
-		<Unit filename="AppletMenu.h" />
-		<Unit filename="Changes.txt" />
-		<Unit filename="Command.cpp" />
-		<Unit filename="Command.h" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="CustomSource.cpp" />
-		<Unit filename="CustomSource.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="emergeCommand.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeCore/emergeCore.cbp
===================================================================
--- trunk/Source/emergeCore/emergeCore.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeCore/emergeCore.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeCore" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeCore.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-L..\bin" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-mno-cygwin" />
-			<Add library="shell32" />
-			<Add library="shlwapi" />
-			<Add library="ole32" />
-			<Add library="comctl32" />
-			<Add library="emergeLib" />
-			<Add library="uuid" />
-		</Linker>
-		<Unit filename="Changes.txt" />
-		<Unit filename="Core.cpp" />
-		<Unit filename="Core.h" />
-		<Unit filename="DDEService.cpp" />
-		<Unit filename="DDEService.h" />
-		<Unit filename="DDEWorker.cpp" />
-		<Unit filename="DDEWorker.h" />
-		<Unit filename="LaunchEditor.cpp" />
-		<Unit filename="LaunchEditor.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="MessageControl.cpp" />
-		<Unit filename="MessageControl.h" />
-		<Unit filename="Requests.txt" />
-		<Unit filename="Shell.cpp" />
-		<Unit filename="Shell.h" />
-		<Unit filename="ShellChanger.cpp" />
-		<Unit filename="ShellChanger.h" />
-		<Unit filename="emergeCore.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="icons\abort.ico" />
-		<Unit filename="icons\add.ico" />
-		<Unit filename="icons\del.ico" />
-		<Unit filename="icons\down.ico" />
-		<Unit filename="icons\edit.ico" />
-		<Unit filename="icons\emerge.ico" />
-		<Unit filename="icons\folder.ico" />
-		<Unit filename="icons\save.ico" />
-		<Unit filename="icons\start.ico" />
-		<Unit filename="icons\stop.ico" />
-		<Unit filename="icons\up.ico" />
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeDesktop/emergeDesktop.cbp
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeDesktop/emergeDesktop.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeDesktop" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeDesktop.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeDesktop.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i586" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="emergeLib" />
-			<Add library="shlwapi" />
-			<Add library="comctl32" />
-			<Add library="emergeGraphics" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="Desktop.cpp" />
-		<Unit filename="Desktop.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="MenuEditor.cpp" />
-		<Unit filename="MenuEditor.h" />
-		<Unit filename="MenuItem.cpp" />
-		<Unit filename="MenuItem.h" />
-		<Unit filename="MenuListItem.cpp" />
-		<Unit filename="MenuListItem.h" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="changes.txt" />
-		<Unit filename="emergeDesktop.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeGraphics/emergeGraphics.cbp
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeGraphics/emergeGraphics.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeGraphics" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeGraphics.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-L..\bin" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeGraphics.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-				<Linker>
-					<Add option="-L..\bin" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-			<Add option="-DEMERGEGRAPHICS_EXPORTS" />
-		</Compiler>
-		<Linker>
-			<Add option="-mno-cygwin" />
-			<Add library="gdi32" />
-			<Add library="emergeLib" />
-			<Add library="ole32" />
-			<Add library="msimg32" />
-		</Linker>
-		<Unit filename="Changes.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="emergeGraphics.h" />
-		<Unit filename="emergeGraphics.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeHotkeys/emergeHotkeys.cbp
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeHotkeys" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeHotkeys.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="emergeLib" />
-			<Add library="comctl32" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Actions.cpp" />
-		<Unit filename="Actions.h" />
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="Changes.txt" />
-		<Unit filename="HotkeyCombo.cpp" />
-		<Unit filename="HotkeyCombo.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="emergeHotkeys.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="icons\add.ico" />
-		<Unit filename="icons\del.ico" />
-		<Unit filename="icons\edit.ico" />
-		<Unit filename="icons\emerge.ico" />
-		<Unit filename="icons\file.ico" />
-		<Unit filename="icons\folder.ico" />
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeLauncher/emergeLauncher.cbp
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeLauncher/emergeLauncher.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeLauncher" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeLauncher.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeLauncher.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i586" />
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L..\bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="emergeLib" />
-			<Add library="emergeGraphics" />
-			<Add library="comctl32" />
-			<Add library="emergeSchemeEngine" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="AppletMenu.cpp" />
-		<Unit filename="AppletMenu.h" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="Item.cpp" />
-		<Unit filename="Item.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="changes.txt" />
-		<Unit filename="emergeLauncher.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeLib/emergeLib.cbp
===================================================================
--- trunk/Source/emergeLib/emergeLib.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeLib/emergeLib.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeLib" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeLib.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeLib.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i586" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-			<Add option="-DEMERGELIB_EXPORTS" />
-		</Compiler>
-		<Linker>
-			<Add option="-mno-cygwin" />
-			<Add library="shlwapi" />
-			<Add library="version" />
-			<Add library="psapi" />
-			<Add library="ole32" />
-			<Add library="uuid" />
-			<Add library="gdi32" />
-		</Linker>
-		<Unit filename="Changes.txt" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Shutdown.cpp" />
-		<Unit filename="Shutdown.h" />
-		<Unit filename="emergeLib.doxy" />
-		<Unit filename="emergeLib.h" />
-		<Unit filename="emergeLib.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.cbp
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeSchemeEngine" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeSchemeEngine.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-			<Add option="-DEMERGESCHEMEENGINE_EXPORTS" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="emergeLib" />
-			<Add library="emergeGraphics" />
-			<Add library="gdi32" />
-			<Add library="msimg32" />
-			<Add library="comdlg32" />
-			<Add library="shlwapi" />
-		</Linker>
-		<Unit filename="BImage.cpp" />
-		<Unit filename="BImage.h" />
-		<Unit filename="Makefile" />
-		<Unit filename="SchemeEditor.cpp" />
-		<Unit filename="SchemeEditor.h" />
-		<Unit filename="emergeSchemeEngine.h" />
-		<Unit filename="emergeSchemeEngine.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeTasks/emergeTasks.cbp
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeTasks/emergeTasks.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeTasks" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeTasks.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="shell32" />
-			<Add library="comctl32" />
-			<Add library="emergeLib" />
-			<Add library="emergeGraphics" />
-			<Add library="emergeSchemeEngine" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="AppletMenu.cpp" />
-		<Unit filename="AppletMenu.h" />
-		<Unit filename="Changes.txt" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="Task.cpp" />
-		<Unit filename="Task.h" />
-		<Unit filename="emergeTasks.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeTray/emergeTray.cbp
===================================================================
--- trunk/Source/emergeTray/emergeTray.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeTray/emergeTray.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeTray" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeTray.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Profile">
-				<Option output="..\bin\emergeTray.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-pg" />
-				</Compiler>
-				<Linker>
-					<Add option="-pg -lgmon" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeTray.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-pedantic" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="uuid" />
-			<Add library="shell32" />
-			<Add library="comctl32" />
-			<Add library="emergeLib" />
-			<Add library="ole32" />
-			<Add library="emergeGraphics" />
-			<Add library="emergeSchemeEngine" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="AppletMenu.cpp" />
-		<Unit filename="AppletMenu.h" />
-		<Unit filename="Changes.txt" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="TrayIcon.cpp" />
-		<Unit filename="TrayIcon.h" />
-		<Unit filename="emergeTray.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeVWM/emergeVWM.cbp
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.cbp	2007-08-02 02:25:00 UTC (rev 1396)
+++ trunk/Source/emergeVWM/emergeVWM.cbp	2007-08-03 12:36:25 UTC (rev 1397)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeVWM" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeVWM.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="Debug">
-				<Option output="..\bin\emergeVWM.exe" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-		</Compiler>
-		<Linker>
-			<Add option="-L../bin" />
-			<Add option="-mno-cygwin" />
-			<Add library="shell32" />
-			<Add library="comctl32" />
-			<Add library="shlwapi" />
-			<Add library="emergeLib" />
-			<Add library="emergeGraphics" />
-			<Add library="emergeSchemeEngine" />
-			<Add library="emergeAppletEngine" />
-		</Linker>
-		<Unit filename="Applet.cpp" />
-		<Unit filename="Applet.h" />
-		<Unit filename="AppletMenu.cpp" />
-		<Unit filename="AppletMenu.h" />
-		<Unit filename="Changes.txt" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="License.txt" />
-		<Unit filename="Makefile" />
-		<Unit filename="Settings.cpp" />
-		<Unit filename="Settings.h" />
-		<Unit filename="Task.cpp" />
-		<Unit filename="Task.h" />
-		<Unit filename="emergeVWM.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Unit filename="resource.h" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1400] trunk/Source

From: <ir0nh34d@us...> - 2007-08-10 01:05

Revision: 1400
          http://emerge.svn.sourceforge.net/emerge/?rev=1400&view=rev
Author:   ir0nh34d
Date:     2007-08-09 18:05:10 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Make source gcc 4 friendly

Modified Paths:
--------------
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeCommand/Config.cpp
    trunk/Source/emergeCommand/CustomSource.cpp
    trunk/Source/emergeCommand/Settings.cpp
    trunk/Source/emergeCommand/Settings.h
    trunk/Source/emergeCore/Core.cpp
    trunk/Source/emergeCore/DDEWorker.cpp
    trunk/Source/emergeCore/LaunchEditor.cpp
    trunk/Source/emergeCore/ShellChanger.cpp
    trunk/Source/emergeDesktop/Desktop.cpp
    trunk/Source/emergeDesktop/MenuEditor.cpp
    trunk/Source/emergeDesktop/Settings.cpp
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeHotkeys/Actions.cpp
    trunk/Source/emergeHotkeys/Settings.cpp
    trunk/Source/emergeLauncher/Config.cpp
    trunk/Source/emergeLauncher/Settings.cpp
    trunk/Source/emergeLauncher/Settings.h
    trunk/Source/emergeLib/emergeLib.h
    trunk/Source/emergeLib/main.cpp
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeTasks/Config.cpp
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Config.cpp
    trunk/Source/emergeTray/Settings.cpp
    trunk/Source/emergeTray/Settings.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Config.cpp
    trunk/Source/emergeVWM/Settings.cpp
    trunk/Source/emergeVWM/Settings.h

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Command.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -245,6 +245,7 @@
 {
   DWORD top, bottom;
   UINT dragBorder = pApplet->guiInfo.dragBorder + pApplet->guiInfo.bevelWidth;
+  LPVOID lpVoid;
 
   top = (height / 2);
   top -= (pSettings->GetFont()->lfHeight / 2);
@@ -283,32 +284,42 @@
     }
 
   if (!pac)
-    CoCreateInstance(CLSID_AutoComplete,
-                     NULL,
-                     CLSCTX_INPROC_SERVER,
-                     IID_IAutoComplete,
-                     (LPVOID*)&pac);
+    {
+      CoCreateInstance(CLSID_AutoComplete,
+                       NULL,
+                       CLSCTX_INPROC_SERVER,
+                       IID_IAutoComplete,
+                       &lpVoid);
+      pac = reinterpret_cast <IAutoComplete*> (lpVoid);
+    }
 
   if (!fileSource)
-    CoCreateInstance(CLSID_ACListISF,
-                     NULL,
-                     CLSCTX_INPROC_SERVER,
-                     IID_IACList,
-                     (LPVOID*)&fileSource);
+    {
+      CoCreateInstance(CLSID_ACListISF,
+                       NULL,
+                       CLSCTX_INPROC_SERVER,
+                       IID_IACList,
+                       &lpVoid);
+      fileSource = reinterpret_cast <IUnknown*> (lpVoid);
+    }
 
   if (!historySource)
     {
       history = new CustomSource();
 
-      history->QueryInterface(IID_IEnumString, (LPVOID*)&historySource);
+      history->QueryInterface(IID_IEnumString, &lpVoid);
+      historySource = reinterpret_cast <IEnumString*> (lpVoid);
     }
 
   if (!pom)
-    CoCreateInstance(CLSID_ACLMulti,
-                     NULL,
-                     CLSCTX_INPROC_SERVER,
-                     IID_IObjMgr,
-                     (LPVOID*)&pom);
+    {
+      CoCreateInstance(CLSID_ACLMulti,
+                       NULL,
+                       CLSCTX_INPROC_SERVER,
+                       IID_IObjMgr,
+                       &lpVoid);
+      pom = reinterpret_cast <IObjMgr*> (lpVoid);
+    }
 
   if (fileSource && pom)
     pom->Append(fileSource);
@@ -379,6 +390,8 @@
 
 void Command::ShowTextWindow()
 {
+  LPVOID lpVoid;
+
   ShowWindow(hText, SW_SHOW);
   SetWindowText(hText, TEXT(""));
   SetForegroundWindow(commandWnd);
@@ -388,8 +401,9 @@
     {
       pac->Init(hText, pom, NULL, NULL);
 
-      if (SUCCEEDED(pac->QueryInterface(IID_IAutoComplete2, (LPVOID*)&pac2)))
+      if (SUCCEEDED(pac->QueryInterface(IID_IAutoComplete2, &lpVoid)))
         {
+          pac2 = reinterpret_cast <IAutoComplete2*> (lpVoid);
           pac2->SetOptions(ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST);
           pac2->Release();
         }

Modified: trunk/Source/emergeCommand/Config.cpp
===================================================================
--- trunk/Source/emergeCommand/Config.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Config.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -204,33 +204,33 @@
 
   if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
-      pSettings->SetZPosition(TEXT("Top"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Top"));
   if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
-      pSettings->SetZPosition(TEXT("Bottom"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
   if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
-      pSettings->SetZPosition(TEXT("Normal"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_COMMANDLEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("left")) != 0)
-      pSettings->SetCommandTextAlign(TEXT("Left"));
+      pSettings->SetCommandTextAlign((WCHAR*)TEXT("Left"));
   if (SendDlgItemMessage(hwndDlg, IDC_COMMANDCENTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("center")) != 0)
-      pSettings->SetCommandTextAlign(TEXT("Center"));
+      pSettings->SetCommandTextAlign((WCHAR*)TEXT("Center"));
   if (SendDlgItemMessage(hwndDlg, IDC_COMMANDRIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("right")) != 0)
-      pSettings->SetCommandTextAlign(TEXT("Right"));
+      pSettings->SetCommandTextAlign((WCHAR*)TEXT("Right"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_CLOCKLEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("left")) != 0)
-      pSettings->SetClockTextAlign(TEXT("Left"));
+      pSettings->SetClockTextAlign((WCHAR*)TEXT("Left"));
   if (SendDlgItemMessage(hwndDlg, IDC_CLOCKCENTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("center")) != 0)
-      pSettings->SetClockTextAlign(TEXT("Center"));
+      pSettings->SetClockTextAlign((WCHAR*)TEXT("Center"));
   if (SendDlgItemMessage(hwndDlg, IDC_CLOCKRIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("right")) != 0)
-      pSettings->SetClockTextAlign(TEXT("Right"));
+      pSettings->SetClockTextAlign((WCHAR*)TEXT("Right"));
 
   return true;
 }

Modified: trunk/Source/emergeCommand/CustomSource.cpp
===================================================================
--- trunk/Source/emergeCommand/CustomSource.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/CustomSource.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -78,12 +78,12 @@
   if (current == 0)
     current = 1;
 
-  ELOpenRegKey(TEXT("emergeCommand\\History"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\History"), &key, true);
 
   for (i = 0; i < current; i++)
     {
       swprintf(path, TEXT("%d"), currentElement);
-      if (!ELReadRegString(key, path, tmp, TEXT("\0")))
+      if (!ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0")))
         break;
 
       wideSize = sizeof(WCHAR) * (int)(wcslen(tmp) + 1);
@@ -132,11 +132,11 @@
   HKEY key;
   WCHAR path[2], tmp[MAX_LINE_LENGTH];
 
-  ELOpenRegKey(TEXT("emergeCommand\\History"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\History"), &key, true);
   for (i = 0; i < MAX_HISTORY; i++)
     {
       swprintf(path, TEXT("%d"), i);
-      if (ELReadRegString(key, path, tmp, TEXT("\0")))
+      if (ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0")))
         {
           if (_wcsicmp(element, tmp) == 0)
             return;
@@ -154,7 +154,7 @@
       for (i = 0; i < MAX_HISTORY; i++)
         {
           swprintf(path, TEXT("%d"), i + 1);
-          ELReadRegString(key, path, tmp, TEXT("\0"));
+          ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0"));
           swprintf(path, TEXT("%d"), i);
           ELWriteRegString(key, path, tmp);
         }

Modified: trunk/Source/emergeCommand/Settings.cpp
===================================================================
--- trunk/Source/emergeCommand/Settings.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Settings.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -35,28 +35,28 @@
   UINT i;
   WCHAR *token;
 
-  ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true);
-  ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
-  ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
-  ELReadRegDWord(key, TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, TEXT("Height"), &height, 100);
-  ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
-  ELReadRegString(key, TEXT("ClockTextAlign"), clockTextAlign, TEXT("left"));
-  ELReadRegString(key, TEXT("CommandTextAlign"), commandTextAlign, TEXT("left"));
-  ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
-  ELReadRegString(key, TEXT("TimeFormat"), timeFormat, TEXT("%m/%d/%y %I:%M:%S %p"));
-  ELReadRegString(key, TEXT("TipFormat"), tipFormat, TEXT("%m/%d/%y %I:%M:%S %p"));
-  ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegString(key, TEXT("Font"), fontString, TEXT("Tahoma-12"));
-  ELReadRegDWord(key, TEXT("ClickThrough"), (DWORD*)&clickThrough, 0);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("ClockTextAlign"), clockTextAlign, (WCHAR*)TEXT("left"));
+  ELReadRegString(key, (WCHAR*)TEXT("CommandTextAlign"), commandTextAlign, (WCHAR*)TEXT("left"));
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+  ELReadRegString(key, (WCHAR*)TEXT("TimeFormat"), timeFormat, (WCHAR*)TEXT("%m/%d/%y %I:%M:%S %p"));
+  ELReadRegString(key, (WCHAR*)TEXT("TipFormat"), tipFormat, (WCHAR*)TEXT("%m/%d/%y %I:%M:%S %p"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Font"), fontString, (WCHAR*)TEXT("Tahoma-12"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), (DWORD*)&clickThrough, 0);
 
   tmpRect.left = x;
   tmpRect.top = y;
   tmpRect.right = tmpRect.left + width;
   tmpRect.bottom = tmpRect.top + height;
   ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
   ELCloseRegKey(key);
 
   HDC hdc = CreateCompatibleDC(NULL);
@@ -89,10 +89,10 @@
   (*this).width = width;
   (*this).height = height;
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("Width"), &width);
-      ELWriteRegDWord(key, TEXT("Height"), &height);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
       ELCloseRegKey(key);
     }
 }
@@ -103,24 +103,24 @@
 
   CopyRect(&resolution, deskRect);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegRect(key, TEXT("Resolution"), &resolution);
+      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
 {
   HKEY key;
 
   (*this).x = x;
   (*this).y = y;
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("X"), (DWORD*)&x);
-      ELWriteRegDWord(key, TEXT("Y"), (DWORD*)&y);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
       ELCloseRegKey(key);
     }
 }
@@ -140,9 +140,9 @@
   fontHeight = MulDiv(logFont->lfHeight, 72, GetDeviceCaps(hdc, LOGPIXELSY));
   swprintf(fontString, TEXT("%s-%d"), _wcsdup(fontString), -fontHeight);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("Font"), fontString);
+      ELWriteRegString(key, (WCHAR*)TEXT("Font"), fontString);
       ELCloseRegKey(key);
     }
 
@@ -236,9 +236,9 @@
 
   (*this).clickThrough = tmp;
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -255,9 +255,9 @@
 
   (*this).snapMove = snapMove;
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("SnapMove"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -274,9 +274,9 @@
 
   (*this).snapSize = snapSize;
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("SnapSize"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -287,9 +287,9 @@
 
   wcscpy((*this).zPosition, zPosition);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("ZPosition"), zPosition);
+      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
       ELCloseRegKey(key);
     }
 }
@@ -300,9 +300,9 @@
 
   wcscpy((*this).clockTextAlign, clockTextAlign);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("ClockTextAlign"), clockTextAlign);
+      ELWriteRegString(key, (WCHAR*)TEXT("ClockTextAlign"), clockTextAlign);
       ELCloseRegKey(key);
     }
 }
@@ -313,9 +313,9 @@
 
   wcscpy((*this).commandTextAlign, commandTextAlign);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("CommandTextAlign"), commandTextAlign);
+      ELWriteRegString(key, (WCHAR*)TEXT("CommandTextAlign"), commandTextAlign);
       ELCloseRegKey(key);
     }
 }
@@ -326,9 +326,9 @@
 
   wcscpy((*this).timeFormat, timeFormat);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("TimeFormat"), timeFormat);
+      ELWriteRegString(key, (WCHAR*)TEXT("TimeFormat"), timeFormat);
       ELCloseRegKey(key);
     }
 }
@@ -339,9 +339,9 @@
 
   wcscpy((*this).tipFormat, tipFormat);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("TipFormat"), tipFormat);
+      ELWriteRegString(key, (WCHAR*)TEXT("TipFormat"), tipFormat);
       ELCloseRegKey(key);
     }
 }
@@ -352,9 +352,9 @@
 
   wcscpy((*this).schemeFile, schemeFile);
 
-  if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("Scheme"), schemeFile);
+      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
       ELCloseRegKey(key);
     }
 }

Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Settings.h	2007-08-10 01:05:10 UTC (rev 1400)
@@ -49,7 +49,7 @@
     LOGFONT *GetFont();
     bool GetClickThrough();
     void SetFont(LOGFONT *logFont);
-    void SetPosition(int x, int y);
+    void SetPosition(DWORD x, DWORD y);
     void SetSize(DWORD width, DWORD height);
     void SetZPosition(WCHAR *zPosition);
     void SetSchemeFile(WCHAR *schemeFile);
@@ -63,7 +63,7 @@
   private:
     DWORD clickThrough;
     DWORD width, height;
-    int x, y;
+    DWORD x, y;
     DWORD snapSize, snapMove;
     WCHAR zPosition[MAX_LINE_LENGTH];
     WCHAR schemeFile[MAX_LINE_LENGTH];

Modified: trunk/Source/emergeCore/Core.cpp
===================================================================
--- trunk/Source/emergeCore/Core.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/Core.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -63,8 +63,8 @@
   WCHAR installDir[MAX_PATH];
 
   ELGetCurrentPath(installDir);
-  ELOpenRegKey(TEXT("emergeCore\\Settings"), &key, true);
-  ELWriteRegString(key, TEXT("InstallDir"), installDir);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Settings"), &key, true);
+  ELWriteRegString(key, (WCHAR*)TEXT("InstallDir"), installDir);
   ELCloseRegKey(key);
 
   WNDCLASSEX wincl;
@@ -116,8 +116,8 @@
   pMessageControl = new MessageControl();
 
   // Launch additional Emerge Desktop applets
-  ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
-  if (!pShell->RunRegEntries(key, false) && !wcsstr(commandLine, TEXT("/noautostart")))
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
+  if (!pShell->RunRegEntries(key, false) && !wcsstr(commandLine, (WCHAR*)TEXT("/noautostart")))
     {
       bool rerun = false;
       WCHAR tmp[MAX_LINE_LENGTH];
@@ -127,7 +127,7 @@
       if (PathFileExists(tmp))
         {
           rerun = true;
-          ELWriteRegString(key, TEXT("10"), tmp);
+          ELWriteRegString(key, (WCHAR*)TEXT("10"), tmp);
         }
 
       wcscpy(tmp, installDir);
@@ -135,7 +135,7 @@
       if (PathFileExists(tmp))
         {
           rerun = true;
-          ELWriteRegString(key, TEXT("11"), tmp);
+          ELWriteRegString(key, (WCHAR*)TEXT("11"), tmp);
         }
 
       wcscpy(tmp, installDir);
@@ -143,7 +143,7 @@
       if (PathFileExists(tmp))
         {
           rerun = true;
-          ELWriteRegString(key, TEXT("12"), tmp);
+          ELWriteRegString(key, (WCHAR*)TEXT("12"), tmp);
         }
 
       if (rerun)

Modified: trunk/Source/emergeCore/DDEWorker.cpp
===================================================================
--- trunk/Source/emergeCore/DDEWorker.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/DDEWorker.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -579,9 +579,10 @@
 {
   WCHAR szPath[MAX_LINE_LENGTH];
   HRESULT hr;
-  IShellLink* pShellLink;
-  IPersistFile* pPersistFile;
+  IShellLink* pShellLink = NULL;
+  IPersistFile* pPersistFile = NULL;
   BOOL bReturn = FALSE;
+  LPVOID lpVoid;
 
   // check that we've set a current group via showgroup or creategroup
   if (m_szCurrentGroup[0])
@@ -615,8 +616,9 @@
 
       wsprintf(szPath, TEXT("%s\\%s.lnk"), m_szCurrentGroup, szDesc);
 
+      lpVoid = pShellLink;
       hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
-                            IID_IShellLink, (LPVOID*) & pShellLink);
+                            IID_IShellLink, &lpVoid);
       if (SUCCEEDED(hr))
         {
           // Set the shortcut info.
@@ -633,7 +635,8 @@
             }
 
           // Save it.
-          hr = pShellLink->QueryInterface(IID_IPersistFile, (LPVOID*) & pPersistFile);
+          lpVoid = pPersistFile;
+          hr = pShellLink->QueryInterface(IID_IPersistFile, &lpVoid);
           if (SUCCEEDED(hr))
             {
               WCHAR wsz[MAX_LINE_LENGTH];

Modified: trunk/Source/emergeCore/LaunchEditor.cpp
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/LaunchEditor.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -153,15 +153,15 @@
   ELStealFocus(hwndDlg);
 
   lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
-  lvCol.pszText = TEXT("Applet");
+  lvCol.pszText = (WCHAR*)TEXT("Applet");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 0, &lvCol);
 
-  lvCol.pszText = TEXT("Version");
+  lvCol.pszText = (WCHAR*)TEXT("Version");
   lvCol.cx = 100;
   ListView_InsertColumn(listWnd, 1, &lvCol);
 
-  lvCol.pszText = TEXT("Path");
+  lvCol.pszText = (WCHAR*)TEXT("Path");
   lvCol.cx = 320;
   ListView_InsertColumn(listWnd, 2, &lvCol);
 
@@ -191,43 +191,43 @@
   ti.hwnd = addWnd;
   ti.uId = (UINT)addWnd;
   ti.hinst = hInstance;
-  ti.lpszText = TEXT("Add Launch Applet");
+  ti.lpszText = (WCHAR*)TEXT("Add Launch Applet");
   GetClientRect(addWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = delWnd;
   ti.uId = (UINT)delWnd;
-  ti.lpszText = TEXT("Delete Launch Applet");
+  ti.lpszText = (WCHAR*)TEXT("Delete Launch Applet");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = startWnd;
   ti.uId = (UINT)startWnd;
-  ti.lpszText = TEXT("Start Launch Applet");
+  ti.lpszText = (WCHAR*)TEXT("Start Launch Applet");
   GetClientRect(startWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = stopWnd;
   ti.uId = (UINT)stopWnd;
-  ti.lpszText = TEXT("Stop Launch Applet");
+  ti.lpszText = (WCHAR*)TEXT("Stop Launch Applet");
   GetClientRect(stopWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = browseWnd;
   ti.uId = (UINT)browseWnd;
-  ti.lpszText = TEXT("Browse for Launch Applet");
+  ti.lpszText = (WCHAR*)TEXT("Browse for Launch Applet");
   GetClientRect(browseWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = upWnd;
   ti.uId = (UINT)upWnd;
-  ti.lpszText = TEXT("Move Launch Applet Up");
+  ti.lpszText = (WCHAR*)TEXT("Move Launch Applet Up");
   GetClientRect(upWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = downWnd;
   ti.uId = (UINT)downWnd;
-  ti.lpszText = TEXT("Move Launch Applet Down");
+  ti.lpszText = (WCHAR*)TEXT("Move Launch Applet Down");
   GetClientRect(downWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
@@ -453,7 +453,7 @@
   int i = 0;
   HKEY key;
 
-  ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
 
 
   // Loop while there are entries in the key and remove them
@@ -498,7 +498,7 @@
 
   lvItem.mask = LVIF_TEXT;
 
-  ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
 
   // Loop while there are entries in the key
   while (RegEnumValue(key, index, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)

Modified: trunk/Source/emergeCore/ShellChanger.cpp
===================================================================
--- trunk/Source/emergeCore/ShellChanger.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/ShellChanger.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -140,37 +140,37 @@
   ti.hwnd = addWnd;
   ti.uId = (UINT)addWnd;
   ti.hinst = hInstance;
-  ti.lpszText = TEXT("Add Shell Item");
+  ti.lpszText = (WCHAR*)TEXT("Add Shell Item");
   GetClientRect(addWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = editWnd;
   ti.uId = (UINT)editWnd;
-  ti.lpszText = TEXT("Edit Shell Item");
+  ti.lpszText = (WCHAR*)TEXT("Edit Shell Item");
   GetClientRect(editWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = delWnd;
   ti.uId = (UINT)delWnd;
-  ti.lpszText = TEXT("Delete Shell Item");
+  ti.lpszText = (WCHAR*)TEXT("Delete Shell Item");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = saveWnd;
   ti.uId = (UINT)saveWnd;
-  ti.lpszText = TEXT("Save Changes");
+  ti.lpszText = (WCHAR*)TEXT("Save Changes");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = abortWnd;
   ti.uId = (UINT)abortWnd;
-  ti.lpszText = TEXT("Discard Changes");
+  ti.lpszText = (WCHAR*)TEXT("Discard Changes");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = browseWnd;
   ti.uId = (UINT)browseWnd;
-  ti.lpszText = TEXT("Browse for File");
+  ti.lpszText = (WCHAR*)TEXT("Browse for File");
   GetClientRect(browseWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
@@ -225,7 +225,7 @@
   SendMessage(shellWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Emerge Desktop"));
   SendMessage(shellWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Windows Explorer"));
 
-  ELOpenRegKey(TEXT("emergeCore\\Shells"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Shells"), &key, true);
 
   size = MAX_LINE_LENGTH * sizeof(subkeyName[0]);
   while (RegEnumKeyEx(key, index, subkeyName, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
@@ -235,8 +235,8 @@
       wcscat(subkeyString, subkeyName);
 
       ELOpenRegKey(subkeyString, &subkey, true);
-      ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
-      ELReadRegString(subkey, TEXT("command"), command, TEXT("\0"));
+      ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+      ELReadRegString(subkey, (WCHAR*)TEXT("command"), command, (WCHAR*)TEXT("\0"));
       ELCloseRegKey(subkey);
 
       if (doCheck)
@@ -451,7 +451,7 @@
   HKEY key;
   ShellItemMap::iterator iter;
 
-  ELDeleteRegKey(TEXT("emergeCore\\Shells"));
+  ELDeleteRegKey((WCHAR*)TEXT("emergeCore\\Shells"));
 
   while (index < count)
     {
@@ -461,8 +461,8 @@
 
       if (ELOpenRegKey(subKey, &key, true))
         {
-          ELWriteRegString(key, TEXT("name"),	name);
-          ELWriteRegString(key, TEXT("command"), (WCHAR*)iter->second.c_str());
+          ELWriteRegString(key, (WCHAR*)TEXT("name"), name);
+          ELWriteRegString(key, (WCHAR*)TEXT("command"), (WCHAR*)iter->second.c_str());
           ELCloseRegKey(key);
 
           i++;

Modified: trunk/Source/emergeDesktop/Desktop.cpp
===================================================================
--- trunk/Source/emergeDesktop/Desktop.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/Desktop.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -536,12 +536,12 @@
       wcscpy(subkeyString, inputString);
       wcscat(subkeyString, subkeyName);
       ELOpenRegKey(subkeyString, &subkey, true);
-      ELReadRegDWord(subkey, TEXT("type"), &type, 0);
+      ELReadRegDWord(subkey, (WCHAR*)TEXT("type"), &type, 0);
 
       // Separator
       if (type == 0)
         {
-          MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
+          MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
 
           itemInfo.fMask = MIIM_FTYPE;
           itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -571,11 +571,11 @@
       // Executable
       if (type == 1)
         {
-          if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+          if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
             {
-              ELReadRegString(subkey, TEXT("workingdir"), workingDir, TEXT("\0"));
+              ELReadRegString(subkey, (WCHAR*)TEXT("workingdir"), workingDir, (WCHAR*)TEXT("\0"));
               MenuItem *menuItem = new MenuItem(type, value, workingDir);
-              ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+              ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
               NoPrefixString(name);
 
               itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -617,15 +617,15 @@
       // System Command
       if (type == 2)
         {
-          if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+          if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
             {
-              ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+              ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
               if (_wcsicmp(name, TEXT("DateTime")) == 0)
                 type = 3;
               else
                 {
                   NoPrefixString(name);
-                  MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+                  MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
 
                   itemInfo.fMask = MIIM_STRING | MIIM_ID;
                   itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -666,9 +666,9 @@
 
       if (type == 3)
         {
-          if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+          if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
             {
-              MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+              MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
 
               time_t tVal;
               struct tm *stVal;
@@ -699,10 +699,10 @@
       // Special Folder
       if (type == 4)
         {
-          if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+          if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
             {
-              MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
-              ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+              MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
+              ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
               NoPrefixString(name);
 
               itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -744,10 +744,10 @@
       // Registry based submenu
       if (type == 100)
         {
-          ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+          ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
           wcscpy(tmp, subkeyString);
           wcscat(tmp, TEXT("\\"));
-          MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
+          MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
           MenuListItem *mli = new MenuListItem(type, tmp);
           NoPrefixString(name);
 
@@ -792,10 +792,10 @@
       // Path based submenu
       if (type == 101)
         {
-          ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
-          ELReadRegString(subkey, TEXT("value"), value, TEXT("\0"));
+          ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+          ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0"));
           ExpandVars(value);
-          MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+          MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
           MenuListItem *mli = new MenuListItem(type, value);
           NoPrefixString(name);
 
@@ -840,9 +840,9 @@
       // Tasks(102) or Settings(103) submenu
       if ((type == 102) || (type == 103))
         {
-          ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
-          MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
-          MenuListItem *mli = new MenuListItem(type, TEXT("\0"));
+          ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+          MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
+          MenuListItem *mli = new MenuListItem(type, (WCHAR*)TEXT("\0"));
           NoPrefixString(name);
 
           itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU;
@@ -950,16 +950,16 @@
       wcscat(destkeyString, TEXT("\\"));
       ELOpenRegKey(destkeyString, &destKey, true);
 
-      if (ELReadRegDWord(subKey, TEXT("type"), &type, 0))
+      if (ELReadRegDWord(subKey, (WCHAR*)TEXT("type"), &type, 0))
         {
-          ELWriteRegDWord(destKey, TEXT("type"), &type);
+          ELWriteRegDWord(destKey, (WCHAR*)TEXT("type"), &type);
           if (type == 100)
             MigrateSubmenu(subkeyString, destkeyString);
         }
-      if (ELReadRegString(subKey, TEXT("value"), value, TEXT("\0")))
-        ELWriteRegString(destKey, TEXT("value"), value);
-      if (ELReadRegString(subKey, TEXT("name"), name, TEXT("\0")))
-        ELWriteRegString(destKey, TEXT("name"), name);
+      if (ELReadRegString(subKey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
+        ELWriteRegString(destKey, (WCHAR*)TEXT("value"), value);
+      if (ELReadRegString(subKey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0")))
+        ELWriteRegString(destKey, (WCHAR*)TEXT("name"), name);
 
       ELCloseRegKey(subKey);
       ELCloseRegKey(destKey);
@@ -978,8 +978,8 @@
 {
   WCHAR expandedPath[MAX_LINE_LENGTH];
 
-  ExpandEmergeVar(value, TEXT("%CommonStartMenu%"));
-  ExpandEmergeVar(value, TEXT("%StartMenu%"));
+  ExpandEmergeVar(value, (WCHAR*)TEXT("%CommonStartMenu%"));
+  ExpandEmergeVar(value, (WCHAR*)TEXT("%StartMenu%"));
 
   ExpandEnvironmentStrings(value, expandedPath, MAX_LINE_LENGTH);
   wcscpy(value, expandedPath);
@@ -1042,157 +1042,157 @@
       type = 4;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          wcscpy(specialFolder, ELGetSpecialFolder(FOLDER_MYCOMPUTER));
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), specialFolder);
-          ELWriteRegString(key, TEXT("Value"), specialFolder);
+          ELGetSpecialFolder(FOLDER_MYCOMPUTER, specialFolder);
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), specialFolder);
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), specialFolder);
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("11\\"));
+      wcscat(tmp, (WCHAR*)TEXT("11\\"));
       type = 0;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("12\\"));
+      wcscat(tmp, (WCHAR*)TEXT("12\\"));
       type = 0x65;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Start Menu"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("%StartMenu%|%CommonStartMenu%"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Start Menu"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%StartMenu%|%CommonStartMenu%"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("13\\"));
+      wcscat(tmp, (WCHAR*)TEXT("13\\"));
       type = 0;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("14\\"));
+      wcscat(tmp, (WCHAR*)TEXT("14\\"));
       type = 103;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Settings"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Settings"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("15\\"));
+      wcscat(tmp, (WCHAR*)TEXT("15\\"));
       type = 0;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("16\\"));
+      wcscat(tmp, (WCHAR*)TEXT("16\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Run"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("Run"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Run"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Run"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("17\\"));
+      wcscat(tmp, (WCHAR*)TEXT("17\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Logoff"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("Logoff"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Logoff"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Logoff"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("18\\"));
+      wcscat(tmp, (WCHAR*)TEXT("18\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Shutdown"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("Shutdown"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Shutdown"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Shutdown"));
           ELCloseRegKey(key);
         }
     }
   else if (menuType == MENU_MID)
     {
-      wcscpy(inputString, TEXT("emergeDesktop\\MidMenu\\"));
+      wcscpy(inputString, (WCHAR*)TEXT("emergeDesktop\\MidMenu\\"));
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("10\\"));
+      wcscat(tmp, (WCHAR*)TEXT("10\\"));
       type = 102;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Tasks"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Tasks"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("11\\"));
+      wcscat(tmp, (WCHAR*)TEXT("11\\"));
       type = 0;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("12\\"));
+      wcscat(tmp, (WCHAR*)TEXT("12\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Show Applets"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("Show"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Applets"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Show"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("13\\"));
+      wcscat(tmp, (WCHAR*)TEXT("13\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Hide Applets"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("Hide"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Hide Applets"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Hide"));
           ELCloseRegKey(key);
         }
 
       wcscpy(tmp, inputString);
-      wcscat(tmp, TEXT("14\\"));
+      wcscat(tmp, (WCHAR*)TEXT("14\\"));
       type = 2;
       if (ELOpenRegKey(tmp, &key, true))
         {
-          ELWriteRegDWord(key, TEXT("Type"), &type);
-          ELWriteRegString(key, TEXT("Name"), TEXT("Show Desktop"));
-          ELWriteRegString(key, TEXT("Value"), TEXT("ShowDesktop"));
+          ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+          ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Desktop"));
+          ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("ShowDesktop"));
           ELCloseRegKey(key);
         }
     }
@@ -1257,7 +1257,7 @@
 
               if (!GetPos(menuType, location, findData.cFileName, true, &folderPos, &itemID, &itemData))
                 {
-                  menuItem = new MenuItem(101, tmp, TEXT("\0"));
+                  menuItem = new MenuItem(101, tmp, (WCHAR*)TEXT("\0"));
                   MENUITEMINFO itemInfo;
 
                   itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA;
@@ -1363,8 +1363,8 @@
                   else if ((wcsstr(_wcslwr(_wcsdup(entry)), TEXT(".url")) != NULL) &&
                            (wcsstr(_wcslwr(_wcsdup(menuItem->GetValue())), TEXT(".url")) != NULL))
                     {
-                      if (ELReadFileString(entry, TEXT("URL"), entryURL, TEXT("")) &&
-                          ELReadFileString(menuItem->GetValue(), TEXT("URL"), targetURL, TEXT("")))
+                      if (ELReadFileString(entry, (WCHAR*)TEXT("URL"), entryURL, (WCHAR*)TEXT("")) &&
+                          ELReadFileString(menuItem->GetValue(), (WCHAR*)TEXT("URL"), targetURL, (WCHAR*)TEXT("")))
                         {
                           if (wcsicmp(entryURL, targetURL) == 0)
                             continue;
@@ -1372,7 +1372,7 @@
                     }
                 }
 
-              menuItem = new MenuItem(1, entry, TEXT("\0"));
+              menuItem = new MenuItem(1, entry, (WCHAR*)TEXT("\0"));
 
               itemInfo.fMask = MIIM_STRING | MIIM_ID;
 
@@ -1471,7 +1471,7 @@
   NoPrefixString(windowTitle);
 
   swprintf(tmp, TEXT("%d"), (int)task);
-  menuItem = new MenuItem(0, tmp, TEXT("\0"));
+  menuItem = new MenuItem(0, tmp, (WCHAR*)TEXT("\0"));
 
   itemInfo.fMask = MIIM_STRING | MIIM_ID;
 
@@ -1576,7 +1576,7 @@
     {
     case WM_RBUTTONDOWN:
       if (menuList.empty())
-        menuList.push_back(new MenuListItem(100, TEXT("emergeDesktop\\RightMenu\\")));
+        menuList.push_back(new MenuListItem(100, (WCHAR*)TEXT("emergeDesktop\\RightMenu\\")));
 
       itemID = TrackPopupMenuEx(menuList[0]->GetMenu(), TPM_RETURNCMD, mousePT.x, mousePT.y, hwnd, NULL);
       if (itemID != 0)
@@ -1599,7 +1599,7 @@
         }
 
       if (menuListMid.empty())
-        menuListMid.push_back(new MenuListItem(100, TEXT("emergeDesktop\\MidMenu\\")));
+        menuListMid.push_back(new MenuListItem(100, (WCHAR*)TEXT("emergeDesktop\\MidMenu\\")));
 
       itemID = TrackPopupMenuEx(menuListMid[0]->GetMenu(), TPM_RETURNCMD, mousePT.x, mousePT.y, hwnd, NULL);
       if (itemID != 0)
@@ -1785,16 +1785,16 @@
 
 void Desktop::BuildSettingsMenu(UINT menuType, UINT location)
 {
-  AddSettingsItem(menuType, location, TEXT("Configure"), 0);
-  AddSettingsItem(menuType, location, TEXT("Edit Launch Applets"), 1);
-  AddSettingsItem(menuType, location, TEXT("Edit Desktop Menus"), 2);
-  AddSettingsItem(menuType, location, TEXT("Change Desktop Shell"), 3);
+  AddSettingsItem(menuType, location, (WCHAR*)TEXT("Configure"), 0);
+  AddSettingsItem(menuType, location, (WCHAR*)TEXT("Edit Launch Applets"), 1);
+  AddSettingsItem(menuType, location, (WCHAR*)TEXT("Edit Desktop Menus"), 2);
+  AddSettingsItem(menuType, location, (WCHAR*)TEXT("Change Desktop Shell"), 3);
 }
 
 void Desktop::AddSettingsItem(UINT menuType, UINT location, WCHAR* text, UINT index)
 {
   MENUITEMINFO itemInfo;
-  MenuItem *menuItem = new MenuItem(0, text, TEXT("\0"));
+  MenuItem *menuItem = new MenuItem(0, text, (WCHAR*)TEXT("\0"));
 
   itemInfo.fMask = MIIM_STRING | MIIM_ID;
   itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -1901,11 +1901,11 @@
         }
     }
   if (index == 1)
-    ELExecuteInternal(TEXT("CoreLaunchEditor"));
+    ELExecuteInternal((WCHAR*)TEXT("CoreLaunchEditor"));
   if (index == 2)
     res = pMenuEditor->Show();
   if (index == 3)
-    ELExecuteInternal(TEXT("CoreShellChanger"));
+    ELExecuteInternal((WCHAR*)TEXT("CoreShellChanger"));
 }
 
 void Desktop::UpdateMenuHook()

Modified: trunk/Source/emergeDesktop/MenuEditor.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/MenuEditor.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -174,37 +174,37 @@
   ti.hwnd = addWnd;
   ti.uId = (UINT)addWnd;
   ti.hinst = hInstance;
-  ti.lpszText = TEXT("Add Menu Item");
+  ti.lpszText = (WCHAR*)TEXT("Add Menu Item");
   GetClientRect(addWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = editWnd;
   ti.uId = (UINT)editWnd;
-  ti.lpszText = TEXT("Edit Menu Item");
+  ti.lpszText = (WCHAR*)TEXT("Edit Menu Item");
   GetClientRect(editWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = delWnd;
   ti.uId = (UINT)delWnd;
-  ti.lpszText = TEXT("Delete Menu Item");
+  ti.lpszText = (WCHAR*)TEXT("Delete Menu Item");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = saveWnd;
   ti.uId = (UINT)saveWnd;
-  ti.lpszText = TEXT("Save Changes");
+  ti.lpszText = (WCHAR*)TEXT("Save Changes");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = abortWnd;
   ti.uId = (UINT)abortWnd;
-  ti.lpszText = TEXT("Discard Changes");
+  ti.lpszText = (WCHAR*)TEXT("Discard Changes");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = browseWnd;
   ti.uId = (UINT)browseWnd;
-  ti.lpszText = TEXT("");
+  ti.lpszText = (WCHAR*)TEXT("");
   GetClientRect(browseWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
@@ -274,16 +274,17 @@
 void MenuEditor::PopulateSpecialFolders(HWND specialFoldersWnd)
 {
   WCHAR tmp[MAX_PATH];
-  wcscpy(tmp, ELGetSpecialFolder(FOLDER_MYDOCUMENTS));
-  SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
-  wcscpy(tmp, ELGetSpecialFolder(FOLDER_MYCOMPUTER));
-  SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
-  wcscpy(tmp, ELGetSpecialFolder(FOLDER_NETWORKPLACES));
-  SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
-  wcscpy(tmp, ELGetSpecialFolder(FOLDER_CONTROLPANEL));
-  SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
-  wcscpy(tmp, ELGetSpecialFolder(FOLDER_RECYCLEBIN));
-  SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+
+  if (ELGetSpecialFolder(FOLDER_MYDOCUMENTS, tmp))
+    SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+  if (ELGetSpecialFolder(FOLDER_MYCOMPUTER, tmp))
+    SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+  if (ELGetSpecialFolder(FOLDER_NETWORKPLACES, tmp))
+    SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+  if (ELGetSpecialFolder(FOLDER_CONTROLPANEL, tmp))
+    SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+  if (ELGetSpecialFolder(FOLDER_RECYCLEBIN, tmp))
+    SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
 }
 
 bool MenuEditor::PopulateTree(HWND treeWnd)
@@ -293,13 +294,13 @@
   tvInsert.hParent = NULL;
   tvInsert.hInsertAfter=TVI_ROOT;
   tvInsert.item.mask = TVIF_TEXT;
-  tvInsert.item.pszText = TEXT("Right");
+  tvInsert.item.pszText = (WCHAR*)TEXT("Right");
   rightRoot = TreeView_InsertItem(treeWnd, &tvInsert);
-  BuildMenuTree(treeWnd, rightRoot, TEXT("emergeDesktop\\RightMenu"));
+  BuildMenuTree(treeWnd, rightRoot, (WCHAR*)TEXT("emergeDesktop\\RightMenu"));
 
-  tvInsert.item.pszText = TEXT("Middle");
+  tvInsert.item.pszText = (WCHAR*)TEXT("Middle");
   midRoot = TreeView_InsertItem(treeWnd, &tvInsert);
-  BuildMenuTree(treeWnd, midRoot, TEXT("emergeDesktop\\MidMenu"));
+  BuildMenuTree(treeWnd, midRoot, (WCHAR*)TEXT("emergeDesktop\\MidMenu"));
 
   return true;
 }
@@ -323,10 +324,10 @@
       wcscat(subkeyString, subkeyName);
 
       ELOpenRegKey(subkeyString, &subkey, true);
-      ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
-      ELReadRegDWord(subkey, TEXT("type"), &type, 0);
-      ELReadRegString(subkey, TEXT("value"), value, TEXT("\0"));
-      ELReadRegString(subkey, TEXT("workingdir"), workingDir, TEXT("\0"));
+      ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+      ELReadRegDWord(subkey, (WCHAR*)TEXT("type"), &type, 0);
+      ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0"));
+      ELReadRegString(subkey, (WCHAR*)TEXT("workingdir"), workingDir, (WCHAR*)TEXT("\0"));
       ELCloseRegKey(subkey);
 
       MENUTREEITEM menuItem;
@@ -339,7 +340,7 @@
       tvInsert.hInsertAfter=TVI_LAST;
       tvInsert.item.mask = TVIF_TEXT;
       if (type == 0)
-        tvInsert.item.pszText = TEXT("[Separator]");
+        tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
       else
         tvInsert.item.pszText = name;
 
@@ -470,11 +471,11 @@
         }
     }
 
-  ELDeleteRegKey(TEXT("emergeDesktop\\RightMenu"));
-  WriteMenu(treeWnd, rightRoot, TEXT("emergeDesktop\\RightMenu"));
+  ELDeleteRegKey((WCHAR*)TEXT("emergeDesktop\\RightMenu"));
+  WriteMenu(treeWnd, rightRoot, (WCHAR*)TEXT("emergeDesktop\\RightMenu"));
 
-  ELDeleteRegKey(TEXT("emergeDesktop\\MidMenu"));
-  WriteMenu(treeWnd, midRoot, TEXT("emergeDesktop\\MidMenu"));
+  ELDeleteRegKey((WCHAR*)TEXT("emergeDesktop\\MidMenu"));
+  WriteMenu(treeWnd, midRoot, (WCHAR*)TEXT("emergeDesktop\\MidMenu"));
 
   treeMap.clear();
 
@@ -511,14 +512,14 @@
               ret = true;
 
               if (wcslen(iter->second.name) > 0)
-                ELWriteRegString(key, TEXT("name"),
+                ELWriteRegString(key, (WCHAR*)TEXT("name"),
                                  iter->second.name);
-              ELWriteRegDWord(key, TEXT("type"), &iter->second.type);
+              ELWriteRegDWord(key, (WCHAR*)TEXT("type"), &iter->second.type);
               if (wcslen(iter->second.value) > 0)
-                ELWriteRegString(key, TEXT("value"),
+                ELWriteRegString(key, (WCHAR*)TEXT("value"),
                                  iter->second.value);
               if (wcslen(iter->second.workingDir) > 0)
-                ELWriteRegString(key, TEXT("workingdir"),
+                ELWriteRegString(key, (WCHAR*)TEXT("workingdir"),
                                  iter->second.workingDir);
               ELCloseRegKey(key);
 
@@ -696,6 +697,7 @@
 BOOL MenuEditor::DoMenuMouseMove(HWND hwndDlg, WPARAM wParam, LPARAM lParam)
 {
   HWND treeWnd = GetDlgItem(hwndDlg, IDC_MENUTREE);
+  HTREEITEM htItem;
 
   if (dragging)
     {
@@ -704,9 +706,9 @@
       hitTest.pt.x = LOWORD(lParam);
       hitTest.pt.y = HIWORD(lParam);
 
-      TreeView_HitTest(treeWnd, &hitTest);
+      htItem = TreeView_HitTest(treeWnd, &hitTest);
 
-      if (hitTest.hItem)
+      if (htItem != NULL)
         {
           if (SetTimer(hwndDlg, 1, 500, NULL))
             hoverItem = hitTest.hItem;
@@ -739,15 +741,15 @@
 
   TVHITTESTINFO hitTest;
   TVINSERTSTRUCT tvInsert;
-  HTREEITEM parent, item, prev;
+  HTREEITEM parent, item, prev, htItem;
   TreeItemMap::iterator iter;
 
   hitTest.pt.x = LOWORD(lParam);
   hitTest.pt.y = HIWORD(lParam);
 
-  TreeView_HitTest(treeWnd, &hitTest);
+  htItem = TreeView_HitTest(treeWnd, &hitTest);
 
-  if (hitTest.hItem)
+  if (htItem != NULL)
     {
       if (dragging)
         {
@@ -775,7 +777,7 @@
           tvInsert.hInsertAfter = prev;
           tvInsert.item.mask = TVIF_TEXT;
           if (iter->second.type == 0)
-            tvInsert.item.pszText = TEXT("[Separator]");
+            tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
           else
             tvInsert.item.pszText = iter->second.name;
 
@@ -814,7 +816,7 @@
       tvInsert.hInsertAfter = TVI_LAST;
       tvInsert.item.mask = TVIF_TEXT;
       if (iter->second.type == 0)
-        tvInsert.item.pszText = TEXT("[Separator]");
+        tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
       else
         tvInsert.item.pszText = iter->second.name;
 
@@ -1037,7 +1039,7 @@
   iter->second.type = GetValueType((int)SendMessage(typeWnd, CB_GETCURSEL, 0, 0));
 
   if (iter->second.type == 0)
-    pItem.pszText = TEXT("[Separator]");
+    pItem.pszText = (WCHAR*)TEXT("[Separator]");
   else
     {
       if (iter->second.type == 2)
@@ -1364,13 +1366,13 @@
   switch (type)
     {
     case 1:
-      ti.lpszText = TEXT("Browse for a file");
+      ti.lpszText = (WCHAR*)TEXT("Browse for a file");
       break;
     case 4:
-      ti.lpszText = TEXT("Browse for an ELScript");
+      ti.lpszText = (WCHAR*)TEXT("Browse for an ELScript");
       break;
     case 101:
-      ti.lpszText = TEXT("Browse for a directory");
+      ti.lpszText = (WCHAR*)TEXT("Browse for a directory");
     }
 
   SendMessage(toolWnd, TTM_SETTOOLINFO, 0, (LPARAM)(LPTOOLINFO)&ti);

Modified: trunk/Source/emergeDesktop/Settings.cpp
===================================================================
--- trunk/Source/emergeDesktop/Settings.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/Settings.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -32,30 +32,30 @@
   HKEY coreKey, deskKey;
   DWORD tmp, tmpa;
 
-  ELOpenRegKey(TEXT("emergeCore\\Settings"), &coreKey, false);
-  ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &deskKey, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Settings"), &coreKey, false);
+  ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &deskKey, true);
 
-  if (!ELReadRegDWord(deskKey, TEXT("TopBorder"), &topBorder, 0))
-    ELReadRegDWord(coreKey, TEXT("TopBorder"), &topBorder, 0);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("TopBorder"), &topBorder, 0))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("TopBorder"), &topBorder, 0);
 
-  if (!ELReadRegDWord(deskKey, TEXT("BottomBorder"), &bottomBorder, 0))
-    ELReadRegDWord(coreKey, TEXT("BottomBorder"), &bottomBorder, 0);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("BottomBorder"), &bottomBorder, 0))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("BottomBorder"), &bottomBorder, 0);
 
-  if (!ELReadRegDWord(deskKey, TEXT("LeftBorder"), &leftBorder, 0))
-    ELReadRegDWord(coreKey, TEXT("LeftBorder"), &leftBorder, 0);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("LeftBorder"), &leftBorder, 0))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("LeftBorder"), &leftBorder, 0);
 
-  if (!ELReadRegDWord(deskKey, TEXT("RightBorder"), &rightBorder, 0))
-    ELReadRegDWord(coreKey, TEXT("RightBorder"), &rightBorder, 0);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("RightBorder"), &rightBorder, 0))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("RightBorder"), &rightBorder, 0);
 
-  if (!ELReadRegDWord(deskKey, TEXT("MenuAlpha"), &menuAlpha, 100))
-    ELReadRegDWord(coreKey, TEXT("MenuAlpha"), &menuAlpha, 100);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("MenuAlpha"), &menuAlpha, 100))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("MenuAlpha"), &menuAlpha, 100);
 
-  if (!ELReadRegDWord(deskKey, TEXT("MenuIcons"), &tmp, 1))
-    ELReadRegDWord(coreKey, TEXT("MenuIcons"), &tmp, 1);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("MenuIcons"), &tmp, 1))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("MenuIcons"), &tmp, 1);
 
   // roblarky
-  if (!ELReadRegDWord(deskKey, TEXT("BorderPrimary"), &tmpa, 0))
-    ELReadRegDWord(coreKey, TEXT("BorderPrimary"), &tmpa, 0);
+  if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("BorderPrimary"), &tmpa, 0))
+    ELReadRegDWord(coreKey, (WCHAR*)TEXT("BorderPrimary"), &tmpa, 0);
 
 
   ELCloseRegKey(coreKey);
@@ -100,9 +100,9 @@
 
   menuIcons = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("MenuIcons"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("MenuIcons"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -113,9 +113,9 @@
 
   topBorder = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("TopBorder"), &value);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("TopBorder"), &value);
       ELCloseRegKey(key);
     }
 }
@@ -137,9 +137,9 @@
 
   leftBorder = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("LeftBorder"), &value);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("LeftBorder"), &value);
       ELCloseRegKey(key);
     }
 }
@@ -156,9 +156,9 @@
 
   borderPrimary = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("BorderPrimary"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("BorderPrimary"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -174,9 +174,9 @@
 
   rightBorder = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("RightBorder"), &value);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("RightBorder"), &value);
       ELCloseRegKey(key);
     }
 }
@@ -192,9 +192,9 @@
 
   bottomBorder = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("BottomBorder"), &value);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("BottomBorder"), &value);
       ELCloseRegKey(key);
     }
 }
@@ -210,9 +210,9 @@
 
   menuAlpha = value;
 
-  if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("MenuAlpha"), &value);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("MenuAlpha"), &value);
       ELCloseRegKey(key);
     }
 }

Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeGraphics/main.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -489,6 +489,7 @@
   UINT iconFlags = 0;
   UINT iconID;
   HRESULT hr;
+  LPVOID lpVoid;
 
   ExpandEnvironmentStrings((LPCTSTR)file, (LPTSTR)expandedFile, MAX_PATH);
 
@@ -533,18 +534,19 @@
       pidlRelative = MSILClone(MSILFindLastID(pidlLocal));
       MSILRemoveLastID(pidlLocal);
 
-      hr = deskFolder->BindToObject(pidlLocal, NULL, IID_IShellFolder, (void**)&appObject);
+      hr = deskFolder->BindToObject(pidlLocal, NULL, IID_IShellFolder, &lpVoid);
       if (FAILED(hr))
         {
           deskFolder->Release();
           MSILFree(pidlLocal);
           return icon;
         }
+      appObject = reinterpret_cast <IShellFolder*> (lpVoid);
 
       MSILFree(pidlLocal);
 
       hr = appObject->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidlRelative, IID_IExtractIcon, NULL,
-                                    (void**)&extractIcon);
+                                    &lpVoid);
       if (FAILED(hr))
         {
           deskFolder->Release();
@@ -552,6 +554,7 @@
           MSILFree(pidlRelative);
           return icon;
         }
+      extractIcon = reinterpret_cast <IExtractIcon*> (lpVoid);
 
       MSILFree(pidlRelative);
 
@@ -796,7 +799,7 @@
   delete bmpBits;
   delete maskBits;
 
-  return ret = TRUE;
+  return (ret = TRUE);
 }
 
 HDC EGBeginPaint(HWND wnd)

Modified: trunk/Source/emergeHotkeys/Actions.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Actions.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeHotkeys/Actions.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -165,11 +165,11 @@
   ELStealFocus(hwndDlg);
 
   lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
-  lvCol.pszText = TEXT("Key Combination");
+  lvCol.pszText = (WCHAR*)TEXT("Key Combination");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 0, &lvCol);
 
-  lvCol.pszText = TEXT("Action");
+  lvCol.pszText = (WCHAR*)TEXT("Action");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 1, &lvCol);
 
@@ -221,43 +221,43 @@
   ti.hwnd = addWnd;
   ti.uId = (UINT)addWnd;
   ti.hinst = hInstance;
-  ti.lpszText = TEXT("Add Hotkey");
+  ti.lpszText = (WCHAR*)TEXT("Add Hotkey");
   GetClientRect(addWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = delWnd;
   ti.uId = (UINT)delWnd;
-  ti.lpszText = TEXT("Delete Hotkey");
+  ti.lpszText = (WCHAR*)TEXT("Delete Hotkey");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = editWnd;
   ti.uId = (UINT)editWnd;
-  ti.lpszText = TEXT("Edit Hotkey");
+  ti.lpszText = (WCHAR*)TEXT("Edit Hotkey");
   GetClientRect(editWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = fileWnd;
   ti.uId = (UINT)fileWnd;
-  ti.lpszText = TEXT("Browse for a file");
+  ti.lpszText = (WCHAR*)TEXT("Browse for a file");
   GetClientRect(fileWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = folderWnd;
   ti.uId = (UINT)folderWnd;
-  ti.lpszText = TEXT("Browse for a folder");
+  ti.lpszText = (WCHAR*)TEXT("Browse for a folder");
   GetClientRect(folderWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = saveWnd;
   ti.uId = (UINT)saveWnd;
-  ti.lpszText = TEXT("Save hotkey definition");
+  ti.lpszText = (WCHAR*)TEXT("Save hotkey definition");
   GetClientRect(saveWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = abortWnd;
   ti.uId = (UINT)abortWnd;
-  ti.lpszText = TEXT("Discard hotkey definition");
+  ti.lpszText = (WCHAR*)TEXT("Discard hotkey definition");
   GetClientRect(abortWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 

Modified: trunk/Source/emergeHotkeys/Settings.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Settings.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeHotkeys/Settings.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -71,7 +71,7 @@
   WCHAR value[MAX_LINE_LENGTH];
   HKEY key;
 
-  ELOpenRegKey(TEXT("emergeHotkeys\\Actions"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeHotkeys\\Actions"), &key, true);
 
   // Loop while there are entries in the key and remove them
   while (RegEnumValue(key, 0, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)
@@ -125,7 +125,7 @@
       hotkeyList.clear();
     }
 
-  ELOpenRegKey(TEXT("emergeHotkeys\\Actions"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeHotkeys\\Actions"), &key, true);
 
   // Loop while there are entries in the key
   while (RegEnumValue(key, index, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -204,19 +204,19 @@
     }
 
   lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
-  lvCol.pszText = TEXT("Command");
+  lvCol.pszText = (WCHAR*)TEXT("Command");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 0, &lvCol);
 
-  lvCol.pszText = TEXT("Working Directory");
+  lvCol.pszText = (WCHAR*)TEXT("Working Directory");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 1, &lvCol);
 
-  lvCol.pszText = TEXT("Icon");
+  lvCol.pszText = (WCHAR*)TEXT("Icon");
   lvCol.cx = 100;
   ListView_InsertColumn(listWnd, 2, &lvCol);
 
-  lvCol.pszText = TEXT("Tip");
+  lvCol.pszText = (WCHAR*)TEXT("Tip");
   lvCol.cx = 160;
   ListView_InsertColumn(listWnd, 3, &lvCol);
 
@@ -298,55 +298,55 @@
   ti.hwnd = addWnd;
   ti.uId = (UINT)addWnd;
   ti.hinst = hInstance;
-  ti.lpszText = TEXT("Add Item");
+  ti.lpszText = (WCHAR*)TEXT("Add Item");
   GetClientRect(addWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = delWnd;
   ti.uId = (UINT)delWnd;
-  ti.lpszText = TEXT("Delete Item");
+  ti.lpszText = (WCHAR*)TEXT("Delete Item");
   GetClientRect(delWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = editWnd;
   ti.uId = (UINT)editWnd;
-  ti.lpszText = TEXT("Edit Item");
+  ti.lpszText = (WCHAR*)TEXT("Edit Item");
   GetClientRect(editWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = upWnd;
   ti.uId = (UINT)upWnd;
-  ti.lpszText = TEXT("Move Item Up");
+  ti.lpszText = (WCHAR*)TEXT("Move Item Up");
   GetClientRect(upWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = downWnd;
   ti.uId = (UINT)downWnd;
-  ti.lpszText = TEXT("Move Item Down");
+  ti.lpszText = (WCHAR*)TEXT("Move Item Down");
   GetClientRect(downWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = saveWnd;
   ti.uId = (UINT)saveWnd;
-  ti.lpszText = TEXT("Save Item");
+  ti.lpszText = (WCHAR*)TEXT("Save Item");
   GetClientRect(downWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = abortWnd;
   ti.uId = (UINT)abortWnd;
-  ti.lpszText = TEXT("Discard Item");
+  ti.lpszText = (WCHAR*)TEXT("Discard Item");
   GetClientRect(abortWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = browseCommandWnd;
   ti.uId = (UINT)browseCommandWnd;
-  ti.lpszText = TEXT("Browse For An Application");
+  ti.lpszText = (WCHAR*)TEXT("Browse For An Application");
   GetClientRect(browseCommandWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
   ti.hwnd = browseIconWnd;
   ti.uId = (UINT)browseIconWnd;
-  ti.lpszText = TEXT("Browse For An Icon");
+  ti.lpszText = (WCHAR*)TEXT("Browse For An Icon");
   GetClientRect(browseIconWnd, &ti.rect);
   SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 
@@ -544,34 +544,34 @@
 
   if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
-      pSettings->SetVerticalDirection(TEXT("Up"));
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Up"));
   if (SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("down")) != 0)
-      pSettings->SetVerticalDirection(TEXT("Down"));
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Down"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) != 0)
-      pSettings->SetDirectionOrientation(TEXT("Vertical"));
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Vertical"));
   if (SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("horizontal")) != 0)
-      pSettings->SetDirectionOrientation(TEXT("Horizontal"));
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Horizontal"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) != 0)
-      pSettings->SetHorizontalDirection(TEXT("Left"));
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Left"));
   if (SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("right")) != 0)
-      pSettings->SetHorizontalDirection(TEXT("Right"));
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Right"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
-      pSettings->SetZPosition(TEXT("Top"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Top"));
   if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
-      pSettings->SetZPosition(TEXT("Bottom"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
   if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
-      pSettings->SetZPosition(TEXT("Normal"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
 
   pSettings->DeleteItems();
 

Modified: trunk/Source/emergeLauncher/Settings.cpp
===================================================================
--- trunk/Source/emergeLauncher/Settings.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Settings.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -40,29 +40,29 @@
   HKEY key;
   RECT deskRect, tmpRect;
 
-  ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
-  ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
-  ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
-  ELReadRegDWord(key, TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, TEXT("Height"), &height, 100);
+  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
 
   tmpRect.left = x;
   tmpRect.right = tmpRect.left + width;
   tmpRect.top = y;
   tmpRect.bottom = tmpRect.top + height;
   ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
-  ELReadRegString(key, TEXT("HorizontalDirection"), horizontalDirection, TEXT("right"));
-  ELReadRegString(key, TEXT("VerticalDirection"), verticalDirection, TEXT("down"));
-  ELReadRegString(key, TEXT("DirectionOrientation"), directionOrientation, TEXT("horizontal"));
-  ELReadRegDWord(key, TEXT("AutoSize"), &autoSize, 0);
-  ELReadRegDWord(key, TEXT("IconSize"), &iconSize, 16);
-  ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
-  ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
-  ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
-  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile,(WCHAR*) TEXT("\0"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
   ELCloseRegKey(key);
 }
 
@@ -73,25 +73,25 @@
   (*this).width = width;
   (*this).height = height;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("Width"), &width);
-      ELWriteRegDWord(key, TEXT("Height"), &height);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
 {
   HKEY key;
 
   (*this).x = x;
   (*this).y = y;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("X"), (DWORD*)&x);
-      ELWriteRegDWord(key, TEXT("Y"), (DWORD*)&y);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
       ELCloseRegKey(key);
     }
 }
@@ -102,9 +102,9 @@
 
   CopyRect(&resolution, deskRect);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegRect(key, TEXT("Resolution"), &resolution);
+      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
       ELCloseRegKey(key);
     }
 }
@@ -195,9 +195,9 @@
 
   wcscpy((*this).zPosition, zPosition);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("ZPosition"), zPosition);
+      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
       ELCloseRegKey(key);
     }
 }
@@ -208,9 +208,9 @@
 
   wcscpy((*this).horizontalDirection, horizontalDirection);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("HorizontalDirection"), horizontalDirection);
+      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
       ELCloseRegKey(key);
     }
 }
@@ -221,9 +221,9 @@
 
   wcscpy((*this).verticalDirection, verticalDirection);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("VerticalDirection"), verticalDirection);
+      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
       ELCloseRegKey(key);
     }
 }
@@ -234,9 +234,9 @@
 
   wcscpy((*this).directionOrientation, directionOrientation);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("DirectionOrientation"), directionOrientation);
+      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
       ELCloseRegKey(key);
     }
 }
@@ -253,9 +253,9 @@
 
   (*this).clickThrough = tmp;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -272,9 +272,9 @@
 
   (*this).autoSize = autoSize;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("AutoSize"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -291,9 +291,9 @@
 
   (*this).snapSize = snapSize;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("SnapSize"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -310,9 +310,9 @@
 
   (*this).snapMove = snapMove;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("SnapMove"), &tmp);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
       ELCloseRegKey(key);
     }
 }
@@ -323,9 +323,9 @@
 
   (*this).iconSize = iconSize;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("IconSize"), &iconSize);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
       ELCloseRegKey(key);
     }
 }
@@ -336,9 +336,9 @@
 
   (*this).iconSize = iconSpacing;
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("IconSpacing"), &iconSize);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSize);
       ELCloseRegKey(key);
     }
 }
@@ -349,9 +349,9 @@
 
   wcscpy((*this).schemeFile, schemeFile);
 
-  if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
     {
-      ELWriteRegString(key, TEXT("Scheme"), schemeFile);
+      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
       ELCloseRegKey(key);
     }
 }
@@ -373,13 +373,13 @@
   swprintf(tipValue, TEXT("Tip%d"), index);
   swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
 
-  ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
 
-  while (ELReadRegString(key, commandValue, app, TEXT("\0")))
+  while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("\0")))
     {
-      ELReadRegString(key, iconValue, icon, TEXT("\0"));
-      ELReadRegString(key, tipValue, tip, TEXT("\0"));
-      ELReadRegString(key, workingDirValue, workingDir, TEXT("\0"));
+      ELReadRegString(key, iconValue, icon, (WCHAR*)TEXT("\0"));
+      ELReadRegString(key, tipValue, tip, (WCHAR*)TEXT("\0"));
+      ELReadRegString(key, workingDirValue, workingDir, (WCHAR*)TEXT("\0"));
 
       itemList.push_back(new Item(mainInstance, app, icon, tip, workingDir, iconSize));
 
@@ -410,9 +410,9 @@
   swprintf(iconValue, TEXT("Icon%d"), index);
   swprintf(tipValue, TEXT("Tip%d"), index);
 
-  ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
 
-  while (ELReadRegString(key, commandValue, app, TEXT("")))
+  while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("")))
     {
       RegDeleteValue(key, commandValue);
       RegDeleteValue(key, iconValue);
@@ -444,7 +444,7 @@
   swprintf(tipValue, TEXT("Tip%d"), index);
   swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
 
-  ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
 
   ELWriteRegString(key, commandValue, command);
   ELWriteRegString(key, iconValue, iconPath);

Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Settings.h	2007-08-10 01:05:10 UTC (rev 1400)
@@ -48,7 +48,7 @@
     WCHAR *GetSchemeFile();
     RECT *GetResolution();
     void SetResolution(RECT *deskRect);
-    void SetPosition(int x, int y);
+    void SetPosition(DWORD x, DWORD y);
     void SetSize(DWORD width, DWORD height);
     void SetZPosition(WCHAR *zPosition);
     void SetHorizontalDirection(WCHAR *horizontalDirection);
@@ -69,8 +69,7 @@
 
   private:
     std::vector<Item*> itemList;
-    DWORD width, height;
-    int x, y;
+    DWORD width, height, x, y;
     WCHAR zPosition[MAX_LINE_LENGTH];
     WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
     directionOrientation[MAX_LINE_LENGTH];

Modified: trunk/Source/emergeLib/emergeLib.h
===================================================================
--- trunk/Source/emergeLib/emergeLib.h	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLib/emergeLib.h	2007-08-10 01:05:10 UTC (rev 1400)
@@ -290,7 +290,7 @@
     DLL_EXPORT bool ELParseCommand(WCHAR *application, WCHAR *program, WCHAR *arguments);
     DLL_EXPORT UINT ELIsSpecialFolder(WCHAR *folder);
     DLL_EXPORT UINT ELIsInternalCommand(WCHAR *command);
-    DLL_EXPORT WCHAR *ELGetSpecialFolder(UINT folder);
+    DLL_EXPORT bool ELGetSpecialFolder(UINT folder, WCHAR *folderPath);
     DLL_EXPORT void ELWriteDebug(WCHAR *debugText);
     DLL_EXPORT void ELDisplayChange(HWND hwnd);
     DLL_EXPORT int ELMid(int left, int right);

Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLib/main.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -572,7 +572,7 @@
       return false;
     }
 
-  return ELExecute(command, TEXT("\0"));
+  return ELExecute(command, (WCHAR*)TEXT("\0"));
 }
 
 //------
@@ -768,7 +768,8 @@
   wcscpy(tmp, path);
   ELGetCurrentPath(corePath);
 
-  *corePathPtr = corePath;
+  corePathPtr[0] = corePath;
+  corePathPtr[1] = NULL;
 
   if (MSPathResolve(tmp, corePathPtr, PRF_VERIFYEXISTS | PRF_TRYPROGRAMEXTENSIONS) &&
       !PathIsDirectory(tmp))
@@ -1393,10 +1394,12 @@
 //-----
 bool ELParseShortcut(LPTSTR shortcut, LPSHORTCUTINFO shortcutInfo)
 {
-  IShellLink *psl;
-  IPersistFile* ppf;
+  IShellLink *psl = NULL;
+  IPersistFile* ppf = NULL;
   LPITEMIDLIST pidl = NULL;
 
+  LPVOID lpVoid;
+
   if (MSILFree == NULL)
     MSILFree = (lpfnILFree)GetProcAddress(GetModuleHandle(TEXT("shell32.dll")), (LPCSTR)155);
 
@@ -1405,20 +1408,22 @@
       // Get a pointer to the IShellLink interface.
       if (FAILED(CoCreateInstance(CLSID_ShellLink, NULL,
                                   CLSCTX_INPROC_SERVER, IID_IShellLink,
-                                  (LPVOID*)&psl)))
+                                  &lpVoid)))
         {
           CoUninitialize();
           return false;
         }
+      psl = reinterpret_cast <IShellLink*> (lpVoid);
 
       // Get a pointer to the IPersistFile interface.
       if (FAILED(psl->QueryInterface(IID_IPersistFile,
-                                     (void**)&ppf)))
+                                     &lpVoid)))
         {
           psl->Release();
           CoUninitialize();
           return false;
         }
+      ppf = reinterpret_cast <IPersistFile*> (lpVoid);
 
       // Load the shortcut.
       if (FAILED(ppf->Load(shortcut, STGM_READ)))
@@ -1551,7 +1556,7 @@
           // execute the command
           if (wcscmp(value, alias) == 0)
             {
-              ELExecute(command, TEXT("\0"));
+              ELExecute(command, (WCHAR*)TEXT("\0"));
               ret = true;
               break;
             }
@@ -2171,7 +2176,7 @@
 
   if (GetFileVersionInfo(applet, notUsed, dataSize, data))
     {
-      if (VerQueryValue(data, TEXT("\\VarFileInfo\\Translation"), &buffer, &bufferSize))
+      if (VerQueryValue(data, (WCHAR*)TEXT("\\VarFileInfo\\Translation"), &buffer, &bufferSize))
         swprintf(tmp, TEXT("\\StringFileInfo\\%04x%04x\\"), LOWORD(*((UINT*)buffer)),
                  HIWORD(*((UINT*)buffer)));
       else
@@ -2355,7 +2360,7 @@
   @param folder special folder to return path for
 */
 
-WCHAR *ELGetSpecialFolder(UINT folder)
+bool ELGetSpecialFolder(UINT folder, WCHAR *folderPath)
 {
   LPITEMIDLIST pidl;
   SHFILEINFO fileInfo;
@@ -2378,12 +2383,13 @@
       SHGetSpecialFolderLocation(NULL, CSIDL_BITBUCKET, &pidl);
       break;
     default:
-      return NULL;
+      return false;
     }
 
   SHGetFileInfo((LPCTSTR)pidl, 0, &fileInfo, sizeof(fileInfo), SHGFI_PIDL | SHGFI_DISPLAYNAME);
+  wcscpy(folderPath, fileInfo.szDisplayName);
 
-  return fileInfo.szDisplayName;
+  return true;
 }
 
 /*!

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -86,7 +86,7 @@
   wcsncpy(origScheme, scheme, MAX_PATH);
 
   ESEReadScheme(scheme, &guiInfo);
-  ESEReadScheme(TEXT(""), &defaultGuiInfo);
+  ESEReadScheme((WCHAR*)TEXT(""), &defaultGuiInfo);
 
   origGuiInfo = guiInfo;
 

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -82,61 +82,61 @@
 
 void ESEWriteScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
 {
-  ELWriteFileInt(schemeFile, TEXT("alpha.active:"), (int)guiInfo->alphaActive);
-  ELWriteFileInt(schemeFile, TEXT("alpha.inactive:"), (int)guiInfo->alphaInactive);
-  ELWriteFileInt(schemeFile, TEXT("alpha.background:"), (int)guiInfo->alphaBackground);
-  ELWriteFileInt(schemeFile, TEXT("alpha.menu:"), (int)guiInfo->alphaMenu);
-  ELWriteFileInt(schemeFile, TEXT("alpha.foreground:"), (int)guiInfo->alphaForeground);
-  ELWriteFileInt(schemeFile, TEXT("alpha.frame:"), (int)guiInfo->alphaFrame);
-  ELWriteFileInt(schemeFile, TEXT("alpha.selected:"), (int)guiInfo->alphaSelected);
-  ELWriteFileInt(schemeFile, TEXT("alpha.border:"), (int)guiInfo->alphaBorder);
-  ELWriteFileInt(schemeFile, TEXT("alpha.text:"), (int)guiInfo->alphaText);
-  ELWriteFileColor(schemeFile, TEXT("color.background:"), guiInfo->colorBackground);
-  ELWriteFileColor(schemeFile, TEXT("color.selected:"), guiInfo->colorSelected);
-  ELWriteFileColor(schemeFile, TEXT("color.foreground:"), guiInfo->colorForeground);
-  ELWriteFileColor(schemeFile, TEXT("color.frame:"), guiInfo->colorFrame);
-  ELWriteFileColor(schemeFile, TEXT("color.font:"), guiInfo->colorFont);
-  ELWriteFileColor(schemeFile, TEXT("color.border:"), guiInfo->colorBorder);
-  ELWriteFileBool(schemeFile, TEXT("window.shadow:"), guiInfo->windowShadow);
-  ELWriteFileInt(schemeFile, TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
-  ELWriteFileInt(schemeFile, TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
-  ELWriteFileInt(schemeFile, TEXT("window.padding:"), (int)guiInfo->padding);
-  ELWriteFileColor(schemeFile, TEXT("gradient.colorFrom:"), guiInfo->gradientFrom);
-  ELWriteFileColor(schemeFile, TEXT("gradient.colorTo:"), guiInfo->gradientTo);
-  ELWriteFileString(schemeFile, TEXT("gradient.method:"), guiInfo->gradientMethod);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.active:"), (int)guiInfo->alphaActive);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.inactive:"), (int)guiInfo->alphaInactive);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.background:"), (int)guiInfo->alphaBackground);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.menu:"), (int)guiInfo->alphaMenu);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.foreground:"), (int)guiInfo->alphaForeground);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.frame:"), (int)guiInfo->alphaFrame);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.selected:"), (int)guiInfo->alphaSelected);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.border:"), (int)guiInfo->alphaBorder);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.text:"), (int)guiInfo->alphaText);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.background:"), guiInfo->colorBackground);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.selected:"), guiInfo->colorSelected);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.foreground:"), guiInfo->colorForeground);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.frame:"), guiInfo->colorFrame);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.font:"), guiInfo->colorFont);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.border:"), guiInfo->colorBorder);
+  ELWriteFileBool(schemeFile, (WCHAR*)TEXT("window.shadow:"), guiInfo->windowShadow);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
+  ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.padding:"), (int)guiInfo->padding);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorFrom:"), guiInfo->gradientFrom);
+  ELWriteFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorTo:"), guiInfo->gradientTo);
+  ELWriteFileString(schemeFile, (WCHAR*)TEXT("gradient.method:"), guiInfo->gradientMethod);
 }
 
 void ESEReadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
 {
-  ELReadFileInt(schemeFile, TEXT("alpha.active:"), (int*)&guiInfo->alphaActive, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.inactive:"), (int*)&guiInfo->alphaInactive, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.background:"), (int*)&guiInfo->alphaBackground, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.menu:"), (int*)&guiInfo->alphaMenu, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.foreground:"), (int*)&guiInfo->alphaForeground, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.frame:"), (int*)&guiInfo->alphaFrame, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.selected:"), (int*)&guiInfo->alphaSelected, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.border:"), (int*)&guiInfo->alphaBorder, 100);
-  ELReadFileInt(schemeFile, TEXT("alpha.text:"), (int*)&guiInfo->alphaText, 100);
-  ELReadFileColor(schemeFile, TEXT("color.background:"), &guiInfo->colorBackground,
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.active:"), (int*)&guiInfo->alphaActive, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.inactive:"), (int*)&guiInfo->alphaInactive, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.background:"), (int*)&guiInfo->alphaBackground, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.menu:"), (int*)&guiInfo->alphaMenu, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.foreground:"), (int*)&guiInfo->alphaForeground, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.frame:"), (int*)&guiInfo->alphaFrame, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.selected:"), (int*)&guiInfo->alphaSelected, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.border:"), (int*)&guiInfo->alphaBorder, 100);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.text:"), (int*)&guiInfo->alphaText, 100);
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.background:"), &guiInfo->colorBackground,
                   GetSysColor(COLOR_BTNFACE));
-  ELReadFileColor(schemeFile, TEXT("color.selected:"), &guiInfo->colorSelected,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.selected:"), &guiInfo->colorSelected,
                   GetSysColor(COLOR_HIGHLIGHT));
-  ELReadFileColor(schemeFile, TEXT("color.foreground:"), &guiInfo->colorForeground,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.foreground:"), &guiInfo->colorForeground,
                   GetSysColor(COLOR_WINDOW));
-  ELReadFileColor(schemeFile, TEXT("color.frame:"), &guiInfo->colorFrame,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.frame:"), &guiInfo->colorFrame,
                   GetSysColor(COLOR_ACTIVECAPTION));
-  ELReadFileColor(schemeFile, TEXT("color.font:"), &guiInfo->colorFont,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.font:"), &guiInfo->colorFont,
                   GetSysColor(COLOR_BTNTEXT));
-  ELReadFileColor(schemeFile, TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
-  ELReadFileBool(schemeFile, TEXT("window.shadow:"), &guiInfo->windowShadow, true);
-  ELReadFileInt(schemeFile, TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
-  ELReadFileInt(schemeFile, TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
-  ELReadFileInt(schemeFile, TEXT("window.padding:"), (int*)&guiInfo->padding, 0);
-  ELReadFileColor(schemeFile, TEXT("gradient.colorFrom:"), &guiInfo->gradientFrom,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
+  ELReadFileBool(schemeFile, (WCHAR*)TEXT("window.shadow:"), &guiInfo->windowShadow, true);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
+  ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.padding:"), (int*)&guiInfo->padding, 0);
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorFrom:"), &guiInfo->gradientFrom,
                   GetSysColor(COLOR_ACTIVECAPTION));
-  ELReadFileColor(schemeFile, TEXT("gradient.colorTo:"), &guiInfo->gradientTo,
+  ELReadFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorTo:"), &guiInfo->gradientTo,
                   GetSysColor(COLOR_GRADIENTACTIVECAPTION));
-  ELReadFileString(schemeFile, TEXT("gradient.method:"), guiInfo->gradientMethod, TEXT("Solid"));
+  ELReadFileString(schemeFile, (WCHAR*)TEXT("gradient.method:"), guiInfo->gradientMethod, (WCHAR*)TEXT("Solid"));
 }
 
 void ESELoadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)

Modified: trunk/Source/emergeTasks/Config.cpp
===================================================================
--- trunk/Source/emergeTasks/Config.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeTasks/Config.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -235,34 +235,34 @@
 
   if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
-      pSettings->SetVerticalDirection(TEXT("Up"));
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Up"));
   if (SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("down")) != 0)
-      pSettings->SetVerticalDirection(TEXT("Down"));
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Down"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) != 0)
-      pSettings->SetDirectionOrientation(TEXT("Vertical"));
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Vertical"));
   if (SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("horizontal")) != 0)
-      pSettings->SetDirectionOrientation(TEXT("Horizontal"));
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Horizontal"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) != 0)
-      pSettings->SetHorizontalDirection(TEXT("Left"));
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Left"));
   if (SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("right")) != 0)
-      pSettings->SetHorizontalDirection(TEXT("Right"));
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Right"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
-      pSettings->SetZPosition(TEXT("Top"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Top"));
   if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
-      pSettings->SetZPosition(TEXT("Bottom"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
   if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
     if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
-      pSettings->SetZPosition(TEXT("Normal"));
+      pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
 
   index = (int)SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_GETCURSEL, 0, 0);
   if (index == 1)

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-08-10 01:05:10 UTC (rev 1400)
@@ -32,33 +32,33 @@
   HKEY key;
   RECT deskRect, tmpRect;
 
-  ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true);
-  ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
-  ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
-  ELReadRegDWord(key, TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, TEXT("Height"), &height, 100);
-  ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
-  ELReadRegString(key, TEXT("HorizontalDirection"), horizontalDirection, TEXT("right"));
-  ELReadRegString(key, TEXT("VerticalDirection"), verticalDirection, TEXT("down"));
-  ELReadRegString(key, TEXT("DirectionOrientation"), directionOrientation, TEXT("horizontal"));
-  ELReadRegDWord(key, TEXT("FlashCount"), &flashCount, 0);
-  ELReadRegDWord(key, TEXT("FlashInterval"), &flashInterval, 1000);
-  ELReadRegDWord(key, TEXT("EnableFlash"), &enableFlash, 1);
-  ELReadRegDWord(key, TEXT("AutoSize"), &autoSize, 0);
-  ELReadRegDWord(key, TEXT("HighLightActive"), &hiliteActive, 1);
-  ELReadRegDWord(key, TEXT("IconSize"), &iconSize, 16);
-  ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
-  ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
-  ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
+  ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
+  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &hiliteActive, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
 
   tmpRect.left = x;
   tmpRect.right = tmpRect.left + width;
   tmpRect.top = y;
   tmpRect.bottom = tmpRect.top + height;
   ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
   ELCloseRegKey(key);
 }
 
@@ -69,10 +69,10 @@
   (*this).width = width;
   (*this).height = height;
 
-  if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("Width"), &width);
-      ELWriteRegDWord(key, TEXT("Height"), &height);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
       ELCloseRegKey(key);
     }
 }
@@ -83,9 +83,9 @@
 
   (*this).iconSize = iconSize;
 
-  if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("IconSize"), &iconSize);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
       ELCloseRegKey(key);
     }
 }
@@ -96,24 +96,24 @@
 
   (*this).iconSpacing = iconSpacing;
 
-  if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
     {
-      ELWriteRegDWord(key, TEXT("IconSpacing"), &iconSpacing);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
 {
   HKEY key;
 
   (*this).x = x;
   (*this).y = y;
 
-  if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1408] trunk/Source

From: <ir0nh34d@us...> - 2007-08-27 17:04

Revision: 1408
          http://emerge.svn.sourceforge.net/emerge/?rev=1408&view=rev
Author:   ir0nh34d
Date:     2007-08-27 10:04:04 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
Added support for Change Icon Dialogue

Modified Paths:
--------------
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeLauncher/Config.cpp
    trunk/Source/emergeLauncher/Config.h

Modified: trunk/Source/emergeGraphics/emergeGraphics.h
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.h	2007-08-23 17:59:36 UTC (rev 1407)
+++ trunk/Source/emergeGraphics/emergeGraphics.h	2007-08-27 17:04:04 UTC (rev 1408)
@@ -141,6 +141,7 @@
     DLL_EXPORT bool EGFrameRect(HDC hdc, RECT *rect, BYTE alpha, COLORREF colour);
     DLL_EXPORT UINT32 EGGetPixel(BYTE alpha, COLORREF colour);
     DLL_EXPORT BYTE EGGetMinAlpha(BYTE alphaBase, BYTE alphaDelta);
+    DLL_EXPORT bool EGGetIconDialogue(HWND hwnd, WCHAR *iconPath);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp	2007-08-23 17:59:36 UTC (rev 1407)
+++ trunk/Source/emergeGraphics/main.cpp	2007-08-27 17:04:04 UTC (rev 1408)
@@ -53,6 +53,9 @@
 typedef UINT (WINAPI *fnPrivateExtractIcons)(LPCTSTR, int, int, int, HICON*, UINT*, UINT, UINT);
 static fnPrivateExtractIcons MSPrivateExtractIcons = NULL;
 
+typedef UINT (WINAPI *fnPickIcon)(HWND, WCHAR*, UINT, UINT*);
+static fnPickIcon MSPickIcon = NULL;
+
 // Globals
 HINSTANCE hInstance = NULL;
 HDC hdc = NULL;
@@ -485,14 +488,26 @@
   IExtractIcon *extractIcon = NULL;
   WCHAR iconLocation[MAX_PATH];
   WCHAR expandedFile[MAX_PATH];
+  WCHAR suppliedFile[MAX_PATH];
+  WCHAR *token;
   int iconIndex = 0;
   UINT iconFlags = 0;
   UINT iconID;
   HRESULT hr;
   LPVOID lpVoid;
+  bool hasIndex = false;
 
-  ExpandEnvironmentStrings((LPCTSTR)file, (LPTSTR)expandedFile, MAX_PATH);
+  token = wcstok(_wcsdup(file), TEXT(","));
+  wcsncpy(suppliedFile, token, MAX_PATH);
+  token = wcstok(NULL, TEXT("\n"));
+  if (token != NULL)
+    {
+      hasIndex = true;
+      iconIndex = _wtoi(token);
+    }
 
+  ExpandEnvironmentStrings((LPCTSTR)suppliedFile, (LPTSTR)expandedFile, MAX_PATH);
+
   if (MSILFree == NULL)
     MSILFree = (fnILFree)GetProcAddress(GetModuleHandle(TEXT("shell32.dll")), (LPCSTR)155);
   if (MSILFree == NULL)
@@ -518,6 +533,12 @@
   if (MSPrivateExtractIcons == NULL)
     return icon;
 
+  if (hasIndex)
+    {
+      MSPrivateExtractIcons(expandedFile, iconIndex, iconSize, iconSize, &icon, &iconID, 1, 0);
+      return icon;
+    }
+
   if (SUCCEEDED(CoInitialize(NULL)))
     {
       hr = SHGetDesktopFolder(&deskFolder);
@@ -545,8 +566,8 @@
 
       MSILFree(pidlLocal);
 
-      hr = appObject->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidlRelative, IID_IExtractIcon, NULL,
-                                    &lpVoid);
+      hr = appObject->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidlRelative,
+                                    IID_IExtractIcon, NULL, &lpVoid);
       if (FAILED(hr))
         {
           deskFolder->Release();
@@ -566,10 +587,8 @@
           return icon;
         }
 
-      if (iconSize == 16)
-        hr = extractIcon->Extract(iconLocation, iconIndex, &tmpIcon, &icon, MAKELONG(32, 16));
-      else
-        hr = extractIcon->Extract(iconLocation, iconIndex, &icon, &tmpIcon, MAKELONG(iconSize, 16));
+      hr = extractIcon->Extract(iconLocation, iconIndex, &icon, &tmpIcon,
+                                MAKELONG(iconSize, 16));
 
       extractIcon->Release();
       appObject->Release();
@@ -579,16 +598,40 @@
         DestroyIcon(tmpIcon);
 
       if (icon == NULL)
-        MSPrivateExtractIcons(iconLocation, iconIndex, iconSize, iconSize, &icon, &iconID, 1, 0);
-      if (icon == NULL)
-        icon = EGGetSystemIcon(ICON_DEFAULT, iconSize);
+        MSPrivateExtractIcons(iconLocation, iconIndex, iconSize, iconSize, &icon,
+                              &iconID, 1, 0);
 
       CoUninitialize();
     }
 
+  if (icon == NULL)
+    icon = EGGetSystemIcon(ICON_DEFAULT, iconSize);
+
   return icon;
 }
 
+bool EGGetIconDialogue(HWND hwnd, WCHAR *iconPath)
+{
+  WCHAR filename[MAX_PATH];
+  UINT iconIndex;
+
+  if (MSPickIcon == NULL)
+    MSPickIcon = (fnPickIcon)GetProcAddress(GetModuleHandle(TEXT("shell32.dll")), (LPCSTR)62);
+
+  if (MSPickIcon == NULL)
+    return false;
+
+  wcsncpy(filename, iconPath, MAX_PATH);
+
+  if (MSPickIcon(hwnd, filename, MAX_PATH, &iconIndex) != 0)
+    {
+      swprintf(iconPath, TEXT("%s,%d"), filename, iconIndex);
+      return true;
+    }
+
+  return false;
+}
+
 //-----
 // Function:	EGGetWindowIcon
 // Required:	HWND task - handle to the task's window

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-08-23 17:59:36 UTC (rev 1407)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-08-27 17:04:04 UTC (rev 1408)
@@ -392,7 +392,7 @@
     case IDC_BROWSECOMMAND:
       return Browse(hwndDlg, BROWSE_COMMAND);
     case IDC_BROWSEICON:
-      return Browse(hwndDlg, BROWSE_ICON);
+      return GetIcon(hwndDlg);
     case IDC_BROWSEWORKINGDIR:
       return Browse(hwndDlg, BROWSE_WORKINGDIR);
     case IDC_EXEBUTTON:
@@ -404,6 +404,16 @@
   return FALSE;
 }
 
+BOOL Config::GetIcon(HWND hwndDlg)
+{
+  WCHAR iconPath[MAX_LINE_LENGTH];
+  if (SendDlgItemMessage(hwndDlg, IDC_EXEBUTTON, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    GetDlgItemText(hwndDlg, IDC_COMMAND, iconPath, MAX_LINE_LENGTH);
+  if (EGGetIconDialogue(hwndDlg, iconPath))
+    SetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath);
+  return TRUE;
+}
+
 void Config::PopulateInternal(HWND internalWnd)
 {
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("RightDeskMenu"));

Modified: trunk/Source/emergeLauncher/Config.h
===================================================================
--- trunk/Source/emergeLauncher/Config.h	2007-08-23 17:59:36 UTC (rev 1407)
+++ trunk/Source/emergeLauncher/Config.h	2007-08-27 17:04:04 UTC (rev 1408)
@@ -61,6 +61,7 @@
     BOOL PopulateFields(HWND hwndDlg, int itemIndex);
 
   private:
+    BOOL GetIcon(HWND hwndDlg);
     HINSTANCE hInstance;
     HWND mainWnd, toolWnd;
     HICON addIcon, editIcon, delIcon, upIcon, downIcon, saveIcon, abortIcon, browseIcon;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1414] trunk/Source

From: <ir0nh34d@us...> - 2007-09-13 17:27

Revision: 1414
          http://emerge.svn.sourceforge.net/emerge/?rev=1414&view=rev
Author:   ir0nh34d
Date:     2007-09-13 10:27:50 -0700 (Thu, 13 Sep 2007)

Log Message:
-----------
Fixes for Change Icon Dialogue

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Config.cpp

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-09-08 01:39:07 UTC (rev 1413)
+++ trunk/Source/EmergeDesktop.cbp	2007-09-13 17:27:50 UTC (rev 1414)
@@ -53,6 +53,7 @@
 					<Add library="gdi32" />
 					<Add library="msimg32" />
 					<Add library="ole32" />
+					<Add library="shlwapi" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>

Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp	2007-09-08 01:39:07 UTC (rev 1413)
+++ trunk/Source/emergeGraphics/main.cpp	2007-09-13 17:27:50 UTC (rev 1414)
@@ -33,6 +33,7 @@
 #include "../emergeLib/emergeLib.h"
 #include <objbase.h>
 #include <stdio.h>
+#include <shlwapi.h>
 
 #ifndef GIL_DEFAULTICON
 #define GIL_DEFAULTICON 64
@@ -627,6 +628,7 @@
     return false;
 
   wcsncpy(filename, iconPath, MAX_PATH);
+  PathQuoteSpaces(filename);
 
   if (MSPickIcon(hwnd, filename, MAX_PATH, &iconIndex) != 0)
     {

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-09-08 01:39:07 UTC (rev 1413)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-09-13 17:27:50 UTC (rev 1414)
@@ -383,7 +383,8 @@
               wcscpy(execInfo.Command, pSettings->GetItem(i)->GetApp());
               wcscpy(execInfo.WorkingDir, pSettings->GetItem(i)->GetWorkingDir());
 
-              _beginthread(ELThreadExecuteAll, 0, (void *)&execInfo);
+              if (_wcsicmp(execInfo.Command, TEXT("separator")) != 0)
+                _beginthread(ELThreadExecuteAll, 0, (void *)&execInfo);
             }
 
           return 0;

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-09-08 01:39:07 UTC (rev 1413)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-09-13 17:27:50 UTC (rev 1414)
@@ -127,7 +127,7 @@
     return true;
 
   if ((GetDlgItemText(hwndDlg, IDC_COMMAND, tmp, MAX_LINE_LENGTH) != 0) ||
-    (GetDlgItemText(hwndDlg, IDC_INTERNAL, tmp, MAX_LINE_LENGTH) != 0))
+      (GetDlgItemText(hwndDlg, IDC_INTERNAL, tmp, MAX_LINE_LENGTH) != 0))
     {
       if (MessageBox(hwndDlg, TEXT("The current command will be lost.\n\nDo you wish to continue?"),
                      TEXT("emergeLauncher"), MB_TOPMOST | MB_YESNO | MB_ICONQUESTION) == IDYES)
@@ -410,22 +410,21 @@
   WCHAR source[MAX_LINE_LENGTH];
   WCHAR tmp[MAX_LINE_LENGTH];
 
-  if (SendDlgItemMessage(hwndDlg, IDC_EXEBUTTON, BM_GETCHECK, 0, 0) == BST_CHECKED)
+  ZeroMemory(iconPath, MAX_LINE_LENGTH);
+  ZeroMemory(source, MAX_LINE_LENGTH);
+  ZeroMemory(tmp, MAX_LINE_LENGTH);
+
+  if (GetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath, MAX_LINE_LENGTH) != 0)
     {
-      GetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath, MAX_LINE_LENGTH);
-      if (wcslen(iconPath) != 0)
-        {
-          token = wcstok(iconPath, TEXT(","));
-          if (token != NULL)
-            wcscpy(iconPath, token);
-        }
-      else
-        {
-          GetDlgItemText(hwndDlg, IDC_COMMAND, iconPath, MAX_LINE_LENGTH);
-          ELParseCommand(iconPath, source, tmp);
-          wcscpy(iconPath, source);
-        }
+      token = wcstok(iconPath, TEXT(","));
+      if (token != NULL)
+        wcscpy(iconPath, token);
     }
+  else if (GetDlgItemText(hwndDlg, IDC_COMMAND, iconPath, MAX_LINE_LENGTH) != 0)
+    {
+      ELParseCommand(iconPath, source, tmp);
+      wcscpy(iconPath, source);
+    }
 
   if (EGGetIconDialogue(hwndDlg, iconPath))
     SetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath);
@@ -459,6 +458,7 @@
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopMenuEditor"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor"));
   SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreShellChanger"));
+  SendMessage(internalWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Separator"));
 }
 
 bool Config::DoExeCom(HWND hwndDlg, bool exeButton)
@@ -474,23 +474,23 @@
     return false;
 
   if (exeButton)
-  {
-    SendMessage(internalWnd, CB_SETCURSEL, (WPARAM)-1, 0);
-    EnableWindow(internalWnd, false);
-    EnableWindow(browseWnd, true);
-    EnableWindow(commandWnd, true);
-    EnableWindow(browseWorkingDirWnd, true);
-    EnableWindow(workingDirWnd, true);
-  }
+    {
+      SendMessage(internalWnd, CB_SETCURSEL, (WPARAM)-1, 0);
+      EnableWindow(internalWnd, false);
+      EnableWindow(browseWnd, true);
+      EnableWindow(commandWnd, true);
+      EnableWindow(browseWorkingDirWnd, true);
+      EnableWindow(workingDirWnd, true);
+    }
   else
-  {
-    SetDlgItemText(hwndDlg, IDC_COMMAND, TEXT(""));
-    EnableWindow(internalWnd, true);
-    EnableWindow(browseWnd, false);
-    EnableWindow(commandWnd, false);
-    EnableWindow(browseWorkingDirWnd, false);
-    EnableWindow(workingDirWnd, false);
-  }
+    {
+      SetDlgItemText(hwndDlg, IDC_COMMAND, TEXT(""));
+      EnableWindow(internalWnd, true);
+      EnableWindow(browseWnd, false);
+      EnableWindow(commandWnd, false);
+      EnableWindow(browseWorkingDirWnd, false);
+      EnableWindow(workingDirWnd, false);
+    }
 
   return true;
 }
@@ -769,7 +769,7 @@
   if (ListView_GetSelectedCount(listWnd) > 1)
     {
       MessageBox(hwndDlg, TEXT("You can only edit one item at a time."),
-        TEXT("emergeLauncher"), MB_OK | MB_TOPMOST | MB_ICONERROR);
+                 TEXT("emergeLauncher"), MB_OK | MB_TOPMOST | MB_ICONERROR);
 
       return false;
     }
@@ -1046,35 +1046,35 @@
     return TRUE;
 
   if (ListView_GetItemState(listWnd, itemIndex, LVIS_SELECTED))
-  {
-    ListView_GetItemText(listWnd, itemIndex, 0, command, MAX_LINE_LENGTH);
-    commandIndex = (int)SendMessage(internalWnd, CB_FINDSTRINGEXACT, (WPARAM)-1,
-      (LPARAM)command);
-    EnableWindow(exeButtonWnd, true);
-    EnableWindow(comButtonWnd, true);
-    if (commandIndex == CB_ERR)
     {
-      SetDlgItemText(hwndDlg, IDC_COMMAND, command);
-      SendMessage(internalWnd, CB_SETCURSEL, (WPARAM)-1, 0);
-      SendMessage(exeButtonWnd, BM_CLICK, 0, 0);
+      ListView_GetItemText(listWnd, itemIndex, 0, command, MAX_LINE_LENGTH);
+      commandIndex = (int)SendMessage(internalWnd, CB_FINDSTRINGEXACT, (WPARAM)-1,
+                                      (LPARAM)command);
+      EnableWindow(exeButtonWnd, true);
+      EnableWindow(comButtonWnd, true);
+      if (commandIndex == CB_ERR)
+        {
+          SetDlgItemText(hwndDlg, IDC_COMMAND, command);
+          SendMessage(internalWnd, CB_SETCURSEL, (WPARAM)-1, 0);
+          SendMessage(exeButtonWnd, BM_CLICK, 0, 0);
+        }
+      else
+        {
+          SetDlgItemText(hwndDlg, IDC_COMMAND, TEXT(""));
+          SendMessage(internalWnd, CB_SETCURSEL, commandIndex, 0);
+          SendMessage(comButtonWnd, BM_CLICK, 0, 0);
+        }
+      EnableWindow(exeButtonWnd, false);
+      EnableWindow(comButtonWnd, false);
+      SetFocus(listWnd);
+
+      ListView_GetItemText(listWnd, itemIndex, 1, workingDir, MAX_LINE_LENGTH);
+      SetDlgItemText(hwndDlg, IDC_WORKINGDIR, workingDir);
+      ListView_GetItemText(listWnd, itemIndex, 2, iconPath, MAX_LINE_LENGTH);
+      SetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath);
+      ListView_GetItemText(listWnd, itemIndex, 3, tip, MAX_LINE_LENGTH);
+      SetDlgItemText(hwndDlg, IDC_TIP, tip);
     }
-    else
-    {
-      SetDlgItemText(hwndDlg, IDC_COMMAND, TEXT(""));
-      SendMessage(internalWnd, CB_SETCURSEL, commandIndex, 0);
-      SendMessage(comButtonWnd, BM_CLICK, 0, 0);
-    }
-    EnableWindow(exeButtonWnd, false);
-    EnableWindow(comButtonWnd, false);
-    SetFocus(listWnd);
 
-    ListView_GetItemText(listWnd, itemIndex, 1, workingDir, MAX_LINE_LENGTH);
-    SetDlgItemText(hwndDlg, IDC_WORKINGDIR, workingDir);
-    ListView_GetItemText(listWnd, itemIndex, 2, iconPath, MAX_LINE_LENGTH);
-    SetDlgItemText(hwndDlg, IDC_ICONPATH, iconPath);
-    ListView_GetItemText(listWnd, itemIndex, 3, tip, MAX_LINE_LENGTH);
-    SetDlgItemText(hwndDlg, IDC_TIP, tip);
-  }
-
   return TRUE;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1421] trunk/Source

From: <ir0nh34d@us...> - 2007-09-19 14:17

Revision: 1421
          http://emerge.svn.sourceforge.net/emerge/?rev=1421&view=rev
Author:   ir0nh34d
Date:     2007-09-19 07:17:36 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Updated to GPL V3

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeAppletEngine/resource.h
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeCommand/AppletMenu.cpp
    trunk/Source/emergeCommand/AppletMenu.h
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeCommand/Command.h
    trunk/Source/emergeCommand/Config.cpp
    trunk/Source/emergeCommand/Config.h
    trunk/Source/emergeCommand/CustomSource.cpp
    trunk/Source/emergeCommand/CustomSource.h
    trunk/Source/emergeCommand/Settings.cpp
    trunk/Source/emergeCommand/Settings.h
    trunk/Source/emergeCommand/emergeCommand.exe.manifest
    trunk/Source/emergeCommand/emergeCommand.rc
    trunk/Source/emergeCommand/main.cpp
    trunk/Source/emergeCommand/resource.h
    trunk/Source/emergeCore/Core.cpp
    trunk/Source/emergeCore/Core.h
    trunk/Source/emergeCore/DDEService.cpp
    trunk/Source/emergeCore/DDEService.h
    trunk/Source/emergeCore/DDEWorker.cpp
    trunk/Source/emergeCore/DDEWorker.h
    trunk/Source/emergeCore/LaunchEditor.cpp
    trunk/Source/emergeCore/LaunchEditor.h
    trunk/Source/emergeCore/MessageControl.cpp
    trunk/Source/emergeCore/MessageControl.h
    trunk/Source/emergeCore/Shell.cpp
    trunk/Source/emergeCore/Shell.h
    trunk/Source/emergeCore/ShellChanger.cpp
    trunk/Source/emergeCore/ShellChanger.h
    trunk/Source/emergeCore/emergeCore.exe.manifest
    trunk/Source/emergeCore/emergeCore.rc
    trunk/Source/emergeCore/main.cpp
    trunk/Source/emergeCore/resource.h
    trunk/Source/emergeDesktop/Config.cpp
    trunk/Source/emergeDesktop/Config.h
    trunk/Source/emergeDesktop/Desktop.cpp
    trunk/Source/emergeDesktop/Desktop.h
    trunk/Source/emergeDesktop/MenuEditor.cpp
    trunk/Source/emergeDesktop/MenuEditor.h
    trunk/Source/emergeDesktop/MenuItem.cpp
    trunk/Source/emergeDesktop/MenuItem.h
    trunk/Source/emergeDesktop/MenuListItem.cpp
    trunk/Source/emergeDesktop/MenuListItem.h
    trunk/Source/emergeDesktop/Settings.cpp
    trunk/Source/emergeDesktop/Settings.h
    trunk/Source/emergeDesktop/emergeDesktop.exe.manifest
    trunk/Source/emergeDesktop/emergeDesktop.rc
    trunk/Source/emergeDesktop/main.cpp
    trunk/Source/emergeDesktop/resource.h
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeGraphics/emergeGraphics.rc
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeGraphics/resource.h
    trunk/Source/emergeHotkeys/Actions.cpp
    trunk/Source/emergeHotkeys/Actions.h
    trunk/Source/emergeHotkeys/Applet.cpp
    trunk/Source/emergeHotkeys/Applet.h
    trunk/Source/emergeHotkeys/HotkeyCombo.cpp
    trunk/Source/emergeHotkeys/HotkeyCombo.h
    trunk/Source/emergeHotkeys/Settings.cpp
    trunk/Source/emergeHotkeys/Settings.h
    trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest
    trunk/Source/emergeHotkeys/emergeHotkeys.rc
    trunk/Source/emergeHotkeys/main.cpp
    trunk/Source/emergeHotkeys/resource.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeLauncher/AppletMenu.cpp
    trunk/Source/emergeLauncher/AppletMenu.h
    trunk/Source/emergeLauncher/Config.cpp
    trunk/Source/emergeLauncher/Config.h
    trunk/Source/emergeLauncher/Item.cpp
    trunk/Source/emergeLauncher/Item.h
    trunk/Source/emergeLauncher/Settings.cpp
    trunk/Source/emergeLauncher/Settings.h
    trunk/Source/emergeLauncher/emergeLauncher.exe.manifest
    trunk/Source/emergeLauncher/emergeLauncher.rc
    trunk/Source/emergeLauncher/main.cpp
    trunk/Source/emergeLauncher/resource.h
    trunk/Source/emergeLib/Shutdown.cpp
    trunk/Source/emergeLib/Shutdown.h
    trunk/Source/emergeLib/emergeLib.dll.manifest
    trunk/Source/emergeLib/emergeLib.h
    trunk/Source/emergeLib/emergeLib.rc
    trunk/Source/emergeLib/main.cpp
    trunk/Source/emergeLib/resource.h
    trunk/Source/emergeSchemeEngine/BImage.cpp
    trunk/Source/emergeSchemeEngine/BImage.h
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/SchemeEditor.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeSchemeEngine/resource.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTasks/AppletMenu.cpp
    trunk/Source/emergeTasks/AppletMenu.h
    trunk/Source/emergeTasks/Config.cpp
    trunk/Source/emergeTasks/Config.h
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTasks/Task.cpp
    trunk/Source/emergeTasks/Task.h
    trunk/Source/emergeTasks/emergeTasks.exe.manifest
    trunk/Source/emergeTasks/emergeTasks.rc
    trunk/Source/emergeTasks/main.cpp
    trunk/Source/emergeTasks/resource.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeTray/AppletMenu.cpp
    trunk/Source/emergeTray/AppletMenu.h
    trunk/Source/emergeTray/Config.cpp
    trunk/Source/emergeTray/Config.h
    trunk/Source/emergeTray/Settings.cpp
    trunk/Source/emergeTray/Settings.h
    trunk/Source/emergeTray/TrayIcon.cpp
    trunk/Source/emergeTray/TrayIcon.h
    trunk/Source/emergeTray/emergeTray.exe.manifest
    trunk/Source/emergeTray/emergeTray.rc
    trunk/Source/emergeTray/main.cpp
    trunk/Source/emergeTray/resource.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h
    trunk/Source/emergeVWM/AppletMenu.cpp
    trunk/Source/emergeVWM/AppletMenu.h
    trunk/Source/emergeVWM/Config.cpp
    trunk/Source/emergeVWM/Config.h
    trunk/Source/emergeVWM/Settings.cpp
    trunk/Source/emergeVWM/Settings.h
    trunk/Source/emergeVWM/Task.cpp
    trunk/Source/emergeVWM/Task.h
    trunk/Source/emergeVWM/emergeVWM.exe.manifest
    trunk/Source/emergeVWM/emergeVWM.rc
    trunk/Source/emergeVWM/main.cpp
    trunk/Source/emergeVWM/resource.h

Removed Paths:
-------------
    trunk/Source/emergeCommand/License.txt
    trunk/Source/emergeCore/License.txt
    trunk/Source/emergeDesktop/License.txt
    trunk/Source/emergeHotkeys/License.txt
    trunk/Source/emergeLauncher/License.txt
    trunk/Source/emergeLib/License.txt
    trunk/Source/emergeScreenTasks/License.txt
    trunk/Source/emergeTasks/License.txt
    trunk/Source/emergeTray/License.txt
    trunk/Source/emergeVWM/License.txt

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,86 +1,84 @@
-//-----
-//
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-//-----
-
-#ifndef __EMERGEAPPLETENGINE_H
-#define __EMERGEAPPLETENGINE_H
-
-#ifdef EMERGEAPPLETENGINE_EXPORTS
-#undef DLL_EXPORT
-#define DLL_EXPORT  __declspec(dllexport)
-#else
-#ifndef DLL_EXPORT
-#define DLL_EXPORT  __declspec(dllimport)
-#endif
-#endif
-
-#ifndef TIP_SIZE
-#define TIP_SIZE 256
-#endif
-
-#define UNICODE 1
-#include <windows.h>
-
-#define ASI_VERTICAL    1
-#define ASI_HORIZONTAL  2
-#define ASI_LEFT        10
-#define ASI_RIGHT       11
-#define ASI_UP          12
-#define ASI_DOWN        13
-
-typedef struct _COMMONSETTINGS
-  {
-    int x;
-    int y;
-    int height;
-    int width;
-  }
-COMMONSETTINGS, *LPCOMMONSETTINGS;
-
-typedef struct _AUTOSIZEINFO
-  {
-    HWND hwnd;
-    RECT *rect;
-    int dragBorder;
-    UINT visibleIconCount;
-    UINT iconSize;
-    UINT iconSpacing;
-    UINT orientation;
-    UINT verticalDirection;
-    UINT horizontalDirection;
-  }
-AUTOSIZEINFO, *LPAUTOSIZEINFO;
-
-// Declaration of functions to import
-#ifdef __cplusplus
-extern "C"
-  {
-#endif
-    DLL_EXPORT LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y);
-    DLL_EXPORT HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition);
-    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc);
-    DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
-    DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);
-    DLL_EXPORT LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *wndRect, RECT *oldDeskRect);
-#ifdef __cplusplus
-  }
-#endif
-
-#endif
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#ifndef __EMERGEAPPLETENGINE_H
+#define __EMERGEAPPLETENGINE_H
+
+#ifdef EMERGEAPPLETENGINE_EXPORTS
+#undef DLL_EXPORT
+#define DLL_EXPORT  __declspec(dllexport)
+#else
+#ifndef DLL_EXPORT
+#define DLL_EXPORT  __declspec(dllimport)
+#endif
+#endif
+
+#ifndef TIP_SIZE
+#define TIP_SIZE 256
+#endif
+
+#define UNICODE 1
+#include <windows.h>
+
+#define ASI_VERTICAL    1
+#define ASI_HORIZONTAL  2
+#define ASI_LEFT        10
+#define ASI_RIGHT       11
+#define ASI_UP          12
+#define ASI_DOWN        13
+
+typedef struct _COMMONSETTINGS
+  {
+    int x;
+    int y;
+    int height;
+    int width;
+  }
+COMMONSETTINGS, *LPCOMMONSETTINGS;
+
+typedef struct _AUTOSIZEINFO
+  {
+    HWND hwnd;
+    RECT *rect;
+    int dragBorder;
+    UINT visibleIconCount;
+    UINT iconSize;
+    UINT iconSpacing;
+    UINT orientation;
+    UINT verticalDirection;
+    UINT horizontalDirection;
+  }
+AUTOSIZEINFO, *LPAUTOSIZEINFO;
+
+// Declaration of functions to import
+#ifdef __cplusplus
+extern "C"
+  {
+#endif
+    DLL_EXPORT LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y);
+    DLL_EXPORT HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition);
+    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc);
+    DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
+    DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);
+    DLL_EXPORT LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *wndRect, RECT *oldDeskRect);
+#ifdef __cplusplus
+  }
+#endif
+
+#endif

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,35 +1,54 @@
-#include "resource.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,0,0
- PRODUCTVERSION 4,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004B0"
-        BEGIN
-            VALUE "CompanyName", "The Emerge Desktop Development Team\0"
-            VALUE "FileDescription", "emergeAppletEngine - Emerge Desktop application library\0"
-            VALUE "FileVersion", "4.0\0"
-            VALUE "InternalName", "emergeAppletEngine\0"
-            VALUE "LegalCopyright", "Copyright (C) 2006\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "emergeAppletEngine.dll\0"
-            VALUE "ProductName", "emergeAppletEngine\0"
-            VALUE "ProductVersion", "4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x410, 1200
-    END
-END
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include "resource.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004B0"
+        BEGIN
+            VALUE "CompanyName", "The Emerge Desktop Development Team\0"
+            VALUE "FileDescription", "emergeAppletEngine - Emerge Desktop application library\0"
+            VALUE "FileVersion", "4.0\0"
+            VALUE "InternalName", "emergeAppletEngine\0"
+            VALUE "LegalCopyright", "Copyright (C) 2006\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "emergeAppletEngine.dll\0"
+            VALUE "ProductName", "emergeAppletEngine\0"
+            VALUE "ProductVersion", "4.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x410, 1200
+    END
+END

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,273 +1,271 @@
-//-----
-//
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-//-----
-
-#undef _WIN32_IE
-#define _WIN32_IE 0x0501
-
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-
-#undef WINVER
-#define WINVER 0x0501
-
-#include "emergeAppletEngine.h"
-#include <stdio.h>
-#include "../emergeLib/emergeLib.h"
-
-// Global definitions
-WCHAR appletClass[ ] = TEXT("EmergeDesktopApplet");
-
-//------
-// Function:    EAEHitTest
-// Requires:    HWND hwnd - window handle
-//              int x - x co-ordinate of mouse
-//              int y - y co-ordinate of mouse
-// Returns:     LRESULT
-// Purpose:     Determine the mouse pointer type for the hit test
-//-----
-LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y)
-{
-  RECT r;
-  GetWindowRect(hwnd, &r);
-  int dragBorder = guiBorder;
-
-  if (dragBorder <= 0)
-    dragBorder = 1;
-
-  if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
-    return HTCAPTION;
-  else if ((GetAsyncKeyState(VK_MENU) & 0x8000) &&
-           !autoSize)
-    {
-      if (x < (r.left + dragBorder) && y < (r.top + dragBorder))
-        return HTTOPLEFT;
-      else if (x < (r.left + dragBorder) && y > ((r.bottom - 1) - dragBorder))
-        return HTBOTTOMLEFT;
-      else if (x < (r.left + dragBorder))
-        return HTLEFT;
-      else if (x > ((r.right - 1) - dragBorder) && y < (r.top + dragBorder))
-        return HTTOPRIGHT;
-      else if (x > ((r.right - 1) - dragBorder) && y > ((r.bottom - 1) - dragBorder))
-        return HTBOTTOMRIGHT;
-      else if (x > ((r.right - 1) - dragBorder))
-        return HTRIGHT;
-      else if (y < (r.top + dragBorder))
-        return HTTOP;
-      else if (y > ((r.bottom - 1) - dragBorder))
-        return HTBOTTOM;
-    }
-
-  return HTCLIENT;
-}
-
-//------
-// Function:    EAEUpdateGUI
-// Requires:    HWND hwnd - window handle
-//              bool shadow - window shadow indicator
-//              WCHAR *zposition - z-order setting for window
-// Returns:     bool
-// Purpose:     Set the window shadow and z-order
-//-----
-HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition)
-{
-  if (ELVersionInfo() != ELVI_2K)
-    {
-      if (shadow)
-        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
-      else
-        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) & ~CS_DROPSHADOW);
-    }
-
-  // Set window z-order
-  if (_wcsicmp(zposition, TEXT("top")) == 0)
-    return HWND_TOPMOST;
-  else if (_wcsicmp(zposition, TEXT("bottom")) == 0)
-    return HWND_BOTTOM;
-
-  return HWND_NOTOPMOST;
-}
-
-HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
-{
-  WNDCLASSEX wcx;
-  HWND appletWindow;
-
-  ZeroMemory(&wcx, sizeof(WNDCLASSEX));
-
-  // Register the window class
-  wcx.hInstance = appletInstance;
-  wcx.lpszClassName = appletClass;
-  wcx.lpfnWndProc = windowProcedure;
-  wcx.cbSize = sizeof (WNDCLASSEX);
-  wcx.style = CS_DBLCLKS;
-  wcx.hIcon = LoadIcon (NULL, IDI_APPLICATION);
-  wcx.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
-  wcx.hCursor = LoadCursor (NULL, IDC_ARROW);
-
-  // Register the window class, and if it fails quit the program
-  if (!RegisterClassEx (&wcx))
-    return NULL;
-
-  // The class is registered, let's create the window
-  appletWindow = CreateWindowEx (
-                   WS_EX_TOOLWINDOW | WS_EX_LAYERED,
-                   appletClass,
-                   NULL,
-                   WS_POPUP,
-                   0, 0,
-                   0, 0,
-                   NULL,
-                   NULL,
-                   appletInstance,
-                   NULL
-                 );
-
-  return appletWindow;
-}
-
-LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *appletRect, RECT *oldDeskRect)
-{
-  RECT deskRect;
-  int leftDelta, rightDelta, midDelta;
-  int topDelta, bottomDelta, centreDelta;
-  int newX, newY;
-  int width, height;
-  int middle, centre;
-  MONITORINFO appletMonitorInfo;
-  appletMonitorInfo.cbSize = sizeof(MONITORINFO);
-
-  if (!GetMonitorInfo(appletMonitor, &appletMonitorInfo))
-    ELGetDesktopRect(appletRect, &deskRect);
-  else
-    CopyRect(&deskRect, &appletMonitorInfo.rcMonitor);
-
-  width = appletRect->right - appletRect->left;
-  height = appletRect->bottom - appletRect->top;
-  middle = appletRect->left + (width / 2);
-  centre = appletRect->top + (height / 2);
-
-  if (!EqualRect(&deskRect, oldDeskRect))
-    {
-      // Horizontal Positioning
-      leftDelta = appletRect->left - oldDeskRect->left;
-      rightDelta = oldDeskRect->right - appletRect->right;
-      midDelta = ELMid(oldDeskRect->right, oldDeskRect->left) - middle;
-
-      if ((abs(midDelta) < abs(leftDelta)) && (abs(midDelta) < abs(rightDelta)))
-        newX = ELMid(deskRect.right, deskRect.left) - midDelta - (width / 2);
-      else if (abs(rightDelta) < abs(leftDelta))
-        newX = deskRect.right - rightDelta - width;
-      else
-        newX = deskRect.left + leftDelta;
-
-      // Vertical Positioning
-      topDelta = appletRect->top - oldDeskRect->top;
-      bottomDelta = oldDeskRect->bottom - appletRect->bottom;
-      centreDelta = ELMid(oldDeskRect->bottom, oldDeskRect->top) - centre;
-
-      if ((abs(centreDelta) < abs(topDelta)) && (abs(centreDelta) < abs(bottomDelta)))
-        newY = ELMid(deskRect.bottom, deskRect.top) - centreDelta - (height / 2);
-      else if (abs(bottomDelta) < abs(topDelta))
-        newY = deskRect.bottom - bottomDelta - height;
-      else
-        newY = deskRect.top + topDelta;
-
-      appletRect->left = newX;
-      appletRect->right = appletRect->left + width;
-      appletRect->top = newY;
-      appletRect->bottom = appletRect->top + height;
-    }
-
-  return 0;
-}
-
-bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo)
-{
-  UINT width, height;
-
-  if (autoSizeInfo.orientation == ASI_VERTICAL)
-    {
-      height = (2 * autoSizeInfo.dragBorder) +
-        (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSpacing) +
-        (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSize);
-      if (autoSizeInfo.visibleIconCount > 0)
-        height -= autoSizeInfo.iconSpacing;
-
-      width = autoSizeInfo.iconSize + (2 * autoSizeInfo.dragBorder);
-    }
-  else
-    {
-      width = (2 * autoSizeInfo.dragBorder) + (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSpacing) +
-              (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSize);
-      if (autoSizeInfo.visibleIconCount > 0)
-        width -= autoSizeInfo.iconSpacing;
-
-      height = autoSizeInfo.iconSize + (2 * autoSizeInfo.dragBorder);
-    }
-
-  if (autoSizeInfo.verticalDirection == ASI_UP)
-    autoSizeInfo.rect->top -= height;
-
-  if (autoSizeInfo.horizontalDirection == ASI_LEFT)
-    autoSizeInfo.rect->left -= width;
-
-  autoSizeInfo.rect->right = autoSizeInfo.rect->left + width;
-  autoSizeInfo.rect->bottom = autoSizeInfo.rect->top + height;
-
-  return true;
-}
-
-HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance)
-{
-  HWND tooltipWindow = NULL;
-
-  // Initialize common controls for the tooltip
-  INITCOMMONCONTROLSEX ic;
-  ic.dwSize = sizeof(INITCOMMONCONTROLSEX);
-  ic.dwICC = ICC_BAR_CLASSES;
-
-  if (!InitCommonControlsEx(&ic))
-    return NULL;
-
-  // Create the tooltip window
-  tooltipWindow = CreateWindowEx(
-                    0,
-                    TOOLTIPS_CLASS,
-                    NULL,
-                    TTS_ALWAYSTIP | WS_POPUP | TTS_NOPREFIX,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    NULL,
-                    NULL,
-                    appletInstance,
-                    NULL
-                  );
-
-  // If the tooltip window was created successfully, extend it for 2K/XP icon tips
-  if (tooltipWindow)
-    {
-      SetWindowPos(tooltipWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
-      SendMessage(tooltipWindow, TTM_SETMAXTIPWIDTH, 0, TIP_SIZE);
-    }
-
-  return tooltipWindow;
-}
-
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#undef _WIN32_IE
+#define _WIN32_IE 0x0501
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+
+#undef WINVER
+#define WINVER 0x0501
+
+#include "emergeAppletEngine.h"
+#include <stdio.h>
+#include "../emergeLib/emergeLib.h"
+
+// Global definitions
+WCHAR appletClass[ ] = TEXT("EmergeDesktopApplet");
+
+//------
+// Function:    EAEHitTest
+// Requires:    HWND hwnd - window handle
+//              int x - x co-ordinate of mouse
+//              int y - y co-ordinate of mouse
+// Returns:     LRESULT
+// Purpose:     Determine the mouse pointer type for the hit test
+//-----
+LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y)
+{
+  RECT r;
+  GetWindowRect(hwnd, &r);
+  int dragBorder = guiBorder;
+
+  if (dragBorder <= 0)
+    dragBorder = 1;
+
+  if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
+    return HTCAPTION;
+  else if ((GetAsyncKeyState(VK_MENU) & 0x8000) &&
+           !autoSize)
+    {
+      if (x < (r.left + dragBorder) && y < (r.top + dragBorder))
+        return HTTOPLEFT;
+      else if (x < (r.left + dragBorder) && y > ((r.bottom - 1) - dragBorder))
+        return HTBOTTOMLEFT;
+      else if (x < (r.left + dragBorder))
+        return HTLEFT;
+      else if (x > ((r.right - 1) - dragBorder) && y < (r.top + dragBorder))
+        return HTTOPRIGHT;
+      else if (x > ((r.right - 1) - dragBorder) && y > ((r.bottom - 1) - dragBorder))
+        return HTBOTTOMRIGHT;
+      else if (x > ((r.right - 1) - dragBorder))
+        return HTRIGHT;
+      else if (y < (r.top + dragBorder))
+        return HTTOP;
+      else if (y > ((r.bottom - 1) - dragBorder))
+        return HTBOTTOM;
+    }
+
+  return HTCLIENT;
+}
+
+//------
+// Function:    EAEUpdateGUI
+// Requires:    HWND hwnd - window handle
+//              bool shadow - window shadow indicator
+//              WCHAR *zposition - z-order setting for window
+// Returns:     bool
+// Purpose:     Set the window shadow and z-order
+//-----
+HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition)
+{
+  if (ELVersionInfo() != ELVI_2K)
+    {
+      if (shadow)
+        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
+      else
+        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) & ~CS_DROPSHADOW);
+    }
+
+  // Set window z-order
+  if (_wcsicmp(zposition, TEXT("top")) == 0)
+    return HWND_TOPMOST;
+  else if (_wcsicmp(zposition, TEXT("bottom")) == 0)
+    return HWND_BOTTOM;
+
+  return HWND_NOTOPMOST;
+}
+
+HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
+{
+  WNDCLASSEX wcx;
+  HWND appletWindow;
+
+  ZeroMemory(&wcx, sizeof(WNDCLASSEX));
+
+  // Register the window class
+  wcx.hInstance = appletInstance;
+  wcx.lpszClassName = appletClass;
+  wcx.lpfnWndProc = windowProcedure;
+  wcx.cbSize = sizeof (WNDCLASSEX);
+  wcx.style = CS_DBLCLKS;
+  wcx.hIcon = LoadIcon (NULL, IDI_APPLICATION);
+  wcx.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
+  wcx.hCursor = LoadCursor (NULL, IDC_ARROW);
+
+  // Register the window class, and if it fails quit the program
+  if (!RegisterClassEx (&wcx))
+    return NULL;
+
+  // The class is registered, let's create the window
+  appletWindow = CreateWindowEx (
+                   WS_EX_TOOLWINDOW | WS_EX_LAYERED,
+                   appletClass,
+                   NULL,
+                   WS_POPUP,
+                   0, 0,
+                   0, 0,
+                   NULL,
+                   NULL,
+                   appletInstance,
+                   NULL
+                 );
+
+  return appletWindow;
+}
+
+LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *appletRect, RECT *oldDeskRect)
+{
+  RECT deskRect;
+  int leftDelta, rightDelta, midDelta;
+  int topDelta, bottomDelta, centreDelta;
+  int newX, newY;
+  int width, height;
+  int middle, centre;
+  MONITORINFO appletMonitorInfo;
+  appletMonitorInfo.cbSize = sizeof(MONITORINFO);
+
+  if (!GetMonitorInfo(appletMonitor, &appletMonitorInfo))
+    ELGetDesktopRect(appletRect, &deskRect);
+  else
+    CopyRect(&deskRect, &appletMonitorInfo.rcMonitor);
+
+  width = appletRect->right - appletRect->left;
+  height = appletRect->bottom - appletRect->top;
+  middle = appletRect->left + (width / 2);
+  centre = appletRect->top + (height / 2);
+
+  if (!EqualRect(&deskRect, oldDeskRect))
+    {
+      // Horizontal Positioning
+      leftDelta = appletRect->left - oldDeskRect->left;
+      rightDelta = oldDeskRect->right - appletRect->right;
+      midDelta = ELMid(oldDeskRect->right, oldDeskRect->left) - middle;
+
+      if ((abs(midDelta) < abs(leftDelta)) && (abs(midDelta) < abs(rightDelta)))
+        newX = ELMid(deskRect.right, deskRect.left) - midDelta - (width / 2);
+      else if (abs(rightDelta) < abs(leftDelta))
+        newX = deskRect.right - rightDelta - width;
+      else
+        newX = deskRect.left + leftDelta;
+
+      // Vertical Positioning
+      topDelta = appletRect->top - oldDeskRect->top;
+      bottomDelta = oldDeskRect->bottom - appletRect->bottom;
+      centreDelta = ELMid(oldDeskRect->bottom, oldDeskRect->top) - centre;
+
+      if ((abs(centreDelta) < abs(topDelta)) && (abs(centreDelta) < abs(bottomDelta)))
+        newY = ELMid(deskRect.bottom, deskRect.top) - centreDelta - (height / 2);
+      else if (abs(bottomDelta) < abs(topDelta))
+        newY = deskRect.bottom - bottomDelta - height;
+      else
+        newY = deskRect.top + topDelta;
+
+      appletRect->left = newX;
+      appletRect->right = appletRect->left + width;
+      appletRect->top = newY;
+      appletRect->bottom = appletRect->top + height;
+    }
+
+  return 0;
+}
+
+bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo)
+{
+  UINT width, height;
+
+  if (autoSizeInfo.orientation == ASI_VERTICAL)
+    {
+      height = (2 * autoSizeInfo.dragBorder) +
+        (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSpacing) +
+        (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSize);
+      if (autoSizeInfo.visibleIconCount > 0)
+        height -= autoSizeInfo.iconSpacing;
+
+      width = autoSizeInfo.iconSize + (2 * autoSizeInfo.dragBorder);
+    }
+  else
+    {
+      width = (2 * autoSizeInfo.dragBorder) + (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSpacing) +
+              (autoSizeInfo.visibleIconCount * autoSizeInfo.iconSize);
+      if (autoSizeInfo.visibleIconCount > 0)
+        width -= autoSizeInfo.iconSpacing;
+
+      height = autoSizeInfo.iconSize + (2 * autoSizeInfo.dragBorder);
+    }
+
+  if (autoSizeInfo.verticalDirection == ASI_UP)
+    autoSizeInfo.rect->top -= height;
+
+  if (autoSizeInfo.horizontalDirection == ASI_LEFT)
+    autoSizeInfo.rect->left -= width;
+
+  autoSizeInfo.rect->right = autoSizeInfo.rect->left + width;
+  autoSizeInfo.rect->bottom = autoSizeInfo.rect->top + height;
+
+  return true;
+}
+
+HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance)
+{
+  HWND tooltipWindow = NULL;
+
+  // Initialize common controls for the tooltip
+  INITCOMMONCONTROLSEX ic;
+  ic.dwSize = sizeof(INITCOMMONCONTROLSEX);
+  ic.dwICC = ICC_BAR_CLASSES;
+
+  if (!InitCommonControlsEx(&ic))
+    return NULL;
+
+  // Create the tooltip window
+  tooltipWindow = CreateWindowEx(
+                    0,
+                    TOOLTIPS_CLASS,
+                    NULL,
+                    TTS_ALWAYSTIP | WS_POPUP | TTS_NOPREFIX,
+                    CW_USEDEFAULT, CW_USEDEFAULT,
+                    CW_USEDEFAULT, CW_USEDEFAULT,
+                    NULL,
+                    NULL,
+                    appletInstance,
+                    NULL
+                  );
+
+  // If the tooltip window was created successfully, extend it for 2K/XP icon tips
+  if (tooltipWindow)
+    {
+      SetWindowPos(tooltipWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+      SendMessage(tooltipWindow, TTM_SETMAXTIPWIDTH, 0, TIP_SIZE);
+    }
+
+  return tooltipWindow;
+}
+

Modified: trunk/Source/emergeAppletEngine/resource.h
===================================================================
--- trunk/Source/emergeAppletEngine/resource.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeAppletEngine/resource.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1 +1,20 @@
-#include <winver.h>
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include <winver.h>

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,34 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
-//
-// Note:
-//
-// The LoadSSO and UnloadSSO code are from TrayManager.cpp which is part
-// of the LiteStep code base.  Original inspiration for the icon handling code
-// was curtousy of the GeoShell TrayService code.
-//
-// Many thanx go to Jaykul (of GeoShell fame) and Message (of LiteStep fame)
-// for helping wrap my head around Windows deals with the systray.
-//
-//-----
+//---
 
 #include "Applet.h"
 

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Applet.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __APPLET_H
 #define __APPLET_H

Modified: trunk/Source/emergeCommand/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/AppletMenu.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "Applet.h"
 

Modified: trunk/Source/emergeCommand/AppletMenu.h
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/AppletMenu.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __APPLETMENU_H
 #define __APPLETMENU_H

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Command.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note:  Many, many thanx go to fangr for providing the initial release
 // of emergeCommand.

Modified: trunk/Source/emergeCommand/Command.h
===================================================================
--- trunk/Source/emergeCommand/Command.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Command.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __COMMAND_H
 #define __COMMAND_H

Modified: trunk/Source/emergeCommand/Config.cpp
===================================================================
--- trunk/Source/emergeCommand/Config.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Config.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "Config.h"
 

Modified: trunk/Source/emergeCommand/Config.h
===================================================================
--- trunk/Source/emergeCommand/Config.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Config.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __CONFIG_H
 #define __CONFIG_H

Modified: trunk/Source/emergeCommand/CustomSource.cpp
===================================================================
--- trunk/Source/emergeCommand/CustomSource.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/CustomSource.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "../emergeLib/emergeLib.h"
 #include "CustomSource.h"

Modified: trunk/Source/emergeCommand/CustomSource.h
===================================================================
--- trunk/Source/emergeCommand/CustomSource.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/CustomSource.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: The CustomSource class is based on CCustomAutoComplete by Klaus H. Probst
 // which is copyright 2002.

Deleted: trunk/Source/emergeCommand/License.txt
===================================================================
--- trunk/Source/emergeCommand/License.txt	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/License.txt	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,63 +0,0 @@
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-    * a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
-    * b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
-    * c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-    * a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-    * b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-    * c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

Modified: trunk/Source/emergeCommand/Settings.cpp
===================================================================
--- trunk/Source/emergeCommand/Settings.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Settings.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "Settings.h"
 

Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/Settings.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __SETTINGS_H
 #define __SETTINGS_H

Modified: trunk/Source/emergeCommand/emergeCommand.exe.manifest
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,3 +1,22 @@
+<!--
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+-->
+
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

Modified: trunk/Source/emergeCommand/emergeCommand.rc
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.rc	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/emergeCommand.rc	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,3 +1,22 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO

Modified: trunk/Source/emergeCommand/main.cpp
===================================================================
--- trunk/Source/emergeCommand/main.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/main.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "Applet.h"
 

Modified: trunk/Source/emergeCommand/resource.h
===================================================================
--- trunk/Source/emergeCommand/resource.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCommand/resource.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,3 +1,22 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
 #include <winver.h>
 #include <winuser.h>
 

Modified: trunk/Source/emergeCore/Core.cpp
===================================================================
--- trunk/Source/emergeCore/Core.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/Core.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,25 +1,24 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
-//  Note: The SetShellWindow is Copyright 2005 Martin Fuchs (taken from ROS Explorer)
+//  Note: The SetShellWindow was inspired by ROS Explorer which is Copyright
+//  2005 Martin Fuchs
 //
 //-----
 

Modified: trunk/Source/emergeCore/Core.h
===================================================================
--- trunk/Source/emergeCore/Core.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/Core.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __CORE_H
 #define __CORE_H

Modified: trunk/Source/emergeCore/DDEService.cpp
===================================================================
--- trunk/Source/emergeCore/DDEService.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/DDEService.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: This file is based on DDEService class component of the LiteStep shell.
 //

Modified: trunk/Source/emergeCore/DDEService.h
===================================================================
--- trunk/Source/emergeCore/DDEService.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/DDEService.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: This file is based on DDEService class component of the LiteStep shell.
 //

Modified: trunk/Source/emergeCore/DDEWorker.cpp
===================================================================
--- trunk/Source/emergeCore/DDEWorker.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/DDEWorker.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: This file is based on DDEWorker class component of the LiteStep shell.
 //

Modified: trunk/Source/emergeCore/DDEWorker.h
===================================================================
--- trunk/Source/emergeCore/DDEWorker.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/DDEWorker.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: This file is based on DDEWorker class component of the LiteStep shell.
 //

Modified: trunk/Source/emergeCore/LaunchEditor.cpp
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/LaunchEditor.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #include "LaunchEditor.h"
 

Modified: trunk/Source/emergeCore/LaunchEditor.h
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/LaunchEditor.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 
 #ifndef __LAUNCHEDITOR_H
 #define __LAUNCHEDITOR_H

Deleted: trunk/Source/emergeCore/License.txt
===================================================================
--- trunk/Source/emergeCore/License.txt	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/License.txt	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,63 +0,0 @@
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-    * a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
-    * b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
-    * c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-    * a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-    * b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-    * c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

Modified: trunk/Source/emergeCore/MessageControl.cpp
===================================================================
--- trunk/Source/emergeCore/MessageControl.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/MessageControl.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: The message handling routine is based on MessageManager which is part
 // of the BB4Win source code copyright 2001-2004 - 2007 The Blackbox for Windows

Modified: trunk/Source/emergeCore/MessageControl.h
===================================================================
--- trunk/Source/emergeCore/MessageControl.h	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/MessageControl.h	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,23 +1,21 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-//-----
+//---
 //
 // Note: The message handling routine is based on MessageManager which is part
 // of the BB4Win source code copyright 2001-2004 The Blackbox for Windows

Modified: trunk/Source/emergeCore/Shell.cpp
===================================================================
--- trunk/Source/emergeCore/Shell.cpp	2007-09-17 00:11:57 UTC (rev 1420)
+++ trunk/Source/emergeCore/Shell.cpp	2007-09-19 14:17:36 UTC (rev 1421)
@@ -1,29 +1,25 @@
-//-----
+//---
 //
-// This file is part of the Emerge Desktop source code
-// Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
+//  This file is part of Emerge Desktop.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1425] trunk/Source

From: <ir0nh34d@us...> - 2007-09-19 14:42

Revision: 1425
          http://emerge.svn.sourceforge.net/emerge/?rev=1425&view=rev
Author:   ir0nh34d
Date:     2007-09-19 07:42:48 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Fix XML comments

Modified Paths:
--------------
    trunk/Source/emergeCommand/emergeCommand.exe.manifest
    trunk/Source/emergeCore/emergeCore.exe.manifest
    trunk/Source/emergeDesktop/emergeDesktop.exe.manifest
    trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest
    trunk/Source/emergeLauncher/emergeLauncher.exe.manifest
    trunk/Source/emergeLib/emergeLib.dll.manifest
    trunk/Source/emergeTasks/emergeTasks.exe.manifest
    trunk/Source/emergeTray/emergeTray.exe.manifest
    trunk/Source/emergeVWM/emergeVWM.exe.manifest

Modified: trunk/Source/emergeCommand/emergeCommand.exe.manifest
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeCore/emergeCore.exe.manifest
===================================================================
--- trunk/Source/emergeCore/emergeCore.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeCore/emergeCore.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeDesktop/emergeDesktop.exe.manifest
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeDesktop/emergeDesktop.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeLauncher/emergeLauncher.exe.manifest
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeLauncher/emergeLauncher.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeLib/emergeLib.dll.manifest
===================================================================
--- trunk/Source/emergeLib/emergeLib.dll.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeLib/emergeLib.dll.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 	<dependency>
 		<dependentAssembly>

Modified: trunk/Source/emergeTasks/emergeTasks.exe.manifest
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeTasks/emergeTasks.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeTray/emergeTray.exe.manifest
===================================================================
--- trunk/Source/emergeTray/emergeTray.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeTray/emergeTray.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>

Modified: trunk/Source/emergeVWM/emergeVWM.exe.manifest
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.exe.manifest	2007-09-19 14:42:31 UTC (rev 1424)
+++ trunk/Source/emergeVWM/emergeVWM.exe.manifest	2007-09-19 14:42:48 UTC (rev 1425)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
 //
 //  This file is part of Emerge Desktop.
@@ -17,8 +19,6 @@
 //
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <dependency>
     <dependentAssembly>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1431] trunk/Source

From: <ir0nh34d@us...> - 2007-09-27 03:27

Revision: 1431
          http://emerge.svn.sourceforge.net/emerge/?rev=1431&view=rev
Author:   ir0nh34d
Date:     2007-09-26 20:27:27 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
Fixed copyright

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeAppletEngine/resource.h
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeCommand/AppletMenu.cpp
    trunk/Source/emergeCommand/AppletMenu.h
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeCommand/Command.h
    trunk/Source/emergeCommand/Config.cpp
    trunk/Source/emergeCommand/Config.h
    trunk/Source/emergeCommand/CustomSource.cpp
    trunk/Source/emergeCommand/CustomSource.h
    trunk/Source/emergeCommand/Settings.cpp
    trunk/Source/emergeCommand/Settings.h
    trunk/Source/emergeCommand/emergeCommand.exe.manifest
    trunk/Source/emergeCommand/emergeCommand.rc
    trunk/Source/emergeCommand/main.cpp
    trunk/Source/emergeCommand/resource.h
    trunk/Source/emergeCore/Core.cpp
    trunk/Source/emergeCore/Core.h
    trunk/Source/emergeCore/DDEService.cpp
    trunk/Source/emergeCore/DDEService.h
    trunk/Source/emergeCore/DDEWorker.cpp
    trunk/Source/emergeCore/DDEWorker.h
    trunk/Source/emergeCore/LaunchEditor.cpp
    trunk/Source/emergeCore/LaunchEditor.h
    trunk/Source/emergeCore/MessageControl.cpp
    trunk/Source/emergeCore/MessageControl.h
    trunk/Source/emergeCore/Shell.cpp
    trunk/Source/emergeCore/Shell.h
    trunk/Source/emergeCore/ShellChanger.cpp
    trunk/Source/emergeCore/ShellChanger.h
    trunk/Source/emergeCore/emergeCore.exe.manifest
    trunk/Source/emergeCore/emergeCore.rc
    trunk/Source/emergeCore/main.cpp
    trunk/Source/emergeCore/resource.h
    trunk/Source/emergeDesktop/Config.cpp
    trunk/Source/emergeDesktop/Config.h
    trunk/Source/emergeDesktop/Desktop.cpp
    trunk/Source/emergeDesktop/Desktop.h
    trunk/Source/emergeDesktop/MenuEditor.cpp
    trunk/Source/emergeDesktop/MenuEditor.h
    trunk/Source/emergeDesktop/MenuItem.cpp
    trunk/Source/emergeDesktop/MenuItem.h
    trunk/Source/emergeDesktop/MenuListItem.cpp
    trunk/Source/emergeDesktop/MenuListItem.h
    trunk/Source/emergeDesktop/Settings.cpp
    trunk/Source/emergeDesktop/Settings.h
    trunk/Source/emergeDesktop/emergeDesktop.exe.manifest
    trunk/Source/emergeDesktop/emergeDesktop.rc
    trunk/Source/emergeDesktop/main.cpp
    trunk/Source/emergeDesktop/resource.h
    trunk/Source/emergeGraphics/emergeGraphics.h
    trunk/Source/emergeGraphics/emergeGraphics.rc
    trunk/Source/emergeGraphics/main.cpp
    trunk/Source/emergeGraphics/resource.h
    trunk/Source/emergeHotkeys/Actions.cpp
    trunk/Source/emergeHotkeys/Actions.h
    trunk/Source/emergeHotkeys/Applet.cpp
    trunk/Source/emergeHotkeys/Applet.h
    trunk/Source/emergeHotkeys/HotkeyCombo.cpp
    trunk/Source/emergeHotkeys/HotkeyCombo.h
    trunk/Source/emergeHotkeys/Settings.cpp
    trunk/Source/emergeHotkeys/Settings.h
    trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest
    trunk/Source/emergeHotkeys/emergeHotkeys.rc
    trunk/Source/emergeHotkeys/main.cpp
    trunk/Source/emergeHotkeys/resource.h
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeLauncher/AppletMenu.cpp
    trunk/Source/emergeLauncher/AppletMenu.h
    trunk/Source/emergeLauncher/Config.cpp
    trunk/Source/emergeLauncher/Config.h
    trunk/Source/emergeLauncher/Item.cpp
    trunk/Source/emergeLauncher/Item.h
    trunk/Source/emergeLauncher/Settings.cpp
    trunk/Source/emergeLauncher/Settings.h
    trunk/Source/emergeLauncher/emergeLauncher.exe.manifest
    trunk/Source/emergeLauncher/emergeLauncher.rc
    trunk/Source/emergeLauncher/main.cpp
    trunk/Source/emergeLauncher/resource.h
    trunk/Source/emergeLib/Shutdown.cpp
    trunk/Source/emergeLib/Shutdown.h
    trunk/Source/emergeLib/emergeLib.dll.manifest
    trunk/Source/emergeLib/emergeLib.h
    trunk/Source/emergeLib/emergeLib.rc
    trunk/Source/emergeLib/main.cpp
    trunk/Source/emergeLib/resource.h
    trunk/Source/emergeSchemeEngine/BImage.cpp
    trunk/Source/emergeSchemeEngine/BImage.h
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/SchemeEditor.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeSchemeEngine/main.cpp
    trunk/Source/emergeSchemeEngine/resource.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTasks/AppletMenu.cpp
    trunk/Source/emergeTasks/AppletMenu.h
    trunk/Source/emergeTasks/Config.cpp
    trunk/Source/emergeTasks/Config.h
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTasks/Task.cpp
    trunk/Source/emergeTasks/Task.h
    trunk/Source/emergeTasks/emergeTasks.exe.manifest
    trunk/Source/emergeTasks/emergeTasks.rc
    trunk/Source/emergeTasks/main.cpp
    trunk/Source/emergeTasks/resource.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeTray/AppletMenu.cpp
    trunk/Source/emergeTray/AppletMenu.h
    trunk/Source/emergeTray/Config.cpp
    trunk/Source/emergeTray/Config.h
    trunk/Source/emergeTray/Settings.cpp
    trunk/Source/emergeTray/Settings.h
    trunk/Source/emergeTray/TrayIcon.cpp
    trunk/Source/emergeTray/TrayIcon.h
    trunk/Source/emergeTray/emergeTray.exe.manifest
    trunk/Source/emergeTray/emergeTray.rc
    trunk/Source/emergeTray/main.cpp
    trunk/Source/emergeTray/resource.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h
    trunk/Source/emergeVWM/AppletMenu.cpp
    trunk/Source/emergeVWM/AppletMenu.h
    trunk/Source/emergeVWM/Config.cpp
    trunk/Source/emergeVWM/Config.h
    trunk/Source/emergeVWM/Settings.cpp
    trunk/Source/emergeVWM/Settings.h
    trunk/Source/emergeVWM/Task.cpp
    trunk/Source/emergeVWM/Task.h
    trunk/Source/emergeVWM/emergeVWM.exe.manifest
    trunk/Source/emergeVWM/emergeVWM.rc
    trunk/Source/emergeVWM/main.cpp
    trunk/Source/emergeVWM/resource.h

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.rc
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeAppletEngine/resource.h
===================================================================
--- trunk/Source/emergeAppletEngine/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeAppletEngine/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/AppletMenu.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/AppletMenu.h
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/AppletMenu.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Command.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Command.h
===================================================================
--- trunk/Source/emergeCommand/Command.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Command.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Config.cpp
===================================================================
--- trunk/Source/emergeCommand/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Config.h
===================================================================
--- trunk/Source/emergeCommand/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/CustomSource.cpp
===================================================================
--- trunk/Source/emergeCommand/CustomSource.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/CustomSource.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/CustomSource.h
===================================================================
--- trunk/Source/emergeCommand/CustomSource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/CustomSource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Settings.cpp
===================================================================
--- trunk/Source/emergeCommand/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/emergeCommand.exe.manifest
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/emergeCommand.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/emergeCommand.rc
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/emergeCommand.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/main.cpp
===================================================================
--- trunk/Source/emergeCommand/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCommand/resource.h
===================================================================
--- trunk/Source/emergeCommand/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCommand/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/Core.cpp
===================================================================
--- trunk/Source/emergeCore/Core.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/Core.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/Core.h
===================================================================
--- trunk/Source/emergeCore/Core.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/Core.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/DDEService.cpp
===================================================================
--- trunk/Source/emergeCore/DDEService.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/DDEService.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/DDEService.h
===================================================================
--- trunk/Source/emergeCore/DDEService.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/DDEService.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/DDEWorker.cpp
===================================================================
--- trunk/Source/emergeCore/DDEWorker.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/DDEWorker.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/DDEWorker.h
===================================================================
--- trunk/Source/emergeCore/DDEWorker.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/DDEWorker.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/LaunchEditor.cpp
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/LaunchEditor.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/LaunchEditor.h
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/LaunchEditor.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/MessageControl.cpp
===================================================================
--- trunk/Source/emergeCore/MessageControl.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/MessageControl.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/MessageControl.h
===================================================================
--- trunk/Source/emergeCore/MessageControl.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/MessageControl.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/Shell.cpp
===================================================================
--- trunk/Source/emergeCore/Shell.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/Shell.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/Shell.h
===================================================================
--- trunk/Source/emergeCore/Shell.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/Shell.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/ShellChanger.cpp
===================================================================
--- trunk/Source/emergeCore/ShellChanger.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/ShellChanger.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/ShellChanger.h
===================================================================
--- trunk/Source/emergeCore/ShellChanger.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/ShellChanger.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/emergeCore.exe.manifest
===================================================================
--- trunk/Source/emergeCore/emergeCore.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/emergeCore.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/emergeCore.rc
===================================================================
--- trunk/Source/emergeCore/emergeCore.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/emergeCore.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/main.cpp
===================================================================
--- trunk/Source/emergeCore/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeCore/resource.h
===================================================================
--- trunk/Source/emergeCore/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeCore/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Config.cpp
===================================================================
--- trunk/Source/emergeDesktop/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Config.h
===================================================================
--- trunk/Source/emergeDesktop/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Desktop.cpp
===================================================================
--- trunk/Source/emergeDesktop/Desktop.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Desktop.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Desktop.h
===================================================================
--- trunk/Source/emergeDesktop/Desktop.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Desktop.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuEditor.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuEditor.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuEditor.h
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuEditor.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuItem.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuItem.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuItem.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuItem.h
===================================================================
--- trunk/Source/emergeDesktop/MenuItem.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuItem.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuListItem.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuListItem.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuListItem.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/MenuListItem.h
===================================================================
--- trunk/Source/emergeDesktop/MenuListItem.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/MenuListItem.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Settings.cpp
===================================================================
--- trunk/Source/emergeDesktop/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/Settings.h
===================================================================
--- trunk/Source/emergeDesktop/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/emergeDesktop.exe.manifest
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/emergeDesktop.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/emergeDesktop.rc
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/emergeDesktop.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/main.cpp
===================================================================
--- trunk/Source/emergeDesktop/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeDesktop/resource.h
===================================================================
--- trunk/Source/emergeDesktop/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeDesktop/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeGraphics/emergeGraphics.h
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeGraphics/emergeGraphics.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeGraphics/emergeGraphics.rc
===================================================================
--- trunk/Source/emergeGraphics/emergeGraphics.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeGraphics/emergeGraphics.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeGraphics/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeGraphics/resource.h
===================================================================
--- trunk/Source/emergeGraphics/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeGraphics/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Actions.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Actions.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Actions.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Actions.h
===================================================================
--- trunk/Source/emergeHotkeys/Actions.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Actions.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Applet.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Applet.h
===================================================================
--- trunk/Source/emergeHotkeys/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/HotkeyCombo.cpp
===================================================================
--- trunk/Source/emergeHotkeys/HotkeyCombo.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/HotkeyCombo.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/HotkeyCombo.h
===================================================================
--- trunk/Source/emergeHotkeys/HotkeyCombo.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/HotkeyCombo.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Settings.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/Settings.h
===================================================================
--- trunk/Source/emergeHotkeys/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/emergeHotkeys.rc
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/main.cpp
===================================================================
--- trunk/Source/emergeHotkeys/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeHotkeys/resource.h
===================================================================
--- trunk/Source/emergeHotkeys/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeHotkeys/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Applet.h
===================================================================
--- trunk/Source/emergeLauncher/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeLauncher/AppletMenu.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/AppletMenu.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/AppletMenu.h
===================================================================
--- trunk/Source/emergeLauncher/AppletMenu.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/AppletMenu.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Config.h
===================================================================
--- trunk/Source/emergeLauncher/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Item.cpp
===================================================================
--- trunk/Source/emergeLauncher/Item.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Item.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Item.h
===================================================================
--- trunk/Source/emergeLauncher/Item.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Item.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Settings.cpp
===================================================================
--- trunk/Source/emergeLauncher/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/emergeLauncher.exe.manifest
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/emergeLauncher.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/emergeLauncher.rc
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/emergeLauncher.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/main.cpp
===================================================================
--- trunk/Source/emergeLauncher/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLauncher/resource.h
===================================================================
--- trunk/Source/emergeLauncher/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLauncher/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLib/Shutdown.cpp
===================================================================
--- trunk/Source/emergeLib/Shutdown.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/Shutdown.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLib/Shutdown.h
===================================================================
--- trunk/Source/emergeLib/Shutdown.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/Shutdown.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLib/emergeLib.dll.manifest
===================================================================
--- trunk/Source/emergeLib/emergeLib.dll.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/emergeLib.dll.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLib/emergeLib.h
===================================================================
--- trunk/Source/emergeLib/emergeLib.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/emergeLib.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -5,35 +5,20 @@
   @author The Emerge Desktop Development Team
 
   @attention This file is part of Emerge Desktop.
+  @attention Copyright (C) 2004-2007  The Emerge Desktop Development Team
 
   @attention Emerge Desktop is free software; you can redistribute it and/or
   modify  it under the terms of the GNU General Public License as published
   by the Free Software Foundation; either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  Emerge Desktop is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//---
+  (at your option) any later version.
 
-  @attention This file is part of the Emerge Desktop source code
-  Copyright (C) 2004 - 2007 The Emerge Desktop Development Team
-  @attention This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
-  of the License, or (at your option) any later version.
-  @attention This program is distributed in the hope that it will be useful,
+  @attention Emerge Desktop is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
+
   @attention You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __EMERGELIB_H

Modified: trunk/Source/emergeLib/emergeLib.rc
===================================================================
--- trunk/Source/emergeLib/emergeLib.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/emergeLib.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -4,6 +4,7 @@
   @author The Emerge Desktop Development Team
 
   @attention This file is part of Emerge Desktop.
+  @attention Copyright (C) 2004-2007  The Emerge Desktop Development Team
 
   @attention Emerge Desktop is free software; you can redistribute it and/or
   modify  it under the terms of the GNU General Public License as published

Modified: trunk/Source/emergeLib/resource.h
===================================================================
--- trunk/Source/emergeLib/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeLib/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/BImage.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/BImage.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/BImage.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/BImage.h
===================================================================
--- trunk/Source/emergeSchemeEngine/BImage.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/BImage.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.h
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeSchemeEngine/resource.h
===================================================================
--- trunk/Source/emergeSchemeEngine/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeSchemeEngine/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/AppletMenu.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/AppletMenu.h
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/AppletMenu.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Config.cpp
===================================================================
--- trunk/Source/emergeTasks/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Config.h
===================================================================
--- trunk/Source/emergeTasks/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Task.cpp
===================================================================
--- trunk/Source/emergeTasks/Task.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Task.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/Task.h
===================================================================
--- trunk/Source/emergeTasks/Task.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/Task.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/emergeTasks.exe.manifest
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/emergeTasks.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/emergeTasks.rc
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/emergeTasks.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/main.cpp
===================================================================
--- trunk/Source/emergeTasks/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTasks/resource.h
===================================================================
--- trunk/Source/emergeTasks/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTasks/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTray/AppletMenu.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/AppletMenu.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/AppletMenu.h
===================================================================
--- trunk/Source/emergeTray/AppletMenu.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/AppletMenu.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Config.cpp
===================================================================
--- trunk/Source/emergeTray/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Config.h
===================================================================
--- trunk/Source/emergeTray/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Settings.cpp
===================================================================
--- trunk/Source/emergeTray/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/Settings.h
===================================================================
--- trunk/Source/emergeTray/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/TrayIcon.cpp
===================================================================
--- trunk/Source/emergeTray/TrayIcon.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/TrayIcon.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/TrayIcon.h
===================================================================
--- trunk/Source/emergeTray/TrayIcon.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/TrayIcon.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/emergeTray.exe.manifest
===================================================================
--- trunk/Source/emergeTray/emergeTray.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/emergeTray.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/emergeTray.rc
===================================================================
--- trunk/Source/emergeTray/emergeTray.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/emergeTray.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/main.cpp
===================================================================
--- trunk/Source/emergeTray/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeTray/resource.h
===================================================================
--- trunk/Source/emergeTray/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeTray/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Applet.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeVWM/AppletMenu.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/AppletMenu.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/AppletMenu.h
===================================================================
--- trunk/Source/emergeVWM/AppletMenu.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/AppletMenu.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Config.cpp
===================================================================
--- trunk/Source/emergeVWM/Config.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Config.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Config.h
===================================================================
--- trunk/Source/emergeVWM/Config.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Config.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Settings.cpp
===================================================================
--- trunk/Source/emergeVWM/Settings.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Settings.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Settings.h
===================================================================
--- trunk/Source/emergeVWM/Settings.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Settings.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Task.cpp
===================================================================
--- trunk/Source/emergeVWM/Task.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Task.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/Task.h
===================================================================
--- trunk/Source/emergeVWM/Task.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/Task.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/emergeVWM.exe.manifest
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.exe.manifest	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/emergeVWM.exe.manifest	2007-09-27 03:27:27 UTC (rev 1431)
@@ -3,6 +3,7 @@
 <!--
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/emergeVWM.rc
===================================================================
--- trunk/Source/emergeVWM/emergeVWM.rc	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/emergeVWM.rc	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/main.cpp
===================================================================
--- trunk/Source/emergeVWM/main.cpp	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/main.cpp	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

Modified: trunk/Source/emergeVWM/resource.h
===================================================================
--- trunk/Source/emergeVWM/resource.h	2007-09-27 03:06:30 UTC (rev 1430)
+++ trunk/Source/emergeVWM/resource.h	2007-09-27 03:27:27 UTC (rev 1431)
@@ -1,6 +1,7 @@
 //---
 //
 //  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
 //
 //  Emerge Desktop is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1440] trunk/Source

From: <ir0nh34d@us...> - 2007-09-28 23:27

Revision: 1440
          http://emerge.svn.sourceforge.net/emerge/?rev=1440&view=rev
Author:   ir0nh34d
Date:     2007-09-28 16:27:43 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
CORE_RIGHTMENU / CORE_MIDMENU fix

Modified Paths:
--------------
    trunk/Source/emergeDesktop/Desktop.cpp
    trunk/Source/emergeHotkeys/Applet.cpp
    trunk/Source/emergeLib/main.cpp

Modified: trunk/Source/emergeDesktop/Desktop.cpp
===================================================================
--- trunk/Source/emergeDesktop/Desktop.cpp	2007-09-28 11:56:52 UTC (rev 1439)
+++ trunk/Source/emergeDesktop/Desktop.cpp	2007-09-28 23:27:43 UTC (rev 1440)
@@ -237,9 +237,11 @@
               break;
 
             case CORE_RIGHTMENU:
+              EndMenu();
               return pDesktop->DoButtonDown(WM_RBUTTONDOWN, hwnd);
 
             case CORE_MIDMENU:
+              EndMenu();
               return pDesktop->DoButtonDown(WM_MBUTTONDOWN, hwnd);
             }
         }

Modified: trunk/Source/emergeHotkeys/Applet.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Applet.cpp	2007-09-28 11:56:52 UTC (rev 1439)
+++ trunk/Source/emergeHotkeys/Applet.cpp	2007-09-28 23:27:43 UTC (rev 1440)
@@ -40,6 +40,9 @@
   if (!mainWnd)
     return 0;
 
+  // Disable menu animation, as it overrides the alpha blending
+  SystemParametersInfo(SPI_SETMENUANIMATION, 0, (PVOID)false, SPIF_SENDCHANGE);
+
   SetWindowPos(mainWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE);
   ShowWindow(mainWnd, SW_SHOW);
 

Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp	2007-09-28 11:56:52 UTC (rev 1439)
+++ trunk/Source/emergeLib/main.cpp	2007-09-28 23:27:43 UTC (rev 1440)
@@ -324,13 +324,11 @@
 {
   if (_wcsicmp(command, TEXT("RightDeskMenu")) == 0)
     {
-      ELStealFocus(ELGetCoreWindow());
       PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_RIGHTMENU);
       return true;
     }
   else if (_wcsicmp(command, TEXT("MidDeskMenu")) == 0)
     {
-      ELStealFocus(ELGetCoreWindow());
       PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_MIDMENU);
       return true;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1467] trunk/Source

From: <ir0nh34d@us...> - 2007-10-29 13:34

Revision: 1467
          http://emerge.svn.sourceforge.net/emerge/?rev=1467&view=rev
Author:   ir0nh34d
Date:     2007-10-29 06:34:44 -0700 (Mon, 29 Oct 2007)

Log Message:
-----------
Improve integration with AppletEngine

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-10-29 13:34:44 UTC (rev 1467)
@@ -72,12 +72,13 @@
 extern "C"
   {
 #endif
-    DLL_EXPORT LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y);
-    DLL_EXPORT HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition);
+    DLL_EXPORT LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y);
+    DLL_EXPORT HWND EAEUpdateGUI(bool shadow, WCHAR *zposition);
     DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc);
     DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
     DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);
     DLL_EXPORT LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *wndRect, RECT *oldDeskRect);
+    DLL_EXPORT void EAEUpdateZPosition(WCHAR *zPosition, bool raise);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -33,19 +33,19 @@
 
 // Global definitions
 WCHAR appletClass[ ] = TEXT("EmergeDesktopApplet");
+HWND appletWindow = NULL;
 
 //------
 // Function:    EAEHitTest
-// Requires:    HWND hwnd - window handle
-//              int x - x co-ordinate of mouse
+// Requires:    int x - x co-ordinate of mouse
 //              int y - y co-ordinate of mouse
 // Returns:     LRESULT
 // Purpose:     Determine the mouse pointer type for the hit test
 //-----
-LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y)
+LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y)
 {
   RECT r;
-  GetWindowRect(hwnd, &r);
+  GetWindowRect(appletWindow, &r);
   int dragBorder = guiBorder;
 
   if (dragBorder <= 0)
@@ -79,20 +79,19 @@
 
 //------
 // Function:    EAEUpdateGUI
-// Requires:    HWND hwnd - window handle
-//              bool shadow - window shadow indicator
+// Requires:    bool shadow - window shadow indicator
 //              WCHAR *zposition - z-order setting for window
 // Returns:     bool
 // Purpose:     Set the window shadow and z-order
 //-----
-HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition)
+HWND EAEUpdateGUI(bool shadow, WCHAR *zposition)
 {
   if (ELVersionInfo() != ELVI_2K)
     {
       if (shadow)
-        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
+        SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) | CS_DROPSHADOW);
       else
-        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) & ~CS_DROPSHADOW);
+        SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) & ~CS_DROPSHADOW);
     }
 
   // Set window z-order
@@ -107,7 +106,6 @@
 HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
 {
   WNDCLASSEX wcx;
-  HWND appletWindow;
 
   ZeroMemory(&wcx, sizeof(WNDCLASSEX));
 
@@ -234,6 +232,26 @@
   return true;
 }
 
+void EAEUpdateZPosition(WCHAR *zPosition, bool raise)
+{
+  HWND relativeWnd = NULL;
+  UINT flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOSENDCHANGING;
+
+  if (raise)
+      relativeWnd = HWND_TOPMOST;
+  else
+    {
+      flags |= SWP_NOACTIVATE;
+      if (wcsicmp(zPosition, TEXT("bottom")) == 0)
+        relativeWnd = HWND_BOTTOM;
+      else if (wcsicmp(zPosition, TEXT("normal")) == 0)
+        relativeWnd = HWND_NOTOPMOST;
+    }
+
+  SetWindowPos(appletWindow, relativeWnd, 0, 0, 0, 0, flags);
+}
+
+
 HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance)
 {
   HWND tooltipWindow = NULL;

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -111,7 +111,7 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
+        return EAEHitTest(pApplet->guiInfo.dragBorder, false,
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
@@ -652,7 +652,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeCommand/Command.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -415,7 +415,13 @@
 {
   int dragBorder = pApplet->guiInfo.dragBorder + pApplet->guiInfo.bevelWidth + pApplet->guiInfo.padding;
 
-  EAEUpdateGUI(commandWnd, pApplet->guiInfo.windowShadow, pSettings->GetZPosition());
+  if (ELVersionInfo() != ELVI_2K)
+    {
+      if (pApplet->guiInfo.windowShadow)
+        SetClassLong(commandWnd, GCL_STYLE, GetClassLong(commandWnd, GCL_STYLE) | CS_DROPSHADOW);
+      else
+        SetClassLong(commandWnd, GCL_STYLE, GetClassLong(commandWnd, GCL_STYLE) & ~CS_DROPSHADOW);
+    }
 
   SetWindowPos(commandWnd, NULL, pSettings->GetX(), pSettings->GetY(),
                pSettings->GetWidth() + (2 * dragBorder), pSettings->GetHeight() + (2 * dragBorder),

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -73,7 +73,7 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+        return EAEHitTest(pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
@@ -730,7 +730,7 @@
   if (activeBrush)
     DeleteObject(activeBrush);
 
-  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -72,7 +72,7 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+        return EAEHitTest(pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
@@ -735,7 +735,8 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          UpdateZPosition(false);
+          if (pSettings->GetRaiseActive())
+            EAEUpdateZPosition(pSettings->GetZPosition(), false);
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
           clickThrough = false;
@@ -823,7 +824,8 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      UpdateZPosition(true);
+      if (pSettings->GetRaiseActive())
+        EAEUpdateZPosition(pSettings->GetZPosition(), true);
       DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
@@ -831,28 +833,6 @@
   return 0;
 }
 
-void Applet::UpdateZPosition(bool raise)
-{
-  HWND relativeWnd = NULL;
-  UINT flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOSENDCHANGING;
-
-  if (!pSettings->GetRaiseActive())
-    return;
-
-  if (raise)
-      relativeWnd = HWND_TOPMOST;
-  else
-    {
-      flags |= SWP_NOACTIVATE;
-      if (wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-        relativeWnd = HWND_BOTTOM;
-      else if (wcsicmp(pSettings->GetZPosition(), TEXT("normal")) == 0)
-        relativeWnd = HWND_NOTOPMOST;
-    }
-
-  SetWindowPos(mainWnd, relativeWnd, 0, 0, 0, 0, flags);
-}
-
 LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
 {
   if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
@@ -1112,7 +1092,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeTasks/Applet.h	2007-10-29 13:34:44 UTC (rev 1467)
@@ -63,7 +63,6 @@
     RECT oldrt;
     HMONITOR appletMonitor;
     void UpdateIcons();
-    void UpdateZPosition(bool raise);
     static LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
     static BOOL CALLBACK EnumTasksList(HWND hwnd, LPARAM lParam);
     static BOOL CALLBACK EnumFullScreenWindows(HWND hwnd, LPARAM lParam);

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeTray/Applet.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -113,7 +113,7 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+        return EAEHitTest(pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
@@ -867,7 +867,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-10-29 13:04:37 UTC (rev 1466)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-10-29 13:34:44 UTC (rev 1467)
@@ -75,7 +75,7 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
+        return EAEHitTest(pApplet->guiInfo.dragBorder, false,
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
@@ -1104,7 +1104,7 @@
   // Remove the tooltip region
   SendMessage(toolWnd, TTM_DELTOOL, 0, (LPARAM)&ti);
 
-  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1476] trunk/Source

From: <ir0nh34d@us...> - 2007-11-07 13:09

Revision: 1476
          http://emerge.svn.sourceforge.net/emerge/?rev=1476&view=rev
Author:   ir0nh34d
Date:     2007-11-07 05:09:26 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Changed methodology for bottom z-order

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -86,6 +86,8 @@
 //-----
 HWND EAEUpdateGUI(bool shadow, WCHAR *zposition)
 {
+  HWND ret = HWND_NOTOPMOST;
+
   if (ELVersionInfo() != ELVI_2K)
     {
       if (shadow)
@@ -94,13 +96,13 @@
         SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) & ~CS_DROPSHADOW);
     }
 
-  // Set window z-order
-  if (_wcsicmp(zposition, TEXT("top")) == 0)
-    return HWND_TOPMOST;
-  else if (_wcsicmp(zposition, TEXT("bottom")) == 0)
-    return ELGetDesktopWindow();
 
-  return HWND_NOTOPMOST;
+  if (_wcsicmp(zposition, TEXT("bottom")) == 0)
+      ret = ELGetDesktopWindow();
+  else if (_wcsicmp(zposition, TEXT("top")) == 0)
+      ret = HWND_TOPMOST;
+
+  return ret;
 }
 
 HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
@@ -125,7 +127,7 @@
 
   // The class is registered, let's create the window
   appletWindow = CreateWindowEx (
-                   WS_EX_TOOLWINDOW | WS_EX_LAYERED,
+                   WS_EX_TOOLWINDOW|WS_EX_LAYERED|WS_EX_NOACTIVATE,
                    appletClass,
                    NULL,
                    WS_POPUP,

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -118,10 +118,6 @@
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
-
       // Write the X and Y settings to the registry
     case WM_MOVE:
       return pApplet->DoMove();
@@ -510,14 +506,6 @@
   return 0;
 }
 
-LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
-{
-  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-    windowPos->flags |= SWP_NOZORDER;
-
-  return 0;
-}
-
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeCommand/Applet.h	2007-11-07 13:09:26 UTC (rev 1476)
@@ -80,7 +80,6 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMove();
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeCommand/Command.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -185,14 +185,6 @@
       RedrawWindow(hwnd, NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-    {
-      if (!_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")))
-        ((WINDOWPOS *)lParam)->flags |= SWP_NOZORDER;
-    }
-    break;
-
     // Don't close on alt-F4
     case WM_SYSCOMMAND:
     {

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -80,10 +80,6 @@
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
-
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -560,14 +556,6 @@
   return 0;
 }
 
-LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
-{
-  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-    windowPos->flags |= SWP_NOZORDER;
-
-  return 0;
-}
-
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);

Modified: trunk/Source/emergeLauncher/Applet.h
===================================================================
--- trunk/Source/emergeLauncher/Applet.h	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeLauncher/Applet.h	2007-11-07 13:09:26 UTC (rev 1476)
@@ -77,7 +77,6 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -79,10 +79,6 @@
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
-
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -810,6 +806,7 @@
 void Applet::ResetTimer()
 {
   SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
+  EAEUpdateZPosition(pSettings->GetZPosition(), false);
 }
 
 LRESULT Applet::DoNCLButtonUp()
@@ -833,14 +830,6 @@
   return 0;
 }
 
-LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
-{
-  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-    windowPos->hwndInsertAfter = ELGetDesktopWindow();
-
-  return 0;
-}
-
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);
@@ -1090,11 +1079,11 @@
 
   dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
+  SetWindowPos(mainWnd, NULL, 0, 0, 0, 0,
+               SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER);
+
   hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
 
-  SetWindowPos(mainWnd, hWndInsertAfter, 0, 0, 0, 0,
-               SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE);
-
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);
   else

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeTasks/Applet.h	2007-11-07 13:09:26 UTC (rev 1476)
@@ -77,7 +77,6 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeTray/Applet.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -120,10 +120,6 @@
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
-
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -685,14 +681,6 @@
   return 0;
 }
 
-LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
-{
-  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-    windowPos->flags |= SWP_NOZORDER;
-
-  return 0;
-}
-
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeTray/Applet.h	2007-11-07 13:09:26 UTC (rev 1476)
@@ -317,7 +317,6 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoEmergeNotify(UINT messageClass, UINT message);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-11-07 13:09:26 UTC (rev 1476)
@@ -82,10 +82,6 @@
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
-      // Repaint the icons as the window size is changing
-    case WM_WINDOWPOSCHANGING:
-      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
-
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -912,14 +908,6 @@
   return 0;
 }
 
-LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
-{
-  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
-    windowPos->flags |= SWP_NOZORDER;
-
-  return 0;
-}
-
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-11-05 20:25:36 UTC (rev 1475)
+++ trunk/Source/emergeVWM/Applet.h	2007-11-07 13:09:26 UTC (rev 1476)
@@ -86,7 +86,6 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1478] trunk/Source

From: <ir0nh34d@us...> - 2007-11-11 03:13

Revision: 1478
          http://emerge.svn.sourceforge.net/emerge/?rev=1478&view=rev
Author:   ir0nh34d
Date:     2007-11-10 19:13:54 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
Initial changes to support COMMONSETTINGS

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-11 03:13:54 UTC (rev 1478)
@@ -46,10 +46,27 @@
 
 typedef struct _COMMONSETTINGS
   {
-    int x;
-    int y;
-    int height;
-    int width;
+    DWORD x;
+    DWORD y;
+    DWORD height;
+    DWORD width;
+    WCHAR zPosition[MAX_PATH];
+    WCHAR horizontalDirection[MAX_PATH];
+    WCHAR verticalDirection[MAX_PATH];
+    WCHAR directionOrientation[MAX_PATH];
+    DWORD flashCount;
+    DWORD flashInterval;
+    DWORD enableFlash;
+    DWORD autoSize;
+    DWORD hiliteActive;
+    DWORD iconSize;
+    DWORD iconSpacing;
+    WCHAR schemeFile[MAX_PATH];
+    DWORD snapMove;
+    DWORD clickThrough;
+    DWORD raise;
+    RECT resolution;
+    DWORD snapSize;
   }
 COMMONSETTINGS, *LPCOMMONSETTINGS;
 
@@ -74,11 +91,12 @@
 #endif
     DLL_EXPORT LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y);
     DLL_EXPORT HWND EAEUpdateGUI(bool shadow, WCHAR *zposition);
-    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc);
+    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc, WCHAR *name);
     DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
     DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);
     DLL_EXPORT LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *wndRect, RECT *oldDeskRect);
     DLL_EXPORT void EAEUpdateZPosition(WCHAR *zPosition, bool raise);
+    DLL_EXPORT LPCOMMONSETTINGS EAEReadSettings();
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -34,7 +34,50 @@
 // Global definitions
 WCHAR appletClass[ ] = TEXT("EmergeDesktopApplet");
 HWND appletWindow = NULL;
+COMMONSETTINGS cs;
+WCHAR appletName[MAX_LINE_LENGTH];
 
+LPCOMMONSETTINGS EAEReadSettings()
+{
+  HKEY key;
+  RECT deskRect, tmpRect;
+  WCHAR tmp[MAX_LINE_LENGTH];
+
+  swprintf(tmp, TEXT("%s\\Settings"), appletName);
+
+  ELOpenRegKey(tmp, &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&cs.x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&cs.y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &cs.width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &cs.height, 100);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), cs.zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), cs.horizontalDirection, (WCHAR*)TEXT("right"));
+  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), cs.verticalDirection, (WCHAR*)TEXT("down"));
+  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), cs.directionOrientation, (WCHAR*)TEXT("horizontal"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &cs.flashCount, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &cs.flashInterval, 1000);
+  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &cs.enableFlash, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &cs.autoSize, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &cs.hiliteActive, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &cs.iconSize, 16);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &cs.iconSpacing, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), cs.schemeFile, (WCHAR*)TEXT("\0"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &cs.snapMove, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &cs.clickThrough, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("RaiseActive"), &cs.raise, 0);
+
+  tmpRect.left = cs.x;
+  tmpRect.right = tmpRect.left + cs.width;
+  tmpRect.top = cs.y;
+  tmpRect.bottom = tmpRect.top + cs.height;
+  ELGetDesktopRect(&tmpRect, &deskRect);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &cs.resolution, &deskRect);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &cs.snapSize, 1);
+  ELCloseRegKey(key);
+
+  return &cs;
+}
+
 //------
 // Function:    EAEHitTest
 // Requires:    int x - x co-ordinate of mouse
@@ -112,7 +155,7 @@
   return ret;
 }
 
-HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
+HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure, WCHAR *name)
 {
   WNDCLASSEX wcx;
 
@@ -146,6 +189,8 @@
                    NULL
                  );
 
+  wcscpy(appletName, name);
+
   return appletWindow;
 }
 

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -262,7 +262,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeCommand"));
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -201,7 +201,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeLauncher"));
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -171,7 +171,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeTasks"));
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeTray/Applet.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -261,7 +261,7 @@
 
   ZeroMemory(&wincl, sizeof(WNDCLASSEX));
 
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeTray"));
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-11-09 17:35:13 UTC (rev 1477)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-11-11 03:13:54 UTC (rev 1478)
@@ -197,7 +197,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeVWM"));
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1481] trunk/Source

From: <ir0nh34d@us...> - 2007-11-16 14:43

Revision: 1481
          http://emerge.svn.sourceforge.net/emerge/?rev=1481&view=rev
Author:   ir0nh34d
Date:     2007-11-16 06:43:57 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
Further integration between Applets and AppletEngine

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTasks/AppletMenu.cpp

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-16 14:43:57 UTC (rev 1481)
@@ -34,6 +34,8 @@
 #define TIP_SIZE 256
 #endif
 
+#define MIN_APPLET_SIZE 10
+
 #define UNICODE 1
 #include <windows.h>
 
@@ -120,6 +122,13 @@
     DLL_EXPORT void EAEUpdateZPosition(WCHAR *zPosition, bool raise);
     DLL_EXPORT LPCOMMONSETTINGS EAEReadSettings();
     DLL_EXPORT bool EAEUpdateSetting(DWORD setting, LPVOID value);
+    DLL_EXPORT LRESULT EAEDoMove();
+    DLL_EXPORT LRESULT EAEDoEnterSizeMove();
+    DLL_EXPORT LRESULT EAEDoDisplayChange();
+    DLL_EXPORT LRESULT EAEDoMoving(RECT *lpRect);
+    DLL_EXPORT HMONITOR EAEGetAppletMonitor();
+    DLL_EXPORT LRESULT EAEDoSize(DWORD width, DWORD height);
+    DLL_EXPORT LRESULT EAEDoSizing(UINT edge, LPRECT rect);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-11-16 14:43:57 UTC (rev 1481)
@@ -36,6 +36,8 @@
 HWND appletWindow = NULL;
 COMMONSETTINGS cs;
 WCHAR appletName[MAX_LINE_LENGTH];
+POINT anchor;
+HMONITOR appletMonitor = NULL;
 
 bool EAEUpdateSetting(DWORD setting, LPVOID value)
 {
@@ -154,6 +156,146 @@
   return ret;
 }
 
+LRESULT EAEDoEnterSizeMove()
+{
+  anchor = ELGetAnchorPoint(appletWindow);
+
+  return 0;
+}
+
+LRESULT EAEDoMove()
+{
+  int x, y;
+  RECT deskRect;
+
+  RECT mainRect;
+  if (!GetWindowRect(appletWindow, &mainRect))
+    return 1;
+
+  if (_wcsicmp(cs.verticalDirection, TEXT("up")) == 0)
+    y = mainRect.bottom;
+  else
+    y = mainRect.top;
+
+  if (_wcsicmp(cs.horizontalDirection, TEXT("left")) == 0)
+    x = mainRect.right;
+  else
+    x = mainRect.left;
+
+  appletMonitor = ELGetDesktopRect(&mainRect, &deskRect);
+  EAEUpdateSetting(CS_X, &x);
+  EAEUpdateSetting(CS_Y, &y);
+  EAEUpdateSetting(CS_RESOLUTION, &deskRect);
+
+  return 0;
+}
+
+HMONITOR EAEGetAppletMonitor()
+{
+  return appletMonitor;
+}
+
+LRESULT EAEDoMoving(RECT *lpRect)
+{
+  SNAPMOVEINFO smi;
+
+  if (cs.snapMove == 1)
+    {
+      smi.AppletWindow = appletWindow;
+      smi.origin = anchor;
+      smi.AppletRect = lpRect;
+
+      ELSnapMove(&smi);
+    }
+
+  return 0;
+}
+
+LRESULT EAEDoSizing(UINT edge, LPRECT rect)
+{
+  int height;
+  int width;
+
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
+  if ((cs.autoSize == 0) && (cs.snapSize == 1))
+    {
+      SNAPSIZEINFO ssi;
+      ssi.AppletWindow = appletWindow;
+      ssi.AppletEdge = edge;
+      ssi.AppletRect = rect;
+
+      ELSnapSize(&ssi);
+    }
+
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  return 0;
+}
+
+LRESULT EAEDoSize(DWORD width, DWORD height)
+{
+  if (!IsWindowVisible(appletWindow))
+    return 1;
+
+  if (cs.autoSize == 1)
+    return 1;
+
+  EAEUpdateSetting(CS_WIDTH, &width);
+  EAEUpdateSetting(CS_HEIGHT, &height);
+
+  return 0;
+}
+
+LRESULT EAEDoDisplayChange()
+{
+  RECT wndRect;
+
+  if (!GetWindowRect(appletWindow, &wndRect))
+    return 1;
+
+  EAEDisplayChange(appletMonitor, &wndRect, &cs.resolution);
+  SetWindowPos(appletWindow, NULL, wndRect.left, wndRect.top, 0, 0,
+               SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOSENDCHANGING);
+
+  return 0;
+}
+
 LPCOMMONSETTINGS EAEReadSettings()
 {
   HKEY key;

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-16 14:43:57 UTC (rev 1481)
@@ -43,6 +43,7 @@
       time_t tVal;
       struct tm *stVal;
       WCHAR tstring[MAX_LINE_LENGTH];
+      swprintf(asdfasdfsdfasfdasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf
 
       // Grab the current time
       time(&tVal);

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-16 14:43:57 UTC (rev 1481)
@@ -79,24 +79,24 @@
       break;
 
     case WM_ENTERSIZEMOVE:
-      return pApplet->DoEnterSizeMove(hwnd);
+      return EAEDoEnterSizeMove();
 
     case WM_SIZING:
-      return pApplet->DoSizing(hwnd, (UINT)wParam, (LPRECT)lParam);
+      return pApplet->DoSizing((UINT)wParam, (LPRECT)lParam);
 
     case WM_MOVING:
-      return pApplet->DoMoving(hwnd, (LPRECT)lParam);
+      return EAEDoMoving((LPRECT)lParam);
 
       // Write the X and Y settings to the registry
     case WM_MOVE:
-      return pApplet->DoMove();
+      return EAEDoMove();
 
       // Write the width height to the registry if the size changed
     case WM_SIZE:
       return pApplet->DoSize(LOWORD(lParam), HIWORD(lParam));
 
     case WM_DISPLAYCHANGE:
-      return pApplet->DoDisplayChange(hwnd);
+      return EAEDoDisplayChange();
 
     case WM_SYSCOMMAND:
       if (wParam == SC_CLOSE)
@@ -129,7 +129,6 @@
   mainInst = hInstance;
   fullScreen = false;
   activeWnd = NULL;
-  appletMonitor = NULL;
 
   activeBackgroundDC = NULL;
   inactiveBackgroundDC = NULL;
@@ -161,18 +160,6 @@
   return cs;
 }
 
-LRESULT Applet::DoDisplayChange(HWND hwnd)
-{
-  RECT wndRect;
-
-  GetWindowRect(hwnd, &wndRect);
-  EAEDisplayChange(appletMonitor, &wndRect, &cs->resolution);
-  SetWindowPos(hwnd, NULL, wndRect.left, wndRect.top, 0, 0,
-               SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOSENDCHANGING);
-
-  return 0;
-}
-
 UINT Applet::Initialize()
 {
   mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeTasks"));
@@ -833,132 +820,23 @@
   return 0;
 }
 
-LRESULT Applet::DoEnterSizeMove(HWND hwnd)
+LRESULT Applet::DoSizing(UINT edge, LPRECT rect)
 {
-  anchor = ELGetAnchorPoint(hwnd);
+  LRESULT ret = EAEDoSizing(edge, rect);
 
-  return 0;
-}
-
-LRESULT Applet::DoMoving(HWND hwnd, RECT *lpRect)
-{
-  SNAPMOVEINFO smi;
-
-  if (cs->snapMove == 1)
-    {
-      smi.AppletWindow = hwnd;
-      smi.origin = anchor;
-      smi.AppletRect = lpRect;
-
-      ELSnapMove(&smi);
-    }
-
-  return 0;
-}
-
-LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
-{
-  int height;
-  int width;
-
-  height = (*rect).bottom - (*rect).top;
-  width = (*rect).right - (*rect).left;
-
-  if ((cs->autoSize == 0) && (cs->snapSize == 1))
-    {
-      SNAPSIZEINFO ssi;
-      ssi.AppletWindow = hwnd;
-      ssi.AppletEdge = edge;
-      ssi.AppletRect = rect;
-
-      ELSnapSize(&ssi);
-    }
-
-  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
-    }
-
-  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
-    }
-
-  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
-    }
-
-  if (edge == WMSZ_BOTTOMLEFT)
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
-    }
-
-
   UpdateIcons();
   DrawAlphaBlend();
-  return 0;
-}
 
-LRESULT Applet::DoMove()
-{
-  int x, y;
-  RECT deskRect;
-
-  RECT mainRect;
-  if (!GetWindowRect(mainWnd, &mainRect))
-    return 1;
-
-  if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
-    y = mainRect.bottom;
-  else
-    y = mainRect.top;
-
-  if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
-    x = mainRect.right;
-  else
-    x = mainRect.left;
-
-  appletMonitor = ELGetDesktopRect(&mainRect, &deskRect);
-  EAEUpdateSetting(CS_X, &x);
-  EAEUpdateSetting(CS_Y, &y);
-  EAEUpdateSetting(CS_RESOLUTION, &deskRect);
-
-  return 0;
+  return ret;
 }
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
   int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
-
-  if (!IsWindowVisible(mainWnd))
-    return 1;
-
-  if (cs->autoSize == 1)
-    return 1;
-
   width -= 2 * dragBorder;
   height -= 2 * dragBorder;
-  EAEUpdateSetting(CS_WIDTH, &width);
-  EAEUpdateSetting(CS_HEIGHT, &height);
 
-  return 0;
+  return EAEDoSize(width, height);
 }
 
 LRESULT Applet::DoEmergeNotify(UINT messageClass, UINT message)
@@ -1110,7 +988,7 @@
       wndRect.right = wndRect.left + cs->width + (2 * dragBorder);
     }
 
-  EAEDisplayChange(appletMonitor, &wndRect, &cs->resolution);
+  EAEDisplayChange(EAEGetAppletMonitor(), &wndRect, &cs->resolution);
 
   SetWindowPos(mainWnd, hWndInsertAfter, wndRect.left, wndRect.top,
                wndRect.right - wndRect.left, wndRect.bottom - wndRect.top,

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeTasks/Applet.h	2007-11-16 14:43:57 UTC (rev 1481)
@@ -36,8 +36,6 @@
 #define MOUSE_TIMER 0
 #define MOUSE_POLL_TIME 250
 
-#define MIN_APPLET_SIZE 10
-
 #include "AppletMenu.h"
 #include <vector>
 #include <process.h>
@@ -59,9 +57,7 @@
     HDC activeBackgroundDC, inactiveBackgroundDC;
     bool fullScreen;
     void ResetTaskIcons();
-    POINT anchor;
     RECT oldrt;
-    HMONITOR appletMonitor;
     void UpdateIcons();
     static LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
     static BOOL CALLBACK EnumTasksList(HWND hwnd, LPARAM lParam);
@@ -78,11 +74,8 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
-    LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
-    LRESULT DoMoving(HWND hwnd, LPRECT lpRect);
-    LRESULT DoEnterSizeMove(HWND hwnd);
-    LRESULT DoSizing(HWND hwnd, UINT edge, LPRECT rect);
+    LRESULT DoSizing(UINT edge, LPRECT rect);
     LRESULT DoEmergeNotify(UINT messageClass, UINT message);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
     LRESULT TaskMouseEvent(UINT message, LPARAM lParam);
@@ -91,7 +84,6 @@
     LRESULT ModifyTask(HWND task);
     LRESULT RemoveTask(HWND task);
     LRESULT SetFlash(HWND task, bool flash);
-    LRESULT DoDisplayChange(HWND hwnd);
     LPCOMMONSETTINGS GetCommonSettings();
     bool ClickThrough();
     void CreateBrushes();

Modified: trunk/Source/emergeTasks/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-14 18:50:58 UTC (rev 1480)
+++ trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-16 14:43:57 UTC (rev 1481)
@@ -177,7 +177,7 @@
     case 300:
       if (pConfig->Show() == IDOK)
         {
-          pApplet->DoMove();
+          EAEDoMove();
           pApplet->UpdateGUI();
         }
       break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1485] trunk/Source

From: <ir0nh34d@us...> - 2007-11-21 20:46

Revision: 1485
          http://emerge.svn.sourceforge.net/emerge/?rev=1485&view=rev
Author:   ir0nh34d
Date:     2007-11-21 12:46:39 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
Updated EAEUpdateGUI parameters

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-21 20:46:39 UTC (rev 1485)
@@ -38,6 +38,7 @@
 
 #define UNICODE 1
 #include <windows.h>
+#include "..\emergeSchemeEngine\emergeSchemeEngine.h"
 
 #define ASI_VERTICAL    1
 #define ASI_HORIZONTAL  2
@@ -114,7 +115,7 @@
   {
 #endif
     DLL_EXPORT LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y);
-    DLL_EXPORT HWND EAEUpdateGUI(bool shadow, WCHAR *zposition);
+    DLL_EXPORT HWND EAEUpdateGUI(LPGUIINFO guiInfo);
     DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc, WCHAR *name);
     DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
     DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -38,6 +38,7 @@
 WCHAR appletName[MAX_LINE_LENGTH];
 POINT anchor;
 HMONITOR appletMonitor = NULL;
+LPGUIINFO appletGuiInfo = NULL;
 
 bool EAEUpdateSetting(DWORD setting, LPVOID value)
 {
@@ -393,22 +394,24 @@
 // Returns:     bool
 // Purpose:     Set the window shadow and z-order
 //-----
-HWND EAEUpdateGUI(bool shadow, WCHAR *zposition)
+HWND EAEUpdateGUI(LPGUIINFO guiInfo)
 {
   HWND ret = HWND_NOTOPMOST;
 
+  appletGuiInfo = guiInfo;
+
   if (ELVersionInfo() != ELVI_2K)
     {
-      if (shadow)
+      if (appletGuiInfo->windowShadow)
         SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) | CS_DROPSHADOW);
       else
         SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) & ~CS_DROPSHADOW);
     }
 
 
-  if (_wcsicmp(zposition, TEXT("bottom")) == 0)
+  if (_wcsicmp(cs.zPosition, TEXT("bottom")) == 0)
       ret = ELGetDesktopWindow();
-  else if (_wcsicmp(zposition, TEXT("top")) == 0)
+  else if (_wcsicmp(cs.zPosition, TEXT("top")) == 0)
       ret = HWND_TOPMOST;
 
   return ret;

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -626,6 +626,8 @@
   int dragBorder;
   RECT wndRect;
   HWND hWndInsertAfter;
+
+  EAEReadSettings();
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
@@ -640,7 +642,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -706,6 +706,7 @@
   HWND hWndInsertAfter;
 
   pSettings->ReadSettings();
+  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -718,7 +719,7 @@
   if (activeBrush)
     DeleteObject(activeBrush);
 
-  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -968,7 +968,7 @@
   SetWindowPos(mainWnd, NULL, 0, 0, 0, 0,
                SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER);
 
-  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, cs->zPosition);
+  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
 
   if (cs->autoSize == 1)
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeTray/Applet.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -846,6 +846,7 @@
   RECT wndRect;
 
   pSettings->ReadSettings();
+  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -855,7 +856,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-11-21 05:15:49 UTC (rev 1484)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-11-21 20:46:39 UTC (rev 1485)
@@ -1080,6 +1080,7 @@
   ti.lpszText = LPSTR_TEXTCALLBACK;
 
   pSettings->ReadSettings();
+  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -1092,7 +1093,7 @@
   // Remove the tooltip region
   SendMessage(toolWnd, TTM_DELTOOL, 0, (LPARAM)&ti);
 
-  hWndInsertAfter = EAEUpdateGUI(guiInfo.windowShadow, pSettings->GetZPosition());
+  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1486] trunk/Source

From: <ir0nh34d@us...> - 2007-11-22 03:28

Revision: 1486
          http://emerge.svn.sourceforge.net/emerge/?rev=1486&view=rev
Author:   ir0nh34d
Date:     2007-11-21 19:28:21 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
Set to compile with gcc-4.2.1-dw2

Modified Paths:
--------------
    trunk/Source/applet_globals.in
    trunk/Source/lib_globals.in

Modified: trunk/Source/applet_globals.in
===================================================================
--- trunk/Source/applet_globals.in	2007-11-21 20:46:39 UTC (rev 1485)
+++ trunk/Source/applet_globals.in	2007-11-22 03:28:21 UTC (rev 1486)
@@ -1,4 +1,4 @@
-CC = g++
+CC = g++-dw2
 AR = ar
 WINDRES = windres
 WINDRESFLAGS = -O COFF

Modified: trunk/Source/lib_globals.in
===================================================================
--- trunk/Source/lib_globals.in	2007-11-21 20:46:39 UTC (rev 1485)
+++ trunk/Source/lib_globals.in	2007-11-22 03:28:21 UTC (rev 1486)
@@ -1,4 +1,4 @@
-CC = g++
+CC = g++-dw2
 AR = ar
 DLLTOOL = dlltool
 WINDRES = windres


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1489] trunk/Source

From: <ir0nh34d@us...> - 2007-11-26 15:15

Revision: 1489
          http://emerge.svn.sourceforge.net/emerge/?rev=1489&view=rev
Author:   ir0nh34d
Date:     2007-11-26 07:15:26 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Revert to 4.0.x base

Modified Paths:
--------------
    trunk/Source/emergeAppletEngine/emergeAppletEngine.h
    trunk/Source/emergeAppletEngine/main.cpp
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/Applet.h
    trunk/Source/emergeCommand/Command.cpp
    trunk/Source/emergeHotkeys/Applet.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLauncher/Applet.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/Applet.h
    trunk/Source/emergeTasks/AppletMenu.cpp
    trunk/Source/emergeTasks/Config.cpp
    trunk/Source/emergeTasks/Makefile
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTasks/emergeTasks.rc
    trunk/Source/emergeTasks/resource.h
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeTray/Applet.h
    trunk/Source/emergeVWM/Applet.cpp
    trunk/Source/emergeVWM/Applet.h

Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h
===================================================================
--- trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -34,11 +34,8 @@
 #define TIP_SIZE 256
 #endif
 
-#define MIN_APPLET_SIZE 10
-
 #define UNICODE 1
 #include <windows.h>
-#include "..\emergeSchemeEngine\emergeSchemeEngine.h"
 
 #define ASI_VERTICAL    1
 #define ASI_HORIZONTAL  2
@@ -47,51 +44,12 @@
 #define ASI_UP          12
 #define ASI_DOWN        13
 
-#define CS_X                    1
-#define CS_Y                    2
-#define CS_WIDTH                3
-#define CS_HEIGHT               4
-#define CS_ZPOSITION            5
-#define CS_HORIZONTALDIRECTION  6
-#define CS_VERTICALDIRECTION    7
-#define CS_DIRECTIONORIENTATION 8
-#define CS_FLASHCOUNT           9
-#define CS_FLASHINTERVAL        10
-#define CS_ENABLEFLASH          11
-#define CS_AUTOSIZE             12
-#define CS_HIGHLIGHTACTIVE      13
-#define CS_ICONSIZE             14
-#define CS_ICONSPACING          15
-#define CS_SCHEME               16
-#define CS_SNAPMOVE             17
-#define CS_CLICKTHROUGH         18
-#define CS_RAISEACTIVE          19
-#define CS_RESOLUTION           20
-#define CS_SNAPSIZE             21
-
 typedef struct _COMMONSETTINGS
   {
-    DWORD x;
-    DWORD y;
-    DWORD height;
-    DWORD width;
-    WCHAR zPosition[MAX_PATH];
-    WCHAR horizontalDirection[MAX_PATH];
-    WCHAR verticalDirection[MAX_PATH];
-    WCHAR directionOrientation[MAX_PATH];
-    DWORD flashCount;
-    DWORD flashInterval;
-    DWORD enableFlash;
-    DWORD autoSize;
-    DWORD hiliteActive;
-    DWORD iconSize;
-    DWORD iconSpacing;
-    WCHAR schemeFile[MAX_PATH];
-    DWORD snapMove;
-    DWORD clickThrough;
-    DWORD raise;
-    RECT resolution;
-    DWORD snapSize;
+    int x;
+    int y;
+    int height;
+    int width;
   }
 COMMONSETTINGS, *LPCOMMONSETTINGS;
 
@@ -114,22 +72,12 @@
 extern "C"
   {
 #endif
-    DLL_EXPORT LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y);
-    DLL_EXPORT HWND EAEUpdateGUI(LPGUIINFO guiInfo);
-    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc, WCHAR *name);
+    DLL_EXPORT LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y);
+    DLL_EXPORT HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition);
+    DLL_EXPORT HWND EAEInitializeAppletWindow(HINSTANCE inst, WNDPROC windowProc);
     DLL_EXPORT HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance);
     DLL_EXPORT bool EAEAutoSize(AUTOSIZEINFO autoSizeInfo);
     DLL_EXPORT LRESULT EAEDisplayChange(HMONITOR appletMonitor, RECT *wndRect, RECT *oldDeskRect);
-    DLL_EXPORT void EAEUpdateZPosition(WCHAR *zPosition, bool raise);
-    DLL_EXPORT LPCOMMONSETTINGS EAEReadSettings();
-    DLL_EXPORT bool EAEUpdateSetting(DWORD setting, LPVOID value);
-    DLL_EXPORT LRESULT EAEDoMove();
-    DLL_EXPORT LRESULT EAEDoEnterSizeMove();
-    DLL_EXPORT LRESULT EAEDoDisplayChange();
-    DLL_EXPORT LRESULT EAEDoMoving(RECT *lpRect);
-    DLL_EXPORT HMONITOR EAEGetAppletMonitor();
-    DLL_EXPORT LRESULT EAEDoSize(DWORD width, DWORD height);
-    DLL_EXPORT LRESULT EAEDoSizing(UINT edge, LPRECT rect);
 #ifdef __cplusplus
   }
 #endif

Modified: trunk/Source/emergeAppletEngine/main.cpp
===================================================================
--- trunk/Source/emergeAppletEngine/main.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeAppletEngine/main.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -33,393 +33,81 @@
 
 // Global definitions
 WCHAR appletClass[ ] = TEXT("EmergeDesktopApplet");
-HWND appletWindow = NULL;
-COMMONSETTINGS cs;
-WCHAR appletName[MAX_LINE_LENGTH];
-POINT anchor;
-HMONITOR appletMonitor = NULL;
-LPGUIINFO appletGuiInfo = NULL;
 
-bool EAEUpdateSetting(DWORD setting, LPVOID value)
-{
-  DWORD *tmp;
-  RECT *rect;
-  HKEY key;
-  bool ret = false;
-  WCHAR keyString[MAX_LINE_LENGTH];
-
-  swprintf(keyString, TEXT("%s\\Settings"), appletName);
-
-  if (!ELOpenRegKey(keyString, &key, true))
-    return ret;
-
-  switch (setting)
-    {
-    case CS_X:
-      tmp = (DWORD*)value;
-      cs.x = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &cs.x);
-      break;
-    case CS_Y:
-      tmp = (DWORD*)value;
-      cs.y = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &cs.y);
-      break;
-    case CS_WIDTH:
-      tmp = (DWORD*)value;
-      cs.width = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &cs.width);
-      break;
-    case CS_HEIGHT:
-      tmp = (DWORD*)value;
-      cs.height = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &cs.height);
-      break;
-    case CS_ZPOSITION:
-      wcscpy(cs.zPosition, (WCHAR*)value);
-      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), cs.zPosition);
-      break;
-    case CS_HORIZONTALDIRECTION:
-      wcscpy(cs.horizontalDirection, (WCHAR*)value);
-      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), cs.horizontalDirection);
-      break;
-    case CS_VERTICALDIRECTION:
-      wcscpy(cs.verticalDirection, (WCHAR*)value);
-      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), cs.verticalDirection);
-      break;
-    case CS_DIRECTIONORIENTATION:
-      wcscpy(cs.directionOrientation, (WCHAR*)value);
-      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), cs.directionOrientation);
-      break;
-    case CS_FLASHCOUNT:
-      tmp = (DWORD*)value;
-      cs.flashCount = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashCount"), &cs.flashCount);
-      break;
-    case CS_FLASHINTERVAL:
-      tmp = (DWORD*)value;
-      cs.flashInterval = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &cs.flashInterval);
-      break;
-    case CS_ENABLEFLASH:
-      tmp = (DWORD*)value;
-      cs.enableFlash = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &cs.enableFlash);
-      break;
-    case CS_AUTOSIZE:
-      tmp = (DWORD*)value;
-      cs.autoSize = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &cs.autoSize);
-      break;
-    case CS_HIGHLIGHTACTIVE:
-      tmp = (DWORD*)value;
-      cs.hiliteActive = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &cs.hiliteActive);
-      break;
-    case CS_ICONSIZE:
-      tmp = (DWORD*)value;
-      cs.iconSize = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &cs.iconSize);
-      break;
-    case CS_ICONSPACING:
-      tmp = (DWORD*)value;
-      cs.iconSpacing = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &cs.iconSpacing);
-      break;
-    case CS_SCHEME:
-      wcscpy(cs.schemeFile, (WCHAR*)value);
-      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), cs.schemeFile);
-      break;
-    case CS_CLICKTHROUGH:
-      tmp = (DWORD*)value;
-      cs.clickThrough = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &cs.clickThrough);
-      break;
-    case CS_RAISEACTIVE:
-      tmp = (DWORD*)value;
-      cs.raise = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("RaiseActive"), &cs.raise);
-      break;
-    case CS_RESOLUTION:
-      rect = (RECT*)value;
-      cs.resolution = *rect;
-      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &cs.resolution);
-      break;
-    case CS_SNAPSIZE:
-      tmp = (DWORD*)value;
-      cs.snapSize = *tmp;
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &cs.snapSize);
-      break;
-    }
-
-  ELCloseRegKey(key);
-
-  return ret;
-}
-
-LRESULT EAEDoEnterSizeMove()
-{
-  anchor = ELGetAnchorPoint(appletWindow);
-
-  return 0;
-}
-
-LRESULT EAEDoMove()
-{
-  int x, y;
-  RECT deskRect;
-
-  RECT mainRect;
-  if (!GetWindowRect(appletWindow, &mainRect))
-    return 1;
-
-  if (_wcsicmp(cs.verticalDirection, TEXT("up")) == 0)
-    y = mainRect.bottom;
-  else
-    y = mainRect.top;
-
-  if (_wcsicmp(cs.horizontalDirection, TEXT("left")) == 0)
-    x = mainRect.right;
-  else
-    x = mainRect.left;
-
-  appletMonitor = ELGetDesktopRect(&mainRect, &deskRect);
-  EAEUpdateSetting(CS_X, &x);
-  EAEUpdateSetting(CS_Y, &y);
-  EAEUpdateSetting(CS_RESOLUTION, &deskRect);
-
-  return 0;
-}
-
-HMONITOR EAEGetAppletMonitor()
-{
-  return appletMonitor;
-}
-
-LRESULT EAEDoMoving(RECT *lpRect)
-{
-  SNAPMOVEINFO smi;
-
-  if (cs.snapMove == 1)
-    {
-      smi.AppletWindow = appletWindow;
-      smi.origin = anchor;
-      smi.AppletRect = lpRect;
-
-      ELSnapMove(&smi);
-    }
-
-  return 0;
-}
-
-LRESULT EAEDoSizing(UINT edge, LPRECT rect)
-{
-  int height;
-  int width;
-
-  height = (*rect).bottom - (*rect).top;
-  width = (*rect).right - (*rect).left;
-
-  if ((cs.autoSize == 0) && (cs.snapSize == 1))
-    {
-      SNAPSIZEINFO ssi;
-      ssi.AppletWindow = appletWindow;
-      ssi.AppletEdge = edge;
-      ssi.AppletRect = rect;
-
-      ELSnapSize(&ssi);
-    }
-
-  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
-    }
-
-  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
-    }
-
-  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
-    }
-
-  if (edge == WMSZ_BOTTOMLEFT)
-    {
-        if (height < MIN_APPLET_SIZE)
-            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
-
-        if (width < MIN_APPLET_SIZE)
-            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
-    }
-
-  return 0;
-}
-
-LRESULT EAEDoSize(DWORD width, DWORD height)
-{
-  if (!IsWindowVisible(appletWindow))
-    return 1;
-
-  if (cs.autoSize == 1)
-    return 1;
-
-  EAEUpdateSetting(CS_WIDTH, &width);
-  EAEUpdateSetting(CS_HEIGHT, &height);
-
-  return 0;
-}
-
-LRESULT EAEDoDisplayChange()
-{
-  RECT wndRect;
-
-  if (!GetWindowRect(appletWindow, &wndRect))
-    return 1;
-
-  EAEDisplayChange(appletMonitor, &wndRect, &cs.resolution);
-  SetWindowPos(appletWindow, NULL, wndRect.left, wndRect.top, 0, 0,
-               SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOSENDCHANGING);
-
-  return 0;
-}
-
-LPCOMMONSETTINGS EAEReadSettings()
-{
-  HKEY key;
-  RECT deskRect, tmpRect;
-  WCHAR tmp[MAX_LINE_LENGTH];
-
-  swprintf(tmp, TEXT("%s\\Settings"), appletName);
-
-  ELOpenRegKey(tmp, &key, true);
-  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&cs.x, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&cs.y, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &cs.width, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &cs.height, 100);
-  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), cs.zPosition, (WCHAR*)TEXT("normal"));
-  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), cs.horizontalDirection, (WCHAR*)TEXT("right"));
-  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), cs.verticalDirection, (WCHAR*)TEXT("down"));
-  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), cs.directionOrientation, (WCHAR*)TEXT("horizontal"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &cs.flashCount, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &cs.flashInterval, 1000);
-  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &cs.enableFlash, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &cs.autoSize, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &cs.hiliteActive, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &cs.iconSize, 16);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &cs.iconSpacing, 1);
-  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), cs.schemeFile, (WCHAR*)TEXT("\0"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &cs.snapMove, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &cs.clickThrough, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("RaiseActive"), &cs.raise, 0);
-
-  tmpRect.left = cs.x;
-  tmpRect.right = tmpRect.left + cs.width;
-  tmpRect.top = cs.y;
-  tmpRect.bottom = tmpRect.top + cs.height;
-  ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &cs.resolution, &deskRect);
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &cs.snapSize, 1);
-  ELCloseRegKey(key);
-
-  return &cs;
-}
-
 //------
 // Function:    EAEHitTest
-// Requires:    int x - x co-ordinate of mouse
+// Requires:    HWND hwnd - window handle
+//              int x - x co-ordinate of mouse
 //              int y - y co-ordinate of mouse
 // Returns:     LRESULT
 // Purpose:     Determine the mouse pointer type for the hit test
 //-----
-LRESULT EAEHitTest(int guiBorder, bool autoSize, int x, int y)
+LRESULT EAEHitTest(HWND hwnd, int guiBorder, bool autoSize, int x, int y)
 {
   RECT r;
-  LRESULT res = HTCLIENT;
-  GetWindowRect(appletWindow, &r);
+  GetWindowRect(hwnd, &r);
   int dragBorder = guiBorder;
 
   if (dragBorder <= 0)
     dragBorder = 1;
 
   if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
-    res = HTCAPTION;
+    return HTCAPTION;
   else if ((GetAsyncKeyState(VK_MENU) & 0x8000) &&
            !autoSize)
     {
       if (x < (r.left + dragBorder) && y < (r.top + dragBorder))
-        res = HTTOPLEFT;
+        return HTTOPLEFT;
       else if (x < (r.left + dragBorder) && y > ((r.bottom - 1) - dragBorder))
-        res = HTBOTTOMLEFT;
+        return HTBOTTOMLEFT;
       else if (x < (r.left + dragBorder))
-        res = HTLEFT;
+        return HTLEFT;
       else if (x > ((r.right - 1) - dragBorder) && y < (r.top + dragBorder))
-        res = HTTOPRIGHT;
+        return HTTOPRIGHT;
       else if (x > ((r.right - 1) - dragBorder) && y > ((r.bottom - 1) - dragBorder))
-        res = HTBOTTOMRIGHT;
+        return HTBOTTOMRIGHT;
       else if (x > ((r.right - 1) - dragBorder))
-        res = HTRIGHT;
+        return HTRIGHT;
       else if (y < (r.top + dragBorder))
-        res = HTTOP;
+        return HTTOP;
       else if (y > ((r.bottom - 1) - dragBorder))
-        res = HTBOTTOM;
+        return HTBOTTOM;
     }
 
-
-  if (res != HTCLIENT)
-    SetWindowLong(appletWindow, GWL_EXSTYLE, GetWindowLong(appletWindow, GWL_EXSTYLE) & ~WS_EX_NOACTIVATE);
-  else
-    SetWindowLong(appletWindow, GWL_EXSTYLE, GetWindowLong(appletWindow, GWL_EXSTYLE) | WS_EX_NOACTIVATE);
-
-  return res;
+  return HTCLIENT;
 }
 
 //------
 // Function:    EAEUpdateGUI
-// Requires:    bool shadow - window shadow indicator
+// Requires:    HWND hwnd - window handle
+//              bool shadow - window shadow indicator
 //              WCHAR *zposition - z-order setting for window
 // Returns:     bool
 // Purpose:     Set the window shadow and z-order
 //-----
-HWND EAEUpdateGUI(LPGUIINFO guiInfo)
+HWND EAEUpdateGUI(HWND hwnd, bool shadow, WCHAR *zposition)
 {
-  HWND ret = HWND_NOTOPMOST;
-
-  appletGuiInfo = guiInfo;
-
   if (ELVersionInfo() != ELVI_2K)
     {
-      if (appletGuiInfo->windowShadow)
-        SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) | CS_DROPSHADOW);
+      if (shadow)
+        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
       else
-        SetClassLong(appletWindow, GCL_STYLE, GetClassLong(appletWindow, GCL_STYLE) & ~CS_DROPSHADOW);
+        SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) & ~CS_DROPSHADOW);
     }
 
+  // Set window z-order
+  if (_wcsicmp(zposition, TEXT("top")) == 0)
+    return HWND_TOPMOST;
+  else if (_wcsicmp(zposition, TEXT("bottom")) == 0)
+    return HWND_BOTTOM;
 
-  if (_wcsicmp(cs.zPosition, TEXT("bottom")) == 0)
-      ret = ELGetDesktopWindow();
-  else if (_wcsicmp(cs.zPosition, TEXT("top")) == 0)
-      ret = HWND_TOPMOST;
-
-  return ret;
+  return HWND_NOTOPMOST;
 }
 
-HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure, WCHAR *name)
+HWND EAEInitializeAppletWindow(HINSTANCE appletInstance, WNDPROC windowProcedure)
 {
   WNDCLASSEX wcx;
+  HWND appletWindow;
 
   ZeroMemory(&wcx, sizeof(WNDCLASSEX));
 
@@ -439,7 +127,7 @@
 
   // The class is registered, let's create the window
   appletWindow = CreateWindowEx (
-                   WS_EX_TOOLWINDOW|WS_EX_LAYERED|WS_EX_NOACTIVATE,
+                   WS_EX_TOOLWINDOW | WS_EX_LAYERED,
                    appletClass,
                    NULL,
                    WS_POPUP,
@@ -451,8 +139,6 @@
                    NULL
                  );
 
-  wcscpy(appletName, name);
-
   return appletWindow;
 }
 
@@ -548,25 +234,6 @@
   return true;
 }
 
-void EAEUpdateZPosition(WCHAR *zPosition, bool raise)
-{
-  HWND relativeWnd = NULL;
-  UINT flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOSENDCHANGING;
-
-  if (raise)
-    relativeWnd = HWND_TOPMOST;
-  else
-    {
-      flags |= SWP_NOACTIVATE;
-      if (wcsicmp(zPosition, TEXT("bottom")) == 0)
-        relativeWnd = ELGetDesktopWindow();
-      else if (wcsicmp(zPosition, TEXT("normal")) == 0)
-        relativeWnd = GetForegroundWindow();
-    }
-
-  SetWindowPos(appletWindow, relativeWnd, 0, 0, 0, 0, flags);
-}
-
 HWND EAEInitializeTooltipWindow(HINSTANCE appletInstance)
 {
   HWND tooltipWindow = NULL;

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -111,13 +111,17 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(pApplet->guiInfo.dragBorder, false,
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
+
       // Write the X and Y settings to the registry
     case WM_MOVE:
       return pApplet->DoMove();
@@ -262,7 +266,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeCommand"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)
@@ -506,6 +510,14 @@
   return 0;
 }
 
+LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
+{
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
+    windowPos->flags |= SWP_NOZORDER;
+
+  return 0;
+}
+
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);
@@ -626,8 +638,6 @@
   int dragBorder;
   RECT wndRect;
   HWND hWndInsertAfter;
-
-  EAEReadSettings();
   pSettings->ReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
@@ -642,7 +652,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
+  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();

Modified: trunk/Source/emergeCommand/Applet.h
===================================================================
--- trunk/Source/emergeCommand/Applet.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeCommand/Applet.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -80,6 +80,7 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
+    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMove();
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);

Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeCommand/Command.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -185,6 +185,14 @@
       RedrawWindow(hwnd, NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+    {
+      if (!_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")))
+        ((WINDOWPOS *)lParam)->flags |= SWP_NOZORDER;
+    }
+    break;
+
     // Don't close on alt-F4
     case WM_SYSCOMMAND:
     {
@@ -407,13 +415,7 @@
 {
   int dragBorder = pApplet->guiInfo.dragBorder + pApplet->guiInfo.bevelWidth + pApplet->guiInfo.padding;
 
-  if (ELVersionInfo() != ELVI_2K)
-    {
-      if (pApplet->guiInfo.windowShadow)
-        SetClassLong(commandWnd, GCL_STYLE, GetClassLong(commandWnd, GCL_STYLE) | CS_DROPSHADOW);
-      else
-        SetClassLong(commandWnd, GCL_STYLE, GetClassLong(commandWnd, GCL_STYLE) & ~CS_DROPSHADOW);
-    }
+  EAEUpdateGUI(commandWnd, pApplet->guiInfo.windowShadow, pSettings->GetZPosition());
 
   SetWindowPos(commandWnd, NULL, pSettings->GetX(), pSettings->GetY(),
                pSettings->GetWidth() + (2 * dragBorder), pSettings->GetHeight() + (2 * dragBorder),

Modified: trunk/Source/emergeHotkeys/Applet.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeHotkeys/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -34,7 +34,7 @@
   // Retrieve the window dimension attributes out of the registry
   hotkeyCount = 0;
 
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeHotkeys"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -73,13 +73,17 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
+
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -201,7 +205,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeLauncher"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)
@@ -556,6 +560,14 @@
   return 0;
 }
 
+LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
+{
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
+    windowPos->flags |= SWP_NOZORDER;
+
+  return 0;
+}
+
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);
@@ -706,7 +718,6 @@
   HWND hWndInsertAfter;
 
   pSettings->ReadSettings();
-  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -719,7 +730,7 @@
   if (activeBrush)
     DeleteObject(activeBrush);
 
-  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
+  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeLauncher/Applet.h
===================================================================
--- trunk/Source/emergeLauncher/Applet.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeLauncher/Applet.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -77,6 +77,7 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
+    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -22,6 +22,7 @@
 
 extern Applet *pApplet;
 AppletMenu *pAppletMenu = NULL;
+Settings *pSettings = NULL;
 
 //-----
 // Function:	WindowProcedure
@@ -34,7 +35,7 @@
 //-----
 LRESULT CALLBACK Applet::WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  if ((pApplet == NULL) || (pAppletMenu == NULL))
+  if ((pApplet == NULL) || (pAppletMenu == NULL) || (pSettings == NULL))
     return DefWindowProc(hwnd, message, wParam, lParam);
 
   switch (message)
@@ -71,32 +72,36 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(pApplet->guiInfo.dragBorder, pApplet->GetCommonSettings()->autoSize,
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
+
     case WM_ENTERSIZEMOVE:
-      return EAEDoEnterSizeMove();
+      return pApplet->DoEnterSizeMove(hwnd);
 
     case WM_SIZING:
-      return pApplet->DoSizing((UINT)wParam, (LPRECT)lParam);
+      return pApplet->DoSizing(hwnd, (UINT)wParam, (LPRECT)lParam);
 
     case WM_MOVING:
-      return EAEDoMoving((LPRECT)lParam);
+      return pApplet->DoMoving(hwnd, (LPRECT)lParam);
 
       // Write the X and Y settings to the registry
     case WM_MOVE:
-      return EAEDoMove();
+      return pApplet->DoMove();
 
       // Write the width height to the registry if the size changed
     case WM_SIZE:
       return pApplet->DoSize(LOWORD(lParam), HIWORD(lParam));
 
     case WM_DISPLAYCHANGE:
-      return EAEDoDisplayChange();
+      return pApplet->DoDisplayChange(hwnd);
 
     case WM_SYSCOMMAND:
       if (wParam == SC_CLOSE)
@@ -129,6 +134,7 @@
   mainInst = hInstance;
   fullScreen = false;
   activeWnd = NULL;
+  appletMonitor = NULL;
 
   activeBackgroundDC = NULL;
   inactiveBackgroundDC = NULL;
@@ -155,14 +161,21 @@
     RemoveTask(taskList.front()->GetWnd());
 }
 
-LPCOMMONSETTINGS Applet::GetCommonSettings()
+LRESULT Applet::DoDisplayChange(HWND hwnd)
 {
-  return cs;
+  RECT wndRect;
+
+  GetWindowRect(hwnd, &wndRect);
+  EAEDisplayChange(appletMonitor, &wndRect, pSettings->GetResolution());
+  SetWindowPos(hwnd, NULL, wndRect.left, wndRect.top, 0, 0,
+               SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);
+
+  return 0;
 }
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeTasks"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)
@@ -171,6 +184,7 @@
   toolWnd = EAEInitializeTooltipWindow(mainInst);
 
   // Initialize Settings and AppletMenu classes
+  pSettings = new Settings();
   pAppletMenu = new AppletMenu(mainWnd, mainInst);
   pAppletMenu->Initialize();
 
@@ -204,7 +218,7 @@
   if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
     return false;
 
-  if (cs->clickThrough != 1)
+  if (pSettings->GetClickThrough() != 1)
     return false;
 
   return true;
@@ -230,13 +244,13 @@
   int x, y, dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
   WCHAR windowTitle[MAX_LINE_LENGTH];
 
-  if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
-    x = r.right - cs->iconSize - dragBorder;
+  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
+    x = r.right - pSettings->GetIconSize() - dragBorder;
   else
     x = dragBorder;
 
-  if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
-    y = r.bottom - cs->iconSize - dragBorder;
+  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
+    y = r.bottom - pSettings->GetIconSize() - dragBorder;
   else
     y = dragBorder;
 
@@ -245,9 +259,9 @@
     {
       // Update the bounding rectangle of the icon
       rect.left = x;
-      rect.right = rect.left + cs->iconSize;
+      rect.right = rect.left + pSettings->GetIconSize();
       rect.top = y;
-      rect.bottom = rect.top + cs->iconSize;
+      rect.bottom = rect.top + pSettings->GetIconSize();
       taskList[i]->SetRect(rect);
 
       // Update the tooltip
@@ -257,78 +271,78 @@
 
       if (taskList[i]->GetVisible())
         {
-          if ((taskList[i]->GetWnd() == activeWnd) && cs->hiliteActive)
+          if ((taskList[i]->GetWnd() == activeWnd) && pSettings->GetHiliteActive())
             {
               InflateRect(&rect, 1, 1);
               EGFrameRect(hdc, &rect, guiInfo.alphaSelected, guiInfo.colorSelected);
             }
 
           // Draw the icon
-          DrawIconEx(hdc, x, y, taskList[i]->GetIcon(), cs->iconSize,
-                     cs->iconSize, 0, NULL, DI_NORMAL);
+          DrawIconEx(hdc, x, y, taskList[i]->GetIcon(), pSettings->GetIconSize(),
+                     pSettings->GetIconSize(), 0, NULL, DI_NORMAL);
         }
 
-      if (_wcsicmp(cs->directionOrientation, TEXT("vertical")) == 0)
+      if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) == 0)
         {
           // Set X and Y for the next icon
-          if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
+          if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
             {
-              y -= cs->iconSize + cs->iconSpacing;
+              y -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
 
               if (y < dragBorder)
                 {
-                  y = r.bottom - (int)cs->iconSize - dragBorder;
+                  y = r.bottom - (int)pSettings->GetIconSize() - dragBorder;
 
-                  if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
-                    x -= cs->iconSize + cs->iconSpacing;
+                  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
+                    x -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
                   else
-                    x += cs->iconSize + cs->iconSpacing;
+                    x += pSettings->GetIconSize() + pSettings->GetIconSpacing();
                 }
             }
           else
             {
-              y += cs->iconSize + cs->iconSpacing;
+              y += pSettings->GetIconSize() + pSettings->GetIconSpacing();
 
-              if (y > (r.bottom - (int)cs->iconSize - dragBorder))
+              if (y > (r.bottom - (int)pSettings->GetIconSize() - dragBorder))
                 {
                   y = dragBorder;
 
-                  if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
-                    x -= cs->iconSize + cs->iconSpacing;
+                  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
+                    x -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
                   else
-                    x += cs->iconSize + cs->iconSpacing;
+                    x += pSettings->GetIconSize() + pSettings->GetIconSpacing();
                 }
             }
         }
       else
         {
           // Set X and Y for the next icon
-          if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
+          if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
             {
-              x -= cs->iconSize + cs->iconSpacing;
+              x -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
 
               if (x < dragBorder)
                 {
-                  x = r.right - cs->iconSize - dragBorder;
+                  x = r.right - pSettings->GetIconSize() - dragBorder;
 
-                  if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
-                    y -= cs->iconSize + cs->iconSpacing;
+                  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
+                    y -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
                   else
-                    y += cs->iconSize + cs->iconSpacing;
+                    y += pSettings->GetIconSize() + pSettings->GetIconSpacing();
                 }
             }
           else
             {
-              x += cs->iconSize + cs->iconSpacing;
+              x += pSettings->GetIconSize() + pSettings->GetIconSpacing();
 
-              if (x > (r.right - (int)cs->iconSize - dragBorder))
+              if (x > (r.right - (int)pSettings->GetIconSize() - dragBorder))
                 {
                   x = dragBorder;
 
-                  if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
-                    y -= cs->iconSize + cs->iconSpacing;
+                  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
+                    y -= pSettings->GetIconSize() + pSettings->GetIconSpacing();
                   else
-                    y += cs->iconSize + cs->iconSpacing;
+                    y += pSettings->GetIconSize() + pSettings->GetIconSpacing();
                 }
             }
         }
@@ -355,20 +369,20 @@
   if (!IsWindowVisible(task))
       return 1;
 
-  if (cs->iconSize == 32)
+  if (pSettings->GetIconSize() == 32)
     icon = EGGetWindowIcon(task, false);
   else
     icon = EGGetWindowIcon(task, true);
 
   taskList.push_back(new Task(task, icon, mainInst));
 
-  if (cs->autoSize == 1)
+  if (pSettings->GetAutoSize())
     {
       AdjustRect(&wndRect);
       SetWindowPos(mainWnd, NULL, wndRect.left, wndRect.top,
                    wndRect.right - wndRect.left,
                    wndRect.bottom - wndRect.top,
-                   SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSENDCHANGING);
+                   SWP_NOZORDER | SWP_NOACTIVATE);
     }
 
   DrawAlphaBlend();
@@ -390,7 +404,7 @@
   if (iter == taskList.end())
       return 1;
 
-  if (cs->iconSize == 32)
+  if (pSettings->GetIconSize() == 32)
     icon = EGGetWindowIcon(task, false);
   else
     icon = EGGetWindowIcon(task, true);
@@ -419,13 +433,13 @@
   delete (*iter);
   taskList.erase(iter);
 
-  if (cs->autoSize == 1)
+  if (pSettings->GetAutoSize())
     {
       AdjustRect(&wndRect);
       SetWindowPos(mainWnd, NULL, wndRect.left, wndRect.top,
                    wndRect.right - wndRect.left,
                    wndRect.bottom - wndRect.top,
-                   SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSENDCHANGING);
+                   SWP_NOZORDER | SWP_NOACTIVATE);
     }
 
   DrawAlphaBlend();
@@ -456,13 +470,13 @@
           taskList.erase(iter);
           iter--;
           refresh = true;
-          if (cs->autoSize == 1)
+          if (pSettings->GetAutoSize())
             {
               AdjustRect(&wndRect);
               SetWindowPos(mainWnd, NULL, wndRect.left, wndRect.top,
                            wndRect.right - wndRect.left,
                            wndRect.bottom - wndRect.top,
-                           SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSENDCHANGING);
+                           SWP_NOZORDER | SWP_NOACTIVATE);
             }
         }
     }
@@ -571,14 +585,14 @@
 
   std::vector<Task*>::iterator iter = FindTask(task);
 
-  if ((iter == taskList.end()) || (cs->enableFlash == 0))
+  if ((iter == taskList.end()) || !pSettings->GetEnableFlash())
     return 1;
 
   if (flash && !(*iter)->GetFlash())
     {
       (*iter)->ToggleVisible();
       (*iter)->SetFlash(true);
-      SetTimer(mainWnd, taskID, cs->flashInterval, NULL);
+      SetTimer(mainWnd, taskID, pSettings->GetFlashInterval(), NULL);
       refresh = true;
     }
   else if (!flash && (*iter)->GetFlash())
@@ -630,23 +644,23 @@
 
   ZeroMemory(&autoSizeInfo, sizeof(AUTOSIZEINFO));
 
-  wndRect->left = (int)cs->x;
-  wndRect->top = (int)cs->y;
+  wndRect->left = (int)pSettings->GetX();
+  wndRect->top = (int)pSettings->GetY();
 
   autoSizeInfo.hwnd = mainWnd;
   autoSizeInfo.rect = wndRect;
   autoSizeInfo.dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
-  autoSizeInfo.iconSize = cs->iconSize;
-  autoSizeInfo.iconSpacing = cs->iconSpacing;
+  autoSizeInfo.iconSize = pSettings->GetIconSize();
+  autoSizeInfo.iconSpacing = pSettings->GetIconSpacing();
   autoSizeInfo.visibleIconCount = (UINT)taskList.size();
 
-  if (_wcsicmp(cs->directionOrientation, TEXT("vertical")) == 0)
+  if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) == 0)
     autoSizeInfo.orientation = ASI_VERTICAL;
 
-  if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
+  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
     autoSizeInfo.verticalDirection = ASI_UP;
 
-  if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
+  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
     autoSizeInfo.horizontalDirection = ASI_LEFT;
 
   EAEAutoSize(autoSizeInfo);
@@ -721,8 +735,6 @@
       if (!PtInRect(&rc, pt))
         {
           mouseOver = false;
-          if (cs->raise == 1)
-            EAEUpdateZPosition(cs->zPosition, false);
           DrawAlphaBlend();
           KillTimer(mainWnd, MOUSE_TIMER);
           clickThrough = false;
@@ -739,7 +751,7 @@
       std::vector<Task*>::iterator iter;
       UINT taskID = timerID - 100;
       bool refresh = true;
-      UINT flashCount = (UINT)cs->flashCount;
+      UINT flashCount = (UINT)pSettings->GetFlashCount();
 
       // Go through each of the elements in the trayIcons array
       for (iter = taskList.begin(); iter != taskList.end(); iter++)
@@ -787,18 +799,11 @@
   POINT pt;
 
   GetCursorPos(&pt);
-  KillTimer(mainWnd, MOUSE_TIMER);
   pAppletMenu->ActivateMenu(pt.x, pt.y);
 
   return 0;
 }
 
-void Applet::ResetTimer()
-{
-  SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
-  EAEUpdateZPosition(cs->zPosition, false);
-}
-
 LRESULT Applet::DoNCLButtonUp()
 {
   SetCursor(LoadCursor(NULL, IDC_ARROW));
@@ -811,8 +816,6 @@
   if (!mouseOver)
     {
       mouseOver = true;
-      if (cs->raise == 1)
-        EAEUpdateZPosition(cs->zPosition, true);
       DrawAlphaBlend();
       SetTimer(mainWnd, MOUSE_TIMER, MOUSE_POLL_TIME, NULL);
     }
@@ -820,23 +823,136 @@
   return 0;
 }
 
-LRESULT Applet::DoSizing(UINT edge, LPRECT rect)
+LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
 {
-  LRESULT ret = EAEDoSizing(edge, rect);
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
+    windowPos->flags |= SWP_NOZORDER;
 
+  return 0;
+}
+
+LRESULT Applet::DoEnterSizeMove(HWND hwnd)
+{
+  anchor = ELGetAnchorPoint(hwnd);
+
+  return 0;
+}
+
+LRESULT Applet::DoMoving(HWND hwnd, RECT *lpRect)
+{
+  SNAPMOVEINFO smi;
+
+  if (pSettings->GetSnapMove())
+    {
+      smi.AppletWindow = hwnd;
+      smi.origin = anchor;
+      smi.AppletRect = lpRect;
+
+      ELSnapMove(&smi);
+    }
+
+  return 0;
+}
+
+LRESULT Applet::DoSizing(HWND hwnd, UINT edge, LPRECT rect)
+{
+  int height;
+  int width;
+
+  height = (*rect).bottom - (*rect).top;
+  width = (*rect).right - (*rect).left;
+
+  if (!pSettings->GetAutoSize() && pSettings->GetSnapSize())
+    {
+      SNAPSIZEINFO ssi;
+      ssi.AppletWindow = hwnd;
+      ssi.AppletEdge = edge;
+      ssi.AppletRect = rect;
+
+      ELSnapSize(&ssi);
+    }
+
+  if ((edge == WMSZ_TOPRIGHT) || (edge == WMSZ_TOP) || (edge == WMSZ_RIGHT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_BOTTOMRIGHT) || (edge == WMSZ_BOTTOM))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).right = (*rect).left + MIN_APPLET_SIZE;
+    }
+
+  if ((edge == WMSZ_TOPLEFT) || (edge == WMSZ_LEFT))
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).top = (*rect).bottom - MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+  if (edge == WMSZ_BOTTOMLEFT)
+    {
+        if (height < MIN_APPLET_SIZE)
+            (*rect).bottom = (*rect).top + MIN_APPLET_SIZE;
+
+        if (width < MIN_APPLET_SIZE)
+            (*rect).left = (*rect).right - MIN_APPLET_SIZE;
+    }
+
+
   UpdateIcons();
   DrawAlphaBlend();
+  return 0;
+}
 
-  return ret;
+LRESULT Applet::DoMove()
+{
+  int x, y;
+  RECT deskRect;
+
+  RECT mainRect;
+  if (!GetWindowRect(mainWnd, &mainRect))
+    return 1;
+
+  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
+    y = mainRect.bottom;
+  else
+    y = mainRect.top;
+
+  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
+    x = mainRect.right;
+  else
+    x = mainRect.left;
+
+  appletMonitor = ELGetDesktopRect(&mainRect, &deskRect);
+  pSettings->SetPosition(x, y);
+  pSettings->SetResolution(&deskRect);
+
+  return 0;
 }
 
 LRESULT Applet::DoSize(DWORD width, DWORD height)
 {
   int dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
-  width -= 2 * dragBorder;
-  height -= 2 * dragBorder;
 
-  return EAEDoSize(width, height);
+  if (!IsWindowVisible(mainWnd))
+    return 1;
+
+  if (pSettings->GetAutoSize())
+    return 1;
+
+  pSettings->SetSize(width - (2 * dragBorder), height - (2 * dragBorder));
+
+  return 0;
 }
 
 LRESULT Applet::DoEmergeNotify(UINT messageClass, UINT message)
@@ -844,15 +960,15 @@
   if (messageClass & EMERGE_CORE)
     {
       if (message == CORE_HIDE)
-        SetWindowPos(mainWnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|
-                     SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW);
+        SetWindowPos(mainWnd, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER |
+                     SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_HIDEWINDOW);
       else if (message == CORE_SHOW)
-        SetWindowPos(mainWnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|
-                     SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_SHOWWINDOW);
+        SetWindowPos(mainWnd, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER |
+                     SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_SHOWWINDOW);
 
       if (message == CORE_REFRESH)
         {
-          EAEUpdateSetting(CS_SCHEME, ESEGetScheme());
+          pSettings->SetSchemeFile(ESEGetScheme());
           UpdateGUI();
         }
 
@@ -936,7 +1052,7 @@
 
   while (iter != taskList.end())
     {
-      if (cs->iconSize == 32)
+      if (pSettings->GetIconSize() == 32)
         icon = EGGetWindowIcon((*iter)->GetWnd(), false);
       else
         icon = EGGetWindowIcon((*iter)->GetWnd(), true);
@@ -954,46 +1070,45 @@
   HWND hWndInsertAfter;
   RECT wndRect;
 
-  cs = EAEReadSettings();
+  pSettings->ReadSettings();
+  ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
-  ESELoadScheme(cs->schemeFile, &guiInfo);
-
-  if (cs->clickThrough == 2)
+  if (pSettings->GetClickThrough() == 2)
     guiInfo.alphaBackground = 0;
 
   ResetTaskIcons();
 
   dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding;
 
-  SetWindowPos(mainWnd, NULL, 0, 0, 0, 0,
-               SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER);
+  ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
+  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
 
-  if (cs->autoSize == 1)
+  if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);
   else
     {
-      if (_wcsicmp(cs->verticalDirection, TEXT("up")) == 0)
-        wndRect.top = cs->y - (cs->height + (2 * dragBorder));
+      if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
+        wndRect.top = pSettings->GetY() - (pSettings->GetHeight() + (2 * dragBorder));
       else
-        wndRect.top = cs->y;
+        wndRect.top = pSettings->GetY();
 
-      if (_wcsicmp(cs->horizontalDirection, TEXT("left")) == 0)
-        wndRect.left = cs->x - (cs->width + (2 * dragBorder));
+      if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
+        wndRect.left = pSettings->GetX() - (pSettings->GetWidth() + (2 * dragBorder));
       else
-        wndRect.left = cs->x;
+        wndRect.left = pSettings->GetX();
 
-      wndRect.bottom = wndRect.top + cs->height + (2 * dragBorder);
-      wndRect.right = wndRect.left + cs->width + (2 * dragBorder);
+      wndRect.bottom = wndRect.top + pSettings->GetHeight() + (2 * dragBorder);
+      wndRect.right = wndRect.left + pSettings->GetWidth() + (2 * dragBorder);
     }
 
-  EAEDisplayChange(EAEGetAppletMonitor(), &wndRect, &cs->resolution);
+  EAEDisplayChange(appletMonitor, &wndRect, pSettings->GetResolution());
 
   SetWindowPos(mainWnd, hWndInsertAfter, wndRect.left, wndRect.top,
-               wndRect.right - wndRect.left, wndRect.bottom - wndRect.top,
-               SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_SHOWWINDOW);
+               wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, SWP_NOACTIVATE | SWP_NOSENDCHANGING);
 
+  ShowWindow(mainWnd, SW_SHOW);
+
   for (i = 0; i < taskList.size(); i++)
     {
       if (taskList[i]->GetFlash())
@@ -1001,7 +1116,7 @@
           taskID = (UINT)taskList[i]->GetWnd() + 100;
 
           KillTimer(mainWnd, taskID);
-          SetTimer(mainWnd, taskID, cs->flashInterval, NULL);
+          SetTimer(mainWnd, taskID, pSettings->GetFlashInterval(), NULL);
         }
 
       taskList[i]->UpdateIcon();

Modified: trunk/Source/emergeTasks/Applet.h
===================================================================
--- trunk/Source/emergeTasks/Applet.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Applet.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -36,6 +36,8 @@
 #define MOUSE_TIMER 0
 #define MOUSE_POLL_TIME 250
 
+#define MIN_APPLET_SIZE 10
+
 #include "AppletMenu.h"
 #include <vector>
 #include <process.h>
@@ -57,12 +59,13 @@
     HDC activeBackgroundDC, inactiveBackgroundDC;
     bool fullScreen;
     void ResetTaskIcons();
+    POINT anchor;
     RECT oldrt;
+    HMONITOR appletMonitor;
     void UpdateIcons();
     static LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
     static BOOL CALLBACK EnumTasksList(HWND hwnd, LPARAM lParam);
     static BOOL CALLBACK EnumFullScreenWindows(HWND hwnd, LPARAM lParam);
-    LPCOMMONSETTINGS cs;
 
   public:
     Applet(HINSTANCE hInstance);
@@ -74,8 +77,12 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
+    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
+    LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
-    LRESULT DoSizing(UINT edge, LPRECT rect);
+    LRESULT DoMoving(HWND hwnd, LPRECT lpRect);
+    LRESULT DoEnterSizeMove(HWND hwnd);
+    LRESULT DoSizing(HWND hwnd, UINT edge, LPRECT rect);
     LRESULT DoEmergeNotify(UINT messageClass, UINT message);
     LRESULT DoDefault(UINT message, UINT shellMessage, HWND task);
     LRESULT TaskMouseEvent(UINT message, LPARAM lParam);
@@ -84,7 +91,7 @@
     LRESULT ModifyTask(HWND task);
     LRESULT RemoveTask(HWND task);
     LRESULT SetFlash(HWND task, bool flash);
-    LPCOMMONSETTINGS GetCommonSettings();
+    LRESULT DoDisplayChange(HWND hwnd);
     bool ClickThrough();
     void CreateBrushes();
     void DestroyBrushes();
@@ -95,7 +102,6 @@
     void DrawAlphaBlend();
     void UpdateGUI();
     void SetActive(HWND hwnd);
-    void ResetTimer();
     GUIINFO guiInfo;
   };
 

Modified: trunk/Source/emergeTasks/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -22,6 +22,7 @@
 
 extern AppletMenu *pAppletMenu;
 extern Applet *pApplet;
+extern Settings *pSettings;
 Config *pConfig = NULL;
 
 //------
@@ -161,7 +162,7 @@
 
       if (GetOpenFileName(&ofn))
         {
-          EAEUpdateSetting(CS_SCHEME, file);
+          pSettings->SetSchemeFile(file);
           pApplet->UpdateGUI();
         }
       break;
@@ -169,7 +170,7 @@
     case 201:
       wcscpy(file, ESEGetScheme());
       ESEEditScheme(mainWnd, file);
-      EAEUpdateSetting(CS_SCHEME, ESEGetScheme());
+      pSettings->SetSchemeFile(ESEGetScheme());
     case 202:
       pApplet->UpdateGUI();
       break;
@@ -177,11 +178,9 @@
     case 300:
       if (pConfig->Show() == IDOK)
         {
-          EAEDoMove();
+          pApplet->DoMove();
           pApplet->UpdateGUI();
         }
       break;
     }
-
-  pApplet->ResetTimer();
 }

Modified: trunk/Source/emergeTasks/Config.cpp
===================================================================
--- trunk/Source/emergeTasks/Config.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Config.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -19,10 +19,9 @@
 //---
 
 #include "Config.h"
-#include "Applet.h"
 
 extern Config *pConfig;
-extern Applet *pApplet;
+extern Settings *pSettings;
 
 BOOL CALLBACK Config::ConfigDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -65,52 +64,49 @@
   SetWindowPos(hwndDlg, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE);
   ELStealFocus(hwndDlg);
 
-  SetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, pApplet->GetCommonSettings()->flashInterval, false);
-  SetDlgItemInt(hwndDlg, IDC_FLASHCOUNT, pApplet->GetCommonSettings()->flashCount, false);
+  SetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, pSettings->GetFlashInterval(), false);
+  SetDlgItemInt(hwndDlg, IDC_FLASHCOUNT, pSettings->GetFlashCount(), false);
 
   SendDlgItemMessage(hwndDlg, IDC_ICONSPACINGUPDOWN, UDM_SETRANGE, (WPARAM)0, (LPARAM)100);
   SendDlgItemMessage(hwndDlg, IDC_FLASHINTERVALUPDOWN, UDM_SETRANGE, (WPARAM)0, (LPARAM)10000);
   SendDlgItemMessage(hwndDlg, IDC_FLASHCOUNTUPDOWN, UDM_SETRANGE, (WPARAM)0, (LPARAM)100);
 
-  if (pApplet->GetCommonSettings()->autoSize == 1)
+  if (pSettings->GetAutoSize())
     SendDlgItemMessage(hwndDlg, IDC_AUTOSIZE, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (pApplet->GetCommonSettings()->snapMove == 1)
+  if (pSettings->GetSnapMove())
     SendDlgItemMessage(hwndDlg, IDC_SNAPMOVE, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (pApplet->GetCommonSettings()->snapSize == 1)
+  if (pSettings->GetSnapSize())
     SendDlgItemMessage(hwndDlg, IDC_SNAPSIZE, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (pApplet->GetCommonSettings()->hiliteActive == 1)
+  if (pSettings->GetHiliteActive())
     SendDlgItemMessage(hwndDlg, IDC_ACTIVETASK, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (pApplet->GetCommonSettings()->enableFlash == 1)
+  if (pSettings->GetEnableFlash())
     SendDlgItemMessage(hwndDlg, IDC_ENABLEFLASH, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (pApplet->GetCommonSettings()->raise == 1)
-    SendDlgItemMessage(hwndDlg, IDC_RAISEACTIVE, BM_SETCHECK, BST_CHECKED, 0);
-
-  if (pApplet->GetCommonSettings()->clickThrough != 0)
+  if (pSettings->GetClickThrough() != 0)
     SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (_wcsicmp(pApplet->GetCommonSettings()->directionOrientation, TEXT("vertical")) == 0)
+  if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_SETCHECK, BST_CHECKED, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (_wcsicmp(pApplet->GetCommonSettings()->horizontalDirection, TEXT("left")) == 0)
+  if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_SETCHECK, BST_CHECKED, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (_wcsicmp(pApplet->GetCommonSettings()->verticalDirection, TEXT("up")) == 0)
+  if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_UP, BM_SETCHECK, BST_CHECKED, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_SETCHECK, BST_CHECKED, 0);
 
-  if (_wcsicmp(pApplet->GetCommonSettings()->zPosition, TEXT("top")) == 0)
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_TOP, BM_SETCHECK, BST_CHECKED, 0);
-  else if (_wcsicmp(pApplet->GetCommonSettings()->zPosition, TEXT("bottom")) == 0)
+  else if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
     SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_SETCHECK, BST_CHECKED, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_SETCHECK, BST_CHECKED, 0);
@@ -118,20 +114,20 @@
   SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("16x16"));
   SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("32x32"));
 
-  if (pApplet->GetCommonSettings()->iconSize == 32)
+  if (pSettings->GetIconSize() == 32)
     SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_SETCURSEL, (WPARAM)1, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_SETCURSEL, (WPARAM)0, 0);
 
-  SetDlgItemInt(hwndDlg, IDC_ICONSPACING, pApplet->GetCommonSettings()->iconSpacing, false);
+  SetDlgItemInt(hwndDlg, IDC_ICONSPACING, pSettings->GetIconSpacing(), false);
 
   SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGHMETHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Full"));
   SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGHMETHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("Background"));
 
-  if (pApplet->GetCommonSettings()->clickThrough == 0)
+  if (pSettings->GetClickThrough() == 0)
     EnableWindow(clickThroughWnd, false);
 
-  if (pApplet->GetCommonSettings()->clickThrough == 2)
+  if (pSettings->GetClickThrough() == 2)
     SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGHMETHOD, CB_SETCURSEL, (WPARAM)1, 0);
   else
     SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGHMETHOD, CB_SETCURSEL, (WPARAM)0, 0);
@@ -167,109 +163,142 @@
   BOOL success;
   UINT result;
   int size, index;
-  DWORD tmp;
 
   if (SendDlgItemMessage(hwndDlg, IDC_AUTOSIZE, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      if (!pSettings->GetAutoSize())
+        pSettings->SetAutoSize(true);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_AUTOSIZE, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_AUTOSIZE, &tmp);
+    {
+      if (pSettings->GetAutoSize())
+        pSettings->SetAutoSize(false);
+    }
 
   if (SendDlgItemMessage(hwndDlg, IDC_SNAPMOVE, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      if (!pSettings->GetSnapMove())
+        pSettings->SetSnapMove(true);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_SNAPMOVE, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_SNAPMOVE, &tmp);
+    {
+      if (pSettings->GetSnapMove())
+        pSettings->SetSnapMove(false);
+    }
 
-  if (SendDlgItemMessage(hwndDlg, IDC_RAISEACTIVE, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
-  else if (SendDlgItemMessage(hwndDlg, IDC_RAISEACTIVE, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_RAISEACTIVE, &tmp);
-
   if (SendDlgItemMessage(hwndDlg, IDC_SNAPSIZE, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      if (!pSettings->GetSnapSize())
+        pSettings->SetSnapSize(true);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_SNAPSIZE, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_SNAPSIZE, &tmp);
+    {
+      if (pSettings->GetSnapSize())
+        pSettings->SetSnapSize(false);
+    }
 
   if (SendDlgItemMessage(hwndDlg, IDC_ACTIVETASK, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      if (!pSettings->GetHiliteActive())
+        pSettings->SetHiliteActive(true);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_ACTIVETASK, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_HIGHLIGHTACTIVE, &tmp);
+    {
+      if (pSettings->GetHiliteActive())
+        pSettings->SetHiliteActive(false);
+    }
 
   if (SendDlgItemMessage(hwndDlg, IDC_ENABLEFLASH, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      if (!pSettings->GetEnableFlash())
+        pSettings->SetEnableFlash(true);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_ENABLEFLASH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_ENABLEFLASH, &tmp);
+    {
+      if (pSettings->GetEnableFlash())
+        pSettings->SetEnableFlash(false);
+    }
 
   if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    tmp = 1;
+    {
+      index = (int)SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGHMETHOD, CB_GETCURSEL, 0, 0);
+      pSettings->SetClickThrough(index + 1);
+    }
   else if (SendDlgItemMessage(hwndDlg, IDC_CLICKTHROUGH, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
-    tmp = 0;
-  EAEUpdateSetting(CS_CLICKTHROUGH, &tmp);
+    {
+      if (pSettings->GetClickThrough() != 0)
+        pSettings->SetClickThrough(0);
+    }
 
   result = GetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, &success, false);
-  if (success)
-    EAEUpdateSetting(CS_FLASHINTERVAL, &result);
+  if (success && (result != pSettings->GetFlashInterval()))
+    pSettings->SetFlashInterval(result);
   else if (!success)
     {
       MessageBox(GetDesktopWindow(), TEXT("Invalid value for flash interval"),
                  TEXT("emergeTasks"), MB_OK | MB_TOPMOST | MB_ICONERROR);
-      SetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, pApplet->GetCommonSettings()->flashInterval, false);
+      SetDlgItemInt(hwndDlg, IDC_FLASHINTERVAL, pSettings->GetFlashInterval(), false);
       return false;
     }
 
   result = GetDlgItemInt(hwndDlg, IDC_FLASHCOUNT, &success, false);
-  if (success)
-    EAEUpdateSetting(CS_FLASHCOUNT, &result);
+  if (success && (result != pSettings->GetFlashCount()))
+    pSettings->SetFlashCount(result);
   else if (!success)
     {
       MessageBox(GetDesktopWindow(), TEXT("Invalid value for flash count"),
                  TEXT("emergeTasks"), MB_OK | MB_TOPMOST | MB_ICONERROR);
-      SetDlgItemInt(hwndDlg, IDC_FLASHCOUNT, pApplet->GetCommonSettings()->flashCount, false);
+      SetDlgItemInt(hwndDlg, IDC_FLASHCOUNT, pSettings->GetFlashCount(), false);
       return false;
     }
 
   if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_VERTICALDIRECTION, (WCHAR*)TEXT("Up"));
+    if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Up"));
   if (SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_VERTICALDIRECTION, (WCHAR*)TEXT("Down"));
+    if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("down")) != 0)
+      pSettings->SetVerticalDirection((WCHAR*)TEXT("Down"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_DIRECTIONORIENTATION, (WCHAR*)TEXT("Vertical"));
+    if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) != 0)
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Vertical"));
   if (SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_DIRECTIONORIENTATION, (WCHAR*)TEXT("Horizontal"));
+    if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("horizontal")) != 0)
+      pSettings->SetDirectionOrientation((WCHAR*)TEXT("Horizontal"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_HORIZONTALDIRECTION, (WCHAR*)TEXT("Left"));
+    if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) != 0)
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Left"));
   if (SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_HORIZONTALDIRECTION, (WCHAR*)TEXT("Right"));
+    if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("right")) != 0)
+      pSettings->SetHorizontalDirection((WCHAR*)TEXT("Right"));
 
   if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_ZPOSITION, (WCHAR*)TEXT("Top"));
+    if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
+      pSettings->SetZPosition((WCHAR*)TEXT("Top"));
   if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_ZPOSITION, (WCHAR*)TEXT("Bottom"));
+    if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
+      pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
   if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    EAEUpdateSetting(CS_ZPOSITION, (WCHAR*)TEXT("Normal"));
+    if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
+      pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
 
   index = (int)SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_GETCURSEL, 0, 0);
   if (index == 1)
     size = 32;
   else
     size = 16;
-  EAEUpdateSetting(CS_ICONSIZE, &size);
+  if ((int)pSettings->GetIconSize() != size)
+    pSettings->SetIconSize(size);
 
   result = GetDlgItemInt(hwndDlg, IDC_ICONSPACING, &success, false);
-  if (success)
-    EAEUpdateSetting(CS_ICONSPACING, &result);
+  if (success && (result != pSettings->GetIconSpacing()))
+    pSettings->SetIconSpacing(result);
   else if (!success)
     {
       MessageBox(GetDesktopWindow(), TEXT("Invalid value for icon spacing"),
                  TEXT("emergeTasks"), MB_OK | MB_TOPMOST | MB_ICONERROR);
-      SetDlgItemInt(hwndDlg, IDC_ICONSPACING, pApplet->GetCommonSettings()->iconSpacing, false);
+      SetDlgItemInt(hwndDlg, IDC_ICONSPACING, pSettings->GetIconSpacing(), false);
       return false;
     }
 

Modified: trunk/Source/emergeTasks/Makefile
===================================================================
--- trunk/Source/emergeTasks/Makefile	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Makefile	2007-11-26 15:15:26 UTC (rev 1489)
@@ -1,18 +1,12 @@
 LIBS = -L../bin -lshell32 -lcomctl32 -lemergeLib -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
 TARGET = emergeTasks
-#OBJS = $(OBJ_DIR)/Task.o \
+OBJS = $(OBJ_DIR)/Task.o \
 			 $(OBJ_DIR)/main.o \
 			 $(OBJ_DIR)/Applet.o \
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
 			 $(OBJ_DIR)/$(TARGET).res
-OBJS = $(OBJ_DIR)/Task.o \
-			 $(OBJ_DIR)/main.o \
-			 $(OBJ_DIR)/Applet.o \
-			 $(OBJ_DIR)/AppletMenu.o \
-			 $(OBJ_DIR)/Config.o \
-			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in
 

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -50,7 +50,6 @@
   ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
   ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
   ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("RaiseActive"), &raise, 0);
 
   tmpRect.left = x;
   tmpRect.right = tmpRect.left + width;
@@ -90,28 +89,6 @@
     }
 }
 
-void Settings::SetRaiseActive(bool raise)
-{
-  DWORD tmp = 0;
-  HKEY key;
-
-  if (raise)
-    tmp = 1;
-
-  (*this).raise = tmp;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("RaiseActive"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-bool Settings::GetRaiseActive()
-{
-  return (raise == 1);
-}
-
 void Settings::SetIconSpacing(DWORD iconSpacing)
 {
   HKEY key;

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/Settings.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -67,8 +67,6 @@
     RECT *GetResolution();
     void SetResolution(RECT *deskRect);
     void SetClickThrough(DWORD clickThrough);
-    void SetRaiseActive(bool raise);
-    bool GetRaiseActive();
 
   private:
     DWORD x, y, width, height, iconSize, iconSpacing, clickThrough;
@@ -79,7 +77,6 @@
     DWORD autoSize, hiliteActive, snapMove, snapSize;
     WCHAR schemeFile[MAX_LINE_LENGTH];
     RECT resolution;
-    DWORD raise;
   };
 
 #endif

Modified: trunk/Source/emergeTasks/emergeTasks.rc
===================================================================
--- trunk/Source/emergeTasks/emergeTasks.rc	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/emergeTasks.rc	2007-11-26 15:15:26 UTC (rev 1489)
@@ -60,7 +60,7 @@
 
 IDI_DEFAULT	ICON	"icons\\emerge.ico"
 
-IDD_CONFIG DIALOGEX 0, 0, 180, 280
+IDD_CONFIG DIALOGEX 0, 0, 180, 265
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "emergeTasks Configuration"
 FONT 8, "MS Sans Serif"
@@ -81,37 +81,35 @@
 	EDITTEXT	IDC_ICONSPACING,145,48,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_ICONSPACINGUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 
-	CONTROL	"Raise when Active",IDC_RAISEACTIVE,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,65,75,10
-
-	GROUPBOX	"Flash",IDC_STATIC,5,80,170,25,WS_GROUP
-	CONTROL	"Enable",IDC_ENABLEFLASH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,10,90,40,10
-	LTEXT		"Interval",IDC_STATIC,55,90,25,8
-	EDITTEXT	IDC_FLASHINTERVAL,80,90,35,12,ES_AUTOHSCROLL|ES_NUMBER
+	GROUPBOX	"Flash",IDC_STATIC,5,65,170,25,WS_GROUP
+	CONTROL	"Enable",IDC_ENABLEFLASH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,10,75,40,10
+	LTEXT		"Interval",IDC_STATIC,55,75,25,8
+	EDITTEXT	IDC_FLASHINTERVAL,80,73,35,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_FLASHINTERVALUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
-	LTEXT		"Count",IDC_STATIC,120,90,20,8
-	EDITTEXT	IDC_FLASHCOUNT,140,88,30,12,ES_AUTOHSCROLL|ES_NUMBER
+	LTEXT		"Count",IDC_STATIC,120,75,20,8
+	EDITTEXT	IDC_FLASHCOUNT,140,73,30,12,ES_AUTOHSCROLL|ES_NUMBER
   CONTROL "",IDC_FLASHCOUNTUPDOWN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_SETBUDDYINT|UDS_ARROWKEYS|UDS_ALIGNRIGHT|UDS_NOTHOUSANDS,0,0,10,12
 
-	GROUPBOX	"ZPosition",IDC_STATIC,5,110,170,25,WS_GROUP
-	CONTROL	"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,120,40,10
-	CONTROL	"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,70,120,40,10
-	CONTROL	"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,130,120,40,10
+	GROUPBOX	"ZPosition",IDC_STATIC,5,95,170,25,WS_GROUP
+	CONTROL	"Top",IDC_TOP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,10,105,40,10
+	CONTROL	"Normal",IDC_NORMAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,70,105,40,10
+	CONTROL	"Bottom",IDC_BOTTOM,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,130,105,40,10
 
-	GROUPBOX	"Direction",IDC_STATIC,5,140,170,110,WS_GROUP
+	GROUPBOX	"Direction",IDC_STATIC,5,125,170,110,WS_GROUP
 
-	GROUPBOX	"Orientation",IDC_STATIC,10,150,160,25,WS_GROUP
-	CONTROL	"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,160,50,10
-	CONTROL	"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,160,50,10
+	GROUPBOX	"Orientation",IDC_STATIC,10,135,160,25,WS_GROUP
+	CONTROL	"Vertical",IDC_VERTICAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,145,50,10
+	CONTROL	"Horizontal",IDC_HORIZONTAL,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,145,50,10
 
-	GROUPBOX	"Horizontal",IDC_STATIC,10,185,160,25,WS_GROUP
-	CONTROL	"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,195,60,10
-	CONTROL	"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,195,60,10
+	GROUPBOX	"Horizontal",IDC_STATIC,10,170,160,25,WS_GROUP
+	CONTROL	"Align Left",IDC_LEFT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,180,60,10
+	CONTROL	"Align Right",IDC_RIGHT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,180,60,10
 
-	GROUPBOX	"Vertical",IDC_STATIC,10,220,160,25,WS_GROUP
-	CONTROL	"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,230,60,10
-	CONTROL	"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,230,60,10
+	GROUPBOX	"Vertical",IDC_STATIC,10,205,160,25,WS_GROUP
+	CONTROL	"Align Bottom",IDC_UP,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,15,215,60,10
+	CONTROL	"Align Top",IDC_DOWN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,100,215,60,10
 
-	PUSHBUTTON	"OK",IDOK,5,260,70,14
-	PUSHBUTTON	"Cancel",IDCANCEL,105,260,70,14
+	PUSHBUTTON	"OK",IDOK,5,245,70,14
+	PUSHBUTTON	"Cancel",IDCANCEL,105,245,70,14
 END
 

Modified: trunk/Source/emergeTasks/resource.h
===================================================================
--- trunk/Source/emergeTasks/resource.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTasks/resource.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -31,7 +31,6 @@
 #define IDC_SNAPSIZE            203
 #define IDC_CLICKTHROUGH        204
 #define IDC_CLICKTHROUGHMETHOD  205
-#define IDC_RAISEACTIVE         206
 
 #define IDC_ENABLEFLASH         300
 #define IDC_FLASHINTERVAL       301

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTray/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -113,13 +113,17 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, pSettings->GetAutoSize(),
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
+
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -261,7 +265,7 @@
 
   ZeroMemory(&wincl, sizeof(WNDCLASSEX));
 
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeTray"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)
@@ -681,6 +685,14 @@
   return 0;
 }
 
+LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
+{
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
+    windowPos->flags |= SWP_NOZORDER;
+
+  return 0;
+}
+
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);
@@ -846,7 +858,6 @@
   RECT wndRect;
 
   pSettings->ReadSettings();
-  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -856,7 +867,7 @@
 
   ShowWindow(mainWnd, SW_HIDE);
 
-  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
+  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
 
   if (pSettings->GetAutoSize())
     AdjustRect(&wndRect);

Modified: trunk/Source/emergeTray/Applet.h
===================================================================
--- trunk/Source/emergeTray/Applet.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeTray/Applet.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -317,6 +317,7 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
+    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoEmergeNotify(UINT messageClass, UINT message);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-11-26 15:15:26 UTC (rev 1489)
@@ -75,13 +75,17 @@
       // Handles the resizing of the window
     case WM_NCHITTEST:
       if (pApplet->ClickThrough() != 1)
-        return EAEHitTest(pApplet->guiInfo.dragBorder, false,
+        return EAEHitTest(hwnd, pApplet->guiInfo.dragBorder, false,
                           LOWORD(lParam), HIWORD(lParam));
       else
         SetWindowLong(hwnd, GWL_EXSTYLE,
                       GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
       break;
 
+      // Repaint the icons as the window size is changing
+    case WM_WINDOWPOSCHANGING:
+      return pApplet->DoWindowPosChanging((WINDOWPOS *)lParam);
+
     case WM_ENTERSIZEMOVE:
       return pApplet->DoEnterSizeMove(hwnd);
 
@@ -197,7 +201,7 @@
 
 UINT Applet::Initialize()
 {
-  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure, (WCHAR*)TEXT("emergeVWM"));
+  mainWnd = EAEInitializeAppletWindow(mainInst, WindowProcedure);
 
   // If the window failed to get created, unregister the class and quit the program
   if (!mainWnd)
@@ -630,10 +634,7 @@
       if (found)
         {
           if (message == WM_LBUTTONDOWN)
-            {
-              ELStealFocus(mainWnd);
-              SwitchDesktop(row, column, false);
-            }
+            SwitchDesktop(row, column, false);
 
           if (message == WM_LBUTTONDBLCLK)
             {
@@ -911,6 +912,14 @@
   return 0;
 }
 
+LRESULT Applet::DoWindowPosChanging(WINDOWPOS *windowPos)
+{
+  if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) == 0)
+    windowPos->flags |= SWP_NOZORDER;
+
+  return 0;
+}
+
 LRESULT Applet::DoEnterSizeMove(HWND hwnd)
 {
   anchor = ELGetAnchorPoint(hwnd);
@@ -1083,7 +1092,6 @@
   ti.lpszText = LPSTR_TEXTCALLBACK;
 
   pSettings->ReadSettings();
-  EAEReadSettings();
   ESELoadScheme(pSettings->GetSchemeFile(), &guiInfo);
 
   if (pSettings->GetClickThrough() == 2)
@@ -1096,7 +1104,7 @@
   // Remove the tooltip region
   SendMessage(toolWnd, TTM_DELTOOL, 0, (LPARAM)&ti);
 
-  hWndInsertAfter = EAEUpdateGUI(&guiInfo);
+  hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pSettings->GetZPosition());
 
   wndRect.left = pSettings->GetX();
   wndRect.top = pSettings->GetY();

Modified: trunk/Source/emergeVWM/Applet.h
===================================================================
--- trunk/Source/emergeVWM/Applet.h	2007-11-26 14:58:16 UTC (rev 1488)
+++ trunk/Source/emergeVWM/Applet.h	2007-11-26 15:15:26 UTC (rev 1489)
@@ -86,6 +86,7 @@
     LRESULT DoNCRButtonUp();
     LRESULT DoNCLButtonUp();
     LRESULT DoSetCursor();
+    LRESULT DoWindowPosChanging(WINDOWPOS *windowPos);
     LRESULT DoMove();
     LRESULT DoSize(DWORD width, DWORD height);
     LRESULT DoMoving(HWND hwnd, LPRECT lpRect);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1490] trunk/Source

From: <ir0nh34d@us...> - 2007-11-26 20:53

Revision: 1490
          http://emerge.svn.sourceforge.net/emerge/?rev=1490&view=rev
Author:   ir0nh34d
Date:     2007-11-26 12:53:53 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Added BaseSettings class

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h

Added Paths:
-----------
    trunk/Source/common/
    trunk/Source/common/BaseSettings.cpp
    trunk/Source/common/BaseSettings.h

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-11-26 15:15:26 UTC (rev 1489)
+++ trunk/Source/EmergeDesktop.cbp	2007-11-26 20:53:53 UTC (rev 1490)
@@ -283,6 +283,18 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="common\BaseAppletMenu.cpp">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="common\BaseAppletMenu.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="common\BaseSettings.cpp">
+			<Option target="emergeTasks - Release" />
+		</Unit>
+		<Unit filename="common\BaseSettings.h">
+			<Option target="emergeTasks - Release" />
+		</Unit>
 		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
 			<Option target="emergeAppletEngine - Release" />
 		</Unit>

Added: trunk/Source/common/BaseSettings.cpp
===================================================================
--- trunk/Source/common/BaseSettings.cpp	                        (rev 0)
+++ trunk/Source/common/BaseSettings.cpp	2007-11-26 20:53:53 UTC (rev 1490)
@@ -0,0 +1,408 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include "BaseSettings.h"
+#include <stdio.h>
+
+BaseSettings::BaseSettings(WCHAR *appletName)
+{
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
+}
+
+BaseSettings::~BaseSettings()
+{}
+
+void BaseSettings::ReadSettings()
+{
+  HKEY key;
+  RECT deskRect, tmpRect;
+
+  ELOpenRegKey(keyString, &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
+  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
+
+  tmpRect.left = x;
+  tmpRect.right = tmpRect.left + width;
+  tmpRect.top = y;
+  tmpRect.bottom = tmpRect.top + height;
+  ELGetDesktopRect(&tmpRect, &deskRect);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
+  ELCloseRegKey(key);
+}
+
+void BaseSettings::SetSize(DWORD width, DWORD height)
+{
+  HKEY key;
+
+  (*this).width = width;
+  (*this).height = height;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetIconSize(DWORD iconSize)
+{
+  HKEY key;
+
+  (*this).iconSize = iconSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetIconSpacing(DWORD iconSpacing)
+{
+  HKEY key;
+
+  (*this).iconSpacing = iconSpacing;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetPosition(DWORD x, DWORD y)
+{
+  HKEY key;
+
+  (*this).x = x;
+  (*this).y = y;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetResolution(RECT *deskRect)
+{
+  HKEY key;
+
+  CopyRect(&resolution, deskRect);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
+      ELCloseRegKey(key);
+    }
+}
+
+RECT *BaseSettings::GetResolution()
+{
+  return &resolution;
+}
+
+int BaseSettings::GetX()
+{
+  return x;
+}
+
+DWORD BaseSettings::GetIconSize()
+{
+  return iconSize;
+}
+
+DWORD BaseSettings::GetIconSpacing()
+{
+  return iconSpacing;
+}
+
+int BaseSettings::GetY()
+{
+  return y;
+}
+
+DWORD BaseSettings::GetWidth()
+{
+  return width;
+}
+
+DWORD BaseSettings::GetHeight()
+{
+  return height;
+}
+
+WCHAR *BaseSettings::GetZPosition()
+{
+  return zPosition;
+}
+
+WCHAR *BaseSettings::GetHorizontalDirection()
+{
+  return horizontalDirection;
+}
+
+WCHAR *BaseSettings::GetVerticalDirection()
+{
+  return verticalDirection;
+}
+
+WCHAR *BaseSettings::GetDirectionOrientation()
+{
+  return directionOrientation;
+}
+
+DWORD BaseSettings::GetFlashCount()
+{
+  return flashCount;
+}
+
+DWORD BaseSettings::GetFlashInterval()
+{
+  return flashInterval;
+}
+
+DWORD BaseSettings::GetClickThrough()
+{
+  return clickThrough;
+}
+
+bool BaseSettings::GetEnableFlash()
+{
+  return (enableFlash == 1);
+}
+
+bool BaseSettings::GetAutoSize()
+{
+  return (autoSize == 1);
+}
+
+bool BaseSettings::GetSnapMove()
+{
+  return (snapMove == 1);
+}
+
+bool BaseSettings::GetSnapSize()
+{
+  return (snapSize == 1);
+}
+
+WCHAR *BaseSettings::GetSchemeFile()
+{
+  return schemeFile;
+}
+
+void BaseSettings::SetZPosition(WCHAR *zPosition)
+{
+  HKEY key;
+
+  wcscpy((*this).zPosition, zPosition);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetHorizontalDirection(WCHAR *horizontalDirection)
+{
+  HKEY key;
+
+  wcscpy((*this).horizontalDirection, horizontalDirection);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetVerticalDirection(WCHAR *verticalDirection)
+{
+  HKEY key;
+
+  wcscpy((*this).verticalDirection, verticalDirection);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetDirectionOrientation(WCHAR *directionOrientation)
+{
+  HKEY key;
+
+  wcscpy((*this).directionOrientation, directionOrientation);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetFlashCount(DWORD flashCount)
+{
+  HKEY key;
+
+  (*this).flashCount = flashCount;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetFlashInterval(DWORD flashInterval)
+{
+  HKEY key;
+
+  (*this).flashInterval = flashInterval;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetEnableFlash(bool enableFlash)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (enableFlash)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).enableFlash = enableFlash;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetClickThrough(DWORD clickThrough)
+{
+  HKEY key;
+
+  (*this).clickThrough = clickThrough;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetAutoSize(bool autoSize)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (autoSize)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).autoSize = autoSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSnapMove(bool snapMove)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (snapMove)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).snapMove = snapMove;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSnapSize(bool snapSize)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (snapSize)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).snapSize = snapSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSchemeFile(WCHAR *schemeFile)
+{
+  HKEY key;
+
+  wcscpy((*this).schemeFile, schemeFile);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
+      ELCloseRegKey(key);
+    }
+}

Added: trunk/Source/common/BaseSettings.h
===================================================================
--- trunk/Source/common/BaseSettings.h	                        (rev 0)
+++ trunk/Source/common/BaseSettings.h	2007-11-26 20:53:53 UTC (rev 1490)
@@ -0,0 +1,84 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#ifndef __BASESETTINGS_H
+#define __BASESETTINGS_H
+
+#define UNICODE 1
+
+#include "../emergeLib/emergeLib.h"
+
+class BaseSettings
+  {
+  public:
+    BaseSettings(WCHAR *appletName);
+    ~BaseSettings();
+    void ReadSettings();
+    DWORD GetIconSize();
+    DWORD GetIconSpacing();
+    int GetX();
+    int GetY();
+    DWORD GetWidth();
+    DWORD GetHeight();
+    WCHAR *GetZPosition();
+    WCHAR *GetHorizontalDirection();
+    WCHAR *GetVerticalDirection();
+    WCHAR *GetDirectionOrientation();
+    DWORD GetFlashCount();
+    DWORD GetFlashInterval();
+    bool GetEnableFlash();
+    bool GetAutoSize();
+    bool GetSnapMove();
+    bool GetSnapSize();
+    WCHAR *GetSchemeFile();
+    DWORD GetClickThrough();
+    void SetPosition(DWORD x, DWORD y);
+    void SetSize(DWORD width, DWORD height);
+    void SetZPosition(WCHAR *zPosition);
+    void SetHorizontalDirection(WCHAR *horizontalDirection);
+    void SetVerticalDirection(WCHAR *verticalDirection);
+    void SetDirectionOrientation(WCHAR *directionOrientation);
+    void SetFlashCount(DWORD flashCount);
+    void SetFlashInterval(DWORD flashInterval);
+    void SetEnableFlash(bool enableFlash);
+    void SetAutoSize(bool autoSize);
+    void SetSnapMove(bool snapMove);
+    void SetSnapSize(bool snapSize);
+    void SetSchemeFile(WCHAR *schemeFile);
+    void SetIconSize(DWORD iconSize);
+    void SetIconSpacing(DWORD iconSpacing);
+    RECT *GetResolution();
+    void SetResolution(RECT *deskRect);
+    void SetClickThrough(DWORD clickThrough);
+
+  private:
+    DWORD x, y, width, height, iconSize, iconSpacing, clickThrough;
+    WCHAR zPosition[MAX_LINE_LENGTH];
+    WCHAR keyString[MAX_LINE_LENGTH];
+    WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
+    directionOrientation[MAX_LINE_LENGTH];
+    DWORD flashCount, flashInterval, enableFlash;
+    DWORD autoSize, snapMove, snapSize;
+    WCHAR schemeFile[MAX_LINE_LENGTH];
+    RECT resolution;
+  };
+
+#endif
+

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-11-26 15:15:26 UTC (rev 1489)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-11-26 20:53:53 UTC (rev 1490)
@@ -19,48 +19,57 @@
 //---
 
 #include "Settings.h"
+#include <stdio.h>
 
+WCHAR appletName[] = TEXT("emergeTasks");
+
 Settings::Settings()
-{}
+  :BaseSettings(appletName)
+{
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
+}
 
-Settings::~Settings()
-{}
-
 void Settings::ReadSettings()
 {
+  BaseSettings::ReadSettings();
+
   HKEY key;
-  RECT deskRect, tmpRect;
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true);
-  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
-  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
-  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
-  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
-  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
-  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+  ELOpenRegKey(keyString, &key, true);
   ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &hiliteActive, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
-  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
-
-  tmpRect.left = x;
-  tmpRect.right = tmpRect.left + width;
-  tmpRect.top = y;
-  tmpRect.bottom = tmpRect.top + height;
-  ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
   ELCloseRegKey(key);
 }
 
+bool Settings::GetHiliteActive()
+{
+  return (hiliteActive == 1);
+}
+
+void Settings::SetHiliteActive(bool hiliteActive)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (hiliteActive)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).hiliteActive = hiliteActive;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+/*Settings::Settings()
+{}
+
+Settings::~Settings()
+{}
+
 void Settings::SetSize(DWORD width, DWORD height)
 {
   HKEY key;
@@ -220,11 +229,6 @@
   return (snapSize == 1);
 }
 
-bool Settings::GetHiliteActive()
-{
-  return (hiliteActive == 1);
-}
-
 WCHAR *Settings::GetSchemeFile()
 {
   return schemeFile;
@@ -397,25 +401,6 @@
     }
 }
 
-void Settings::SetHiliteActive(bool hiliteActive)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (hiliteActive)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).hiliteActive = hiliteActive;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
 void Settings::SetSchemeFile(WCHAR *schemeFile)
 {
   HKEY key;
@@ -428,3 +413,4 @@
       ELCloseRegKey(key);
     }
 }
+*/

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-11-26 15:15:26 UTC (rev 1489)
+++ trunk/Source/emergeTasks/Settings.h	2007-11-26 20:53:53 UTC (rev 1490)
@@ -22,8 +22,23 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
+#include "../common/BaseSettings.h"
 
-class Settings
+class Settings: public BaseSettings
+{
+  public:
+    Settings();
+    void ReadSettings();
+    bool GetHiliteActive();
+    void SetHiliteActive(bool autoSize);
+  private:
+    DWORD hiliteActive;
+    WCHAR keyString[MAX_LINE_LENGTH];
+};
+
+#endif
+
+/*class Settings
   {
   public:
     Settings();
@@ -80,4 +95,4 @@
   };
 
 #endif
-
+*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1491] trunk/Source

From: <ir0nh34d@us...> - 2007-11-27 15:58

Revision: 1491
          http://emerge.svn.sourceforge.net/emerge/?rev=1491&view=rev
Author:   ir0nh34d
Date:     2007-11-27 07:58:44 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Updated for Base classes

Modified Paths:
--------------
    trunk/Source/applet_globals.in
    trunk/Source/emergeTasks/Makefile

Modified: trunk/Source/applet_globals.in
===================================================================
--- trunk/Source/applet_globals.in	2007-11-26 20:53:53 UTC (rev 1490)
+++ trunk/Source/applet_globals.in	2007-11-27 15:58:44 UTC (rev 1491)
@@ -4,6 +4,7 @@
 WINDRESFLAGS = -O COFF
 BIN_DIR = bin
 OBJ_DIR = .objs
+BASE_DIR = common
 BUILD = release
 LDFLAGS = -Wall -mwindows -mno-cygwin
 CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
@@ -29,19 +30,24 @@
 makedir:
 	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@if [ ! -d ../$(BASE_DIR)/$(OBJ_DIR) ]; then mkdir ../$(BASE_DIR)/$(OBJ_DIR); fi
 clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
+	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res ../$(BASE_DIR)/$(OBJ_DIR)/*.o
 else
 makedir:
 	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
 	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
+	@if not exist ..\$(BASE_DIR)\$(OBJ_DIR) mkdir ..\$(BASE_DIR)\$(OBJ_DIR)
 clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
+	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res ..\$(BASE_DIR)\$(OBJ_DIR)\*.o
 endif
 
 $(OBJ_DIR)/%.o: %.cpp
 	$(CC) $(CFLAGS) -c $< -o $@
 
+../$(BASE_DIR)/$(OBJ_DIR)/%.o: ../$(BASE_DIR)/%.cpp
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
 	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
 

Modified: trunk/Source/emergeTasks/Makefile
===================================================================
--- trunk/Source/emergeTasks/Makefile	2007-11-26 20:53:53 UTC (rev 1490)
+++ trunk/Source/emergeTasks/Makefile	2007-11-27 15:58:44 UTC (rev 1491)
@@ -6,6 +6,7 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
+			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1492] trunk/Source

From: <ir0nh34d@us...> - 2007-11-28 01:12

Revision: 1492
          http://emerge.svn.sourceforge.net/emerge/?rev=1492&view=rev
Author:   ir0nh34d
Date:     2007-11-27 17:12:03 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Standardized BaseSettings class

Modified Paths:
--------------
    trunk/Source/common/BaseSettings.cpp
    trunk/Source/common/BaseSettings.h
    trunk/Source/emergeTasks/Settings.cpp
    trunk/Source/emergeTasks/Settings.h

Modified: trunk/Source/common/BaseSettings.cpp
===================================================================
--- trunk/Source/common/BaseSettings.cpp	2007-11-27 15:58:44 UTC (rev 1491)
+++ trunk/Source/common/BaseSettings.cpp	2007-11-28 01:12:03 UTC (rev 1492)
@@ -43,9 +43,6 @@
   ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
   ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
   ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
-  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
   ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
   ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
   ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
@@ -187,26 +184,11 @@
   return directionOrientation;
 }
 
-DWORD BaseSettings::GetFlashCount()
-{
-  return flashCount;
-}
-
-DWORD BaseSettings::GetFlashInterval()
-{
-  return flashInterval;
-}
-
 DWORD BaseSettings::GetClickThrough()
 {
   return clickThrough;
 }
 
-bool BaseSettings::GetEnableFlash()
-{
-  return (enableFlash == 1);
-}
-
 bool BaseSettings::GetAutoSize()
 {
   return (autoSize == 1);
@@ -279,51 +261,6 @@
     }
 }
 
-void BaseSettings::SetFlashCount(DWORD flashCount)
-{
-  HKEY key;
-
-  (*this).flashCount = flashCount;
-
-  if (ELOpenRegKey(keyString, &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount);
-      ELCloseRegKey(key);
-    }
-}
-
-void BaseSettings::SetFlashInterval(DWORD flashInterval)
-{
-  HKEY key;
-
-  (*this).flashInterval = flashInterval;
-
-  if (ELOpenRegKey(keyString, &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval);
-      ELCloseRegKey(key);
-    }
-}
-
-void BaseSettings::SetEnableFlash(bool enableFlash)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (enableFlash)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).enableFlash = enableFlash;
-
-  if (ELOpenRegKey(keyString, &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
 void BaseSettings::SetClickThrough(DWORD clickThrough)
 {
   HKEY key;

Modified: trunk/Source/common/BaseSettings.h
===================================================================
--- trunk/Source/common/BaseSettings.h	2007-11-27 15:58:44 UTC (rev 1491)
+++ trunk/Source/common/BaseSettings.h	2007-11-28 01:12:03 UTC (rev 1492)
@@ -41,9 +41,6 @@
     WCHAR *GetHorizontalDirection();
     WCHAR *GetVerticalDirection();
     WCHAR *GetDirectionOrientation();
-    DWORD GetFlashCount();
-    DWORD GetFlashInterval();
-    bool GetEnableFlash();
     bool GetAutoSize();
     bool GetSnapMove();
     bool GetSnapSize();
@@ -55,9 +52,6 @@
     void SetHorizontalDirection(WCHAR *horizontalDirection);
     void SetVerticalDirection(WCHAR *verticalDirection);
     void SetDirectionOrientation(WCHAR *directionOrientation);
-    void SetFlashCount(DWORD flashCount);
-    void SetFlashInterval(DWORD flashInterval);
-    void SetEnableFlash(bool enableFlash);
     void SetAutoSize(bool autoSize);
     void SetSnapMove(bool snapMove);
     void SetSnapSize(bool snapSize);
@@ -74,7 +68,6 @@
     WCHAR keyString[MAX_LINE_LENGTH];
     WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
     directionOrientation[MAX_LINE_LENGTH];
-    DWORD flashCount, flashInterval, enableFlash;
     DWORD autoSize, snapMove, snapSize;
     WCHAR schemeFile[MAX_LINE_LENGTH];
     RECT resolution;

Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp	2007-11-27 15:58:44 UTC (rev 1491)
+++ trunk/Source/emergeTasks/Settings.cpp	2007-11-28 01:12:03 UTC (rev 1492)
@@ -37,6 +37,9 @@
 
   ELOpenRegKey(keyString, &key, true);
   ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &hiliteActive, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
+  ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
   ELCloseRegKey(key);
 }
 
@@ -64,136 +67,6 @@
     }
 }
 
-/*Settings::Settings()
-{}
-
-Settings::~Settings()
-{}
-
-void Settings::SetSize(DWORD width, DWORD height)
-{
-  HKEY key;
-
-  (*this).width = width;
-  (*this).height = height;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetIconSize(DWORD iconSize)
-{
-  HKEY key;
-
-  (*this).iconSize = iconSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetIconSpacing(DWORD iconSpacing)
-{
-  HKEY key;
-
-  (*this).iconSpacing = iconSpacing;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetPosition(DWORD x, DWORD y)
-{
-  HKEY key;
-
-  (*this).x = x;
-  (*this).y = y;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetResolution(RECT *deskRect)
-{
-  HKEY key;
-
-  CopyRect(&resolution, deskRect);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
-      ELCloseRegKey(key);
-    }
-}
-
-RECT *Settings::GetResolution()
-{
-  return &resolution;
-}
-
-int Settings::GetX()
-{
-  return x;
-}
-
-DWORD Settings::GetIconSize()
-{
-  return iconSize;
-}
-
-DWORD Settings::GetIconSpacing()
-{
-  return iconSpacing;
-}
-
-int Settings::GetY()
-{
-  return y;
-}
-
-DWORD Settings::GetWidth()
-{
-  return width;
-}
-
-DWORD Settings::GetHeight()
-{
-  return height;
-}
-
-WCHAR *Settings::GetZPosition()
-{
-  return zPosition;
-}
-
-WCHAR *Settings::GetHorizontalDirection()
-{
-  return horizontalDirection;
-}
-
-WCHAR *Settings::GetVerticalDirection()
-{
-  return verticalDirection;
-}
-
-WCHAR *Settings::GetDirectionOrientation()
-{
-  return directionOrientation;
-}
-
 DWORD Settings::GetFlashCount()
 {
   return flashCount;
@@ -204,88 +77,11 @@
   return flashInterval;
 }
 
-DWORD Settings::GetClickThrough()
-{
-  return clickThrough;
-}
-
 bool Settings::GetEnableFlash()
 {
   return (enableFlash == 1);
 }
 
-bool Settings::GetAutoSize()
-{
-  return (autoSize == 1);
-}
-
-bool Settings::GetSnapMove()
-{
-  return (snapMove == 1);
-}
-
-bool Settings::GetSnapSize()
-{
-  return (snapSize == 1);
-}
-
-WCHAR *Settings::GetSchemeFile()
-{
-  return schemeFile;
-}
-
-void Settings::SetZPosition(WCHAR *zPosition)
-{
-  HKEY key;
-
-  wcscpy((*this).zPosition, zPosition);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetHorizontalDirection(WCHAR *horizontalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).horizontalDirection, horizontalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetVerticalDirection(WCHAR *verticalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).verticalDirection, verticalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetDirectionOrientation(WCHAR *directionOrientation)
-{
-  HKEY key;
-
-  wcscpy((*this).directionOrientation, directionOrientation);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
-      ELCloseRegKey(key);
-    }
-}
-
 void Settings::SetFlashCount(DWORD flashCount)
 {
   HKEY key;
@@ -330,87 +126,3 @@
       ELCloseRegKey(key);
     }
 }
-
-void Settings::SetClickThrough(DWORD clickThrough)
-{
-  HKEY key;
-
-  (*this).clickThrough = clickThrough;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetAutoSize(bool autoSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (autoSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).autoSize = autoSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapMove(bool snapMove)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapMove)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapMove = snapMove;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapSize(bool snapSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapSize = snapSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSchemeFile(WCHAR *schemeFile)
-{
-  HKEY key;
-
-  wcscpy((*this).schemeFile, schemeFile);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
-      ELCloseRegKey(key);
-    }
-}
-*/

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-11-27 15:58:44 UTC (rev 1491)
+++ trunk/Source/emergeTasks/Settings.h	2007-11-28 01:12:03 UTC (rev 1492)
@@ -31,68 +31,16 @@
     void ReadSettings();
     bool GetHiliteActive();
     void SetHiliteActive(bool autoSize);
-  private:
-    DWORD hiliteActive;
-    WCHAR keyString[MAX_LINE_LENGTH];
-};
-
-#endif
-
-/*class Settings
-  {
-  public:
-    Settings();
-    ~Settings();
-    void ReadSettings();
-    DWORD GetIconSize();
-    DWORD GetIconSpacing();
-    int GetX();
-    int GetY();
-    DWORD GetWidth();
-    DWORD GetHeight();
-    WCHAR *GetZPosition();
-    WCHAR *GetHorizontalDirection();
-    WCHAR *GetVerticalDirection();
-    WCHAR *GetDirectionOrientation();
-    DWORD GetFlashCount();
-    DWORD GetFlashInterval();
-    bool GetEnableFlash();
-    bool GetAutoSize();
-    bool GetSnapMove();
-    bool GetSnapSize();
-    bool GetHiliteActive();
-    WCHAR *GetSchemeFile();
-    DWORD GetClickThrough();
-    void SetPosition(DWORD x, DWORD y);
-    void SetSize(DWORD width, DWORD height);
-    void SetZPosition(WCHAR *zPosition);
-    void SetHorizontalDirection(WCHAR *horizontalDirection);
-    void SetVerticalDirection(WCHAR *verticalDirection);
-    void SetDirectionOrientation(WCHAR *directionOrientation);
     void SetFlashCount(DWORD flashCount);
     void SetFlashInterval(DWORD flashInterval);
     void SetEnableFlash(bool enableFlash);
-    void SetAutoSize(bool autoSize);
-    void SetSnapMove(bool snapMove);
-    void SetSnapSize(bool snapSize);
-    void SetHiliteActive(bool autoSize);
-    void SetSchemeFile(WCHAR *schemeFile);
-    void SetIconSize(DWORD iconSize);
-    void SetIconSpacing(DWORD iconSpacing);
-    RECT *GetResolution();
-    void SetResolution(RECT *deskRect);
-    void SetClickThrough(DWORD clickThrough);
-
+    DWORD GetFlashCount();
+    DWORD GetFlashInterval();
+    bool GetEnableFlash();
   private:
-    DWORD x, y, width, height, iconSize, iconSpacing, clickThrough;
-    WCHAR zPosition[MAX_LINE_LENGTH];
-    WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
-    directionOrientation[MAX_LINE_LENGTH];
+    DWORD hiliteActive;
+    WCHAR keyString[MAX_LINE_LENGTH];
     DWORD flashCount, flashInterval, enableFlash;
-    DWORD autoSize, hiliteActive, snapMove, snapSize;
-    WCHAR schemeFile[MAX_LINE_LENGTH];
-    RECT resolution;
-  };
+};
 
 #endif
-*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1494] trunk/Source

From: <ir0nh34d@us...> - 2007-11-28 01:39

Revision: 1494
          http://emerge.svn.sourceforge.net/emerge/?rev=1494&view=rev
Author:   ir0nh34d
Date:     2007-11-27 17:39:25 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Updated for BaseSettings class

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/emergeLauncher/Makefile
    trunk/Source/emergeLauncher/Settings.cpp
    trunk/Source/emergeLauncher/Settings.h

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-11-28 01:24:03 UTC (rev 1493)
+++ trunk/Source/EmergeDesktop.cbp	2007-11-28 01:39:25 UTC (rev 1494)
@@ -283,17 +283,15 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="common\BaseAppletMenu.cpp">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="common\BaseAppletMenu.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
 		<Unit filename="common\BaseSettings.cpp">
 			<Option target="emergeTasks - Release" />
+			<Option target="emergeCommand - Release" />
+			<Option target="emergeLauncher - Release" />
 		</Unit>
 		<Unit filename="common\BaseSettings.h">
 			<Option target="emergeTasks - Release" />
+			<Option target="emergeCommand - Release" />
+			<Option target="emergeLauncher - Release" />
 		</Unit>
 		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
 			<Option target="emergeAppletEngine - Release" />

Modified: trunk/Source/emergeLauncher/Makefile
===================================================================
--- trunk/Source/emergeLauncher/Makefile	2007-11-28 01:24:03 UTC (rev 1493)
+++ trunk/Source/emergeLauncher/Makefile	2007-11-28 01:39:25 UTC (rev 1494)
@@ -6,6 +6,7 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
+			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeLauncher/Settings.cpp
===================================================================
--- trunk/Source/emergeLauncher/Settings.cpp	2007-11-28 01:24:03 UTC (rev 1493)
+++ trunk/Source/emergeLauncher/Settings.cpp	2007-11-28 01:39:25 UTC (rev 1494)
@@ -20,8 +20,12 @@
 
 #include "Settings.h"
 
+WCHAR appletName[] = TEXT("emergeLauncher");
+
 Settings::Settings(HINSTANCE mainInstance)
+  :BaseSettings(appletName)
 {
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
   (*this).mainInstance = mainInstance;
 }
 
@@ -34,321 +38,6 @@
     }
 }
 
-void Settings::ReadSettings()
-{
-  HKEY key;
-  RECT deskRect, tmpRect;
-
-  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
-  ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
-
-  tmpRect.left = x;
-  tmpRect.right = tmpRect.left + width;
-  tmpRect.top = y;
-  tmpRect.bottom = tmpRect.top + height;
-  ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
-  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
-  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
-  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
-  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile,(WCHAR*) TEXT("\0"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
-  ELCloseRegKey(key);
-}
-
-void Settings::SetSize(DWORD width, DWORD height)
-{
-  HKEY key;
-
-  (*this).width = width;
-  (*this).height = height;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetPosition(DWORD x, DWORD y)
-{
-  HKEY key;
-
-  (*this).x = x;
-  (*this).y = y;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetResolution(RECT *deskRect)
-{
-  HKEY key;
-
-  CopyRect(&resolution, deskRect);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
-      ELCloseRegKey(key);
-    }
-}
-
-int Settings::GetX()
-{
-  return x;
-}
-
-int Settings::GetY()
-{
-  return y;
-}
-
-RECT *Settings::GetResolution()
-{
-  return &resolution;
-}
-
-DWORD Settings::GetWidth()
-{
-  return width;
-}
-
-DWORD Settings::GetHeight()
-{
-  return height;
-}
-
-DWORD Settings::GetIconSpacing()
-{
-  return iconSpacing;
-}
-
-WCHAR *Settings::GetZPosition()
-{
-  return zPosition;
-}
-
-WCHAR *Settings::GetHorizontalDirection()
-{
-  return horizontalDirection;
-}
-
-WCHAR *Settings::GetVerticalDirection()
-{
-  return verticalDirection;
-}
-
-WCHAR *Settings::GetDirectionOrientation()
-{
-  return directionOrientation;
-}
-
-bool Settings::GetAutoSize()
-{
-  return (autoSize == 1);
-}
-
-DWORD Settings::GetClickThrough()
-{
-  return clickThrough;
-}
-
-bool Settings::GetSnapMove()
-{
-  return (snapMove == 1);
-}
-
-bool Settings::GetSnapSize()
-{
-  return (snapSize == 1);
-}
-
-DWORD Settings::GetIconSize()
-{
-  return iconSize;
-}
-
-WCHAR *Settings::GetSchemeFile()
-{
-  return schemeFile;
-}
-
-void Settings::SetZPosition(WCHAR *zPosition)
-{
-  HKEY key;
-
-  wcscpy((*this).zPosition, zPosition);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetHorizontalDirection(WCHAR *horizontalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).horizontalDirection, horizontalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetVerticalDirection(WCHAR *verticalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).verticalDirection, verticalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetDirectionOrientation(WCHAR *directionOrientation)
-{
-  HKEY key;
-
-  wcscpy((*this).directionOrientation, directionOrientation);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetClickThrough(DWORD clickThrough)
-{
-  HKEY key;
-
-  (*this).clickThrough = clickThrough;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetAutoSize(bool autoSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (autoSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).autoSize = autoSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapSize(bool snapSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapSize = snapSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapMove(bool snapMove)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapMove)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapMove = snapMove;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetIconSize(DWORD iconSize)
-{
-  HKEY key;
-
-  (*this).iconSize = iconSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetIconSpacing(DWORD iconSpacing)
-{
-  HKEY key;
-
-  (*this).iconSize = iconSpacing;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSize);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSchemeFile(WCHAR *schemeFile)
-{
-  HKEY key;
-
-  wcscpy((*this).schemeFile, schemeFile);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
-      ELCloseRegKey(key);
-    }
-}
-
 void Settings::PopulateItems()
 {
   HKEY key;
@@ -366,7 +55,7 @@
   swprintf(tipValue, TEXT("Tip%d"), index);
   swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey(keyString, &key, true);
 
   while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("\0")))
     {
@@ -374,7 +63,8 @@
       ELReadRegString(key, tipValue, tip, (WCHAR*)TEXT("\0"));
       ELReadRegString(key, workingDirValue, workingDir, (WCHAR*)TEXT("\0"));
 
-      itemList.push_back(new Item(mainInstance, app, icon, tip, workingDir, iconSize));
+      itemList.push_back(new Item(mainInstance, app, icon, tip, workingDir,
+        BaseSettings::GetIconSize()));
 
       index++;
 
@@ -403,7 +93,7 @@
   swprintf(iconValue, TEXT("Icon%d"), index);
   swprintf(tipValue, TEXT("Tip%d"), index);
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey(keyString, &key, true);
 
   while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("")))
     {
@@ -437,7 +127,7 @@
   swprintf(tipValue, TEXT("Tip%d"), index);
   swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
+  ELOpenRegKey(keyString, &key, true);
 
   ELWriteRegString(key, commandValue, command);
   ELWriteRegString(key, iconValue, iconPath);
@@ -456,4 +146,3 @@
 {
   return itemList[index];
 }
-

Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h	2007-11-28 01:24:03 UTC (rev 1493)
+++ trunk/Source/emergeLauncher/Settings.h	2007-11-28 01:39:25 UTC (rev 1494)
@@ -22,44 +22,14 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
+#include "../common/BaseSettings.h"
 #include "Item.h"
 
-class Settings
+class Settings: public BaseSettings
   {
   public:
     Settings(HINSTANCE mainInstance);
     ~Settings();
-    void ReadSettings();
-    int GetX();
-    int GetY();
-    DWORD GetWidth();
-    DWORD GetHeight();
-    WCHAR *GetZPosition();
-    WCHAR *GetHorizontalDirection();
-    WCHAR *GetVerticalDirection();
-    WCHAR *GetDirectionOrientation();
-    bool GetAutoSize();
-    bool GetSnapMove();
-    bool GetSnapSize();
-    DWORD GetClickThrough();
-    DWORD GetIconSize();
-    DWORD GetIconSpacing();
-    WCHAR *GetSchemeFile();
-    RECT *GetResolution();
-    void SetResolution(RECT *deskRect);
-    void SetPosition(DWORD x, DWORD y);
-    void SetSize(DWORD width, DWORD height);
-    void SetZPosition(WCHAR *zPosition);
-    void SetHorizontalDirection(WCHAR *horizontalDirection);
-    void SetVerticalDirection(WCHAR *verticalDirection);
-    void SetDirectionOrientation(WCHAR *directionOrientation);
-    void SetAutoSize(bool autoSize);
-    void SetSnapMove(bool snapMove);
-    void SetSnapSize(bool snapSize);
-    void SetIconSize(DWORD iconSize);
-    void SetIconSpacing(DWORD iconSpacing);
-    void SetSchemeFile(WCHAR *schemeFile);
-    void SetClickThrough(DWORD clickThrough);
     UINT GetItemListSize();
     Item *GetItem(UINT index);
     void PopulateItems();
@@ -68,14 +38,8 @@
 
   private:
     std::vector<Item*> itemList;
-    DWORD width, height, x, y;
-    WCHAR zPosition[MAX_LINE_LENGTH];
-    WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
-    directionOrientation[MAX_LINE_LENGTH];
-    DWORD autoSize, iconSize, snapMove, snapSize, iconSpacing, clickThrough;
-    WCHAR schemeFile[MAX_LINE_LENGTH];
     HINSTANCE mainInstance;
-    RECT resolution;
+    WCHAR keyString[MAX_LINE_LENGTH];
   };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1495] trunk/Source

From: <ir0nh34d@us...> - 2007-11-28 01:49

Revision: 1495
          http://emerge.svn.sourceforge.net/emerge/?rev=1495&view=rev
Author:   ir0nh34d
Date:     2007-11-27 17:49:52 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Updated for BaseSettings class

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/emergeVWM/Makefile
    trunk/Source/emergeVWM/Settings.cpp
    trunk/Source/emergeVWM/Settings.h

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-11-28 01:39:25 UTC (rev 1494)
+++ trunk/Source/EmergeDesktop.cbp	2007-11-28 01:49:52 UTC (rev 1495)
@@ -287,11 +287,13 @@
 			<Option target="emergeTasks - Release" />
 			<Option target="emergeCommand - Release" />
 			<Option target="emergeLauncher - Release" />
+			<Option target="emergeVWM - Release" />
 		</Unit>
 		<Unit filename="common\BaseSettings.h">
 			<Option target="emergeTasks - Release" />
 			<Option target="emergeCommand - Release" />
 			<Option target="emergeLauncher - Release" />
+			<Option target="emergeVWM - Release" />
 		</Unit>
 		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
 			<Option target="emergeAppletEngine - Release" />

Modified: trunk/Source/emergeVWM/Makefile
===================================================================
--- trunk/Source/emergeVWM/Makefile	2007-11-28 01:39:25 UTC (rev 1494)
+++ trunk/Source/emergeVWM/Makefile	2007-11-28 01:49:52 UTC (rev 1495)
@@ -7,6 +7,7 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
+			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeVWM/Settings.cpp
===================================================================
--- trunk/Source/emergeVWM/Settings.cpp	2007-11-28 01:39:25 UTC (rev 1494)
+++ trunk/Source/emergeVWM/Settings.cpp	2007-11-28 01:49:52 UTC (rev 1495)
@@ -20,8 +20,13 @@
 
 #include "Settings.h"
 
+WCHAR appletName[] = TEXT("emergeVWM");
+
 Settings::Settings()
-{}
+  :BaseSettings(appletName)
+{
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
+}
 
 Settings::~Settings()
 {
@@ -32,126 +37,21 @@
 void Settings::ReadSettings()
 {
   HKEY key;
-  RECT deskRect, tmpRect;
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true);
-  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
-  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELOpenRegKey(keyString, &key, true);
   ELReadRegDWord(key, (WCHAR*)TEXT("DesktopRows"), &rows, 2);
   ELReadRegDWord(key, (WCHAR*)TEXT("DesktopColumns"), &columns, 2);
-  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
   ELReadRegDWord(key, (WCHAR*)TEXT("HideSticky"), &hideSticky, 0);
-
-  tmpRect.left = x;
-  tmpRect.right = tmpRect.left + width;
-  tmpRect.top = y;
-  tmpRect.bottom = tmpRect.top + height;
-  ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
   ELCloseRegKey(key);
 
   BuildStickyList();
 }
 
-void Settings::SetSize(DWORD width, DWORD height)
-{
-  HKEY key;
-
-  (*this).width = width;
-  (*this).height = height;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetPosition(DWORD x, DWORD y)
-{
-  HKEY key;
-
-  (*this).x = x;
-  (*this).y = y;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetResolution(RECT *deskRect)
-{
-  HKEY key;
-
-  CopyRect(&resolution, deskRect);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
-      ELCloseRegKey(key);
-    }
-}
-
 bool Settings::GetHideSticky()
 {
   return (hideSticky == 1);
 }
 
-RECT *Settings::GetResolution()
-{
-  return &resolution;
-}
-
-DWORD Settings::GetClickThrough()
-{
-  return clickThrough;
-}
-
-bool Settings::GetSnapMove()
-{
-  return (snapMove == 1);
-}
-
-bool Settings::GetSnapSize()
-{
-  return (snapSize == 1);
-}
-
-int Settings::GetX()
-{
-  return x;
-}
-
-int Settings::GetY()
-{
-  return y;
-}
-
-DWORD Settings::GetWidth()
-{
-  return width;
-}
-
-DWORD Settings::GetHeight()
-{
-  return height;
-}
-
-WCHAR *Settings::GetZPosition()
-{
-  return zPosition;
-}
-
 DWORD Settings::GetDesktopRows()
 {
   return rows;
@@ -162,11 +62,6 @@
   return columns;
 }
 
-WCHAR *Settings::GetSchemeFile()
-{
-  return schemeFile;
-}
-
 void Settings::SetHideSticky(bool hideSticky)
 {
   HKEY key;
@@ -179,84 +74,20 @@
 
   (*this).hideSticky = tmp;
 
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
+  if (ELOpenRegKey(keyString, &key, true))
     {
       ELWriteRegDWord(key, (WCHAR*)TEXT("HideSticky"), &tmp);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetClickThrough(DWORD clickThrough)
-{
-  HKEY key;
-
-  (*this).clickThrough = clickThrough;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapMove(bool snapMove)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapMove)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapMove = snapMove;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapSize(bool snapSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapSize = snapSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetZPosition(WCHAR *zPosition)
-{
-  HKEY key;
-
-  wcscpy((*this).zPosition, zPosition);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
-      ELCloseRegKey(key);
-    }
-}
-
 void Settings::SetDesktopRows(DWORD rows)
 {
   HKEY key;
 
   (*this).rows = rows;
 
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
+  if (ELOpenRegKey(keyString, &key, true))
     {
       ELWriteRegDWord(key, (WCHAR*)TEXT("DesktopRows"), &rows);
       ELCloseRegKey(key);
@@ -269,26 +100,13 @@
 
   (*this).columns = columns;
 
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
+  if (ELOpenRegKey(keyString, &key, true))
     {
       ELWriteRegDWord(key, (WCHAR*)TEXT("DesktopColumns"), &columns);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetSchemeFile(WCHAR *schemeFile)
-{
-  HKEY key;
-
-  wcscpy((*this).schemeFile, schemeFile);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeVWM\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
-      ELCloseRegKey(key);
-    }
-}
-
 //-----
 // Function:	BuildStickyList
 // Required:	Nothing

Modified: trunk/Source/emergeVWM/Settings.h
===================================================================
--- trunk/Source/emergeVWM/Settings.h	2007-11-28 01:39:25 UTC (rev 1494)
+++ trunk/Source/emergeVWM/Settings.h	2007-11-28 01:49:52 UTC (rev 1495)
@@ -22,25 +22,16 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
+#include "../common/BaseSettings.h"
 #include <string>
 #include <vector>
 
-class Settings
+class Settings: public BaseSettings
   {
   public:
     Settings();
     ~Settings();
     void ReadSettings();
-    int GetX();
-    int GetY();
-    DWORD GetWidth();
-    DWORD GetHeight();
-    WCHAR *GetZPosition();
-    WCHAR *GetSchemeFile();
-    void SetPosition(DWORD x, DWORD y);
-    void SetSize(DWORD width, DWORD height);
-    void SetZPosition(WCHAR *zPosition);
-    void SetSchemeFile(WCHAR *schemeFile);
     DWORD GetDesktopRows();
     DWORD GetDesktopColumns();
     void SetDesktopRows(DWORD rows);
@@ -51,27 +42,15 @@
     bool CheckSticky(WCHAR *appName);
     void AddStickyListItem(WCHAR *item);
     void WriteStickyList();
-    bool GetSnapMove();
-    bool GetSnapSize();
-    DWORD GetClickThrough();
     bool GetHideSticky();
-    void SetSnapMove(bool snapMove);
-    void SetSnapSize(bool snapSize);
-    void SetClickThrough(DWORD clickThrough);
     void SetHideSticky(bool hideSticky);
-    RECT *GetResolution();
-    void SetResolution(RECT *deskRect);
 
   private:
     std::vector<std::wstring> stickyList;
     void BuildStickyList();
-    DWORD width, height, x, y;
-    WCHAR zPosition[MAX_LINE_LENGTH];
-    WCHAR schemeFile[MAX_LINE_LENGTH];
     DWORD rows, columns;
-    DWORD snapMove, snapSize;
-    DWORD clickThrough, hideSticky;
-    RECT resolution;
+    DWORD hideSticky;
+    WCHAR keyString[MAX_LINE_LENGTH];
   };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1497] trunk/Source

From: <ir0nh34d@us...> - 2007-11-28 02:11

Revision: 1497
          http://emerge.svn.sourceforge.net/emerge/?rev=1497&view=rev
Author:   ir0nh34d
Date:     2007-11-27 18:11:06 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Updated to work with BaseSettings class

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/emergeTray/Makefile
    trunk/Source/emergeTray/Settings.cpp
    trunk/Source/emergeTray/Settings.h

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-11-28 01:58:29 UTC (rev 1496)
+++ trunk/Source/EmergeDesktop.cbp	2007-11-28 02:11:06 UTC (rev 1497)
@@ -288,12 +288,14 @@
 			<Option target="emergeCommand - Release" />
 			<Option target="emergeLauncher - Release" />
 			<Option target="emergeVWM - Release" />
+			<Option target="emergeTray - Release" />
 		</Unit>
 		<Unit filename="common\BaseSettings.h">
 			<Option target="emergeTasks - Release" />
 			<Option target="emergeCommand - Release" />
 			<Option target="emergeLauncher - Release" />
 			<Option target="emergeVWM - Release" />
+			<Option target="emergeTray - Release" />
 		</Unit>
 		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
 			<Option target="emergeAppletEngine - Release" />

Modified: trunk/Source/emergeTray/Makefile
===================================================================
--- trunk/Source/emergeTray/Makefile	2007-11-28 01:58:29 UTC (rev 1496)
+++ trunk/Source/emergeTray/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
@@ -6,6 +6,7 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
+			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeTray/Settings.cpp
===================================================================
--- trunk/Source/emergeTray/Settings.cpp	2007-11-28 01:58:29 UTC (rev 1496)
+++ trunk/Source/emergeTray/Settings.cpp	2007-11-28 02:11:06 UTC (rev 1497)
@@ -20,233 +20,41 @@
 
 #include "Settings.h"
 
+WCHAR appletName[] = TEXT("emergeTray");
+
 extern Applet *pApplet; // roblarky
 
 Settings::Settings()
-{}
+  :BaseSettings(appletName)
+{
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
+}
 
 Settings::~Settings()
 {
-
   // Clear the hideList vector - roblarky
   hideList.clear();
 }
 
 void Settings::ReadSettings()
 {
+  BaseSettings::ReadSettings();
+
   HKEY key;
-  RECT deskRect, tmpRect;
 
-  ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true);
-  ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
-  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
-  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
-  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
-  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
-  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
-  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
-  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
-  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+  ELOpenRegKey(keyString, &key, true);
   ELReadRegDWord(key, (WCHAR*)TEXT("UnhideIcons"), &unhideIcons, 1); // roblarky
-
-  tmpRect.left = x;
-  tmpRect.right = tmpRect.left + width;
-  tmpRect.top = y;
-  tmpRect.bottom = tmpRect.top + height;
-  ELGetDesktopRect(&tmpRect, &deskRect);
-  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
-  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
   ELCloseRegKey(key);
 
   BuildHideList();  // roblarky
 }
 
-void Settings::SetSize(DWORD width, DWORD height)
-{
-  HKEY key;
-
-  (*this).width = width;
-  (*this).height = height;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetIconSpacing(DWORD iconSpacing)
-{
-  HKEY key;
-
-  (*this).iconSpacing = iconSpacing;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetPosition(DWORD x, DWORD y)
-{
-  HKEY key;
-
-  (*this).x = x;
-  (*this).y = y;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
-      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetResolution(RECT *deskRect)
-{
-  HKEY key;
-
-  CopyRect(&resolution, deskRect);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
-      ELCloseRegKey(key);
-    }
-}
-
-RECT *Settings::GetResolution()
-{
-  return &resolution;
-}
-
-int Settings::GetX()
-{
-  return x;
-}
-
-int Settings::GetY()
-{
-  return y;
-}
-
-DWORD Settings::GetWidth()
-{
-  return width;
-}
-
-DWORD Settings::GetIconSpacing()
-{
-  return iconSpacing;
-}
-
-DWORD Settings::GetHeight()
-{
-  return height;
-}
-
-WCHAR *Settings::GetZPosition()
-{
-  return zPosition;
-}
-
-WCHAR *Settings::GetHorizontalDirection()
-{
-  return horizontalDirection;
-}
-
-WCHAR *Settings::GetVerticalDirection()
-{
-  return verticalDirection;
-}
-
-WCHAR *Settings::GetDirectionOrientation()
-{
-  return directionOrientation;
-}
-
-bool Settings::GetAutoSize()
-{
-  return (autoSize == 1);
-}
-
-DWORD Settings::GetClickThrough()
-{
-  return clickThrough;
-}
-
-bool Settings::GetSnapMove()
-{
-  return (snapMove == 1);
-}
-
 // roblarky
 bool Settings::GetUnhideIcons()
 {
   return (unhideIcons == 1);
 }
 
-bool Settings::GetSnapSize()
-{
-  return (snapSize == 1);
-}
-
-WCHAR *Settings::GetSchemeFile()
-{
-  return schemeFile;
-}
-
-void Settings::SetZPosition(WCHAR *zPosition)
-{
-  HKEY key;
-
-  wcscpy((*this).zPosition, zPosition);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetClickThrough(DWORD clickThrough)
-{
-  HKEY key;
-
-  (*this).clickThrough = clickThrough;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSnapMove(bool snapMove)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapMove)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapMove = snapMove;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
 // roblarky
 void Settings::SetUnhideIcons(bool unhideIcons)
 {
@@ -260,103 +68,13 @@
 
   (*this).unhideIcons = unhideIcons;
 
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
+  if (ELOpenRegKey(keyString, &key, true))
     {
       ELWriteRegDWord(key, (WCHAR*)TEXT("UnhideIcons"), &tmp);
       ELCloseRegKey(key);
     }
 }
 
-void Settings::SetSnapSize(bool snapSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (snapSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).snapSize = snapSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetHorizontalDirection(WCHAR *horizontalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).horizontalDirection, horizontalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetVerticalDirection(WCHAR *verticalDirection)
-{
-  HKEY key;
-
-  wcscpy((*this).verticalDirection, verticalDirection);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetDirectionOrientation(WCHAR *directionOrientation)
-{
-  HKEY key;
-
-  wcscpy((*this).directionOrientation, directionOrientation);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetAutoSize(bool autoSize)
-{
-  HKEY key;
-  DWORD tmp;
-
-  if (autoSize)
-    tmp = 1;
-  else
-    tmp = 0;
-
-  (*this).autoSize = autoSize;
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
-      ELCloseRegKey(key);
-    }
-}
-
-void Settings::SetSchemeFile(WCHAR *schemeFile)
-{
-  HKEY key;
-
-  wcscpy((*this).schemeFile, schemeFile);
-
-  if (ELOpenRegKey((WCHAR*)TEXT("emergeTray\\Settings"), &key, true))
-    {
-      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
-      ELCloseRegKey(key);
-    }
-}
-
 //----- roblarky
 // Function:	BuildHideList
 // Required:	Nothing
@@ -484,7 +202,6 @@
     }
 }
 
-
 // roblarky
 void Settings::WriteHideList()
 {
@@ -514,5 +231,3 @@
 
   ELCloseRegKey(key);
 }
-
-

Modified: trunk/Source/emergeTray/Settings.h
===================================================================
--- trunk/Source/emergeTray/Settings.h	2007-11-28 01:58:29 UTC (rev 1496)
+++ trunk/Source/emergeTray/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
@@ -22,48 +22,21 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
+#include "../common/BaseSettings.h"
 // BEGIN roblarky
 #include <string>
 #include <vector>
 #include "Applet.h"
 // END roblarky
 
-class Settings
+class Settings: public BaseSettings
   {
   public:
     Settings();
     ~Settings();
     void ReadSettings();
-    int GetX();
-    int GetY();
-    DWORD GetWidth();
-    DWORD GetHeight();
-    DWORD GetIconSpacing();
-    WCHAR *GetZPosition();
-    WCHAR *GetHorizontalDirection();
-    WCHAR *GetVerticalDirection();
-    WCHAR *GetDirectionOrientation();
-    bool GetAutoSize();
-    bool GetSnapMove();
-    bool GetSnapSize();
-    DWORD GetClickThrough();
     bool GetUnhideIcons(); // roblarky
-    WCHAR *GetSchemeFile();
-    void SetPosition(DWORD x, DWORD y);
-    void SetSize(DWORD width, DWORD height);
-    void SetZPosition(WCHAR *zPosition);
-    void SetHorizontalDirection(WCHAR *horizontalDirection);
-    void SetVerticalDirection(WCHAR *verticalDirection);
-    void SetDirectionOrientation(WCHAR *directionOrientation);
-    void SetAutoSize(bool autoSize);
-    void SetSchemeFile(WCHAR *schemeFile);
-    void SetSnapMove(bool snapMove);
-    void SetSnapSize(bool snapSize);
-    void SetIconSpacing(DWORD iconSpacing);
     void SetUnhideIcons(bool unhideIcons); // roblarky
-    void SetClickThrough(DWORD clickThrough);
-    RECT *GetResolution();
-    void SetResolution(RECT *deskRect);
     // BEGIN roblarky
     UINT GetHideListSize();
     WCHAR *GetHideListItem(UINT item);
@@ -76,14 +49,8 @@
   private:
     std::vector<std::wstring> hideList; // roblarky
     void BuildHideList(); // roblarky
-    DWORD width, height, x, y;
-    WCHAR zPosition[MAX_LINE_LENGTH];
-    WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
-    directionOrientation[MAX_LINE_LENGTH];
-    DWORD autoSize, snapSize, snapMove, iconSpacing, unhideIcons; // roblarky
-    DWORD clickThrough;
-    WCHAR schemeFile[MAX_LINE_LENGTH];
-    RECT resolution;
+    DWORD unhideIcons; // roblarky
+    WCHAR keyString[MAX_LINE_LENGTH];
   };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1498] trunk/Source

From: <ir0nh34d@us...> - 2007-11-28 14:27

Revision: 1498
          http://emerge.svn.sourceforge.net/emerge/?rev=1498&view=rev
Author:   ir0nh34d
Date:     2007-11-28 06:27:36 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
Implemented emergeBaseClasses

Modified Paths:
--------------
    trunk/Source/EmergeDesktop.cbp
    trunk/Source/Makefile
    trunk/Source/applet_globals.in
    trunk/Source/emergeCommand/Makefile
    trunk/Source/emergeCommand/Settings.h
    trunk/Source/emergeLauncher/Makefile
    trunk/Source/emergeLauncher/Settings.h
    trunk/Source/emergeTasks/Makefile
    trunk/Source/emergeTasks/Settings.h
    trunk/Source/emergeTray/Makefile
    trunk/Source/emergeTray/Settings.h
    trunk/Source/emergeVWM/Makefile
    trunk/Source/emergeVWM/Settings.h

Added Paths:
-----------
    trunk/Source/emergeBaseClasses/
    trunk/Source/emergeBaseClasses/BaseSettings.cpp
    trunk/Source/emergeBaseClasses/BaseSettings.h
    trunk/Source/emergeBaseClasses/Makefile
    trunk/Source/emergeBaseClasses/emergeBaseClasses.dll.manifest
    trunk/Source/emergeBaseClasses/emergeBaseClasses.rc
    trunk/Source/emergeBaseClasses/resource.h

Modified: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/EmergeDesktop.cbp	2007-11-28 14:27:36 UTC (rev 1498)
@@ -99,6 +99,27 @@
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
+			<Target title="emergeBaseClasses - Release">
+				<Option output="bin\emergeBaseClasses" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".objs\Release" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-march=i686" />
+					<Add option="-O2" />
+					<Add option="-DEMERGEBASECLASSES_EXPORTS" />
+				</Compiler>
+				<ResourceCompiler>
+					<Add directory=".\emergeLib" />
+				</ResourceCompiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="emergeLib" />
+					<Add directory=".\bin" />
+				</Linker>
+			</Target>
 			<Target title="emergeCore - Release">
 				<Option output="bin\emergeCore" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".objs\Release" />
@@ -142,6 +163,7 @@
 					<Add library="emergeGraphics" />
 					<Add library="ole32" />
 					<Add library="uuid" />
+					<Add library="emergeBaseClasses" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
@@ -205,6 +227,7 @@
 					<Add library="emergeGraphics" />
 					<Add library="emergeAppletEngine" />
 					<Add library="comctl32" />
+					<Add library="emergeBaseClasses" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
@@ -226,6 +249,7 @@
 					<Add library="emergeSchemeEngine" />
 					<Add library="emergeAppletEngine" />
 					<Add library="emergeGraphics" />
+					<Add library="emergeBaseClasses" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
@@ -250,6 +274,7 @@
 					<Add library="comctl32" />
 					<Add library="uuid" />
 					<Add library="ole32" />
+					<Add library="emergeBaseClasses" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
@@ -273,30 +298,17 @@
 					<Add library="emergeGraphics" />
 					<Add library="comctl32" />
 					<Add library="shlwapi" />
+					<Add library="emergeBaseClasses" />
 					<Add directory=".\bin" />
 				</Linker>
 			</Target>
 		</Build>
 		<VirtualTargets>
-			<Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;emergeVWM - Release;" />
+			<Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;" />
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="common\BaseSettings.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeCommand - Release" />
-			<Option target="emergeLauncher - Release" />
-			<Option target="emergeVWM - Release" />
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="common\BaseSettings.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeCommand - Release" />
-			<Option target="emergeLauncher - Release" />
-			<Option target="emergeVWM - Release" />
-			<Option target="emergeTray - Release" />
-		</Unit>
 		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
 			<Option target="emergeAppletEngine - Release" />
 		</Unit>
@@ -310,6 +322,22 @@
 		<Unit filename="emergeAppletEngine\resource.h">
 			<Option target="emergeAppletEngine - Release" />
 		</Unit>
+		<Unit filename="emergeBaseClasses\BaseSettings.cpp">
+			<Option target="emergeBaseClasses - Release" />
+		</Unit>
+		<Unit filename="emergeBaseClasses\BaseSettings.h">
+			<Option target="emergeBaseClasses - Release" />
+		</Unit>
+		<Unit filename="emergeBaseClasses\emergeBaseClasses.dll.manifest">
+			<Option target="emergeBaseClasses - Release" />
+		</Unit>
+		<Unit filename="emergeBaseClasses\emergeBaseClasses.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="emergeBaseClasses - Release" />
+		</Unit>
+		<Unit filename="emergeBaseClasses\resource.h">
+			<Option target="emergeBaseClasses - Release" />
+		</Unit>
 		<Unit filename="emergeCommand\Applet.cpp">
 			<Option target="emergeCommand - Release" />
 		</Unit>

Modified: trunk/Source/Makefile
===================================================================
--- trunk/Source/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,7 +1,7 @@
 # Note: The 'source' target requires the zip program.  For a Windows command prompt, you
 # can download zip from http://gnuwin32.sourceforge.net/packages/zip.htm.
 
-LIBS = emergeLib emergeGraphics emergeAppletEngine emergeSchemeEngine
+LIBS = emergeLib emergeGraphics emergeAppletEngine emergeSchemeEngine emergeBaseClasses
 APPLETS = emergeCore emergeDesktop emergeHotkeys emergeTasks emergeCommand emergeLauncher \
 					emergeVWM emergeTray
 BUILD = release

Modified: trunk/Source/applet_globals.in
===================================================================
--- trunk/Source/applet_globals.in	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/applet_globals.in	2007-11-28 14:27:36 UTC (rev 1498)
@@ -4,7 +4,6 @@
 WINDRESFLAGS = -O COFF
 BIN_DIR = bin
 OBJ_DIR = .objs
-BASE_DIR = common
 BUILD = release
 LDFLAGS = -Wall -mwindows -mno-cygwin
 CFLAGS = -Wall -pedantic -mno-cygwin -frtti -fexceptions -march=i686 -O2
@@ -30,24 +29,19 @@
 makedir:
 	@if [ ! -d ../$(BIN_DIR) ]; then mkdir ../$(BIN_DIR); fi
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
-	@if [ ! -d ../$(BASE_DIR)/$(OBJ_DIR) ]; then mkdir ../$(BASE_DIR)/$(OBJ_DIR); fi
 clean:
-	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res ../$(BASE_DIR)/$(OBJ_DIR)/*.o
+	-rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.res
 else
 makedir:
 	@if not exist ..\$(BIN_DIR) mkdir ..\$(BIN_DIR)
 	@if not exist $(OBJ_DIR) mkdir $(OBJ_DIR)
-	@if not exist ..\$(BASE_DIR)\$(OBJ_DIR) mkdir ..\$(BASE_DIR)\$(OBJ_DIR)
 clean:
-	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res ..\$(BASE_DIR)\$(OBJ_DIR)\*.o
+	-del $(OBJ_DIR)\*.o $(OBJ_DIR)\*.res
 endif
 
 $(OBJ_DIR)/%.o: %.cpp
 	$(CC) $(CFLAGS) -c $< -o $@
 
-../$(BASE_DIR)/$(OBJ_DIR)/%.o: ../$(BASE_DIR)/%.cpp
-	$(CC) $(CFLAGS) -c $< -o $@
-
 $(OBJ_DIR)/$(TARGET).res: $(TARGET).rc
 	$(WINDRES) $(WINDRESFLAGS) -i $? -o $@
 

Added: trunk/Source/emergeBaseClasses/BaseSettings.cpp
===================================================================
--- trunk/Source/emergeBaseClasses/BaseSettings.cpp	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/BaseSettings.cpp	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,345 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include "BaseSettings.h"
+#include <stdio.h>
+
+BaseSettings::BaseSettings(WCHAR *appletName)
+{
+  swprintf(keyString, TEXT("%s\\Settings"), appletName);
+}
+
+BaseSettings::~BaseSettings()
+{}
+
+void BaseSettings::ReadSettings()
+{
+  HKEY key;
+  RECT deskRect, tmpRect;
+
+  ELOpenRegKey(keyString, &key, true);
+  ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+  ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+  ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+  ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+  ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+  ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+  ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+  ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+  ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
+
+  tmpRect.left = x;
+  tmpRect.right = tmpRect.left + width;
+  tmpRect.top = y;
+  tmpRect.bottom = tmpRect.top + height;
+  ELGetDesktopRect(&tmpRect, &deskRect);
+  ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+  ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
+  ELCloseRegKey(key);
+}
+
+void BaseSettings::SetSize(DWORD width, DWORD height)
+{
+  HKEY key;
+
+  (*this).width = width;
+  (*this).height = height;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetIconSize(DWORD iconSize)
+{
+  HKEY key;
+
+  (*this).iconSize = iconSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetIconSpacing(DWORD iconSpacing)
+{
+  HKEY key;
+
+  (*this).iconSpacing = iconSpacing;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetPosition(DWORD x, DWORD y)
+{
+  HKEY key;
+
+  (*this).x = x;
+  (*this).y = y;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+      ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetResolution(RECT *deskRect)
+{
+  HKEY key;
+
+  CopyRect(&resolution, deskRect);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
+      ELCloseRegKey(key);
+    }
+}
+
+RECT *BaseSettings::GetResolution()
+{
+  return &resolution;
+}
+
+int BaseSettings::GetX()
+{
+  return x;
+}
+
+DWORD BaseSettings::GetIconSize()
+{
+  return iconSize;
+}
+
+DWORD BaseSettings::GetIconSpacing()
+{
+  return iconSpacing;
+}
+
+int BaseSettings::GetY()
+{
+  return y;
+}
+
+DWORD BaseSettings::GetWidth()
+{
+  return width;
+}
+
+DWORD BaseSettings::GetHeight()
+{
+  return height;
+}
+
+WCHAR *BaseSettings::GetZPosition()
+{
+  return zPosition;
+}
+
+WCHAR *BaseSettings::GetHorizontalDirection()
+{
+  return horizontalDirection;
+}
+
+WCHAR *BaseSettings::GetVerticalDirection()
+{
+  return verticalDirection;
+}
+
+WCHAR *BaseSettings::GetDirectionOrientation()
+{
+  return directionOrientation;
+}
+
+DWORD BaseSettings::GetClickThrough()
+{
+  return clickThrough;
+}
+
+bool BaseSettings::GetAutoSize()
+{
+  return (autoSize == 1);
+}
+
+bool BaseSettings::GetSnapMove()
+{
+  return (snapMove == 1);
+}
+
+bool BaseSettings::GetSnapSize()
+{
+  return (snapSize == 1);
+}
+
+WCHAR *BaseSettings::GetSchemeFile()
+{
+  return schemeFile;
+}
+
+void BaseSettings::SetZPosition(WCHAR *zPosition)
+{
+  HKEY key;
+
+  wcscpy((*this).zPosition, zPosition);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetHorizontalDirection(WCHAR *horizontalDirection)
+{
+  HKEY key;
+
+  wcscpy((*this).horizontalDirection, horizontalDirection);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetVerticalDirection(WCHAR *verticalDirection)
+{
+  HKEY key;
+
+  wcscpy((*this).verticalDirection, verticalDirection);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetDirectionOrientation(WCHAR *directionOrientation)
+{
+  HKEY key;
+
+  wcscpy((*this).directionOrientation, directionOrientation);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetClickThrough(DWORD clickThrough)
+{
+  HKEY key;
+
+  (*this).clickThrough = clickThrough;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetAutoSize(bool autoSize)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (autoSize)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).autoSize = autoSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSnapMove(bool snapMove)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (snapMove)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).snapMove = snapMove;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSnapSize(bool snapSize)
+{
+  HKEY key;
+  DWORD tmp;
+
+  if (snapSize)
+    tmp = 1;
+  else
+    tmp = 0;
+
+  (*this).snapSize = snapSize;
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
+      ELCloseRegKey(key);
+    }
+}
+
+void BaseSettings::SetSchemeFile(WCHAR *schemeFile)
+{
+  HKEY key;
+
+  wcscpy((*this).schemeFile, schemeFile);
+
+  if (ELOpenRegKey(keyString, &key, true))
+    {
+      ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
+      ELCloseRegKey(key);
+    }
+}

Added: trunk/Source/emergeBaseClasses/BaseSettings.h
===================================================================
--- trunk/Source/emergeBaseClasses/BaseSettings.h	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/BaseSettings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,83 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#ifndef __BASESETTINGS_H
+#define __BASESETTINGS_H
+
+#define UNICODE 1
+
+#ifdef EMERGEBASECLASSES_EXPORTS
+#define DLL_EXPORT  __declspec(dllexport)
+#else
+#define DLL_EXPORT  __declspec(dllimport)
+#endif
+
+#include "../emergeLib/emergeLib.h"
+
+class DLL_EXPORT BaseSettings
+  {
+  public:
+    BaseSettings(WCHAR *appletName);
+    ~BaseSettings();
+    void ReadSettings();
+    DWORD GetIconSize();
+    DWORD GetIconSpacing();
+    int GetX();
+    int GetY();
+    DWORD GetWidth();
+    DWORD GetHeight();
+    WCHAR *GetZPosition();
+    WCHAR *GetHorizontalDirection();
+    WCHAR *GetVerticalDirection();
+    WCHAR *GetDirectionOrientation();
+    bool GetAutoSize();
+    bool GetSnapMove();
+    bool GetSnapSize();
+    WCHAR *GetSchemeFile();
+    DWORD GetClickThrough();
+    void SetPosition(DWORD x, DWORD y);
+    void SetSize(DWORD width, DWORD height);
+    void SetZPosition(WCHAR *zPosition);
+    void SetHorizontalDirection(WCHAR *horizontalDirection);
+    void SetVerticalDirection(WCHAR *verticalDirection);
+    void SetDirectionOrientation(WCHAR *directionOrientation);
+    void SetAutoSize(bool autoSize);
+    void SetSnapMove(bool snapMove);
+    void SetSnapSize(bool snapSize);
+    void SetSchemeFile(WCHAR *schemeFile);
+    void SetIconSize(DWORD iconSize);
+    void SetIconSpacing(DWORD iconSpacing);
+    RECT *GetResolution();
+    void SetResolution(RECT *deskRect);
+    void SetClickThrough(DWORD clickThrough);
+
+  private:
+    DWORD x, y, width, height, iconSize, iconSpacing, clickThrough;
+    WCHAR zPosition[MAX_LINE_LENGTH];
+    WCHAR keyString[MAX_LINE_LENGTH];
+    WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
+    directionOrientation[MAX_LINE_LENGTH];
+    DWORD autoSize, snapMove, snapSize;
+    WCHAR schemeFile[MAX_LINE_LENGTH];
+    RECT resolution;
+  };
+
+#endif
+

Added: trunk/Source/emergeBaseClasses/Makefile
===================================================================
--- trunk/Source/emergeBaseClasses/Makefile	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,7 @@
+LIBS = -L../bin -lemergeLib
+TARGET = emergeBaseClasses
+OBJS = $(OBJ_DIR)/BaseSettings.o \
+			 $(OBJ_DIR)/$(TARGET).res
+EXPORTS = -DEMERGEBASECLASSES_EXPORTS
+
+include ../lib_globals.in

Added: trunk/Source/emergeBaseClasses/emergeBaseClasses.dll.manifest
===================================================================
--- trunk/Source/emergeBaseClasses/emergeBaseClasses.dll.manifest	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/emergeBaseClasses.dll.manifest	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+-->
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity
+				type="win32"
+				name="Microsoft.Windows.Common-Controls"
+				version="6.0.0.0"
+				processorArchitecture="X86"
+				publicKeyToken="6595b64144ccf1df"
+				language="*"
+			/>
+		</dependentAssembly>
+	</dependency>
+</assembly>

Added: trunk/Source/emergeBaseClasses/emergeBaseClasses.rc
===================================================================
--- trunk/Source/emergeBaseClasses/emergeBaseClasses.rc	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/emergeBaseClasses.rc	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,60 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include "resource.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004B0"
+        BEGIN
+            VALUE "CompanyName", "The Emerge Desktop Development Team\0"
+            VALUE "FileDescription", "emergeBaseClasses - Emerge Desktop utility library\0"
+            VALUE "FileVersion", "4.0\0"
+            VALUE "InternalName", "emergeBaseClasses\0"
+            VALUE "LegalCopyright", "Copyright (C) 2007\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "emergeBaseClasses.dll\0"
+            VALUE "ProductName", "emergeBaseClasses\0"
+            VALUE "ProductVersion", "4.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x410, 1200
+    END
+END
+
+#ifdef __GNUC__
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "emergeBaseClasses.dll.manifest"
+#endif
+

Added: trunk/Source/emergeBaseClasses/resource.h
===================================================================
--- trunk/Source/emergeBaseClasses/resource.h	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/resource.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -0,0 +1,24 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include <winver.h>
+#include <winuser.h>
+#include <commctrl.h>
+

Modified: trunk/Source/emergeCommand/Makefile
===================================================================
--- trunk/Source/emergeCommand/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeCommand/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,4 +1,11 @@
-LIBS = -L../bin -lemergeLib -lole32 -luuid -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
+LIBS = -L../bin \
+			 -lemergeLib \
+			 -lole32 \
+			 -luuid \
+			 -lemergeGraphics \
+			 -lemergeSchemeEngine \
+			 -lemergeAppletEngine \
+			 -lemergeBaseClasses
 TARGET = emergeCommand
 OBJS = $(OBJ_DIR)/Command.o \
 			 $(OBJ_DIR)/main.o \
@@ -7,7 +14,6 @@
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
 			 $(OBJ_DIR)/CustomSource.o \
-			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeCommand/Settings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -22,7 +22,7 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
-#include "../common/BaseSettings.h"
+#include "../emergeBaseClasses/BaseSettings.h"
 
 class Settings: public BaseSettings
   {

Modified: trunk/Source/emergeLauncher/Makefile
===================================================================
--- trunk/Source/emergeLauncher/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeLauncher/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,4 +1,12 @@
-LIBS = -L../bin -lshell32 -lcomctl32 -lemergeLib -lemergeGraphics -luuid -lemergeSchemeEngine -lemergeAppletEngine
+LIBS = -L../bin \
+			 -lshell32 \
+			 -lcomctl32 \
+			 -lemergeLib \
+			 -lemergeGraphics \
+			 -luuid \
+			 -lemergeSchemeEngine \
+			 -lemergeAppletEngine \
+			 -lemergeBaseClasses
 TARGET = emergeLauncher
 OBJS = $(OBJ_DIR)/Item.o \
 			 $(OBJ_DIR)/main.o \
@@ -6,7 +14,6 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
-			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeLauncher/Settings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -22,7 +22,7 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
-#include "../common/BaseSettings.h"
+#include "../emergeBaseClasses/BaseSettings.h"
 #include "Item.h"
 
 class Settings: public BaseSettings

Modified: trunk/Source/emergeTasks/Makefile
===================================================================
--- trunk/Source/emergeTasks/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeTasks/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,4 +1,11 @@
-LIBS = -L../bin -lshell32 -lcomctl32 -lemergeLib -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
+LIBS = -L../bin \
+			 -lshell32 \
+			 -lcomctl32 \
+			 -lemergeLib \
+			 -lemergeGraphics \
+			 -lemergeSchemeEngine \
+			 -lemergeAppletEngine \
+			 -lemergeBaseClasses
 TARGET = emergeTasks
 OBJS = $(OBJ_DIR)/Task.o \
 			 $(OBJ_DIR)/main.o \
@@ -6,7 +13,6 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
-			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeTasks/Settings.h
===================================================================
--- trunk/Source/emergeTasks/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeTasks/Settings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -22,7 +22,7 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
-#include "../common/BaseSettings.h"
+#include "../emergeBaseClasses/BaseSettings.h"
 
 class Settings: public BaseSettings
 {

Modified: trunk/Source/emergeTray/Makefile
===================================================================
--- trunk/Source/emergeTray/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeTray/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,4 +1,12 @@
-LIBS = -L../bin -luuid -lole32 -lcomctl32 -lemergeLib -lemergeGraphics -lemergeSchemeEngine -lemergeAppletEngine
+LIBS = -L../bin \
+			 -luuid \
+			 -lole32 \
+			 -lcomctl32 \
+			 -lemergeLib \
+			 -lemergeGraphics \
+			 -lemergeSchemeEngine \
+			 -lemergeAppletEngine \
+			 -lemergeBaseClasses
 TARGET = emergeTray
 OBJS = $(OBJ_DIR)/TrayIcon.o \
 			 $(OBJ_DIR)/main.o \
@@ -6,7 +14,6 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
-			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeTray/Settings.h
===================================================================
--- trunk/Source/emergeTray/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeTray/Settings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -22,7 +22,7 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
-#include "../common/BaseSettings.h"
+#include "../emergeBaseClasses/BaseSettings.h"
 // BEGIN roblarky
 #include <string>
 #include <vector>

Modified: trunk/Source/emergeVWM/Makefile
===================================================================
--- trunk/Source/emergeVWM/Makefile	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeVWM/Makefile	2007-11-28 14:27:36 UTC (rev 1498)
@@ -1,5 +1,12 @@
-LIBS = -L../bin -lshell32 -lcomctl32 -lshlwapi -lemergeLib -lemergeGraphics -lemergeSchemeEngine \
-			 -lemergeAppletEngine
+LIBS = -L../bin \
+			 -lshell32 \
+			 -lcomctl32 \
+			 -lshlwapi \
+			 -lemergeLib \
+			 -lemergeGraphics \
+			 -lemergeSchemeEngine \
+			 -lemergeAppletEngine \
+			 -lemergeBaseClasses
 TARGET = emergeVWM
 OBJS = $(OBJ_DIR)/Task.o \
 			 $(OBJ_DIR)/main.o \
@@ -7,7 +14,6 @@
 			 $(OBJ_DIR)/AppletMenu.o \
 			 $(OBJ_DIR)/Settings.o \
 			 $(OBJ_DIR)/Config.o \
-			 ../$(BASE_DIR)/$(OBJ_DIR)/BaseSettings.o \
 			 $(OBJ_DIR)/$(TARGET).res
 
 include ../applet_globals.in

Modified: trunk/Source/emergeVWM/Settings.h
===================================================================
--- trunk/Source/emergeVWM/Settings.h	2007-11-28 02:11:06 UTC (rev 1497)
+++ trunk/Source/emergeVWM/Settings.h	2007-11-28 14:27:36 UTC (rev 1498)
@@ -22,7 +22,7 @@
 #define __SETTINGS_H
 
 #include "../emergeLib/emergeLib.h"
-#include "../common/BaseSettings.h"
+#include "../emergeBaseClasses/BaseSettings.h"
 #include <string>
 #include <vector>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1501] trunk/Source

From: <ir0nh34d@us...> - 2007-11-29 02:44

Revision: 1501
          http://emerge.svn.sourceforge.net/emerge/?rev=1501&view=rev
Author:   ir0nh34d
Date:     2007-11-28 18:44:26 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
Added BaseAppletMenu class

Modified Paths:
--------------
    trunk/Source/emergeBaseClasses/Makefile
    trunk/Source/emergeBaseClasses/emergeBaseClasses.rc
    trunk/Source/emergeBaseClasses/resource.h
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTasks/AppletMenu.cpp
    trunk/Source/emergeTasks/AppletMenu.h

Added Paths:
-----------
    trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp
    trunk/Source/emergeBaseClasses/BaseAppletMenu.h

Added: trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp
===================================================================
--- trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp	2007-11-29 02:44:26 UTC (rev 1501)
@@ -0,0 +1,184 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#include "BaseAppletMenu.h"
+#include "../emergeSchemeEngine/emergeSchemeEngine.h"
+#include <stdio.h>
+
+BaseAppletMenu *pBaseAppletMenu;
+
+//------
+// Function:	HookCallWndProc
+// Requires:	int nCode - action
+// 		wParam - not used
+// 		lParam - message data
+// Returns:	LRESULT
+// Purpose:	Hooks the menu windows of a given application
+//-----
+LRESULT CALLBACK BaseAppletMenu::HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam)
+{
+  CWPSTRUCT cwps;
+
+  if ( nCode == HC_ACTION )
+    {
+      CopyMemory(&cwps, (LPVOID)lParam, sizeof(CWPSTRUCT));
+
+      switch (cwps.message)
+        {
+        case WM_CREATE:
+        {
+          WCHAR szClass[128];
+          GetClassName(cwps.hwnd, szClass, 127);
+          if (_wcsicmp(szClass, TEXT("#32768"))==0)
+            {
+              SetWindowLong(cwps.hwnd,
+                            GWL_EXSTYLE,
+                            GetWindowLong(cwps.hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
+              SetLayeredWindowAttributes(cwps.hwnd, 0, pBaseAppletMenu->GetMenuAlpha(), LWA_ALPHA);
+            }
+        }
+        break;
+        }
+    }
+
+  return CallNextHookEx((HHOOK)WH_CALLWNDPROC, nCode, wParam, lParam);
+}
+
+DWORD BaseAppletMenu::GetMenuAlpha()
+{
+  return menuAlpha;
+}
+
+BaseAppletMenu::BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance)
+{
+  (*this).mainWnd = mainWnd;
+  menuHook = NULL;
+
+  pBaseAppletMenu = this;
+}
+
+BaseAppletMenu::~BaseAppletMenu()
+{
+  DestroyMenu(appletMenu);
+
+  // Clear the menu hook
+  if (menuHook)
+    UnhookWindowsHookEx(menuHook);
+}
+
+void BaseAppletMenu::Initialize()
+{
+  // create the mainMenu
+  appletMenu = CreatePopupMenu();
+
+  // Populate The Menu
+  BuildMenu();
+}
+
+void BaseAppletMenu::UpdateHook(DWORD menuAlpha)
+{
+  // Clear the menu hook
+  if (menuHook)
+    UnhookWindowsHookEx(menuHook);
+
+  (*this).menuAlpha = menuAlpha;
+
+  // Hook the menus (for transparency)
+  menuHook = SetWindowsHookEx(WH_CALLWNDPROC, HookCallWndProc, 0, GetWindowThreadProcessId(mainWnd, 0));
+}
+
+void BaseAppletMenu::BuildMenu()
+{
+  AppendMenu(appletMenu, MF_STRING, EBC_ABOUT, TEXT("About"));
+  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
+  AppendMenu(appletMenu, MF_STRING, EBC_LOADSCHEME, TEXT("Load Scheme"));
+  AppendMenu(appletMenu, MF_STRING, EBC_EDITSCHEME, TEXT("Edit Current Scheme"));
+  AppendMenu(appletMenu, MF_STRING, EBC_RELOADSCHEME, TEXT("Reload Current Scheme"));
+  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
+  AppendMenu(appletMenu, MF_STRING, EBC_CONFIGURE, TEXT("Configure"));
+  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
+  AppendMenu(appletMenu, MF_STRING, EBC_EXIT, TEXT("Exit"));
+}
+
+DWORD BaseAppletMenu::ActivateMenu(int x, int y, WCHAR *schemeFile)
+{
+  UINT ret = TrackPopupMenuEx(appletMenu, TPM_RETURNCMD, x, y, mainWnd, NULL);
+  WCHAR path[MAX_PATH], file[MAX_PATH];
+  OPENFILENAME ofn;
+
+  switch (ret)
+    {
+    case EBC_ABOUT:
+      WCHAR tmp[MAX_LINE_LENGTH];
+      VERSIONINFO versionInfo;
+
+      if (ELAppletVersionInfo(mainWnd, &versionInfo))
+        {
+          swprintf(tmp, TEXT("%s\n\nVersion: %s\n\nCurrent Scheme: %s\n\nAuthor: %s"),
+                   versionInfo.Description,
+                   versionInfo.Version,
+                   ESEGetScheme(),
+                   versionInfo.Author);
+
+          MessageBox(GetDesktopWindow(), tmp, TEXT("emergeTasks"),
+                     MB_OK | MB_TOPMOST | MB_ICONINFORMATION);
+        }
+      else
+        ret = 0;
+      break;
+
+    case EBC_EXIT:
+      PostQuitMessage(0);
+      break;
+
+    case EBC_LOADSCHEME:
+      ZeroMemory(file, MAX_PATH);
+      ZeroMemory(&ofn, sizeof(ofn));
+
+      ELGetCurrentPath(path);
+      wcscat(path, TEXT("Schemes"));
+
+      ofn.lStructSize = sizeof(ofn);
+      ofn.hwndOwner = mainWnd;
+      ofn.lpstrFilter = TEXT("Scheme (*.eds)\0*.eds\0");
+      ofn.lpstrFile = file;
+      ofn.nMaxFile = MAX_PATH;
+      ofn.lpstrInitialDir = path;
+      ofn.lpstrTitle = TEXT("Load Scheme");
+      ofn.lpstrDefExt = NULL;
+      ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_DONTADDTORECENT;
+
+      if (GetOpenFileName(&ofn))
+        {
+          wcscpy(schemeFile, file);
+          break;
+        }
+      else
+        ret = 0;
+      break;
+
+    case EBC_EDITSCHEME:
+      wcscpy(file, ESEGetScheme());
+      ESEEditScheme(mainWnd, file);
+      break;
+    }
+
+  return ret;
+}

Added: trunk/Source/emergeBaseClasses/BaseAppletMenu.h
===================================================================
--- trunk/Source/emergeBaseClasses/BaseAppletMenu.h	                        (rev 0)
+++ trunk/Source/emergeBaseClasses/BaseAppletMenu.h	2007-11-29 02:44:26 UTC (rev 1501)
@@ -0,0 +1,67 @@
+//---
+//
+//  This file is part of Emerge Desktop.
+//  Copyright (C) 2004-2007  The Emerge Desktop Development Team
+//
+//  Emerge Desktop is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Emerge Desktop is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//---
+
+#ifndef __BASEAPPLETMENU_H
+#define __BASEAPPLETMENU_H
+
+// Define required for the Window Transparency
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+
+#define UNICODE 1
+
+#include "../emergeLib/emergeLib.h"
+
+#ifdef EMERGEBASECLASSES_EXPORTS
+#undef DLL_EXPORT
+#define DLL_EXPORT  __declspec(dllexport)
+#else
+#undef DLL_EXPORT
+#define DLL_EXPORT  __declspec(dllimport)
+#endif
+
+#define EBC_ABOUT         100
+#define EBC_LOADSCHEME    200
+#define EBC_EDITSCHEME    201
+#define EBC_RELOADSCHEME  202
+#define EBC_CONFIGURE     300
+#define EBC_EXIT          400
+
+class DLL_EXPORT BaseAppletMenu
+  {
+  public:
+    BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance);
+    ~BaseAppletMenu();
+    void Initialize();
+    void BuildMenu();
+    DWORD ActivateMenu(int x, int y, WCHAR *schemeFile);
+    DWORD GetMenuAlpha();
+    void UpdateHook(DWORD menuAlpha);
+
+  private:
+    HWND mainWnd;
+    DWORD menuAlpha;
+    HMENU appletMenu;
+    HHOOK menuHook;
+    HINSTANCE hInstance;
+    static LRESULT CALLBACK HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
+  };
+
+#endif

Modified: trunk/Source/emergeBaseClasses/Makefile
===================================================================
--- trunk/Source/emergeBaseClasses/Makefile	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeBaseClasses/Makefile	2007-11-29 02:44:26 UTC (rev 1501)
@@ -1,6 +1,7 @@
-LIBS = -L../bin -lemergeLib
+LIBS = -L../bin -lemergeLib -lemergeSchemeEngine
 TARGET = emergeBaseClasses
 OBJS = $(OBJ_DIR)/BaseSettings.o \
+			 $(OBJ_DIR)/BaseAppletMenu.o \
 			 $(OBJ_DIR)/$(TARGET).res
 EXPORTS = -DEMERGEBASECLASSES_EXPORTS
 

Modified: trunk/Source/emergeBaseClasses/emergeBaseClasses.rc
===================================================================
--- trunk/Source/emergeBaseClasses/emergeBaseClasses.rc	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeBaseClasses/emergeBaseClasses.rc	2007-11-29 02:44:26 UTC (rev 1501)
@@ -23,34 +23,30 @@
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 4,0,0,0
  PRODUCTVERSION 4,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef DEBUG
+ FILEFLAGS VS_FF_DEBUG
 #endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004B0"
         BEGIN
-            VALUE "CompanyName", "The Emerge Desktop Development Team\0"
-            VALUE "FileDescription", "emergeBaseClasses - Emerge Desktop utility library\0"
-            VALUE "FileVersion", "4.0\0"
-            VALUE "InternalName", "emergeBaseClasses\0"
-            VALUE "LegalCopyright", "Copyright (C) 2007\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "emergeBaseClasses.dll\0"
-            VALUE "ProductName", "emergeBaseClasses\0"
-            VALUE "ProductVersion", "4.0\0"
+            VALUE "CompanyName", "The Emerge Desktop Development Team"
+            VALUE "FileDescription", "emergeBaseClasses - Emerge Desktop utility library"
+            VALUE "FileVersion", "4.0"
+            VALUE "InternalName", "emergeBaseClasses"
+            VALUE "LegalCopyright", "Copyright (C) 2007"
+            VALUE "OriginalFilename", "emergeBaseClasses.dll"
+            VALUE "ProductName", "emergeBaseClasses"
+            VALUE "ProductVersion", "4.0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x410, 1200
+        VALUE "Translation", 0x0, 1200
     END
 END
 

Modified: trunk/Source/emergeBaseClasses/resource.h
===================================================================
--- trunk/Source/emergeBaseClasses/resource.h	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeBaseClasses/resource.h	2007-11-29 02:44:26 UTC (rev 1501)
@@ -19,6 +19,4 @@
 //---
 
 #include <winver.h>
-#include <winuser.h>
-#include <commctrl.h>
 

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-11-29 02:44:26 UTC (rev 1501)
@@ -19,10 +19,13 @@
 //---
 
 #include "Applet.h"
+#include "Settings.h"
+#include "Config.h"
 
 extern Applet *pApplet;
 AppletMenu *pAppletMenu = NULL;
 Settings *pSettings = NULL;
+Config *pConfig = NULL;
 
 //-----
 // Function:	WindowProcedure
@@ -147,7 +150,17 @@
   // Unregister the specified Emerge Desktop messages
   PostMessage(ELGetCoreWindow(), EMERGE_UNREGISTER, (WPARAM)mainWnd, (LPARAM)EMERGE_CORE | EMERGE_VWM);
 
-  // Destroy mainMenu
+  // Cleanup the icon vectors
+  while (!taskList.empty())
+  {
+    taskList.front()->DeleteTip(mainWnd, toolWnd);
+    delete (taskList.front());
+    taskList.erase(taskList.begin());
+  }
+
+  // Destroy class pointers
+  delete pSettings;
+  delete pConfig;
   delete pAppletMenu;
 
   // Unregister as a Shell window
@@ -155,10 +168,6 @@
     DeleteDC(activeBackgroundDC);
   if (inactiveBackgroundDC != NULL)
     DeleteDC(inactiveBackgroundDC);
-
-  // Cleanup the icon vectors
-  while (!taskList.empty())
-    RemoveTask(taskList.front()->GetWnd());
 }
 
 LRESULT Applet::DoDisplayChange(HWND hwnd)
@@ -183,8 +192,9 @@
 
   toolWnd = EAEInitializeTooltipWindow(mainInst);
 
-  // Initialize Settings and AppletMenu classes
+  // Initialize Settings, Config and AppletMenu classes
   pSettings = new Settings();
+  pConfig = new Config(mainInst, mainWnd);
   pAppletMenu = new AppletMenu(mainWnd, mainInst);
   pAppletMenu->Initialize();
 
@@ -797,10 +807,31 @@
 LRESULT Applet::DoNCRButtonUp()
 {
   POINT pt;
+  WCHAR schemeFile[MAX_LINE_LENGTH];
 
   GetCursorPos(&pt);
-  pAppletMenu->ActivateMenu(pt.x, pt.y);
+  switch (pAppletMenu->ActivateMenu(pt.x, pt.y, schemeFile))
+  {
+    case EBC_LOADSCHEME:
+      pSettings->SetSchemeFile(schemeFile);
+      UpdateGUI();
+      break;
 
+    case EBC_EDITSCHEME:
+      pSettings->SetSchemeFile(ESEGetScheme());
+    case EBC_RELOADSCHEME:
+      UpdateGUI();
+      break;
+
+    case EBC_CONFIGURE:
+      if (pConfig->Show() == IDOK)
+        {
+          DoMove();
+          UpdateGUI();
+        }
+      break;
+  }
+
   return 0;
 }
 
@@ -1123,7 +1154,7 @@
     }
 
   if (pAppletMenu)
-    pAppletMenu->UpdateHook();
+    pAppletMenu->UpdateHook(guiInfo.alphaMenu);
 
   ZeroMemory(&oldrt, sizeof(RECT));
   DrawAlphaBlend();

Modified: trunk/Source/emergeTasks/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-29 02:44:26 UTC (rev 1501)
@@ -18,169 +18,9 @@
 //
 //---
 
-#include "Applet.h"
+#include "AppletMenu.h"
 
-extern AppletMenu *pAppletMenu;
-extern Applet *pApplet;
-extern Settings *pSettings;
-Config *pConfig = NULL;
-
-//------
-// Function:	HookCallWndProc
-// Requires:	int nCode - action
-// 		wParam - not used
-// 		lParam - message data
-// Returns:	LRESULT
-// Purpose:	Hooks the menu windows of a given application
-//-----
-LRESULT CALLBACK AppletMenu::HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam)
-{
-  CWPSTRUCT cwps;
-
-  if ( nCode == HC_ACTION )
-    {
-      CopyMemory(&cwps, (LPVOID)lParam, sizeof(CWPSTRUCT));
-
-      switch (cwps.message)
-        {
-        case WM_CREATE:
-        {
-          WCHAR szClass[128];
-          GetClassName(cwps.hwnd, szClass, 127);
-          if (_wcsicmp(szClass, TEXT("#32768"))==0)
-            {
-              SetWindowLong(cwps.hwnd,
-                            GWL_EXSTYLE,
-                            GetWindowLong(cwps.hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
-              SetLayeredWindowAttributes(cwps.hwnd, 0, pApplet->guiInfo.alphaMenu, LWA_ALPHA);
-            }
-        }
-        break;
-        }
-    }
-
-  return CallNextHookEx((HHOOK)WH_CALLWNDPROC, nCode, wParam, lParam);
-}
-
 AppletMenu::AppletMenu(HWND mainWnd, HINSTANCE hInstance)
+  :BaseAppletMenu(mainWnd, hInstance)
 {
-  (*this).mainWnd = mainWnd;
-  menuHook = NULL;
-
-  pConfig = new Config(hInstance, mainWnd);
 }
-
-AppletMenu::~AppletMenu()
-{
-  if (pConfig)
-    delete pConfig;
-
-  DestroyMenu(appletMenu);
-
-  // Clear the menu hook
-  if (menuHook)
-    UnhookWindowsHookEx(menuHook);
-}
-
-void AppletMenu::Initialize()
-{
-  // create the mainMenu
-  appletMenu = CreatePopupMenu();
-
-  // Populate The Menu
-  BuildMenu();
-}
-
-void AppletMenu::UpdateHook()
-{
-  // Clear the menu hook
-  if (menuHook)
-    UnhookWindowsHookEx(menuHook);
-
-  // Hook the menus (for transparency)
-  menuHook = SetWindowsHookEx(WH_CALLWNDPROC, HookCallWndProc, 0, GetWindowThreadProcessId(mainWnd, 0));
-}
-
-void AppletMenu::BuildMenu()
-{
-  AppendMenu(appletMenu, MF_STRING, 100, TEXT("About"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 200, TEXT("Load Scheme"));
-  AppendMenu(appletMenu, MF_STRING, 201, TEXT("Edit Current Scheme"));
-  AppendMenu(appletMenu, MF_STRING, 202, TEXT("Reload Current Scheme"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 300, TEXT("Configure"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 101, TEXT("Exit"));
-}
-
-void AppletMenu::ActivateMenu(int x, int y)
-{
-  UINT ret = TrackPopupMenuEx(appletMenu, TPM_RETURNCMD, x, y, mainWnd, NULL);
-  WCHAR path[MAX_PATH], file[MAX_PATH];
-  OPENFILENAME ofn;
-
-  switch (ret)
-    {
-    case 100:
-      WCHAR tmp[MAX_LINE_LENGTH];
-      VERSIONINFO versionInfo;
-
-      if (ELAppletVersionInfo(mainWnd, &versionInfo))
-        {
-          swprintf(tmp, TEXT("%s\n\nVersion: %s\n\nCurrent Scheme: %s\n\nAuthor: %s"),
-                   versionInfo.Description,
-                   versionInfo.Version,
-                   ESEGetScheme(),
-                   versionInfo.Author);
-
-          MessageBox(GetDesktopWindow(), tmp, TEXT("emergeTasks"),
-                     MB_OK | MB_TOPMOST | MB_ICONINFORMATION);
-        }
-      break;
-
-    case 101:
-      PostQuitMessage(0);
-      break;
-
-    case 200:
-      ZeroMemory(file, MAX_PATH);
-      ZeroMemory(&ofn, sizeof(ofn));
-
-      ELGetCurrentPath(path);
-      wcscat(path, TEXT("Schemes"));
-
-      ofn.lStructSize = sizeof(ofn);
-      ofn.hwndOwner = mainWnd;
-      ofn.lpstrFilter = TEXT("Scheme (*.eds)\0*.eds\0");
-      ofn.lpstrFile = file;
-      ofn.nMaxFile = MAX_PATH;
-      ofn.lpstrInitialDir = path;
-      ofn.lpstrTitle = TEXT("Load Scheme");
-      ofn.lpstrDefExt = NULL;
-      ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_DONTADDTORECENT;
-
-      if (GetOpenFileName(&ofn))
-        {
-          pSettings->SetSchemeFile(file);
-          pApplet->UpdateGUI();
-        }
-      break;
-
-    case 201:
-      wcscpy(file, ESEGetScheme());
-      ESEEditScheme(mainWnd, file);
-      pSettings->SetSchemeFile(ESEGetScheme());
-    case 202:
-      pApplet->UpdateGUI();
-      break;
-
-    case 300:
-      if (pConfig->Show() == IDOK)
-        {
-          pApplet->DoMove();
-          pApplet->UpdateGUI();
-        }
-      break;
-    }
-}

Modified: trunk/Source/emergeTasks/AppletMenu.h
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.h	2007-11-28 14:32:48 UTC (rev 1500)
+++ trunk/Source/emergeTasks/AppletMenu.h	2007-11-29 02:44:26 UTC (rev 1501)
@@ -25,26 +25,12 @@
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
 
-#include "Settings.h"
-#include "Config.h"
+#include "../emergeBaseClasses/BaseAppletMenu.h"
 
-class AppletMenu
+class AppletMenu: public BaseAppletMenu
   {
   public:
     AppletMenu(HWND mainWnd, HINSTANCE hInstance);
-    ~AppletMenu();
-    void Initialize();
-    void BuildMenu();
-    void ActivateMenu(int x, int y);
-    DWORD GetMenuAlpha();
-    void UpdateHook();
-
-  private:
-    HWND mainWnd;
-    HMENU appletMenu;
-    HHOOK menuHook;
-    HINSTANCE hInstance;
-    static LRESULT CALLBACK HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
   };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1503] trunk/Source

From: <ir0nh34d@us...> - 2007-11-29 13:50

Revision: 1503
          http://emerge.svn.sourceforge.net/emerge/?rev=1503&view=rev
Author:   ir0nh34d
Date:     2007-11-29 05:50:01 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Updated for BaseAppletMenu

Modified Paths:
--------------
    trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp
    trunk/Source/emergeBaseClasses/BaseAppletMenu.h
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeCommand/AppletMenu.cpp
    trunk/Source/emergeCommand/AppletMenu.h
    trunk/Source/emergeTasks/AppletMenu.cpp

Modified: trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp
===================================================================
--- trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeBaseClasses/BaseAppletMenu.cpp	2007-11-29 13:50:01 UTC (rev 1503)
@@ -66,10 +66,11 @@
   return menuAlpha;
 }
 
-BaseAppletMenu::BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance)
+BaseAppletMenu::BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance, WCHAR *appletName)
 {
   (*this).mainWnd = mainWnd;
   menuHook = NULL;
+  wcscpy((*this).appletName, appletName);
 
   pBaseAppletMenu = this;
 }
@@ -137,7 +138,7 @@
                    ESEGetScheme(),
                    versionInfo.Author);
 
-          MessageBox(GetDesktopWindow(), tmp, TEXT("emergeTasks"),
+          MessageBox(GetDesktopWindow(), tmp, appletName,
                      MB_OK | MB_TOPMOST | MB_ICONINFORMATION);
         }
       else

Modified: trunk/Source/emergeBaseClasses/BaseAppletMenu.h
===================================================================
--- trunk/Source/emergeBaseClasses/BaseAppletMenu.h	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeBaseClasses/BaseAppletMenu.h	2007-11-29 13:50:01 UTC (rev 1503)
@@ -47,7 +47,7 @@
 class DLL_EXPORT BaseAppletMenu
   {
   public:
-    BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance);
+    BaseAppletMenu(HWND mainWnd, HINSTANCE hInstance, WCHAR *appletName);
     ~BaseAppletMenu();
     void Initialize();
     void BuildMenu();
@@ -61,6 +61,7 @@
     HMENU appletMenu;
     HHOOK menuHook;
     HINSTANCE hInstance;
+    WCHAR appletName[MAX_LINE_LENGTH];
     static LRESULT CALLBACK HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
   };
 

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-11-29 13:50:01 UTC (rev 1503)
@@ -19,11 +19,13 @@
 //---
 
 #include "Applet.h"
+#include "Config.h"
 
 extern Applet *pApplet;
 AppletMenu *pAppletMenu = NULL;
 Settings *pSettings = NULL;
 Command *pCommand = NULL;
+Config *pConfig = NULL;
 WCHAR szClassName[ ] = TEXT("Shell_CommandWnd");
 
 //-----
@@ -248,6 +250,9 @@
   if (pCommand)
     delete pCommand;
 
+  if (pConfig)
+    delete pConfig;
+
   if (mainFont)
     delete mainFont;
 }
@@ -278,6 +283,7 @@
   toolWnd = EAEInitializeTooltipWindow(mainInst);
 
   // Initialize Settings and Scheme classes
+  pConfig = new Config(mainInst, mainWnd);
   pSettings = new Settings();
 
   // Create the Command Window
@@ -484,10 +490,32 @@
 LRESULT Applet::DoNCRButtonUp()
 {
   POINT pt;
+  WCHAR schemeFile[MAX_LINE_LENGTH];
 
   GetCursorPos(&pt);
-  pAppletMenu->ActivateMenu(pt.x, pt.y);
 
+  switch (pAppletMenu->ActivateMenu(pt.x, pt.y, schemeFile))
+  {
+    case EBC_LOADSCHEME:
+      pSettings->SetSchemeFile(schemeFile);
+      UpdateGUI();
+      break;
+
+    case EBC_EDITSCHEME:
+      pSettings->SetSchemeFile(ESEGetScheme());
+    case EBC_RELOADSCHEME:
+      UpdateGUI();
+      break;
+
+    case EBC_CONFIGURE:
+      if (pConfig->Show() == IDOK)
+        {
+          DoMove();
+          UpdateGUI();
+        }
+      break;
+  }
+
   return 0;
 }
 
@@ -667,7 +695,7 @@
   ShowWindow(mainWnd, SW_SHOW);
 
   if (pAppletMenu)
-    pAppletMenu->UpdateHook();
+    pAppletMenu->UpdateHook(guiInfo.alphaMenu);
 
   pCommand->UpdateGUI();
 

Modified: trunk/Source/emergeCommand/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.cpp	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeCommand/AppletMenu.cpp	2007-11-29 13:50:01 UTC (rev 1503)
@@ -18,170 +18,11 @@
 //
 //---
 
-#include "Applet.h"
+#include "AppletMenu.h"
 
-extern AppletMenu *pAppletMenu;
-extern Applet *pApplet;
-extern Settings *pSettings;
-Config *pConfig = NULL;
+WCHAR myName[] = TEXT("emergeCommand");
 
-//------
-// Function:	HookCallWndProc
-// Requires:	int nCode - action
-// 		wParam - not used
-// 		lParam - message data
-// Returns:	LRESULT
-// Purpose:	Hooks the menu windows of a given application
-//-----
-LRESULT CALLBACK AppletMenu::HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam)
-{
-  CWPSTRUCT cwps;
-
-  if ( nCode == HC_ACTION )
-    {
-      CopyMemory(&cwps, (LPVOID)lParam, sizeof(CWPSTRUCT));
-
-      switch (cwps.message)
-        {
-        case WM_CREATE:
-        {
-          WCHAR szClass[128];
-          GetClassName(cwps.hwnd, szClass, 127);
-          if (_wcsicmp(szClass, TEXT("#32768"))==0)
-            {
-              SetWindowLong(cwps.hwnd,
-                            GWL_EXSTYLE,
-                            GetWindowLong(cwps.hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
-              SetLayeredWindowAttributes(cwps.hwnd, 0, pApplet->guiInfo.alphaMenu, LWA_ALPHA);
-            }
-        }
-        break;
-        }
-    }
-
-  return CallNextHookEx((HHOOK)WH_CALLWNDPROC, nCode, wParam, lParam);
-}
-
 AppletMenu::AppletMenu(HWND mainWnd, HINSTANCE hInstance)
+  :BaseAppletMenu(mainWnd, hInstance, myName)
 {
-  (*this).mainWnd = mainWnd;
-  menuHook = NULL;
-
-  pConfig = new Config(hInstance, mainWnd);
 }
-
-AppletMenu::~AppletMenu()
-{
-  if (pConfig)
-    delete pConfig;
-
-  DestroyMenu(appletMenu);
-
-  // Clear the menu hook
-  if (menuHook)
-    UnhookWindowsHookEx(menuHook);
-}
-
-void AppletMenu::Initialize()
-{
-  // create the mainMenu
-  appletMenu = CreatePopupMenu();
-
-  // Populate The Menu
-  BuildMenu();
-}
-
-void AppletMenu::UpdateHook()
-{
-  // Clear the menu hook
-  if (menuHook)
-    UnhookWindowsHookEx(menuHook);
-
-  // Hook the menus (for transparency)
-  menuHook = SetWindowsHookEx(WH_CALLWNDPROC, HookCallWndProc, 0, GetWindowThreadProcessId(mainWnd, 0));
-}
-
-void AppletMenu::BuildMenu()
-{
-  AppendMenu(appletMenu, MF_STRING, 100, TEXT("About"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 200, TEXT("Load Scheme"));
-  AppendMenu(appletMenu, MF_STRING, 201, TEXT("Edit Current Scheme"));
-  AppendMenu(appletMenu, MF_STRING, 202, TEXT("Reload Current Scheme"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 300, TEXT("Configure"));
-  AppendMenu(appletMenu, MF_SEPARATOR, 0, NULL);
-  AppendMenu(appletMenu, MF_STRING, 101, TEXT("Exit"));
-}
-
-void AppletMenu::ActivateMenu(int x, int y)
-{
-  UINT ret = TrackPopupMenuEx(appletMenu, TPM_RETURNCMD, x, y, mainWnd, NULL);
-  WCHAR path[MAX_PATH], file[MAX_PATH];
-  OPENFILENAME ofn;
-
-  switch (ret)
-    {
-    case 100:
-    {
-      WCHAR tmp[MAX_LINE_LENGTH];
-      VERSIONINFO versionInfo;
-
-      if (ELAppletVersionInfo(mainWnd, &versionInfo))
-        {
-          swprintf(tmp, TEXT("%s\n\nVersion: %s\n\nCurrent Scheme: %s\n\nAuthor: %s"),
-                   versionInfo.Description,
-                   versionInfo.Version,
-                   ESEGetScheme(),
-                   versionInfo.Author);
-
-          MessageBox(GetDesktopWindow(), tmp, TEXT("emergeCommand"),
-                     MB_OK | MB_TOPMOST | MB_ICONINFORMATION);
-        }
-    }
-    break;
-
-    case 101:
-      PostQuitMessage(0);
-      break;
-
-    case 200:
-    {
-      ZeroMemory(file, MAX_PATH);
-      ZeroMemory(&ofn, sizeof(ofn));
-
-      ELGetCurrentPath(path);
-      wcscat(path, TEXT("Schemes"));
-
-      ofn.lStructSize = sizeof(ofn);
-      ofn.hwndOwner = mainWnd;
-      ofn.lpstrFilter = TEXT("Scheme (*.eds)\0*.eds\0");
-      ofn.lpstrFile = file;
-      ofn.nMaxFile = MAX_PATH;
-      ofn.lpstrInitialDir = path;
-      ofn.lpstrTitle = TEXT("Load Scheme");
-      ofn.lpstrDefExt = NULL;
-      ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_DONTADDTORECENT;
-
-      if (GetOpenFileName(&ofn))
-        {
-          pSettings->SetSchemeFile(file);
-          pApplet->UpdateGUI();
-        }
-    }
-    break;
-
-    case 201:
-      wcscpy(file, ESEGetScheme());
-      ESEEditScheme(mainWnd, file);
-      pSettings->SetSchemeFile(ESEGetScheme());
-    case 202:
-      pApplet->UpdateGUI();
-      break;
-
-    case 300:
-      if (pConfig->Show() == IDOK)
-        pApplet->UpdateGUI();
-      break;
-    }
-}

Modified: trunk/Source/emergeCommand/AppletMenu.h
===================================================================
--- trunk/Source/emergeCommand/AppletMenu.h	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeCommand/AppletMenu.h	2007-11-29 13:50:01 UTC (rev 1503)
@@ -25,26 +25,12 @@
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
 
-#include "Settings.h"
-#include "Config.h"
+#include "../emergeBaseClasses/BaseAppletMenu.h"
 
-class AppletMenu
+class AppletMenu: public BaseAppletMenu
   {
   public:
     AppletMenu(HWND mainWnd, HINSTANCE hInstance);
-    ~AppletMenu();
-    void Initialize();
-    void BuildMenu();
-    void ActivateMenu(int x, int y);
-    DWORD GetMenuAlpha();
-    void UpdateHook();
-
-  private:
-    HWND mainWnd;
-    HMENU appletMenu;
-    HHOOK menuHook;
-    HINSTANCE hInstance;
-    static LRESULT CALLBACK HookCallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
   };
 
 #endif

Modified: trunk/Source/emergeTasks/AppletMenu.cpp
===================================================================
--- trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-29 02:44:51 UTC (rev 1502)
+++ trunk/Source/emergeTasks/AppletMenu.cpp	2007-11-29 13:50:01 UTC (rev 1503)
@@ -20,7 +20,9 @@
 
 #include "AppletMenu.h"
 
+WCHAR myName[] = TEXT("emergeTasks");
+
 AppletMenu::AppletMenu(HWND mainWnd, HINSTANCE hInstance)
-  :BaseAppletMenu(mainWnd, hInstance)
+  :BaseAppletMenu(mainWnd, hInstance, myName)
 {
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1510] trunk/Source

From: <ir0nh34d@us...> - 2007-12-01 22:27

Revision: 1510
          http://emerge.svn.sourceforge.net/emerge/?rev=1510&view=rev
Author:   ir0nh34d
Date:     2007-12-01 14:27:34 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Merge 4.0.2 fullscreen fix

Modified Paths:
--------------
    trunk/Source/emergeCommand/Applet.cpp
    trunk/Source/emergeLauncher/Applet.cpp
    trunk/Source/emergeLib/emergeLib.h
    trunk/Source/emergeLib/emergeLib.rc
    trunk/Source/emergeLib/main.cpp
    trunk/Source/emergeTasks/Applet.cpp
    trunk/Source/emergeTray/Applet.cpp
    trunk/Source/emergeVWM/Applet.cpp

Modified: trunk/Source/emergeCommand/Applet.cpp
===================================================================
--- trunk/Source/emergeCommand/Applet.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeCommand/Applet.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -193,9 +193,7 @@
         case HSHELL_RUDEAPPACTIVATED:
           if (!fullScreen)
           {
-            Sleep(100);
-
-            if (ELIsFullScreen(task))
+            if (ELIsFullScreen(mainWnd))
               {
                 fullScreen = true;
                 DoEmergeNotify(EMERGE_CORE, CORE_HIDE);

Modified: trunk/Source/emergeLauncher/Applet.cpp
===================================================================
--- trunk/Source/emergeLauncher/Applet.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeLauncher/Applet.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -143,9 +143,7 @@
         case HSHELL_RUDEAPPACTIVATED:
           if (!fullScreen)
             {
-              Sleep(100);
-
-              if (ELIsFullScreen(task))
+              if (ELIsFullScreen(mainWnd))
                 {
                   fullScreen = true;
                   DoEmergeNotify(EMERGE_CORE, CORE_HIDE);

Modified: trunk/Source/emergeLib/emergeLib.h
===================================================================
--- trunk/Source/emergeLib/emergeLib.h	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeLib/emergeLib.h	2007-12-01 22:27:34 UTC (rev 1510)
@@ -266,7 +266,6 @@
     DLL_EXPORT void ELThreadExecuteSpecialFolder(void *argument);
     DLL_EXPORT bool ELGetCurrentPath(LPTSTR path);
     DLL_EXPORT HWND ELGetCoreWindow();
-    DLL_EXPORT HWND ELGetDesktopWindow();
     DLL_EXPORT bool ELRun();
     DLL_EXPORT bool ELRegisterShellHook(HWND hwnd, DWORD method);
     DLL_EXPORT bool ELQuit(bool prompt);
@@ -294,7 +293,7 @@
     DLL_EXPORT bool ELAppletVersionInfo(HWND appWnd, LPVERSIONINFO versionInfo);
     DLL_EXPORT bool ELAppletFileVersion(WCHAR *applet, LPVERSIONINFO versionInfo);
     DLL_EXPORT bool ELGetWindowApp(HWND hWnd, WCHAR *processName, bool fullName);
-    DLL_EXPORT bool ELIsFullScreen(HWND hwnd);
+    DLL_EXPORT bool ELIsFullScreen(HWND appletWnd);
     DLL_EXPORT bool ELParseCommand(WCHAR *application, WCHAR *program, WCHAR *arguments);
     DLL_EXPORT UINT ELIsSpecialFolder(WCHAR *folder);
     DLL_EXPORT UINT ELIsInternalCommand(WCHAR *command);

Modified: trunk/Source/emergeLib/emergeLib.rc
===================================================================
--- trunk/Source/emergeLib/emergeLib.rc	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeLib/emergeLib.rc	2007-12-01 22:27:34 UTC (rev 1510)
@@ -21,36 +21,32 @@
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,0,0
- PRODUCTVERSION 4,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
+ FILEVERSION 4,0,2,0
+ PRODUCTVERSION 4,0,2,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef DEBUG
+ FILEFLAGS VS_FF_DEBUG
 #endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004B0"
         BEGIN
-            VALUE "CompanyName", "The Emerge Desktop Development Team\0"
-            VALUE "FileDescription", "emergeLib - Emerge Desktop utility library\0"
-            VALUE "FileVersion", "4.0\0"
-            VALUE "InternalName", "emergeLib\0"
-            VALUE "LegalCopyright", "Copyright (C) 2004 - 2007\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "emergeLib.dll\0"
-            VALUE "ProductName", "emergeLib\0"
-            VALUE "ProductVersion", "4.0\0"
+            VALUE "CompanyName", "The Emerge Desktop Development Team"
+            VALUE "FileDescription", "emergeLib - Emerge Desktop utility library"
+            VALUE "FileVersion", "4.0.2"
+            VALUE "InternalName", "emergeLib"
+            VALUE "LegalCopyright", "Copyright (C) 2004 - 2007"
+            VALUE "OriginalFilename", "emergeLib.dll"
+            VALUE "ProductName", "emergeLib"
+            VALUE "ProductVersion", "4.0.2"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x410, 1200
+        VALUE "Translation", 0x0, 1200
     END
 END
 

Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeLib/main.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -20,9 +20,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   @note 1)	For MSVC users, put the AggressiveOptimize.h header file (available from
-http://www.nopcode.com) in your 'include' directory.  It cuts down on executable
-filesize.
-@... 2)	The ELExit code is based on a function from the LiteShell code base.
+  http://www.nopcode.com) in your 'include' directory.  It cuts down on executable
+  filesize.
+  @note 2)	The ELExit code is based on a function from the LiteShell code base.
 */
 
 #undef _WIN32_IE
@@ -52,6 +52,7 @@
 bool SnapMoveToDesk(LPSNAPMOVEINFO snapMove);
 bool GetWindowApp(DWORD processID, WCHAR *processName, bool fullName);
 bool WriteValue(WCHAR *fileName, WCHAR *keyword, WCHAR *value);
+BOOL CALLBACK FullscreenEnum(HWND hwnd, LPARAM lParam);
 
 // Globals
 HINSTANCE dllInstance;
@@ -93,7 +94,7 @@
   @param value value to read from the key
   @param target pointer to DWORD to recieve value
   @param notFound value to use if not found
-  */
+*/
 bool ELReadRegDWord(HKEY key, LPTSTR value, DWORD *target, DWORD notFound)
 {
   DWORD dwSize = sizeof(DWORD);
@@ -291,18 +292,11 @@
 // Returns:	HWND
 // Purpose:	Returns emergeCore's desktop window
 //-----
-HWND ELGetDesktopWindow()
+/*HWND ELGetDesktopWindow()
 {
-  HWND deskWindow = FindWindow(TEXT("progman"), NULL);
+  return FindWindow(TEXT("emergeDesktopClass"), NULL);
+}*/
 
-  if (deskWindow == NULL)
-    deskWindow = HWND_BOTTOM;
-  else
-    deskWindow = GetNextWindow(deskWindow, GW_HWNDPREV);
-
-  return deskWindow;
-}
-
 void ELWriteDebug(WCHAR *debugText)
 {
   FILE *fp;
@@ -715,7 +709,7 @@
                                    SPIF_SENDCHANGE);
             }
 
-          result = MSRegisterShellHookWindow(shellWnd, method);
+            result = MSRegisterShellHookWindow(shellWnd, method);
         }
     }
 
@@ -803,36 +797,41 @@
   return abs(edge - side) < 10;
 }
 
-bool ELIsFullScreen(HWND hwnd)
+BOOL CALLBACK FullscreenEnum(HWND hwnd, LPARAM lParam)
 {
-  RECT wndRect;
-  POINT midPt;
-  HMONITOR hwndMonitor;
+  HMONITOR hwndMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
   MONITORINFO hwndMonitorInfo;
+  RECT wndRect;
   hwndMonitorInfo.cbSize = sizeof(MONITORINFO);
 
-  if (!IsWindowVisible(hwnd))
-    return false;
+  if (hwndMonitor != (HMONITOR)lParam)
+    return true;
 
   if (hwnd == FindWindow(TEXT("Progman"), NULL))
-    return false;
+    return true;
 
   if (hwnd == FindWindow(TEXT("InstallShield_Win"), NULL))
-    return false;
+    return true;
 
-  /*  if ((GetWindowLong(hwnd, GWL_STYLE) & WS_THICKFRAME) == WS_THICKFRAME)
-      return false;*/
-
-  GetWindowRect(hwnd, &wndRect);
-  midPt.x = (wndRect.right - wndRect.left) / 2;
-  midPt.y = (wndRect.bottom - wndRect.top) / 2;
-  hwndMonitor = MonitorFromPoint(midPt, MONITOR_DEFAULTTONEAREST);
   GetMonitorInfo(hwndMonitor, &hwndMonitorInfo);
-
+  GetWindowRect(hwnd, &wndRect);
   if ((wndRect.left <= hwndMonitorInfo.rcMonitor.left) &&
       (wndRect.top <= hwndMonitorInfo.rcMonitor.top) &&
       (wndRect.right >= hwndMonitorInfo.rcMonitor.right) &&
       (wndRect.bottom >= hwndMonitorInfo.rcMonitor.bottom))
+    {
+      SetLastError(ERROR_SUCCESS);
+      return false;
+    }
+
+  return true;
+}
+
+bool ELIsFullScreen(HWND appletWnd)
+{
+  HMONITOR appletMonitor = MonitorFromWindow(appletWnd, MONITOR_DEFAULTTONEAREST);
+
+  if (EnumWindows(FullscreenEnum, (LPARAM)appletMonitor) == ERROR_SUCCESS)
     return true;
 
   return false;
@@ -1003,30 +1002,30 @@
   if (!GetMonitorInfo(appletMonitor, &appletMonitorInfo))
     return false;
 
-  //  if ((IsClose(snapMove->AppletRect->top, appletMonitorInfo.rcMonitor.top)) |
-  //      (snapMove->AppletRect->top < appletMonitorInfo.rcMonitor.top))
+//  if ((IsClose(snapMove->AppletRect->top, appletMonitorInfo.rcMonitor.top)) |
+//      (snapMove->AppletRect->top < appletMonitorInfo.rcMonitor.top))
   if (IsClose(snapMove->AppletRect->top, appletMonitorInfo.rcMonitor.top))
     {
       verticalMove = true;
       verticalOffset = appletMonitorInfo.rcMonitor.top - snapMove->AppletRect->top;
     }
-  //  else if ((IsClose(snapMove->AppletRect->bottom, appletMonitorInfo.rcMonitor.bottom)) |
-  //      (snapMove->AppletRect->bottom > appletMonitorInfo.rcMonitor.bottom))
+//  else if ((IsClose(snapMove->AppletRect->bottom, appletMonitorInfo.rcMonitor.bottom)) |
+//      (snapMove->AppletRect->bottom > appletMonitorInfo.rcMonitor.bottom))
   else if (IsClose(snapMove->AppletRect->bottom, appletMonitorInfo.rcMonitor.bottom))
     {
       verticalMove = true;
       verticalOffset = appletMonitorInfo.rcMonitor.bottom - snapMove->AppletRect->bottom;
     }
 
-  //  if ((IsClose(snapMove->AppletRect->left, appletMonitorInfo.rcMonitor.left)) |
-  //      (snapMove->AppletRect->left < appletMonitorInfo.rcMonitor.left))
+//  if ((IsClose(snapMove->AppletRect->left, appletMonitorInfo.rcMonitor.left)) |
+//      (snapMove->AppletRect->left < appletMonitorInfo.rcMonitor.left))
   if (IsClose(snapMove->AppletRect->left, appletMonitorInfo.rcMonitor.left))
     {
       horizontalMove = true;
       horizontalOffset = appletMonitorInfo.rcMonitor.left - snapMove->AppletRect->left;
     }
-  //  else if ((IsClose(snapMove->AppletRect->right, appletMonitorInfo.rcMonitor.right)) |
-  //      (snapMove->AppletRect->right > appletMonitorInfo.rcMonitor.right))
+//  else if ((IsClose(snapMove->AppletRect->right, appletMonitorInfo.rcMonitor.right)) |
+//      (snapMove->AppletRect->right > appletMonitorInfo.rcMonitor.right))
   else if (IsClose(snapMove->AppletRect->right, appletMonitorInfo.rcMonitor.right))
     {
       horizontalMove = true;
@@ -1344,8 +1343,8 @@
   HMODULE user32DLL = GetModuleHandle(TEXT("user32.dll"));
   if (user32DLL)
     {
-      static lpfnMSSwitchToThisWindow MSSwitchToThisWindow =
-        (lpfnMSSwitchToThisWindow)GetProcAddress(user32DLL, "SwitchToThisWindow");
+      static lpfnMSSwitchToThisWindow MSSwitchToThisWindow = (lpfnMSSwitchToThisWindow)GetProcAddress(
+            user32DLL, "SwitchToThisWindow");
       if (MSSwitchToThisWindow)
         {
           MSSwitchToThisWindow(wnd, TRUE);
@@ -1535,7 +1534,7 @@
   @brief Take the supplied alias comparing it to the command file and executes the appropriate command based on the alias.
   @param alias String containing the alias
   @return true if successful
-  */
+*/
 
 bool ELExecuteAlias(LPTSTR alias)
 {
@@ -1580,7 +1579,7 @@
   @fn ELThreadExecuteAll(void *argument)
   @brief Thread wrapper that will attempt to execute all ELExecute commands
   @param argument LPEXECUTEINFO structure containing command to execute
-  */
+*/
 
 void ELThreadExecuteAll(void *argument)
 {
@@ -1607,7 +1606,7 @@
   @fn ELThreadExecute(void *argument)
   @brief Thread wrapper for ELExecute
   @param argument LPEXECUTEINFO structure containing command to execute
-  */
+*/
 
 void ELThreadExecute(void *argument)
 {
@@ -1624,7 +1623,7 @@
   @fn ELThreadExecuteInternal(void *argument)
   @brief Thread wrapper for ELExecuteInternal
   @param argument LPEXECUTEINFO structure containing command to execute
-  */
+*/
 
 void ELThreadExecuteInternal(void *argument)
 {
@@ -1641,7 +1640,7 @@
   @fn ELThreadExecuteSpecialFolder(void *argument)
   @brief Thread wrapper for ELExecuteSpecialFolder
   @param argument LPEXECUTEINFO structure containing command to execute
-  */
+*/
 
 void ELThreadExecuteSpecialFolder(void *argument)
 {
@@ -1658,7 +1657,7 @@
   @fn ELThreadExecuteAlias(void *argument)
   @brief Thread wrapper for ELExecuteAlias
   @param argument LPEXECUTEINFO structure containing command to execute
-  */
+*/
 
 void ELThreadExecuteAlias(void *argument)
 {
@@ -1675,10 +1674,10 @@
   @fn ELExit(UINT uFlag, bool prompt)
   @brief Alternate shutdown method
   @param uFlag shutdown method.  Valid flags include: EWX_FORCE, EWX_FORCEIFHUNG, EWX_LOGOFF, EWX_POWEROFF,
-  EWX_REBOOT, EMERGE_SUSPEND, EMERGE_HIBERNATE
+    EWX_REBOOT, EMERGE_SUSPEND, EMERGE_HIBERNATE
   @param prompt if true, display dialogue, if false, no dialogue
   @return true if successful
-  */
+*/
 
 bool ELExit(UINT uFlag, bool prompt)
 {
@@ -1788,7 +1787,7 @@
   @fn ELShowDesktop()
   @brief Shows the desktop by minimizing all top level windows
   @return true if successful
-  */
+*/
 
 bool ELShowDesktop()
 {
@@ -1799,7 +1798,7 @@
   @fn ELCheckWindow(HWND hwnd)
   @brief Check to seee if the window is a valid 'task'
   @param hwnd window handle
-  */
+*/
 
 bool ELCheckWindow(HWND hwnd)
 {
@@ -1817,7 +1816,7 @@
   @param hwnd window handle to minimize
   @param lParam not used
   @return TRUE
-  */
+*/
 
 BOOL CALLBACK MinimizeAll(HWND hwnd, LPARAM lParam)
 {
@@ -1935,7 +1934,7 @@
   @param keyword Variable to search for
   @param value String that contains the keyword's value
   @return true if successful
-  */
+*/
 
 bool ReadValue(WCHAR *fileName, WCHAR *keyword, WCHAR *value)
 {
@@ -1994,7 +1993,7 @@
   @param target Integer that is populated by the function
   @param notFound Integer to use if the variable is not found
   @return true if successful
-  */
+*/
 
 bool ELReadFileInt(WCHAR *fileName, WCHAR *item, int *target, int notFound)
 {
@@ -2029,7 +2028,7 @@
   @param target String that is populated by the function
   @param notFound String to use if the variable is not found
   @return true if successful
-  */
+*/
 
 bool ELReadFileString(WCHAR *fileName, WCHAR *item, WCHAR *target, WCHAR *notFound)
 {
@@ -2055,7 +2054,7 @@
   @param target bool that is populated by the function
   @param notFound bool to use if the variable is not found
   @return true if successful
-  */
+*/
 
 bool ELReadFileBool(WCHAR *fileName, WCHAR *item, bool *target, bool notFound)
 {
@@ -2090,7 +2089,7 @@
   @param target COLORREF that is populated by the function
   @param notFound COLORREF to use if the variable is not found
   @return true if successful
-  */
+*/
 
 bool ELReadFileColor(WCHAR *fileName, WCHAR *item, COLORREF *target, COLORREF notFound)
 {
@@ -2122,7 +2121,7 @@
   @fn ELVersionInfo()
   @brief Determines the version of the Operating System
   @return Version of Operating System
-  */
+*/
 
 UINT ELVersionInfo()
 {
@@ -2147,7 +2146,7 @@
   @param appWnd Window handle
   @param versionInfo VERSIONINFO structure to populate
   @return true if successful
-  */
+*/
 
 bool ELAppletVersionInfo(HWND appWnd, LPVERSIONINFO versionInfo)
 {
@@ -2165,7 +2164,7 @@
   @param applet File to open
   @param versionInfo VERSIONINFO structure to populate
   @return true if successful
-  */
+*/
 
 bool ELAppletFileVersion(WCHAR *applet, LPVERSIONINFO versionInfo)
 {
@@ -2238,7 +2237,7 @@
   @param processName Populated with process owning the window handle
   @param fullName if true return fully qualified name, if false return basename
   @return true if successful
-  */
+*/
 
 bool GetWindowApp(DWORD processID, WCHAR *processName, bool fullName)
 {
@@ -2281,7 +2280,7 @@
   @param processName Populated with process owning the window handle
   @param fullName if true return fully qualified name, if false return basename
   @return true if successful
-  */
+*/
 
 bool ELGetWindowApp(HWND hWnd, WCHAR *processName, bool fullName)
 {
@@ -2296,7 +2295,7 @@
   @fn ELIsInternalCommand(WCHAR *command)
   @brief Determines the internal command based on the string passed
   @param command string to perform check on
-  */
+*/
 
 UINT ELIsInternalCommand(WCHAR *command)
 {
@@ -2322,7 +2321,7 @@
   @fn ELIsSpecialFolder(WCHAR *folder)
   @brief Determines the special folder based on the string passed
   @param folder string to perform check on
-  */
+*/
 
 UINT ELIsSpecialFolder(WCHAR *folder)
 {
@@ -2366,7 +2365,7 @@
   @fn ELGetSpecialFolder(UINT folder)
   @brief Returns the path to special Windows folders
   @param folder special folder to return path for
-  */
+*/
 
 bool ELGetSpecialFolder(UINT folder, WCHAR *folderPath)
 {
@@ -2405,7 +2404,7 @@
   @brief Returns the mid point between two sides.
   @param left value of one side
   @param right value of other side
-  */
+*/
 
 int ELMid(int left, int right)
 {

Modified: trunk/Source/emergeTasks/Applet.cpp
===================================================================
--- trunk/Source/emergeTasks/Applet.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeTasks/Applet.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -1040,8 +1040,7 @@
         case HSHELL_RUDEAPPACTIVATED:
           if (!fullScreen)
             {
-              Sleep(100);
-              if (ELIsFullScreen(task))
+              if (ELIsFullScreen(mainWnd))
                 {
                   fullScreen = true;
                   DoEmergeNotify(EMERGE_CORE, CORE_HIDE);

Modified: trunk/Source/emergeTray/Applet.cpp
===================================================================
--- trunk/Source/emergeTray/Applet.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeTray/Applet.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -183,8 +183,7 @@
         case HSHELL_RUDEAPPACTIVATED:
           if (!fullScreen)
             {
-              Sleep(100);
-              if (ELIsFullScreen(task))
+              if (ELIsFullScreen(mainWnd))
                 {
                   fullScreen = true;
                   DoEmergeNotify(EMERGE_CORE, CORE_HIDE);

Modified: trunk/Source/emergeVWM/Applet.cpp
===================================================================
--- trunk/Source/emergeVWM/Applet.cpp	2007-12-01 22:12:44 UTC (rev 1509)
+++ trunk/Source/emergeVWM/Applet.cpp	2007-12-01 22:27:34 UTC (rev 1510)
@@ -852,8 +852,7 @@
         case HSHELL_RUDEAPPACTIVATED:
           if (!fullScreen)
             {
-              Sleep(100);
-              if (ELIsFullScreen(task))
+              if (ELIsFullScreen(mainWnd))
                 {
                   fullScreen = true;
                   DoEmergeNotify(EMERGE_CORE, CORE_HIDE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1539] trunk/Source

From: <ir0nh34d@us...> - 2007-12-24 00:03

Revision: 1539
          http://emerge.svn.sourceforge.net/emerge/?rev=1539&view=rev
Author:   ir0nh34d
Date:     2007-12-23 16:03:41 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
Out of date project files

Removed Paths:
-------------
    trunk/Source/.cproject
    trunk/Source/.project
    trunk/Source/EmergeDesktop.cbp

Deleted: trunk/Source/.cproject
===================================================================
--- trunk/Source/.cproject	2007-12-18 13:09:26 UTC (rev 1538)
+++ trunk/Source/.cproject	2007-12-24 00:03:41 UTC (rev 1539)
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.508877515">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.508877515" moduleId="org.eclipse.cdt.core.settings" name="MinGW GCC">
-
-
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-
-<configuration artifactExtension="" artifactName="emerge" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.508877515" name="MinGW GCC" parent="org.eclipse.cdt.build.core.emptycfg">
-<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.508877515.1920087436" name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.1754451752" name="cdt.managedbuild.toolchain.gnu.mingw.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.1260863255" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-<builder autoBuildTarget="all" buildPath="${workspace_loc:/emerge/Source}" cleanBuildTarget="clean" command="mingw32-make" enableAutoBuild="true" enableCleanBuild="true" id="cdt.managedbuild.toolchain.gnu.mingw.base.508877515.1513597630" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.223847306" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.580922182" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1879125706" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.298716616" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.410295724" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1077078421" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1133742137" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1840750214" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.1520597607" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.508877515;cdt.managedbuild.toolchain.gnu.mingw.base.508877515.1920087436;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.298716616;cdt.managedbuild.tool.gnu.cpp.compiler.input">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.508877515;cdt.managedbuild.toolchain.gnu.mingw.base.508877515.1920087436;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1077078421;cdt.managedbuild.tool.gnu.c.compiler.input">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-
-<project id="emerge.null.223177310" name="emerge"/>
-</storageModule>
-</cproject>

Deleted: trunk/Source/.project
===================================================================
--- trunk/Source/.project	2007-12-18 13:09:26 UTC (rev 1538)
+++ trunk/Source/.project	2007-12-24 00:03:41 UTC (rev 1539)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>emerge</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-	</natures>
-</projectDescription>

Deleted: trunk/Source/EmergeDesktop.cbp
===================================================================
--- trunk/Source/EmergeDesktop.cbp	2007-12-18 13:09:26 UTC (rev 1538)
+++ trunk/Source/EmergeDesktop.cbp	2007-12-24 00:03:41 UTC (rev 1539)
@@ -1,817 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="EmergeDesktop" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="emergeLib - Release">
-				<Option output="bin\emergeLib" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-DEMERGELIB_EXPORTS" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeLib" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="shlwapi" />
-					<Add library="version" />
-					<Add library="psapi" />
-					<Add library="ole32" />
-					<Add library="uuid" />
-					<Add library="gdi32" />
-					<Add library="wtsapi32" />
-				</Linker>
-			</Target>
-			<Target title="emergeGraphics - Release">
-				<Option output="bin\emergeGraphics" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-DEMERGEGRAPHICS_EXPORTS" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeGraphics" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="gdi32" />
-					<Add library="msimg32" />
-					<Add library="ole32" />
-					<Add library="shlwapi" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeAppletEngine - Release">
-				<Option output="bin\emergeAppletEngine" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-DEMERGEAPPLETENGINE_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="comctl32" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeSchemeEngine - Release">
-				<Option output="bin\emergeSchemeEngine" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-DEMERGESCHEMEENGINE_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeGraphics" />
-					<Add library="emergeLib" />
-					<Add library="gdi32" />
-					<Add library="msimg32" />
-					<Add library="comdlg32" />
-					<Add library="shlwapi" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeBaseClasses - Release">
-				<Option output="bin\emergeBaseClasses" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-DEMERGEBASECLASSES_EXPORTS" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeLib" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="comdlg32" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeCore - Release">
-				<Option output="bin\emergeCore" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeCore" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="shell32" />
-					<Add library="shlwapi" />
-					<Add library="ole32" />
-					<Add library="comctl32" />
-					<Add library="uuid" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeCommand - Release">
-				<Option output="bin\emergeCommand" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeCommand" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeLib" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeGraphics" />
-					<Add library="ole32" />
-					<Add library="uuid" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeDesktop - Release">
-				<Option output="bin\emergeDesktop" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeDesktop" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="shlwapi" />
-					<Add library="comctl32" />
-					<Add library="emergeGraphics" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeHotkeys - Release">
-				<Option output="bin\emergeHotkeys" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeHotkeys" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeLib" />
-					<Add library="comctl32" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeLauncher - Release">
-				<Option output="bin\emergeLauncher" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeLauncher" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeLib" />
-					<Add library="emergeGraphics" />
-					<Add library="emergeAppletEngine" />
-					<Add library="comctl32" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeTasks - Release">
-				<Option output="bin\emergeTasks" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeTasks" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeGraphics" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeTray - Release">
-				<Option output="bin\emergeTray" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeTray" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeLib" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeGraphics" />
-					<Add library="comctl32" />
-					<Add library="uuid" />
-					<Add library="ole32" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeVWM - Release">
-				<Option output="bin\emergeVWM" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeVWM" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeLib" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeGraphics" />
-					<Add library="comctl32" />
-					<Add library="shlwapi" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-			<Target title="emergeTasks - Debug">
-				<Option output="bin\emergeTasks" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".objs\Release" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-O2" />
-					<Add option="-g" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory=".\emergeTasks" />
-				</ResourceCompiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="emergeLib" />
-					<Add library="emergeSchemeEngine" />
-					<Add library="emergeAppletEngine" />
-					<Add library="emergeGraphics" />
-					<Add library="emergeBaseClasses" />
-					<Add directory=".\bin" />
-				</Linker>
-			</Target>
-		</Build>
-		<VirtualTargets>
-			<Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;" />
-		</VirtualTargets>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Unit filename="emergeAppletEngine\emergeAppletEngine.h">
-			<Option target="emergeAppletEngine - Release" />
-		</Unit>
-		<Unit filename="emergeAppletEngine\emergeAppletEngine.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeAppletEngine - Release" />
-		</Unit>
-		<Unit filename="emergeAppletEngine\main.cpp">
-			<Option target="emergeAppletEngine - Release" />
-		</Unit>
-		<Unit filename="emergeAppletEngine\resource.h">
-			<Option target="emergeAppletEngine - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\BaseAppletMenu.cpp">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\BaseAppletMenu.h">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\BaseSettings.cpp">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\BaseSettings.h">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\emergeBaseClasses.dll.manifest">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\emergeBaseClasses.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeBaseClasses\resource.h">
-			<Option target="emergeBaseClasses - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Applet.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Applet.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\AppletMenu.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\AppletMenu.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Command.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Command.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Config.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Config.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\CustomSource.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\CustomSource.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Settings.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\Settings.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\emergeCommand.exe.manifest">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\emergeCommand.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\main.cpp">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCommand\resource.h">
-			<Option target="emergeCommand - Release" />
-		</Unit>
-		<Unit filename="emergeCore\Core.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\Core.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\DDEService.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\DDEService.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\DDEWorker.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\DDEWorker.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\LaunchEditor.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\LaunchEditor.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\MessageControl.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\MessageControl.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\Shell.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\Shell.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\ShellChanger.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\ShellChanger.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\emergeCore.exe.manifest">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\emergeCore.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\main.cpp">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeCore\resource.h">
-			<Option target="emergeCore - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Config.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Config.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Desktop.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Desktop.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuEditor.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuEditor.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuItem.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuItem.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuListItem.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\MenuListItem.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Settings.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\Settings.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\emergeDesktop.exe.manifest">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\emergeDesktop.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\main.cpp">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeDesktop\resource.h">
-			<Option target="emergeDesktop - Release" />
-		</Unit>
-		<Unit filename="emergeGraphics\emergeGraphics.h">
-			<Option target="emergeGraphics - Release" />
-		</Unit>
-		<Unit filename="emergeGraphics\emergeGraphics.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeGraphics - Release" />
-		</Unit>
-		<Unit filename="emergeGraphics\main.cpp">
-			<Option target="emergeGraphics - Release" />
-		</Unit>
-		<Unit filename="emergeGraphics\resource.h">
-			<Option target="emergeGraphics - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Actions.cpp">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Actions.h">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Applet.cpp">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Applet.h">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\HotkeyCombo.cpp">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\HotkeyCombo.h">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Settings.cpp">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\Settings.h">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\emergeHotkeys.exe.manifest">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\emergeHotkeys.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\main.cpp">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeHotkeys\resource.h">
-			<Option target="emergeHotkeys - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Applet.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Applet.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\AppletMenu.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\AppletMenu.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Config.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Config.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Item.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Item.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Settings.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\Settings.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\emergeLauncher.exe.manifest">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\emergeLauncher.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\main.cpp">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLauncher\resource.h">
-			<Option target="emergeLauncher - Release" />
-		</Unit>
-		<Unit filename="emergeLib\Shutdown.cpp">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\Shutdown.h">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\emergeLib.dll.manifest">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\emergeLib.doxy">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\emergeLib.h">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\emergeLib.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\main.cpp">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeLib\resource.h">
-			<Option target="emergeLib - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\BImage.cpp">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\BImage.h">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\SchemeEditor.cpp">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\SchemeEditor.h">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\emergeSchemeEngine.h">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\emergeSchemeEngine.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\main.cpp">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeSchemeEngine\resource.h">
-			<Option target="emergeSchemeEngine - Release" />
-		</Unit>
-		<Unit filename="emergeTasks\Applet.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Applet.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\AppletMenu.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\AppletMenu.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Config.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Config.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Settings.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Settings.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Task.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\Task.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\emergeTasks.exe.manifest">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\emergeTasks.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\main.cpp">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTasks\resource.h">
-			<Option target="emergeTasks - Release" />
-			<Option target="emergeTasks - Debug" />
-		</Unit>
-		<Unit filename="emergeTray\Applet.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\Applet.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\AppletMenu.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\AppletMenu.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\Config.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\Config.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\Settings.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\Settings.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\TrayIcon.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\TrayIcon.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\emergeTray.exe.manifest">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\emergeTray.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\main.cpp">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeTray\resource.h">
-			<Option target="emergeTray - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Applet.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Applet.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\AppletMenu.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\AppletMenu.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Config.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Config.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Settings.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Settings.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Task.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\Task.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\emergeVWM.exe.manifest">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\emergeVWM.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\main.cpp">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Unit filename="emergeVWM\resource.h">
-			<Option target="emergeVWM - Release" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Emerge-svn] SF.net SVN: emerge: [1549] trunk/Source

From: <ir0nh34d@us...> - 2008-01-01 15:03

Revision: 1549
          http://emerge.svn.sourceforge.net/emerge/?rev=1549&view=rev
Author:   ir0nh34d
Date:     2008-01-01 07:03:10 -0800 (Tue, 01 Jan 2008)

Log Message:
-----------
Out of date

Removed Paths:
-------------
    trunk/Source/emergeCommand/Changes.txt
    trunk/Source/emergeCommand/SciTEDirectory.properties
    trunk/Source/emergeCommand/emergeCommand.sln
    trunk/Source/emergeCommand/emergeCommand.vcproj
    trunk/Source/emergeCore/Changes.txt
    trunk/Source/emergeCore/Requests.txt
    trunk/Source/emergeCore/SciTEDirectory.properties
    trunk/Source/emergeCore/emergeCore.sln
    trunk/Source/emergeCore/emergeCore.vcproj
    trunk/Source/emergeDesktop/SciTEDirectory.properties
    trunk/Source/emergeDesktop/changes.txt
    trunk/Source/emergeDesktop/emergeDesktop.sln
    trunk/Source/emergeDesktop/emergeDesktop.vcproj
    trunk/Source/emergeHook/Changes.txt
    trunk/Source/emergeHook/emergeHook.cbp
    trunk/Source/emergeHook/emergeHook.sln
    trunk/Source/emergeHook/emergeHook.vcproj
    trunk/Source/emergeHotkeys/Changes.txt
    trunk/Source/emergeHotkeys/SciTEDirectory.properties
    trunk/Source/emergeHotkeys/emergeHotkeys.sln
    trunk/Source/emergeHotkeys/emergeHotkeys.vcproj
    trunk/Source/emergeLauncher/SciTEDirectory.properties
    trunk/Source/emergeLauncher/changes.txt
    trunk/Source/emergeLauncher/emergeLauncher.sln
    trunk/Source/emergeLauncher/emergeLauncher.vcproj
    trunk/Source/emergeLib/Changes.txt
    trunk/Source/emergeLib/emergeLib.sln
    trunk/Source/emergeLib/emergeLib.vcproj
    trunk/Source/emergeTasks/Changes.txt
    trunk/Source/emergeTasks/SciTEDirectory.properties
    trunk/Source/emergeTasks/emergeTasks.sln
    trunk/Source/emergeTasks/emergeTasks.vcproj
    trunk/Source/emergeTray/Changes.txt
    trunk/Source/emergeTray/SciTEDirectory.properties
    trunk/Source/emergeTray/emergeTray.sln
    trunk/Source/emergeTray/emergeTray.vcproj
    trunk/Source/emergeVWM/Changes.txt
    trunk/Source/emergeVWM/SciTEDirectory.properties
    trunk/Source/emergeVWM/emergeVWM.sln
    trunk/Source/emergeVWM/emergeVWM.vcproj

Deleted: trunk/Source/emergeCommand/Changes.txt
===================================================================
--- trunk/Source/emergeCommand/Changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCommand/Changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,189 +0,0 @@
-[changed 2006/12/13 ir0nh34d Applet.cpp/.h]
-- fix applet menu for mutlimonitor configurations
-
-[added 2006/10/16 ir0nh34d Applet.cpp, Settings.cpp/.h, Config.cpp]
-- added support for SnapSize / SnapMove
-
-[added 2006/10/12 ir0nh34d Applet.cpp/.h, Settings.cpp/.h, Config.cpp,
-resource.h, emergeCommand.rc]
-- added support for tooltips
-
-[changed 2006/09/17 ir0nh34d Applet.cpp]
-- enabled applet snapping
-
-[changed 2006/09/08 ir0nh34d Applet.cpp]
-- fixed z-order issue
-
-=== 3.0.1 ===
-
-[changed 2006/05/09 ir0nh34d Applet.cpp]
-- update system based colors when they change
-
-[changed 2006/04/12 ir0nh34d Applet.cpp]
-- don't display garbage text when starting
-
-[changed 2006/04/12 ir0nh34d Applet.cpp]
-- make the border grow outward instead of inward
-
-=== 3.0.0 ===
-
-[changed 2006/02/14 ir0nh34d emergeCommand.rc]
-- integrated manifest file in to emergeCore.exe
-
-=== 2.0 ===
-
-[changed 2005/08/19 ir0nh34d Scheme.cpp]
-- fixed click through bug where background alpha was not handled correctly
-
-[added 2005/08/17 ir0nh34d emergeCommand.exe.manifest]
-- to give config dialog XP look and feel (thanx to iamsthitha for the file)
-
-[changed 2005/07/27 ir0nh34d Applet.cpp, Applet.h]
-- applet hides when there is a full screen app
-
-[changed 2005/07/02 ir0nh34d Applet.cpp, Applet.h]
-- fixed change on screen resize
-
-[changed 2005/06/28 ir0nh34d Scheme.cpp]
-- fixed 16-bit 'click-through' bug
-
-[changed 2005/06/15 ir0nh34d all files]
-- fixed issues as a result of unicode change
-
-[changed 2005/05/26 ir0nh34d all files]
-- converted to unicode
-
-=== 1.1.1 ===
-
-[changed 2005/04/03 ir0nh34d main.cpp]
-- fixed focus issue when activated via hotkey
-
-=== 1.1 ===
-
-[changed 2004/12/09 ir0nh34d main.cpp]
-- updated to work with new emergeThreadExecute function modifications
-
-[changed 2004/12/05 ir0nh34d Command.cpp, Command.h]
-- added AutoComplete via the CustomSource class
-
-[added 2004/12/05 ir0nh34d CustomSource.cpp, CustomSoure.h]
-- added CustomSource class
-
-[changed 2004/11/23 ir0nh34d all source files]
-- switched to new applet code base
-
-[changed 2004/10/03 ir0nh34d main.cpp, Command.h, Command.cpp]
-- fixed problem where text window was not resizing with main window
-- modified clock text display options to more closely emulate the text window
-- the edit window now uses the user defined font
-
-[changed 2004/09/27 ir0nh34d main.cpp]
-- fixed click through bug
-
-[added 2004/09/27 ir0nh34d main.cpp, Required.h, Command.cpp, Command.h]
-- added UseSelectedText to make the time display with the selected text color
-- added TextAlign, to aligh the text left, center or right
-
-[changed 2004/09/26 ir0nh34d main.cpp, Required.h, Command.cpp, Command.h]
-- switched to 'new look'
-
-=== iCommand is now emergeCommand ===
-
-[changed 2004/06/28 ir0nh34d main.cpp]
-- switched to HWND_BOTTOM since iCore now supports it
-
-=== 1.5 ===
-
-[added 2004/05/08 ir0nh34d main.cpp]
-- if executed again, the original window gains focus and sets 'text
-  entry' mode
-
-[changed 2004/05/03 ir0nh34d main.cpp]
-- switched to Threaded iExecute functions
-
-[added 2004/04/27 ir0nh34d main.cpp]
-- added support for both global and applet based DropShadow enabling /
-  disabling
-
-[added 2004/04/23 ir0nh34d main.cpp]
-- added support for iScripts
-
-=== 1.4 ===
-
-[changed 2004/04/16 ir0nh34d main.cpp, Required.h]
-- FontSize has been removed
-- The size of the font is now based on the height of the window (and
-  sizes dynamically as the height of the window changes)
-
-[changed 2004/04/06 ir0nh34d main.cpp]
-- commands are no longer repeated in history
-
-[changed 2004/04/06 ir0nh34d main.cpp]
-- CTRL Left Click works anywhere on the window now
-
-=== 1.3 ===
-
-[added 2004/03/26 ir0nh34d main.cpp]
-- added support for all 'Internal Commands' via a call to iExecuteInternal
-
-[added 2004/03/23 ir0nh34d main.cpp]
-- added support for CORE_HIDE / CORE_SHOW support
-- requires iCore 2.1 and iLib 2.1
-
-=== 1.2 ===
-
-[changed 2004/02/16 ir0nh34d main.cpp, Required.h]
-- reverted back to old CTRL-drag
-- If a drag is allowed, the cursor will change
-
-[changed 2004/02/01 ir0nh34d main.cpp]
-- switched to new WM_NCDESTROY mechanism
-
-[changed 2004/01/16 ir0nh34d main.cpp]
-- fixed background colour
-
-[changed 2004/01/11 ir0nh34d recompile]
-- recompiled to use new iShell messaging system
-
-[changed 2003/01/06 ir0nh34d main.cpp]
-- sizing of the window now requires the 'ALT' key to be held down
-- holding down shift while sizing will NOT save the new size of the window
-- holding down shift while moving will NOT save the new position of the window
-
-=== 1.1 ===
-
-[changed 2003/12/30 ir0nh34d main.cpp]
-- switched to iSnapToEdge
-
-[changed 2003/12/16 ir0nh34d main.cpp]
-- fixed multi-mon support when dragging window
-
-=== 1.0 ===
-
-[added 2003/11/17 ir0nh34d main.cpp, Requried.h]
-- added support for ActiveWindowAlpha and InactiveWindowAlpha
-
-[changed 2003/11/11 ir0nh34d main.cpp]
-- updated to work with iCore
-
-[changed 2003/11/08 ir0nh34d main.cpp]
-- requires DDE support
-- uses HWND_BOTTOM when set to 'bottom'
-
-[changed 2003/11/02 ir0nh34d main.cpp]
-- cleaned up message return values
-
-[changed 2003/10/29 ir0nh34d main.cpp]
-- modified window dragging support to be consistant across applets
-
-=== 0.2 ===
-
-[changed 2003/10/04 ir0nh34d main.cpp]
-- reverted back to the old formating with a locale fix
-
-[changed 2003/10/03 ir0nh34d main.cpp]
-- made the date and time display locale specific (for our international users :) )
-
-=== 0.1 ===
-
-- Initial Version

Deleted: trunk/Source/emergeCommand/SciTEDirectory.properties
===================================================================
--- trunk/Source/emergeCommand/SciTEDirectory.properties	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCommand/SciTEDirectory.properties	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,3 +0,0 @@
-debug.target=..\bin\emergeCommand.exe
-command.go.$(file.patterns.cplusplus)=$(debug.target)
-command.go.needs.$(file.patterns.cplusplus)=

Deleted: trunk/Source/emergeCommand/emergeCommand.sln
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCommand/emergeCommand.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeCommand", "emergeCommand.vcproj", "{B8CF4652-F247-4269-87AB-88980ADD7615}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B8CF4652-F247-4269-87AB-88980ADD7615}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B8CF4652-F247-4269-87AB-88980ADD7615}.Debug|Win32.Build.0 = Debug|Win32
-		{B8CF4652-F247-4269-87AB-88980ADD7615}.Release|Win32.ActiveCfg = Release|Win32
-		{B8CF4652-F247-4269-87AB-88980ADD7615}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeCommand/emergeCommand.vcproj
===================================================================
--- trunk/Source/emergeCommand/emergeCommand.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCommand/emergeCommand.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeCommand"
-	ProjectGUID="{B8CF4652-F247-4269-87AB-88980ADD7615}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib ole32.lib gdi32.lib comdlg32.lib msvcrt.lib uuid.lib ..\bin\emergeLib.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(TargetFileName).manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Applet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AppletMenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Command.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CustomSource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Scheme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeCommand.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Applet.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\AppletMenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Command.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Config.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\CustomSource.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Scheme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeCore/Changes.txt
===================================================================
--- trunk/Source/emergeCore/Changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCore/Changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,265 +0,0 @@
-[changed - 08/15/06 - ir0nh34d Core.cpp]
-- fix for internal desktop commands
-
-[changed - 06/30/06 - ir0nh34d LaunchEditor.cpp]
-- fixed item moving so the selected item stays visible and cannot be
-  moved off the list
-- fixed bug #1496600
-
-=== 3.0.1 ===
-
-[changed 2006/05/02 ir0nh34d emergeCore.rc]
-- updated Launch Editor to be consistant
-
-[changed 2006/05/01 ir0nh34d main.cpp]
-- switched to using Unicode for command line parsing
-
-[changed 2006/04/30 ir0nh34d main.cpp]
-- added command line verification
-
-[changed 2006/04/26 ir0nh34d Shell.cpp]
-- moved COM initilization into DDE functions
-
-=== 3.0.0 ===
-
-[removed 2006/03/11 ir0nh34d Shell.cpp/.h]
-- removed startup exceptions
-
-[removed 2006/02/11 ir0nh34d emergeCore.rc]
-- integrated manifest file in to emergeCore.exe
-
-[removed 2005/11/01 ir0nh34d Desktop.cpp/.h, MenuEditor.cpp/.h, Config.cpp/.h, Settings.cpp/.h]
-- moved to emergeDesktop
-
-=== 2.0 ===
-
-[added 2005/08/20 ir0nh34d Desktop.cpp, Desktop.h]
-- added %CommonStartMenu% and %StartMenu% emerge vars
-
-[changed 2005/05/18 ir0nh34d main.cpp]
-- the /shellchanger option works even if emergeCore is already running
-- fixed the bug where Shell Changer added an extra slash
-
-[added 2005/08/18 ir0nh34d Desktop.cpp]
-- added 'Settings' menu to default menu
-
-[added 2005/08/17 ir0nh34d emergeCore.exe.manifest]
-- to give config dialog XP look and feel (thanx to iamsthitha for the file)
-
-[changed 2005/07/13 ir0nh34d Core.cpp, Desktop.cpp]
-- all Internal Commands are now accessible via window messages
-
-[changed 2005/07/11 ir0nh34d Core.cpp]
-- changed '-shellchanger' to '/shellchanger' to be consistant with '/nostartup'
-
-[removed 2005/07/11 ir0nh34d Desktop.cpp]
-- removed support for emergeScript
-
-[changed 2005/06/06 ir0nh34d MenuEditor.cpp]
-- User is prompted to save item when pressing enter (OK) if a valid item exists
-
-[changed 2005/06/06 ir0nh34d ShellChanger.cpp, ShellChanger.h]
-- removed 'change shell' button, changed 'OK' button to 'Change' button
-- shell list is written on save/delete
-
-[changed 2005/06/03 ir0nh34d ShellChanger.cpp]
-- if no shell is selected, only the 'add shell' button is available
-- when first displayed, it will show the current desktop shell (providing it has been set for the
-  current user)
-
-[added 2005/06/02 ir0nh34d Core.cpp, Desktop.cpp]
-- added '-shellchanger' command lind
-
-[added 2005/06/01 ir0nh34d Core.cpp, Desktop.cpp]
-- added support for 'CoreSettings', 'CoreLaunchEditor', 'CoreMenuEditor' and 'CoreShellChanger' internal
-  commands
-
-[added 2005/05/31 ir0nh34d ShellChanger.cpp, ShellChanger.h]
-- added ShellChanger class
-
-[changed 2005/05/26 ir0nh34d all files]
-- converted to unicode
-
-[changed 2005/05/20 ir0nh34d LaunchEditor.cpp]
-- fixed bug where Launch Editor would display wrong version for non-emerge applications
-
-[added 2005/05/14 ir0nh34d LaunchEditor.cpp, LaunchEditor.h, Settings.cpp, Settings.h]
-- added support for path and version in Launch Editor
-
-[changed 2005/05/01 ir0nh34d MenuEditor.cpp]
-- fixed bug where root menu could be dragged to become submenu
-
-[added 2005/05/01 ir0nh34d MenuEditor.cpp, MenuEditor.h, LaunchEditor.cpp, LaunchEditor.h]
-- split all the config dialogs to separate files
-
-[added 2005/05/01 ir0nh34d config.cpp, config.h]
-- added 'autoexpand' support
-
-[changed 2005/04/28 ir0nh34d config.cpp]
-- treeview now scrolls with dragged object
-- fixed submenu moving
-
-[added 2005/04/27 ir0nh34d config.cpp, config.h]
-- added support for the 'middle' menu
-- added support for 'add item'
-
-[added 2005/04/26 ir0nh34d config.cpp, config.h]
-- added edit and delete
-- new submenu item created when 'submenu' selected as a type
-- replaced text buttons with icon buttons
-- using new icons provided by moeghan
-
-[added 2005/03/18 ir0nh34d Config.cpp, Config.h]
-- added menu parsing display in tree view
-
-[changed 2005/03/11 ir0nh34d Config.cpp, Config.h, emergeCore.rc, resource.h]
-- removed spinner
-- set menu alpha range from 20 to 100 (don't allow less than 20, as it is hard to see)
-
-[changed 2005/03/10 ir0nh34d Shell.cpp, Shell.h, main.cpp]
-- moved the XP logon delay to allow for better timing
-
-[added 2005/03/10 ir0nh34d Config.cpp, Config.h, emergeCore.rc, resource.h]
-- added slider and spinner for menu alpha setting
-
-[changed 2005/03/07 ir0nh34d Core.cpp]
-- updated to handle emergeGetDesktopWindow
-
-[added 2005/03/06 ir0nh34d Desktop.cpp]
-- implemented new 'always on bottom' mechanism
-
-[added 2005/03/02 ir0nh34d resource.h, emergeCore.rc, Config.cpp, Config.h]
-- added Core Settings dialog
-
-[changed 2005/03/01 ir0nh34d Desktop.cpp, Desktop.h, Settings.h, Settings.cpp]
-- moved core settings to Settings class
-
-[added 2005/02/28 ir0nh34d Config.cpp, Config.h, resource.h, Settings.cpp, Settings.h]
-- added Launch List edit dialog
-
-[changed 2005/02/24 ir0nh34d Desktop.cpp, Desktop.h]
-- finally fixed menu order
-- fixed mixed case .lnk extension hiding
-
-[changed 2005/02/22 ir0nh34d Core.cpp]
-- fixed XP logon delay timing
-
-[added 2005/02/19 ir0nh34d Desktop.cpp, Desktop.h]
-- enforced alphabetic order with file based menus
-
-[added 2005/02/15 ir0nh34d Shell.cpp]
-- added code to remove XP logon delay (thanx to the LiteStep developers for figuring it out ;) )
-
-[changed 2005/02/14 ir0nh34d Shell.cpp, Shell.h]
-- moved code in to the Shell class
-- improved threading
-
-[added 2005/02/14 ir0nh34d Core.cpp, Core.h, Desktop.cpp, Desktop.h]
-- added Core and Desktop classes
-
-[changed 2005/02/14 ir0nh34d MessageControl.cpp, MessageControl.h]
-- Moved the code in to the MessageControl class
-
-[changed 2005/02/13 ir0nh34d main.cpp]
-- merged '/noautostart' from verison 1.1.1
-
-=== 1.1 ===
-
-[changed 2005/01/24 ir0nh34d main.cpp, Required.h]
-- by default emergeTray and emergeTasks are added and started to the Launch key if it is empty
-
-[changed 2005/01/21 ir0nh34d main.cpp]
-- default menu for right and mid click now write to the registry
-
-[changed 2004/12/09 ir0nh34d main.cpp]
-- updated to work with new emergeThreadExecute function modifications
-
-[changed 2004/08/21 ir0nh34d, main.cpp, Required.h]
-- fixed menu bug where ampersands (&) would not show
-
-[added 2004/08/21 ir0nh34d main.cpp, Shell.cpp, Shell.h]
-- added the startup application check (based on the StartUpRunner code from LiteStep)
-
-=== 1.0 ===
-
-[changed 2004/07/28 ir0nh34d main.cpp, Required.h, Shell.cpp, Shell.h]
-- updated to work with emergeLib
-
-=== iCore is now emergeCore ===
-
-[changed 2004/06/29 ir0nh34d main.cpp]
-- fixed multi-monitor support for the custome desktop area
-
-[changed 2004/06/28 ir0nh34d main.cpp]
-- improved support for HWND_BOTTOM apps
-
-[removed 2004/06/28 ir0nh34d Shell.cpp, Shell.h, main.cpp]
-- removed SetShellWindow (not used anyway)
-
-=== 2.3 ===
-
-[changed 2004/05/19 ir0nh34d Shell.h, Shell.cpp]
-- multi-threaded startup items
-
-[changed 2004/05/03 ir0nh34d main.cpp, Shell.h, Shell.cpp]
-- switched to multi-threaded iExecute
-
-[added 2004/04/24 ir0nh34d main.cpp]
-- added support for iScripts (use menu type 4)
-
-=== 2.2 ===
-
-[changed 2004/04/17 ir0nh34d main.cpp]
-- switched to using iSwitchToThisWindow
-
-[added 2004/04/15 ir0nh34d main.cpp]
-- added 'type 3' for DateTime
-
-=== 2.1 ===
-
-[removed 2004/03/26 ir0nh34d main.cpp]
-- moved all 'Internal Commands' to iLib
-
-[changed 2004/03/17 ir0nh34d Shell.cpp]
-- fixed problem with rundll32.exe using case sensitive entry points in a dll
-
-=== 2.0 ===
-
-[added 2004/02/18 ir0nh34d main.cpp, Shell.cpp, Shell.h]
-- added the 'Exceptions' key to allow for startup exceptions
-- holding down F5 while iCore starts bypasses the startup exceptions
-
-[added 2004/02/17 ir0nh34d main.cpp]
-- added /nostartup command line switch to disable the 'startup' folders and registry entries
-
-[added 2004/02/16 ir0nh34d main.cpp, Required.h]
-- if no entries are found in the 'Launch' key on startup, the user is asked if they would like
-  to add them, which launches iConfig (if found)
-- can be disabled with 'DisableLaunchWarning' of type REG_DWORD set to 1 in the iCore\Settings
-  key
-
-[changed 2004/02/01 ir0nh34d main.cpp]
-- switched to new WM_NCDESTROY mechanism
-
-[added 2004/01/20 allelimo main.cpp, required.h]
-- added middle-click menu (registry: iShell\iCore\MidMenu)
-- changed menu to right-click menu (registry: iShell\iCore\RightMenu)
-- added "emptybin" to menu internal commands (type = 2)
-
-[changed 2004/01/12 ir0nh34d main.cpp, MessageHandler.h, MessageHandler.cpp]
-- updated new messaging system to use applet types
-- when applets register, they register with a type, meaning they will recieve any messages
-  destined for that applet type
-
-[changed 2004/01/11 ir0nh34d main.cpp, MessageHandler.h, MessageHandler.cpp]
-- implemented new iShell messaging system
-
-=== 1.1 ===
-
-[changed 2003/12/16 ir0nh34d main.cpp]
-- fixed multi-mon support
-
-=== 1.0 ===
-
-- incorporated iDesk and iControl into iCore, so all the 'Shell' functionality is in one location
-

Deleted: trunk/Source/emergeCore/Requests.txt
===================================================================
--- trunk/Source/emergeCore/Requests.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCore/Requests.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,4 +0,0 @@
-- Have 'My Computer' and 'Control Panel' menus
-- Add start, stop, move up, move down to launch editor
-- Launch editor show 3 columns: File, Version, Path
-- Shell changer as part of settings menu

Deleted: trunk/Source/emergeCore/SciTEDirectory.properties
===================================================================
--- trunk/Source/emergeCore/SciTEDirectory.properties	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCore/SciTEDirectory.properties	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1 +0,0 @@
-debug.target=..\bin\emergeCore.exe

Deleted: trunk/Source/emergeCore/emergeCore.sln
===================================================================
--- trunk/Source/emergeCore/emergeCore.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCore/emergeCore.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeCore", "emergeCore.vcproj", "{2E4DB769-52BE-4362-B27B-694FCD7C9D10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2E4DB769-52BE-4362-B27B-694FCD7C9D10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E4DB769-52BE-4362-B27B-694FCD7C9D10}.Debug|Win32.Build.0 = Debug|Win32
-		{2E4DB769-52BE-4362-B27B-694FCD7C9D10}.Release|Win32.ActiveCfg = Release|Win32
-		{2E4DB769-52BE-4362-B27B-694FCD7C9D10}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeCore/emergeCore.vcproj
===================================================================
--- trunk/Source/emergeCore/emergeCore.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeCore/emergeCore.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeCore"
-	ProjectGUID="{2E4DB769-52BE-4362-B27B-694FCD7C9D10}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib advapi32.lib shell32.lib ole32.lib comdlg32.lib comctl32.lib shlwapi.lib msvcrt.lib msvcprt.lib ..\bin\emergeLib.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(TargetFileName).manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Core.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LaunchEditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MessageControl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Shell.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ShellChanger.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeCore.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Core.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\LaunchEditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\MessageControl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Shell.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ShellChanger.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeDesktop/SciTEDirectory.properties
===================================================================
--- trunk/Source/emergeDesktop/SciTEDirectory.properties	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeDesktop/SciTEDirectory.properties	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1 +0,0 @@
-debug.target=..\bin\emergeDesktop.exe

Deleted: trunk/Source/emergeDesktop/changes.txt
===================================================================
--- trunk/Source/emergeDesktop/changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeDesktop/changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,113 +0,0 @@
-[2007/03/28 ir0nh34d Desktop.cpp/.h]
-- implement a desktop window to avoid using a hook to resolve issue with Vista
-- implement a timer to make sure the desktop window remains at the bottom of the Z-Order
-
-[2006/11/25 ir0nh34d Desktop.cpp]
-- hide minimized windows
-
-[2006/08/18 ir0nh34d Desktop.cpp/.h]
-- fixed menu sorting
-
-[2006/08/15 ir0nh34d Desktop.cpp]
-- Fix for Desktop internal commands
-
-[2006/08/07 ir0nh34d Desktop.cpp, MenuEditor.cpp/.h]
-- Fixed crash when right clicking on desktop if MenuEditor is visible
-
-[2006/07/18 ir0nh34d Desktop.cpp/.h]
-- Fix issue with menu not displaying on some multimonitor configurations
-
-[2006/07/01 ir0nh34d Desktop.cpp, emergeDesktop.rc, resource.h, MenuItem.cpp/.h]
-- add working directory support (feature request #1452922)
-
-=== 3.0.2 ===
-
-[2006/05/02 ir0nh34d emergeDesktop.rc]
-- updated config dialogs to be consistant
-
-=== 3.0.1 ===
-
-[2006/03/26 ir0nh34d Makefile]
-- added support for creating a debug build (use 'make DEBUG=1')
-
-[2006/03/20 ir0nh34d Desktop.cpp/.h]
-- plugged memory leak (bug #1453924)
-
-[2006/03/17 ir0nh34d MenuEditor.cpp]
-- don't resolve shortcuts when using the browse for executables
-
-=== 3.0.0 ===
-
-[2006/03/08 ir0nh34d Desktop.cpp/.h, MenuEditor.cpp]
-- added MigrateMenu and MigrateSubmenu to move menu definitions from emergeCore
-to emergeDesktop
-
-[2006/02/19 ir0nh34d Desktop.cpp]
-- added support for Special Folders
-
-[2006/02/11 ir0nh34d emergeDesktop.rc]
-- migrated manifest file in to emergeDesktop.exe
-
-[2006/02/09 ir0nh34d Desktop.cpp]
-- added support for some Internal Commands via EGGetSystemIcon
-
-[2006/01/28 ir0nh34d Desktop.cpp/.h]
-- modified to work with updated desktop hook
-
-[2006/01/24 ir0nhead Desktop.cpp]
-- added icon support for tasks menu
-
-[2006/01/10 ir0nh34d Desktop.cpp/.h, Settings.cpp/.h, emergeDesktop.rc, resource.h]
-- added option to enable/disable menu icons
-
-[2005/12/06 ir0nh34d Desktop.cpp/.h]
-- added icon support for file items
-
-[2005/11/26 ir0nh34d Desktop.cpp/.h]
-- switched to using emergeHook for the desktop hook
-
-[2005/11/02 ir0nh34d everything]
-- moved Desktop functionality from emergeCore to emergeDesktop
-
-=== iDesktop is now emergeDesktop ===
-
-- note:
-  up to now emergeDesktop is a very simple and rough applet:
-  it can only work if you set in the registry
-  "desktopdir" to a directory containing LINKS ONLY
-  No drag and drop, no moving icons, no folders etc.
-  Anyway, it is an early beta... :)
-
-
-
-=== 0.3 ===
-[03/28/2004]
-(Requires iCore 2.1 and iLib 2.1)
-
-[03/01/2004 - allelimo - emergeDesktopDialog.cpp]
-- added: IconsOrder setting. Values are "ascending" and "descending".
-
-
-=== 0.2 ===
-[02/29/2004]
-(Requires iCore 2.0 and iLib 2.0)
-
-[02/29/2004 - allelimo - emergeDesktop.cpp]
-- checked for compatibility with new iShell directory structure
-
-[02/06/2004 - allelimo - emergeDesktopDialog.cpp]
-- added: the applet registers with iCore to receive messages (i.e., quit)
-
-[02/03/2004 - allelimo - emergeDesktop.cpp]
-- added: allow only one instance of the applet running
-
-[02/02/2004 - allelimo - emergeDesktopDialog.cpp]
-- added: the desktop directory can be customized
-- added: the size can be customized
-
-
-=== 0.1 ===
-[02/01/2004]
-
-- test build - not to be released:
-- paths are hardcoded

Deleted: trunk/Source/emergeDesktop/emergeDesktop.sln
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeDesktop/emergeDesktop.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeDesktop", "emergeDesktop.vcproj", "{B95B56AC-D0EF-4041-9879-D17303CA836D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B95B56AC-D0EF-4041-9879-D17303CA836D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B95B56AC-D0EF-4041-9879-D17303CA836D}.Debug|Win32.Build.0 = Debug|Win32
-		{B95B56AC-D0EF-4041-9879-D17303CA836D}.Release|Win32.ActiveCfg = Release|Win32
-		{B95B56AC-D0EF-4041-9879-D17303CA836D}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeDesktop/emergeDesktop.vcproj
===================================================================
--- trunk/Source/emergeDesktop/emergeDesktop.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeDesktop/emergeDesktop.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeDesktop"
-	ProjectGUID="{B95B56AC-D0EF-4041-9879-D17303CA836D}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib comctl32.lib comdlg32.lib shell32.lib advapi32.lib shlwapi.lib msvcrt.lib msvcprt.lib ..\bin\emergeLib.lib ..\bin\emergeGraphics.lib ..\bin\emergeHook.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(TargetFileName).manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Desktop.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuEditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuListItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeDesktop.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Config.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Desktop.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuEditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuItem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\MenuListItem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeHook/Changes.txt
===================================================================
--- trunk/Source/emergeHook/Changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHook/Changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,3 +0,0 @@
-=== 3.0.0 ===
-
-- Initial Release

Deleted: trunk/Source/emergeHook/emergeHook.cbp
===================================================================
--- trunk/Source/emergeHook/emergeHook.cbp	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHook/emergeHook.cbp	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="emergeHook" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Release">
-				<Option output="..\bin\emergeHook.dll" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="..\bin" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i586" />
-					<Add option="-O3" />
-					<Add option="-Wall" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-mno-cygwin" />
-			<Add option="-DEMERGEHOOK_EXPORTS" />
-		</Compiler>
-		<Linker>
-			<Add option="-mno-cygwin" />
-		</Linker>
-		<Unit filename="emergeHook.h" />
-		<Unit filename="emergeHook.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="main.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

Deleted: trunk/Source/emergeHook/emergeHook.sln
===================================================================
--- trunk/Source/emergeHook/emergeHook.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHook/emergeHook.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeHook", "emergeHook.vcproj", "{F658FF5D-F0E7-4512-A871-F327B8A21BCB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F658FF5D-F0E7-4512-A871-F327B8A21BCB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F658FF5D-F0E7-4512-A871-F327B8A21BCB}.Debug|Win32.Build.0 = Debug|Win32
-		{F658FF5D-F0E7-4512-A871-F327B8A21BCB}.Release|Win32.ActiveCfg = Release|Win32
-		{F658FF5D-F0E7-4512-A871-F327B8A21BCB}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeHook/emergeHook.vcproj
===================================================================
--- trunk/Source/emergeHook/emergeHook.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHook/emergeHook.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeHook"
-	ProjectGUID="{F658FF5D-F0E7-4512-A871-F327B8A21BCB}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EMERGEHOOK_EXPORTS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EMERGEHOOK_EXPORTS;"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib msvcrt.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\emergeHook.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeHook.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeHotkeys/Changes.txt
===================================================================
--- trunk/Source/emergeHotkeys/Changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHotkeys/Changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,107 +0,0 @@
-[changed 2006/10/17 ir0nh34d Settings.cpp, HotkeyCombo.cpp]
-- Fixed bug #1570996
-
-[changed 2006/06/30 ir0nh34d emergeHotkeys.rc, Actions.cpp]
-- Applied delete item fix
-
-=== 3.0.1 ===
-
-[changed 2006/05/02 ir0nh34d emergeHotkeys.rc]
-- updated config dialog to be consistant
-
-[changed 2006/04/26 ir0nh34d Actions.cpp, Actions.h]
-- only enable the del and edit icons if a key combination is selected
-
-=== 3.0.0 ===
-
-[changed 2006/02/11 ir0nh34d emergeHotkeys.rc]
-- migrated manifest file in to emergeHotkeys.exe
-
-[changed 2006/01/28 ir0nh34d Applet.cpp]
-- changed activation hotkey combo to Ctrl+F1 to avoid conflict with explorer
-
-[changed 2005/09/06 ir0nh34d emergeHotkeys.rc]
-- tweaked button placement
-
-=== 2.0 ===
-
-[added 2005/08/17 ir0nh34d emergeHotkeys.exe.manifest]
-- to give config dialog XP look and feel (thanx to iamsthitha for the file)
-
-[added 2005/08/14 ir0nh34d Actions.cpp, HotkeyCombo.h, HotkeyCombo.cpp]
-- added special key support
-
-[changed 2005/07/28 ir0nh34d Actions.cpp, Actions.h]
-- updated configuration dialog with 2.0 look and feel
-
-[added 2005/06/01 ir0nh34d Actions.cpp]
-- added support for 'core' internal commands
-
-[changed 2005/05/30 ir0nh34d Actions.cpp]
-- fixed find file dialog opening behind main dialog
-
-[changed 2005/05/26 ir0nh34d all files]
-- converted to unicode
-
-=== 1.1 ===
-
-[changed 01/08/05 ir0nh34d all]
-- updated to new code base
-
-[changed 2004/12/09 ir0nh34d main.cpp]
-- updated to work with new emergeThreadExecute function modifications
-
-=== iHotkeys is now emergeHotkeys ===
-
-=== 1.3 ===
-
-[changed 2004/05/03 ir0nh34d main.cpp]
-- switched to Threaded iExecute functions
-
-[added 2004/04/24 ir0nh34d main.cpp]
-- added support for iScripts
-
-=== 1.2 ===
-
-[removed 2004/03/26 ir0nh34d main.cpp]
-- moved all 'Internal Commands' into iLib
-
-[added 2004/03/23 ir0nh34d main.cpp]
-- added 'Hide' and 'Show' commands
-
-=== 1.1 ===
-
-[changed 2004/02/05 ir0nh34d main.cpp]
-- corrected problem with hotkeys not registering
-
-[added 2004/02/03 ir0nh34d main.cpp]
-- added support for the iCore MidMenu (use MidDeskMenu as the action)
-
-[changed 2004/02/01 ir0nh34d main.cpp]
-- switched to new WM_NCDESTROY mechanism
-
-[changed 2004/01/11 ir0nh34d recompile]
-- recompiled to use the new iShell messaging system
-
-=== 1.0 ===
-
-[changed 2003/11/11 ir0nh34d main.cpp]
-- updated to work with iCore
-
-[changed 2003/11/08 ir0nh34d main.cpp]
-- requires DDE support (to launch explorer windows)
-
-[changed 2003/11/02 ir0nh34d main.cpp]
-- cleaned up message return values
-
-[added 2003/11/02 ir0nh34d main.cpp]
-- iHotkeys will not launch if there are no valid hotkeys defined
-
-=== 0.2 ===
-
-[changed 2003/09/23 e-sushi main.cpp]
-- fixed bug where Alt-F4 would close the applet
-
-=== 0.1 ===
-
-- Initial release

Deleted: trunk/Source/emergeHotkeys/SciTEDirectory.properties
===================================================================
--- trunk/Source/emergeHotkeys/SciTEDirectory.properties	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHotkeys/SciTEDirectory.properties	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1 +0,0 @@
-debug.target=..\bin\emergeHotkeys.exe

Deleted: trunk/Source/emergeHotkeys/emergeHotkeys.sln
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeHotkeys", "emergeHotkeys.vcproj", "{9D0C94F5-21EA-4533-84BF-EEF596B26382}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D0C94F5-21EA-4533-84BF-EEF596B26382}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D0C94F5-21EA-4533-84BF-EEF596B26382}.Debug|Win32.Build.0 = Debug|Win32
-		{9D0C94F5-21EA-4533-84BF-EEF596B26382}.Release|Win32.ActiveCfg = Release|Win32
-		{9D0C94F5-21EA-4533-84BF-EEF596B26382}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeHotkeys/emergeHotkeys.vcproj
===================================================================
--- trunk/Source/emergeHotkeys/emergeHotkeys.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeHotkeys/emergeHotkeys.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeHotkeys"
-	ProjectGUID="{9D0C94F5-21EA-4533-84BF-EEF596B26382}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib msvcrt.lib msvcprt.lib ..\bin\emergeLib.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(TargetFileName).manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Actions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Applet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\HotkeyCombo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeHotkeys.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Actions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Applet.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\HotkeyCombo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeLauncher/SciTEDirectory.properties
===================================================================
--- trunk/Source/emergeLauncher/SciTEDirectory.properties	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeLauncher/SciTEDirectory.properties	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,3 +0,0 @@
-debug.target=..\bin\emergeLauncher.exe
-command.go.$(file.patterns.cplusplus)=$(debug.target)
-command.go.needs.$(file.patterns.cplusplus)=

Deleted: trunk/Source/emergeLauncher/changes.txt
===================================================================
--- trunk/Source/emergeLauncher/changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeLauncher/changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,140 +0,0 @@
-[added 2007/02/02 ir0nh34d Config.cpp/.h, resource.h, emergeLauncher.rc]
-- added support for Internal Commands to the Configuration dialog
-
-[changed 2006/12/13 ir0nh34d Applet.cpp/.h]
-- fix applet menu for mutlimonitor configurations
-
-[added 2006/10/16 ir0nh34d Applet.cpp, Settings.cpp/.h, Config.cpp]
-- added support for SnapSize / SnapMove
-
-[changed 2006/09/17 ir0nh34d Applet.cpp]
-- enabled applet snapping
-
-[changed 2006/09/08 ir0nh34d Applet.cpp]
-- fixed z-order issue
-
-[07/01/06 - ir0nh34d - Config.cpp, Settings.cpp/.h, Applet.cpp, Item.cpp/.h,
-    emergeLauncher.rc, resource.h]
-- Added working directory support (Feature Request #1452924)
-
-[06/30/60 - ir0nh34d - Config.cpp]
-- fixed item moving so the selected item stays visible and cannot be
-  moved off the list
-- fixed bug #1496599
-
-=== 3.0.1 ===
-
-[05/09/06 - ir0nh34d - Applet.cpp]
-- update system based colors when they change
-
-[04/17/06 - ir0nhead - Applet.cpp]
-- make drag borders grow outward
-
-[03/17/06 - ir0nh34d - Config.cpp]
-- don't resolve shortcuts when using the browser
-
-=== 3.0.0 ===
-
-[02/20/06 - ir0nh34d - Applet.cpp]
-- switched to ThreadExecuteAll to allow for SpecialFolders and aliases
-
-[02/11/06 - ir0nh34d - emergeLauncher.rc]
-- migrated manifest file in to emergeLauncher.exe
-
-[02/05/06 - ir0nh34d - Item.cpp]
-- extract icon for executable even if arguments are supplied
-
-=== 2.0.1 ===
-
-[10/17/2005 - ir0nh34d - Settings.cpp/.h, Applet.cpp, Item.cpp/.h]
-- fixed win2k support
-- command/icon browse dialog now remembers the last directory it was from
-
-=== 2.0 ===
-
-[10/13/2005 - ir0nh34d - everything]
-- completely recoded with 2.0 code base
-- added configuration dialog
-- added support for 16x16, 32x32 and 48x48 icons
-
-=== 0.7 ===
-[05/22/2004]
-
-[05/13/2004 - allelimo - emergeLauncher.cpp]
-- added: iScript support
-
-[05/10/2004 - allelimo - emergeLauncher.cpp]
-- added: dropshadow settings
-
-
-=== 0.6 ===
-[03/28/2004]
-(Requires iCore 2.1 and iLib 2.1)
-
-[03/26/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: ishell messages: HIDE/SHOW
-
-[03/20/2004 - allelimo - iBtnSt.cpp]
-- fixed: active/inactive alpha when the mouse is over a button
-
-
-=== 0.5 ===
-[02/27/2004]
-(Requires iCore 2.0 and iLib 2.0)
-
-[02/27/2004 - allelimo - emergeLauncher.cpp]
-- checked for compatibility with new iShell directory structure
-
-[02/11/2004 - allelimo - emergeLauncher.cpp]
-- fixed: doubleclick under winXP
-
-[02/06/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: the applet registers with iCore to receive messages (i.e., quit)
-
-[02/03/2004 - allelimo - emergeLauncher.cpp]
-- fixed: running again on win2k ( drop_shadow style is skipped on win2k )
-- added: allow only one instance of the applet running
-
-
-===0.4===
-[01/15/2004]
-
-[01/15/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: bool bTransparent
-
-
-=== 0.3 ===
-[01/11/2004]
-
-[01/11/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: display move cursor with CTRL or CTRL+SHIFT
-- changed: by default it is placed at x=0, y=0
-
-[01/10/2004 - allelimo - emergeLauncherDlg.cpp]
-- fixed: (again) onbottom z-order
-- changed: show tooltips also when the applet is inactive
-
-[01/07/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: customizable tooltips for launch buttons
-- added: if no custom icon is specified, the default
-	 app/file icon is automatically used
-- changed: CTRL+SHIFT moves the window without storing
-	   the new position to the registry
-
-
-=== 0.2 ===
-[01/02/2004]
-
-[01/02/2004 - allelimo - emergeLauncherDlg.cpp]
-- fixed: onbottom z-order
-- added: snap to screen borders function
-- added: when moved saves position to the registry
-
-[01/01/2004 - allelimo - emergeLauncherDlg.cpp]
-- added: active/inactive windowalpha
-
-
-=== 0.1 ===
-[12/28/2003]
-
-- first public beta

Deleted: trunk/Source/emergeLauncher/emergeLauncher.sln
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.sln	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeLauncher/emergeLauncher.sln	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emergeLauncher", "emergeLauncher.vcproj", "{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}.Debug|Win32.Build.0 = Debug|Win32
-		{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}.Release|Win32.ActiveCfg = Release|Win32
-		{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/Source/emergeLauncher/emergeLauncher.vcproj
===================================================================
--- trunk/Source/emergeLauncher/emergeLauncher.vcproj	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeLauncher/emergeLauncher.vcproj	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emergeLauncher"
-	ProjectGUID="{6356DFAC-4E3A-4B22-A3C6-91C12F00436E}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory=".objs"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib msvcrt.lib msvcprt.lib ..\bin\emergeLib.lib ..\bin\emergeGraphics.lib"
-				LinkIncremental="0"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(TargetFileName).manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Applet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AppletMenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Item.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Scheme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\emergeLauncher.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Applet.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\AppletMenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Config.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Item.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Scheme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/Source/emergeLib/Changes.txt
===================================================================
--- trunk/Source/emergeLib/Changes.txt	2007-12-27 20:51:57 UTC (rev 1548)
+++ trunk/Source/emergeLib/Changes.txt	2008-01-01 15:03:10 UTC (rev 1549)
@@ -1,369 +0,0 @@
-[changed 2007/04/15 ir0nh34d main.cpp]
-- ELExecute now supports System variables as part of the program name
-
-[changed 2007/03/29 ir0nh34d main.cpp]
-- modifed ELWrite debug to output the calling applet's name and append a newline
-
-[added 2007/02/03 ir0nh34d main.cpp, emergeLib.h]
-- added ELIsInternalCommand
-
-[removed 2007/01/26 ir0nh34d main.cpp, emergeLib.h]
-- removed ELGetDesktopWindow since emergeDesktop now acts like a regular applet
-
-[added 2006/12/12 ir0nh34d main.cpp, emergeLib.h]
-- added ELMid
-
-[added 2006/11/32 ir0nhead main.cpp, emergeLib.h]
-- added ELWriteRegRect and ELReadRegRect
-
-[added 2006/11/12 ir0nh34d main.cpp, emergeLib.h]
-- Added ELDisplayChange
-
-[changed 2006/10/24 ir0nh34d main.cpp]
-- fixed ShowDesktop
-
-[changed 2006/10/21 ir0nh34d main.cpp, emergeLib.h]
-- added support for fully qualified file name with ELGetWindowApp
-
-[changed 2006/09/16 ir0nh34d main.cpp]
-- added support for applet snapping
-
-[changed 2006/09/07 ir0nh34d main.cpp]
-- improved FullScreen detection with ELIsFullScreen
-
-[added 2006/08/18 ir0nh34d main.cpp, emergeLib.h]
-- added ELWriteDebug
-
-[changed 2006/08/15 ir0nh34d main.cpp]
-- fix desktop internal commands fix
-
-[added 2006/06/27 ir0nh34d main.cpp]
-- added check for InstallShield 'hidden' fullscreen window in ELIsFullScreen
-
-=== 3.0.1 ===
-
-[changed 2006/05/03 ir0nh34d main.cpp]
-- optimized ELCheckPathWithExtension
-
-[changed 2006/04/27 ir