Move bookmarks to xpfe/components.
This commit is contained in:
waterson%netscape.com
Родитель
d2c39c78d7
Коммит
62b6172eb6
|
|
@ -42,10 +42,6 @@
|
|||
#define NS_RDFINMEMORYDATASOURCE_CID \
|
||||
{ 0xbfd0526d, 0x834c, 0x11d2, { 0x8e, 0xac, 0x0, 0x80, 0x5f, 0x29, 0xf3, 0x70 } }
|
||||
|
||||
// {E638D760-8687-11d2-B530-000000000000}
|
||||
#define NS_RDFBOOKMARKDATASOURCE_CID \
|
||||
{ 0xe638d760, 0x8687, 0x11d2, { 0xb5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
|
||||
|
||||
// {E638D760-8687-11d2-B530-000000000001}
|
||||
#define NS_RDFFILESYSTEMDATASOURCE_CID \
|
||||
{ 0xe638d760, 0x8687, 0x11d2, { 0xb5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x01 } }
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
|||
|
||||
static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID);
|
||||
static NS_DEFINE_CID(kLocalStoreCID, NS_LOCALSTORE_CID);
|
||||
static NS_DEFINE_CID(kRDFBookmarkDataSourceCID, NS_RDFBOOKMARKDATASOURCE_CID);
|
||||
static NS_DEFINE_CID(kRDFCompositeDataSourceCID, NS_RDFCOMPOSITEDATASOURCE_CID);
|
||||
static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
|
||||
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
|
||||
|
|
@ -185,10 +184,6 @@ RDFFactoryImpl::CreateInstance(nsISupports *aOuter,
|
|||
if (NS_FAILED(rv = NS_NewRDFXMLDataSource((nsIRDFXMLDataSource**) &inst)))
|
||||
return rv;
|
||||
}
|
||||
else if (mClassID.Equals(kRDFBookmarkDataSourceCID)) {
|
||||
if (NS_FAILED(rv = NS_NewRDFBookmarkDataSource((nsIRDFDataSource**) &inst)))
|
||||
return rv;
|
||||
}
|
||||
else if (mClassID.Equals(kRDFFileSystemDataSourceCID)) {
|
||||
if (NS_FAILED(rv = NS_NewRDFFileSystemDataSource((nsIRDFDataSource**) &inst)))
|
||||
return rv;
|
||||
|
|
@ -358,11 +353,6 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
|
|||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// register our build-in datasources:
|
||||
rv = compMgr->RegisterComponent(kRDFBookmarkDataSourceCID,
|
||||
"Bookmarks",
|
||||
NS_RDF_DATASOURCE_PROGID_PREFIX "bookmarks",
|
||||
aPath, PR_TRUE, PR_TRUE);
|
||||
if (NS_FAILED(rv)) goto done;
|
||||
rv = compMgr->RegisterComponent(kRDFCompositeDataSourceCID,
|
||||
"RDF Composite Data Source",
|
||||
NS_RDF_DATASOURCE_PROGID_PREFIX "composite-datasource",
|
||||
|
|
@ -515,8 +505,6 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
|
|||
(nsISupports**)&compMgr);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
rv = compMgr->UnregisterComponent(kRDFBookmarkDataSourceCID, aPath);
|
||||
if (NS_FAILED(rv)) goto done;
|
||||
rv = compMgr->UnregisterComponent(kRDFFileSystemDataSourceCID,aPath);
|
||||
if (NS_FAILED(rv)) goto done;
|
||||
rv = compMgr->UnregisterComponent(kRDFSearchDataSourceCID,aPath);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
nsIBookmarkDataSource.h
|
||||
nsILocalStore.h
|
||||
nsIRDFFileSystem.h
|
||||
nsIRDFFind.h
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = rdf
|
||||
|
||||
EXPORTS = \
|
||||
nsIBookmarkDataSource.h \
|
||||
nsILocalStore.h \
|
||||
nsIRDFFileSystem.h \
|
||||
nsIRDFFind.h \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ MODULE=rdf
|
|||
DEPTH=..\..\..
|
||||
|
||||
EXPORTS = \
|
||||
nsIBookmarkDataSource.h \
|
||||
nsILocalStore.h \
|
||||
nsIRDFFileSystem.h \
|
||||
nsIRDFFind.h \
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ include $(topsrcdir)/config/config.mk
|
|||
LIBRARY_NAME = rdfdatasource_s
|
||||
|
||||
CPPSRCS = \
|
||||
nsBookmarkDataSource.cpp \
|
||||
nsLocalStore.cpp \
|
||||
nsFileSystemDataSource.cpp \
|
||||
nsFindDataSource.cpp \
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ LIBRARY_NAME=rdfdatasource_s
|
|||
LCFLAGS=-DMOZ_BRPROF
|
||||
|
||||
CPP_OBJS=\
|
||||
.\$(OBJDIR)\nsBookmarkDataSource.obj \
|
||||
.\$(OBJDIR)\nsFileSystemDataSource.obj \
|
||||
.\$(OBJDIR)\nsFindDataSource.obj \
|
||||
.\$(OBJDIR)\nsFTPDataSource.obj \
|
||||
|
|
|
|||
|
|
@ -32,10 +32,6 @@
|
|||
#include "nsError.h"
|
||||
|
||||
class nsIRDFDataSource;
|
||||
class nsIRDFDataBase;
|
||||
|
||||
// in nsBookmarkDataSource.cpp
|
||||
nsresult NS_NewRDFBookmarkDataSource(nsIRDFDataSource** result);
|
||||
|
||||
// in nsFileSystemDataSource.cpp
|
||||
nsresult NS_NewRDFFileSystemDataSource(nsIRDFDataSource** result);
|
||||
|
|
@ -49,9 +45,6 @@ nsresult NS_NewRDFFindDataSource(nsIRDFDataSource** result);
|
|||
// in nsFTPDataSource.cpp
|
||||
nsresult NS_NewRDFFTPDataSource(nsIRDFDataSource** result);
|
||||
|
||||
// in nsRelatedLinksDataSource.cpp
|
||||
nsresult NS_NewRDFRelatedLinksDataSource(nsIRDFDataSource **result);
|
||||
|
||||
#endif // nsBuiltinDataSources_h__
|
||||
|
||||
|
||||
|
|
|
|||
Двоичные данные
rdf/macbuild/rdf.mcp
Двоичные данные
rdf/macbuild/rdf.mcp
Двоичный файл не отображается.
|
|
@ -27,17 +27,8 @@ include $(topsrcdir)/config/config.mk
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
FILES = \
|
||||
bookmarks.html \
|
||||
history.css \
|
||||
history.xul \
|
||||
bm-panel.xul \
|
||||
bm-props.xul \
|
||||
bookmark-folder-closed.gif \
|
||||
bookmark-folder-open.gif \
|
||||
bookmark-item.gif \
|
||||
bookmarks.css \
|
||||
bookmarks.js \
|
||||
bookmarks.xul \
|
||||
document.gif \
|
||||
dom-test-1.css \
|
||||
dom-test-1.xul \
|
||||
|
|
@ -53,12 +44,9 @@ FILES = \
|
|||
flames.gif \
|
||||
folder-closed.gif \
|
||||
folder-open.gif \
|
||||
iefavorite.gif \
|
||||
ignore-test.xul \
|
||||
loading.gif \
|
||||
online.gif \
|
||||
personal-folder-closed.gif \
|
||||
personal-folder-open.gif \
|
||||
remote-flash-1.rdf \
|
||||
remote-flash-2.rdf \
|
||||
remote-flash-3.rdf \
|
||||
|
|
|
|||
|
|
@ -21,17 +21,8 @@ MODULE=rdf
|
|||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
FILES=\
|
||||
bookmarks.html \
|
||||
history.css \
|
||||
history.xul \
|
||||
bm-panel.xul \
|
||||
bm-props.xul \
|
||||
bookmark-folder-closed.gif \
|
||||
bookmark-folder-open.gif \
|
||||
bookmark-item.gif \
|
||||
bookmarks.css \
|
||||
bookmarks.js \
|
||||
bookmarks.xul \
|
||||
document.gif \
|
||||
dom-test-1.css \
|
||||
dom-test-1.xul \
|
||||
|
|
@ -47,12 +38,9 @@ FILES=\
|
|||
flames.gif \
|
||||
folder-closed.gif \
|
||||
folder-open.gif \
|
||||
iefavorite.gif \
|
||||
ignore-test.xul \
|
||||
loading.gif \
|
||||
online.gif \
|
||||
personal-folder-closed.gif \
|
||||
personal-folder-open.gif \
|
||||
remote-flash-1.rdf \
|
||||
remote-flash-2.rdf \
|
||||
remote-flash-3.rdf \
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
<RDF:li>
|
||||
<RDF:Description ID="bookmarks">
|
||||
<NC:title>&sidebar.bookmarks.label;</NC:title>
|
||||
<NC:content>resource://res/rdf/bm-panel.xul</NC:content>
|
||||
<NC:customize>resource://res/rdf/bm-panel-cust.xul</NC:customize>
|
||||
<NC:content>resource://res/samples/bm-panel.xul</NC:content>
|
||||
<NC:customize>resource://res/samples/bm-panel-cust.xul</NC:customize>
|
||||
</RDF:Description>
|
||||
</RDF:li>
|
||||
</RDF:Seq>
|
||||
|
|
|
|||
|
|
@ -75,34 +75,6 @@ treeitem[container="true"][open="true"][loading="true"] > treecell > titledbutto
|
|||
list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/bookmark-folder-closed.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/bookmark-folder-open.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/personal-folder-closed.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/personal-folder-open.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/bookmark-item.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/IEFavorite.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/bookmark-item.gif");
|
||||
}
|
||||
|
||||
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treecell > titledbutton {
|
||||
list-style-image: url("resource:/res/rdf/folder-open.gif");
|
||||
}
|
||||
|
|
@ -127,10 +99,6 @@ treeitem > treecell > titledbutton {
|
|||
list-style-image: url("resource:/res/rdf/document.gif");
|
||||
}
|
||||
|
||||
titledbutton#bookmarks {
|
||||
list-style-image:url("resource:/res/rdf/bookmark-item.gif");
|
||||
}
|
||||
|
||||
toolbar#sidebarbar titledbutton{
|
||||
color:#CCCCFF;
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче