Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regressions introduced in hrev 50503

Browse Source 
- Missing "dontAsk" when renaming some files,
- Missing exceptions in the warning alert construction to automatically
  allow modifying some files (anything inside the settings folder)
- Missing translations

Fixes #12925.
This commit is contained in:
Adrien Destugues 2016-08-24 07:21:47 +02:00
parent c2507fb82b
commit 5298c29729
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kits/tracker/FSUtils.cpp
View File

@ -707,19 +707,20 @@ ConfirmChangeIfWellKnownDirectory(const BEntry* entry, DestructiveAction action,
B_USER_SETTINGS_DIRECTORY)
|| DirectoryMatchesOrContains(entry, "beos_mime",
B_SYSTEM_SETTINGS_DIRECTORY)) {
warning.ReplaceFirst("%target", "the MIME settings");
warning.ReplaceFirst("%target", B_TRANSLATE("the MIME settings"));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
warning.ReplaceFirst("%target", "the config folder");
warning.ReplaceFirst("%target", B_TRANSLATE("the config folder"));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
|| DirectoryMatches(entry, B_SYSTEM_SETTINGS_DIRECTORY)) {
warning.ReplaceFirst("%target", "the settings folder");
warning.ReplaceFirst("%target", B_TRANSLATE("the settings folder"));
requireOverride = false;
} else {
// It was not a special directory/file after all. Allow renaming.
return true;
}
}
if (!warning.Length())
} else
return true;
if (dontAsk)

2
src/kits/tracker/InfoWindow.cpp
View File

@ -1239,7 +1239,7 @@ AttributeView::MouseDown(BPoint where)
fTrackingState = path_track;
} else if (fTitleRect.Contains(where)) {
if (!fModel->HasLocalizedName()
&& ConfirmChangeIfWellKnownDirectory(&entry, kRename)) {
&& ConfirmChangeIfWellKnownDirectory(&entry, kRename, true)) {
BeginEditingTitle();
}
} else if (fTitleEditView) {