i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shortcuts: Automatic whitespace cleanup.

Browse Source
This commit is contained in:
Rene Gollent
2015-01-23 22:18:25 -05:00
parent d13b9014e8
commit d229773736
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/shortcuts/ShortcutsWindow.cpp
+10 -10
View File
@@ -295,9 +295,9 @@ ShortcutsWindow::QuitRequested()
// up the file requester // up the file requester
if (fLastSaved.InitCheck() == B_OK) { if (fLastSaved.InitCheck() == B_OK) {
if (_SaveKeySet(fLastSaved) == false) { if (_SaveKeySet(fLastSaved) == false) {
BAlert* alert = new BAlert(ERROR, BAlert* alert = new BAlert(ERROR,
B_TRANSLATE("Shortcuts was unable to save your " B_TRANSLATE("Shortcuts was unable to save your "
"KeySet file!"), "KeySet file!"),
B_TRANSLATE("Oh no")); B_TRANSLATE("Oh no"));
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
alert->Go(); alert->Go();
@@ -332,7 +332,7 @@ ShortcutsWindow::_GetSettingsFile(entry_ref* eref)
BPath path; BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK) if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
return false; return false;
else else
path.Append(SHORTCUTS_SETTING_FILE_NAME); path.Append(SHORTCUTS_SETTING_FILE_NAME);
if (BEntry(path.Path(), true).GetRef(eref) == B_OK) if (BEntry(path.Path(), true).GetRef(eref) == B_OK)
@@ -371,7 +371,7 @@ ShortcutsWindow::_SaveKeySet(BEntry& saveEntry)
} }
// Appends new entries from the file specified in the "spec" entry of // Appends new entries from the file specified in the "spec" entry of
// (loadMessage). Returns true iff successful. // (loadMessage). Returns true iff successful.
bool bool
ShortcutsWindow::_LoadKeySet(const BMessage& loadMessage) ShortcutsWindow::_LoadKeySet(const BMessage& loadMessage)
@@ -495,7 +495,7 @@ ShortcutsWindow::MessageReceived(BMessage* message)
0, false); 0, false);
fOpenPanel->Show(); fOpenPanel->Show();
} }
fOpenPanel->SetButtonLabel(B_DEFAULT_BUTTON, fLastOpenWasAppend ? fOpenPanel->SetButtonLabel(B_DEFAULT_BUTTON, fLastOpenWasAppend ?
B_TRANSLATE("Append") : B_TRANSLATE("Open")); B_TRANSLATE("Append") : B_TRANSLATE("Open"));
break; break;
@@ -545,14 +545,14 @@ ShortcutsWindow::MessageReceived(BMessage* message)
BMessage fileMsg; BMessage fileMsg;
{ {
BFile file(&ref, B_READ_ONLY); BFile file(&ref, B_READ_ONLY);
if ((file.InitCheck() != B_OK) if ((file.InitCheck() != B_OK)
|| (fileMsg.Unflatten(&file) != B_OK)) { || (fileMsg.Unflatten(&file) != B_OK)) {
if (isStartMsg) { if (isStartMsg) {
// use this to save to anyway // use this to save to anyway
fLastSaved = BEntry(&ref); fLastSaved = BEntry(&ref);
break; break;
} else { } else {
BAlert* alert = new BAlert(ERROR, BAlert* alert = new BAlert(ERROR,
B_TRANSLATE("Shortcuts was couldn't open your " B_TRANSLATE("Shortcuts was couldn't open your "
"KeySet file!"), B_TRANSLATE("OK")); "KeySet file!"), B_TRANSLATE("OK"));
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
@@ -582,7 +582,7 @@ ShortcutsWindow::MessageReceived(BMessage* message)
_GetSettingsFile(&eref); _GetSettingsFile(&eref);
if (ref == eref) fKeySetModified = false; if (ref == eref) fKeySetModified = false;
} else { } else {
BAlert* alert = new BAlert(ERROR, BAlert* alert = new BAlert(ERROR,
B_TRANSLATE("Shortcuts was unable to parse your " B_TRANSLATE("Shortcuts was unable to parse your "
"KeySet file!"), B_TRANSLATE("OK")); "KeySet file!"), B_TRANSLATE("OK"));
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
@@ -637,7 +637,7 @@ ShortcutsWindow::MessageReceived(BMessage* message)
if (showSaveError) { if (showSaveError) {
BAlert* alert = new BAlert(ERROR, BAlert* alert = new BAlert(ERROR,
B_TRANSLATE("Shortcuts wasn't able to save your keyset."), B_TRANSLATE("Shortcuts wasn't able to save your keyset."),
B_TRANSLATE("OK")); B_TRANSLATE("OK"));
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
alert->Go(NULL); alert->Go(NULL);
@@ -673,7 +673,7 @@ ShortcutsWindow::MessageReceived(BMessage* message)
_MarkKeySetModified(); _MarkKeySetModified();
// Rules for new selection: If there is an item at (index), // Rules for new selection: If there is an item at (index),
// select it. Otherwise, if there is an item at (index-1), // select it. Otherwise, if there is an item at (index-1),
// select it. Otherwise, select nothing. // select it. Otherwise, select nothing.
int num = fColumnListView->CountRows(); int num = fColumnListView->CountRows();
if (num > 0) { if (num > 0) {