New dialog - not used yet

editor/ui/dialogs/content/EditConflict.js

@@ -0,0 +1,53 @@
+/* 
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ */
+
+// dialog initialization code
+function Startup()
+{
+  if (!InitEditorShell())
+    return;
+  
+  //doSetOkCancel(null,PreventCancel);
+}
+
+function KeepCurrentPage()
+{
+dump("KeepCurrentPage\n");
+  // Simple close dialog and don't change current page
+  //TODO: Should we force saving of the current page?
+  window.close();
+}
+
+function UseOtherPage()
+{
+dump("UseOtherPage\n");
+  // Reload the URL -- that will get other editor's contents
+  //editorShell.LoadUrl(editorShell.editorDocument.location);
+  setTimeout("editorShell.LoadUrl(editorShell.editorDocument.location)", 10);
+  window.close();
+}
+
+function PreventCancel()
+{
+  // Don't let Esc key close the dialog!
+  return false;
+}

editor/ui/dialogs/content/EditConflict.xul

@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
+<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+
+<!DOCTYPE window SYSTEM "chrome://editor/locale/EditConflict.dtd">
+
+<window class="dialog" title="&windowTitle.label;"
+	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	 xmlns:html="http://www.w3.org/TR/REC-html40"
+   onload = "Startup()"
+   orient="vertical">
+
+  <!-- Methods common to all editor dialogs -->
+  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script language="JavaScript" src="chrome://editor/content/EditConflict.js"/>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+
+  <keyset id="keyset"/>
+  <popupset id="aTooltipSet" />
+  
+  <text class="label" value ="&conflictWarning.label;"/>
+  <spring class="bigspacer"/>
+  <text class="label" value ="&conflictResolve.label;"/>
+  <spring class="bigspacer"/>
+  <box flex="1">
+    <spring class="bigspacer"/>
+    <button class="dialog" value="&keepCurrentPageButton.label;"
+            flex="1" oncommand="KeepCurrentPage()"/>
+    <spring class="bigspacer"/>
+  </box>
+  <box flex="1">
+    <spring class="bigspacer"/>
+    <button class="dialog" value="&useOtherPageButton.label;"
+            flex="1" oncommand="UseOtherPage()"/>
+    <spring class="bigspacer"/>
+  </box>
+
+</window>

editor/ui/dialogs/locale/en-US/EditConflict.dtd

@@ -0,0 +1,28 @@
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-2000 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
+<!-- Window title -->
+<!ENTITY windowTitle.label "Select Edit Changes">
+<!ENTITY conflictWarning.label "This page has been modified by another program, but you also have unsaved changes in Composer.">
+<!ENTITY conflictResolve.label "Select which version to keep:">
+<!ENTITY keepCurrentPageButton.label "Keep current page changes">
+<!ENTITY useOtherPageButton.label "Replace current page with other changes">