Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 1fb9041

Browse files
committed
Merge pull request #4303 from TomMalbran/tom/find-in-files-p2
Find in Files Improvements (Part 2: Pagination)
2 parents ddd9094 + 326463b commit 1fb9041

File tree

6 files changed

+362
-122
lines changed

6 files changed

+362
-122
lines changed

src/htmlContent/search-panel.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<div id="search-results" class="bottom-panel vert-resizable top-resizer no-focus">
22
<div class="toolbar simple-toolbar-layout">
3-
<div class="title">{{SEARCH_RESULTS}}</div>
43
<div class="title" id="search-result-summary"></div>
54
<a href="#" class="close">&times;</a>
65
</div>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{{summary}}}
2+
{{#hasPages}}
3+
<span class="first-page {{^hasPrev}}disabled{{/hasPrev}}"></span>
4+
<span class="prev-page {{^hasPrev}}disabled{{/hasPrev}}"></span>
5+
{{{results}}}
6+
<span class="next-page {{^hasNext}}disabled{{/hasNext}}"></span>
7+
<span class="last-page {{^hasNext}}disabled{{/hasNext}}"></span>
8+
{{/hasPages}}

src/nls/root/strings.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,17 @@ define({
125125
"NO_UPDATE_TITLE" : "You're up to date!",
126126
"NO_UPDATE_MESSAGE" : "You are running the latest version of {APP_NAME}.",
127127

128-
"FIND_IN_FILES_TITLE" : "for \"{4}\" {5} - {0} {1} in {2} {3}",
128+
"FIND_IN_FILES_TITLE" : "\"{4}\" found {5} &mdash; {0} {1} in {2} {3}",
129129
"FIND_IN_FILES_SCOPED" : "in <span class='dialog-filename'>{0}</span>",
130130
"FIND_IN_FILES_NO_SCOPE" : "in project",
131131
"FIND_IN_FILES_FILE" : "file",
132132
"FIND_IN_FILES_FILES" : "files",
133133
"FIND_IN_FILES_MATCH" : "match",
134134
"FIND_IN_FILES_MATCHES" : "matches",
135-
"FIND_IN_FILES_MORE_THAN" : "More than ",
136-
"FIND_IN_FILES_MAX" : " (showing the first {0} matches)",
135+
"FIND_IN_FILES_MORE_THAN" : "Over ",
136+
"FIND_IN_FILES_PAGING" : "{0}&mdash;{1}",
137+
"FIND_IN_FILES_LESS" : " <a href='#' class='find-less'>Less</a>",
138+
"FIND_IN_FILES_MORE" : " <a href='#' class='find-more'>More</a>",
137139
"FIND_IN_FILES_FILE_PATH" : "File: <span class='dialog-filename'>{0}</span>",
138140
"FIND_IN_FILES_LINE" : "line: {0}",
139141

@@ -279,7 +281,6 @@ define({
279281
// Strings for main-view.html
280282
"EXPERIMENTAL_BUILD" : "experimental build",
281283
"DEVELOPMENT_BUILD" : "development build",
282-
"SEARCH_RESULTS" : "Search Results",
283284
"OK" : "OK",
284285
"DONT_SAVE" : "Don't Save",
285286
"SAVE" : "Save",

0 commit comments

Comments
 (0)