Tasklistbar

.gitignore

@@ -1,9 +1,15 @@
-
-/Console2.ncb
-/Console2.suo
 bin/
 obj/
+ipch/
 help/console.chm
 
 *.aps
 *.user
+*.opensdf
+*.sdf
+*.suo
+
+*~
+*.bak
+*.orig
+*.swp

Console/AboutDlg.cpp

@@ -9,13 +9,18 @@
 
 LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-	CWindow	staticMessage(GetDlgItem(IDC_STATIC_VERSION));
-	CString	strMsg;
-
-	strMsg.Format(L"Console %i.%02i.%i", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD);
-	staticMessage.SetWindowText(strMsg);
+#ifdef _USE_AERO
+  AERO_CONTROL(CButton, m_Ok, IDOK)
+  this->OpenThemeData(VSCLASS_WINDOW);
+#else
+  CString strMsg;
+  strMsg.Format(L"\nConsoleZ %i.%i.%i\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD);
 
+  CWindow staticMessage(GetDlgItem(IDC_STATIC_VERSION));
+  staticMessage.SetWindowText(strMsg);
+#endif
 	CenterWindow(GetParent());
+
 	return TRUE;
 }
 

Console/AboutDlg.h

@@ -4,12 +4,20 @@
 
 #pragma once
 
-class CAboutDlg : public CDialogImpl<CAboutDlg>
+class CAboutDlg :
+#ifdef _USE_AERO
+  public aero::CDialogImpl<CAboutDlg>
+#else
+  public CDialogImpl<CAboutDlg>
+#endif
 {
 public:
 	enum { IDD = IDD_ABOUTBOX };
 
 	BEGIN_MSG_MAP(CAboutDlg)
+#ifdef _USE_AERO
+    CHAIN_MSG_MAP(aero::CDialogImpl<CAboutDlg>)
+#endif
 		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
 		COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
 		COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
@@ -22,4 +30,59 @@ class CAboutDlg : public CDialogImpl<CAboutDlg>
 
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+#ifdef _USE_AERO
+  void Paint(CDCHandle dc, RECT& rClient, RECT& rView, RECT& rDest)
+  {
+    aero::CDialogImpl<CAboutDlg>::Paint(dc, rClient, rView, rDest);
+
+    CPaintDC(*this);
+    Gdiplus::Graphics gr(dc);
+
+    CIcon icon (static_cast<HICON>(
+      ::LoadImage(
+        ::GetModuleHandle(NULL),
+        MAKEINTRESOURCE(IDR_MAINFRAME),
+        IMAGE_ICON,
+        256,
+        256,
+        LR_DEFAULTCOLOR)));
+
+    //get the icon info
+    ICONINFO ii;
+    GetIconInfo(icon, &ii);
+
+    //create a bitmap from the ICONINFO so we can access the bitmapData
+    Gdiplus::Bitmap bmpIcon(ii.hbmColor, NULL);
+    Gdiplus::Rect rectBounds(0, 0, bmpIcon.GetWidth(), bmpIcon.GetHeight() );
+
+    //get the BitmapData
+    Gdiplus::BitmapData bmData;
+    bmpIcon.LockBits(&rectBounds, Gdiplus::ImageLockModeRead,
+      bmpIcon.GetPixelFormat(), &bmData);
+
+    // create a new 32 bit bitmap using the bitmapData
+    Gdiplus::Bitmap bmpAlpha(bmData.Width, bmData.Height, bmData.Stride,
+      PixelFormat32bppARGB, (BYTE*)bmData.Scan0);
+    bmpIcon.UnlockBits(&bmData);
+
+    gr.DrawImage(&bmpAlpha, 0, 0);
+
+    DTTOPTS dtto = { 0 };
+    dtto.dwSize = sizeof(DTTOPTS);
+    dtto.iGlowSize = 8;
+    dtto.dwFlags = DTT_COMPOSITED | DTT_GLOWSIZE;
+
+    CRect rectVersion(0x25,0x41,0x25+0x78,0x41+0x25);
+    CString strMsgVersion;
+    strMsgVersion.Format(L"\nConsoleZ %i.%i.%i\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD);
+    this->DrawTextW(dc, strMsgVersion, rectVersion, DT_CENTER | DT_VCENTER, dtto);
+
+    CRect rectAppText(0x14,0x64,0x14+0x9A,0x64+0x80);
+    this->DrawTextW(
+      dc,
+      L"\nCopyright (C) 2011-2012\nChristophe Bucher\n\na modified version of\nConsole 2\nfrom\nMarko Bozikovic",
+      rectAppText,
+      DT_CENTER | DT_VCENTER, dtto);
+  }
+#endif
 };