hit me baby one more time... (all fixed now. fingers crossed).

This commit is contained in:
ben%netscape.com 2001-05-09 11:18:45 +00:00
Родитель 0fcce03313
Коммит 5ab5837308
2 изменённых файлов: 21 добавлений и 16 удалений

Просмотреть файл

@ -34,7 +34,12 @@
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
<!DOCTYPE window [
<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
%utilDTD;
<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
%bmDTD;
]>
<window id="bookmark-window" windowtype="bookmarks:manager"
title="&bookmarksWindowTitle.label;"
@ -147,12 +152,22 @@
<menupopup>
<menuitem id="menu_undo" disabled="true"/>
<menuseparator/>
<menuitem id="menu_cut" command="cmd_bm_cut"/>
<menuitem id="menu_copy" command="cmd_bm_copy"/>
<menuitem id="menu_paste" command="cmd_bm_paste"/>
<menuitem id="menu_delete" command="cmd_bm_delete"/>
<menuitem id="menu_bm_cut"
label="&cutCmd.label;" accesskey="&cutCmd.accesskey;"
key="key_cut" command="cmd_bm_cut"/>
<menuitem id="menu_bm_copy"
label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
key="key_copy" command="cmd_bm_copy"/>
<menuitem id="menu_bm_paste"
label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"
key="key_paste" command="cmd_bm_paste"/>
<menuitem id="menu_bm_delete"
label="&deleteCmd.label;" accesskey="&deleteCmd.label;"
key="key_bm_delete" command="cmd_bm_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuitem id="menu_bm_selectAll"
label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
key="key_selectAll" command="cmd_bm_selectAll"/>
<menuseparator/>
<menuitem label="&command.fileBookmark.label;"
accesskey="&command.fileBookmark.accesskey;"

Просмотреть файл

@ -829,16 +829,6 @@ var BookmarksUtils = {
title = url;
}
const kPrefContractID = "@mozilla.org/preferences;1";
const kPrefIID = Components.interfaces.nsIPref;
const kPrefSvc = Components.classes[kPrefContractID].getService(kPrefIID);
try {
var temp = kPrefSvc.GetBoolPref("browser.bookmarks.add_without_dialog");
aShowDialog = !temp;
}
catch (e) {
}
this.addBookmark(url, title, docCharset, aShowDialog);
},