From: jkkn <jkkn>
Date: Wed, 17 Oct 2007 12:54:59 +0000 (+0000)
Subject: added context menu
X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=54d4b4d538e8285eba70e8251f72c5a23e6213df;p=tv2developer

added context menu
---

diff --git a/content/about.xul b/content/about.xul
index b47b8f2..77b6318 100755
--- a/content/about.xul
+++ b/content/about.xul
@@ -15,12 +15,12 @@
   <separator class="thin"/>
   <text value="&createdBy;" style="font-weight: bold;"/>
   <text value="Kristian Kræmmer Nielsen &lt;jkkn@tv2.dk&gt;" class="url"
-        onclick="window.open('http://jkkn.dk/tv2developer/'); window.close();"/>
+        onclick="window.open('http://jkkn.dk/tv2developer/');"/>
   <separator class="thin"/>
     <text value="&homePage;" style="font-weight: bold;"/>
     <text value="http://jkkn.dk/tv2developer/"
           class="url"
-        onclick="window.open('http://jkkn.dk/tv2developer/'); window.close();"/>
+          onclick="window.open('http://jkkn.dk/tv2developer/');"/>
   <separator class="thin"/>
 </vbox>
 <spring flex="1"/>
diff --git a/content/browser_overlay.xul b/content/browser_overlay.xul
index 1b5b30a..ae3cba3 100755
--- a/content/browser_overlay.xul
+++ b/content/browser_overlay.xul
@@ -14,8 +14,19 @@
     <key id="tv2-button-key" modifiers="alt" key="1" oncommand="TV2Developer.handleKeyShortcut(event)"/>
 </keyset>
 
+<popupset id="mainPopupSet">
+    <popup id="tv2developer-contextmenu">
+        <menuitem label="&config.label;..." accesskey="&config.accesskey;"
+                  oncommand="window.openDialog('chrome://tv2developer/content/options.xul','tv2options','chrome,dialog,modal')" />
+        <menuseparator />
+        <menuitem label="&about.label;" accesskey="&about.accesskey;"
+                  oncommand="window.openDialog('chrome://tv2developer/content/about.xul','tv2about','chrome,dialog,modal')" />
+    </popup>
+</popupset>
+
 <toolbarpalette id="BrowserToolbarPalette">
   <toolbarbutton id="tv2-swap-button" type="menu-button"
+                 context="tv2developer-contextmenu"
                  accesskey="2"
                  insertAfter="urlbar-container"
                  label="tv2.dk"
diff --git a/content/tv2developer.js b/content/tv2developer.js
index 51c09e9..685a57b 100755
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -204,10 +204,9 @@ var TV2Developer = {
                 links.push(new this.TV2Link('test_live_swap', liveurl, tv2_uri));
                 links.push(new this.TV2Link('test_snapshot_swap', snapshoturl, tv2_uri));
                 if (tv2_user != initials) {
-                    links.push(new this.TV2Link('testprompt_swap', testurl, tv2_uri));
-                } else {
-                    links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, 'promptInitials'));
+                    links.push(new this.TV2Link('test_swap', testurl, tv2_uri));
                 }
+                links.push(new this.TV2Link('testprompt_swap', testprompturl, tv2_uri, 'promptInitials'));
             }
             
             links.push(new this.TV2LinkSplit());
diff --git a/locale/en-US/tv2developer.dtd b/locale/en-US/tv2developer.dtd
index 88ba1dc..1c2e9ff 100755
--- a/locale/en-US/tv2developer.dtd
+++ b/locale/en-US/tv2developer.dtd
@@ -1,8 +1,13 @@
 <!ENTITY version "version">
-<!ENTITY aboutDialog.title "TV 2 Developer Plugin - about">
+<!ENTITY aboutDialog.title "TV 2 Developer  - about">
 <!ENTITY createdBy "Created By:">
 <!ENTITY homePage "Home Page:">
 
-<!ENTITY optionsDialog.title "TV 2 Developer Plugin - Options">
+<!ENTITY optionsDialog.title "TV 2 Developer - Options">
 <!ENTITY developerInitials.description "Enter your TV 2 initials (e.x. jkkn):">
 
+<!ENTITY config.label "Configure">
+<!ENTITY config.accesskey "c">
+
+<!ENTITY about.label "About TV 2 Developer Plugin">
+<!ENTITY about.accesskey "a">
diff --git a/version b/version
index 4ea988f..8f0916f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.15
+0.5.0