Browse Source

added icons for 175% zooming in windows

ScottBrogden 9 years ago
parent
commit
d5820eb862

+ 16 - 0
CP_Main.rc

@@ -1359,6 +1359,22 @@ maximize_24             PNG                     "res\\maximize_24.png"
 
 
 maximize_20             PNG                     "res\\maximize_20.png"
 maximize_20             PNG                     "res\\maximize_20.png"
 
 
+return_28               PNG                     "res\\return_28.png"
+
+minimize_28             PNG                     "res\\minimize_28.png"
+
+maximize_28             PNG                     "res\\maximize_28.png"
+
+ChevronLeft_Black_28    PNG                     "res\\ChevronLeft_Black_28.png"
+
+ChevronRight_Black_28   PNG                     "res\\ChevronRight_Black_28.png"
+
+Close_Black_28          PNG                     "res\\Close_Black_28.png"
+
+system_menu_2_42        PNG                     "res\\system_menu_2_42.png"
+
+open_folder_42          PNG                     "res\\open_folder_42.png"
+
 
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 //
 //

+ 8 - 0
CP_Main.vcxproj

@@ -2007,10 +2007,12 @@
     <None Include="res\ChevronLeft_Black_16_16.png" />
     <None Include="res\ChevronLeft_Black_16_16.png" />
     <None Include="res\ChevronLeft_Black_20_20.png" />
     <None Include="res\ChevronLeft_Black_20_20.png" />
     <None Include="res\ChevronLeft_Black_24_24.png" />
     <None Include="res\ChevronLeft_Black_24_24.png" />
+    <None Include="res\ChevronLeft_Black_28.png" />
     <None Include="res\ChevronLeft_Black_32_32.png" />
     <None Include="res\ChevronLeft_Black_32_32.png" />
     <None Include="res\ChevronRight_Black_16_16.png" />
     <None Include="res\ChevronRight_Black_16_16.png" />
     <None Include="res\ChevronRight_Black_20_20.png" />
     <None Include="res\ChevronRight_Black_20_20.png" />
     <None Include="res\ChevronRight_Black_24_24.png" />
     <None Include="res\ChevronRight_Black_24_24.png" />
+    <None Include="res\ChevronRight_Black_28.png" />
     <None Include="res\ChevronRight_Black_32_32.png" />
     <None Include="res\ChevronRight_Black_32_32.png" />
     <None Include="res\chevron_right_16_16.png" />
     <None Include="res\chevron_right_16_16.png" />
     <None Include="res\chevron_right_10_10.png" />
     <None Include="res\chevron_right_10_10.png" />
@@ -2036,6 +2038,7 @@
     <None Include="res\Close_Black_16_16.png" />
     <None Include="res\Close_Black_16_16.png" />
     <None Include="res\Close_Black_20_20.png" />
     <None Include="res\Close_Black_20_20.png" />
     <None Include="res\Close_Black_24_24.png" />
     <None Include="res\Close_Black_24_24.png" />
+    <None Include="res\Close_Black_28.png" />
     <None Include="res\Close_Black_32_32.png" />
     <None Include="res\Close_Black_32_32.png" />
     <None Include="res\cog_16_16.png" />
     <None Include="res\cog_16_16.png" />
     <None Include="res\cog_20_20.png" />
     <None Include="res\cog_20_20.png" />
@@ -2073,11 +2076,13 @@
     <None Include="res\maximize_16_16.png" />
     <None Include="res\maximize_16_16.png" />
     <None Include="res\maximize_20.png" />
     <None Include="res\maximize_20.png" />
     <None Include="res\maximize_24.png" />
     <None Include="res\maximize_24.png" />
+    <None Include="res\maximize_28.png" />
     <None Include="res\maximize_32.png" />
     <None Include="res\maximize_32.png" />
     <None Include="res\maximize_8_8.png" />
     <None Include="res\maximize_8_8.png" />
     <None Include="res\minimize_16.png" />
     <None Include="res\minimize_16.png" />
     <None Include="res\minimize_20.png" />
     <None Include="res\minimize_20.png" />
     <None Include="res\minimize_24.png" />
     <None Include="res\minimize_24.png" />
+    <None Include="res\minimize_28.png" />
     <None Include="res\minimize_32.png" />
     <None Include="res\minimize_32.png" />
     <None Include="res\NewWindowIcon_24_14.png" />
     <None Include="res\NewWindowIcon_24_14.png" />
     <None Include="res\NewWindowIcon_30.png" />
     <None Include="res\NewWindowIcon_30.png" />
@@ -2094,10 +2099,12 @@
     <None Include="res\open_folder_24.png" />
     <None Include="res\open_folder_24.png" />
     <None Include="res\open_folder_30.png" />
     <None Include="res\open_folder_30.png" />
     <None Include="res\open_folder_36.png" />
     <None Include="res\open_folder_36.png" />
+    <None Include="res\open_folder_42.png" />
     <None Include="res\open_folder_48.png" />
     <None Include="res\open_folder_48.png" />
     <None Include="res\return_16.png" />
     <None Include="res\return_16.png" />
     <None Include="res\return_20.png" />
     <None Include="res\return_20.png" />
     <None Include="res\return_24.png" />
     <None Include="res\return_24.png" />
+    <None Include="res\return_28.png" />
     <None Include="res\return_32.png" />
     <None Include="res\return_32.png" />
     <None Include="res\Search_16.png" />
     <None Include="res\Search_16.png" />
     <None Include="res\Search_20.png" />
     <None Include="res\Search_20.png" />
@@ -2125,6 +2132,7 @@
     <None Include="res\system_menu_2_32_32.png" />
     <None Include="res\system_menu_2_32_32.png" />
     <None Include="res\system_menu_2_36.png" />
     <None Include="res\system_menu_2_36.png" />
     <None Include="res\system_menu_2_40_40.png" />
     <None Include="res\system_menu_2_40_40.png" />
+    <None Include="res\system_menu_2_42.png" />
     <None Include="res\system_menu_2_48.png" />
     <None Include="res\system_menu_2_48.png" />
     <None Include="res\system_menu_2_48_48.png" />
     <None Include="res\system_menu_2_48_48.png" />
     <None Include="res\system_menu_2_64_64.png" />
     <None Include="res\system_menu_2_64_64.png" />

+ 8 - 0
CP_Main.vcxproj.filters

@@ -1219,6 +1219,14 @@
     <None Include="res\maximize_32.png" />
     <None Include="res\maximize_32.png" />
     <None Include="res\maximize_24.png" />
     <None Include="res\maximize_24.png" />
     <None Include="res\maximize_20.png" />
     <None Include="res\maximize_20.png" />
+    <None Include="res\return_28.png" />
+    <None Include="res\minimize_28.png" />
+    <None Include="res\maximize_28.png" />
+    <None Include="res\ChevronLeft_Black_28.png" />
+    <None Include="res\ChevronRight_Black_28.png" />
+    <None Include="res\Close_Black_28.png" />
+    <None Include="res\system_menu_2_42.png" />
+    <None Include="res\open_folder_42.png" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">
     <Filter Include="sqlite">

+ 5 - 5
DittoWindow.cpp

@@ -50,11 +50,11 @@ void CDittoWindow::DoCreate(CWnd *pWnd)
 						OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,
 						OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,
 						DEFAULT_PITCH|FF_SWISS, _T("Segoe UI"));
 						DEFAULT_PITCH|FF_SWISS, _T("Segoe UI"));
 	
 	
-	m_closeButton.LoadStdImageDPI(Close_Black_16_16, Close_Black_20_20, Close_Black_24_24, Close_Black_32_32, _T("PNG"));
-	m_chevronRightButton.LoadStdImageDPI(ChevronRight_Black_16_16, ChevronRight_Black_20_20, ChevronRight_Black_24_24, ChevronRight_Black_32_32, _T("PNG"));
-	m_chevronLeftButton.LoadStdImageDPI(ChevronLeft_Black_16_16, ChevronLeft_Black_20_20, ChevronLeft_Black_24_24, ChevronLeft_Black_32_32, _T("PNG"));
-	m_maximizeButton.LoadStdImageDPI(IDB_MAXIMIZE_16_16, maximize_20, maximize_24, maximize_32, _T("PNG"));
-	m_minimizeButton.LoadStdImageDPI(minimize_16, minimize_20, minimize_24, minimize_32, _T("PNG"));
+	m_closeButton.LoadStdImageDPI(Close_Black_16_16, Close_Black_20_20, Close_Black_24_24, Close_Black_28, Close_Black_32_32, _T("PNG"));
+	m_chevronRightButton.LoadStdImageDPI(ChevronRight_Black_16_16, ChevronRight_Black_20_20, ChevronRight_Black_24_24, ChevronRight_Black_28, ChevronRight_Black_32_32, _T("PNG"));
+	m_chevronLeftButton.LoadStdImageDPI(ChevronLeft_Black_16_16, ChevronLeft_Black_20_20, ChevronLeft_Black_24_24, ChevronLeft_Black_28, ChevronLeft_Black_32_32, _T("PNG"));
+	m_maximizeButton.LoadStdImageDPI(IDB_MAXIMIZE_16_16, maximize_20, maximize_24, maximize_28, maximize_32, _T("PNG"));
+	m_minimizeButton.LoadStdImageDPI(minimize_16, minimize_20, minimize_24, minimize_28, minimize_32, _T("PNG"));
 	//m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
 	//m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
 }
 }
 
 

+ 5 - 1
GdiImageDrawer.cpp

@@ -25,7 +25,7 @@ BOOL CGdiImageDrawer::LoadRaw(unsigned char* bitmapData, int imageSize)
 	return m_pStdImage->LoadRaw(bitmapData, imageSize);
 	return m_pStdImage->LoadRaw(bitmapData, imageSize);
 }
 }
 
 
-BOOL CGdiImageDrawer::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id192, LPCTSTR pType)
+BOOL CGdiImageDrawer::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id168, UINT id192, LPCTSTR pType)
 {
 {
 	BOOL ret = FALSE;
 	BOOL ret = FALSE;
 
 
@@ -33,6 +33,10 @@ BOOL CGdiImageDrawer::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id
 	{
 	{
 		ret = LoadStdImage(id192, pType);
 		ret = LoadStdImage(id192, pType);
 	}
 	}
+	else if (theApp.m_metrics.GetDPIX() >= 168)
+	{
+		ret = LoadStdImage(id168, pType);
+	}
 	else if (theApp.m_metrics.GetDPIX() >= 144)
 	else if (theApp.m_metrics.GetDPIX() >= 144)
 	{
 	{
 		ret = LoadStdImage(id144, pType);
 		ret = LoadStdImage(id144, pType);

+ 1 - 1
GdiImageDrawer.h

@@ -9,7 +9,7 @@ public:
 	~CGdiImageDrawer();
 	~CGdiImageDrawer();
 
 
 	BOOL LoadStdImage(UINT id, LPCTSTR pType);
 	BOOL LoadStdImage(UINT id, LPCTSTR pType);
-	BOOL LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id192, LPCTSTR pType);
+	BOOL LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id168, UINT id192, LPCTSTR pType);
 	void Draw(CDC* pScreenDC, CWnd *pWnd, int posX, int posY, bool mouseHover, bool mouseDown, int forceWidth = INT_MAX, int forceHeight = INT_MAX);
 	void Draw(CDC* pScreenDC, CWnd *pWnd, int posX, int posY, bool mouseHover, bool mouseDown, int forceWidth = INT_MAX, int forceHeight = INT_MAX);
 	BOOL LoadRaw(unsigned char* bitmapData, int imageSize);
 	BOOL LoadRaw(unsigned char* bitmapData, int imageSize);
 
 

+ 5 - 1
GdipButton.cpp

@@ -83,7 +83,7 @@ BEGIN_MESSAGE_MAP(CGdipButton, CButton)
 END_MESSAGE_MAP()
 END_MESSAGE_MAP()
 
 
 
 
-BOOL CGdipButton::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id192, LPCTSTR pType)
+BOOL CGdipButton::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id168, UINT id192, LPCTSTR pType)
 {
 {
 	BOOL ret = FALSE;
 	BOOL ret = FALSE;
 
 
@@ -91,6 +91,10 @@ BOOL CGdipButton::LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id192,
 	{
 	{
 		ret = LoadStdImage(id192, pType);
 		ret = LoadStdImage(id192, pType);
 	}
 	}
+	else if (theApp.m_metrics.GetDPIX() >= 168)
+	{
+		ret = LoadStdImage(id168, pType);
+	}
 	else if (theApp.m_metrics.GetDPIX() >= 144)
 	else if (theApp.m_metrics.GetDPIX() >= 144)
 	{
 	{
 		ret = LoadStdImage(id144, pType);
 		ret = LoadStdImage(id144, pType);

+ 1 - 1
GdipButton.h

@@ -54,7 +54,7 @@ public:
 	BOOL LoadAltImage(UINT id, LPCTSTR pType);
 	BOOL LoadAltImage(UINT id, LPCTSTR pType);
 	BOOL LoadStdImage(UINT id, LPCTSTR pType);
 	BOOL LoadStdImage(UINT id, LPCTSTR pType);
 
 
-	BOOL LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id192, LPCTSTR pType);
+	BOOL LoadStdImageDPI(UINT id96, UINT id120, UINT id144, UINT id168, UINT id192, LPCTSTR pType);
 
 
 	// if false, disables the press state and uses grayscale image if it exists
 	// if false, disables the press state and uses grayscale image if it exists
 	void EnableButton(BOOL bEnable = TRUE) { m_bIsDisabled = !bEnable; }
 	void EnableButton(BOOL bEnable = TRUE) { m_bIsDisabled = !bEnable; }

+ 3 - 4
QPasteWnd.cpp

@@ -332,19 +332,18 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 
     m_ShowGroupsFolderBottom.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SHOW_GROUPS_BOTTOM);
     m_ShowGroupsFolderBottom.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SHOW_GROUPS_BOTTOM);
     //m_ShowGroupsFolderBottom.LoadBitmaps(IDB_CLOSED_FOLDER, IDB_CLOSED_FOLDER_PRESSED, IDB_CLOSED_FOLDER_FOCUSED);
     //m_ShowGroupsFolderBottom.LoadBitmaps(IDB_CLOSED_FOLDER, IDB_CLOSED_FOLDER_PRESSED, IDB_CLOSED_FOLDER_FOCUSED);
-	m_ShowGroupsFolderBottom.LoadStdImageDPI(open_folder_24, open_folder_30, open_folder_36, open_folder_48, _T("PNG"));
+	m_ShowGroupsFolderBottom.LoadStdImageDPI(open_folder_24, open_folder_30, open_folder_36, open_folder_42, open_folder_48, _T("PNG"));
     m_ShowGroupsFolderBottom.ShowWindow(SW_SHOW);
     m_ShowGroupsFolderBottom.ShowWindow(SW_SHOW);
 	m_ShowGroupsFolderBottom.SetToolTipText(theApp.m_Language.GetString(_T("GroupsTooltip"), _T("Groups")));
 	m_ShowGroupsFolderBottom.SetToolTipText(theApp.m_Language.GetString(_T("GroupsTooltip"), _T("Groups")));
 	m_ShowGroupsFolderBottom.ModifyStyle(WS_TABSTOP, 0);
 	m_ShowGroupsFolderBottom.ModifyStyle(WS_TABSTOP, 0);
 
 
     m_BackButton.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_BACK_BUTTON);
     m_BackButton.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_BACK_BUTTON);
-	m_BackButton.LoadStdImageDPI(return_16, return_20, return_24, return_32, _T("PNG"));
+	m_BackButton.LoadStdImageDPI(return_16, return_20, return_24, return_28, return_32, _T("PNG"));
 	m_BackButton.ModifyStyle(WS_TABSTOP, 0);
 	m_BackButton.ModifyStyle(WS_TABSTOP, 0);
     m_BackButton.ShowWindow(SW_SHOW);
     m_BackButton.ShowWindow(SW_SHOW);
 
 
 	m_systemMenu.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SYSTEM_BUTTON);
 	m_systemMenu.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SYSTEM_BUTTON);
-	//m_systemMenu.LoadStdImageDPI(IDB_HAMBURGER_16_16, IDB_HAMBURGER_20_20, IDB_HAMBURGER_24_24, IDB_HAMBURGER_32_32, _T("PNG"));
-	m_systemMenu.LoadStdImageDPI(system_menu_2_24, system_menu_2_30, system_menu_2_36, system_menu_2_48, _T("PNG"));
+	m_systemMenu.LoadStdImageDPI(system_menu_2_24, system_menu_2_30, system_menu_2_36, system_menu_2_42, system_menu_2_48, _T("PNG"));
 	m_systemMenu.ModifyStyle(WS_TABSTOP, 0);
 	m_systemMenu.ModifyStyle(WS_TABSTOP, 0);
 	m_systemMenu.ShowWindow(SW_SHOW);
 	m_systemMenu.ShowWindow(SW_SHOW);
 		
 		

+ 10 - 2
Resource.h

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Microsoft Visual C++ generated include file.
-// Used by CP_Main.rc
+// Used by CP_Main2.rc
 //
 //
 #define IDD_ABOUTBOX                    100
 #define IDD_ABOUTBOX                    100
 #define IDR_CP_MAIN                     103
 #define IDR_CP_MAIN                     103
@@ -164,6 +164,14 @@
 #define maximize_24                     306
 #define maximize_24                     306
 #define IDB_PNG17                       307
 #define IDB_PNG17                       307
 #define maximize_20                     307
 #define maximize_20                     307
+#define return_28                       308
+#define minimize_28                     309
+#define maximize_28                     310
+#define ChevronLeft_Black_28            311
+#define ChevronRight_Black_28           312
+#define Close_Black_28                  313
+#define system_menu_2_42                314
+#define open_folder_42                  315
 #define IDC_PATH                        1000
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
 #define IDC_SELECT_SOUND                1002
@@ -642,7 +650,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        308
+#define _APS_NEXT_RESOURCE_VALUE        316
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104
 #define _APS_NEXT_SYMED_VALUE           104

+ 1 - 1
SymbolEdit.cpp

@@ -32,7 +32,7 @@ CSymbolEdit::CSymbolEdit() :
 
 
 
 
 	//m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
 	//m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
-	m_closeButton.LoadStdImageDPI(search_close_16, Search_20, Search_24, Search_32, _T("PNG"));
+	m_closeButton.LoadStdImageDPI(search_close_16, Search_20, Search_24, Search_28, Search_32, _T("PNG"));
 }
 }
 
 
 CSymbolEdit::~CSymbolEdit()
 CSymbolEdit::~CSymbolEdit()

+ 1 - 1
ToolTipEx.cpp

@@ -103,7 +103,7 @@ BOOL CToolTipEx::Create(CWnd *pParentWnd)
     SetLogFont(GetSystemToolTipFont(), FALSE);
     SetLogFont(GetSystemToolTipFont(), FALSE);
 
 
 	m_optionsButton.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, 2);
 	m_optionsButton.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, 2);
-	m_optionsButton.LoadStdImageDPI(IDB_COG_16_16, IDB_COG_20_20, IDB_COG_24_24, IDB_COG_32_32, _T("PNG"));
+	m_optionsButton.LoadStdImageDPI(IDB_COG_16_16, IDB_COG_20_20, IDB_COG_24_24, cog_28 IDB_COG_32_32, _T("PNG"));
 	m_optionsButton.SetToolTipText(theApp.m_Language.GetString(_T("DescriptionOptionsTooltip"), _T("Description Options")));
 	m_optionsButton.SetToolTipText(theApp.m_Language.GetString(_T("DescriptionOptionsTooltip"), _T("Description Options")));
 	m_optionsButton.ShowWindow(SW_SHOW);
 	m_optionsButton.ShowWindow(SW_SHOW);
 
 

BIN
res/ChevronLeft_Black_28.png


BIN
res/ChevronRight_Black_28.png


BIN
res/Chevron_512.png


BIN
res/Close_Black_28.png


BIN
res/Search_28.png


BIN
res/cog_28.png


BIN
res/maximize_28.png


BIN
res/minimize_28.png


BIN
res/open_folder_42.png


BIN
res/return_28.png