[Yulup-commits] rev 20770 - in
public/yulup/src/trunk/yulup/prototypes/prototype1/src:
chrome/content/editor chrome/locale/de chrome/locale/en
chrome/locale/es chrome/locale/fr chrome/locale/ku
chrome/locale/tr chrome/locale/xml chrome/skin icons/crystal
icons/industrial icons/tango
andi at wyona.com
andi at wyona.com
Tue Dec 12 23:05:07 CET 2006
Author: andi
Date: 2006-12-12 23:05:05 +0100 (Tue, 12 Dec 2006)
New Revision: 20770
Modified:
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.js
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.xul
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/editor.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/editor.dtd.xml
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/skin/theme.default.css
public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/crystal/theme.crystal.css
public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/industrial/theme.industrial.css
public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/tango/theme.tango.css
Log:
Exit button added.
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.js
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.js 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.js 2006-12-12 22:05:05 UTC (rev 20770)
@@ -265,6 +265,12 @@
Editor.onUnloadListener();
},
+ exitEditor: function () {
+ /* DEBUG */ dump("Yulup:editor.js:Editor.exitEditor() invoked\n");
+
+ /* DEBUG */ dump("Yulup:editor.js:Editor.exitEditor() not implemented yet.\n");
+ },
+
/**
* Create a new editor instance starting with a built-in
* document template.
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.xul
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.xul 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/editor/editor.xul 2006-12-12 22:05:05 UTC (rev 20770)
@@ -140,6 +140,7 @@
<!-- Note that you have to handle these keys as well in the CommandKeyBindingsListener,
otherwise they won't work if the focus is inside the editor element. -->
<keyset>
+ <key id="key_yulup_exit" modifiers="accel shift" key="E" oncommand="Editor.exitEditor()"/>
<key id="key_yulup_savetemp" modifiers="accel shift" key="T" command="cmd_yulup_savetemp"/>
<key id="key_yulup_savecms" modifiers="accel shift" key="S" command="cmd_yulup_savecms"/>
<key id="key_yulup_checkincms" modifiers="accel shift" key="C" command="cmd_yulup_checkincms"/>
@@ -160,6 +161,12 @@
<toolbar id="uiYulupEditorToolbar"
toolbarname="Yulup Editor Toolbar">
<box id="uiYulupFileOperationsToolbarbuttons">
+ <toolbarbutton id="uiFileOperationExit"
+ oncommand="Editor.exitEditor()"
+ observes="broadcaster_yulup_newopen"
+ label="&fileOperationExit.label;" tooltiptext="&fileOperationExit.tooltip;"
+ key="key_yulup_exit"
+ disabled="true"/>
<toolbarbutton id="uiFileOperationNew" label="&fileOperationNew.label;" tooltiptext="&fileOperationNew.tooltip;" observes="broadcaster_yulup_newopen" type="menu">
<menupopup id="uiFileOperationNewMenupopup">
<menu id="uiYulupOperationNewFromTemplateLocalMenu"
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Einfügen">
<!ENTITY editOperationRedo.label "Wiederherstellen">
<!ENTITY editOperationUndo.label "Rückgängig">
+<!ENTITY fileOperationExit.label "Beenden">
<!ENTITY fileOperationNew.label "Neu">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "Neue von lokaler Vorlage">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "Neue von entfernter Vorlage">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Aus der Zwischenablage einfügen">
<!ENTITY editOperationRedo.tooltip "Letzte Operation wiederholen">
<!ENTITY editOperationUndo.tooltip "Letzte Operation rückgängig machen">
+<!ENTITY fileOperationExit.tooltip "Den Editor beenden">
<!ENTITY fileOperationNew.tooltip "Neues Dokument erstellen">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Neues Dokument nach lokaler Vorlage erstellen">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Neues Dokuman nach CMS Vorlage erstellen">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Paste">
<!ENTITY editOperationRedo.label "Redo">
<!ENTITY editOperationUndo.label "Undo">
+<!ENTITY fileOperationExit.label "Exit">
<!ENTITY fileOperationNew.label "New">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "New from local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "New from remote template">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Paste from clipboard">
<!ENTITY editOperationRedo.tooltip "Redo last operation">
<!ENTITY editOperationUndo.tooltip "Undo last operation">
+<!ENTITY fileOperationExit.tooltip "Exit the editor">
<!ENTITY fileOperationNew.tooltip "Create a new document">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Create a new document based on a local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Create a new document based on a template from CMS">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Paste">
<!ENTITY editOperationRedo.label "Redo">
<!ENTITY editOperationUndo.label "Undo">
+<!ENTITY fileOperationExit.label "Exit">
<!ENTITY fileOperationNew.label "New">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "New from local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "New from remote template">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Paste from clipboard">
<!ENTITY editOperationRedo.tooltip "Redo last operation">
<!ENTITY editOperationUndo.tooltip "Undo last operation">
+<!ENTITY fileOperationExit.tooltip "Exit the editor">
<!ENTITY fileOperationNew.tooltip "Create a new document">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Create a new document based on a local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Create a new document based on a template from CMS">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Paste">
<!ENTITY editOperationRedo.label "Redo">
<!ENTITY editOperationUndo.label "Undo">
+<!ENTITY fileOperationExit.label "Exit">
<!ENTITY fileOperationNew.label "New">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "New from local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "New from remote template">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Paste from clipboard">
<!ENTITY editOperationRedo.tooltip "Redo last operation">
<!ENTITY editOperationUndo.tooltip "Undo last operation">
+<!ENTITY fileOperationExit.tooltip "Exit the editor">
<!ENTITY fileOperationNew.tooltip "Create a new document">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Create a new document based on a local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Create a new document based on a template from CMS">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Paste">
<!ENTITY editOperationRedo.label "Redo">
<!ENTITY editOperationUndo.label "Undo">
+<!ENTITY fileOperationExit.label "Exit">
<!ENTITY fileOperationNew.label "New">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "New from local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "New from remote template">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Paste from clipboard">
<!ENTITY editOperationRedo.tooltip "Redo last operation">
<!ENTITY editOperationUndo.tooltip "Undo last operation">
+<!ENTITY fileOperationExit.tooltip "Exit the editor">
<!ENTITY fileOperationNew.tooltip "Create a new document">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Create a new document based on a local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Create a new document based on a template from CMS">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/editor.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/editor.dtd 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/editor.dtd 2006-12-12 22:05:05 UTC (rev 20770)
@@ -8,6 +8,7 @@
<!ENTITY editOperationPaste.label "Paste">
<!ENTITY editOperationRedo.label "Redo">
<!ENTITY editOperationUndo.label "Undo">
+<!ENTITY fileOperationExit.label "Exit">
<!ENTITY fileOperationNew.label "New">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.label "New from local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.label "New from remote template">
@@ -35,6 +36,7 @@
<!ENTITY editOperationPaste.tooltip "Paste from clipboard">
<!ENTITY editOperationRedo.tooltip "Redo last operation">
<!ENTITY editOperationUndo.tooltip "Undo last operation">
+<!ENTITY fileOperationExit.tooltip "Exit the editor">
<!ENTITY fileOperationNew.tooltip "Create a new document">
<!ENTITY fileOperationNewFromTemplateLocalMenuitem.tooltip "Create a new document based on a local template">
<!ENTITY fileOperationNewFromTemplateCMSMenuitem.tooltip "Create a new document based on a template from CMS">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/editor.dtd.xml
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/editor.dtd.xml 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/editor.dtd.xml 2006-12-12 22:05:05 UTC (rev 20770)
@@ -51,6 +51,11 @@
<name xml:lang="de">Rückgängig</name>
</entity>
+ <entity id="fileOperationExit.label">
+ <name xml:lang="en">Exit</name>
+ <name xml:lang="de">Beenden</name>
+ </entity>
+
<entity id="fileOperationNew.label">
<name xml:lang="en">New</name>
<name xml:lang="de">Neu</name>
@@ -185,6 +190,11 @@
<name xml:lang="de">Letzte Operation rückgängig machen</name>
</entity>
+ <entity id="fileOperationExit.tooltip">
+ <name xml:lang="en">Exit the editor</name>
+ <name xml:lang="de">Den Editor beenden</name>
+ </entity>
+
<entity id="fileOperationNew.tooltip">
<name xml:lang="en">Create a new document</name>
<name xml:lang="de">Neues Dokument erstellen</name>
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/skin/theme.default.css
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/skin/theme.default.css 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/skin/theme.default.css 2006-12-12 22:05:05 UTC (rev 20770)
@@ -10,6 +10,21 @@
}
+#uiFileOperationExit {
+ list-style-image: url("chrome://yulup/skin/icons/default/yulup-exit.png");
+ -moz-image-region: rect(0px 24px 23px 0px);
+ -moz-box-orient: vertical;
+}
+
+#uiFileOperationExit[disabled="false"]:active {
+ -moz-image-region: rect(24px 24px 47px 0px);
+}
+
+#uiFileOperationExit[disabled="true"] {
+ -moz-image-region: rect(48px 24px 71px 0px);
+}
+
+
#uiFileOperationNew {
list-style-image: url("chrome://yulup/skin/icons/default/yulup-new.png");
-moz-image-region: rect(0px 24px 23px 0px);
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/crystal/theme.crystal.css
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/crystal/theme.crystal.css 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/crystal/theme.crystal.css 2006-12-12 22:05:05 UTC (rev 20770)
@@ -4,6 +4,20 @@
/* note: rect(top_edge right_edge bottom_edge left_edge), values
* are the offsets from the top-left edge. */
+#uiFileOperationExit {
+ list-style-image: url("chrome://yulup/skin/icons/themes/Crystal/yulup-exit.png") !important;
+ -moz-image-region: rect(0px 22px 22px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="false"]:active {
+ -moz-image-region: rect(22px 22px 44px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="true"] {
+ -moz-image-region: rect(44px 22px 66px 0px) !important;
+}
+
+
#uiFileOperationNew {
list-style-image: url("chrome://yulup/skin/icons/themes/Crystal/yulup-new.png") !important;
-moz-image-region: rect(0px 22px 22px 0px) !important;
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/industrial/theme.industrial.css
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/industrial/theme.industrial.css 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/industrial/theme.industrial.css 2006-12-12 22:05:05 UTC (rev 20770)
@@ -3,6 +3,20 @@
/* -------------------- Toolbar Buttons -------------------- */
/* note: rect(top_edge right_edge bottom_edge left_edge) */
+#uiFileOperationExit {
+ list-style-image: url("chrome://yulup/skin/icons/themes/Industrial/yulup-exit.png") !important;
+ -moz-image-region: rect(0px 25px 23px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="false"]:active {
+ -moz-image-region: rect(24px 25px 47px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="true"] {
+ -moz-image-region: rect(48px 25px 71px 0px) !important;
+}
+
+
#uiFileOperationNew {
list-style-image: url("chrome://yulup/skin/icons/themes/Industrial/yulup-new.png") !important;
-moz-image-region: rect(0px 25px 23px 0px) !important;
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/tango/theme.tango.css
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/tango/theme.tango.css 2006-12-12 21:20:27 UTC (rev 20769)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/icons/tango/theme.tango.css 2006-12-12 22:05:05 UTC (rev 20770)
@@ -4,6 +4,20 @@
/* note: rect(top_edge right_edge bottom_edge left_edge), values
* are the offsets from the top-left edge. */
+#uiFileOperationExit {
+ list-style-image: url("chrome://yulup/skin/icons/themes/Tango/yulup-exit.png") !important;
+ -moz-image-region: rect(0px 22px 22px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="false"]:active {
+ -moz-image-region: rect(22px 22px 44px 0px) !important;
+}
+
+#uiFileOperationExit[disabled="true"] {
+ -moz-image-region: rect(44px 22px 66px 0px) !important;
+}
+
+
#uiFileOperationNew {
list-style-image: url("chrome://yulup/skin/icons/themes/Tango/yulup-new.png") !important;
-moz-image-region: rect(0px 22px 22px 0px) !important;
More information about the Phoenix-commits
mailing list