From ec3841397d32bf4d344209a305fefdee3441b101 Mon Sep 17 00:00:00 2001
From: Einar Egilsson
Date: Mon, 12 Oct 2009 09:13:38 +0000
Subject: Move up and down finally ready!

git-svn-id: http://einaregilsson.googlecode.com/svn/mozilla/redirector/trunk@264 119bf307-c92d-0410-89bd-8f53e6181181
---
 chrome/content/ui/settings.xul           |  10 ++---
 chrome/locale/en-US/redirectList.xul.dtd |  65 -------------------------------
 chrome/locale/en-US/settings.xul.dtd     |  63 ++++++++++++++++++++++++++++++
 chrome/skin/movedown.png                 | Bin 0 -> 294 bytes
 chrome/skin/movedowndisabled.png         | Bin 0 -> 361 bytes
 chrome/skin/moveup.png                   | Bin 0 -> 360 bytes
 chrome/skin/moveupdisabled.png           | Bin 0 -> 282 bytes
 chrome/skin/redirector.css               |   8 +++-
 8 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 chrome/locale/en-US/redirectList.xul.dtd
 create mode 100644 chrome/locale/en-US/settings.xul.dtd
 create mode 100644 chrome/skin/movedown.png
 create mode 100644 chrome/skin/movedowndisabled.png
 create mode 100644 chrome/skin/moveup.png
 create mode 100644 chrome/skin/moveupdisabled.png

(limited to 'chrome')

diff --git a/chrome/content/ui/settings.xul b/chrome/content/ui/settings.xul
index fca43a4..641df8c 100644
--- a/chrome/content/ui/settings.xul
+++ b/chrome/content/ui/settings.xul
@@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://redirector/skin/redirector.css" type="text/css"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://redirector/locale/redirectList.xul.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://redirector/locale/settings.xul.dtd">
 <window title="&window.title;"
         orient="vertical"
         onload="RedirectList.onLoad();"
@@ -30,10 +30,6 @@
 		</tabs>
 		<tabpanels flex="1">
 			<tabpanel flex="1">
-				<keyset>
-					<key oncommand="RedirectList.moveUp();" keycode="VK_UP" modifiers="control" />
-					<key oncommand="RedirectList.moveDown();" keycode="VK_DOWN" modifiers="control" />
-				</keyset>
 				<vbox flex="1">
 					<richlistbox seltype="single" id="lstRedirects" flex="1" ondblclick="RedirectList.editRedirect();" onselect="RedirectList.selectionChange();">
 						<richlistitem class="redirectListItem" selected="false">
@@ -64,8 +60,8 @@
 						<button id="btnAdd" oncommand="RedirectList.addRedirect();" accesskey="&btnAdd.accesskey;" label="&btnAdd.label;" tooltiptext="&btnAdd.tooltip;" disabled="false" />
 						<button id="btnEdit" oncommand="RedirectList.editRedirect();" accesskey="&btnEdit.accesskey;" label="&btnEdit.label;" tooltiptext="&btnEdit.tooltip;" disabled="true" />
 						<button id="btnDelete" oncommand="RedirectList.deleteRedirect();" accesskey="&btnDelete.accesskey;" label="&btnDelete.label;" tooltiptext="&btnDelete.tooltip;" disabled="true" />
-						<button id="btnUp" oncommand="RedirectList.moveUp();" label="&btnUp.label;" tooltiptext="&btnUp.tooltip;" disabled="false" />
-						<button id="btnDown" oncommand="RedirectList.moveDown();" tooltiptext="&btnDown.tooltip;" label="&btnDown.label;" />
+						<button id="btnUp" oncommand="RedirectList.moveUp();" tooltiptext="&btnUp.tooltip;" disabled="true" />
+						<button id="btnDown" oncommand="RedirectList.moveDown();" tooltiptext="&btnDown.tooltip;" disabled="true" />
 					</hbox>
 				</vbox>
 			</tabpanel>
diff --git a/chrome/locale/en-US/redirectList.xul.dtd b/chrome/locale/en-US/redirectList.xul.dtd
deleted file mode 100644
index e05b556..0000000
--- a/chrome/locale/en-US/redirectList.xul.dtd
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- $Id$ -->
-<!ENTITY window.title "Redirector">
-
-<!-- ListItems with redirects -->
-<!ENTITY colIncludePattern.label "Include pattern">
-<!ENTITY colExcludePattern.label "Exclude pattern">
-<!ENTITY colRedirectTo.label "Redirect to">
-<!ENTITY colEnabled.label "Enabled">
-
-<!-- Buttons -->
-<!ENTITY btnAdd.label "Add...">
-<!ENTITY btnAdd.accesskey "A">
-<!ENTITY btnAdd.tooltip "Create a new redirect">
-
-<!ENTITY btnEdit.label "Edit...">
-<!ENTITY btnEdit.accesskey "E">
-<!ENTITY btnEdit.tooltip "Edit the selected redirect">
-
-<!ENTITY btnDelete.label "Delete">
-<!ENTITY btnDelete.accesskey "D">
-<!ENTITY btnDelete.tooltip "Delete the selected redirect">
-
-<!ENTITY btnUp.label "Up">
-<!ENTITY btnUp.tooltip "Move the selected redirect up">
-
-<!ENTITY btnDown.label "Down">
-<!ENTITY btnDown.tooltip "Move the selected redirect down">
-
-<!ENTITY btnImport.label "Import...">
-<!ENTITY btnImport.accesskey "I">
-<!ENTITY btnImport.tooltip "Import redirects from a file">
-
-<!ENTITY btnExport.label "Export...">
-<!ENTITY btnExport.accesskey "E">
-<!ENTITY btnExport.tooltip "Export redirects to a file">
-
-
-<!-- Tab headers -->
-<!ENTITY tabRedirects.label "Redirects">
-<!ENTITY tabRedirects.accesskey "R">
-<!ENTITY tabPreferences.label "Preferences">
-<!ENTITY tabPreferences.accesskey "P">
-<!ENTITY tabImportExport.label "Import/Export">
-<!ENTITY tabImportExport.accesskey "m">
-<!ENTITY tabHelp.label "Help">
-<!ENTITY tabHelp.accesskey "H">
-
-<!-- Preferences -->
-<!ENTITY grpGeneralPreferences.label "General">
-<!ENTITY grpDebuggingPreferences.label "Debugging">
-
-<!ENTITY chkEnableRedirector.label "Enable Redirector">
-<!ENTITY chkEnableRedirector.accesskey "E">
-
-<!ENTITY chkShowStatusBarIcon.label "Show status bar icon">
-<!ENTITY chkShowStatusBarIcon.accesskey "s">
-
-<!ENTITY chkShowContextMenu.label "Show context menu">
-<!ENTITY chkShowContextMenu.accesskey "c">
-
-<!ENTITY chkEnableDebugOutput.label "Enable debug output">
-<!ENTITY chkEnableDebugOutput.accesskey "d">
-
-
-
diff --git a/chrome/locale/en-US/settings.xul.dtd b/chrome/locale/en-US/settings.xul.dtd
new file mode 100644
index 0000000..2fc6a6c
--- /dev/null
+++ b/chrome/locale/en-US/settings.xul.dtd
@@ -0,0 +1,63 @@
+<!-- $Id$ -->
+<!ENTITY window.title "Redirector">
+
+<!-- ListItems with redirects -->
+<!ENTITY colIncludePattern.label "Include pattern">
+<!ENTITY colExcludePattern.label "Exclude pattern">
+<!ENTITY colRedirectTo.label "Redirect to">
+<!ENTITY colEnabled.label "Enabled">
+
+<!-- Buttons -->
+<!ENTITY btnAdd.label "Add...">
+<!ENTITY btnAdd.accesskey "A">
+<!ENTITY btnAdd.tooltip "Create a new redirect">
+
+<!ENTITY btnEdit.label "Edit...">
+<!ENTITY btnEdit.accesskey "E">
+<!ENTITY btnEdit.tooltip "Edit the selected redirect">
+
+<!ENTITY btnDelete.label "Delete">
+<!ENTITY btnDelete.accesskey "D">
+<!ENTITY btnDelete.tooltip "Delete the selected redirect">
+
+<!ENTITY btnUp.tooltip "Move the selected redirect up">
+
+<!ENTITY btnDown.tooltip "Move the selected redirect down">
+
+<!ENTITY btnImport.label "Import...">
+<!ENTITY btnImport.accesskey "I">
+<!ENTITY btnImport.tooltip "Import redirects from a file">
+
+<!ENTITY btnExport.label "Export...">
+<!ENTITY btnExport.accesskey "E">
+<!ENTITY btnExport.tooltip "Export redirects to a file">
+
+
+<!-- Tab headers -->
+<!ENTITY tabRedirects.label "Redirects">
+<!ENTITY tabRedirects.accesskey "R">
+<!ENTITY tabPreferences.label "Preferences">
+<!ENTITY tabPreferences.accesskey "P">
+<!ENTITY tabImportExport.label "Import/Export">
+<!ENTITY tabImportExport.accesskey "m">
+<!ENTITY tabHelp.label "Help">
+<!ENTITY tabHelp.accesskey "H">
+
+<!-- Preferences -->
+<!ENTITY grpGeneralPreferences.label "General">
+<!ENTITY grpDebuggingPreferences.label "Debugging">
+
+<!ENTITY chkEnableRedirector.label "Enable Redirector">
+<!ENTITY chkEnableRedirector.accesskey "E">
+
+<!ENTITY chkShowStatusBarIcon.label "Show status bar icon">
+<!ENTITY chkShowStatusBarIcon.accesskey "s">
+
+<!ENTITY chkShowContextMenu.label "Show context menu">
+<!ENTITY chkShowContextMenu.accesskey "c">
+
+<!ENTITY chkEnableDebugOutput.label "Enable debug output">
+<!ENTITY chkEnableDebugOutput.accesskey "d">
+
+
+
diff --git a/chrome/skin/movedown.png b/chrome/skin/movedown.png
new file mode 100644
index 0000000..d32b79c
Binary files /dev/null and b/chrome/skin/movedown.png differ
diff --git a/chrome/skin/movedowndisabled.png b/chrome/skin/movedowndisabled.png
new file mode 100644
index 0000000..afd8fc6
Binary files /dev/null and b/chrome/skin/movedowndisabled.png differ
diff --git a/chrome/skin/moveup.png b/chrome/skin/moveup.png
new file mode 100644
index 0000000..3025378
Binary files /dev/null and b/chrome/skin/moveup.png differ
diff --git a/chrome/skin/moveupdisabled.png b/chrome/skin/moveupdisabled.png
new file mode 100644
index 0000000..e526b29
Binary files /dev/null and b/chrome/skin/moveupdisabled.png differ
diff --git a/chrome/skin/redirector.css b/chrome/skin/redirector.css
index c39905b..1b32081 100644
--- a/chrome/skin/redirector.css
+++ b/chrome/skin/redirector.css
@@ -4,4 +4,10 @@
 #lstRedirects richlistitem { border-bottom:dotted 1px grey; padding:3px; }
 .redirectRows > row > label { font-weight:bold;}
 .editRedirects > row > textbox { width: 350px; }
-#redirectorSettings > tabbox { margin:4px; }
\ No newline at end of file
+#redirectorSettings > tabbox { margin:4px; }
+#btnUp { list-style-image: url('chrome://redirector/skin/moveup.png'); }
+#btnDown { list-style-image: url('chrome://redirector/skin/movedown.png'); }
+#btnUp[disabled=true] { list-style-image: url('chrome://redirector/skin/moveupdisabled.png'); }
+#btnDown[disabled=true] { list-style-image: url('chrome://redirector/skin/movedowndisabled.png'); }
+
+#btnUp, #btnDown { width:25px; min-width:25px; }
-- 
cgit v1.2.3-70-g09d2