liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify path help, add '%f' to generated examples

Browse Source
This commit is contained in:
Scott Gilbertson
2024-02-11 15:28:39 -05:00
parent ccc667e390
commit 5d7586bab4
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@@ -2115,7 +2115,7 @@ QUEUE_LOCATION_TEMPLATE_HELP_PATHS_INTRO;The <b>%dN</b>, <b>%d-N</b>, <b>%pN</b>
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_INTRO_WINDOWS;For Windows paths, <b>%d-1</b> is the drive letter and colon, and <b>%d-2</b> is the base directory on that drive. QUEUE_LOCATION_TEMPLATE_HELP_PATHS_INTRO_WINDOWS;For Windows paths, <b>%d-1</b> is the drive letter and colon, and <b>%d-2</b> is the base directory on that drive.
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_BODY_1;Using this pathname as an example: QUEUE_LOCATION_TEMPLATE_HELP_PATHS_BODY_1;Using this pathname as an example:
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_EXAMPLE_LINUX;/home/tom/photos/2010-10-31/photo1.raw QUEUE_LOCATION_TEMPLATE_HELP_PATHS_EXAMPLE_LINUX;/home/tom/photos/2010-10-31/photo1.raw
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_EXAMPLE_WINDOWS;C:\users\tom\photos\2010-10-31\photo1.raw QUEUE_LOCATION_TEMPLATE_HELP_PATHS_EXAMPLE_WINDOWS;D:\tom\photos\2010-10-31\photo1.raw
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_BODY_2;The meanings of the formatting strings are: QUEUE_LOCATION_TEMPLATE_HELP_PATHS_BODY_2;The meanings of the formatting strings are:
QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH;ERROR: 2nd result is different: QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH;ERROR: 2nd result is different:
QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE;Rank QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE;Rank

26
rtgui/batchqueuepanel.cc
View File

@@ -406,11 +406,6 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr<Gtk::TextBuffer> b
// number of elements in the path. // number of elements in the path.
auto insertPathExamples = [&buffer, &pos, pathElementCount, exampleFilePath](char letter, int offset1, int mult1, int offset2, int mult2) auto insertPathExamples = [&buffer, &pos, pathElementCount, exampleFilePath](char letter, int offset1, int mult1, int offset2, int mult2)
{ {
Glib::ustring startMonospace("<tt>");
Glib::ustring endMonospace("</tt>");
auto buildBuffer = Gtk::TextBuffer::create();
auto buildpos = buildBuffer->begin();
buildpos = buildBuffer->insert(buildpos, startMonospace);
for (int n=0; n<pathElementCount; n++) for (int n=0; n<pathElementCount; n++)
{ {
auto path1 = Glib::ustring::format("%",letter,offset1+n*mult1); auto path1 = Glib::ustring::format("%",letter,offset1+n*mult1);
@@ -419,24 +414,25 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr<Gtk::TextBuffer> b
auto result1 = BatchQueue::calcAutoFileNameBase(exampleFilePath); auto result1 = BatchQueue::calcAutoFileNameBase(exampleFilePath);
options.savePathTemplate = path2; options.savePathTemplate = path2;
auto result2 = BatchQueue::calcAutoFileNameBase(exampleFilePath); auto result2 = BatchQueue::calcAutoFileNameBase(exampleFilePath);
buildpos = buildBuffer->insert (buildpos, Glib::ustring::format("\n <b>", path1, "</b> = <b>", path2, "</b> = <i>", result1, "</i>")); pos = buffer->insert_markup(pos, Glib::ustring::format("\n<tt> <b>", path1, "</b> = <b>", path2, "</b> = <i>", result1, "</i></tt>"));
if (result1 != result2) if (result1 != result2)
{ {
// If this error appears, it indicates a coding error in either BatchQueue::calcAutoFileNameBase // If this error appears, it indicates a coding error in either BatchQueue::calcAutoFileNameBase
// or BatchQueuePanel::populateTemplateHelpBuffer. // or BatchQueuePanel::populateTemplateHelpBuffer.
buildpos = buildBuffer->insert(buildpos, Glib::ustring::format(" ", M("QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH"), " ", result2)); pos = buffer->insert_markup(pos, Glib::ustring::format(" ", M("QUEUE_LOCATION_TEMPLATE_HELP_RESULT_MISMATCH"), " ", result2));
} }
} }
buildpos = buildBuffer->insert(buildpos, endMonospace);
pos = buffer->insert_markup(pos, buildBuffer->get_text());
}; };
// Example outputs in comments below are for a 4-element path. // Example outputs in comments below are for a 4-element path.
// <b>%d4</b> = <b>%d-1</b> = <i>home</i> insertPathExamples('d', pathElementCount, -1, -1, -1); // <b>%d4</b> = <b>%d-1</b> = <i>home</i>
insertPathExamples('d', pathElementCount, -1, -1, -1); insertPathExamples('p', 1, 1, -pathElementCount, 1); // <b>%p1</b> = <b>%p-4</b> = <i>/home/tom/photos/2010-10-31/</i>
// <b>%p1</b> = <b>%p-4</b> = <i>/home/tom/photos/2010-10-31/</i> insertPathExamples('P', 1, 1, -pathElementCount, 1); // <b>%P1</b> = <b>%P-4</b> = <i>2010-10-31/</i>
insertPathExamples('p', 1, 1, -pathElementCount, 1); {
// <b>%P1</b> = <b>%P-4</b> = <i>2010-10-31/</i> Glib::ustring fspecifier("%f");
insertPathExamples('P', 1, 1, -pathElementCount, 1); options.savePathTemplate = fspecifier;
auto result = BatchQueue::calcAutoFileNameBase(exampleFilePath);
pos = buffer->insert_markup(pos, Glib::ustring::format("\n<tt> <b>", fspecifier, "</b> = <i>", result, "</i></tt>"));
}
insertTopicHeading(M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE")); insertTopicHeading(M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE"));
pos = buffer->insert_markup(pos, M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_BODY")); pos = buffer->insert_markup(pos, M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_BODY"));