Fix regressions introduced in hrev 50503
- 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:
@@ -707,19 +707,20 @@ ConfirmChangeIfWellKnownDirectory(const BEntry* entry, DestructiveAction action,
|
|||||||
B_USER_SETTINGS_DIRECTORY)
|
B_USER_SETTINGS_DIRECTORY)
|
||||||
|| DirectoryMatchesOrContains(entry, "beos_mime",
|
|| DirectoryMatchesOrContains(entry, "beos_mime",
|
||||||
B_SYSTEM_SETTINGS_DIRECTORY)) {
|
B_SYSTEM_SETTINGS_DIRECTORY)) {
|
||||||
warning.ReplaceFirst("%target", "the MIME settings");
|
warning.ReplaceFirst("%target", B_TRANSLATE("the MIME settings"));
|
||||||
requireOverride = false;
|
requireOverride = false;
|
||||||
} else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
|
} else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
|
||||||
warning.ReplaceFirst("%target", "the config folder");
|
warning.ReplaceFirst("%target", B_TRANSLATE("the config folder"));
|
||||||
requireOverride = false;
|
requireOverride = false;
|
||||||
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
|
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
|
||||||
|| DirectoryMatches(entry, B_SYSTEM_SETTINGS_DIRECTORY)) {
|
|| DirectoryMatches(entry, B_SYSTEM_SETTINGS_DIRECTORY)) {
|
||||||
warning.ReplaceFirst("%target", "the settings folder");
|
warning.ReplaceFirst("%target", B_TRANSLATE("the settings folder"));
|
||||||
requireOverride = false;
|
requireOverride = false;
|
||||||
|
} else {
|
||||||
|
// It was not a special directory/file after all. Allow renaming.
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else
|
||||||
|
|
||||||
if (!warning.Length())
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (dontAsk)
|
if (dontAsk)
|
||||||
|
|||||||
@@ -1239,7 +1239,7 @@ AttributeView::MouseDown(BPoint where)
|
|||||||
fTrackingState = path_track;
|
fTrackingState = path_track;
|
||||||
} else if (fTitleRect.Contains(where)) {
|
} else if (fTitleRect.Contains(where)) {
|
||||||
if (!fModel->HasLocalizedName()
|
if (!fModel->HasLocalizedName()
|
||||||
&& ConfirmChangeIfWellKnownDirectory(&entry, kRename)) {
|
&& ConfirmChangeIfWellKnownDirectory(&entry, kRename, true)) {
|
||||||
BeginEditingTitle();
|
BeginEditingTitle();
|
||||||
}
|
}
|
||||||
} else if (fTitleEditView) {
|
} else if (fTitleEditView) {
|
||||||
|
|||||||
Reference in New Issue
Block a user