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

* Improved the Go menu by sorting items into sub-menus for each day, five days

Browse Source 
into the past, and the rest of them into "Earlier".
 * Moved the "Clear history" item to the top.

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@324 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2012-07-03 15:38:18 +02:00
committed by Alexandre Deckner
parent 2e8e305ebc
commit e405ff6af7
1 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BrowserWindow.cpp
+73 -10
View File
@@ -683,6 +683,16 @@ BrowserWindow::QuitRequested()
} }
static void
addOrDeleteMenu(BMenu* menu, BMenu* toMenu)
{
if (menu->CountItems() > 0)
toMenu->AddItem(menu);
else
delete menu;
}
void void
BrowserWindow::MenusBeginning() BrowserWindow::MenusBeginning()
{ {
@@ -695,25 +705,78 @@ BrowserWindow::MenusBeginning()
return; return;
int32 count = history->countItems(); int32 count = history->countItems();
BMenuItem* clearHistoryItem = new BMenuItem("Clear history",
new BMessage(CLEAR_HISTORY));
clearHistoryItem->SetEnabled(count > 0);
fGoMenu->AddItem(clearHistoryItem);
if (count == 0) {
history->Unlock();
return;
}
fGoMenu->AddSeparatorItem();
BDateTime todayStart = BDateTime::CurrentDateTime(B_LOCAL_TIME);
todayStart.SetTime(BTime(0, 0, 0));
BDateTime oneDayAgoStart = todayStart;
oneDayAgoStart.Date().AddDays(-1);
BDateTime twoDaysAgoStart = oneDayAgoStart;
twoDaysAgoStart.Date().AddDays(-1);
BDateTime threeDaysAgoStart = twoDaysAgoStart;
threeDaysAgoStart.Date().AddDays(-1);
BDateTime fourDaysAgoStart = threeDaysAgoStart;
fourDaysAgoStart.Date().AddDays(-1);
BDateTime fiveDaysAgoStart = fourDaysAgoStart;
fiveDaysAgoStart.Date().AddDays(-1);
BMenu* todayMenu = new BMenu("Today");
BMenu* yesterdayMenu = new BMenu("Yesterday");
BMenu* twoDaysAgoMenu = new BMenu(
twoDaysAgoStart.Date().LongDayName().String());
BMenu* threeDaysAgoMenu = new BMenu(
threeDaysAgoStart.Date().LongDayName().String());
BMenu* fourDaysAgoMenu = new BMenu(
fourDaysAgoStart.Date().LongDayName().String());
BMenu* fiveDaysAgoMenu = new BMenu(
fiveDaysAgoStart.Date().LongDayName().String());
BMenu* earlierMenu = new BMenu("Earlier");
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
BrowsingHistoryItem historyItem = history->historyItemAt(i); BrowsingHistoryItem historyItem = history->historyItemAt(i);
BMessage* message = new BMessage(GOTO_URL); BMessage* message = new BMessage(GOTO_URL);
message->AddString("url", historyItem.url().String()); message->AddString("url", historyItem.url().String());
// TODO: More sophisticated menu structure... sorted by days/weeks...
BString truncatedUrl(historyItem.url()); BString truncatedUrl(historyItem.url());
be_plain_font->TruncateString(&truncatedUrl, B_TRUNCATE_END, 480); be_plain_font->TruncateString(&truncatedUrl, B_TRUNCATE_END, 480);
menuItem = new BMenuItem(truncatedUrl, message); menuItem = new BMenuItem(truncatedUrl, message);
fGoMenu->AddItem(menuItem);
if (historyItem.dateTime() < fiveDaysAgoStart)
earlierMenu->AddItem(menuItem);
else if (historyItem.dateTime() < fourDaysAgoStart)
fiveDaysAgoMenu->AddItem(menuItem);
else if (historyItem.dateTime() < threeDaysAgoStart)
fourDaysAgoMenu->AddItem(menuItem);
else if (historyItem.dateTime() < twoDaysAgoStart)
threeDaysAgoMenu->AddItem(menuItem);
else if (historyItem.dateTime() < oneDayAgoStart)
twoDaysAgoMenu->AddItem(menuItem);
else if (historyItem.dateTime() < todayStart)
yesterdayMenu->AddItem(menuItem);
else
todayMenu->AddItem(menuItem);
} }
if (fGoMenu->CountItems() > 3) {
fGoMenu->AddSeparatorItem();
fGoMenu->AddItem(new BMenuItem("Clear history",
new BMessage(CLEAR_HISTORY)));
}
history->Unlock(); history->Unlock();
addOrDeleteMenu(todayMenu, fGoMenu);
addOrDeleteMenu(yesterdayMenu, fGoMenu);
addOrDeleteMenu(twoDaysAgoMenu, fGoMenu);
addOrDeleteMenu(fourDaysAgoMenu, fGoMenu);
addOrDeleteMenu(fiveDaysAgoMenu, fGoMenu);
addOrDeleteMenu(earlierMenu, fGoMenu);
} }