Browse Source

screen scaling fixes for icons

Scott Brogden 9 years ago
parent
commit
3a71e62d98

+ 4 - 0
CP_Main.rc

@@ -1375,6 +1375,10 @@ system_menu_2_42        PNG                     "res\\system_menu_2_42.png"
 
 open_folder_42          PNG                     "res\\open_folder_42.png"
 
+cog_28                  PNG                     "res\\cog_28.png"
+
+Search_28               PNG                     "res\\Search_28.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

+ 2 - 0
CP_Main.vcxproj

@@ -2044,6 +2044,7 @@
     <None Include="res\cog_20_20.png" />
     <None Include="res\cog_22_22.png" />
     <None Include="res\cog_24_24.png" />
+    <None Include="res\cog_28.png" />
     <None Include="res\cog_32_32.png" />
     <None Include="res\CP_Main.ico" />
     <None Include="res\CP_Main.rc2" />
@@ -2109,6 +2110,7 @@
     <None Include="res\Search_16.png" />
     <None Include="res\Search_20.png" />
     <None Include="res\Search_24.png" />
+    <None Include="res\Search_28.png" />
     <None Include="res\Search_32.png" />
     <None Include="res\search_close.bmp" />
     <None Include="res\search_close_125.bmp" />

+ 2 - 0
CP_Main.vcxproj.filters

@@ -1227,6 +1227,8 @@
     <None Include="res\Close_Black_28.png" />
     <None Include="res\system_menu_2_42.png" />
     <None Include="res\open_folder_42.png" />
+    <None Include="res\cog_28.png" />
+    <None Include="res\Search_28.png" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">

+ 5 - 5
QListCtrl.cpp

@@ -65,11 +65,11 @@ CQListCtrl::CQListCtrl()
 
 	m_mouseOverScrollAreaStart = 0;
 
-	m_groupFolder.LoadStdImageDPI(IDB_OPEN_FOLDER_16_16, IDB_OPEN_FOLDER_20_20, IDB_OPEN_FOLDER_24_24, IDB_OPEN_FOLDER_32_32, _T("PNG"));
-	m_dontDeleteImage.LoadStdImageDPI(IDB_YELLOW_STAR_16_16, IDB_YELLOW_STAR_20_20, IDB_YELLOW_STAR_24_24, IDB_YELLOW_STAR_32_32, _T("PNG"));
-	m_inFolderImage.LoadStdImageDPI(IDB_IN_FOLDER_16_16, IDB_IN_FOLDER_20_20, IDB_IN_FOLDER_24_24, IDB_IN_FOLDER_32_32, _T("PNG"));
-	m_shortCutImage.LoadStdImageDPI(IDB_KEY_16_16, IDB_KEY_20_20, IDB_KEY_24_24, IDB_KEY_32_32, _T("PNG"));
-	m_stickyImage.LoadStdImageDPI(IDB_STICKY_16_16, IDB_STICKY_20_20, IDB_STICKY_24_24, IDB_STICKY_32_32, _T("PNG"));
+	m_groupFolder.LoadStdImageDPI(IDB_OPEN_FOLDER_16_16, IDB_OPEN_FOLDER_20_20, IDB_OPEN_FOLDER_24_24, IDB_OPEN_FOLDER_24_24, IDB_OPEN_FOLDER_32_32, _T("PNG"));
+	m_dontDeleteImage.LoadStdImageDPI(IDB_YELLOW_STAR_16_16, IDB_YELLOW_STAR_20_20, IDB_YELLOW_STAR_24_24, IDB_YELLOW_STAR_24_24, IDB_YELLOW_STAR_32_32, _T("PNG"));
+	m_inFolderImage.LoadStdImageDPI(IDB_IN_FOLDER_16_16, IDB_IN_FOLDER_20_20, IDB_IN_FOLDER_24_24, IDB_IN_FOLDER_24_24, IDB_IN_FOLDER_32_32, _T("PNG"));
+	m_shortCutImage.LoadStdImageDPI(IDB_KEY_16_16, IDB_KEY_20_20, IDB_KEY_24_24, IDB_KEY_24_24, IDB_KEY_32_32, _T("PNG"));
+	m_stickyImage.LoadStdImageDPI(IDB_STICKY_16_16, IDB_STICKY_20_20, IDB_STICKY_24_24, IDB_STICKY_24_24, IDB_STICKY_32_32, _T("PNG"));
 
 	m_showIfClipWasPasted = TRUE;
 	m_bShowTextForFirstTenHotKeys = true;

+ 5 - 2
Resource.h

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by CP_Main2.rc
+// Used by CP_Main.rc
 //
 #define IDD_ABOUTBOX                    100
 #define IDR_CP_MAIN                     103
@@ -172,6 +172,9 @@
 #define Close_Black_28                  313
 #define system_menu_2_42                314
 #define open_folder_42                  315
+#define cog_28                          316
+#define IDB_PNG13                       317
+#define Search_28                       317
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
@@ -650,7 +653,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        316
+#define _APS_NEXT_RESOURCE_VALUE        318
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104

+ 1 - 1
ToolTipEx.cpp

@@ -103,7 +103,7 @@ BOOL CToolTipEx::Create(CWnd *pParentWnd)
     SetLogFont(GetSystemToolTipFont(), FALSE);
 
 	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, cog_28 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.ShowWindow(SW_SHOW);
 

BIN
res/open_folder_42.png


BIN
res/opened_folder_16_16.png


BIN
res/opened_folder_20_20.png


BIN
res/opened_folder_24_24.png


BIN
res/opened_folder_32_32.png


BIN
res/return_20.png


BIN
res/return_24.png


BIN
res/return_28.png


BIN
res/system_menu_2_42.png