[ros-diffs] [gadamopoulos] 53310: [desk] -remove theme.h and merge it in appearance.h

Author: gadamopoulos
Date: Thu Aug 18 21:18:33 2011
New Revision: 53310

URL: http://svn.reactos.org/svn/reactos?rev=53310&view=rev
Log:
[desk]
-remove theme.h and merge it in appearance.h

Removed:
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h
Modified:
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl…
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h [iso-8859-1] Thu Aug 18
21:18:33 2011
@@ -1,3 +1,81 @@
+/* Some definitions for theme */
+#define SIZE_BORDER_X 0
+#define SIZE_BORDER_Y 1
+#define SIZE_CAPTION_Y 2
+#define SIZE_ICON_X 3
+#define SIZE_ICON_Y 4
+#define SIZE_ICON_SPC_X 5
+#define SIZE_ICON_SPC_Y 6
+#define SIZE_MENU_SIZE_X 7
+#define SIZE_MENU_Y 8
+#define SIZE_SCROLL_X 9
+#define SIZE_SCROLL_Y 10
+#define SIZE_SMCAPTION_Y 11
+#define SIZE_EDGE_X 12
+#define SIZE_EDGE_Y 13
+#define SIZE_FRAME_Y 14
+#define SIZE_MENU_CHECK_X 15
+#define SIZE_MENU_CHECK_Y 16
+#define SIZE_MENU_SIZE_Y 17
+#define SIZE_SIZE_X 18
+#define SIZE_SIZE_Y 19
+
+#define FONT_CAPTION 0
+#define FONT_SMCAPTION 1
+#define FONT_HILIGHT 2
+#define FONT_MENU 2
+#define FONT_ICON 3
+#define FONT_INFO 4
+#define FONT_DIALOG 5
+
+#define NUM_ELEMENTS 22
+#define NUM_FONTS 6
+#define NUM_SIZES 20
+#define NUM_COLORS 31
+#define MAX_TEMPLATES 50
+#define MAX_TEMPLATENAMELENTGH 80
+
+/* Some typedefs for theme */
+
+/* Most (but not all) fields below correspond to HKCU\Control
Panel\Desktop\UserPreferencesMask */
+typedef struct
+{
+	BOOL bActiveWindowTracking;
+	BOOL bMenuAnimation;
+	BOOL bComboBoxAnimation;
+	BOOL bListBoxSmoothScrolling;
+	BOOL bGradientCaptions;
+	BOOL bKeyboardCues;
+	BOOL bActiveWndTrkZorder;
+	BOOL bHotTracking;
+	BOOL bMenuFade;
+	BOOL bSelectionFade;
+	BOOL bTooltipAnimation;
+	BOOL bTooltipFade;
+	BOOL bCursorShadow;
+	BOOL bUiEffects;
+	BOOL bFontSmoothing;
+	BOOL bDragFullWindows;
+	UINT uiFontSmoothingType;
+} EFFECTS;
+
+typedef struct
+{
+	COLORREF crColor[NUM_COLORS];
+	LOGFONT lfFont[NUM_FONTS];
+	INT Size[NUM_SIZES];
+	BOOL bFlatMenus;
+	EFFECTS Effects;
+} COLOR_SCHEME;
+
+typedef struct
+{
+	TCHAR strKeyName[4];
+	TCHAR strSizeName[4];
+	TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH];
+	TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH];
+} SCHEME_PRESET;
+
 /* Some typedefs for appearance */
 
 /* This is the global structure used to store the current values.
@@ -16,6 +94,15 @@
     BOOL bInitializing;
 } GLOBALS;
 
+extern SCHEME_PRESET g_ColorSchemes[MAX_TEMPLATES];
+
+/* prototypes for theme.c */
+VOID LoadCurrentScheme(COLOR_SCHEME* scheme);
+BOOL LoadSchemeFromReg(COLOR_SCHEME* scheme, INT SchemeId);
+VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId);
+BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName);
+INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle);
+
 /* prototypes for appearance.c */
 INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
 

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl…
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h [iso-8859-1] Thu Aug 18 21:18:33
2011
@@ -12,7 +12,6 @@
 #include <dll/desk/deskcplx.h>
 #include <cfgmgr32.h>
 
-#include "theme.h"
 #include "appearance.h"
 #include "preview.h"
 #include "draw.h"

Removed: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl…
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h (removed)
@@ -1,86 +1,0 @@
-/* Some definitions for theme */
-#define SIZE_BORDER_X 0
-#define SIZE_BORDER_Y 1
-#define SIZE_CAPTION_Y 2
-#define SIZE_ICON_X 3
-#define SIZE_ICON_Y 4
-#define SIZE_ICON_SPC_X 5
-#define SIZE_ICON_SPC_Y 6
-#define SIZE_MENU_SIZE_X 7
-#define SIZE_MENU_Y 8
-#define SIZE_SCROLL_X 9
-#define SIZE_SCROLL_Y 10
-#define SIZE_SMCAPTION_Y 11
-#define SIZE_EDGE_X 12
-#define SIZE_EDGE_Y 13
-#define SIZE_FRAME_Y 14
-#define SIZE_MENU_CHECK_X 15
-#define SIZE_MENU_CHECK_Y 16
-#define SIZE_MENU_SIZE_Y 17
-#define SIZE_SIZE_X 18
-#define SIZE_SIZE_Y 19
-
-#define FONT_CAPTION 0
-#define FONT_SMCAPTION 1
-#define FONT_HILIGHT 2
-#define FONT_MENU 2
-#define FONT_ICON 3
-#define FONT_INFO 4
-#define FONT_DIALOG 5
-
-#define NUM_ELEMENTS 22
-#define NUM_FONTS 6
-#define NUM_SIZES 20
-#define NUM_COLORS 31
-#define MAX_TEMPLATES 50
-#define MAX_TEMPLATENAMELENTGH 80
-
-/* Some typedefs for theme */
-
-/* Most (but not all) fields below correspond to HKCU\Control
Panel\Desktop\UserPreferencesMask */
-typedef struct
-{
-	BOOL bActiveWindowTracking;
-	BOOL bMenuAnimation;
-	BOOL bComboBoxAnimation;
-	BOOL bListBoxSmoothScrolling;
-	BOOL bGradientCaptions;
-	BOOL bKeyboardCues;
-	BOOL bActiveWndTrkZorder;
-	BOOL bHotTracking;
-	BOOL bMenuFade;
-	BOOL bSelectionFade;
-	BOOL bTooltipAnimation;
-	BOOL bTooltipFade;
-	BOOL bCursorShadow;
-	BOOL bUiEffects;
-	BOOL bFontSmoothing;
-	BOOL bDragFullWindows;
-	UINT uiFontSmoothingType;
-} EFFECTS;
-
-typedef struct
-{
-	COLORREF crColor[NUM_COLORS];
-	LOGFONT lfFont[NUM_FONTS];
-	INT Size[NUM_SIZES];
-	BOOL bFlatMenus;
-	EFFECTS Effects;
-} COLOR_SCHEME;
-
-typedef struct
-{
-	TCHAR strKeyName[4];
-	TCHAR strSizeName[4];
-	TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH];
-	TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH];
-} SCHEME_PRESET;
-
-extern SCHEME_PRESET g_ColorSchemes[MAX_TEMPLATES];
-
-/* prototypes for theme.c */
-VOID LoadCurrentScheme(COLOR_SCHEME* scheme);
-BOOL LoadSchemeFromReg(COLOR_SCHEME* scheme, INT SchemeId);
-VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId);
-BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName);
-INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle);