Mercurial > snowl

changeset 294:26320193da70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move the general toolbar to a separate overlay so we can include it in the stream view in addition to the list view
author Myk Melez <myk@mozilla.org>
date Mon, 29 Sep 2008 16:38:14 -0700
parents 84f10c04c203
children 581897df99eb
files chrome.manifest content/collections.css content/collections.js content/collections.xul locale/en-US/collections.dtd
diffstat 5 files changed, 2 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/chrome.manifest	Mon Sep 29 16:37:33 2008 -0700
+++ b/chrome.manifest	Mon Sep 29 16:38:14 2008 -0700
@@ -3,6 +3,7 @@
 overlay chrome://browser/content/browser.xul chrome://snowl/content/browser.xul
 overlay chrome://browser/content/browser.xul chrome://snowl/content/list.xul
 overlay chrome://snowl/content/list-sidebar.xul chrome://snowl/content/collections.xul
+overlay chrome://snowl/content/collections.xul chrome://snowl/content/toolbar.xul
 
 resource snowl ./
 
--- a/content/collections.css	Mon Sep 29 16:37:33 2008 -0700
+++ b/content/collections.css	Mon Sep 29 16:38:14 2008 -0700
@@ -34,14 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-toolbarbutton {
-  -moz-appearance: none;
-}
-
-.toolbarbutton-icon {
-  -moz-margin-end: 0;
-}
-
 #sourcesView {
   margin-left: 0;
   margin-right: 0;
--- a/content/collections.js	Mon Sep 29 16:37:33 2008 -0700
+++ b/content/collections.js	Mon Sep 29 16:38:14 2008 -0700
@@ -322,40 +322,6 @@
 this._log.info(row.value + " is selected");
 else
 this._log.info(row.value + " is not selected");
-  },
-
-  subscribe: function(event) {
-    gBrowserWindow.gBrowser.selectedTab =
-      gBrowserWindow.gBrowser.addTab("chrome://snowl/content/subscribe.xul");
-  },
-
-  unsubscribe: function(aEvent) {
-    let collection = this._rows[this._tree.currentIndex];
-
-    if (!collection.parent || collection.parent.groupIDColumn != "sources.id")
-      return;
-
-    let sourceID = this._rows[this._tree.currentIndex].groupID;
-
-    SnowlDatastore.dbConnection.beginTransaction();
-    try {
-      SnowlDatastore.dbConnection.executeSimpleSQL("DELETE FROM metadata WHERE messageID IN (SELECT id FROM messages WHERE sourceID = " + sourceID + ")");
-      SnowlDatastore.dbConnection.executeSimpleSQL("DELETE FROM parts WHERE messageID IN (SELECT id FROM messages WHERE sourceID = " + sourceID + ")");
-      SnowlDatastore.dbConnection.executeSimpleSQL("DELETE FROM messages WHERE sourceID = " + sourceID);
-      SnowlDatastore.dbConnection.executeSimpleSQL("DELETE FROM sources WHERE id = " + sourceID);
-      SnowlDatastore.dbConnection.commitTransaction();
-    }
-    catch(ex) {
-      SnowlDatastore.dbConnection.rollbackTransaction();
-      throw ex;
-    }
-
-    this._obsSvc.notifyObservers(null, "sources:changed", null);
-    this._obsSvc.notifyObservers(null, "messages:changed", null);
-  },
-
-  onExportOPML: function() {
-    SnowlOPML.export(window);
   }
 
 };
--- a/content/collections.xul	Mon Sep 29 16:37:33 2008 -0700
+++ b/content/collections.xul	Mon Sep 29 16:38:14 2008 -0700
@@ -54,24 +54,7 @@
       <treechildren flex="1"/>
     </tree>
 
-    <toolbar>
-      <toolbarbutton id="snowlSubscribeButton"
-                     image="chrome://snowl/content/icons/add.png"
-                     oncommand="SourcesView.subscribe()"
-                     tooltiptext="&subscribeButton.tooltip;"/>
-      <toolbarbutton id="snowlUnsubscribeButton"
-                     image="chrome://snowl/content/icons/delete.png"
-                     oncommand="SourcesView.unsubscribe()"
-                     tooltiptext="&unsubscribeButton.tooltip;"/>
-      <toolbarbutton id="snowlRefreshButton"
-                     image="chrome://snowl/content/icons/arrow_refresh_small.png"
-                     oncommand="SnowlService.refreshAllSources()"
-                     tooltiptext="&refreshButton.tooltip;"/>
-      <toolbarbutton id="snowlExportOPMLButton"
-                     image="chrome://snowl/content/icons/opml-icon-16x16.png"
-                     oncommand="SourcesView.onExportOPML()"
-                     tooltiptext="&exportButton.tooltip;"/>
-    </toolbar>
+    <toolbar id="snowlToolbar"/>
   </vbox>
 
 </overlay>
--- a/locale/en-US/collections.dtd	Mon Sep 29 16:37:33 2008 -0700
+++ b/locale/en-US/collections.dtd	Mon Sep 29 16:38:14 2008 -0700
@@ -1,6 +1,1 @@
 <!ENTITY nameCol.label                "Name">
-
-<!ENTITY subscribeButton.tooltip      "Subscribe to message sources.">
-<!ENTITY unsubscribeButton.tooltip    "Unsubscribe from message sources.">
-<!ENTITY refreshButton.tooltip        "Refresh message sources.">
-<!ENTITY exportButton.tooltip         "Export message sources as OPML.">