added context menu

diff --git a/content/about.xul b/content/about.xul
index b47b8f28888774a3f7591a8cdef3ed704371a958..77b631889db6d489f9488c05fa807f7db74310ad 100755 (executable)
--- 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 1b5b30aba237e5446be70b71f699f1f12b176757..ae3cba3a4468997b25ee70974f7c400eb6e4666c 100755 (executable)
--- 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 51c09e93c3b649721b1df95c254996d124551bad..685a57bbd521c71e66bdc16cb4934481d70b1ed9 100755 (executable)
--- 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 88ba1dc98257743ec752c486f37f4bbeb17fd183..1c2e9ff6eb846664bb6795130f7b8de74960ac7d 100755 (executable)
--- 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 4ea988fb19526b3bedd6ddb5690dbe0b715679b3..8f0916f768f0487bcf8d33827ce2c8dcecb645c1 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.15
+0.5.0