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

Factor out an _SaveSettings() call to write back settings. Use it to commit tray item changes immediately instead of at Deskbar exit. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43009 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2011-10-30 18:28:22 +00:00
parent d64437e6a9
commit 7625ce5150
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/apps/deskbar/StatusView.cpp
View File

@ -439,14 +439,7 @@ TReplicantTray::InitAddOnSupport()
void
TReplicantTray::DeleteAddOnSupport()
{
BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, true) == B_OK) {
path.Append(kReplicantSettingsFile);
BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE);
if (file.InitCheck() == B_OK)
fAddOnSettings.Flatten(&file);
}
_SaveSettings();
for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->RemoveItem(i);
@ -625,9 +618,8 @@ TReplicantTray::LoadAddOn(BEntry* entry, int32* id, bool addToSettings)
// add the rep; adds info to list
if (addToSettings) {
entry_ref ref;
if (entry->GetRef(&ref) == B_OK)
fAddOnSettings.AddString(kReplicantPathField, path.Path());
fAddOnSettings.AddString(kReplicantPathField, path.Path());
_SaveSettings();
}
return B_OK;
@ -697,6 +689,18 @@ TReplicantTray::RemoveItem(int32 id)
// attribute was added via Deskbar API (AddItem(entry_ref*, int32*)
if (item->isAddOn) {
BPath path(&item->entryRef);
BString storedPath;
for (int32 i = 0;
fAddOnSettings->FindString(kReplicantPathField, i, &storedPath)
== B_OK; i++) {
if (storedPath == path.Path()) {
fAddOnSettings->RemoveItem(kReplicantPathField, i);
break;
}
}
_SaveSettings();
BNode node(&item->entryRef);
watch_node(&item->nodeRef, B_STOP_WATCHING, this, Window());
}
@ -1198,6 +1202,24 @@ TReplicantTray::SetMultiRow(bool state)
}
void
TReplicantTray::_SaveSettings()
{
status_t result;
BPath path;
if ((result = find_directory(B_USER_SETTINGS_DIRECTORY, &path, true))
== B_OK) {
path.Append(kReplicantSettingsFile);
BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE);
if ((result = file.InitCheck()) == B_OK)
result = fAddOnSettings.Flatten(&file);
}
return result;
}
// #pragma mark -

2
src/apps/deskbar/StatusView.h
View File

@ -199,6 +199,8 @@ public:
bool IsDragging() {return IsTracking();}
private:
status_t _SaveSettings();
TBarView* fBarView;
BView* fChild;
BPoint fPreviousPosition;