src/NewsKit.Parsing.cs src/Summa.Core.StringCatalog.cs src/Summa.Data.Feeds.cs @@ -23,7 +23,7 @@ SUMMA_CSDISTFILES = \ Summa.Data.Search.cs \ NewsKit.AtomParser.cs \ Summa.Gui.AboutDialog.cs \ - NewsKit.Core.cs \ + NewsKit.Parsing.cs \ Summa.Gui.Actions.cs \ NewsKit.Exceptions.cs \ Summa.Gui.AddFeedDialog.cs \ @@ -70,12 +70,13 @@ SUMMA_CSDISTFILES = \ Summa.Gui.WebKitView.cs \ Summa.Core.Updater.cs \ Summa.Net.ConnectionState.cs \ - Summa.Data.Core.cs \ + Summa.Data.Feeds.cs \ Summa.Net.INetworkManager.cs \ Summa.Data.Feed.cs \ Summa.Net.NetworkManager.cs \ Notifications.Global.cs \ - Notifications.Notification.cs + Notifications.Notification.cs \ + Summa.Core.StringCatalog.cs summalibdir = $(prefix)/lib/summa all: src/Makefile.am @@ -28,8 +28,10 @@ using System.Collections; using System.Xml; using System.Text; +using NewsKit; + namespace NewsKit { - public class AtomParser : NewsKit.IFeedParser { + public class AtomParser : IFeedParser { private XmlDocument document; private XmlNamespaceManager mgr; @@ -39,7 +41,7 @@ namespace NewsKit { try { return name; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -51,7 +53,7 @@ namespace NewsKit { try { return subtitle; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -63,7 +65,7 @@ namespace NewsKit { try { return uri; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -75,7 +77,7 @@ namespace NewsKit { try { return author; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -87,7 +89,7 @@ namespace NewsKit { try { return image; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -99,7 +101,7 @@ namespace NewsKit { try { return license; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -111,7 +113,7 @@ namespace NewsKit { try { return etag; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -123,7 +125,7 @@ namespace NewsKit { try { return modified; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -135,7 +137,7 @@ namespace NewsKit { try { return favicon; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -157,7 +159,7 @@ namespace NewsKit { try { return items; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return new ArrayList(); } } @@ -165,30 +167,19 @@ namespace NewsKit { } public AtomParser(string uri, string xml) { - this.uri = uri; - this.document = new XmlDocument(); + Uri = uri; + document = new XmlDocument(); xml = xml.TrimStart(); document.LoadXml(xml); mgr = new XmlNamespaceManager(document.NameTable); if ( xml.Contains("xmlns=\"http://purl.org/atom/ns#\"") ) { - this.mgr.AddNamespace("atom", "http://purl.org/atom/ns#"); + mgr.AddNamespace("atom", "http://purl.org/atom/ns#"); } else { - this.mgr.AddNamespace("atom", "http://www.w3.org/2005/Atom"); + mgr.AddNamespace("atom", "http://www.w3.org/2005/Atom"); } - Parse(); - } - - public AtomParser(string uri, XmlDocument doc) { - this.uri = uri; - this.document = doc; - this.mgr = new XmlNamespaceManager(document.NameTable); - this.mgr.AddNamespace("atom", "http://www.w3.org/2005/Atom"); - Parse(); - } - - private void Parse() { + Name = GetXmlNodeText(document, "/atom:feed/atom:title"); Subtitle = GetXmlNodeText(document, "/atom:feed/atom:subtitle"); License = GetXmlNodeText(document, "/atom:feed/atom:license"); @@ -203,17 +194,16 @@ namespace NewsKit { } } - private NewsKit.Item ParseItem(XmlNode node) { - NewsKit.Item item = new NewsKit.Item(); + private Item ParseItem(XmlNode node) { + Item item = new Item(); item.Title = GetXmlNodeText(node, "atom:title"); item.Author = GetXmlNodeText(node, "atom:author/atom:name"); XmlNodeList linknodes = node.SelectNodes("atom:link", mgr); ProcessXmlNodeLinks(linknodes, item); - //item.Uri = GetXmlNodeUrl(node, "atom:link"); - item.Contents = GetXmlNodeContent(node); + item.Contents = GetXmlNodeText(node, "atom:content"); if ( item.Contents == null ) { - item.Contents = GetXmlNodeSummary(node); + item.Contents = GetXmlNodeText(node, "atom:summary"); } item.Date = GetRfc822DateTime(node, "atom:updated").ToString(); item.LastUpdated = ""; @@ -227,21 +217,13 @@ namespace NewsKit { return (n == null) ? null : n.InnerText.Trim(); } - public string GetXmlNodeContent(XmlNode node) { - XmlNode n = node.SelectSingleNode("atom:content", mgr); - return (n == null) ? null : n.InnerXml.Trim().Replace("\n", "<br/>\n"); - } - public string GetXmlNodeSummary(XmlNode node) { - XmlNode n = node.SelectSingleNode("atom:summary", mgr); - return (n == null) ? null : n.InnerXml.Trim().Replace("\n", "<br/>\n"); - } - - public void ProcessXmlNodeLinks(XmlNodeList node, NewsKit.Item item) { + public void ProcessXmlNodeLinks(XmlNodeList node, Item item) { string possible_self = null; foreach ( XmlNode n in node ) { bool has_rel = false; bool is_self = false; + bool is_alternate = false; bool is_enclosure = false; foreach ( XmlAttribute val in n.Attributes ) { if ( (string)val.Name == "rel" ) { @@ -250,6 +232,8 @@ namespace NewsKit { is_self = true; } else if ( (string)val.Value == "enclosure" ) { is_enclosure = true; + } else if ( (string)val.Value == "alternate" ) { + is_alternate = true; } } @@ -259,6 +243,10 @@ namespace NewsKit { item.Uri = (string)val.Value; } else if ( is_enclosure ){ item.EncUri = (string)val.Value; + } if ( is_alternate ) { + if ( String.IsNullOrEmpty(item.Uri) ) { + item.Uri = (string)val.Value; + } } } else { possible_self = (string)val.Value; src/NewsKit.AtomParser.cs @@ -1,5 +1,7 @@ using System; +using NewsKit; + namespace NewsKit.Exceptions { // for failures to download [Serializable()] src/NewsKit.Exceptions.cs @@ -1,5 +1,7 @@ using System; +using NewsKit; + namespace NewsKit { internal static class Globals { // you want to customize this class to your program, so that you can @@ -41,7 +43,7 @@ namespace NewsKit { } public static void Exception(Exception e) { - Summa.Core.Log.Exception(e); + //Summa.Core.Log.Exception(e); } } } src/NewsKit.Globals.cs @@ -1,6 +1,8 @@ using System; using System.Collections; +using NewsKit; + namespace NewsKit { public interface IFeedParser { string Name {get; set;} src/NewsKit.IFeedParser.cs @@ -1,5 +1,7 @@ using System; +using NewsKit; + namespace NewsKit { public class Item { public string Title; src/NewsKit.Item.cs @@ -27,6 +27,8 @@ using System; using System.Xml; using System.Collections; +using NewsKit; + namespace NewsKit { public class OpmlParser { public ArrayList Uris; src/NewsKit.OpmlParser.cs @@ -28,8 +28,10 @@ using System.Collections; using System.Xml; using System.Text; +using NewsKit; + namespace NewsKit { - public class RdfParser : NewsKit.IFeedParser { + public class RdfParser : IFeedParser { private XmlDocument document; private XmlNamespaceManager mgr; @@ -39,7 +41,7 @@ namespace NewsKit { try { return name; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -51,7 +53,7 @@ namespace NewsKit { try { return subtitle; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -63,7 +65,7 @@ namespace NewsKit { try { return uri; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -75,7 +77,7 @@ namespace NewsKit { try { return author; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -87,7 +89,7 @@ namespace NewsKit { try { return image; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -99,7 +101,7 @@ namespace NewsKit { try { return license; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -111,7 +113,7 @@ namespace NewsKit { try { return etag; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -123,7 +125,7 @@ namespace NewsKit { try { return modified; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -135,7 +137,7 @@ namespace NewsKit { try { return favicon; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -157,7 +159,7 @@ namespace NewsKit { try { return items; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return new ArrayList(); } } @@ -171,7 +173,7 @@ namespace NewsKit { try { document.LoadXml(xml); } catch (XmlException e) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); bool have_stripped_control = false; StringBuilder sb = new StringBuilder (); @@ -198,18 +200,8 @@ namespace NewsKit { mgr = new XmlNamespaceManager(document.NameTable); mgr.AddNamespace("rss10", "http://purl.org/rss/1.0/"); mgr.AddNamespace("content", "http://purl.org/rss/1.0/modules/content/"); - Parse(); - } - - public RdfParser(string uri, XmlDocument doc) { - this.uri = uri; - this.document = doc; - this.mgr.AddNamespace("rss10", "http://purl.org/rss/1.0/"); - this.mgr.AddNamespace("content", "http://purl.org/rss/1.0/modules/content/"); - Parse(); - } - - private void Parse() { + mgr.AddNamespace("dc", "http://purl.org/dc/elements/1.1/"); + XmlNodeList channodes = document.SelectNodes("//rss10:channel", mgr); foreach ( XmlNode node in channodes ) { Name = GetXmlNodeText(node, "rss10:title"); @@ -224,25 +216,25 @@ namespace NewsKit { } } - private NewsKit.Item ParseItem(XmlNode node) { - NewsKit.Item item = new NewsKit.Item(); + private Item ParseItem(XmlNode node) { + Item item = new Item(); item.Title = GetXmlNodeText(node, "rss10:title"); item.Author = GetXmlNodeText(node, "rss10:author"); item.Uri = GetXmlNodeText(node, "rss10:link"); item.Contents = GetXmlNodeText(node, "rss10:description"); + Console.WriteLine(item.Contents); try { if ( item.Contents.Length < GetXmlNodeText(node, "content:encoded").Length ) { item.Contents = GetXmlNodeText(node, "content:encoded"); } } catch ( Exception ) { - item.Contents = GetXmlNodeText(node, "content:encoded"); + if ( String.IsNullOrEmpty(item.Contents) ) { + item.Contents = GetXmlNodeText(node, "content:encoded"); + } } - item.Date = GetRfc822DateTime(node, "rss10:pubDate").ToString(); - /*if ( item.Date == DateTime.MinValue.ToString() ) { - item.Date = GetRfc822DateTime(node, "dc:date").ToString(); - }*/ - // should look for dc:date + item.Date = Convert.ToDateTime(GetXmlNodeText(node, "dc:date")).ToString(); + item.LastUpdated = GetRfc822DateTime(node, "dcterms:modified").ToString(); @@ -259,7 +251,7 @@ namespace NewsKit { string result = GetXmlNodeText(node, tag); if (!String.IsNullOrEmpty(result)) { - ret = NewsKit.RssCommon.Parse(result); + ret = RssCommon.Parse(result); } return ret; src/NewsKit.RdfParser.cs @@ -1,8 +1,11 @@ using System; using System.Net; using System.Text; +using System.Text.RegularExpressions; using System.IO; +using NewsKit; + namespace NewsKit { public class Request { public string Uri; @@ -20,11 +23,11 @@ namespace NewsKit { public Request(string uri, string last_modified) { Uri = uri; - if ( NewsKit.Globals.Connected ) { + if ( Globals.Connected ) { try { webrequest = (HttpWebRequest)WebRequest.Create(uri); webrequest.AllowAutoRedirect = true; - webrequest.UserAgent = NewsKit.Globals.UserAgent; + webrequest.UserAgent = Globals.UserAgent; webrequest.MaximumAutomaticRedirections = 4; webrequest.MaximumResponseHeadersLength = 4; @@ -34,7 +37,7 @@ namespace NewsKit { webrequest.IfModifiedSince = m; } } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); } webresponse = (HttpWebResponse)webrequest.GetResponse(); @@ -44,7 +47,7 @@ namespace NewsKit { StringBuilder sb = new StringBuilder(); if ( Status == HttpStatusCode.NotModified ) { - throw new NewsKit.Exceptions.NotUpdated(); + throw new Exceptions.NotUpdated(); } else { stream = webresponse.GetResponseStream(); string tempString = null; @@ -62,28 +65,28 @@ namespace NewsKit { while (count > 0); Xml = sb.ToString(); - Xml = System.Text.RegularExpressions.Regex.Replace(Xml, "<( [a-z]+)=([a-zA-Z0-9:/._%;?=&-]+)", "$1=\"$2\""); + Xml = Regex.Replace(Xml, "<( [a-z]+)=([a-zA-Z0-9:/._%;?=&-]+)", "$1=\"$2\""); LastModified = webresponse.LastModified.ToString(); try { Etag = webresponse.Headers.GetValues("ETag")[0]; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); } } webresponse.Close(); } catch ( System.Net.WebException e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); try { webresponse.Close(); stream.Close(); } catch ( Exception ) {} - throw new NewsKit.Exceptions.NotFound(); + throw new Exceptions.NotFound(); } } else { - throw new NewsKit.Exceptions.NotFound(); + throw new Exceptions.NotFound(); } } } src/NewsKit.Request.cs @@ -1,4 +1,4 @@ -// NewsKit.RssCommon.cs +// RssCommon.cs // // Mostly from Banshee's Migo.Syndication library // Copyright (c) 2006-2008 Michael C. Urbanski @@ -27,6 +27,8 @@ using System; using System.Text.RegularExpressions; +using NewsKit; + namespace NewsKit { public static class RssCommon { private const string monthsStr = @@ -124,8 +126,7 @@ namespace NewsKit { offsetMinutes *= -1; } } else { - switch ( offset ) - { + switch ( offset ) { case "GMT": case "UT": break; case "EDT": offsetHours = -4; break; case "EST": case "CDT": offsetHours = -5; break; src/NewsKit.RssCommon.cs @@ -28,6 +28,8 @@ using System.Collections; using System.Xml; using System.Text; +using NewsKit; + namespace NewsKit { public class RssParser : IFeedParser { private XmlDocument document; @@ -39,7 +41,7 @@ namespace NewsKit { try { return name; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -51,7 +53,7 @@ namespace NewsKit { try { return subtitle; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -63,7 +65,7 @@ namespace NewsKit { try { return uri; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -75,7 +77,7 @@ namespace NewsKit { try { return author; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -87,7 +89,7 @@ namespace NewsKit { try { return image; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -99,7 +101,7 @@ namespace NewsKit { try { return license; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -111,7 +113,7 @@ namespace NewsKit { try { return etag; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -123,7 +125,7 @@ namespace NewsKit { try { return modified; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -135,7 +137,7 @@ namespace NewsKit { try { return favicon; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return ""; } } @@ -157,7 +159,7 @@ namespace NewsKit { try { return items; } catch ( Exception e ) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); return new ArrayList(); } } @@ -172,7 +174,7 @@ namespace NewsKit { try { document.LoadXml(xml); } catch (XmlException e) { - NewsKit.Globals.Exception(e); + Globals.Exception(e); bool have_stripped_control = false; StringBuilder sb = new StringBuilder (); @@ -207,8 +209,8 @@ namespace NewsKit { } } - private NewsKit.Item ParseItem(XmlNode node) { - NewsKit.Item item = new NewsKit.Item(); + private Item ParseItem(XmlNode node) { + Item item = new Item(); item.Title = GetXmlNodeText(node, "title"); item.Author = GetXmlNodeText(node, "author"); @@ -242,7 +244,7 @@ namespace NewsKit { string result = GetXmlNodeText(node, tag); if (!String.IsNullOrEmpty(result)) { - ret = NewsKit.RssCommon.Parse(result); + ret = RssCommon.Parse(result); } return ret; src/NewsKit.RssParser.cs @@ -1,28 +1,32 @@ using System; +using NewsKit; + namespace NewsKit { public static class TestBed { public static void Main() { IFeedParser p; - bool found = NewsKit.Core.ParseUri("http://timesonline.typepad.com/dons_life/index.rdf", "", out p); + bool found = Core.ParseUri("http://daringfireball.net/index.xml", "", out p); - Console.WriteLine("Feed Name: "+p.Name); - Console.WriteLine("Feed URL: "+p.Uri); - Console.WriteLine(""); - foreach ( NewsKit.Item i in p.Items ) { - Console.WriteLine("Item Name: "+i.Title); - Console.WriteLine("Item URI: "+i.Uri); - Console.WriteLine("Item Date: "+i.Date); - if ( i.Contents == null ) { - Console.WriteLine("Item Contents: No"); - } else { - if ( i.Contents.Length > 5 ) { - Console.WriteLine("Item Contents: Yes"); - } else { + if ( found ) { + Console.WriteLine("Feed Name: "+p.Name); + Console.WriteLine("Feed URL: "+p.Uri); + Console.WriteLine(""); + foreach ( NewsKit.Item i in p.Items ) { + Console.WriteLine("Item Name: "+i.Title); + Console.WriteLine("Item URI: "+i.Uri); + Console.WriteLine("Item Date: "+i.Date); + if ( i.Contents == null ) { Console.WriteLine("Item Contents: No"); + } else { + if ( i.Contents.Length > 5 ) { + Console.WriteLine("Item Contents: Yes"); + } else { + Console.WriteLine("Item Contents: No"); + } } + Console.WriteLine(""); } - Console.WriteLine(""); } } } src/NewsKit.TestBed.cs @@ -33,47 +33,46 @@ using NDesk.DBus; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Core { public static class Application { - public static LogList Log; - public static Summa.Core.Database Database; public static Gtk.ListStore TagStore; public static ArrayList Browsers; public static Summa.Gui.StatusIcon StatusIcon; - public static Summa.Core.Updater Updater; - public static Summa.Core.DBusInterface DBus; + public static Updater Updater; + public static DBusInterface DBus; public static bool WindowsShown; public static void Main() { //GLib.Thread.Init(); Gdk.Threads.Init(); - Log = new LogList(); - Gtk.Application.Init(); SetProcessName("summa"); - GLib.Log.SetLogHandler(null, GLib.LogLevelFlags.All, new GLib.LogFunc(Summa.Core.Log.LogFunc)); //FIXME + GLib.Log.SetLogHandler(null, GLib.LogLevelFlags.All, new GLib.LogFunc(Log.LogFunc)); //FIXME /* - * the ListStore for all Summa.Gui.TagViews, since tags don't + * the ListStore for all TagViews, since tags don't * vary by context. */ TagStore = new Gtk.ListStore(typeof(Gdk.Pixbuf), typeof(string)); - Database = new Summa.Core.Database(); - Updater = new Summa.Core.Updater(); - DBus = new Summa.Core.DBusInterface(); + Updater = new Updater(); + DBus = new DBusInterface(); /* * a list of browser instances - when a browser is created, it * should be added to this list, and when it is destroyed, it * should be removed. */ Browsers = new ArrayList(); - Browsers.Add(new Summa.Gui.Browser()); + Browsers.Add(new Browser()); StatusIcon = new Summa.Gui.StatusIcon(); - foreach ( Summa.Gui.Browser browser in Browsers ) { + foreach ( Browser browser in Browsers ) { browser.ShowAll(); } WindowsShown = true; @@ -84,9 +83,14 @@ namespace Summa.Core { } private static void DebugTest() { + /*foreach ( ISource source in Feeds.GetFeeds() ) { + foreach ( Item item in source.Items ) { + item.Read = true; + } + }*/ } - public static void CloseWindow(Summa.Gui.Browser browser) { + public static void CloseWindow(Browser browser) { if ( Browsers.Count == 1 ) { /* get dimensions */ int width; @@ -94,8 +98,8 @@ namespace Summa.Core { browser.GetSize(out width, out height); - Summa.Core.Config.WindowWidth = width; - Summa.Core.Config.WindowHeight = height; + Config.WindowWidth = width; + Config.WindowHeight = height; /* get pane positions */ int main_size; @@ -106,9 +110,9 @@ namespace Summa.Core { left_size = browser.left_paned.Position; right_size = browser.right_paned.Position; - Summa.Core.Config.MainPanePosition = main_size; - Summa.Core.Config.LeftPanePosition = left_size; - Summa.Core.Config.RightPanePosition = right_size; + Config.MainPanePosition = main_size; + Config.LeftPanePosition = left_size; + Config.RightPanePosition = right_size; Bus.Session.Unregister(new ObjectPath(DBus.ObjPath)); Bus.Session.ReleaseName(DBus.BusName); @@ -122,12 +126,12 @@ namespace Summa.Core { public static void ToggleShown() { if ( WindowsShown ) { - foreach ( Summa.Gui.Browser browser in Summa.Core.Application.Browsers ) { + foreach ( Browser browser in Application.Browsers ) { browser.Hide(); } WindowsShown = false; } else { - foreach ( Summa.Gui.Browser browser in Summa.Core.Application.Browsers ) { + foreach ( Browser browser in Application.Browsers ) { browser.Show(); } WindowsShown = true; @@ -143,7 +147,7 @@ namespace Summa.Core { public static void SetProcessName(string name) { if (prctl (PR_SET_NAME, Encoding.ASCII.GetBytes (name + '\0'), 0, 0, 0) < 0) { - Summa.Core.Log.Message(String.Format("Couldn't set process name to '{0}': {1}", name, Mono.Unix.Native.Stdlib.GetLastError())); + Log.Message(String.Format("Couldn't set process name to '{0}': {1}", name, Mono.Unix.Native.Stdlib.GetLastError())); } } } src/Summa.Core.Application.cs @@ -27,9 +27,11 @@ using System; using System.Collections; using GConf; +using Summa.Core; + namespace Summa.Core { public static class Config { - private static GConf.Client client = new GConf.Client(); + private static Client client = new Client(); //TODO: put these in a schema file. private static string KEY_LIBNOTIFY = "/apps/summa/show_notifications"; @@ -47,13 +49,14 @@ namespace Summa.Core { private static string KEY_THEME = "/apps/summa/theme"; private static string KEY_STATUS_ICON = "/apps/summa/show_status_icon"; private static string KEY_ICON_FEEDS = "/apps/summa/show_status_icon_for"; + private static string KEY_NUMBER_OF_ITEMS = "/apps/summa/save_number_of_items"; public static bool ShowNotifications { get { try { return (bool)client.Get(KEY_LIBNOTIFY); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_LIBNOTIFY, true); return true; } @@ -67,8 +70,8 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_WIN_HEIGHT); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_WIN_HEIGHT, 400); return 400; } @@ -82,8 +85,8 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_WIN_WIDTH); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_WIN_WIDTH, 700); return 700; } @@ -97,8 +100,8 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_MAIN_PANE_POSITION); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_MAIN_PANE_POSITION, 170); return 170; } @@ -112,8 +115,8 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_LEFT_PANE_POSITION); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_LEFT_PANE_POSITION, 170); return 170; } @@ -127,8 +130,8 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_RIGHT_PANE_POSITION); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_RIGHT_PANE_POSITION, 170); return 170; } @@ -142,8 +145,8 @@ namespace Summa.Core { get { try { return (bool)client.Get(KEY_SHOULD_SORT_FEEDVIEW); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_SHOULD_SORT_FEEDVIEW, false); return false; } @@ -157,15 +160,15 @@ namespace Summa.Core { get { try { return (int)client.Get(KEY_DEFAULT_ZOOM_LEVEL); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_DEFAULT_ZOOM_LEVEL, 10); return 10; } } set { client.Set(KEY_DEFAULT_ZOOM_LEVEL, value); - Summa.Core.Notifier.ChangeZoom(); + Notifier.ChangeZoom(); } } @@ -174,8 +177,8 @@ namespace Summa.Core { try { int a = (int)client.Get(KEY_GLOBAL_UPDATE_INTERVAL); return (uint)a; - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_GLOBAL_UPDATE_INTERVAL, 3600000); return 3600000; } @@ -189,8 +192,8 @@ namespace Summa.Core { get { try { return (string)client.Get(KEY_BOOKMARKER); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_BOOKMARKER, "Native"); return "Native"; } @@ -204,8 +207,8 @@ namespace Summa.Core { get { try { return (bool)client.Get(KEY_TABS); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_TABS, false); return false; } @@ -219,15 +222,15 @@ namespace Summa.Core { get { try { return (bool)client.Get(KEY_WIDESCREEN); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_WIDESCREEN, false); return false; } } set { client.Set(KEY_WIDESCREEN, value); - Summa.Core.Notifier.ChangeView(); + Notifier.ChangeView(); } } @@ -247,11 +250,11 @@ namespace Summa.Core { } } - public static Summa.Core.ITheme Theme { + public static ITheme Theme { get { try { string name = (string)client.Get(KEY_THEME); - foreach ( Summa.Core.ITheme theme in Summa.Core.ThemeManager.Themes ) { + foreach ( ITheme theme in ThemeManager.Themes ) { if ( theme.Name == name ) { return theme; } @@ -263,7 +266,7 @@ namespace Summa.Core { } } set { - Summa.Core.ITheme theme = (Summa.Core.ITheme)value; + ITheme theme = (ITheme)value; client.Set(KEY_THEME, theme.Name); } } @@ -272,15 +275,15 @@ namespace Summa.Core { get { try { return (bool)client.Get(KEY_STATUS_ICON); - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_STATUS_ICON, false); return false; } } set { client.Set(KEY_STATUS_ICON, value); - Summa.Core.Notifier.ShowIcon(); + Notifier.ShowIcon(); } } @@ -296,8 +299,8 @@ namespace Summa.Core { } } return returls; - } catch ( GConf.NoSuchKeyException e ) { - Summa.Core.Log.Exception(e); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); client.Set(KEY_ICON_FEEDS, ""); return new ArrayList(); } @@ -308,5 +311,20 @@ namespace Summa.Core { client.Set(KEY_ICON_FEEDS, retstring); } } + + public static int NumberOfItems { + get { + try { + return (int)client.Get(KEY_NUMBER_OF_ITEMS); + } catch ( NoSuchKeyException e ) { + Log.Exception(e); + client.Set(KEY_NUMBER_OF_ITEMS, 100); + return 100; + } + } + set { + client.Set(KEY_NUMBER_OF_ITEMS, value); + } + } } } src/Summa.Core.Config.cs @@ -27,6 +27,9 @@ using System; using NDesk.DBus; using org.freedesktop.DBus; +using Summa.Core; +using Summa.Data; + namespace Summa.Core { [Interface("org.gnome.feed.Reader")] public interface SummaDBus { // make sure to keep up with Liferea @@ -42,14 +45,14 @@ namespace Summa.Core { public string ObjPath = "/org/gnome/feed/Reader"; public DBusInterface() { - NDesk.DBus.BusG.Init(); + BusG.Init(); Bus.Session.RequestName(BusName); Bus.Session.Register(new ObjectPath(ObjPath), this); } public bool Subscribe(string url) { - Summa.Data.Core.RegisterFeed(url); + Feeds.RegisterFeed(url); return true; } @@ -59,16 +62,16 @@ namespace Summa.Core { } public bool SetOnline(bool online) { - Summa.Core.Config.Connected = online; - return Summa.Core.Config.Connected; + Config.Connected = online; + return Config.Connected; } public int GetUnreadItems() { - return Summa.Data.Core.GetUnreadCount(); + return Feeds.GetUnreadCount(); } public int GetNewItems() { - return Summa.Data.Core.GetUnreadCount(); + return Feeds.GetUnreadCount(); } } } src/Summa.Core.DBus.cs @@ -3,7 +3,7 @@ // Copyright (c) 2008 Ethan Osten // // Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation +// obtaining a copy of "" software and associated documentation // files (the "Software"), to deal in the Software without // restriction, including without limitation the rights to use, // copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -11,7 +11,7 @@ // Software is furnished to do so, subject to the following // conditions: // -// The above copyright notice and this permission notice shall be +// The above copyright notice and "" permission notice shall be // included in all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -30,22 +30,27 @@ using System.IO; using System.Data; using Mono.Data.SqliteClient; +using Summa.Core; + namespace Summa.Core { - public class Database { - private static string uri = Mono.Unix.Native.Stdlib.getenv("HOME")+"/.config/summa/database.db"; - private string Uri = "URI=file://"+uri; - private IDbConnection db; + public static class Database { + private static string uri; + private static string Uri; + private static IDbConnection db; - public event Summa.Core.FeedAddedHandler FeedAdded; - public event Summa.Core.FeedDeletedHandler FeedDeleted; - public event Summa.Core.FeedChangedHandler FeedChanged; - public event Summa.Core.ItemAddedHandler ItemAdded; - public event Summa.Core.ItemDeletedHandler ItemDeleted; - public event Summa.Core.ItemChangedHandler ItemChanged; + public static event FeedAddedHandler FeedAdded; + public static event FeedDeletedHandler FeedDeleted; + public static event FeedChangedHandler FeedChanged; + public static event ItemAddedHandler ItemAdded; + public static event ItemDeletedHandler ItemDeleted; + public static event ItemChangedHandler ItemChanged; - private Hashtable GeneratedNames; + private static Hashtable GeneratedNames; - public Database() { + static Database() { + uri = Mono.Unix.Native.Stdlib.getenv("HOME")+"/.config/summa/database.db"; + Uri = "URI=file://"+uri; + Directory.CreateDirectory(Mono.Unix.Native.Stdlib.getenv("HOME")+"/.config/summa/"); bool exists = File.Exists(uri); @@ -64,7 +69,7 @@ namespace Summa.Core { } } - private void NonQueryCommand(string commandtext) { + private static void NonQueryCommand(string commandtext) { IDbCommand dbcmd = db.CreateCommand(); dbcmd.CommandText = commandtext; dbcmd.ExecuteNonQuery(); @@ -72,7 +77,7 @@ namespace Summa.Core { dbcmd = null; } - private string EscapeParam(string parameter) { + private static string EscapeParam(string parameter) { Encoding enc = new ASCIIEncoding(); try { Byte[] bytes = enc.GetBytes(parameter); @@ -84,7 +89,7 @@ namespace Summa.Core { } } - private string UnescapeParam(string parameter) { + private static string UnescapeParam(string parameter) { try { //return HttpUtility.HtmlDecode(parameter); return parameter; @@ -94,7 +99,7 @@ namespace Summa.Core { } } - private void Initialize() { + private static void Initialize() { NonQueryCommand("create table Summa (id INTEGER PRIMARY KEY, version VARCHAR(50))"); NonQueryCommand("create table Feeds (id INTEGER PRIMARY KEY, uri VARCHAR(50), generated_name VARCHAR(50), name VARCHAR(50), author VARCHAR(50), subtitle VARCHAR(50), image VARCHAR(50), license VARCHAR(50), etag VARCHAR(50), hmodified VARCHAR(50), status VARCHAR(50), tags VARCHAR(50), favicon VARCHAR(50))"); @@ -102,7 +107,7 @@ namespace Summa.Core { NonQueryCommand(String.Format("insert into Summa values (null, {0})", @"""0""")); } - private string GenerateRandomName() { + private static string GenerateRandomName() { Random random = new Random(); StringBuilder builder = new StringBuilder(); @@ -112,11 +117,11 @@ namespace Summa.Core { return builder.ToString(); } - public string GetGeneratedName(string uri) { + public static string GetGeneratedName(string uri) { return (string)GeneratedNames[uri]; } - public string CreateFeed(string uri, string name, string author, string subtitle, string image, string license, string etag, string hmodified, string status, string tags, string favicon) { + public static string CreateFeed(string uri, string name, string author, string subtitle, string image, string license, string etag, string hmodified, string status, string tags, string favicon) { string generated_name = GenerateRandomName(); IDbCommand dbcmd = db.CreateCommand(); @@ -234,25 +239,25 @@ namespace Summa.Core { GeneratedNames.Add(uri, generated_name); - Summa.Core.AddedEventArgs args = new Summa.Core.AddedEventArgs(); + AddedEventArgs args = new AddedEventArgs(); args.Uri = uri; - FeedAdded(this, args); + FeedAdded("", args); return generated_name; } - public void DeleteFeed(string uri) { + public static void DeleteFeed(string uri) { NonQueryCommand("drop table "+GetGeneratedName(uri)); NonQueryCommand(@"delete from Feeds where uri="""+EscapeParam(uri)+@""""); GeneratedNames.Remove(uri); - Summa.Core.AddedEventArgs args = new Summa.Core.AddedEventArgs(); + AddedEventArgs args = new AddedEventArgs(); args.Uri = uri; - FeedDeleted(this, args); + FeedDeleted("", args); } - public string[] GetFeed(string uri) { + public static string[] GetFeed(string uri) { string[] feed = new string[13]; IDbCommand dbcmd = db.CreateCommand(); @@ -285,7 +290,7 @@ namespace Summa.Core { return feed; } - public ArrayList GetFeeds() { + public static ArrayList GetFeeds() { ArrayList list = new ArrayList(); IDbCommand dbcmd = db.CreateCommand(); @@ -317,7 +322,7 @@ namespace Summa.Core { return list; } - public bool FeedExists(string url) { + public static bool FeedExists(string url) { bool exists = false; foreach (string[] feed in GetFeeds()) { if ( feed[1] == url ) { @@ -327,7 +332,7 @@ namespace Summa.Core { return exists; } - public ArrayList GetPosts(string feeduri) { + public static ArrayList GetPosts(string feeduri) { ArrayList list = new ArrayList(); IDbCommand dbcmd = db.CreateCommand(); @@ -355,7 +360,7 @@ namespace Summa.Core { return list; } - public string[] GetItem(string feeduri, string uri) { + public static string[] GetItem(string feeduri, string uri) { string[] item = null; IDbCommand dbcmd = db.CreateCommand(); @@ -381,19 +386,19 @@ namespace Summa.Core { return item; } - public void DeleteItem(string feeduri, string uri) { + public static void DeleteItem(string feeduri, string uri) { string generated_name = GetGeneratedName(feeduri); string command = "delete from "+generated_name+@" where uri="""+EscapeParam(uri)+@""""; NonQueryCommand(command); - Summa.Core.AddedEventArgs args = new Summa.Core.AddedEventArgs(); + AddedEventArgs args = new AddedEventArgs(); args.Uri = uri; args.FeedUri = feeduri; - ItemAdded(this, args); + ItemAdded("", args); } - public void AddItem(string feeduri, string title, string uri, string date, string last_updated, string author, string tags, string content, string encuri, string read, string flagged) { + public static void AddItem(string feeduri, string title, string uri, string date, string last_updated, string author, string tags, string content, string encuri, string read, string flagged) { string generated_name = GetGeneratedName(feeduri); IDbCommand dbcmd = db.CreateCommand(); @@ -493,34 +498,34 @@ namespace Summa.Core { dbcmd.Dispose(); dbcmd = null; - Summa.Core.AddedEventArgs args = new Summa.Core.AddedEventArgs(); + AddedEventArgs args = new AddedEventArgs(); args.Uri = uri; args.FeedUri = feeduri; - ItemAdded(this, args); + ItemAdded("", args); } - public void ChangeFeedInfo(string feeduri, string property, string intended_value) { + public static void ChangeFeedInfo(string feeduri, string property, string intended_value) { NonQueryCommand("update Feeds set "+property+@"="""+EscapeParam(intended_value)+@""" where uri="""+EscapeParam(feeduri)+@""""); - Summa.Core.ChangedEventArgs args = new Summa.Core.ChangedEventArgs(); + ChangedEventArgs args = new ChangedEventArgs(); args.Uri = feeduri; args.Value = intended_value; args.ItemProperty = property; - FeedChanged(this, args); + FeedChanged("", args); } - public void ChangeItemInfo(string feeduri, string itemuri, string property, string intended_value) { //optimize + public static void ChangeItemInfo(string feeduri, string itemuri, string property, string intended_value) { //optimize NonQueryCommand("update "+GetGeneratedName(feeduri)+" set "+property+@"="""+EscapeParam(intended_value)+@""" where uri="""+EscapeParam(itemuri)+@""""); - Summa.Core.ChangedEventArgs args = new Summa.Core.ChangedEventArgs(); + ChangedEventArgs args = new ChangedEventArgs(); args.Uri = itemuri; args.FeedUri = feeduri; args.Value = intended_value; args.ItemProperty = property; - ItemChanged(this, args); + ItemChanged("", args); } - public ArrayList GetTags() { + public static ArrayList GetTags() { ArrayList list = new ArrayList(); foreach ( string feeduri in GetFeeds() ) { src/Summa.Core.Database.cs @@ -25,6 +25,8 @@ using System; +using Summa.Core; + namespace Summa.Core { public class NotificationEventArgs : EventArgs { public string Message; src/Summa.Core.EventArgs.cs @@ -25,6 +25,8 @@ using System; +using Summa.Core; + namespace Summa.Core { namespace Exceptions { // thrown when Update() or RegisterFeed() run into problems src/Summa.Core.Exceptions.cs @@ -26,6 +26,8 @@ using System; using System.Collections; +using Summa.Core; + namespace Summa.Core { public interface IBookmarker { void ShowBookmarkWindow(string title, string url, string content, string tags); src/Summa.Core.IBookmarker.cs @@ -25,6 +25,8 @@ using System; +using Summa.Core; + namespace Summa.Core { public interface IMediaPlayer { bool GetPlaying(); src/Summa.Core.IMediaPlayer.cs @@ -26,12 +26,14 @@ using System; using System.Collections; +using Summa.Data; + namespace Summa.Core { public interface ITheme { string Name {get;} string Uri {get; set;} - string MakeHtml(Summa.Data.ISource feed); - string MakeHtml(Summa.Data.Item item); + string MakeHtml(ISource feed); + string MakeHtml(Item item); } } src/Summa.Core.ITheme.cs @@ -25,30 +25,40 @@ using System; +using Summa.Core; + namespace Summa.Core { public static class Log { + public static event EventHandler LogAdded; + public static event EventHandler LogRemoved; + + private static LogList log_list; + + static Log() { + log_list = new LogList(); + } + public static void Exception(Exception e) { - Summa.Core.Application.Log.AddMessage(e.ToString()); + log_list.AddMessage(e.ToString()); + //Log.LogAdded(null, new EventArgs()); } public static void Exception(Exception e, string message) { - Summa.Core.Application.Log.AddMessage(e.ToString()+" with message "+message); + log_list.AddMessage(e.ToString()+" with message "+message); + //Log.LogAdded(null, new EventArgs()); } public static void Message(string message) { - Summa.Core.Application.Log.AddMessage(message); + log_list.AddMessage(message); + //Log.LogAdded(null, new EventArgs()); } public static void LogFunc(string log_domain, GLib.LogLevelFlags log_level, string message) { Message(message); } - public static void EmitLogAdded() { - //LogAdded(null, new EventArgs()); - } - - public static void EmitLogRemoved() { - //LogRemoved(null, new EventArgs()); + public static void RemoveLog() { + //Log.LogRemoved(null, new EventArgs()); } } } src/Summa.Core.Log.cs @@ -26,22 +26,22 @@ using System; using System.Collections; +using Summa.Core; + namespace Summa.Core { public class LogList : ArrayList { - public LogList() : base() { - } + public LogList() : base() {} public void AddMessage(string message) { this.Add(message); - Summa.Core.Log.EmitLogAdded(); this.Trim(); } private void Trim() { while ( Count > 100 ) { Remove(this[0]); - Summa.Core.Log.EmitLogRemoved(); + Log.RemoveLog(); } } } src/Summa.Core.LogList.cs @@ -27,37 +27,41 @@ using System; using NDesk.DBus; using Notifications; +using Summa.Core; + namespace Summa.Core { public static class Notifier { - public static event Summa.Core.NotificationEventHandler NewMessage; + public static event NotificationEventHandler NewMessage; public static event EventHandler ZoomChanged; public static event EventHandler ViewChanged; public static event EventHandler IconShown; public static void Notify(string message) { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = message; - NewMessage(null, args); + NewMessage("", args); } public static void PopupNotification(string message, string body) { Notifications.Notification n = new Notifications.Notification(message, body, "summa"); - if ( Summa.Core.Config.ShowStatusIcon ) { - //n.AttachToStatusIcon(Summa.Core.Application.StatusIcon); + if ( Config.ShowStatusIcon ) { + //n.AttachToStatusIcon(Application.StatusIcon); } n.Show(); } public static void ChangeZoom() { - ZoomChanged(null, new EventArgs()); + ZoomChanged("", new EventArgs()); } public static void ChangeView() { - ViewChanged(null, new EventArgs()); + ViewChanged("", new EventArgs()); } public static void ShowIcon() { - IconShown(null, new EventArgs()); + try { + IconShown("", new EventArgs()); + } catch ( Exception ) {} } } } src/Summa.Core.Notifier.cs @@ -26,16 +26,19 @@ using System; using System.Collections; +using Summa.Core; +using Summa.Gui; + namespace Summa.Core { public static class ThemeManager { public static ArrayList Themes { get { ArrayList list = new ArrayList(); - //FIXME: a foreach here, iterating over installed themes other - //than the default one + // FIXME: a foreach here, iterating over installed themes other + // than the default one - list.Add(new Summa.Gui.NativeTheme()); + list.Add(new NativeTheme()); return list; } } src/Summa.Core.ThemeManager.cs @@ -29,6 +29,9 @@ using System.Threading; using GLib; +using Summa.Core; +using Summa.Data; + namespace Summa.Core { public class Updater { public bool Updating; @@ -36,15 +39,15 @@ namespace Summa.Core { private Queue updating_queue; - private Summa.Data.ISource updating_feed; + private ISource updating_feed; private string adding_url; public ArrayList FeedsUpdating { get { - Summa.Data.Feed[] array = (Summa.Data.Feed[])updating_queue.ToArray(); + Feed[] array = (Feed[])updating_queue.ToArray(); ArrayList retval = new ArrayList(); - foreach ( Summa.Data.Feed feed in array ) { + foreach ( Feed feed in array ) { retval.Add(feed); } @@ -58,28 +61,28 @@ namespace Summa.Core { updating_queue = new Queue(); - GLib.Timeout.Add(Summa.Core.Config.GlobalUpdateInterval, new GLib.TimeoutHandler(ScheduledUpdate)); + GLib.Timeout.Add(Config.GlobalUpdateInterval, new GLib.TimeoutHandler(ScheduledUpdate)); } private void UpdateThread() { - foreach ( Summa.Data.Feed feed in updating_queue ) { + foreach ( Feed feed in updating_queue ) { Updating = true; bool update = false; //try { - Summa.Core.NotificationEventArgs fargs = new Summa.Core.NotificationEventArgs(); - fargs.Message = "Updating feed: "+feed.Name; + NotificationEventArgs fargs = new NotificationEventArgs(); + fargs.Message = String.Format(StringCatalog.UpdatingFeed, feed.Name); Gtk.Application.Invoke(this, fargs, OnNotify); update = feed.Update(); if ( update ) { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = feed.Name+" has new items."; args.Title = feed.Name; Gtk.Application.Invoke(this, args, OnNotify); } else { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = feed.Name+" has no new items."; Gtk.Application.Invoke(this, args, new EventHandler(OnNotify)); } @@ -88,11 +91,11 @@ namespace Summa.Core { } private void OnNotify(object obj, EventArgs args) { - Summa.Core.NotificationEventArgs iargs = (Summa.Core.NotificationEventArgs)args; - Summa.Core.Notifier.Notify(iargs.Message); + NotificationEventArgs iargs = (NotificationEventArgs)args; + Notifier.Notify(iargs.Message); if ( iargs.Title != null ) { - Summa.Core.Notifier.PopupNotification(iargs.Title, iargs.Message); + Notifier.PopupNotification(iargs.Title, iargs.Message); } } @@ -100,7 +103,7 @@ namespace Summa.Core { if (!Updating) { should_automatic_update = false; - foreach ( Summa.Data.Feed feed in Summa.Data.Core.GetFeeds() ) { + foreach ( Feed feed in Feeds.GetFeeds() ) { updating_queue.Enqueue(feed); } @@ -111,25 +114,25 @@ namespace Summa.Core { private void UpdateFeedThread() { try { - Summa.Core.NotificationEventArgs fargs = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs fargs = new NotificationEventArgs(); fargs.Message = "Updating feed: "+updating_feed.Name; Gtk.Application.Invoke(this, fargs, OnNotify); bool update = updating_feed.Update(); if ( update ) { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = updating_feed.Name+" has new items."; Gtk.Application.Invoke(this, args, OnNotify); } else { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = updating_feed.Name+" has no new items."; Gtk.Application.Invoke(this, args, new EventHandler(OnNotify)); } } catch ( NullReferenceException ) {} } - public void UpdateFeed(Summa.Data.ISource feed) { + public void UpdateFeed(ISource feed) { updating_feed = feed; System.Threading.Thread updatethread = new System.Threading.Thread(UpdateFeedThread); updatethread.Start(); @@ -137,7 +140,7 @@ namespace Summa.Core { public bool ScheduledUpdate() { if ( !Updating && should_automatic_update ) { - foreach ( Summa.Data.Feed feed in Summa.Data.Core.GetFeeds() ) { + foreach ( Feed feed in Feeds.GetFeeds() ) { updating_queue.Enqueue(feed); } @@ -148,27 +151,27 @@ namespace Summa.Core { } else { should_automatic_update = true; - GLib.Timeout.Add(Summa.Core.Config.GlobalUpdateInterval, new GLib.TimeoutHandler(ScheduledUpdate)); + GLib.Timeout.Add(Config.GlobalUpdateInterval, new GLib.TimeoutHandler(ScheduledUpdate)); return false; } } private void AddFeedThread() { - Summa.Core.NotificationEventArgs fargs = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs fargs = new NotificationEventArgs(); fargs.Message = "Adding feed "+adding_url; Gtk.Application.Invoke(this, fargs, OnNotify); try { - Summa.Data.Core.RegisterFeed(adding_url); + Feeds.RegisterFeed(adding_url); - fargs = new Summa.Core.NotificationEventArgs(); + fargs = new NotificationEventArgs(); fargs.Message = "Successfully added feed "+adding_url; Gtk.Application.Invoke(this, fargs, OnNotify); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); - fargs = new Summa.Core.NotificationEventArgs(); + fargs = new NotificationEventArgs(); fargs.Message = "Adding feed "+adding_url+" failed"; Gtk.Application.Invoke(this, fargs, OnNotify); } src/Summa.Core.Updater.cs @@ -27,21 +27,25 @@ using System; using System.Collections; using System.Linq; +using NewsKit; +using Summa.Core; +using Summa.Data; + namespace Summa.Data { public class ItemEventArgs : EventArgs { - public Summa.Data.Item Item; + public Item Item; public ItemEventArgs() {} } - public class Feed : Summa.Data.ISource { + public class Feed : ISource { public string Name { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[3]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "name", value); + Database.ChangeFeedInfo(Url, "name", value); } } private string url; @@ -51,54 +55,54 @@ namespace Summa.Data { } public string Author { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[4]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "author", value); + Database.ChangeFeedInfo(Url, "author", value); } } public string Subtitle { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[5]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "subtitle", value); + Database.ChangeFeedInfo(Url, "subtitle", value); } } public string License { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[7]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "license", value); + Database.ChangeFeedInfo(Url, "license", value); } } public string Image { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[6]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "image", value); + Database.ChangeFeedInfo(Url, "image", value); } } public string Status { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); return feed[10]; } set { - Summa.Core.Application.Database.ChangeFeedInfo(Url, "status", value); + Database.ChangeFeedInfo(Url, "status", value); } } public ArrayList Tags { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); string tags = feed[11]; - ArrayList al = new System.Collections.ArrayList(); + ArrayList al = new ArrayList(); foreach ( string tag in tags.Split(',') ) { al.Add(tag); } @@ -114,12 +118,12 @@ namespace Summa.Data { } string jtags = String.Join(",", tags); - Summa.Core.Application.Database.ChangeFeedInfo(Url, "tags", jtags); + Database.ChangeFeedInfo(Url, "tags", jtags); } } public Gdk.Pixbuf Favicon { get { - string[] feed = Summa.Core.Application.Database.GetFeed(Url); + string[] feed = Database.GetFeed(Url); if ( feed[12] == "" ) { return Gtk.IconTheme.Default.LookupIcon("feed-presence", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon(); } else { @@ -127,17 +131,17 @@ namespace Summa.Data { } } set { - //Summa.Core.Application.Database.ChangeFeedInfo(Url, "favicon", value); + //Database.ChangeFeedInfo(Url, "favicon", value); } } public ArrayList Items { get { - ArrayList uris = Summa.Core.Application.Database.GetPosts(Url); + ArrayList uris = Database.GetPosts(Url); ArrayList items = new ArrayList(); foreach ( string[] item in uris ) { - items.Add(new Summa.Data.Item(item[1], Url)); + items.Add(new Item(item[1], Url)); } return items; @@ -148,7 +152,7 @@ namespace Summa.Data { get { int count = 0; - foreach (string[] item in Summa.Core.Application.Database.GetPosts(Url)) { + foreach (string[] item in Database.GetPosts(Url)) { if ( item[8] == "False" ) { count++; } @@ -159,7 +163,7 @@ namespace Summa.Data { public bool HasUnread { get { - foreach ( string[] item in Summa.Core.Application.Database.GetPosts(Url)) { + foreach ( string[] item in Database.GetPosts(Url)) { if ( item[8] == "False" ) { return true; } @@ -205,44 +209,60 @@ namespace Summa.Data { } public bool Update() { - NewsKit.IFeedParser parser; - - bool success = NewsKit.Core.ParseUri(Url, Summa.Core.Application.Database.GetFeed(Url)[9], out parser); + IFeedParser p; + bool success = Parsing.ParseUri(Url, Database.GetFeed(Url)[9], out p); if ( !success ) { return false; } - parser.Items.Reverse(); - bool update = false; + bool updated = false; - ArrayList urls = new ArrayList(); + ArrayList urls_we_have = new ArrayList(); - foreach ( string[] item in Summa.Core.Application.Database.GetPosts(Url)) { - urls.Add(item[1]); + foreach ( string[] item in Database.GetPosts(Url)) { + urls_we_have.Add(item[1]); } - foreach ( NewsKit.Item item in parser.Items ) { - if ( !urls.Contains(item.Uri) ) { - update = true; - Summa.Core.Application.Database.AddItem(Url, item.Title, item.Uri, item.Date, item.LastUpdated, item.Author, item.Tags, item.Contents, item.EncUri, "False", "False"); + ArrayList items_to_add = new ArrayList(); + foreach ( Item item in p.Items ) { + if ( !urls_we_have.Contains(item.Uri) ) { + updated = true; + + items_to_add.Add(item); + } else { + // we do this because otherwise we have to deal with feeds + // like Cat and Girl, which have hundreds of items in + // them. Once we delete them (later in this function), we + // end up adding them again on the next update, only to + // delete them again. However, this means that items added + // in-between old items aren't caught. This is a problem, + // but it's rare enough that it doesn't really matter. + break; } } - if ( update ) { - // set the limit for the number of items we have at 100, but increase it by the number of flagged items so that they aren't dropped. - int limit = 100; - foreach ( string[] item in Summa.Core.Application.Database.GetPosts(Url) ) { + items_to_add.Reverse(); + foreach ( Item item in items_to_add ) { + Database.AddItem(Url, item.Title, item.Uri, item.Date.ToString(), item.LastUpdated.ToString(), item.Author, item.Tags, item.Contents, item.EncUri, "False", "False"); + } + + if ( updated ) { + // set the limit for the number of items we have at 100, + // but increase it by the number of flagged items so that + // they aren't dropped. + int limit = Config.NumberOfItems; + foreach ( string[] item in Database.GetPosts(Url) ) { if ( item[9] == "True" ) { limit++; } } - ArrayList del_items = Summa.Core.Application.Database.GetPosts(Url); + ArrayList del_items = Database.GetPosts(Url); foreach ( string[] item in del_items ) { - if ( Summa.Core.Application.Database.GetPosts(Url).Count > limit ) { + if ( Database.GetPosts(Url).Count > limit ) { if ( item[9] == "False" ) { - Summa.Core.Application.Database.DeleteItem(Url, item[1]); + Database.DeleteItem(Url, item[1]); } } else { break; @@ -250,11 +270,11 @@ namespace Summa.Data { } } - return update; + return updated; } public void MarkItemsRead() { - foreach (Summa.Data.Item item in Items) { + foreach (Item item in Items) { item.Read = true; } } src/Summa.Data.Feed.cs @@ -26,6 +26,8 @@ using System; using System.Collections; +using Summa.Core; + namespace Summa.Data { public interface ISource { string Name { get; set; } src/Summa.Data.ISource.cs @@ -25,27 +25,31 @@ using System; +using Summa.Core; +using Summa.Data; + namespace Summa.Data { public class Item { public string Title { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); - return item[0]; + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); + string hack = item[0].Replace("???", "'"); + return hack; } catch ( Exception e ) { Summa.Core.Log.Exception(e); return ""; } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "title", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "title", value); } } public string Uri; public DateTime Date { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); return Convert.ToDateTime(item[2]); } catch ( Exception e ) { Summa.Core.Log.Exception(e); @@ -53,13 +57,13 @@ namespace Summa.Data { } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "date", value.ToString()); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "date", value.ToString()); } } public string LastUpdated { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); return item[3]; } catch ( Exception e ) { Summa.Core.Log.Exception(e); @@ -67,13 +71,13 @@ namespace Summa.Data { } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "last_updated", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "last_updated", value); } } public string Author { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); return item[4]; } catch ( Exception e ) { Summa.Core.Log.Exception(e); @@ -81,13 +85,13 @@ namespace Summa.Data { } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "author", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "author", value); } } public string Tags { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); return item[5]; } catch ( Exception e ) { Summa.Core.Log.Exception(e); @@ -95,27 +99,29 @@ namespace Summa.Data { } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "title", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "title", value); } } public string Contents { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); - return item[6]; + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); + string hack = item[6].Replace("???", "'"); + hack = hack.Replace("??", ""); + return hack; } catch ( Exception e ) { Summa.Core.Log.Exception(e); return ""; } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "content", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "content", value); } } public string EncUri { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); return item[7]; } catch ( Exception e ) { Summa.Core.Log.Exception(e); @@ -123,13 +129,13 @@ namespace Summa.Data { } } set { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "encuri", value); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "encuri", value); } } public bool Read { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); string val = item[8]; if ( val == "True" ) { return true; @@ -143,16 +149,16 @@ namespace Summa.Data { } set { if ( value == true ) { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "read", "True"); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "read", "True"); } else { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "read", "False"); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "read", "False"); } } } public bool Flagged { get { try { - string[] item = Summa.Core.Application.Database.GetItem(FeedUri, Uri); + string[] item = Summa.Core.Database.GetItem(FeedUri, Uri); string val = item[9]; if ( val == "True" ) { return true; @@ -166,9 +172,9 @@ namespace Summa.Data { } set { if ( value == true ) { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "flagged", "True"); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "flagged", "True"); } else { - Summa.Core.Application.Database.ChangeItemInfo(FeedUri, Uri, "flagged", "False"); + Summa.Core.Database.ChangeItemInfo(FeedUri, Uri, "flagged", "False"); } } } src/Summa.Data.Item.cs @@ -26,6 +26,11 @@ using System; using System.Collections; +using Gtk; + +using Summa.Core; +using Summa.Data; + namespace Summa.Data { // simple dummy implementation of Search, only powerful enough for things // like "get all unread items." Real search support, with multiple params @@ -86,14 +91,14 @@ namespace Summa.Data { } public Gdk.Pixbuf Favicon { - get { return Gtk.IconTheme.Default.LookupIcon("system-search", (int)Gtk.IconSize.Menu, Gtk.IconLookupFlags.NoSvg).LoadIcon(); } + get { return IconTheme.Default.LookupIcon("system-search", (int)IconSize.Menu, IconLookupFlags.NoSvg).LoadIcon(); } set {} } public int UnreadCount { get { int count = 0; - foreach ( Summa.Data.Item item in Items ) { + foreach ( Item item in Items ) { if ( !item.Read ) { count++; } @@ -113,11 +118,11 @@ namespace Summa.Data { ArrayList items = new ArrayList(); foreach ( ArrayList term in terms ) { - foreach ( Summa.Data.Feed feed in Summa.Data.Core.GetFeeds() ) { + foreach ( Feed feed in Feeds.GetFeeds() ) { if ( (string)term[0] == "read" && (string)term[1] == "False" && !feed.HasUnread ) { continue; } else { - foreach ( Summa.Data.Item item in feed.Items ) { + foreach ( Item item in feed.Items ) { if ( (string)term[0] == "read" ) { if ( (string)term[1] == "True" && item.Read ) { items.Add(item); @@ -151,7 +156,7 @@ namespace Summa.Data { public bool Update() { return false; } public void MarkItemsRead() { - foreach ( Summa.Data.Item item in Items ) { + foreach ( Item item in Items ) { item.Read = true; } } src/Summa.Data.Search.cs @@ -27,6 +27,9 @@ using System; using Gtk; using Gdk; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { public class AboutDialog : Gtk.AboutDialog { public AboutDialog() { @@ -41,16 +44,16 @@ namespace Summa.Gui { authors[1] = "Will Farrington"; Authors = authors; - Comments = "Aggregate and read RSS feeds"; + Comments = StringCatalog.AboutComments; - IconTheme i = Gtk.IconTheme.Default; + IconTheme i = IconTheme.Default; - Gdk.Pixbuf image_window = i.LoadIcon("add", 0, Gtk.IconLookupFlags.NoSvg); + Pixbuf image_window = i.LoadIcon("add", 0, IconLookupFlags.NoSvg); LogoIconName = "summa"; Icon = image_window; - Response += new Gtk.ResponseHandler(OnHide); + Response += new ResponseHandler(OnHide); } private void OnHide(object obj, ResponseArgs args) { src/Summa.Gui.AboutDialog.cs @@ -28,29 +28,33 @@ using System; using System.Collections; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Actions { public class AddAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public AddAction(Summa.Gui.Browser browser) : base("Add", "_Add") { + public AddAction(Browser browser) : base("Add", "_Add") { this.browser = browser; Tooltip = "Create a new feed"; - StockId = Gtk.Stock.Add; + StockId = Stock.Add; Activated += NewAddFeedDialog; } public void NewAddFeedDialog(object obj, EventArgs args) { - Summa.Gui.AddFeedDialog add_dialog = new Summa.Gui.AddFeedDialog(); + AddFeedDialog add_dialog = new AddFeedDialog(); add_dialog.TransientFor = browser; add_dialog.Show(); } } public class ImportAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public ImportAction(Summa.Gui.Browser browser) : base("Import", "_Import") { + public ImportAction(Browser browser) : base("Import", "_Import") { this.browser = browser; Tooltip = "Import data"; @@ -58,16 +62,16 @@ namespace Summa.Actions { } public void Import(object obj, EventArgs args) { - Summa.Gui.FirstRun fr = new Summa.Gui.FirstRun(); + FirstRun fr = new FirstRun(); fr.TransientFor = browser; fr.ShowAll(); } } public class UpdateAllAction : Gtk.Action { - public UpdateAllAction(Summa.Gui.Browser browser) : base("Update_all", "_Update All") { + public UpdateAllAction(Browser browser) : base("Update_all", "_Update All") { Tooltip = "Update all feeds"; - StockId = Gtk.Stock.Refresh; + StockId = Stock.Refresh; Activated += UpdateAll; } @@ -77,13 +81,13 @@ namespace Summa.Actions { } public class PrintAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public PrintAction(Summa.Gui.Browser browser) : base("Print", "_Print") { + public PrintAction(Browser browser) : base("Print", "_Print") { this.browser = browser; Tooltip = "_Print the currently selected item"; - StockId = Gtk.Stock.Print; + StockId = Stock.Print; Activated += Print; Sensitive = false; } @@ -100,9 +104,9 @@ namespace Summa.Actions { } public class PrintPreviewAction : Gtk.Action { - public PrintPreviewAction(Summa.Gui.Browser browser) : base("Print_preview", "Print Previe_w") { + public PrintPreviewAction(Browser browser) : base("Print_preview", "Print Previe_w") { Tooltip = "Show a preview of the printed document"; - StockId = Gtk.Stock.PrintPreview; + StockId = Stock.PrintPreview; Activated += PrintPreview; Sensitive = false; } @@ -112,7 +116,7 @@ namespace Summa.Actions { } public class EmailLinkAction : Gtk.Action { - public EmailLinkAction(Summa.Gui.Browser browser) : base("Email_link", "_Email") { + public EmailLinkAction(Browser browser) : base("Email_link", "_Email") { Tooltip = "Email a copy of the selected item"; Activated += EmailLink; Sensitive = false; @@ -123,14 +127,14 @@ namespace Summa.Actions { } public class BookmarkAction : Gtk.Action { - private Summa.Gui.Browser browser; - private Summa.Core.IBookmarker bookmarker; + private Browser browser; + private IBookmarker bookmarker; - public BookmarkAction(Summa.Gui.Browser browser) : base("Bookmark", "_Bookmark") { + public BookmarkAction(Browser browser) : base("Bookmark", "_Bookmark") { this.browser = browser; - IconSet bookmark_iconset = new Gtk.IconSet(); - IconSource bookmark_iconsource = new Gtk.IconSource(); + IconSet bookmark_iconset = new IconSet(); + IconSource bookmark_iconsource = new IconSource(); bookmark_iconsource.IconName = "bookmark-new"; bookmark_iconset.AddSource(bookmark_iconsource); browser.factory.Add("summa-bookmark-new", bookmark_iconset); @@ -139,12 +143,12 @@ namespace Summa.Actions { StockId = "summa-bookmark-new"; Activated += Bookmark; - switch(Summa.Core.Config.Bookmarker) { + switch(Config.Bookmarker) { case "Native": - bookmarker = new Summa.Gui.NativeBookmarker(); + bookmarker = new NativeBookmarker(); break; case "Dieu": - bookmarker = new Summa.Gui.DieuBookmarker(); + bookmarker = new DieuBookmarker(); break; } } @@ -163,9 +167,9 @@ namespace Summa.Actions { } public class NewTabAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public NewTabAction(Summa.Gui.Browser browser) : base("New_tab", "Open in a New _Tab") { + public NewTabAction(Browser browser) : base("New_tab", "Open in a New _Tab") { this.browser = browser; Tooltip = "Open the current item in a new tab"; @@ -179,26 +183,26 @@ namespace Summa.Actions { } public class NewWindowAction : Gtk.Action { - public NewWindowAction(Summa.Gui.Browser browser) : base("New_window", "New _Window") { + public NewWindowAction(Browser browser) : base("New_window", "New _Window") { Tooltip = "Open a new window"; Activated += NewWindow; } public void NewWindow(object obj, EventArgs args) { - Window b = new Summa.Gui.Browser(); + Window b = new Browser(); Summa.Core.Application.Browsers.Add(b); b.ShowAll(); } } public class CloseWindowAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public CloseWindowAction(Summa.Gui.Browser browser) : base("Close_window", "_Close Window") { + public CloseWindowAction(Browser browser) : base("Close_window", "_Close Window") { this.browser = browser; Tooltip = "Close this window"; - StockId = Gtk.Stock.Close; + StockId = Stock.Close; Activated += CloseWindow; } @@ -208,9 +212,9 @@ namespace Summa.Actions { } public class CopyAction : Gtk.Action { - public CopyAction(Summa.Gui.Browser browser) : base("Copy", "_Copy") { + public CopyAction(Browser browser) : base("Copy", "_Copy") { Tooltip = "Copy"; - StockId = Gtk.Stock.Copy; + StockId = Stock.Copy; Activated += Copy; Sensitive = false; } @@ -220,7 +224,7 @@ namespace Summa.Actions { } public class SelectAllAction : Gtk.Action { - public SelectAllAction(Summa.Gui.Browser browser) : base("Select_all", "_Select All Text") { + public SelectAllAction(Browser browser) : base("Select_all", "_Select All Text") { Tooltip = "Select all text"; Activated += SelectAll; Sensitive = false; @@ -231,9 +235,9 @@ namespace Summa.Actions { } public class FindAction : Gtk.Action { - public FindAction(Summa.Gui.Browser browser) : base("Find", "_Find...") { + public FindAction(Browser browser) : base("Find", "_Find...") { Tooltip = "Find an item"; - StockId = Gtk.Stock.Find; + StockId = Stock.Find; Activated += Find; Sensitive = false; } @@ -243,31 +247,31 @@ namespace Summa.Actions { } public class PreferencesAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public PreferencesAction(Summa.Gui.Browser browser) : base("Preferences", "_Preferences") { + public PreferencesAction(Browser browser) : base("Preferences", "_Preferences") { this.browser = browser; Tooltip = "Preferences for Summa"; - StockId = Gtk.Stock.Preferences; + StockId = Stock.Preferences; Activated += ShowConfigDialog; } public void ShowConfigDialog(object obj, EventArgs args) { - Window w = new Summa.Gui.ConfigDialog(); + Window w = new ConfigDialog(); w.TransientFor = browser; w.ShowAll(); } } public class UpdateAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public UpdateAction(Summa.Gui.Browser browser) : base("Update", "_Update Feed") { + public UpdateAction(Browser browser) : base("Update", "_Update Feed") { this.browser = browser; Tooltip = "Update selected feed"; - StockId = Gtk.Stock.Refresh; + StockId = Stock.Refresh; Activated += Update; } @@ -288,13 +292,13 @@ namespace Summa.Actions { } public class MarkReadAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public MarkReadAction(Summa.Gui.Browser browser) : base("Mark_read", "_Mark Read") { + public MarkReadAction(Browser browser) : base("Mark_read", "_Mark Read") { this.browser = browser; Tooltip = "Mark all items in the selected feed as read"; - StockId = Gtk.Stock.Apply; + StockId = Stock.Apply; Activated += MarkAllItemsRead; } @@ -306,19 +310,19 @@ namespace Summa.Actions { } public class DeleteAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public DeleteAction(Summa.Gui.Browser browser) : base("Delete", "_Delete Feed") { + public DeleteAction(Browser browser) : base("Delete", "_Delete Feed") { this.browser = browser; Tooltip = "Delete the selected feed"; - StockId = Gtk.Stock.Delete; + StockId = Stock.Delete; Activated += DeleteFeed; } public void DeleteFeed(object obj, EventArgs args) { if ( browser.FeedView.HasSelected ) { - Window del = new Summa.Gui.DeleteConfirmationDialog(browser.curfeed); + Window del = new DeleteConfirmationDialog(browser.curfeed); del.TransientFor = browser; del.ShowAll(); } @@ -326,19 +330,19 @@ namespace Summa.Actions { } public class PropertiesAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public PropertiesAction(Summa.Gui.Browser browser) : base("Properties", "_Properties") { + public PropertiesAction(Browser browser) : base("Properties", "_Properties") { this.browser = browser; Tooltip = "Properties of the selected feed"; - StockId = Gtk.Stock.Properties; + StockId = Stock.Properties; Activated += ShowPropertiesDialog; } public void ShowPropertiesDialog(object obj, EventArgs args) { if ( browser.FeedView.HasSelected ) { - Window dialog = new Summa.Gui.FeedPropertiesDialog(browser.FeedView.Selected); + Window dialog = new FeedPropertiesDialog(browser.FeedView.Selected); dialog.TransientFor = browser; dialog.ShowAll(); } @@ -346,9 +350,9 @@ namespace Summa.Actions { } public class TagsAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public TagsAction(Summa.Gui.Browser browser) : base("Tags", "Edit Feed _Tags") { + public TagsAction(Browser browser) : base("Tags", "Edit Feed _Tags") { this.browser = browser; Tooltip = "Edit the tags of your feeds by tag"; @@ -356,20 +360,20 @@ namespace Summa.Actions { } public void ShowTagsWindow(object obj, EventArgs args) { - Window dialog = new Summa.Gui.TagWindow(); + Window dialog = new TagWindow(); dialog.TransientFor = browser; dialog.ShowAll(); } } public class ZoomInAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public ZoomInAction(Summa.Gui.Browser browser) : base("ZoomIn", "Zoom _In") { + public ZoomInAction(Browser browser) : base("ZoomIn", "Zoom _In") { this.browser = browser; Tooltip = "Increase text size"; - StockId = Gtk.Stock.ZoomIn; + StockId = Stock.ZoomIn; Activated += ZoomIn; } @@ -385,13 +389,13 @@ namespace Summa.Actions { } public class ZoomOutAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public ZoomOutAction(Summa.Gui.Browser browser) : base("ZoomOut", "Zoom _Out") { + public ZoomOutAction(Browser browser) : base("ZoomOut", "Zoom _Out") { this.browser = browser; Tooltip = "Decrease text size"; - StockId = Gtk.Stock.ZoomOut; + StockId = Stock.ZoomOut; Activated += ZoomOut; } @@ -401,7 +405,7 @@ namespace Summa.Actions { public void CheckShouldSensitive() { if ( browser.ItemView.HasSelected ) { - if ( Summa.Core.Config.DefaultZoomLevel != 3 ) { + if ( Config.DefaultZoomLevel != 3 ) { Sensitive = true; } else { Sensitive = false; @@ -410,8 +414,8 @@ namespace Summa.Actions { } } - public class LoadImagesAction : Gtk.ToggleAction { - public LoadImagesAction(Summa.Gui.Browser browser) : base("LoadImages", "_Load Images", null, null) { + public class LoadImagesAction : ToggleAction { + public LoadImagesAction(Browser browser) : base("LoadImages", "_Load Images", null, null) { Tooltip = "Load images in items"; Toggled += LoadImages; @@ -423,8 +427,8 @@ namespace Summa.Actions { } } - public class HideReadAction : Gtk.ToggleAction { - public HideReadAction(Summa.Gui.Browser browser) : base("Hide_read", "_Hide Read Items", null, null) { + public class HideReadAction : ToggleAction { + public HideReadAction(Browser browser) : base("Hide_read", "_Hide ReadSumma.Data.Items", null, null) { Tooltip = "Hide read items in the item list"; Toggled += HideRead; @@ -437,13 +441,13 @@ namespace Summa.Actions { } public class NextItemAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public NextItemAction(Summa.Gui.Browser browser) : base("Next_item", "_Next Item") { + public NextItemAction(Browser browser) : base("Next_item", "_NextSumma.Data.Item") { this.browser = browser; Tooltip = "Go to next unread item"; - StockId = Gtk.Stock.GoForward; + StockId = Stock.GoForward; Activated += GoToNextItem; } @@ -458,7 +462,7 @@ namespace Summa.Actions { browser.ItemView.GoToPreviousItem(); browser.UpdateHtmlview(); } else { - Summa.Core.Notifier.Notify("There are no more unread items."); + Notifier.Notify("There are no more unread items."); } } else { browser.UpdateHtmlview(); @@ -467,13 +471,13 @@ namespace Summa.Actions { } public class PreviousItemAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public PreviousItemAction(Summa.Gui.Browser browser) : base("Previous_item", "_Previous Item") { + public PreviousItemAction(Browser browser) : base("Previous_item", "_PreviousSumma.Data.Item") { this.browser = browser; Tooltip = "Go to the previous item"; - StockId = Gtk.Stock.GoBack; + StockId = Stock.GoBack; Activated += GoToPreviousItem; } @@ -486,10 +490,10 @@ namespace Summa.Actions { } public class FlagAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; private Summa.Data.Item item; - public FlagAction(Summa.Gui.Browser browser) : base("Flag_item", "Flag This Item") { + public FlagAction(Browser browser) : base("Flag_item", "Flag This Item") { this.browser = browser; Tooltip = "Flag/unflag this item"; @@ -505,9 +509,9 @@ namespace Summa.Actions { this.item = item; if ( item.Flagged ) { - Label = "Unflag this item"; + Label = "Unflag This Item"; } else { - Label = "Flag this item"; + Label = "Flag This Item"; } Sensitive = true; @@ -515,10 +519,10 @@ namespace Summa.Actions { } public class UnreadAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; private Summa.Data.Item item; - public UnreadAction(Summa.Gui.Browser browser) : base("Read_item", "Mark As Unread") { + public UnreadAction(Browser browser) : base("Read_item", "Mark As Unread") { this.browser = browser; Tooltip = "Mark this item as unread/read"; @@ -551,21 +555,21 @@ namespace Summa.Actions { } public class EnclosureAction : Gtk.Action { - private Summa.Gui.Browser browser; - private Summa.Core.IMediaPlayer mediaplayer; + private Browser browser; + private IMediaPlayer mediaplayer; - public EnclosureAction(Summa.Gui.Browser browser) : base("Play_pause", "_Play") { + public EnclosureAction(Browser browser) : base("Play_pause", "_Play") { this.browser = browser; Tooltip = "Play or pause the media enclosed"; - StockId = Gtk.Stock.MediaPlay; + StockId = Stock.MediaPlay; Activated += Play; - mediaplayer = new Summa.Gui.TotemMediaPlayer(); + mediaplayer = new TotemMediaPlayer(); } public void Play(object obj, EventArgs args) { - if ( browser.play_action.StockId == Gtk.Stock.MediaPause ) { + if ( browser.play_action.StockId == Stock.MediaPause ) { mediaplayer.Pause(); SetToPlay(); } else { @@ -584,19 +588,19 @@ namespace Summa.Actions { public void SetToPlay() { Label = "_Play"; - StockId = Gtk.Stock.MediaPlay; + StockId = Stock.MediaPlay; } public void SetToPause() { Label = "_Pause"; - StockId = Gtk.Stock.MediaPause; + StockId = Stock.MediaPause; } } public class SaveEnclosureAction : Gtk.Action { - public SaveEnclosureAction(Summa.Gui.Browser browser) : base("Save_enclosed", "_Save Enclosed Media") { + public SaveEnclosureAction(Browser browser) : base("Save_enclosed", "_Save Enclosed Media") { Tooltip = "Save the enclosed media"; - StockId = Gtk.Stock.Save; + StockId = Stock.Save; Activated += Save; Sensitive = false; } @@ -614,9 +618,9 @@ namespace Summa.Actions { } public class HelpAction : Gtk.Action { - public HelpAction(Summa.Gui.Browser browser) : base("Contents", "_Contents") { + public HelpAction(Browser browser) : base("Contents", "_Contents") { Tooltip = "Get help"; - StockId = Gtk.Stock.Help; + StockId = Stock.Help; Activated += Help; Sensitive = false; } @@ -626,13 +630,13 @@ namespace Summa.Actions { } public class AboutAction : Gtk.Action { - private Summa.Gui.Browser browser; + private Browser browser; - public AboutAction(Summa.Gui.Browser browser) : base("About", "_About") { + public AboutAction(Browser browser) : base("About", "_About") { this.browser = browser; Tooltip = "About"; - StockId = Gtk.Stock.About; + StockId = Stock.About; Activated += ShowAbout; } @@ -643,40 +647,40 @@ namespace Summa.Actions { } } - public class WidescreenViewAction : Gtk.RadioAction { - public WidescreenViewAction(Summa.Gui.Browser browser) : base("Wide_view", "_Use Widescreen View", null, null, 0) { + public class WidescreenViewAction : RadioAction { + public WidescreenViewAction(Browser browser) : base("Wide_view", "_Use Widescreen View", null, null, 0) { Tooltip = "Use the widescreen view"; Activated += SetView; - if ( Summa.Core.Config.WidescreenView ) { + if ( Config.WidescreenView ) { CurrentValue = Value; } - //Summa.Core.Notifier.ViewChanged += OnViewChanged; + //Notifier.ViewChanged += OnViewChanged; } public void SetView(object obj, EventArgs args) { if ( Summa.Core.Application.Browsers.Count > 0 ) { - Summa.Core.Config.WidescreenView = true; + Config.WidescreenView = true; } } } - public class NormalViewAction : Gtk.RadioAction { - public NormalViewAction(Summa.Gui.Browser browser) : base("Normal_view", "_Use Normal View", null, null, 0) { + public class NormalViewAction : RadioAction { + public NormalViewAction(Browser browser) : base("Normal_view", "_Use Normal View", null, null, 0) { Tooltip = "Use the normal view"; Activated += SetView; - if ( !Summa.Core.Config.WidescreenView ) { + if ( !Config.WidescreenView ) { CurrentValue = Value; } - //Summa.Core.Notifier.ViewChanged += OnViewChanged; + //Notifier.ViewChanged += OnViewChanged; } public void SetView(object obj, EventArgs args) { if ( Summa.Core.Application.Browsers.Count > 0 ) { - Summa.Core.Config.WidescreenView = false; + Config.WidescreenView = false; } } } src/Summa.Gui.Actions.cs @@ -26,20 +26,23 @@ using System; using Gtk; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { - public class AddFeedDialog : Gtk.Window { - private Gtk.VBox vbox; - private Gtk.HBox hbox; - private Gtk.HButtonBox bbox; - private Gtk.Image image; - private Gtk.Table table; - private Gtk.Label label; - private Gtk.Entry entry; - private Gtk.Button cancel_button; - private Gtk.Button add_button; + public class AddFeedDialog : Window { + private VBox vbox; + private HBox hbox; + private HButtonBox bbox; + private Image image; + private Table table; + private Label label; + private Entry entry; + private Button cancel_button; + private Button add_button; - public AddFeedDialog() : base(Gtk.WindowType.Toplevel) { - Title = "Add subscription"; + public AddFeedDialog() : base(WindowType.Toplevel) { + Title = StringCatalog.AddFeedTitle; IconName = "add"; DeleteEvent += OnCancel; @@ -47,37 +50,37 @@ namespace Summa.Gui { Resizable = false; BorderWidth = 6; - vbox = new Gtk.VBox(false, 6); + vbox = new VBox(false, 6); Add(vbox); - hbox = new Gtk.HBox(false, 6); + hbox = new HBox(false, 6); vbox.PackStart(hbox); - image = new Gtk.Image(Gtk.Stock.Add, Gtk.IconSize.Dialog); + image = new Image(Stock.Add, IconSize.Dialog); hbox.PackStart(image); - table = new Gtk.Table(2, 3, false); + table = new Table(2, 3, false); table.RowSpacing = 6; hbox.PackEnd(table); - label = new Gtk.Label(); - label.Markup = "<b>Enter the URL of the feed:</b>"; + label = new Label(); + label.Markup = StringCatalog.AddFeedMessage; table.Attach(label, 1, 2, 0, 1); - entry = new Gtk.Entry(); + entry = new Entry(); entry.Activated += OnActivated; table.Attach(entry, 1, 2, 1, 2); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; bbox.Spacing = 6; vbox.PackEnd(bbox); - cancel_button = new Gtk.Button(Gtk.Stock.Cancel); + cancel_button = new Button(Stock.Cancel); cancel_button.Clicked += new EventHandler(OnCancel); bbox.PackStart(cancel_button); - add_button = new Gtk.Button(Gtk.Stock.Add); + add_button = new Button(Stock.Add); add_button.Clicked += new EventHandler(OnAdd); add_button.GrabFocus(); bbox.PackEnd(add_button); src/Summa.Gui.AddFeedDialog.cs @@ -27,22 +27,25 @@ using System; using Gtk; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { - public class AddTagDialog : Gtk.Window { - private Summa.Gui.FeedPropertiesDialog propdialog; - private Summa.Gui.TagWindow twindow; + public class AddTagDialog : Window { + private FeedPropertiesDialog propdialog; + private TagWindow twindow; - private Gtk.VBox vbox; - private Gtk.HBox hbox; - private Gtk.HButtonBox bbox; - private Gtk.Image image; - private Gtk.Table table; - private Gtk.Label label; - private Gtk.Entry entry; - private Gtk.Button cancel_button; - private Gtk.Button add_button; + private VBox vbox; + private HBox hbox; + private HButtonBox bbox; + private Image image; + private Table table; + private Label label; + private Entry entry; + private Button cancel_button; + private Button add_button; - public AddTagDialog(Summa.Gui.FeedPropertiesDialog dialog) : base(Gtk.WindowType.Toplevel) { + public AddTagDialog(FeedPropertiesDialog dialog) : base(WindowType.Toplevel) { TransientFor = dialog; propdialog = dialog; @@ -51,7 +54,7 @@ namespace Summa.Gui { add_button.Clicked += new EventHandler(OnAdd); } - public AddTagDialog(Summa.Gui.TagWindow dialog) : base(Gtk.WindowType.Toplevel) { + public AddTagDialog(TagWindow dialog) : base(WindowType.Toplevel) { TransientFor = dialog; twindow = dialog; @@ -68,36 +71,36 @@ namespace Summa.Gui { Resizable = false; BorderWidth = 6; - vbox = new Gtk.VBox(false, 6); + vbox = new VBox(false, 6); Add(vbox); - hbox = new Gtk.HBox(false, 6); + hbox = new HBox(false, 6); vbox.PackStart(hbox); - image = new Gtk.Image(Gtk.Stock.Add, Gtk.IconSize.Dialog); + image = new Image(Stock.Add, IconSize.Dialog); hbox.PackStart(image); - table = new Gtk.Table(2, 3, false); + table = new Table(2, 3, false); table.RowSpacing = 6; hbox.PackEnd(table); - label = new Gtk.Label(); + label = new Label(); label.Markup = "Enter the name of the tag:"; table.Attach(label, 1, 2, 0, 1); - entry = new Gtk.Entry(); + entry = new Entry(); table.Attach(entry, 1, 2, 1, 2); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; bbox.Spacing = 6; vbox.PackEnd(bbox); - cancel_button = new Gtk.Button(Gtk.Stock.Cancel); + cancel_button = new Button(Stock.Cancel); cancel_button.Clicked += new EventHandler(OnCancel); bbox.PackStart(cancel_button); - add_button = new Gtk.Button(Gtk.Stock.Add); + add_button = new Button(Stock.Add); bbox.PackEnd(add_button); } src/Summa.Gui.AddTagDialog.cs @@ -19,7 +19,7 @@ // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// WHETHER IN AN Gtk.Action OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. @@ -27,13 +27,17 @@ using System; using System.Collections; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class Browser : Gtk.Window { + public class Browser : Window { public Gtk.ActionGroup action_group; - public Gtk.IconFactory factory; - public Gtk.UIManager uimanager; + public IconFactory factory; + public UIManager uimanager; - public Gtk.Table table; + public Table table; //menus public Gtk.Action file_menu; @@ -71,8 +75,8 @@ namespace Summa.Gui { // item menu public Summa.Actions.ZoomInAction zoom_in_action; public Summa.Actions.ZoomOutAction zoom_out_action; - public Gtk.ToggleAction load_images_action; - public Gtk.ToggleAction hide_read_action; + public ToggleAction load_images_action; + public ToggleAction hide_read_action; public Gtk.Action next_item_action; public Gtk.Action prev_item_action; public Summa.Actions.FlagAction flag_action; @@ -88,37 +92,37 @@ namespace Summa.Gui { public Gtk.Action help_action; public Gtk.Action about_action; - public Gtk.Widget menubar; - public Gtk.Widget toolbar; + public Widget menubar; + public Widget toolbar; - public Gtk.Paned main_paned; - public Gtk.Paned left_paned; - public Gtk.Paned right_paned; + public Paned main_paned; + public Paned left_paned; + public Paned right_paned; - public Summa.Gui.TagView TagView; - public Gtk.ScrolledWindow TagView_swin; - public Summa.Gui.FeedView FeedView; - public Gtk.ScrolledWindow FeedView_swin; - public Summa.Gui.ItemView ItemView; - public Gtk.ScrolledWindow ItemView_swin; + public TagView TagView; + public ScrolledWindow TagView_swin; + public FeedView FeedView; + public ScrolledWindow FeedView_swin; + public ItemView ItemView; + public ScrolledWindow ItemView_swin; public Summa.Data.Item item; - public Summa.Gui.ItemNotebook ItemNotebook; + public ItemNotebook ItemNotebook; - public Gtk.Button connection_button; - public Summa.Gui.NotificationBar StatusBar; + public Button connection_button; + public NotificationBar StatusBar; // the currently displayed feed - public Summa.Data.ISource curfeed; + public ISource curfeed; public Summa.Data.Item curitem; - public Browser() : base(Gtk.WindowType.Toplevel) { + public Browser() : base(WindowType.Toplevel) { Title = "Summa"; IconName = "summa"; action_group = new Gtk.ActionGroup("general"); - factory = new Gtk.IconFactory(); + factory = new IconFactory(); factory.AddDefault(); DestroyEvent += CloseWindow; @@ -126,79 +130,79 @@ namespace Summa.Gui { SetUpActionGroup(); - uimanager = new Gtk.UIManager(); + uimanager = new UIManager(); uimanager.InsertActionGroup(action_group, 0); AddAccelGroup(uimanager.AccelGroup); SetUpUimanager(); - table = new Gtk.Table(5, 5, false); + table = new Table(5, 5, false); Add(table); menubar = uimanager.GetWidget("/MenuBar"); - table.Attach(menubar, 0, 5, 0, 1, Gtk.AttachOptions.Fill, Gtk.AttachOptions.Fill, 0, 0); + table.Attach(menubar, 0, 5, 0, 1, AttachOptions.Fill, AttachOptions.Fill, 0, 0); toolbar = uimanager.GetWidget("/ToolBar"); - table.Attach(toolbar, 0, 5, 1, 2, Gtk.AttachOptions.Fill, Gtk.AttachOptions.Fill, 0, 0); + table.Attach(toolbar, 0, 5, 1, 2, AttachOptions.Fill, AttachOptions.Fill, 0, 0); - main_paned = new Gtk.HPaned(); + main_paned = new HPaned(); table.Attach(main_paned, 0, 5, 2, 3); - left_paned = new Gtk.VPaned(); + left_paned = new VPaned(); main_paned.Pack1(left_paned, true, true); - TagView = new Summa.Gui.TagView(); + TagView = new TagView(); TagView.CursorChanged += new EventHandler(TagviewChanged); - TagView_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + TagView_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); TagView_swin.Add(TagView); - TagView_swin.ShadowType = Gtk.ShadowType.In; - TagView_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + TagView_swin.ShadowType = ShadowType.In; + TagView_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); left_paned.Pack1(TagView_swin, true, true); - FeedView = new Summa.Gui.FeedView(); + FeedView = new FeedView(); FeedView.CursorChanged += new EventHandler(FeedviewChanged); - FeedView_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + FeedView_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); FeedView_swin.Add(FeedView); - FeedView_swin.ShadowType = Gtk.ShadowType.In; - FeedView_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + FeedView_swin.ShadowType = ShadowType.In; + FeedView_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); left_paned.Pack2(FeedView_swin, true, true); - if ( Summa.Core.Config.WidescreenView ) { - right_paned = new Gtk.HPaned(); + if ( Config.WidescreenView ) { + right_paned = new HPaned(); } else { - right_paned = new Gtk.VPaned(); + right_paned = new VPaned(); } main_paned.Pack2(right_paned, true, true); - ItemView = new Summa.Gui.ItemView(); + ItemView = new ItemView(); ItemView.CursorChanged += new EventHandler(ItemviewChanged); - ItemView_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ItemView_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); ItemView_swin.Add(ItemView); - ItemView_swin.ShadowType = Gtk.ShadowType.In; - ItemView_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + ItemView_swin.ShadowType = ShadowType.In; + ItemView_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); right_paned.Pack1(ItemView_swin, true, true); - ItemNotebook = new Summa.Gui.ItemNotebook(); + ItemNotebook = new ItemNotebook(); right_paned.Pack2(ItemNotebook, true, true); - StatusBar = new Summa.Gui.NotificationBar(); - table.Attach(StatusBar, 0, 5, 3, 4, Gtk.AttachOptions.Fill, Gtk.AttachOptions.Fill, 0, 0); + StatusBar = new NotificationBar(); + table.Attach(StatusBar, 0, 5, 3, 4, AttachOptions.Fill, AttachOptions.Fill, 0, 0); UpdateFromConfig(); FeedView.Populate("All"); - Summa.Core.Application.Database.ItemChanged += OnItemChanged; - Summa.Core.Application.Database.ItemAdded += OnItemAdded; - Summa.Core.Notifier.ViewChanged += OnViewChanged; + Database.ItemChanged += OnItemChanged; + Database.ItemAdded += OnItemAdded; + Notifier.ViewChanged += OnViewChanged; } private void OnViewChanged(object obj, EventArgs args) { right_paned.Remove(ItemView_swin); right_paned.Remove(ItemNotebook); main_paned.Remove(right_paned); - if ( Summa.Core.Config.WidescreenView ) { - right_paned = new Gtk.HPaned(); + if ( Config.WidescreenView ) { + right_paned = new HPaned(); } else { - right_paned = new Gtk.VPaned(); + right_paned = new VPaned(); } main_paned.Pack2(right_paned, true, true); right_paned.Add1(ItemView_swin); @@ -206,7 +210,7 @@ namespace Summa.Gui { ShowAll(); } - private void OnItemChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnItemChanged(object obj, ChangedEventArgs args) { if ( FeedView.HasSelected ) { if ( FeedView.Selected.Url == args.FeedUri ) { if ( args.ItemProperty == "read" ) { @@ -216,7 +220,7 @@ namespace Summa.Gui { } } - private void OnItemAdded(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemAdded(object obj, AddedEventArgs args) { if ( FeedView.HasSelected ) { if ( FeedView.Selected.Url == args.FeedUri ) { UpdateName(); @@ -240,7 +244,7 @@ namespace Summa.Gui { public void ItemviewChanged(object obj, EventArgs args) { UpdateHtmlview(); - play_action.StockId = Gtk.Stock.MediaPlay; + play_action.StockId = Stock.MediaPlay; if ( ItemView.Selected.EncUri != "" ) { play_action.Sensitive = true; @@ -251,8 +255,8 @@ namespace Summa.Gui { public void UpdateHtmlview() { curitem = ItemView.Selected; - Gtk.Bin c = (Gtk.Bin)ItemNotebook.GetNthPage(0); - Summa.Gui.WebKitView view = (Summa.Gui.WebKitView)c.Child; + Bin c = (Bin)ItemNotebook.GetNthPage(0); + WebKitView view = (WebKitView)c.Child; view.Render(curitem); ItemNotebook.ShowAll(); @@ -277,15 +281,15 @@ namespace Summa.Gui { } public void UpdateFromConfig() { - Resize(Summa.Core.Config.WindowWidth, Summa.Core.Config.WindowHeight); + Resize(Config.WindowWidth, Config.WindowHeight); - main_paned.Position = Summa.Core.Config.MainPanePosition; - left_paned.Position = Summa.Core.Config.LeftPanePosition; - right_paned.Position = Summa.Core.Config.RightPanePosition; + main_paned.Position = Config.MainPanePosition; + left_paned.Position = Config.LeftPanePosition; + right_paned.Position = Config.RightPanePosition; } - public void ShowNotification(Summa.Data.Feed feed) { - /*if (Summa.Core.Config.ShowNotifications) { + public void ShowNotification(Feed feed) { + /*if (Config.ShowNotifications) { var not = new Notify.Notification("New feed items", "Feed \""+feed.name+"\" has new unread items.", "internet-news-reader", null); not.set_urgency(Notify.Urgency.NORMAL); not.show(); @@ -293,7 +297,7 @@ namespace Summa.Gui { } public void UpdateName() { - Summa.Data.ISource feed = FeedView.Selected; + ISource feed = FeedView.Selected; Title = feed.Name+" ("+feed.UnreadCount.ToString()+" unread) - Summa"; } @@ -422,7 +426,7 @@ namespace Summa.Gui { about_action = new Summa.Actions.AboutAction(this); action_group.Add(about_action); - view_slist = new GLib.SList(typeof(Gtk.ToggleAction)); + view_slist = new GLib.SList(typeof(ToggleAction)); normal_view_action = new Summa.Actions.NormalViewAction(this); action_group.Add(normal_view_action); @@ -438,7 +442,7 @@ namespace Summa.Gui { public void SetUpUimanager() { string ui = @"<ui> <menubar name='MenuBar'> - <menu action='FileMenu'> + <menu Gtk.Action='FileMenu'> <menuitem action='Add'/> <menuitem action='Import'/> <separator/> @@ -451,7 +455,7 @@ namespace Summa.Gui { <menuitem action='New_window'/> <menuitem action='Close_window'/> </menu> - <menu action='EditMenu'> + <menu Gtk.Action='EditMenu'> <menuitem action='Copy'/> <separator/> <menuitem action='Select_all'/> @@ -461,7 +465,7 @@ namespace Summa.Gui { <separator/> <menuitem action='Preferences'/> </menu> - <menu action='ViewMenu'> + <menu Gtk.Action='ViewMenu'> <menuitem action='ZoomIn'/> <menuitem action='ZoomOut'/> <separator/> @@ -471,7 +475,7 @@ namespace Summa.Gui { <menuitem action='LoadImages'/> <menuitem action='Hide_read'/> </menu> - <menu action='SubsMenu'> + <menu Gtk.Action='SubsMenu'> <menuitem action='Update'/> <menuitem action='Mark_read'/> <separator/> @@ -481,7 +485,7 @@ namespace Summa.Gui { <menuitem action='Properties'/> <menuitem action='Tags'/> </menu> - <menu action='ItemMenu'> + <menu Gtk.Action='ItemMenu'> <menuitem action='Flag_item'/> <menuitem action='Read_item'/> <separator/> @@ -491,7 +495,7 @@ namespace Summa.Gui { <menuitem action='Email_link'/> <menuitem action='Bookmark'/> </menu> - <menu action='HelpMenu'> + <menu Gtk.Action='HelpMenu'> <menuitem action='Contents'/> <menuitem action='About'/> </menu> src/Summa.Gui.Browser.cs @@ -27,38 +27,42 @@ using System; using System.Collections; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class ConfigDialog : Gtk.Window { - private Gtk.VBox vbox; - private Gtk.Notebook notebook; - private Gtk.ButtonBox bbox; - private Gtk.VBox general_vbox; - private Gtk.VBox statusicon_vbox; - private Gtk.VBox feeds_vbox; + public class ConfigDialog : Window { + private VBox vbox; + private Notebook notebook; + private ButtonBox bbox; + private VBox general_vbox; + private VBox statusicon_vbox; + private VBox feeds_vbox; - private Gtk.CheckButton cb_notifications; - private Gtk.CheckButton cb_sortfeedview; - private Gtk.CheckButton cb_tabs; - private Gtk.CheckButton cb_icon; - private Gtk.CheckButton cb_widescreen; - private Gtk.ComboBox cb_updateinterval; + private CheckButton cb_notifications; + private CheckButton cb_sortfeedview; + private CheckButton cb_tabs; + private CheckButton cb_icon; + private CheckButton cb_widescreen; + private ComboBox cb_updateinterval; private string[] updateinterval_options; - private Gtk.ListStore store; + private ListStore store; - public ConfigDialog() : base(Gtk.WindowType.Toplevel) { + public ConfigDialog() : base(WindowType.Toplevel) { Title = "Summa Preferences"; BorderWidth = 5; DeleteEvent += OnClose; - vbox = new Gtk.VBox(); + vbox = new VBox(); vbox.Spacing = 6; Add(vbox); - notebook = new Gtk.Notebook(); + notebook = new Notebook(); vbox.PackStart(notebook, false, false, 0); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; vbox.PackStart(bbox, false, false, 0); AddGeneralTab(); @@ -67,12 +71,12 @@ namespace Summa.Gui { } private void AddGeneralTab() { - general_vbox = new Gtk.VBox(); + general_vbox = new VBox(); general_vbox.BorderWidth = 5; general_vbox.Spacing = 10; - Frame interface_frame = new Gtk.Frame(); - Label interface_label = new Gtk.Label(); + Frame interface_frame = new Frame(); + Label interface_label = new Label(); interface_label.Markup = ("<b>Interface</b>"); interface_label.UseUnderline = true; interface_frame.LabelWidget = interface_label; @@ -81,38 +85,38 @@ namespace Summa.Gui { interface_frame.Shadow = ShadowType.None; general_vbox.PackStart(interface_frame, false, false, 0); - Alignment interface_alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f); + Alignment interface_alignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f); interface_alignment.TopPadding = (uint)(interface_frame == null ? 0 : 5); interface_alignment.LeftPadding = 12; interface_frame.Add(interface_alignment); - VBox interface_vbox = new Gtk.VBox(); + VBox interface_vbox = new VBox(); interface_vbox.BorderWidth = 5; interface_vbox.Spacing = 6; interface_alignment.Add(interface_vbox); - cb_notifications = new Gtk.CheckButton("Show notifications on feed updates"); - cb_notifications.Active = Summa.Core.Config.ShowNotifications; + cb_notifications = new CheckButton("Show notifications on feed updates"); + cb_notifications.Active = Config.ShowNotifications; cb_notifications.Toggled += new EventHandler(OnCbNotificationsToggled); interface_vbox.PackStart(cb_notifications, false, false, 0); - cb_sortfeedview = new Gtk.CheckButton("Sort feeds according to unread items"); - cb_sortfeedview.Active = Summa.Core.Config.SortFeedview; + cb_sortfeedview = new CheckButton("Sort feeds according to unread items"); + cb_sortfeedview.Active = Config.SortFeedview; cb_sortfeedview.Toggled += new EventHandler(OnCbSortFeedViewToggled); interface_vbox.PackStart(cb_sortfeedview, false, false, 0); - cb_tabs = new Gtk.CheckButton("Open links in tabs inside Summa"); - cb_tabs.Active = Summa.Core.Config.OpenTabs; + cb_tabs = new CheckButton("Open links in tabs inside Summa"); + cb_tabs.Active = Config.OpenTabs; cb_tabs.Toggled += new EventHandler(OnCbTabsToggled); interface_vbox.PackStart(cb_tabs, false, false, 0); - cb_widescreen = new Gtk.CheckButton("Arrange window in widescreen mode"); - cb_widescreen.Active = Summa.Core.Config.WidescreenView; + cb_widescreen = new CheckButton("Arrange window in widescreen mode"); + cb_widescreen.Active = Config.WidescreenView; cb_widescreen.Toggled += new EventHandler(OnCbWidescreenToggled); interface_vbox.PackStart(cb_widescreen, false, false, 0); - Frame updating_frame = new Gtk.Frame(); - Label updating_label = new Gtk.Label(); + Frame updating_frame = new Frame(); + Label updating_label = new Label(); updating_label.Markup = ("<b>Updating</b>"); updating_label.UseUnderline = true; updating_frame.LabelWidget = updating_label; @@ -121,18 +125,18 @@ namespace Summa.Gui { updating_frame.Shadow = ShadowType.None; general_vbox.PackStart(updating_frame, false, false, 0); - Alignment updating_alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f); + Alignment updating_alignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f); updating_alignment.TopPadding = (uint)(updating_frame == null ? 0 : 5); updating_alignment.LeftPadding = 12; updating_frame.Add(updating_alignment); - VBox updating_vbox = new Gtk.VBox(); + VBox updating_vbox = new VBox(); updating_vbox.BorderWidth = 5; updating_vbox.Spacing = 6; updating_alignment.Add(updating_vbox); - Label updateinterval_label = new Gtk.Label("Update interval: "); - HBox updateinterval_hbox = new Gtk.HBox(); + Label updateinterval_label = new Label("Update interval: "); + HBox updateinterval_hbox = new HBox(); updateinterval_hbox.PackStart(updateinterval_label, false, false, 0); updating_vbox.PackStart(updateinterval_hbox); @@ -142,26 +146,26 @@ namespace Summa.Gui { updateinterval_options[2] = "Every two hours"; updateinterval_options[3] = "Daily"; - cb_updateinterval = new Gtk.ComboBox(updateinterval_options); + cb_updateinterval = new ComboBox(updateinterval_options); SetCbUpdateIntervalText(); cb_updateinterval.Changed += new EventHandler(OnCbUpdateIntervalChanged); updateinterval_hbox.PackStart(cb_updateinterval); - notebook.AppendPage(general_vbox, new Gtk.Label("General")); + notebook.AppendPage(general_vbox, new Label("General")); } private void AddStatusIconTab() { - statusicon_vbox = new Gtk.VBox(); + statusicon_vbox = new VBox(); statusicon_vbox.BorderWidth = 5; statusicon_vbox.Spacing = 10; - cb_icon = new Gtk.CheckButton("Show the status icon"); - cb_icon.Active = Summa.Core.Config.ShowStatusIcon; + cb_icon = new CheckButton("Show the status icon"); + cb_icon.Active = Config.ShowStatusIcon; cb_icon.Toggled += new EventHandler(OnCbIconToggled); statusicon_vbox.PackStart(cb_icon, false, false, 0); - Frame feeds_frame = new Gtk.Frame(); - Label feeds_label = new Gtk.Label(); + Frame feeds_frame = new Frame(); + Label feeds_label = new Label(); feeds_label.Markup = ("<b>Feeds to show icon for</b>"); feeds_label.UseUnderline = true; feeds_frame.LabelWidget = feeds_label; @@ -170,65 +174,65 @@ namespace Summa.Gui { feeds_frame.Shadow = ShadowType.None; statusicon_vbox.PackStart(feeds_frame, false, false, 0); - Alignment feeds_alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f); + Alignment feeds_alignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f); feeds_alignment.TopPadding = (uint)(feeds_frame == null ? 0 : 5); feeds_alignment.LeftPadding = 12; feeds_frame.Add(feeds_alignment); - feeds_vbox = new Gtk.VBox(); + feeds_vbox = new VBox(); feeds_vbox.BorderWidth = 5; feeds_vbox.Spacing = 6; feeds_alignment.Add(feeds_vbox); AddFeedTreeView(); - notebook.AppendPage(statusicon_vbox, new Gtk.Label("Status Icon")); + notebook.AppendPage(statusicon_vbox, new Label("Status Icon")); } private void OnCbNotificationsToggled(object obj, EventArgs args) { if ( cb_notifications.Active ) { - Summa.Core.Config.ShowNotifications = true; + Config.ShowNotifications = true; } else { - Summa.Core.Config.ShowNotifications = false; + Config.ShowNotifications = false; } } private void OnCbSortFeedViewToggled(object obj, EventArgs args) { if ( cb_sortfeedview.Active ) { - Summa.Core.Config.SortFeedview = true; + Config.SortFeedview = true; } else { - Summa.Core.Config.SortFeedview = false; + Config.SortFeedview = false; } } private void OnCbTabsToggled(object obj, EventArgs args) { if ( cb_tabs.Active ) { - Summa.Core.Config.OpenTabs = true; + Config.OpenTabs = true; } else { - Summa.Core.Config.OpenTabs = false; + Config.OpenTabs = false; } } private void OnCbIconToggled(object obj, EventArgs args) { if ( cb_icon.Active ) { - Summa.Core.Config.ShowStatusIcon = true; + Config.ShowStatusIcon = true; } else { - Summa.Core.Config.ShowStatusIcon = false; + Config.ShowStatusIcon = false; } } private void OnCbWidescreenToggled(object obj, EventArgs args) { if ( cb_widescreen.Active ) { - Summa.Core.Config.WidescreenView = true; + Config.WidescreenView = true; } else { - Summa.Core.Config.WidescreenView = false; + Config.WidescreenView = false; } } private void SetCbUpdateIntervalText() { TreeIter iter; - switch(Summa.Core.Config.GlobalUpdateInterval) { + switch(Config.GlobalUpdateInterval) { case 1800000: cb_updateinterval.Model.GetIterFirst(out iter); cb_updateinterval.SetActiveIter(iter); @@ -257,46 +261,46 @@ namespace Summa.Gui { private void OnCbUpdateIntervalChanged(object obj, EventArgs args) { switch(cb_updateinterval.ActiveText) { case "Every thirty minutes": - Summa.Core.Config.GlobalUpdateInterval = 1800000; + Config.GlobalUpdateInterval = 1800000; break; case "Every hour": - Summa.Core.Config.GlobalUpdateInterval = 3600000; + Config.GlobalUpdateInterval = 3600000; break; case "Every two hours": - Summa.Core.Config.GlobalUpdateInterval = 7200000; + Config.GlobalUpdateInterval = 7200000; break; case "Daily": - Summa.Core.Config.GlobalUpdateInterval = 86400000; + Config.GlobalUpdateInterval = 86400000; break; } } private void AddFeedTreeView() { - store = new Gtk.ListStore(typeof(bool), typeof(string), typeof(string), typeof(Gdk.Pixbuf)); + store = new ListStore(typeof(bool), typeof(string), typeof(string), typeof(Gdk.Pixbuf)); - CellRendererToggle crt = new Gtk.CellRendererToggle(); + CellRendererToggle crt = new CellRendererToggle(); crt.Activatable = true; - crt.Toggled += new Gtk.ToggledHandler(OnCrtToggled); + crt.Toggled += new ToggledHandler(OnCrtToggled); - CellRendererText trender = new Gtk.CellRendererText(); + CellRendererText trender = new CellRendererText(); trender.Ellipsize = Pango.EllipsizeMode.End; - TreeView treeview = new Gtk.TreeView(); + TreeView treeview = new TreeView(); treeview.Model = store; - ScrolledWindow treeview_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ScrolledWindow treeview_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); treeview_swin.Add(treeview); treeview_swin.SetSizeRequest(200, 300); - treeview_swin.ShadowType = Gtk.ShadowType.In; - treeview_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + treeview_swin.ShadowType = ShadowType.In; + treeview_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); - TreeViewColumn column_Use = new Gtk.TreeViewColumn("Use", crt, "active", 0); + TreeViewColumn column_Use = new TreeViewColumn("Use", crt, "active", 0); treeview.AppendColumn(column_Use); - TreeViewColumn column_Icon = new Gtk.TreeViewColumn("Icon", new Gtk.CellRendererPixbuf(), "pixbuf", 3); + TreeViewColumn column_Icon = new TreeViewColumn("Icon", new CellRendererPixbuf(), "pixbuf", 3); treeview.AppendColumn(column_Icon); - TreeViewColumn column_Name = new Gtk.TreeViewColumn("Title", trender, "text", 1); + TreeViewColumn column_Name = new TreeViewColumn("Title", trender, "text", 1); treeview.AppendColumn(column_Name); feeds_vbox.PackStart(treeview_swin); @@ -305,22 +309,22 @@ namespace Summa.Gui { private void OnCrtToggled(object obj, ToggledArgs args) { TreeIter iter; - store.GetIter(out iter, new Gtk.TreePath(args.Path)); + store.GetIter(out iter, new TreePath(args.Path)); if ( (bool)store.GetValue(iter, 0) ) { store.SetValue(iter, 0, false); - Summa.Data.Feed feed = Summa.Data.Core.RegisterFeed((string)store.GetValue(iter, 2)); + Feed feed = Feeds.RegisterFeed((string)store.GetValue(iter, 2)); - ArrayList uris = Summa.Core.Config.IconFeedUris; + ArrayList uris = Config.IconFeedUris; uris.Remove(feed.Url); - Summa.Core.Config.IconFeedUris = uris; + Config.IconFeedUris = uris; } else { store.SetValue(iter, 0, true); - Summa.Data.Feed feed = Summa.Data.Core.RegisterFeed((string)store.GetValue(iter, 2)); + Feed feed = Feeds.RegisterFeed((string)store.GetValue(iter, 2)); - ArrayList uris = Summa.Core.Config.IconFeedUris; + ArrayList uris = Config.IconFeedUris; uris.Add(feed.Url); - Summa.Core.Config.IconFeedUris = uris; + Config.IconFeedUris = uris; } Summa.Core.Application.StatusIcon.CheckVisibility(); } @@ -328,10 +332,10 @@ namespace Summa.Gui { private void Populate(string tag) { store.Clear(); - foreach ( Summa.Data.Feed feed in Summa.Data.Core.GetFeeds() ) { - Gtk.TreeIter iter = store.Append(); + foreach ( Feed feed in Feeds.GetFeeds() ) { + TreeIter iter = store.Append(); - store.SetValue(iter, 0, Summa.Core.Config.IconFeedUris.Contains(feed.Url)); + store.SetValue(iter, 0, Config.IconFeedUris.Contains(feed.Url)); store.SetValue(iter, 1, feed.Name); store.SetValue(iter, 2, feed.Url); store.SetValue(iter, 3, feed.Favicon); @@ -339,7 +343,7 @@ namespace Summa.Gui { } private void AddCloseButton() { - Button close_button = new Gtk.Button(Gtk.Stock.Close); + Button close_button = new Button(Stock.Close); close_button.Clicked += new EventHandler(OnClose); bbox.PackStart(close_button); } src/Summa.Gui.ConfigDialog.cs @@ -27,21 +27,25 @@ using System; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class DeleteConfirmationDialog : Gtk. Window { - private Summa.Data.ISource feed; + public class DeleteConfirmationDialog : Window { + private ISource feed; - private Gtk.VBox vbox; - private Gtk.HBox hbox; - private Gtk.Image image; - private Gtk.Table table; - private Gtk.Label label; - private Gtk.Label warn_label; - private Gtk.ButtonBox bbox; - private Gtk.Button cancel_button; - private Gtk.Button delete_button; + private VBox vbox; + private HBox hbox; + private Image image; + private Table table; + private Label label; + private Label warn_label; + private ButtonBox bbox; + private Button cancel_button; + private Button delete_button; - public DeleteConfirmationDialog(Summa.Data.ISource delfeed) : base(Gtk.WindowType.Toplevel) { + public DeleteConfirmationDialog(ISource delfeed) : base(WindowType.Toplevel) { feed = delfeed; Title = "Delete feed?"; @@ -52,40 +56,40 @@ namespace Summa.Gui { Resizable = false; BorderWidth = 6; - vbox = new Gtk.VBox(false, 6); + vbox = new VBox(false, 6); Add(vbox); - hbox = new Gtk.HBox(false, 6); + hbox = new HBox(false, 6); vbox.PackStart(hbox); - image = new Gtk.Image(Gtk.Stock.Delete, Gtk.IconSize.Dialog); + image = new Image(Stock.Delete, IconSize.Dialog); hbox.PackStart(image); - table = new Gtk.Table(2, 3, false); + table = new Table(2, 3, false); table.RowSpacing = 6; hbox.PackEnd(table); - label = new Gtk.Label(); + label = new Label(); label.Wrap = true; label.Markup = "<b><big>Delete feed "+feed.Name+"?</big></b>"; table.Attach(label, 1, 2, 0, 1); - warn_label = new Gtk.Label(); + warn_label = new Label(); warn_label.Wrap = true; warn_label.Markup = "This cannot be undone."; warn_label.SetAlignment(0.0F, 0.5F); table.Attach(warn_label, 1, 2, 1, 2); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; bbox.Spacing = 6; vbox.PackEnd(bbox); - cancel_button = new Gtk.Button(Gtk.Stock.Cancel); + cancel_button = new Button(Stock.Cancel); cancel_button.Clicked += new EventHandler(OnCancel); bbox.PackStart(cancel_button); - delete_button = new Gtk.Button(Gtk.Stock.Delete); + delete_button = new Button(Stock.Delete); delete_button.Clicked += new EventHandler(OnDelete); bbox.PackEnd(delete_button); } @@ -95,7 +99,7 @@ namespace Summa.Gui { } private void OnDelete(object obj, EventArgs args) { - Summa.Data.Core.DeleteFeed(feed.Url); + Feeds.DeleteFeed(feed.Url); Destroy(); } src/Summa.Gui.DeleteConfirmationDialog.cs @@ -27,13 +27,16 @@ using System; using System.Collections; using NDesk.DBus; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { public class DieuBookmarker : Summa.Core.IBookmarker { - private Summa.Gui.IDieu dieu; + private IDieu dieu; private bool possible; public DieuBookmarker() { - dieu = Bus.Session.GetObject<Summa.Gui.IDieu>("org.gnome.Dieu", new ObjectPath("/org/gnome/Dieu")); + dieu = Bus.Session.GetObject<IDieu>("org.gnome.Dieu", new ObjectPath("/org/gnome/Dieu")); possible = true; } src/Summa.Gui.DieuBookmarker.cs @@ -27,26 +27,30 @@ using System; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class FeedPropertiesDialog : Gtk.Window { - public Summa.Data.ISource feed; + public class FeedPropertiesDialog : Window { + public ISource feed; - private Gtk.VBox vbox; - private Gtk.Notebook notebook; - private Gtk.ButtonBox bbox; + private VBox vbox; + private Notebook notebook; + private ButtonBox bbox; - private Gtk.VBox general_vbox; - private Gtk.Entry entry_name; - private Gtk.Entry entry_author; - private Gtk.Entry entry_subtitle; - private Gtk.Entry entry_image; - private Gtk.Entry entry_url; + private VBox general_vbox; + private Entry entry_name; + private Entry entry_author; + private Entry entry_subtitle; + private Entry entry_image; + private Entry entry_url; - private Gtk.TreeView tv_tags; - public Gtk.ListStore store_tags; - private Gtk.CellRendererToggle cr_toggle; + private TreeView tv_tags; + public ListStore store_tags; + private CellRendererToggle cr_toggle; - public FeedPropertiesDialog(Summa.Data.ISource f) : base(Gtk.WindowType.Toplevel) { + public FeedPropertiesDialog(ISource f) : base(WindowType.Toplevel) { feed = f; Title = "\""+feed.Name+"\" Properties"; @@ -54,15 +58,15 @@ namespace Summa.Gui { BorderWidth = 5; DeleteEvent += OnClose; - vbox = new Gtk.VBox(); + vbox = new VBox(); vbox.Spacing = 6; Add(vbox); - notebook = new Gtk.Notebook(); + notebook = new Notebook(); vbox.PackStart(notebook, false, false, 0); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; vbox.PackStart(bbox, false, false, 0); AddGeneralTab(); @@ -71,12 +75,12 @@ namespace Summa.Gui { } private void AddGeneralTab() { - general_vbox = new Gtk.VBox(); + general_vbox = new VBox(); general_vbox.BorderWidth = 5; general_vbox.Spacing = 10; - Frame properties_frame = new Gtk.Frame(); - Label properties_label = new Gtk.Label(); + Frame properties_frame = new Frame(); + Label properties_label = new Label(); properties_label.Markup = ("<b>Properties</b>"); properties_label.UseUnderline = true; properties_frame.LabelWidget = properties_label; @@ -85,48 +89,48 @@ namespace Summa.Gui { properties_frame.Shadow = ShadowType.None; general_vbox.PackStart(properties_frame, false, false, 0); - Alignment properties_alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f); + Alignment properties_alignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f); properties_alignment.TopPadding = (uint)(properties_frame == null ? 0 : 5); properties_alignment.LeftPadding = 12; properties_frame.Add(properties_alignment); - Table properties_table = new Gtk.Table(2, 4, false); + Table properties_table = new Table(2, 4, false); properties_table.BorderWidth = 5; properties_table.ColumnSpacing = 6; properties_table.RowSpacing = 6; properties_alignment.Add(properties_table); - Label name_label = new Gtk.Label("Name: "); + Label name_label = new Label("Name: "); name_label.SetAlignment(0.0F, 0.5F); properties_table.Attach(name_label, 0, 1, 0, 1); - entry_name = new Gtk.Entry(feed.Name); + entry_name = new Entry(feed.Name); properties_table.Attach(entry_name, 1, 2, 0, 1); - Label author_label = new Gtk.Label("Author: "); + Label author_label = new Label("Author: "); author_label.SetAlignment(0.0F, 0.5F); properties_table.Attach(author_label, 0, 1, 1, 2); - entry_author = new Gtk.Entry(feed.Author); + entry_author = new Entry(feed.Author); properties_table.Attach(entry_author, 1, 2, 1, 2); - Label subtitle_label = new Gtk.Label("Subtitle: "); + Label subtitle_label = new Label("Subtitle: "); subtitle_label.SetAlignment(0.0F, 0.5F); properties_table.Attach(subtitle_label, 0, 1, 2, 3); - entry_subtitle = new Gtk.Entry(feed.Subtitle); + entry_subtitle = new Entry(feed.Subtitle); properties_table.Attach(entry_subtitle, 1, 2, 2, 3); - Label image_label = new Gtk.Label("Image: "); + Label image_label = new Label("Image: "); image_label.SetAlignment(0.0F, 0.5F); properties_table.Attach(image_label, 0, 1, 3, 4); - entry_image = new Gtk.Entry(feed.Image); + entry_image = new Entry(feed.Image); properties_table.Attach(entry_image, 1, 2, 3, 4); - Frame source_frame = new Gtk.Frame(); + Frame source_frame = new Frame(); source_frame.Sensitive = false; - Label source_label = new Gtk.Label(); + Label source_label = new Label(); source_label.Markup = ("<b>Source</b>"); source_label.UseUnderline = true; source_frame.LabelWidget = source_label; @@ -135,55 +139,55 @@ namespace Summa.Gui { source_frame.Shadow = ShadowType.None; general_vbox.PackStart(source_frame, false, false, 0); - Alignment source_alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f); + Alignment source_alignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f); source_alignment.TopPadding = (uint)(source_frame == null ? 0 : 5); source_alignment.LeftPadding = 12; source_frame.Add(source_alignment); - Table source_table = new Gtk.Table(2, 4, false); + Table source_table = new Table(2, 4, false); source_table.BorderWidth = 5; source_table.ColumnSpacing = 6; source_table.RowSpacing = 6; source_alignment.Add(source_table); - Label url_label = new Gtk.Label("URL: "); + Label url_label = new Label("URL: "); url_label.SetAlignment(0.0F, 0.5F); source_table.Attach(url_label, 0, 1, 0, 1); - entry_url = new Gtk.Entry(feed.Url); + entry_url = new Entry(feed.Url); source_table.Attach(entry_url, 1, 2, 0, 1); - notebook.AppendPage(general_vbox, new Gtk.Label("General")); + notebook.AppendPage(general_vbox, new Label("General")); } private void AddTagsTab() { - Table tags_table = new Gtk.Table(1, 2, false); + Table tags_table = new Table(1, 2, false); tags_table.BorderWidth = 5; tags_table.ColumnSpacing = 10; tags_table.RowSpacing = 10; - ScrolledWindow tags_swin = new Gtk.ScrolledWindow(); - tags_swin.ShadowType = Gtk.ShadowType.In; - tags_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + ScrolledWindow tags_swin = new ScrolledWindow(); + tags_swin.ShadowType = ShadowType.In; + tags_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); tags_table.Attach(tags_swin, 0, 1, 0, 1); - cr_toggle = new Gtk.CellRendererToggle(); + cr_toggle = new CellRendererToggle(); cr_toggle.Activatable = true; - cr_toggle.Toggled += new Gtk.ToggledHandler(OnCrToggleToggled); - tv_tags = new Gtk.TreeView(); + cr_toggle.Toggled += new ToggledHandler(OnCrToggleToggled); + tv_tags = new TreeView(); tags_swin.Add(tv_tags); - store_tags = new Gtk.ListStore(typeof(bool), typeof(string)); + store_tags = new ListStore(typeof(bool), typeof(string)); tv_tags.Model = store_tags; // set up the columns for the view - TreeViewColumn column_Read = new Gtk.TreeViewColumn("Use", cr_toggle, "active", 0); + TreeViewColumn column_Read = new TreeViewColumn("Use", cr_toggle, "active", 0); tv_tags.AppendColumn(column_Read); - TreeViewColumn column_Name = new Gtk.TreeViewColumn("Title", new Gtk.CellRendererText(), "text", 1); + TreeViewColumn column_Name = new TreeViewColumn("Title", new CellRendererText(), "text", 1); tv_tags.AppendColumn(column_Name); - foreach ( string tag in Summa.Data.Core.GetTags() ) { + foreach ( string tag in Feeds.GetTags() ) { TreeIter iter = store_tags.Append(); if ( feed.Tags.Contains(tag) ) { store_tags.SetValue(iter, 0, true); @@ -193,25 +197,25 @@ namespace Summa.Gui { store_tags.SetValue(iter, 1, tag); } - ButtonBox tags_bbox = new Gtk.HButtonBox(); - tags_bbox.Layout = Gtk.ButtonBoxStyle.End; + ButtonBox tags_bbox = new HButtonBox(); + tags_bbox.Layout = ButtonBoxStyle.End; tags_table.Attach(tags_bbox, 0, 1, 1, 2); - Button add_button = new Gtk.Button(Gtk.Stock.Add); + Button add_button = new Button(Stock.Add); add_button.Clicked += new EventHandler(OnAddButtonClicked); tags_bbox.PackStart(add_button); - notebook.AppendPage(tags_table, new Gtk.Label("Tags")); + notebook.AppendPage(tags_table, new Label("Tags")); } private void OnAddButtonClicked(object obj, EventArgs args) { - Window win = new Summa.Gui.AddTagDialog(this); + Window win = new AddTagDialog(this); win.ShowAll(); } private void OnCrToggleToggled(object obj, ToggledArgs args) { TreeIter iter; - store_tags.GetIter(out iter, new Gtk.TreePath(args.Path)); + store_tags.GetIter(out iter, new TreePath(args.Path)); if ( (bool)store_tags.GetValue(iter, 0) ) { store_tags.SetValue(iter, 0, false); @@ -223,7 +227,7 @@ namespace Summa.Gui { } private void AddCloseButton() { - Button close_button = new Gtk.Button(Gtk.Stock.Close); + Button close_button = new Button(Stock.Close); close_button.Clicked += new EventHandler(OnClose); bbox.PackStart(close_button); } src/Summa.Gui.FeedPropertiesDialog.cs @@ -25,21 +25,26 @@ using System; -using Gtk; using System.Collections; -using Gdk; using System.Linq; + +using Gtk; +using Gdk; using Pango; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class FeedView : Gtk.TreeView{ - public Gtk.ListStore store; + public class FeedView : TreeView{ + public ListStore store; public string SetTag; private ArrayList feeds; - public Gtk.TreeIter iter; - public Gtk.TreeModel selectmodel; + public TreeIter iter; + public TreeModel selectmodel; // a NewsKitFeed representing the feed selected // note that if no feed is selected, trying to get this will cause you @@ -54,7 +59,7 @@ namespace Summa.Gui { } } - public Summa.Data.ISource Selected { + public ISource Selected { get { if ( Selection.CountSelectedRows() != 0 ) { Selection.GetSelected(out selectmodel, out iter); @@ -63,15 +68,15 @@ namespace Summa.Gui { string val = (string)store.GetValue(iter, 2); if ( val != null ) { - return Summa.Data.Core.RegisterFeed(val); + return Feeds.RegisterFeed(val); } else { if ( (string)store.GetValue(iter, 1) == "Unread items" ) { - Summa.Data.Search search = new Summa.Data.Search("summasearch://read:false"); + Search search = new Search("summasearch://read:false"); search.Name = "Unread items"; search.AddSearchTerm("read", "False"); return search; } else if ( (string)store.GetValue(iter, 1) == "Flagged items" ) { - Summa.Data.Search search = new Summa.Data.Search("summasearch://flagged:true"); + Search search = new Search("summasearch://flagged:true"); search.Name = "Flagged items"; search.AddSearchTerm("flagged", "True"); return search; @@ -82,36 +87,36 @@ namespace Summa.Gui { } public bool FeedSort { - get { return Summa.Core.Config.SortFeedview; } + get { return Config.SortFeedview; } set { if ( value ) { - store.SetSortColumnId(3, Gtk.SortType.Descending); + store.SetSortColumnId(3, SortType.Descending); } - Summa.Core.Config.SortFeedview = value; + Config.SortFeedview = value; } } - private Gtk.CellRendererText trender; + private CellRendererText trender; private Hashtable feedhash; public FeedView() { // set up the liststore for the view - store = new Gtk.ListStore(typeof(Gdk.Pixbuf), // the icon - typeof(string), // the name - typeof(string), // the url - typeof(bool), // unread? - typeof(int)); // font weight + store = new ListStore(typeof(Gdk.Pixbuf), // the icon + typeof(string), // the name + typeof(string), // the url + typeof(bool), // unread? + typeof(int)); // font weight Model = store; - trender = new Gtk.CellRendererText(); + trender = new CellRendererText(); trender.Ellipsize = Pango.EllipsizeMode.End; // set up the columns for the view - TreeViewColumn column_Read = new Gtk.TreeViewColumn("Read", new Gtk.CellRendererPixbuf(), "pixbuf", 0); + TreeViewColumn column_Read = new TreeViewColumn("Read", new CellRendererPixbuf(), "pixbuf", 0); column_Read.SortColumnId = 3; column_Read.SortIndicator = false; AppendColumn(column_Read); - TreeViewColumn column_Name = new Gtk.TreeViewColumn("Title", trender, "text", 1); + TreeViewColumn column_Name = new TreeViewColumn("Title", trender, "text", 1); column_Name.AddAttribute(trender, "weight", 4); column_Name.SortColumnId = 1; column_Name.SortIndicator = true; @@ -122,40 +127,40 @@ namespace Summa.Gui { feedhash = new Hashtable(); feeds = new ArrayList(); - Summa.Core.Application.Database.FeedAdded += OnFeedAdded; - Summa.Core.Application.Database.FeedDeleted += OnFeedDeleted; - Summa.Core.Application.Database.FeedChanged += OnFeedChanged; - Summa.Core.Application.Database.ItemChanged += OnItemChanged; - Summa.Core.Application.Database.ItemAdded += OnItemAdded; - Summa.Core.Application.Database.ItemDeleted += OnItemDeleted; + Database.FeedAdded += OnFeedAdded; + Database.FeedDeleted += OnFeedDeleted; + Database.FeedChanged += OnFeedChanged; + Database.ItemChanged += OnItemChanged; + Database.ItemAdded += OnItemAdded; + Database.ItemDeleted += OnItemDeleted; } - private void OnFeedAdded (object obj, Summa.Core.AddedEventArgs args) { - Summa.Data.Feed feed = new Summa.Data.Feed(args.Uri); + private void OnFeedAdded (object obj, AddedEventArgs args) { + Feed feed = new Feed(args.Uri); if ( feed.Tags.Contains(SetTag) ) { - AddNewFeed(new Summa.Data.Feed(args.Uri)); + AddNewFeed(new Feed(args.Uri)); } ShowAll(); } - private void OnFeedDeleted(object obj, Summa.Core.AddedEventArgs args) { - DeleteFeed(new Summa.Data.Feed(args.Uri)); + private void OnFeedDeleted(object obj, AddedEventArgs args) { + DeleteFeed(new Feed(args.Uri)); } - private void OnFeedChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnFeedChanged(object obj, ChangedEventArgs args) { try { - UpdateFeed(new Summa.Data.Feed(args.Uri)); + UpdateFeed(new Feed(args.Uri)); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } if ( args.ItemProperty == "tags" ) { if ( args.Value.Split(',').Contains(SetTag) ) { try { } catch ( Exception ) { - AddNewFeed(new Summa.Data.Feed(args.Uri)); + AddNewFeed(new Feed(args.Uri)); } } } @@ -163,27 +168,27 @@ namespace Summa.Gui { ShowAll(); } - private void OnItemAdded(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemAdded(object obj, AddedEventArgs args) { try { - UpdateFeed(new Summa.Data.Feed(args.FeedUri)); + UpdateFeed(new Feed(args.FeedUri)); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } } - private void OnItemDeleted(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemDeleted(object obj, AddedEventArgs args) { try { - UpdateFeed(new Summa.Data.Feed(args.FeedUri)); + UpdateFeed(new Feed(args.FeedUri)); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } } - private void OnItemChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnItemChanged(object obj, ChangedEventArgs args) { try { - UpdateFeed(new Summa.Data.Feed(args.FeedUri)); + UpdateFeed(new Feed(args.FeedUri)); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } } @@ -202,29 +207,29 @@ namespace Summa.Gui { } public void Update() { - ArrayList ufeeds = Summa.Data.Core.GetFeeds(SetTag); + ArrayList ufeeds = Feeds.GetFeeds(SetTag); ArrayList haveurls = new ArrayList(); - foreach ( Summa.Data.ISource feed in feeds ) { + foreach ( ISource feed in feeds ) { haveurls.Add(feed.Url); } - foreach (Summa.Data.ISource feed in ufeeds) { + foreach (ISource feed in ufeeds) { if ( !haveurls.Contains(feed.Url) ) { - Gtk.TreeIter iter; + TreeIter iter; iter = store.Append(); AppendFeed(feed, iter); } } - feeds = Summa.Data.Core.GetFeeds(SetTag); + feeds = Feeds.GetFeeds(SetTag); } public void UpdateSelected() { AppendFeed(Selected, iter); } - public void UpdateFeed(Summa.Data.ISource feed) { + public void UpdateFeed(ISource feed) { TreePath path = (TreePath)feedhash[feed.Url]; TreeIter iter; store.GetIter(out iter, path); @@ -232,28 +237,28 @@ namespace Summa.Gui { QueueDraw(); } - public void DeleteFeed(Summa.Data.ISource feed) { + public void DeleteFeed(ISource feed) { try { TreePath path = (TreePath)feedhash[feed.Url]; TreeIter iter; store.GetIter(out iter, path); store.Remove(ref iter); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } QueueDraw(); QueueResize(); } - public void AddNewFeed(Summa.Data.ISource feed) { - Gtk.TreeIter iter = store.Append(); + public void AddNewFeed(ISource feed) { + TreeIter iter = store.Append(); AppendFeed(feed, iter); QueueDraw(); QueueResize(); } - public void AppendFeed(Summa.Data.ISource feed, Gtk.TreeIter titer) { + public void AppendFeed(ISource feed, TreeIter titer) { bool unread = feed.HasUnread; Gdk.Pixbuf icon = feed.Favicon; @@ -274,7 +279,7 @@ namespace Summa.Gui { try { feedhash.Add(feedurl, store.GetPath(titer)); } catch ( System.ArgumentException e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } } @@ -283,12 +288,12 @@ namespace Summa.Gui { SetTag = "Searches"; - Summa.Data.Search search = new Summa.Data.Search("summasearch://read:false"); + Search search = new Search("summasearch://read:false"); search.Name = "Unread items"; search.AddSearchTerm("read", "False"); AddNewFeed(search); - search = new Summa.Data.Search("summasearch://flagged:true"); + search = new Search("summasearch://flagged:true"); search.Name = "Flagged items"; search.AddSearchTerm("flagged", "True"); AddNewFeed(search); @@ -297,13 +302,13 @@ namespace Summa.Gui { private void PopulateWithFeeds(string tag) { store.Clear(); - feeds = Summa.Data.Core.GetFeeds(tag); + feeds = Feeds.GetFeeds(tag); SetTag = tag; - foreach (Summa.Data.Feed feed in feeds) { + foreach (Feed feed in feeds) { if ( tag == SetTag ) { - Gtk.TreeIter iter; + TreeIter iter; iter = store.Append(); AppendFeed(feed, iter); @@ -314,8 +319,7 @@ namespace Summa.Gui { } public bool GoToNextUnreadFeed() { - Gtk.TreeModel selectmodel; - + TreeModel selectmodel; if ( Selection.CountSelectedRows() != 0 ) { Selection.GetSelected(out selectmodel, out iter); } else { store.GetIterFirst(out iter); } @@ -323,7 +327,8 @@ namespace Summa.Gui { bool has_unread = false; while ( !has_unread ) { - GLib.Value readvalue = new GLib.Value(true); + GLib.Value readvalue = GLib.Value.Empty; + if ( !store.IterIsValid(iter) ) { break; } @@ -342,7 +347,7 @@ namespace Summa.Gui { store.GetIterFirst(out iter); while ( !has_unread ) { - GLib.Value readvalue = new GLib.Value(false); + GLib.Value readvalue = GLib.Value.Empty; if ( !store.IterIsValid(iter) ) { break; src/Summa.Gui.FeedView.cs @@ -24,8 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. using System; -using Gtk; using System.Collections; +using System.Threading; +using Gtk; + +using Summa.Core; +using Summa.Core.Exceptions; +using Summa.Data; +using Summa.Gui; namespace Summa.Gui { public class ProgressEventArgs : EventArgs { @@ -34,57 +40,57 @@ namespace Summa.Gui { public ProgressEventArgs() {} } - public class FirstRun : Gtk.Window { - private Gtk.VBox vbox; - private Gtk.HBox hbox; - private Gtk.HButtonBox bbox; - private Gtk.Image image; - private Gtk.Table table; - private Gtk.Label label; - private Gtk.FileChooserDialog fcdialog; - private Gtk.FileChooserButton fcbutton; - private Gtk.Button cancel_button; - private Gtk.Button add_button; - private Gtk.ProgressBar pb; + public class FirstRun : Window { + private VBox vbox; + private HBox hbox; + private HButtonBox bbox; + private Image image; + private Table table; + private Label label; + private FileChooserDialog fcdialog; + private FileChooserButton fcbutton; + private Button cancel_button; + private Button add_button; + private ProgressBar pb; private ArrayList failed_feeds; - public FirstRun() : base(Gtk.WindowType.Toplevel) { - IconName = Gtk.Stock.Convert; + public FirstRun() : base(WindowType.Toplevel) { + IconName = Stock.Convert; Title = "Import OPML file"; Resizable = false; BorderWidth = 6; - vbox = new Gtk.VBox(false, 6); + vbox = new VBox(false, 6); Add(vbox); - hbox = new Gtk.HBox(false, 6); + hbox = new HBox(false, 6); vbox.PackStart(hbox); - image = new Gtk.Image("dialog-question", Gtk.IconSize.Dialog); + image = new Image("dialog-question", IconSize.Dialog); hbox.PackStart(image); - table = new Gtk.Table(2, 3, false); + table = new Table(2, 3, false); table.RowSpacing = 6; hbox.PackStart(table); - label = new Gtk.Label("To import feeds, select an OPML file."); + label = new Label("To import feeds, select an OPML file."); label.LineWrap = true; table.Attach(label, 1, 2, 0, 1); - fcdialog = new Summa.Gui.OpmlDialog(); - fcbutton = new Gtk.FileChooserButton(fcdialog); + fcdialog = new OpmlDialog(); + fcbutton = new FileChooserButton(fcdialog); table.Attach(fcbutton, 1, 2, 1, 2); - bbox = new Gtk.HButtonBox(); + bbox = new HButtonBox(); vbox.PackEnd(bbox); - cancel_button = new Gtk.Button(Gtk.Stock.Cancel); + cancel_button = new Button(Stock.Cancel); cancel_button.Clicked += OnCancel; bbox.PackEnd(cancel_button); - add_button = new Gtk.Button(Gtk.Stock.Convert); + add_button = new Button(Stock.Convert); add_button.Clicked += new EventHandler(OnImport); bbox.PackEnd(add_button); } @@ -97,11 +103,11 @@ namespace Summa.Gui { Title = "Importing..."; add_button.Sensitive = false; - pb = new Gtk.ProgressBar(); + pb = new ProgressBar(); table.Attach(pb, 1, 2, 1, 2); pb.Show(); - System.Threading.Thread thread = new System.Threading.Thread(ImportThread); + Thread thread = new Thread(ImportThread); thread.Start(); } @@ -110,24 +116,24 @@ namespace Summa.Gui { if ( fcdialog.Uris.Length > 0 ) { string uri = fcdialog.Uri; - ArrayList feeds = Summa.Data.Core.ImportOpml(uri); + ArrayList feeds = Feeds.ImportOpml(uri); double step = 1.0/feeds.Count; double progress = 0.0; foreach ( string feed in feeds ) { - Summa.Core.NotificationEventArgs args = new Summa.Core.NotificationEventArgs(); + NotificationEventArgs args = new NotificationEventArgs(); args.Message = "Importing feed \""+feed+"\""; Gtk.Application.Invoke(this, args, new EventHandler(OnNotify)); bool it_worked = true; try { - Summa.Data.Core.RegisterFeed(feed); + Feeds.RegisterFeed(feed); it_worked = true; - } catch ( Summa.Core.Exceptions.BadFeed e ) { - Summa.Core.Log.Exception(e); + } catch ( BadFeed e ) { + Log.Exception(e); - args = new Summa.Core.NotificationEventArgs(); + args = new NotificationEventArgs(); args.Message = "Import of feed \""+feed+"\" failed"; Gtk.Application.Invoke(this, args, new EventHandler(OnNotify)); @@ -136,14 +142,14 @@ namespace Summa.Gui { it_worked = false; } - Summa.Gui.ProgressEventArgs pargs = new Summa.Gui.ProgressEventArgs(); + ProgressEventArgs pargs = new ProgressEventArgs(); pargs.Progress = progress; Gtk.Application.Invoke(this, pargs, new EventHandler(OnProgress)); progress += step; if ( it_worked ) { - args = new Summa.Core.NotificationEventArgs(); + args = new NotificationEventArgs(); args.Message = "Import of feed \""+feed+"\" was successful"; Gtk.Application.Invoke(this, args, new EventHandler(OnNotify)); } @@ -154,17 +160,17 @@ namespace Summa.Gui { } private void OnDialog(object obj, EventArgs args) { - Window md = new Summa.Gui.MessageDialog(failed_feeds); + Window md = new MessageDialog(failed_feeds); md.ShowAll(); } private void OnNotify(object obj, EventArgs args) { - Summa.Core.NotificationEventArgs iargs = (Summa.Core.NotificationEventArgs)args; - Summa.Core.Notifier.Notify(iargs.Message); + NotificationEventArgs iargs = (NotificationEventArgs)args; + Notifier.Notify(iargs.Message); } private void OnProgress(object obj, EventArgs args) { - Summa.Gui.ProgressEventArgs pargs = (Summa.Gui.ProgressEventArgs)args; + ProgressEventArgs pargs = (ProgressEventArgs)args; pb.Fraction = pargs.Progress; } } src/Summa.Gui.FirstRun.cs @@ -26,6 +26,9 @@ using System; using NDesk.DBus; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { [Interface ("org.gnome.Dieu")] public interface IDieu { src/Summa.Gui.IDieu.cs @@ -27,12 +27,16 @@ using System; using System.Collections; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class ItemNotebook : Gtk.Notebook { - public Summa.Gui.WebKitView CurrentView { + public class ItemNotebook : Notebook { + public WebKitView CurrentView { get { - Bin c = (Gtk.Bin)GetNthPage(Page); - return (Summa.Gui.WebKitView)c.Child; + Bin c = (Bin)GetNthPage(Page); + return (WebKitView)c.Child; } } @@ -49,20 +53,20 @@ namespace Summa.Gui { } public void Load(Summa.Data.Item item) { - Gtk.HBox container = new Gtk.HBox(); - Gtk.Label label = new Gtk.Label(item.Title); + HBox container = new HBox(); + Label label = new Label(item.Title); container.PackStart(label); - Gtk.Button button = new Gtk.Button(new Gtk.Image(Gtk.IconTheme.Default.LookupIcon("gtk-close", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon())); + Button button = new Button(new Image(IconTheme.Default.LookupIcon("gtk-close", 16, IconLookupFlags.NoSvg).LoadIcon())); button.Clicked += OnClicked; - button.Relief = Gtk.ReliefStyle.None; + button.Relief = ReliefStyle.None; button.SetSizeRequest(20, 20); container.PackEnd(button); - Summa.Gui.WebKitView view = new Summa.Gui.WebKitView(); + WebKitView view = new WebKitView(); view.notebook = this; - ScrolledWindow view_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ScrolledWindow view_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); view_swin.Add(view); - view_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + view_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); view.Render(item); hash.Add(container, view); @@ -79,22 +83,22 @@ namespace Summa.Gui { } public void Load(string content) { - Gtk.HBox container = new Gtk.HBox(); - Gtk.Label label = new Gtk.Label("Summa"); + HBox container = new HBox(); + Label label = new Label("Summa"); container.PackStart(label); if ( NPages != 0 ) { - Gtk.Button button = new Gtk.Button(new Gtk.Image(Gtk.IconTheme.Default.LookupIcon("gtk-close", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon())); + Button button = new Button(new Image(IconTheme.Default.LookupIcon("gtk-close", 16, IconLookupFlags.NoSvg).LoadIcon())); button.Clicked += OnClicked; - button.Relief = Gtk.ReliefStyle.None; + button.Relief = ReliefStyle.None; button.SetSizeRequest(20, 20); container.PackEnd(button); } - Summa.Gui.WebKitView view = new Summa.Gui.WebKitView(); + WebKitView view = new WebKitView(); view.notebook = this; - ScrolledWindow view_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ScrolledWindow view_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); view_swin.Add(view); - view_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + view_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); view.Render(content); hash.Add(container, view); @@ -111,20 +115,20 @@ namespace Summa.Gui { } public void LoadUri(string uri) { - Gtk.HBox container = new Gtk.HBox(); - Gtk.Label label = new Gtk.Label(uri); + HBox container = new HBox(); + Label label = new Label(uri); container.PackStart(label); - Gtk.Button button = new Gtk.Button(new Gtk.Image(Gtk.IconTheme.Default.LookupIcon("gtk-close", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon())); + Button button = new Button(new Image(IconTheme.Default.LookupIcon("gtk-close", 16, IconLookupFlags.NoSvg).LoadIcon())); button.Clicked += OnClicked; - button.Relief = Gtk.ReliefStyle.None; + button.Relief = ReliefStyle.None; button.SetSizeRequest(20, 20); container.PackEnd(button); - Summa.Gui.WebKitView view = new Summa.Gui.WebKitView(); + WebKitView view = new WebKitView(); view.notebook = this; - ScrolledWindow view_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ScrolledWindow view_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); view_swin.Add(view); - view_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + view_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); view.RenderUri(uri); hash.Add(container, view); @@ -141,8 +145,8 @@ namespace Summa.Gui { } private void OnClicked(object obj, EventArgs args) { - Button b = (Gtk.Button)obj; - Gtk.Widget o = (Gtk.Widget)hash[b.Parent]; + Button b = (Button)obj; + Widget o = (Widget)hash[b.Parent]; int pos = PageNum(o.Parent); RemovePage(pos); hash.Remove(b.Parent); src/Summa.Gui.ItemNotebook.cs @@ -29,20 +29,24 @@ using Gdk; using System.Collections; using System.Linq; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class ItemView : Gtk.TreeView { - public Gtk.ListStore store; - private Gtk.IconTheme icon_theme; + public class ItemView : TreeView { + public ListStore store; + private IconTheme icon_theme; private Gdk.Pixbuf icon; - private Summa.Data.ISource feedobj; + private ISource feedobj; private ArrayList items; private Hashtable itemhash; - private Gtk.TreeIter iter; + private TreeIter iter; - private Gtk.TreeViewColumn column_Date; - private Gtk.TreeViewColumn column_Title; + private TreeViewColumn column_Date; + private TreeViewColumn column_Title; public bool HasSelected { get { @@ -56,7 +60,7 @@ namespace Summa.Gui { public Summa.Data.Item Selected { get { - Gtk.TreeModel selectmodel; + TreeModel selectmodel; if ( Selection.CountSelectedRows() != 0 ) { Selection.GetSelected(out selectmodel, out iter); } else { store.GetIterFirst(out iter); } @@ -66,28 +70,28 @@ namespace Summa.Gui { public ItemView() { // set up the liststore for the view - store = new Gtk.ListStore(typeof(Gdk.Pixbuf), typeof(bool), typeof(bool), typeof(string), typeof(string), typeof(string), typeof(int)); + store = new ListStore(typeof(Gdk.Pixbuf), typeof(bool), typeof(bool), typeof(string), typeof(string), typeof(string), typeof(int)); Model = store; // set up the columns for the view - InsertColumn(-1, "Read", new Gtk.CellRendererPixbuf(), "pixbuf", 0); - CellRendererText trender = new Gtk.CellRendererText(); + InsertColumn(-1, "Read", new CellRendererPixbuf(), "pixbuf", 0); + CellRendererText trender = new CellRendererText(); - column_Date = new Gtk.TreeViewColumn("Date", trender, "text", 3); + column_Date = new TreeViewColumn("Date", trender, "text", 3); column_Date.AddAttribute(trender, "weight", 6); column_Date.SortColumnId = 3; column_Date.SortIndicator = true; AppendColumn(column_Date); - column_Title = new Gtk.TreeViewColumn("Title", trender, "text", 4); + column_Title = new TreeViewColumn("Title", trender, "text", 4); column_Title.AddAttribute(trender, "weight", 6); AppendColumn(column_Title); RulesHint = true; HeadersClickable = true; - store.SetSortColumnId(3, Gtk.SortType.Descending); + store.SetSortColumnId(3, SortType.Descending); // set up the icon theme so that we can make stuff pretty - icon_theme = Gtk.IconTheme.Default; + icon_theme = IconTheme.Default; } private void PopulateItem(Summa.Data.Item item) { @@ -95,16 +99,16 @@ namespace Summa.Gui { try { iter = (TreeIter)itemhash[item.Uri]; } catch ( NullReferenceException e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); iter = store.Append(); itemhash.Add(item.Uri, iter); } if (!item.Read) { - icon = icon_theme.LookupIcon("feed-item", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon(); + icon = icon_theme.LookupIcon("feed-item", 16, IconLookupFlags.NoSvg).LoadIcon(); store.SetValue(iter, 6, (int)Pango.Weight.Bold); } else if (item.Flagged) { - icon = icon_theme.LookupIcon("emblem-important", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon(); + icon = icon_theme.LookupIcon("emblem-important", 16, IconLookupFlags.NoSvg).LoadIcon(); store.SetValue(iter, 6, (int)Pango.Weight.Normal); } else { icon = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 0, 0, 0); @@ -124,11 +128,11 @@ namespace Summa.Gui { TreeIter iter = (TreeIter)itemhash[item.Uri]; store.Remove(ref iter); } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); } } - public void Populate(Summa.Data.ISource feed) { + public void Populate(ISource feed) { feedobj = feed; items = feed.Items; items.Reverse(); @@ -145,13 +149,13 @@ namespace Summa.Gui { } } - Summa.Core.Application.Database.FeedDeleted += OnFeedDeleted; - Summa.Core.Application.Database.ItemAdded += OnItemAdded; - Summa.Core.Application.Database.ItemDeleted += OnItemDeleted; - Summa.Core.Application.Database.ItemChanged += OnItemChanged; + Database.FeedDeleted += OnFeedDeleted; + Database.ItemAdded += OnItemAdded; + Database.ItemDeleted += OnItemDeleted; + Database.ItemChanged += OnItemChanged; } - private void OnFeedDeleted(object obj, Summa.Core.AddedEventArgs args) { + private void OnFeedDeleted(object obj, AddedEventArgs args) { if ( feedobj.Url == args.Uri ) { Gtk.Application.Invoke(this, new EventArgs(), new EventHandler(InvokeStoreClear)); } @@ -161,37 +165,37 @@ namespace Summa.Gui { store.Clear(); } - private void OnItemAdded(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemAdded(object obj, AddedEventArgs args) { if ( feedobj.Url == args.FeedUri ) { Gtk.Application.Invoke(this, args, new EventHandler(InvokeAddItem)); } } private void InvokeAddItem(object obj, EventArgs args) { - Summa.Core.AddedEventArgs aargs = (Summa.Core.AddedEventArgs)args; + AddedEventArgs aargs = (AddedEventArgs)args; PopulateItem(new Summa.Data.Item(aargs.Uri, aargs.FeedUri)); } - private void OnItemDeleted(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemDeleted(object obj, AddedEventArgs args) { if ( feedobj.Url == args.FeedUri ) { Gtk.Application.Invoke(this, args, new EventHandler(InvokeDeleteItem)); } } private void InvokeDeleteItem(object obj, EventArgs args) { - Summa.Core.AddedEventArgs aargs = (Summa.Core.AddedEventArgs)args; + AddedEventArgs aargs = (AddedEventArgs)args; DeleteItem(new Summa.Data.Item(aargs.Uri, aargs.FeedUri)); } - private void OnItemChanged(object obj, Summa.Core.ChangedEventArgs args ) { + private void OnItemChanged(object obj, ChangedEventArgs args ) { if ( args.FeedUri == feedobj.Url ) { Gtk.Application.Invoke(this, args, new EventHandler(InvokeChangeItem)); } } private void InvokeChangeItem(object obj, EventArgs args) { - Summa.Core.ChangedEventArgs aargs = (Summa.Core.ChangedEventArgs)args; + ChangedEventArgs aargs = (ChangedEventArgs)args; PopulateItem(new Summa.Data.Item(aargs.Uri, aargs.FeedUri)); } @@ -223,7 +227,7 @@ namespace Summa.Gui { items = feedobj.Items; } catch ( Exception e ) { - Summa.Core.Log.Exception(e, "No feed selected"); + Log.Exception(e, "No feed selected"); } } @@ -239,7 +243,7 @@ namespace Summa.Gui { public void GoToPreviousItem() { if ( Selection.CountSelectedRows() != 0 ) { - Gtk.TreeModel selectmodel; + TreeModel selectmodel; Selection.GetSelected(out selectmodel, out iter); } else { store.GetIterFirst(out iter); @@ -257,14 +261,14 @@ namespace Summa.Gui { public bool GoToNextItem() { if ( Selection.CountSelectedRows() != 0 ) { - Gtk.TreeModel selectmodel; + TreeModel selectmodel; Selection.GetSelected(out selectmodel, out iter); } else { store.GetIterFirst(out iter); } bool has_unread = false; while ( !has_unread ) { - GLib.Value readvalue = new GLib.Value(false); + GLib.Value readvalue = GLib.Value.Empty; if ( !store.IterIsValid(iter) ) { break; } @@ -286,7 +290,7 @@ namespace Summa.Gui { store.GetIterFirst(out iter); while ( true ) { - GLib.Value readvalue = new GLib.Value(false); + GLib.Value readvalue = GLib.Value.Empty; if (!store.IterIsValid(iter)) { break; } @@ -302,7 +306,7 @@ namespace Summa.Gui { } } - private Summa.Data.Item ItemFromIter(Gtk.TreeIter treeiter) { + private Summa.Data.Item ItemFromIter(TreeIter treeiter) { string val = (string)store.GetValue(iter, 5); bool fail = false; Summa.Data.Item item = null; @@ -317,7 +321,7 @@ namespace Summa.Gui { } if ( fail ) { - item = Summa.Data.Core.GetItem(val); + item = Feeds.GetItem(val); } return item; @@ -366,7 +370,7 @@ namespace Summa.Gui { return year+"/"+month+"/"+day+" at "+hour+":"+minute+":"+second; } catch ( Exception e ) { - Summa.Core.Log.Exception(e); + Log.Exception(e); return ""; } } src/Summa.Gui.ItemView.cs @@ -25,23 +25,25 @@ using System; using System.Collections; - using Gtk; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { - public class MessageDialog : Gtk.Window { - private Gtk.VBox vbox; - private Gtk.HBox hbox; - private Gtk.HButtonBox bbox; - private Gtk.Image image; - private Gtk.Table table; - private Gtk.Label label; - private Gtk.TextBuffer buffer; - private Gtk.TextView textview; - private Gtk.ScrolledWindow textviewsw; - private Gtk.Button close_button; + public class MessageDialog : Window { + private VBox vbox; + private HBox hbox; + private HButtonBox bbox; + private Image image; + private Table table; + private Label label; + private TextBuffer buffer; + private TextView textview; + private ScrolledWindow textviewsw; + private Button close_button; - public MessageDialog(ArrayList list) : base(Gtk.WindowType.Toplevel) { + public MessageDialog(ArrayList list) : base(WindowType.Toplevel) { Title = "Error"; IconName = "dialog-error"; @@ -50,49 +52,49 @@ namespace Summa.Gui { Resizable = false; BorderWidth = 6; - vbox = new Gtk.VBox(false, 6); + vbox = new VBox(false, 6); Add(vbox); - hbox = new Gtk.HBox(false, 6); + hbox = new HBox(false, 6); vbox.PackStart(hbox); - image = new Gtk.Image(Gtk.Stock.DialogError, Gtk.IconSize.Dialog); + image = new Image(Stock.DialogError, IconSize.Dialog); hbox.PackStart(image); - table = new Gtk.Table(2, 3, false); + table = new Table(2, 3, false); table.RowSpacing = 6; hbox.PackEnd(table); - label = new Gtk.Label(); + label = new Label(); label.Markup = "<big><b>Some feeds failed to import</b></big>"; table.Attach(label, 1, 2, 0, 1); - buffer = new Gtk.TextBuffer(new Gtk.TextTagTable()); + buffer = new TextBuffer(new TextTagTable()); foreach ( string feed in list ) { buffer.Text = buffer.Text + feed+"\n";; } - textview = new Gtk.TextView(buffer); + textview = new TextView(buffer); textview.Editable = false; - textview.WrapMode = Gtk.WrapMode.Word; + textview.WrapMode = WrapMode.Word; textview.SetSizeRequest(400, 150); - textviewsw = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); - textviewsw.ShadowType = Gtk.ShadowType.In; - textviewsw.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + textviewsw = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); + textviewsw.ShadowType = ShadowType.In; + textviewsw.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); textviewsw.Add(textview); table.Attach(textviewsw, 1, 2, 1, 2); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; bbox.Spacing = 6; vbox.PackEnd(bbox); - close_button = new Gtk.Button(Gtk.Stock.Close); + close_button = new Button(Stock.Close); close_button.Clicked += new EventHandler(OnClose); bbox.PackStart(close_button); - TransientFor = (Summa.Gui.Browser)Summa.Core.Application.Browsers[0]; + TransientFor = (Browser)Summa.Core.Application.Browsers[0]; } private void OnClose(object obj, EventArgs args) { src/Summa.Gui.MessageDialog.cs @@ -24,9 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. using System; -using Gtk; using System.Net; using System.Collections; +using Gtk; + +using Summa.Core; +using Summa.Gui; namespace Summa.Gui { public class NativeBookmarker : Summa.Core.IBookmarker { src/Summa.Gui.NativeBookmarker.cs @@ -26,6 +26,9 @@ using System; using System.Collections; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { public class NativeTheme : Summa.Core.ITheme { public string Name { src/Summa.Gui.NativeTheme.cs @@ -26,16 +26,19 @@ using System; using Gtk; +using Summa.Core; +using Summa.Gui; + namespace Summa.Gui { public class NotificationBar : Gtk.Statusbar { private uint cid; public NotificationBar() { cid = 0; - Summa.Core.Notifier.NewMessage += OnNotification; + Notifier.NewMessage += OnNotification; } - private void OnNotification(object obj, Summa.Core.NotificationEventArgs args) { + private void OnNotification(object obj, NotificationEventArgs args) { ShowMessage(args.Message); } src/Summa.Gui.NotificationBar.cs @@ -27,15 +27,15 @@ using System; using Gtk; namespace Summa.Gui { - public class OpmlDialog : Gtk.FileChooserDialog { + public class OpmlDialog : FileChooserDialog { public OpmlDialog() { Title = "Select an OPML file"; - Action = Gtk.FileChooserAction.Open; + Action = FileChooserAction.Open; - AddButton(Gtk.Stock.Cancel, Gtk.ResponseType.Cancel); - AddButton(Gtk.Stock.Open, Gtk.ResponseType.Ok); + AddButton(Stock.Cancel, ResponseType.Cancel); + AddButton(Stock.Open, ResponseType.Ok); - DefaultResponse = Gtk.ResponseType.Ok; + DefaultResponse = ResponseType.Ok; } } } src/Summa.Gui.OpmlDialog.cs @@ -26,6 +26,10 @@ using System; using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { public class StatusIcon : Gtk.StatusIcon { private int Unread; @@ -33,12 +37,12 @@ namespace Summa.Gui { public StatusIcon() { FromIconName = "summa"; - Unread = Summa.Data.Core.GetUnreadCount(); + Unread = Feeds.GetUnreadCount(); Activate += new EventHandler(ToggleBrowserStatus); - Summa.Core.Application.Database.ItemChanged += OnItemChanged; - Summa.Core.Application.Database.ItemAdded += OnItemAdded; - Summa.Core.Application.Database.ItemDeleted += OnItemDeleted; + Database.ItemChanged += OnItemChanged; + Database.ItemAdded += OnItemAdded; + Database.ItemDeleted += OnItemDeleted; UpdateTooltip(); CheckVisibility(); @@ -51,10 +55,10 @@ namespace Summa.Gui { } public void CheckVisibility() { - if ( Summa.Core.Config.ShowStatusIcon ) { + if ( Config.ShowStatusIcon ) { bool found = false; - foreach ( string url in Summa.Core.Config.IconFeedUris ) { - Summa.Data.Feed feed = Summa.Data.Core.RegisterFeed(url); + foreach ( string url in Config.IconFeedUris ) { + Feed feed = Feeds.RegisterFeed(url); if ( feed.HasUnread ) { Visible = true; @@ -74,7 +78,7 @@ namespace Summa.Gui { Summa.Core.Application.ToggleShown(); } - private void OnItemChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnItemChanged(object obj, ChangedEventArgs args) { if ( args.ItemProperty == "read" ) { if ( args.Value == "True" ) { Unread--; @@ -88,14 +92,14 @@ namespace Summa.Gui { } } - private void OnItemAdded(object obj, Summa.Core.AddedEventArgs args) { + private void OnItemAdded(object obj, AddedEventArgs args) { Unread++; UpdateTooltip(); CheckVisibility(); } - private void OnItemDeleted(object obj, Summa.Core.AddedEventArgs args) { - Unread = Summa.Data.Core.GetUnreadCount(); + private void OnItemDeleted(object obj, AddedEventArgs args) { + Unread = Feeds.GetUnreadCount(); UpdateTooltip(); CheckVisibility(); } src/Summa.Gui.StatusIcon.cs @@ -29,15 +29,19 @@ using System.Linq; using Gtk; using Gdk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class TagView : Gtk.TreeView { + public class TagView : TreeView { public ArrayList Tags; - private Gtk.TreeIter tagiter; + private TreeIter tagiter; public string Selected { get { - Gtk.TreeModel selectmodel; + TreeModel selectmodel; Selection.GetSelected(out selectmodel, out tagiter); string val = (string)Summa.Core.Application.TagStore.GetValue(tagiter, 1); return val; @@ -49,21 +53,21 @@ namespace Summa.Gui { Model = Summa.Core.Application.TagStore; // set up the columns for the view, and hide them. - InsertColumn(-1, "Pix", new Gtk.CellRendererPixbuf(), "pixbuf", 0); - InsertColumn(-1, "Tag", new Gtk.CellRendererText(), "text", 1); + InsertColumn(-1, "Pix", new CellRendererPixbuf(), "pixbuf", 0); + InsertColumn(-1, "Tag", new CellRendererText(), "text", 1); HeadersVisible = false; // set up for NewsKit - Tags = Summa.Data.Core.GetTags(); + Tags = Feeds.GetTags(); if ( Summa.Core.Application.Browsers.Count == 0 ) { - Gtk.TreeIter tagiter; + TreeIter tagiter; tagiter = Summa.Core.Application.TagStore.Append(); - Summa.Core.Application.TagStore.SetValue(tagiter, 0, Gtk.IconTheme.Default.LookupIcon("feed-presence", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon()); + Summa.Core.Application.TagStore.SetValue(tagiter, 0, IconTheme.Default.LookupIcon("feed-presence", 16, IconLookupFlags.NoSvg).LoadIcon()); Summa.Core.Application.TagStore.SetValue(tagiter, 1, "All feeds"); tagiter = Summa.Core.Application.TagStore.Append(); - Summa.Core.Application.TagStore.SetValue(tagiter, 0, Gtk.IconTheme.Default.LookupIcon("system-search", (int)Gtk.IconSize.Menu, Gtk.IconLookupFlags.NoSvg).LoadIcon()); + Summa.Core.Application.TagStore.SetValue(tagiter, 0, IconTheme.Default.LookupIcon("system-search", (int)IconSize.Menu, IconLookupFlags.NoSvg).LoadIcon()); Summa.Core.Application.TagStore.SetValue(tagiter, 1, "Searches"); foreach ( string tag in Tags ) { @@ -73,7 +77,7 @@ namespace Summa.Gui { } } - Summa.Core.Application.Database.FeedChanged += OnFeedChanged; + Database.FeedChanged += OnFeedChanged; TreeIter iter; Summa.Core.Application.TagStore.GetIterFirst(out iter); @@ -85,7 +89,7 @@ namespace Summa.Gui { } public void Update() { - ArrayList utags = Summa.Data.Core.GetTags(); + ArrayList utags = Feeds.GetTags(); foreach ( string tag in utags ) { if ( tag != "All" ) { @@ -94,13 +98,13 @@ namespace Summa.Gui { } } } - Tags = Summa.Data.Core.GetTags(); + Tags = Feeds.GetTags(); } public void AppendTag(string tag) { - Gtk.TreeIter iter; + TreeIter iter; iter = Summa.Core.Application.TagStore.Append(); - Summa.Core.Application.TagStore.SetValue(iter, 0, Gtk.IconTheme.Default.LookupIcon("tag", 16, Gtk.IconLookupFlags.NoSvg).LoadIcon()); + Summa.Core.Application.TagStore.SetValue(iter, 0, IconTheme.Default.LookupIcon("tag", 16, IconLookupFlags.NoSvg).LoadIcon()); Summa.Core.Application.TagStore.SetValue(iter, 1, tag); } } src/Summa.Gui.TagView.cs @@ -25,38 +25,41 @@ using System; using System.Collections; - using Gtk; +using Summa.Core; +using Summa.Data; +using Summa.Gui; + namespace Summa.Gui { - public class TagWindow : Gtk.Window {private Gtk.VBox vbox; - private Gtk.Table table; - private Gtk.ButtonBox bbox; + public class TagWindow : Window {private VBox vbox; + private Table table; + private ButtonBox bbox; - private Gtk.CellRendererToggle crt; - private Gtk.ListStore store; - private Gtk.TreeView treeview; + private CellRendererToggle crt; + private ListStore store; + private TreeView treeview; - public Gtk.ComboBox ComboBox; + public ComboBox ComboBox; - private Gtk.TreeIter iter; + private TreeIter iter; private ArrayList Tags; - public Summa.Data.Feed Selected { + public Feed Selected { get { if ( treeview.Selection.CountSelectedRows() != 0 ) { - Gtk.TreeModel selectmodel; + TreeModel selectmodel; treeview.Selection.GetSelected(out selectmodel, out iter); } else { store.GetIterFirst(out iter); } string val = (string)store.GetValue(iter, 2); - return Summa.Data.Core.RegisterFeed(val); + return Feeds.RegisterFeed(val); } } - public TagWindow() : base(Gtk.WindowType.Toplevel) { + public TagWindow() : base(WindowType.Toplevel) { Tags = new ArrayList(); Title = "Manage your tags"; @@ -64,26 +67,26 @@ namespace Summa.Gui { DeleteEvent += OnClose; Resizable = false; - vbox = new Gtk.VBox(); + vbox = new VBox(); vbox.Spacing = 6; Add(vbox); - table = new Gtk.Table(2, 2, false); + table = new Table(2, 2, false); table.RowSpacing = 6; vbox.PackStart(table, false, false, 0); - bbox = new Gtk.HButtonBox(); - bbox.Layout = Gtk.ButtonBoxStyle.End; + bbox = new HButtonBox(); + bbox.Layout = ButtonBoxStyle.End; AddTagsCombobox(); AddFeedTreeView(); AddButtons(); vbox.PackStart(bbox, false, false, 0); - Summa.Core.Application.Database.FeedChanged += OnFeedChanged; + Database.FeedChanged += OnFeedChanged; } - private void OnFeedChanged(object obj, Summa.Core.ChangedEventArgs args ) { + private void OnFeedChanged(object obj, ChangedEventArgs args ) { if ( args.ItemProperty == "tags" ) { foreach ( string tag in args.Value.Split(',') ) { if ( !Tags.Contains(tag) ) { @@ -97,8 +100,8 @@ namespace Summa.Gui { } private void AddTagsCombobox() { - ComboBox = Gtk.ComboBox.NewText(); - foreach ( string tag in Summa.Data.Core.GetTags() ) { + ComboBox = ComboBox.NewText(); + foreach ( string tag in Feeds.GetTags() ) { if ( tag != "All" ) { ComboBox.AppendText(tag); Tags.Add(tag); @@ -107,7 +110,7 @@ namespace Summa.Gui { ComboBox.Changed += new EventHandler(OnCbUpdateIntervalChanged); - table.Attach(ComboBox, 0, 1, 0, 1, Gtk.AttachOptions.Fill, Gtk.AttachOptions.Fill, 0, 0); + table.Attach(ComboBox, 0, 1, 0, 1, AttachOptions.Fill, AttachOptions.Fill, 0, 0); } private void OnCbUpdateIntervalChanged(object obj, EventArgs args) { @@ -115,31 +118,31 @@ namespace Summa.Gui { } private void AddFeedTreeView() { - store = new Gtk.ListStore(typeof(bool), typeof(string), typeof(string), typeof(Gdk.Pixbuf)); + store = new ListStore(typeof(bool), typeof(string), typeof(string), typeof(Gdk.Pixbuf)); - crt = new Gtk.CellRendererToggle(); + crt = new CellRendererToggle(); crt.Activatable = true; - crt.Toggled += new Gtk.ToggledHandler(OnCrtToggled); + crt.Toggled += new ToggledHandler(OnCrtToggled); - CellRendererText trender = new Gtk.CellRendererText(); + CellRendererText trender = new CellRendererText(); trender.Ellipsize = Pango.EllipsizeMode.End; - treeview = new Gtk.TreeView(); + treeview = new TreeView(); treeview.Model = store; - ScrolledWindow treeview_swin = new Gtk.ScrolledWindow(new Gtk.Adjustment(0, 0, 0, 0, 0, 0), new Gtk.Adjustment(0, 0, 0, 0, 0, 0)); + ScrolledWindow treeview_swin = new ScrolledWindow(new Adjustment(0, 0, 0, 0, 0, 0), new Adjustment(0, 0, 0, 0, 0, 0)); treeview_swin.Add(treeview); treeview_swin.SetSizeRequest(200, 300); - treeview_swin.ShadowType = Gtk.ShadowType.In; - treeview_swin.SetPolicy(Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic); + treeview_swin.ShadowType = ShadowType.In; + treeview_swin.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); - TreeViewColumn column_Use = new Gtk.TreeViewColumn("Use", crt, "active", 0); + TreeViewColumn column_Use = new TreeViewColumn("Use", crt, "active", 0); treeview.AppendColumn(column_Use); - TreeViewColumn column_Icon = new Gtk.TreeViewColumn("Icon", new Gtk.CellRendererPixbuf(), "pixbuf", 3); + TreeViewColumn column_Icon = new TreeViewColumn("Icon", new CellRendererPixbuf(), "pixbuf", 3); treeview.AppendColumn(column_Icon); - TreeViewColumn column_Name = new Gtk.TreeViewColumn("Title", trender, "text", 1); + TreeViewColumn column_Name = new TreeViewColumn("Title", trender, "text", 1); treeview.AppendColumn(column_Name); table.Attach(treeview_swin, 0, 1, 1, 2); @@ -147,28 +150,28 @@ namespace Summa.Gui { private void OnCrtToggled(object obj, ToggledArgs args) { TreeIter iter; - store.GetIter(out iter, new Gtk.TreePath(args.Path)); + store.GetIter(out iter, new TreePath(args.Path)); if ( (bool)store.GetValue(iter, 0) ) { store.SetValue(iter, 0, false); - Summa.Data.Feed feed = Summa.Data.Core.RegisterFeed((string)store.GetValue(iter, 2)); + Feed feed = Feeds.RegisterFeed((string)store.GetValue(iter, 2)); feed.RemoveTag(ComboBox.ActiveText); } else { store.SetValue(iter, 0, true); - Summa.Data.Feed feed = Summa.Data.Core.RegisterFeed((string)store.GetValue(iter, 2)); + Feed feed = Feeds.RegisterFeed((string)store.GetValue(iter, 2)); feed.AppendTag(ComboBox.ActiveText); } - Summa.Gui.Browser b = (Summa.Gui.Browser)Summa.Core.Application.Browsers[0]; + Browser b = (Browser)Summa.Core.Application.Browsers[0]; b.TagView.Update(); } private void Populate(string tag) { store.Clear(); - foreach ( Summa.Data.Feed feed in Summa.Data.Core.GetFeeds() ) { - Gtk.TreeIter iter = store.Append(); + foreach ( Feed feed in Feeds.GetFeeds() ) { + TreeIter iter = store.Append(); store.SetValue(iter, 0, feed.Tags.Contains(ComboBox.ActiveText)); store.SetValue(iter, 1, feed.Name); @@ -178,17 +181,17 @@ namespace Summa.Gui { } private void AddButtons() { - Button add_button = new Gtk.Button(Gtk.Stock.Add); + Button add_button = new Button(Stock.Add); add_button.Clicked += new EventHandler(OnAdd); bbox.PackStart(add_button); - Button close_button = new Gtk.Button(Gtk.Stock.Close); + Button close_button = new Button(Stock.Close); close_button.Clicked += new EventHandler(OnClose); bbox.PackStart(close_button); } private void OnAdd(object obj, EventArgs args) { - Window t = new Summa.Gui.AddTagDialog(this); + Window t = new AddTagDialog(this); t.ShowAll(); } src/Summa.Gui.TagWindow.cs @@ -24,10 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. using System; +using System.Diagnostics; + +using Summa.Core; +using Summa.Gui; namespace Summa.Gui { - public class TotemMediaPlayer : Summa.Core.IMediaPlayer { - private System.Diagnostics.Process process; + public class TotemMediaPlayer : IMediaPlayer { + private Process process; private bool still_alive; private bool playing; @@ -45,16 +49,16 @@ namespace Summa.Gui { public void Play(string uri) { if ( !playing && still_alive ) { - System.Diagnostics.Process.Start("totem --play-pause"); + Process.Start("totem --play-pause"); } else { still_alive = true; - process = System.Diagnostics.Process.Start(String.Format("totem {0}", uri)); + process = Process.Start(String.Format("totem {0}", uri)); process.Exited += new EventHandler(OnExited); } } public bool Pause() { - System.Diagnostics.Process.Start("totem --pause"); + Process.Start("totem --pause"); playing = false; return true; } src/Summa.Gui.TotemMediaPlayer.cs @@ -27,7 +27,10 @@ using System; using System.Text; using Gtk; using WebKit; -using Gnome; + +using Summa.Core; +using Summa.Data; +using Summa.Gui; namespace Summa.Gui { public class WebSettings : WebKit.WebSettings { @@ -39,11 +42,11 @@ namespace Summa.Gui { } } - public class WebKitView : WebKit.WebView { + public class WebKitView : WebView { private StringBuilder content = new StringBuilder(); public Summa.Data.Item SelectedItem; - public Summa.Data.ISource SelectedFeed; - public Summa.Gui.ItemNotebook notebook; + public ISource SelectedFeed; + public ItemNotebook notebook; public WebKitView() { NavigationRequested += new NavigationRequestedHandler(OnNavigationRequested); @@ -52,12 +55,12 @@ namespace Summa.Gui { string starting_content = "Welcome to <b>Summa</b>, a GNOME feed reader.<br /><br />This is a preview release, not intended to be used by anyone. Exercise caution."; Render(starting_content); - ZoomTo(Summa.Core.Config.DefaultZoomLevel); - Summa.Core.Notifier.ZoomChanged += OnZoomChanged; + ZoomTo(Config.DefaultZoomLevel); + Notifier.ZoomChanged += OnZoomChanged; } private void OnZoomChanged(object obj, EventArgs args) { - ZoomTo(Summa.Core.Config.DefaultZoomLevel); + ZoomTo(Config.DefaultZoomLevel); } public bool CanZoom() { @@ -67,9 +70,9 @@ namespace Summa.Gui { public void ZoomIn() { Summa.Gui.WebSettings settings = new Summa.Gui.WebSettings(); - if ( Summa.Core.Config.DefaultZoomLevel > 4 ) { - Summa.Core.Config.DefaultZoomLevel++; - settings.DefaultFontSize = Summa.Core.Config.DefaultZoomLevel; + if ( Config.DefaultZoomLevel > 4 ) { + Config.DefaultZoomLevel++; + settings.DefaultFontSize = Config.DefaultZoomLevel; Settings = settings; } @@ -78,9 +81,9 @@ namespace Summa.Gui { public void ZoomOut() { Summa.Gui.WebSettings settings = new Summa.Gui.WebSettings(); - if ( Summa.Core.Config.DefaultZoomLevel-1 > 4 ) { - Summa.Core.Config.DefaultZoomLevel--; - settings.DefaultFontSize = Summa.Core.Config.DefaultZoomLevel; + if ( Config.DefaultZoomLevel-1 > 4 ) { + Config.DefaultZoomLevel--; + settings.DefaultFontSize = Config.DefaultZoomLevel; Settings = settings; } @@ -88,7 +91,7 @@ namespace Summa.Gui { public void ZoomTo(int size) { Summa.Gui.WebSettings settings = new Summa.Gui.WebSettings(); - settings.DefaultFontSize = Summa.Core.Config.DefaultZoomLevel; + settings.DefaultFontSize = Config.DefaultZoomLevel; Settings = settings; } @@ -109,7 +112,7 @@ namespace Summa.Gui { } private void OnNavigationRequested(object obj, NavigationRequestedArgs args) { - if ( Summa.Core.Config.OpenTabs ) { + if ( Config.OpenTabs ) { try { notebook.LoadUri(args.Request.Uri); } catch ( Exception ) { @@ -119,7 +122,7 @@ namespace Summa.Gui { Gnome.Url.Show(args.Request.Uri); } - args.RetVal = WebKit.NavigationResponse.Ignore; + args.RetVal = NavigationResponse.Ignore; } private void OnHoveringOverLink(object obj, HoveringOverLinkArgs args) { @@ -134,9 +137,9 @@ namespace Summa.Gui { if (text != String.Empty) { if ( text != null ) { - Summa.Core.Notifier.Notify("Click to visit " + text); + Notifier.Notify("Click to visit " + text); } else { - Summa.Core.Notifier.Notify(""); + Notifier.Notify(""); } } } @@ -150,32 +153,32 @@ namespace Summa.Gui { } public void Render(Summa.Data.Item item) { - Render(Summa.Core.Config.Theme.MakeHtml(item)); + Render(Config.Theme.MakeHtml(item)); SelectedItem = item; - Summa.Core.Application.Database.ItemChanged += OnItemChanged; + Database.ItemChanged += OnItemChanged; } - public void Render(Summa.Data.ISource feed) { - Render(Summa.Core.Config.Theme.MakeHtml(feed)); + public void Render(ISource feed) { + Render(Config.Theme.MakeHtml(feed)); SelectedFeed = feed; - Summa.Core.Application.Database.FeedChanged += OnFeedChanged; + Database.FeedChanged += OnFeedChanged; /*string all_content = ""; - foreach ( Summa.Data.Item item in feed.GetItems() ) { + foreach ( Item item in feed.GetItems() ) { all_content += MakeItemHtml(item); all_content += "<br/><br/><hr/>"; } Render(all_content);*/ } - private void OnFeedChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnFeedChanged(object obj, ChangedEventArgs args) { if ( args.Uri == SelectedFeed.Url ) { Render(content.ToString()); } } - private void OnItemChanged(object obj, Summa.Core.ChangedEventArgs args) { + private void OnItemChanged(object obj, ChangedEventArgs args) { if ( args.Uri == SelectedItem.Uri ) { Render(SelectedItem); } src/Summa.Gui.WebKitView.cs @@ -25,6 +25,9 @@ using System; +using Summa.Core; +using Summa.Net; + namespace Summa.Net { public enum ConnectionState : int { Connected, src/Summa.Net.ConnectionState.cs @@ -26,6 +26,9 @@ using System; using NDesk.DBus; +using Summa.Core; +using Summa.Net; + namespace Summa.Net { [Interface ("org.gnome.Dieu")] public interface INetworkManager { src/Summa.Net.INetworkManager.cs @@ -26,19 +26,22 @@ using System; using NDesk.DBus; +using Summa.Core; +using Summa.Net; + namespace Summa.Net { public static class NetworkManager { - public static Summa.Net.ConnectionState Status() { + public static ConnectionState Status() { try { - Summa.Net.INetworkManager nm = NDesk.DBus.Bus.Session.GetObject<Summa.Net.INetworkManager>("org.freedesktop.NetworkManager", new ObjectPath("/org/freedesktop/NetworkManager")); + INetworkManager nm = Bus.Session.GetObject<INetworkManager>("org.freedesktop.NetworkManager", new ObjectPath("/org/freedesktop/NetworkManager")); if ( nm.state() == 3 ) { - return Summa.Net.ConnectionState.Connected; + return ConnectionState.Connected; } else { - return Summa.Net.ConnectionState.Offline; + return ConnectionState.Offline; } } catch ( Exception ) { - return Summa.Net.ConnectionState.Connected; + return ConnectionState.Connected; } } } src/Summa.Net.NetworkManager.cs @@ -1,4 +1,4 @@ #!/bin/bash -gmcs -r:Mono.Posix -r:System.Drawing -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 src/Summa.Net.ConnectionState.cs src/Summa.Net.INetworkManager.cs src/Summa.Net.NetworkManager.cs src/MigoRfc822DateTime.cs src/NewsKit.AtomParser.cs src/NewsKit.Core.cs src/NewsKit.Exceptions.cs src/NewsKit.Globals.cs src/NewsKit.IFeedParser.cs src/NewsKit.Item.cs src/NewsKit.OpmlParser.cs src/NewsKit.RdfParser.cs src/NewsKit.Request.cs src/NewsKit.RssParser.cs src/NewsKit.TestBed.cs -out:src/newskit.exe +gmcs -r:Mono.Posix -r:System.Drawing -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 src/Summa.Net.ConnectionState.cs src/Summa.Net.INetworkManager.cs src/Summa.Net.NetworkManager.cs src/MigoRfc822DateTime.cs src/NewsKit.AtomParser.cs src/NewsKit.Core.cs src/NewsKit.Exceptions.cs src/NewsKit.Globals.cs src/NewsKit.IFeedParser.cs src/NewsKit.Item.cs src/NewsKit.OpmlParser.cs src/NewsKit.RdfParser.cs src/NewsKit.Request.cs src/NewsKit.RssParser.cs src/NewsKit.RssCommon.cs src/NewsKit.TestBed.cs -out:src/newskit.exe mono src/newskit.exe testparser.sh src/NewsKit.Core.cs src/Summa.Data.Core.cs 8c395209523e0122ad988750785715d47dcb6e3d Ethan Osten eosten@Phineas.(none) http://github.com/wfarr/newskit/commit/553ad3e0ef5568cfdeede88b1711d692edf39b67 553ad3e0ef5568cfdeede88b1711d692edf39b67 2008-10-19T16:58:15-07:00 2008-10-19T16:58:15-07:00 I really have no idea where to begin with this one. 22db9b49b99cf21b4eaa5078f089ad2a66f1bb9c Ethan Osten eosten@Phineas.(none)