nserver 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,10 @@
+== 1.1.4 / 2007-11-12
+
+* Add a "Message History" dialog, available by activating the NServer tray
+  icon (left-click is default)
+ * This obviously means we now keep track of messages.
+* Update nclient to accept title parameter, and to pass in priority properly
+
 == 1.1.3 / 2007-11-10
 
 * Minor updates

data/bin/nclient

@@ -6,12 +6,14 @@ require 'getoptlong'
 
 opts = GetoptLong.new(
   [ '--priority', '-p', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--host', GetoptLong::REQUIRED_ARGUMENT ]
+  [ '--host', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--title', GetoptLong::REQUIRED_ARGUMENT ]
 )
 
 priority = :normal
 host_ip = '127.0.0.1'
 msg = nil
+title = nil
 
 opts.each do |opt,arg|
   case opt
@@ -24,6 +26,8 @@ opts.each do |opt,arg|
       priority = p
     when '--host'
       host_ip = arg
+    when '--title'
+      title = arg
   end
 end
 
@@ -32,11 +36,15 @@ if ARGV.length != 1
   exit 1
 end
 
-msg = ARGV[0]
+text = ARGV[0]
 
 begin
   client = NServer::Client.new(:host => host_ip)
-  client.notify(msg, priority )
+  msg = NServer::Message.new
+  msg.text = text
+  msg.priority = priority
+  msg.title = title
+  client.notify(msg)
 rescue NServer::NoServerAvailable
   STDERR.puts("No server available.")
   exit 1

data/lib/nserver.rb

@@ -11,7 +11,7 @@ require 'ipaddr'
 require 'yaml'
 
 module NServer
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
   class Server < GServer
     # Create a NServer::Server instance
     #
@@ -50,6 +50,7 @@ module NServer
       @check_interval = opts[:check_interval]
 
       @msg_list = [ Message.new("NServer Ready.") ]
+      @msg_history = []
       @allowed_clients = opts[:allow]
 
       Notify.init("Notification Server")
@@ -60,11 +61,36 @@ module NServer
 
       @notification = Notify::Notification::new("X", nil, nil, @tray_icon)
       @notification.timeout = opts[:msg_timeout]
+      #@notification.signal_connect('closed') do |s|
+      #  puts "Closed!"
+      #end
 
       Thread.new { Gtk.main }
       sleep 5
       @tray_icon.embedded? || raise("Failed to setup tray icon.")
 
+      @tray_icon.signal_connect('activate') do |ti|
+        dialog = Gtk::Dialog.new(
+          "Message History",
+          nil,
+          Gtk::Dialog::DESTROY_WITH_PARENT,
+          [ Gtk::Stock::OK, Gtk::Dialog::RESPONSE_NONE ]
+        )
+        dialog.signal_connect('response') {|d,r| d.destroy }
+        dialog.vbox.add(Gtk::Label.new("Message history (most recent on top)"))
+        @msg_history.reverse.each do |m| 
+          label = Gtk::Label.new(m.text)
+          label.set_alignment(0,0.5)
+
+          dialog.vbox.add(Gtk::HSeparator.new)
+          dialog.vbox.add(label)
+        end
+        dialog.default_response = -1
+        dialog.set_default_size(300, 0)
+        dialog.show_all
+      end
+      
+
       ## Setup msg thread
       @msg_thread = Thread.new(self, @check_interval) do |server, intv|
         loop do
@@ -76,6 +102,9 @@ module NServer
 
     # Display the message
     def notify(msg)
+      @msg_history << msg
+      @msg_history.shift if @msg_history.size > 5
+
       @notification.update((msg.title or "Message Received"), msg.text, nil)
       @notification.urgency = msg.priority
       #@tray_icon.tooltip = msg.title
@@ -230,9 +259,13 @@ module NServer
 
     def initialize( text = "", priority = :normal, title = nil )
       @text = text
-      @priority = ( PRIORITIES.index( priority ) or 1 )
+      self.priority = priority
       @title = title
     end
+
+    def priority=(p)
+      @priority = (PRIORITIES.index(p) or 1)
+    end
   end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.5
 specification_version: 2
 name: nserver
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-11-10 00:00:00 -05:00
+  version: 1.1.4
+date: 2007-11-12 00:00:00 -05:00
 summary: Notification server for ruby using libnotify
 require_paths: 
 - lib