From 339cc6eca8ef70a950ad1de4c097129f631b5db6 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 6 Jan 2013 17:14:41 +0100
Subject: [PATCH] TGitMerge: Synced styles with TGitMerge

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Resources/TortoiseGitBlameENG.rc | 30 ++++++++++++------------------
 src/TortoiseGitBlame/MainFrm.cpp     | 11 +++++++++++
 src/TortoiseGitBlame/Resource.h      |  5 +++--
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Resources/TortoiseGitBlameENG.rc b/src/Resources/TortoiseGitBlameENG.rc
index 132c43921..51660dabe 100644
--- a/src/Resources/TortoiseGitBlameENG.rc
+++ b/src/Resources/TortoiseGitBlameENG.rc
@@ -257,18 +257,20 @@ BEGIN
         MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR
         POPUP "&Application Look"
         BEGIN
-            MENUITEM "Windows &2000",               ID_VIEW_APPLOOK_WIN_2000
-            MENUITEM "Office &XP",                  ID_VIEW_APPLOOK_OFF_XP
-            MENUITEM "&Windows XP",                 ID_VIEW_APPLOOK_WIN_XP
-            MENUITEM "Office 200&3",                ID_VIEW_APPLOOK_OFF_2003
-            MENUITEM "Visual Studio.NET 200&5",     ID_VIEW_APPLOOK_VS_2005
-            POPUP "Office 200&7"
+            MENUITEM "Windows 2000",                ID_VIEW_APPLOOK_WIN_2000
+            MENUITEM "Office XP",                   ID_VIEW_APPLOOK_OFF_XP
+            MENUITEM "Windows XP",                  ID_VIEW_APPLOOK_WIN_XP
+            MENUITEM "Office 2003",                 ID_VIEW_APPLOOK_OFF_2003
+            MENUITEM "Visual Studio 2005",          ID_VIEW_APPLOOK_VS_2005
+            POPUP "Office 2007"
             BEGIN
-                MENUITEM "&Blue Style",                 ID_VIEW_APPLOOK_OFF_2007_BLUE
-                MENUITEM "B&lack Style",                ID_VIEW_APPLOOK_OFF_2007_BLACK
-                MENUITEM "&Silver Style",               ID_VIEW_APPLOOK_OFF_2007_SILVER
-                MENUITEM "&Aqua Style",                 ID_VIEW_APPLOOK_OFF_2007_AQUA
+                MENUITEM "Blue Style",                  ID_VIEW_APPLOOK_OFF_2007_BLUE
+                MENUITEM "Black Style",                 ID_VIEW_APPLOOK_OFF_2007_BLACK
+                MENUITEM "Silver Style",                ID_VIEW_APPLOOK_OFF_2007_SILVER
+                MENUITEM "Aqua Style",                  ID_VIEW_APPLOOK_OFF_2007_AQUA
             END
+            MENUITEM "Visual Studio 2008",          ID_VIEW_APPLOOK_VS_2008
+            MENUITEM "Windows 7",                   ID_VIEW_APPLOOK_WIN7
         END
         MENUITEM "Show author",                 ID_VIEW_SHOWAUTHOR
         MENUITEM "&Follow renames",             ID_VIEW_FOLLOWRENAMES
@@ -292,14 +294,6 @@ BEGIN
     END
 END
 
-IDR_THEME_MENU MENU 
-BEGIN
-    MENUITEM "Office 2007 (&Blue Style)",   ID_VIEW_APPLOOK_OFF_2007_BLUE
-    MENUITEM "Office 2007 (B&lack Style)",  ID_VIEW_APPLOOK_OFF_2007_BLACK
-    MENUITEM "Office 2007 (&Silver Style)", ID_VIEW_APPLOOK_OFF_2007_SILVER
-    MENUITEM "Office 2007 (&Aqua Style)",   ID_VIEW_APPLOOK_OFF_2007_AQUA
-END
-
 IDR_BLAME_POPUP MENU 
 BEGIN
     POPUP "BlAMEPOPUP"
diff --git a/src/TortoiseGitBlame/MainFrm.cpp b/src/TortoiseGitBlame/MainFrm.cpp
index 95ba4c521..1a5d588dd 100644
--- a/src/TortoiseGitBlame/MainFrm.cpp
+++ b/src/TortoiseGitBlame/MainFrm.cpp
@@ -274,6 +274,16 @@ void CMainFrame::OnApplicationLook(UINT id)
 		CDockingManager::SetDockingMode(DT_SMART);
 		break;
 
+	case ID_VIEW_APPLOOK_VS_2008:
+		CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerVS2008));
+		CDockingManager::SetDockingMode(DT_SMART);
+		break;
+
+	case ID_VIEW_APPLOOK_WIN7:
+		CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows7));
+		CDockingManager::SetDockingMode(DT_SMART);
+		break;
+
 	default:
 		switch (theApp.m_nAppLook)
 		{
@@ -305,6 +315,7 @@ void CMainFrame::OnApplicationLook(UINT id)
 
 void CMainFrame::OnUpdateApplicationLook(CCmdUI* pCmdUI)
 {
+	pCmdUI->Enable();
 	pCmdUI->SetRadio(theApp.m_nAppLook == pCmdUI->m_nID);
 }
 
diff --git a/src/TortoiseGitBlame/Resource.h b/src/TortoiseGitBlame/Resource.h
index 8581cea38..4a092490f 100644
--- a/src/TortoiseGitBlame/Resource.h
+++ b/src/TortoiseGitBlame/Resource.h
@@ -29,9 +29,10 @@
 #define IDI_PROPERTIES_WND              167
 #define IDI_PROPERTIES_WND_HC           168
 #define IDR_OUTPUT_POPUP                182
-#define IDR_THEME_MENU                  200
 #define ID_SET_STYLE                    201
-#define ID_VIEW_APPLOOK_WIN_2000        210
+#define ID_VIEW_APPLOOK_WIN_2000        208
+#define ID_VIEW_APPLOOK_VS_2008         209
+#define ID_VIEW_APPLOOK_WIN7            210
 #define ID_VIEW_APPLOOK_OFF_XP          211
 #define ID_VIEW_APPLOOK_WIN_XP          212
 #define ID_VIEW_APPLOOK_OFF_2003        213
-- 
2.11.4.GIT