[Phoenix-commits] rev 20259 - in
public/yulup/src/trunk/yulup/prototypes/prototype1/src:
chrome/content chrome/content/preferences chrome/locale/de
chrome/locale/en chrome/locale/es chrome/locale/fr
chrome/locale/ku chrome/locale/tr chrome/locale/xml
defaults/preferences
andi at wyona.com
andi at wyona.com
Thu Nov 23 15:52:23 CET 2006
Author: andi
Date: 2006-11-23 15:52:22 +0100 (Thu, 23 Nov 2006)
New Revision: 20259
Modified:
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/preferences/preferences.xul
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/view.js
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/preferences.dtd
public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/preferences.dtd.xml
public/yulup/src/trunk/yulup/prototypes/prototype1/src/defaults/preferences/defaults.js
Log:
Added "wrap to window width" for source editor.
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/preferences/preferences.xul
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/preferences/preferences.xul 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/preferences/preferences.xul 2006-11-23 14:52:22 UTC (rev 20259)
@@ -78,6 +78,9 @@
<preference id="pref_editor_tabspaces"
name="extensions.yulup.editor.tabspaces"
type="int"/>
+ <preference id="pref_editor_wrap"
+ name="extensions.yulup.editor.wrap"
+ type="bool"/>
<preference id="pref_editor_theme"
name="extensions.yulup.editor.theme"
type="unichar"/>
@@ -104,6 +107,11 @@
</groupbox>
<groupbox>
+ <caption label="&editorLayoutGroupbox.label;"/>
+ <checkbox label="&editorLayoutWrapToWindow.label;" preference="pref_editor_wrap"/>
+ </groupbox>
+
+ <groupbox>
<caption label="&editorThemeGroupbox.label;"/>
<label value="&editorThemeMenulistLabel.label;:" control="uiEditorThemeMenulist"/>
<menulist id="uiEditorThemeMenulist" disabled="true">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/view.js
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/view.js 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/content/view.js 2006-11-23 14:52:22 UTC (rev 20259)
@@ -645,6 +645,7 @@
*/
setUp: function () {
var sourceEditor = null;
+ var wrapText = null;
var keyBinding = null;
var useTabSpaces = null;
var noOfTabSpaces = null;
@@ -677,6 +678,12 @@
this.view.rootElement.style.whiteSpace = "pre";
this.view.rootElement.style.margin = 0;
+ // wrap to window width
+ if ((wrapText = YulupPreferences.getBoolPref("editor.", "wrap")) != null) {
+ if (wrapText)
+ this.view.wrapWidth = 0;
+ }
+
// make the caret visible even if the current selection is not collapsed
this.view.selectionController.setCaretVisibilityDuringSelection(true);
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/de/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Leerzeichen anstatt Tab verwenden">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Anzahl Leerzeichen">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Text im Source Editor auf Fensterbreite umbrechen">
<!ENTITY editorThemeGroupbox.label "Aussehen">
<!ENTITY editorThemeMenulistLabel.label "Aussehen auswählen">
<!ENTITY editorThemeDefaultTheme.label "Standard">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/en/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Use spaces instead of tab">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Number of spaces">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Wrap source editor to window width">
<!ENTITY editorThemeGroupbox.label "Appearance">
<!ENTITY editorThemeMenulistLabel.label "Choose the editor appearance">
<!ENTITY editorThemeDefaultTheme.label "Default">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/es/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Use spaces instead of tab">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Number of spaces">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Wrap source editor to window width">
<!ENTITY editorThemeGroupbox.label "Appearance">
<!ENTITY editorThemeMenulistLabel.label "Choose the editor appearance">
<!ENTITY editorThemeDefaultTheme.label "Default">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/fr/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Use spaces instead of tab">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Number of spaces">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Wrap source editor to window width">
<!ENTITY editorThemeGroupbox.label "Appearance">
<!ENTITY editorThemeMenulistLabel.label "Choose the editor appearance">
<!ENTITY editorThemeDefaultTheme.label "Default">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/ku/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Use spaces instead of tab">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Number of spaces">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Wrap source editor to window width">
<!ENTITY editorThemeGroupbox.label "Appearance">
<!ENTITY editorThemeMenulistLabel.label "Choose the editor appearance">
<!ENTITY editorThemeDefaultTheme.label "Default">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/preferences.dtd
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/preferences.dtd 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/tr/preferences.dtd 2006-11-23 14:52:22 UTC (rev 20259)
@@ -13,6 +13,8 @@
<!ENTITY editorKeyBindingsReadline.label "Readline (Emacs)">
<!ENTITY editorKeyBindingsUseSpacesForTabLabel.label "Use spaces instead of tab">
<!ENTITY editorKeyBindingsNoOfSpacesLabel.label "Number of spaces">
+<!ENTITY editorLayoutGroupbox.label "Layout">
+<!ENTITY editorLayoutWrapToWindow.label "Wrap source editor to window width">
<!ENTITY editorThemeGroupbox.label "Appearance">
<!ENTITY editorThemeMenulistLabel.label "Choose the editor appearance">
<!ENTITY editorThemeDefaultTheme.label "Default">
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/preferences.dtd.xml
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/preferences.dtd.xml 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/chrome/locale/xml/preferences.dtd.xml 2006-11-23 14:52:22 UTC (rev 20259)
@@ -77,6 +77,16 @@
<name xml:lang="de">Anzahl Leerzeichen</name>
</entity>
+ <entity id="editorLayoutGroupbox.label">
+ <name xml:lang="en">Layout</name>
+ <name xml:lang="de">Layout</name>
+ </entity>
+
+ <entity id="editorLayoutWrapToWindow.label">
+ <name xml:lang="en">Wrap source editor to window width</name>
+ <name xml:lang="de">Text im Source Editor auf Fensterbreite umbrechen</name>
+ </entity>
+
<entity id="editorThemeGroupbox.label">
<name xml:lang="en">Appearance</name>
<name xml:lang="de">Aussehen</name>
Modified: public/yulup/src/trunk/yulup/prototypes/prototype1/src/defaults/preferences/defaults.js
===================================================================
--- public/yulup/src/trunk/yulup/prototypes/prototype1/src/defaults/preferences/defaults.js 2006-11-23 14:44:16 UTC (rev 20258)
+++ public/yulup/src/trunk/yulup/prototypes/prototype1/src/defaults/preferences/defaults.js 2006-11-23 14:52:22 UTC (rev 20259)
@@ -3,6 +3,7 @@
pref("extensions.yulup.editor.keybinding", "readline");
pref("extensions.yulup.editor.usetabspaces", true);
pref("extensions.yulup.editor.tabspaces", 2);
+pref("extensions.yulup.editor.wrap", true);
pref("extensions.yulup.editor.theme", "default");
pref("extensions.yulup.workspace.location", "");
pref("extensions.yulup.workspace.alwaysdownload", false);
More information about the Phoenix-commits
mailing list