commit 62c4365e94698bdcc17e4511e0472eaf6b1f85a5
parent e4564ce976e4e06adcd24bf80885e13cbb45aa34
Author: cfillion <cfillion@users.noreply.github.com>
Date: Wed, 13 Sep 2017 22:09:54 -0700
use LF instead of CRLF for MessageBox'es
the only remaining CRLF are for SetWindowText, which requires them
Diffstat:
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/about.cpp b/src/about.cpp
@@ -475,7 +475,7 @@ void AboutIndexDelegate::install()
&& !installOpts.autoInstall) {
const int btn = Win32::messageBox(m_dialog->handle(),
"Do you want ReaPack to install new packages from this repository"
- " when synchronizing in the future?\r\n\r\nThis setting can also be"
+ " when synchronizing in the future?\n\nThis setting can also be"
" customized globally or on a per-repository basis in"
" ReaPack > Manage repositories.",
"Install all packages in this repository", MB_YESNOCANCEL);
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -404,7 +404,7 @@ void Browser::refresh(const bool stale)
if(!isVisible() || stale) {
show();
- Win32::messageBox(handle(), "No repository enabled!\r\n"
+ Win32::messageBox(handle(), "No repository enabled!\n"
"Enable or import repositories from Extensions > ReaPack > Manage repositories.",
"Browse packages", MB_OK);
}
@@ -466,9 +466,9 @@ void Browser::populate(const vector<IndexPtr> &indexes)
catch(const reapack_error &e) {
char msg[255];
snprintf(msg, sizeof(msg),
- "ReaPack could not read from the local package registry.\r\n"
- "Retry later once all installation task are completed.\r\n"
- "\r\nError description: %s", e.what());
+ "ReaPack could not read from the local package registry.\n"
+ "Retry later once all installation task are completed.\n\n"
+ "Error description: %s", e.what());
Win32::messageBox(handle(), msg, "ReaPack", MB_OK);
}
@@ -614,10 +614,10 @@ void Browser::installLatestAll()
const bool isEverything = (size_t)m_list->selectionSize() == m_entries.size();
if(isEverything && !installOpts.autoInstall) {
- const int btn = Win32::messageBox(handle(), "Do you want ReaPack to install new packages"
- " automatically when synchronizing in the future?\r\n\r\nThis setting"
- " can also be customized globally or on a per-repository basis in"
- " ReaPack > Manage repositories.",
+ const int btn = Win32::messageBox(handle(), "Do you want ReaPack to install"
+ " new packages automatically when synchronizing in the future?\n\nThis"
+ " setting can also be customized globally or on a per-repository basis"
+ " in ReaPack > Manage repositories.",
"Install every available packages", MB_YESNOCANCEL);
switch(btn) {
@@ -796,7 +796,7 @@ bool Browser::confirm() const
char msg[255];
snprintf(msg, sizeof(msg),
- "Are you sure to uninstall %zu package%s?\r\nThe files and settings will"
+ "Are you sure to uninstall %zu package%s?\nThe files and settings will"
" be permanently deleted from this computer.",
count, count == 1 ? "" : "s");
diff --git a/src/import.cpp b/src/import.cpp
@@ -141,7 +141,7 @@ void Import::fetch()
break;
case ThreadTask::Failure: {
char msg[1024];
- snprintf(msg, sizeof(msg), "Download failed: %s\r\n%s",
+ snprintf(msg, sizeof(msg), "Download failed: %s\n%s",
dl->error().message.c_str(), url.c_str());
Win32::messageBox(handle(), msg, TITLE, MB_OK);
m_pool->abort();
@@ -180,9 +180,8 @@ bool Import::read(MemoryDownload *dl, const size_t idx)
}
else {
snprintf(msg, sizeof(msg),
- "%s is already configured with a different URL.\r\n"
- "Do you want to overwrite it?",
- index->name().c_str());
+ "%s is already configured with a different URL.\n"
+ "Do you want to overwrite it?", index->name().c_str());
const auto answer = Win32::messageBox(handle(), msg, TITLE, MB_YESNO);
@@ -200,7 +199,7 @@ bool Import::read(MemoryDownload *dl, const size_t idx)
return true;
}
catch(const reapack_error &e) {
- snprintf(msg, sizeof(msg), "The received file is invalid: %s\r\n%s",
+ snprintf(msg, sizeof(msg), "The received file is invalid: %s\n%s",
e.what(), dl->url().c_str());
Win32::messageBox(handle(), msg, TITLE, MB_OK);
return false;
diff --git a/src/main.cpp b/src/main.cpp
@@ -53,7 +53,7 @@ static bool loadAPI(void *(*getFunc)(const char *))
if(func.required && *func.ptr == nullptr) {
char msg[1024];
snprintf(msg, sizeof(msg),
- "ReaPack v%s is incompatible with this version of REAPER.\r\n\r\n"
+ "ReaPack v%s is incompatible with this version of REAPER.\n\n"
"(Unable to import the following API function: %s)",
ReaPack::VERSION, func.name);
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -527,7 +527,7 @@ void Manager::importArchive()
}
catch(const reapack_error &e) {
char msg[512];
- snprintf(msg, sizeof(msg), "An error occured while reading %s.\r\n\r\n%s.",
+ snprintf(msg, sizeof(msg), "An error occured while reading %s.\n\n%s.",
path.c_str(), e.what());
Win32::messageBox(handle(), msg, title, MB_OK);
}
diff --git a/src/report.cpp b/src/report.cpp
@@ -63,7 +63,7 @@ void Report::onTimer(int timer)
stopTimer(timer);
Win32::messageBox(handle(),
- "One or more native REAPER extensions were installed.\r\n"
+ "One or more native REAPER extensions were installed.\n"
"These newly installed files won't be loaded until REAPER is restarted.",
"ReaPack Notice", MB_OK);
}