Merge pull request #451 from lifenjoiner/matches

improve presentation of matching results and related

Author: stefankueng

src/LineData.h

@@ -23,6 +23,7 @@
 struct LineDataLine
 {
     DWORD           number;
+    DWORD           column;
     std::wstring    text;
 };
 

src/Resources/grepWin.rc

@@ -191,10 +191,10 @@ CAPTION "grepWin Settings"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Editor",IDC_EDITORGROUP,7,7,303,61
-    LTEXT           "Command line to start an editor at a specific line:",IDC_STATIC1,13,19,288,8
+    LTEXT           "Command line to start an editor at a specific line and in line offset:",IDC_STATIC1,13,19,288,8
     EDITTEXT        IDC_EDITORCMD,13,31,269,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_SEARCHPATHBROWSE,286,31,15,14
-    LTEXT           "%path% is replaced with the path of the file, %line% with the line to jump to",IDC_STATIC2,13,47,288,17
+    LTEXT           "%path% is replaced with the path of the file, %line% with the line to jump to, %column% with in line offset",IDC_STATIC2,13,47,288,17
     LTEXT           "Language:",IDC_STATIC4,7,72,135,8
     COMBOBOX        IDC_LANGUAGE,170,71,140,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "number of NULL bytes per MB allowed for a file to still be considered text instead of binary",IDC_STATIC3,7,85,241,17
@@ -376,6 +376,7 @@ BEGIN
     IDS_REGEXINVALID        "invalid regex!"
     IDS_SIZE                "Size"
     IDS_LINE                "Line"
+    IDS_COLUMN              "Column"
     IDS_MATCHES             "Matches"
     IDS_TEXT                "Text"
     IDS_PATH                "Path"
@@ -395,7 +396,7 @@ BEGIN
     IDS_COPYRESULT          "Copy text result to clipboard"
     IDS_COPYRESULTS         "Copy text results to clipboard"
     IDS_XMOREMATCHES        "%ld more matches"
-    IDS_CONTEXTLINE         "Line %5ld : %30s\n"
+    IDS_CONTEXTLINE         "Line %5ld : %s\n"
     IDS_INFOLABELFILE       "scanning file '%s'"
     IDS_ERR_RELATIVEPATH    "Relative paths are not allowed. Please enter an absolute path!"
     IDS_ERR_INVALID_PATH    "Invalid path!"

src/SearchDlg.cpp

@@ -109,6 +109,7 @@ class CSearchDlg : public CDialog
     void             FillResultList();
     bool             AddFoundEntry(CSearchInfo* pInfo, bool bOnlyListControl = false);
     void             ShowContextMenu(HWND hWnd, int x, int y);
+    LRESULT          ColorizeMatchResultProc(LPNMLVCUSTOMDRAW lpLVCD);
     void             DoListNotify(LPNMITEMACTIVATE lpNMItemActivate);
     void             OpenFileAtListIndex(int listIndex);
     void             UpdateInfoLabel();

src/SearchDlg.h

@@ -49,6 +49,8 @@ class CSearchInfo
     std::wstring              filePath;
     __int64                   fileSize;
     std::vector<DWORD>        matchLinesNumbers;
+    std::vector<DWORD>        matchColumnsNumbers;
+    std::vector<DWORD>        matchLengths;
     std::vector<std::wstring> matchLines;
     __int64                   matchCount;
     CTextFile::UnicodeType    encoding;

src/SearchInfo.h

@@ -342,6 +342,8 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
                             wchar_t buf[40] = {0};
                             swprintf_s(buf, L"%ld", it2->number);
                             SearchReplace(cmd, L"%line%", buf);
+                            swprintf_s(buf, L"%ld", it2->column);
+                            SearchReplace(cmd, L"%column%", buf);
 
                             STARTUPINFO         startupInfo;
                             PROCESS_INFORMATION processInfo;
@@ -365,9 +367,14 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
                             wchar_t buf[40] = {0};
                             swprintf_s(buf, L"%ld", it->matchLinesNumbers[0]);
                             SearchReplace(cmd, L"%line%", buf);
+                            swprintf_s(buf, L"%ld", it->matchColumnsNumbers[0]);
+                            SearchReplace(cmd, L"%column%", buf);
                         }
                         else
+                        {
                             SearchReplace(cmd, L"%line%", L"0");
+                            SearchReplace(cmd, L"%column%", L"0");
+                        }
 
                         STARTUPINFO         startupInfo;
                         PROCESS_INFORMATION processInfo;

src/ShellContextMenu.cpp

@@ -113,7 +113,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>
@@ -140,7 +140,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>
@@ -172,7 +172,7 @@
       <SetChecksum>true</SetChecksum>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>
@@ -202,7 +202,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <SetChecksum>true</SetChecksum>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;Urlmon.lib;UxTheme.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>

src/grepWin.vcxproj

@@ -91,6 +91,7 @@
 #define IDS_COPY_COLUMN                 177
 #define IDS_COPY_COLUMN_SEL             178
 #define IDS_REGEXEXCEPTION              179
+#define IDS_COLUMN                      180
 #define IDC_SEARCHTEXT                  1000
 #define IDC_REGEXRADIO                  1001
 #define IDC_TEXTRADIO                   1002

src/resource.h

@@ -44,7 +44,7 @@ msgid "%ld more matches"
 msgstr "%ld meer gevind"
 
 #. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %column% with in line offset"
 msgstr "%path% word vervang met die pad van die lêer, %line% met die lyn om na te spring, %pattern% met die soekreeks."
 
 #. Resource IDs: (119)
@@ -124,8 +124,12 @@ msgstr "Vang Soektog"
 msgid "Check for updates"
 msgstr "Kyk vir opdaterings"
 
+#. Resource IDs: (180)
+msgid "Column"
+msgstr ""
+
 #. Resource IDs: (1068)
-msgid "Command line to start an editor at a specific line:"
+msgid "Command line to start an editor at a specific line and in line offset:"
 msgstr "Opdragreël om 'n redakteur op 'n spesifieke reël te begin:"
 
 #. Resource IDs: (1060)
@@ -307,8 +311,8 @@ msgstr "Lyn"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Lyn %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Lyn %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/Afrikaans.lang

@@ -44,7 +44,7 @@ msgid "%ld more matches"
 msgstr "больш %ld супадзенняў"
 
 #. Resource IDs: (1069)
-msgid "%path% is replaced with the path of the file, %line% with the line to jump to"
+msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %column% with in line offset"
 msgstr ""
 
 #. Resource IDs: (119)
@@ -124,8 +124,12 @@ msgstr ""
 msgid "Check for updates"
 msgstr ""
 
+#. Resource IDs: (180)
+msgid "Column"
+msgstr ""
+
 #. Resource IDs: (1068)
-msgid "Command line to start an editor at a specific line:"
+msgid "Command line to start an editor at a specific line and in line offset:"
 msgstr "Каманда для адкрыцця рэдактара на выбраным радку:"
 
 #. Resource IDs: (1060)
@@ -307,8 +311,8 @@ msgstr "Радок"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Радок %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Радок %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"