aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEinar Egilsson2009-10-12 09:13:38 +0000
committerEinar Egilsson2009-10-12 09:13:38 +0000
commitec3841397d32bf4d344209a305fefdee3441b101 (patch)
treef9b5ce459c5a8df795be67c331994e8cac3668b5
parenta253051e8bedde1727e3615c15965afe72e0ae35 (diff)
Move up and down finally ready!
git-svn-id: http://einaregilsson.googlecode.com/svn/mozilla/redirector/trunk@264 119bf307-c92d-0410-89bd-8f53e6181181
-rw-r--r--chrome/content/ui/settings.xul10
-rw-r--r--chrome/locale/en-US/settings.xul.dtd (renamed from chrome/locale/en-US/redirectList.xul.dtd)2
-rw-r--r--chrome/skin/movedown.pngbin0 -> 294 bytes
-rw-r--r--chrome/skin/movedowndisabled.pngbin0 -> 361 bytes
-rw-r--r--chrome/skin/moveup.pngbin0 -> 360 bytes
-rw-r--r--chrome/skin/moveupdisabled.pngbin0 -> 282 bytes
-rw-r--r--chrome/skin/redirector.css8
7 files changed, 10 insertions, 10 deletions
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/settings.xul.dtd
index e05b556..2fc6a6c 100644
--- a/chrome/locale/en-US/redirectList.xul.dtd
+++ b/chrome/locale/en-US/settings.xul.dtd
@@ -20,10 +20,8 @@
<!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...">
diff --git a/chrome/skin/movedown.png b/chrome/skin/movedown.png
new file mode 100644
index 0000000..d32b79c
--- /dev/null
+++ b/chrome/skin/movedown.png
Binary files differ
diff --git a/chrome/skin/movedowndisabled.png b/chrome/skin/movedowndisabled.png
new file mode 100644
index 0000000..afd8fc6
--- /dev/null
+++ b/chrome/skin/movedowndisabled.png
Binary files differ
diff --git a/chrome/skin/moveup.png b/chrome/skin/moveup.png
new file mode 100644
index 0000000..3025378
--- /dev/null
+++ b/chrome/skin/moveup.png
Binary files differ
diff --git a/chrome/skin/moveupdisabled.png b/chrome/skin/moveupdisabled.png
new file mode 100644
index 0000000..e526b29
--- /dev/null
+++ b/chrome/skin/moveupdisabled.png
Binary files 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; }