diff --git a/rtdata/languages/default b/rtdata/languages/default
index e5ce63a20..b089b69cb 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -2115,7 +2115,7 @@ QUEUE_LOCATION_TEMPLATE_HELP_PATHS_INTRO;The %dN, %d-N, %pN
QUEUE_LOCATION_TEMPLATE_HELP_PATHS_INTRO_WINDOWS;For Windows paths, %d-1 is the drive letter and colon, and %d-2 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_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_RESULT_MISMATCH;ERROR: 2nd result is different:
QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE;Rank
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index 991ff0239..1fa0b7169 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -406,11 +406,6 @@ void BatchQueuePanel::populateTemplateHelpBuffer(Glib::RefPtr b
// number of elements in the path.
auto insertPathExamples = [&buffer, &pos, pathElementCount, exampleFilePath](char letter, int offset1, int mult1, int offset2, int mult2)
{
- Glib::ustring startMonospace("");
- Glib::ustring endMonospace("");
- auto buildBuffer = Gtk::TextBuffer::create();
- auto buildpos = buildBuffer->begin();
- buildpos = buildBuffer->insert(buildpos, startMonospace);
for (int n=0; n b
auto result1 = BatchQueue::calcAutoFileNameBase(exampleFilePath);
options.savePathTemplate = path2;
auto result2 = BatchQueue::calcAutoFileNameBase(exampleFilePath);
- buildpos = buildBuffer->insert (buildpos, Glib::ustring::format("\n ", path1, " = ", path2, " = ", result1, ""));
+ pos = buffer->insert_markup(pos, Glib::ustring::format("\n ", path1, " = ", path2, " = ", result1, ""));
if (result1 != result2)
{
// If this error appears, it indicates a coding error in either BatchQueue::calcAutoFileNameBase
// 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.
- // %d4 = %d-1 = home
- insertPathExamples('d', pathElementCount, -1, -1, -1);
- // %p1 = %p-4 = /home/tom/photos/2010-10-31/
- insertPathExamples('p', 1, 1, -pathElementCount, 1);
- // %P1 = %P-4 = 2010-10-31/
- insertPathExamples('P', 1, 1, -pathElementCount, 1);
+ insertPathExamples('d', pathElementCount, -1, -1, -1); // %d4 = %d-1 = home
+ insertPathExamples('p', 1, 1, -pathElementCount, 1); // %p1 = %p-4 = /home/tom/photos/2010-10-31/
+ insertPathExamples('P', 1, 1, -pathElementCount, 1); // %P1 = %P-4 = 2010-10-31/
+ {
+ Glib::ustring fspecifier("%f");
+ options.savePathTemplate = fspecifier;
+ auto result = BatchQueue::calcAutoFileNameBase(exampleFilePath);
+ pos = buffer->insert_markup(pos, Glib::ustring::format("\n ", fspecifier, " = ", result, ""));
+ }
insertTopicHeading(M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_TITLE"));
pos = buffer->insert_markup(pos, M("QUEUE_LOCATION_TEMPLATE_HELP_RANK_BODY"));