mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add new day -> site history view.

This commit is contained in:
blakeross%telocity.com 2002-10-13 01:08:43 +00:00
Родитель 8210f7a2e2
Коммит f9ed83c04e
5 изменённых файлов: 58 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
browser/components/history/content/history-panel.xul
Просмотреть файл

@ -83,10 +83,14 @@
callback="searchHistory(gSearchBox.value);"/>
<toolbarbutton id="viewButton" type="menu" label="&view.label;" selectedsort="day" persist="selectedsort">
<menupopup>
<menuitem id="byday" label="&byDate.label;" accesskey="&byDate.accesskey;" type="radio"
oncommand="this.parentNode.parentNode.setAttribute('selectedsort', 'day'); GroupBy('day');"/>
<menuitem id="bydayandsite" label="&byDayAndSite.label;" accesskey="&byDayAndSite.accesskey;" type="radio"
oncommand="this.parentNode.parentNode.setAttribute('selectedsort', 'dayandsite'); GroupBy('dayandsite'); SortBy('dayandsite');"/>
<menuitem id="bysite" label="&bySite.label;" accesskey="&bySite.accesskey;" type="radio"
oncommand="this.parentNode.parentNode.setAttribute('selectedsort', 'site'); GroupBy('none'); SortBy('name');"/>
<menuitem id="byday" label="&byDate.label;" accesskey="&byDate.accesskey;"
type="radio"
oncommand="this.parentNode.parentNode.setAttribute('selectedsort', 'day');
GroupBy('day'); SortBy('day');"/>
<menuitem id="byvisited" label="&byMostVisited.label;" accesskey="&byMostVisited.accesskey;"
type="radio"
oncommand="this.parentNode.parentNode.setAttribute('selectedsort', 'visited');

18
browser/components/history/content/history.js
Просмотреть файл

@ -65,6 +65,8 @@ function HistoryCommonInit()
document.getElementById("byvisited").setAttribute("checked", "true");
else if (mode == "lastvisited")
document.getElementById("bylastvisited").setAttribute("checked", "true");
else if (mode == "dayandsite")
document.getElementById("bydayandsite").setAttribute("checked", "true");
else
document.getElementById("byday").setAttribute("checked", "true");
gHistoryTree.focus();
@ -78,7 +80,7 @@ function historyOnSelect()
gLastDomain = "";
var match;
var currentIndex = gHistoryTree.currentIndex;
var rowIsContainer = gHistoryGrouping == "day" ? isContainer(gHistoryTree, currentIndex) : false;
var rowIsContainer = (gHistoryGrouping == "day" || gHistoryGrouping == "dayandsite") ? isContainer(gHistoryTree, currentIndex) : false;
var url = gHistoryTree.builder.QueryInterface(Components.interfaces.nsIXULTreeBuilder).getResourceAtIndex(currentIndex).Value;
if (url && !rowIsContainer) {
@ -250,6 +252,9 @@ function GroupBy(groupingType)
// xxx for now
gHistoryTree.setAttribute("ref", "NC:HistoryByDate");
break;
case "dayandsite":
gHistoryTree.setAttribute("ref", "NC:HistoryByDateAndSite");
break;
case "day":
default:
gHistoryTree.setAttribute("ref", "NC:HistoryByDate");
@ -257,17 +262,6 @@ function GroupBy(groupingType)
}
}
var groupObserver = {
observe: function(aPrefBranch, aTopic, aPrefName) {
try {
gHistoryGrouping = aPrefBranch.QueryInterface(Components.interfaces.nsIPrefBranch).getCharPref(aPrefName);
GroupBy(gHistoryGrouping);
}
catch(ex) {
}
}
}
function historyAddBookmarks()
{
var count = gHistoryTree.treeBoxObject.view.selection.count;

4
browser/components/history/locale/history.dtd
Просмотреть файл

@ -57,4 +57,6 @@
<!ENTITY byMostVisited.label "By Most Visited">
<!ENTITY byMostVisited.accesskey "V">
<!ENTITY byLastVisited.label "By Last Visited">
<!ENTITY byLastVisited.accesskey "L">
<!ENTITY byLastVisited.accesskey "L">
<!ENTITY byDayAndSite.label "By Date and Site">
<!ENTITY byDayAndSite.accesskey "t">

47
toolkit/components/history/src/nsGlobalHistory.cpp
Просмотреть файл

@ -101,6 +101,7 @@ nsIRDFResource* nsGlobalHistory::kNC_Referrer;
nsIRDFResource* nsGlobalHistory::kNC_child;
nsIRDFResource* nsGlobalHistory::kNC_URL;
nsIRDFResource* nsGlobalHistory::kNC_HistoryRoot;
nsIRDFResource* nsGlobalHistory::kNC_HistoryByDateAndSite;
nsIRDFResource* nsGlobalHistory::kNC_HistoryByDate;
nsIMdbFactory* nsGlobalHistory::gMdbFactory = nsnull;
nsIPrefBranch* nsGlobalHistory::gPrefBranch = nsnull;
@ -559,6 +560,7 @@ nsGlobalHistory::~nsGlobalHistory()
NS_IF_RELEASE(kNC_child);
NS_IF_RELEASE(kNC_URL);
NS_IF_RELEASE(kNC_HistoryRoot);
NS_IF_RELEASE(kNC_HistoryByDateAndSite);
NS_IF_RELEASE(kNC_HistoryByDate);
NS_IF_RELEASE(gMdbFactory);
@ -1502,6 +1504,7 @@ nsGlobalHistory::GetTarget(nsIRDFResource* aSource,
// matching row?
if (aProperty == kNC_child &&
(aSource == kNC_HistoryRoot ||
aSource == kNC_HistoryByDateAndSite ||
aSource == kNC_HistoryByDate ||
IsFindResource(aSource))) {
@ -1785,10 +1788,15 @@ nsGlobalHistory::GetTargets(nsIRDFResource* aSource,
NS_ADDREF(*aTargets);
return NS_OK;
}
else if ((aSource == kNC_HistoryByDateAndSite) &&
(aProperty == kNC_child)) {
return GetRootDayQueries(aTargets, PR_TRUE);
}
else if ((aSource == kNC_HistoryByDate) &&
(aProperty == kNC_child)) {
return GetRootDayQueries(aTargets);
return GetRootDayQueries(aTargets, PR_FALSE);
}
else if (aProperty == kNC_child &&
IsFindResource(aSource)) {
@ -1836,7 +1844,8 @@ nsGlobalHistory::Unassert(nsIRDFResource* aSource,
{
// translate into an appropriate removehistory call
nsresult rv;
if ((aSource == kNC_HistoryRoot || aSource == kNC_HistoryByDate || IsFindResource(aSource)) &&
if ((aSource == kNC_HistoryRoot || aSource == kNC_HistoryByDateAndSite || aSource == kNC_HistoryByDate
|| IsFindResource(aSource)) &&
aProperty == kNC_child) {
nsCOMPtr<nsIRDFResource> resource = do_QueryInterface(aTarget, &rv);
@ -2052,6 +2061,7 @@ nsGlobalHistory::HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, PRBool
return NS_ERROR_NULL_POINTER;
if ((aSource == kNC_HistoryRoot) ||
(aSource == kNC_HistoryByDateAndSite) ||
(aSource == kNC_HistoryByDate)) {
*result = (aArc == kNC_child);
}
@ -2105,6 +2115,7 @@ nsGlobalHistory::ArcLabelsOut(nsIRDFResource* aSource,
nsresult rv;
if ((aSource == kNC_HistoryRoot) ||
(aSource == kNC_HistoryByDateAndSite) ||
(aSource == kNC_HistoryByDate)) {
return NS_NewSingletonEnumerator(aLabels, kNC_child);
}
@ -2337,6 +2348,7 @@ nsGlobalHistory::Init()
gRDFService->GetResource(NC_NAMESPACE_URI "child", &kNC_child);
gRDFService->GetResource(NC_NAMESPACE_URI "URL", &kNC_URL);
gRDFService->GetResource("NC:HistoryRoot", &kNC_HistoryRoot);
gRDFService->GetResource("NC:HistoryByDateAndSite", &kNC_HistoryByDateAndSite);
gRDFService->GetResource("NC:HistoryByDate", &kNC_HistoryByDate);
}
@ -2954,7 +2966,7 @@ nsGlobalHistory::NotifyChange(nsIRDFResource* aSource,
// only returns queries that currently have matches in global history
//
nsresult
nsGlobalHistory::GetRootDayQueries(nsISimpleEnumerator **aResult)
nsGlobalHistory::GetRootDayQueries(nsISimpleEnumerator **aResult, PRBool aBySite)
{
nsresult rv;
nsCOMPtr<nsISupportsArray> dayArray;
@ -2970,7 +2982,8 @@ nsGlobalHistory::GetRootDayQueries(nsISimpleEnumerator **aResult)
for (i=0; i<7; i++) {
uri = prefix;
uri.AppendInt(i);
uri.Append("&groupby=Hostname");
if (aBySite)
uri.Append("&groupby=Hostname");
rv = gRDFService->GetResource(uri.get(), getter_AddRefs(finduri));
if (NS_FAILED(rv)) continue;
rv = CreateFindEnumerator(finduri, getter_AddRefs(findEnumerator));
@ -2982,7 +2995,8 @@ nsGlobalHistory::GetRootDayQueries(nsISimpleEnumerator **aResult)
uri = FIND_BY_AGEINDAYS_PREFIX "isgreater" "&text=";
uri.AppendInt(i-1);
uri.Append("&groupby=Hostname");
if (aBySite)
uri.Append("&groupby=Hostname");
rv = gRDFService->GetResource(uri.get(), getter_AddRefs(finduri));
if (NS_SUCCEEDED(rv)) {
rv = CreateFindEnumerator(finduri, getter_AddRefs(findEnumerator));
@ -3252,10 +3266,29 @@ nsGlobalHistory::NotifyFindAssertions(nsIRDFResource *aSource,
GetFindUriPrefix(query, PR_TRUE, findUri);
gRDFService->GetResource(findUri.get(), getter_AddRefs(childFindResource));
NotifyAssert(kNC_HistoryByDate, kNC_child, childFindResource);
NotifyAssert(kNC_HistoryByDateAndSite, kNC_child, childFindResource);
query.terms.Clear();
query.groupBy = 0;
query.terms.AppendElement((void *)&ageterm);
GetFindUriPrefix(query, PR_TRUE, findUri);
gRDFService->GetResource(findUri.get(), getter_AddRefs(childFindResource));
NotifyAssert(kNC_HistoryByDate, kNC_child, childFindResource);
query.terms.Clear();
query.groupBy = 0;
query.terms.AppendElement((void *)&ageterm);
GetFindUriPrefix(query, PR_TRUE, findUri);
gRDFService->GetResource(findUri.get(), getter_AddRefs(childFindResource));
NotifyAssert(childFindResource, kNC_child, aSource);
query.terms.Clear();
// 3) AgeInDays=<age>&groupby=Hostname ->
// AgeInDays=<age>&Hostname=<host>
@ -3357,6 +3390,8 @@ nsGlobalHistory::NotifyFindUnassertions(nsIRDFResource *aSource,
gRDFService->GetResource(findUri.get(), getter_AddRefs(findResource));
NotifyUnassert(findResource, kNC_child, aSource);
query.terms.Clear();
return NS_OK;
}

3
toolkit/components/history/src/nsGlobalHistory.h
Просмотреть файл

@ -189,7 +189,7 @@ protected:
//
// search stuff - find URL stuff, etc
//
nsresult GetRootDayQueries(nsISimpleEnumerator **aResult);
nsresult GetRootDayQueries(nsISimpleEnumerator **aResult, PRBool aBySite);
nsresult GetFindUriName(const char *aURL, nsIRDFNode **aResult);
nsresult CreateFindEnumerator(nsIRDFResource *aSource,
nsISimpleEnumerator **aResult);
@ -351,6 +351,7 @@ protected:
static nsIRDFResource* kNC_URL; // XXX do we need?
static nsIRDFResource* kNC_HistoryRoot;
static nsIRDFResource* kNC_HistoryByDate;
static nsIRDFResource* kNC_HistoryByDateAndSite;
static nsIMdbFactory* gMdbFactory;
static nsIPrefBranch* gPrefBranch;