Updated for Thunderbird 68

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 3.6.8 - 2019-12-09
+
+### Added
+- Support for Thunderbird 68.*
+
+# Change Log
+
 ## 3.2 - 2019-04-03
 
 ### Added

_locales/de/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"    
+  },
+  "appDesc": {
+    "message": "MailHops Karten die Route eine E-Mail gereist, um bei Ihnen melden. Verwendung GeoIP es zeigt auch zurückgelegte Strecke zusammen mit dem Standort ( Ort, Bundesland und Land) des Absenders."
+  }
+}

_locales/de/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Einstellungen">
+<!ENTITY mailhops_tab_member_label           "Mitglied">
+<!ENTITY mailhops_tab_filters_label           "Filter">
+<!ENTITY mailhops_tab_defaults_label           "Grundeinstellungen">
+<!ENTITY mailhops_tab_display_label           "Anzeige">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Verbindung testen">
+<!ENTITY mailhops_connection_reset           "Verbindung zurücksetzen">

_locales/de/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "Karte">
+<!ENTITY mailhops_route_nav_details_label      "Einzelheiten">
+<!ENTITY mailhops_route_nav_refresh_label      "Neu laden">
+<!ENTITY mailhops_route_nav_options_label      "Einstellungen">
+<!ENTITY mailhops_unsubscribe                  "Abbestellen">
+<!ENTITY mailhops_hops                         "Hops">

_locales/en/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"    
+  },
+  "appDesc": {
+    "message": "MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender."
+  }
+}

_locales/en/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferences">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/en/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "Map">
+<!ENTITY mailhops_route_nav_details_label      "Details">
+<!ENTITY mailhops_route_nav_refresh_label      "Refresh">
+<!ENTITY mailhops_route_nav_options_label      "Preferences">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/es/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"    
+  },
+  "appDesc": {
+    "message": "Mapas MailHops la ruta un correo electrónico viajó a llegar a usted. Usando GeoIP también muestra la distancia recorrida junto con la ubicación ( ciudad, estado y país) del remitente."
+  }
+}

_locales/es/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferencias">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/es/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Ruta">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Aut">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "detalles">
+<!ENTITY mailhops_route_nav_refresh_label      "refrescar">
+<!ENTITY mailhops_route_nav_options_label      "Preferencias">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/fr/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  }, 
+  "appDesc": {
+    "message": "MailHops vous permet de connaître la route empruntée par un mail avant qu'il ne parvienne dans votre messagerie. Grâce à MailHops vous pourrez : connaître le lieu d'émission du mail (pays, ville); visualiser le parcours du mail sur une carte (avec un grand choix de styles de carte); ou encore connaître des informations plus techniques (le user-agent et l'authentification utilisés par l'expéditeur) et d'autres informations plus amusantes comme la distance totale parcourue par le mail ou la météo actuelle sur le lieu d'émission. La version gratuite (sans clef API) permet d'obtenir ces informations et bien d'autres pour 100 messages par tranche de 24h."
+  }
+}

_locales/fr/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Préférences">
+<!ENTITY mailhops_tab_member_label           "Compte">
+<!ENTITY mailhops_tab_filters_label           "Filtrage">
+<!ENTITY mailhops_tab_defaults_label           "Autres paramètres">
+<!ENTITY mailhops_tab_display_label           "Apparence de la barre">
+<!ENTITY mailhops_tab_api_label           "Serveur &amp; API">
+<!ENTITY mailhops_connection_test           "Tester la connexion">
+<!ENTITY mailhops_connection_reset           "Rétablir la connexion par défaut">

_locales/fr/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "Trajet">
+<!ENTITY mailhops_header_auth_label            "Authentification">
+<!ENTITY mailhops_header_meta_label            "Autres données">
+<!ENTITY mailhops_route_nav_map_label          "Afficher la Carte">
+<!ENTITY mailhops_route_nav_details_label      "Détails">
+<!ENTITY mailhops_route_nav_refresh_label      "Rafraîchir">
+<!ENTITY mailhops_route_nav_options_label      "Préférences">
+<!ENTITY mailhops_unsubscribe                  "Se désabonner">
+<!ENTITY mailhops_hops                         "Trajet">

_locales/ja/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  }, 
+  "appDesc": {
+    "message": "MailHops 電子メールがあなたに取得するために旅したルートをマップします。のGeoIPを使用しても距離が送信者の場所（都市、州や国）と一緒に旅に表示されます。"
+  }
+}

_locales/ja/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "設定">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/ja/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHopsルート">
+<!ENTITY mailhops_header_auth_label            "MailHopsメーラー/認証">
+<!ENTITY mailhops_header_meta_label            "MailHopsメタ">
+<!ENTITY mailhops_route_nav_map_label          "マップ">
+<!ENTITY mailhops_route_nav_details_label      "細部">
+<!ENTITY mailhops_route_nav_refresh_label      "リフレッシュ">
+<!ENTITY mailhops_route_nav_options_label      "設定">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/pl/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  } , 
+  "appDesc": {
+    "message": "Wskazuje trasę, którą e-mail dotarł do adresata. Korzystając z GeoIP, pokazuje także przybliżony dystans do nadawcy oraz jego położenie (miasto, region i państwo)."
+  }
+}

_locales/pl/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "opcje">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/pl/strings.dtd

@@ -0,0 +1,10 @@
+<!ENTITY mailhops_header_route_label           "Trasa">
+<!ENTITY mailhops_header_auth_label            "Mailer/Auth">
+<!ENTITY mailhops_header_lists_label           "Listy">
+<!ENTITY mailhops_header_meta_label            "Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "szczegóły">
+<!ENTITY mailhops_route_nav_refresh_label      "odśwież">
+<!ENTITY mailhops_route_nav_options_label      "opcje">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/pt-BR/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  }, 
+  "appDesc": {
+    "message": "MailHops mapeia a rota um e-mail viajou para chegar até você . Usando GeoIP ele também exibe a distância percorrida , juntamente com a localização (cidade , estado e país ) do remetente."
+  }
+}

_locales/pt-BR/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferências">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/pt-BR/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "detalhes">
+<!ENTITY mailhops_route_nav_refresh_label      "refrescar">
+<!ENTITY mailhops_route_nav_options_label      "Preferências">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/ru/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  } , 
+  "appDesc": {
+    "message": "MailHops отображает маршрутэлектронной почты , пройденное , чтобы добраться до вас. Использование GeoIP также отображает расстояние вместе с места (город, штат и страна ) отправителя."
+  }
+}

_locales/ru/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "предпочтения">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/ru/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops маршрута">
+<!ENTITY mailhops_header_auth_label            "MailHops Мейлер / Авт">
+<!ENTITY mailhops_header_meta_label            "MailHops Мета">
+<!ENTITY mailhops_route_nav_map_label          "карта">
+<!ENTITY mailhops_route_nav_details_label      "подробности">
+<!ENTITY mailhops_route_nav_refresh_label      "обновление">
+<!ENTITY mailhops_route_nav_options_label      "предпочтения">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

_locales/zh-CN/messages.json

@@ -0,0 +1,8 @@
+{
+  "appName": {
+    "message": "MailHops"
+  } , 
+  "appDesc": {
+    "message": "MailHops 映射電子郵件前往得到你的路線。使用GeoIP的它也顯示行駛距離隨著發送者的位置（城市，州和國家"
+  }
+}

_locales/zh-CN/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "优先">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

_locales/zh-CN/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops路线">
+<!ENTITY mailhops_header_auth_label            "MailHops梅勒/验证">
+<!ENTITY mailhops_header_meta_label            "MailHops元">
+<!ENTITY mailhops_route_nav_map_label          "地圖">
+<!ENTITY mailhops_route_nav_details_label      "詳細信息">
+<!ENTITY mailhops_route_nav_refresh_label      "刷新">
+<!ENTITY mailhops_route_nav_options_label      "优先">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

build.sh

@@ -2,26 +2,6 @@
 
 filename='mailhops'
 
-rm -f $filename.xpi
+rm -f $filename.zip
 
-find ./ -type f -name "._*" -exec rm {} \;
-
-mkdir build
-mkdir build/chrome
-
-cd chrome
-zip -r $filename.jar . -i *.js *.xul *.png *.gif *.rdf *.css *.dtd *.properties *.svg
-mv $filename.jar ../build/chrome/
-
-cd ..
-cp *.rdf build
-cp *.manifest build
-cd build
-zip -r $filename.xpi . -i *.rdf *.manifest *.jar
-mv $filename.xpi ../
-cd ..
-rm -rf build
-
-# git clone https://github.com/nmaier/xpisign.py.git
-# add this for cert signing
-# python xpisign.py -k cert.pem mailhops.xpi mailhops.signed.xpi
+zip -r $filename.zip ./ -x ./images/* -i *.js *.xul *.png *.gif *.css *.json *.dtd _locales/*/messages.json *.manifest

chrome.manifest

@@ -1,18 +1,16 @@
-content   mailhops   				jar:chrome/mailhops.jar!/content/
-skin  	  mailhops   classic/1.0    jar:chrome/mailhops.jar!/skin/classic/
-locale    mailhops   de             jar:chrome/mailhops.jar!/locale/de/
-locale    mailhops   en             jar:chrome/mailhops.jar!/locale/en/
-locale    mailhops   es             jar:chrome/mailhops.jar!/locale/es/
-locale    mailhops   fr             jar:chrome/mailhops.jar!/locale/fr/
-locale    mailhops   ja             jar:chrome/mailhops.jar!/locale/ja/
-locale    mailhops   pl             jar:chrome/mailhops.jar!/locale/pl/
-locale    mailhops   pt-BR          jar:chrome/mailhops.jar!/locale/pt-BR/
-locale    mailhops   ru             jar:chrome/mailhops.jar!/locale/ru/
-locale    mailhops   zh-CN          jar:chrome/mailhops.jar!/locale/zh-CN/
+content   mailhops   				chrome/content/
 
-# Postbox 5
-overlay chrome://messenger/content/mailWindowOverlay.xul chrome://mailhops/content/msgNotificationBar.xul application=postbox@postbox-inc.com
+skin  	  mailhops   classic/1.0    chrome/skin/classic/
 
-# Thunberbird
-overlay chrome://messenger/content/mailWindowOverlay.xul chrome://mailhops/content/msgNotificationBar.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-overlay chrome://messenger/content/messenger.xul         chrome://mailhops/content/msgListColumn.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+locale    mailhops   de             chrome/locale/de/
+locale    mailhops   en             chrome/locale/en/
+locale    mailhops   es             chrome/locale/es/
+locale    mailhops   fr             chrome/locale/fr/
+locale    mailhops   ja             chrome/locale/ja/
+locale    mailhops   pl             chrome/locale/pl/
+locale    mailhops   pt-BR          chrome/locale/pt-BR/
+locale    mailhops   ru             chrome/locale/ru/
+locale    mailhops   zh-CN          chrome/locale/zh-CN/
+
+overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgNotificationBar.xul
+overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgListColumn.xul

chrome/content/mailhops-2-msgNotificationBar.js

@@ -33,7 +33,7 @@ var mailHopsDisplay =
     this.mailhopsDataPaneDNSBL = document.getElementById("mailhopsDataPaneDNSBL");
 
     //wait for message to be selected before showing
-    if(!reload) this.mhBox.style.display = 'none';
+    if(!reload && this.mhBox) this.mhBox.style.display = 'none';
 
     //event listner for route click to launch map
     this.mailhopsDataPaneDNSBL.addEventListener("click", function () {

chrome/content/mailhops-3.js

@@ -4,12 +4,11 @@
 * @website: http://mailhops.com
 */
 
-var mailHops =
-{
+var mailHops = {
   msgURI:	null,
   isLoaded: false,
   options: {
-      'version':'MailHops Plugin 3.1.8',
+      'version':'MailHops Plugin 3.6.8',
       'lan':'en',
       'unit':'mi',
       'api_http':'https://',
@@ -93,7 +92,7 @@ mailHops.StreamListener =
 {
   content: "" ,
   found: false ,
-  onDataAvailable: function ( request , context , inputStream , offset , count )
+  onDataAvailable: function ( request, inputStream, offset, count )
   {
     try {
       var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance ( Components.interfaces.nsIScriptableInputStream ) ;
@@ -117,15 +116,17 @@ mailHops.StreamListener =
       mailHops.LOG('StreamListener Error: '+JSON.stringify(e));
     }
   },
-  onStartRequest: function ( request , context )
+  onStartRequest: function ( request )
   {
     this.content = "" ;
     this.found = false ;
   },
-  onStopRequest: function ( aRequest , aContext , aStatusCode )
+  onStopRequest: function ( aRequest , aStatusCode )
   {
     mailHops.headers = Components.classes["@mozilla.org/messenger/mimeheaders;1"].createInstance ( Components.interfaces.nsIMimeHeaders ) ;
-    mailHops.headers.initialize ( this.content , this.content.length ) ;
+    mailHops.headers.initialize(this.content, this.content.length);
+    mailHops.headerData = this.content;
+    console.log(this.content);
     mailHops.getRoute() ;
   }
 };
@@ -310,10 +311,11 @@ mailHops.testIP = function(ip,header){
 	return validIP;
 };
 
-mailHops.setupEventListener = function(){
+mailHops.setupEventListener = function () {
   if ( mailHops.isLoaded ){
-    return ;
+    return;
   }
+  mailHops.LOG("Setting up Message listener");
 
   mailHops.init();
   mailHops.registerObserver();
@@ -328,12 +330,10 @@ mailHops.setupEventListener = function(){
 //preferences observers
 mailHops.registerObserver = function(){
   var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService( Components.interfaces.nsIPrefService ) ;
-  mailHops._branch = prefService.getBranch( "mail.mailHops." ) ;
-  try {
-    mailHops._branch.QueryInterface( Components.interfaces.nsIPrefBranchInternal ) ;
-  } catch (err){
-    mailHops._branch.QueryInterface( Components.interfaces.nsIPrefBranch ) ;
-  }
+  mailHops._branch = prefService.getBranch("mail.mailHops.");
+  if (!("addObserver" in mailHops._branch))
+    mailHops._branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
+  
   mailHops._branch.addObserver( "" , mailHops , false ) ;
 };
 
@@ -502,4 +502,12 @@ mailHops.refreshCache = function(){
 	mailHops.getRoute();
 };
 
-addEventListener( "messagepane-loaded" , mailHops.setupEventListener , true );
+// window.addEventListener("messagepane-loaded", mailHops.setupEventListener, true);
+window.addEventListener("load", function() {
+  var messagepane = document.getElementById("messagepane");
+  if (messagepane) {
+    messagepane.addEventListener("load", function () {
+      mailHops.setupEventListener();
+    }, true);    
+  }
+}, false);

chrome/content/mailhops-5-msgListColumn.js

@@ -23,9 +23,11 @@ var columnHandler = {
     },
     isString:            function() {return true;},
  
-    getCellProperties:   function(row, col, props){},
+    getCellProperties: function (row, col, props) {
+        return 'colMailHops';
+    },
     getRowProperties:    function(row, props){},
-    getImageSrc:         function(row, col) {
+    getImageSrc: function (row, col) {
           var msgKey = gDBView.getKeyAt(row);
           var msgHdr = gDBView.db.GetMsgHdrForKey(msgKey);
           var countryCode = null;
@@ -65,6 +67,9 @@ function doOnceLoaded() {
 
 function addCustomColumnHandler() {
     gDBView.addColumnHandler("colMailHops", columnHandler);
+    if ("COLUMNS_MAP_NOSORT" in gFolderDisplay) {
+        gFolderDisplay.COLUMNS_MAP_NOSORT.add("colMailHops");
+    }    
 }
 
-addEventListener( "load", doOnceLoaded, false );
+window.addEventListener("load", doOnceLoaded, false);

chrome/content/msgListColumn.xul

@@ -10,7 +10,6 @@
     </treecols>
   </tree>
   
-  <!-- include our javascript file -->
-  <script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
-  <script type="application/x-javascript" src="chrome://mailhops/content/msgListColumn.js"/> 
+  <script type="application/x-javascript" src="chrome://mailhops/content/mailhops-1-utils.js"/>	
+  <script type="application/x-javascript" src="chrome://mailhops/content/mailhops-5-msgListColumn.js"/> 
 </overlay>

chrome/content/msgNotificationBar.xul

@@ -7,12 +7,12 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml">
 
-	<script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/msgNotificationBar.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
+	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops-1-utils.js"/>
+	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops-2-msgNotificationBar.js"/>
+	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops-3.js"/>
 
-	<rows id="msgNotificationBar">
-		<row id="mailhopsNoficationBox" collapsed="false">
+	<hbox id="mail-notification-top">
+		<stack id="mailhopsNoficationBox" collapsed="false" notificationside="top">
 			    <image id="mailhopsLogo" src="chrome://mailhops/content/images/mailhops32.png" width="32" height="32" tooltiptext="&mailhops_route_nav_options_label;"/>
 
           <label id="mailHopsAccountMessage" class="bar-link" value="Join today"></label>
@@ -24,11 +24,11 @@
             <label id="mailhopsResultWeather" class="bar-link"></label>
 
             <hbox id="mailhopsHopsBox">
-       			    <button id="mailhopsDataPaneHops" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_hops;"></button>
+       			    <toolbarbutton id="mailhopsDataPaneHops" label="&mailhops_hops;" class="toolbarbutton"></toolbarbutton>
                 <vbox id="mailhopsDataPaneDetails"></vbox>
             </hbox>
 
-    				<button id="mailhopsDataPaneRefresh" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_refresh_label;"></button>
+    				<toolbarbutton id="mailhopsDataPaneRefresh" label="&mailhops_route_nav_refresh_label;" class="toolbarbutton"></toolbarbutton>
 
     				<label id="mailhopsDataPaneMailer" class="auth-item" value="" tooltiptext="Mailer"></label>
 
@@ -41,7 +41,7 @@
             <label id="mailhopsUnsubscribe" class="bar-link unsubscribe" value="&mailhops_unsubscribe;"></label>
 
        		</hbox>
-		</row>
-	</rows>
+		</stack>
+	</hbox>
 
 </overlay>

chrome/content/preferences.xul

@@ -15,8 +15,8 @@
 	ondialogaccept="return mailHopPreferences.savePreferences();"
 	title="MailHops &mailhops_preferences;">
 
-	<script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/preferences.js"/>
+	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops-1-utils.js"/>
+	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops-4-preferences.js"/>
 
 	<vbox width="400px">
 

chrome/skin/classic/msgNotificationBar.css

@@ -113,6 +113,7 @@
 	background-color: #FFF;
   position: absolute;
 	margin-top: 0;
+	z-index: 10000;
 }
 
 #mailhopsDataPaneDetails .hop {
@@ -130,3 +131,14 @@
   padding-left: 22px;
   margin-left: 22px;
 }
+
+#mailhopsNoficationBox .toolbarbutton {
+	font-family: Lato,'Helvetica Neue',Arial,Helvetica,sans-serif;
+  margin: 0 .25em 0 0;
+	padding: 0px 9px 9px 9px;
+	width: 75px;
+	font-weight: 400;
+	border-radius: .28571429rem;
+	box-shadow: 0 0 0 1px #1b1c1d inset!important;
+  color: #1b1c1d!important;
+}

install.rdf

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-	<Description about="urn:mozilla:install-manifest">
-		<em:type>2</em:type>
-		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>3.2.0</em:version>
-
-		<em:name>MailHops</em:name>
-		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>
-		<em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL>
-		<em:homepageURL>https://www.mailhops.com</em:homepageURL>
-		<em:creator>Andrew Van Tassel</em:creator>
-		<em:optionsURL>chrome://mailhops/content/preferences.xul</em:optionsURL>
-
-	 	<!-- Postbox -->
-		<em:targetApplication>
-		  	<Description>
-	        	<em:id>postbox@postbox-inc.com</em:id>
-		        <em:minVersion>2.0</em:minVersion>
-	        	<em:maxVersion>5.*</em:maxVersion>
-	      	</Description>
-		</em:targetApplication>
-
-		<!-- Thunderbird -->
-		<em:targetApplication>
-			<Description>
-				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-				<em:minVersion>3.0.*</em:minVersion>
-				<em:maxVersion>60.*</em:maxVersion>
-			</Description>
-		</em:targetApplication>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>de</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops Karten die Route eine E-Mail gereist, um bei Ihnen melden. Verwendung GeoIP es zeigt auch zurückgelegte Strecke zusammen mit dem Standort ( Ort, Bundesland und Land) des Absenders.</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>en</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>es</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>Mapas MailHops la ruta un correo electrónico viajó a llegar a usted. Usando GeoIP también muestra la distancia recorrida junto con la ubicación ( ciudad, estado y país) del remitente.</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>fr</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops vous permet de connaître la route empruntée par un mail avant qu'il ne parvienne dans votre messagerie. Grâce à MailHops vous pourrez : connaître le lieu d'émission du mail (pays, ville); visualiser le parcours du mail sur une carte (avec un grand choix de styles de carte); ou encore connaître des informations plus techniques (le user-agent et l'authentification utilisés par l'expéditeur) et d'autres informations plus amusantes comme la distance totale parcourue par le mail ou la météo actuelle sur le lieu d'émission. La version gratuite (sans clef API) permet d'obtenir ces informations et bien d'autres pour 100 messages par tranche de 24h.</em:description>
-  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>ja</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops電子メールがあなたに取得するために旅したルートをマップします。のGeoIPを使用しても距離が送信者の場所（都市、州や国）と一緒に旅に表示されます。</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>pl</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>Wskazuje trasę, którą e-mail dotarł do adresata. Korzystając z GeoIP, pokazuje także przybliżony dystans do nadawcy oraz jego położenie (miasto, region i państwo).</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>pt-BR</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops mapeia a rota um e-mail viajou para chegar até você . Usando GeoIP ele também exibe a distância percorrida , juntamente com a localização (cidade , estado e país ) do remetente.</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>ru</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops отображает маршрутэлектронной почты , пройденное , чтобы добраться до вас. Использование GeoIP также отображает расстояние вместе с места (город, штат и страна ) отправителя.</em:description>
-		  </Description>
-		</em:localized>
-
-		<em:localized>
-		  <Description>
-		    <em:locale>zh-CN</em:locale>
-		    <em:name>MailHops</em:name>
-		    <em:description>MailHops映射電子郵件前往得到你的路線。使用GeoIP的它也顯示行駛距離隨著發送者的位置（城市，州和國家）</em:description>
-		  </Description>
-		</em:localized>
-
-	</Description>
-
-</RDF>

mailhops/_locales/de/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Einstellungen">
+<!ENTITY mailhops_tab_member_label           "Mitglied">
+<!ENTITY mailhops_tab_filters_label           "Filter">
+<!ENTITY mailhops_tab_defaults_label           "Grundeinstellungen">
+<!ENTITY mailhops_tab_display_label           "Anzeige">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Verbindung testen">
+<!ENTITY mailhops_connection_reset           "Verbindung zurücksetzen">

mailhops/_locales/de/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "Karte">
+<!ENTITY mailhops_route_nav_details_label      "Einzelheiten">
+<!ENTITY mailhops_route_nav_refresh_label      "Neu laden">
+<!ENTITY mailhops_route_nav_options_label      "Einstellungen">
+<!ENTITY mailhops_unsubscribe                  "Abbestellen">
+<!ENTITY mailhops_hops                         "Hops">

mailhops/_locales/en/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferences">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/en/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "Map">
+<!ENTITY mailhops_route_nav_details_label      "Details">
+<!ENTITY mailhops_route_nav_refresh_label      "Refresh">
+<!ENTITY mailhops_route_nav_options_label      "Preferences">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/es/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferencias">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/es/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Ruta">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Aut">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "detalles">
+<!ENTITY mailhops_route_nav_refresh_label      "refrescar">
+<!ENTITY mailhops_route_nav_options_label      "Preferencias">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/fr/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Préférences">
+<!ENTITY mailhops_tab_member_label           "Compte">
+<!ENTITY mailhops_tab_filters_label           "Filtrage">
+<!ENTITY mailhops_tab_defaults_label           "Autres paramètres">
+<!ENTITY mailhops_tab_display_label           "Apparence de la barre">
+<!ENTITY mailhops_tab_api_label           "Serveur &amp; API">
+<!ENTITY mailhops_connection_test           "Tester la connexion">
+<!ENTITY mailhops_connection_reset           "Rétablir la connexion par défaut">

mailhops/_locales/fr/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "Trajet">
+<!ENTITY mailhops_header_auth_label            "Authentification">
+<!ENTITY mailhops_header_meta_label            "Autres données">
+<!ENTITY mailhops_route_nav_map_label          "Afficher la Carte">
+<!ENTITY mailhops_route_nav_details_label      "Détails">
+<!ENTITY mailhops_route_nav_refresh_label      "Rafraîchir">
+<!ENTITY mailhops_route_nav_options_label      "Préférences">
+<!ENTITY mailhops_unsubscribe                  "Se désabonner">
+<!ENTITY mailhops_hops                         "Trajet">

mailhops/_locales/ja/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "設定">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/ja/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHopsルート">
+<!ENTITY mailhops_header_auth_label            "MailHopsメーラー/認証">
+<!ENTITY mailhops_header_meta_label            "MailHopsメタ">
+<!ENTITY mailhops_route_nav_map_label          "マップ">
+<!ENTITY mailhops_route_nav_details_label      "細部">
+<!ENTITY mailhops_route_nav_refresh_label      "リフレッシュ">
+<!ENTITY mailhops_route_nav_options_label      "設定">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/pl/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "opcje">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/pl/strings.dtd

@@ -0,0 +1,10 @@
+<!ENTITY mailhops_header_route_label           "Trasa">
+<!ENTITY mailhops_header_auth_label            "Mailer/Auth">
+<!ENTITY mailhops_header_lists_label           "Listy">
+<!ENTITY mailhops_header_meta_label            "Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "szczegóły">
+<!ENTITY mailhops_route_nav_refresh_label      "odśwież">
+<!ENTITY mailhops_route_nav_options_label      "opcje">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/pt-BR/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "Preferências">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/pt-BR/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops Route">
+<!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
+<!ENTITY mailhops_header_meta_label            "MailHops Meta">
+<!ENTITY mailhops_route_nav_map_label          "mapa">
+<!ENTITY mailhops_route_nav_details_label      "detalhes">
+<!ENTITY mailhops_route_nav_refresh_label      "refrescar">
+<!ENTITY mailhops_route_nav_options_label      "Preferências">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/ru/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "предпочтения">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/ru/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops маршрута">
+<!ENTITY mailhops_header_auth_label            "MailHops Мейлер / Авт">
+<!ENTITY mailhops_header_meta_label            "MailHops Мета">
+<!ENTITY mailhops_route_nav_map_label          "карта">
+<!ENTITY mailhops_route_nav_details_label      "подробности">
+<!ENTITY mailhops_route_nav_refresh_label      "обновление">
+<!ENTITY mailhops_route_nav_options_label      "предпочтения">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/_locales/zh-CN/prefs.dtd

@@ -0,0 +1,8 @@
+<!ENTITY mailhops_preferences           "优先">
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Default">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
+<!ENTITY mailhops_connection_test           "Test Connection">
+<!ENTITY mailhops_connection_reset           "Reset Connection">

mailhops/_locales/zh-CN/strings.dtd

@@ -0,0 +1,9 @@
+<!ENTITY mailhops_header_route_label           "MailHops路线">
+<!ENTITY mailhops_header_auth_label            "MailHops梅勒/验证">
+<!ENTITY mailhops_header_meta_label            "MailHops元">
+<!ENTITY mailhops_route_nav_map_label          "地圖">
+<!ENTITY mailhops_route_nav_details_label      "詳細信息">
+<!ENTITY mailhops_route_nav_refresh_label      "刷新">
+<!ENTITY mailhops_route_nav_options_label      "优先">
+<!ENTITY mailhops_unsubscribe      "Unsubscribe">
+<!ENTITY mailhops_hops      "Hops">

mailhops/chrome.manifest

@@ -0,0 +1,16 @@
+content   mailhops   				chrome/content/
+
+skin  	  mailhops   classic/1.0    chrome/skin/classic/
+
+locale    mailhops   de             chrome/locale/de/
+locale    mailhops   en             chrome/locale/en/
+locale    mailhops   es             chrome/locale/es/
+locale    mailhops   fr             chrome/locale/fr/
+locale    mailhops   ja             chrome/locale/ja/
+locale    mailhops   pl             chrome/locale/pl/
+locale    mailhops   pt-BR          chrome/locale/pt-BR/
+locale    mailhops   ru             chrome/locale/ru/
+locale    mailhops   zh-CN          chrome/locale/zh-CN/
+
+overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgNotificationBar.xul
+overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgListColumn.xul