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

Patch from [Beta], thanks!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13117 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-06-14 14:06:10 +00:00
parent aa486def43
commit 88e96a1483
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prefs/backgrounds/BGView.cpp
+6 -4
View File
@@ -164,7 +164,6 @@ BGView::BGView(BRect frame, const char *name, int32 resize, int32 flags)
new BMessage(DEFAULT_FOLDER))); new BMessage(DEFAULT_FOLDER)));
fWorkspaceMenu->AddItem(menuItem = new BMenuItem("Other folder" B_UTF8_ELLIPSIS, fWorkspaceMenu->AddItem(menuItem = new BMenuItem("Other folder" B_UTF8_ELLIPSIS,
new BMessage(OTHER_FOLDER))); new BMessage(OTHER_FOLDER)));
fWorkspaceMenu->AddSeparatorItem();
fImageMenu = new BPopUpMenu("pick one"); fImageMenu = new BPopUpMenu("pick one");
fImageMenu->AddItem(new BGImageMenuItem("None", -1, new BMessage(NONE_IMAGE))); fImageMenu->AddItem(new BGImageMenuItem("None", -1, new BMessage(NONE_IMAGE)));
@@ -254,13 +253,11 @@ BGView::AllAttached(void)
void void
BGView::MessageReceived(BMessage *msg) BGView::MessageReceived(BMessage *msg)
{ {
//printf("what : %li\n", msg->what);
switch(msg->what) switch(msg->what)
{ {
case B_SIMPLE_DATA: case B_SIMPLE_DATA:
case B_REFS_RECEIVED: case B_REFS_RECEIVED:
{ {
//printf("refs received\n");
RefsReceived(msg); RefsReceived(msg);
break; break;
} }
@@ -765,7 +762,10 @@ BGView::LoadSettings(void)
int32 index = 0; int32 index = 0;
while(fSettings.FindString("recentfolder", index, &string)==B_OK) while(fSettings.FindString("recentfolder", index, &string)==B_OK)
{ {
if (index == 0)
fWorkspaceMenu->AddSeparatorItem();
BPath path(string.String()); BPath path(string.String());
int32 i = AddPath(path); int32 i = AddPath(path);
BString s; BString s;
@@ -964,6 +964,8 @@ BGView::RefsReceived(BMessage *msg)
item = fWorkspaceMenu->ItemAt(index+6); item = fWorkspaceMenu->ItemAt(index+6);
fLastWorkspaceIndex = index+6; fLastWorkspaceIndex = index+6;
} else { } else {
if (fWorkspaceMenu->CountItems() <= 5)
fWorkspaceMenu->AddSeparatorItem();
BString s; BString s;
s << "Folder: " << path.Leaf(); s << "Folder: " << path.Leaf();
item = new BMenuItem(s.String(), new BMessage(FOLDER_SELECTED)); item = new BMenuItem(s.String(), new BMessage(FOLDER_SELECTED));