gloudapp 1.2.0 → 1.3.0

data/README.md

@@ -28,6 +28,20 @@ but rvm ist strongly recommended because some
 [linux distributions](https://bugs.launchpad.net/ubuntu/+source/gems/+bug/145267) 
 do not add rubygem binaries to PATH)
 
+### Ubuntu and AppIndicator (experimental)
+
+People using newer versions of Ubuntu don't see the StatusIcon of GloudApp anymore.
+To solve this you should install the libappindicator header files:
+
+	sudo apt-get install libappindicator-dev
+
+And then the [ruby-libappindicator bindings as a gem](https://github.com/leander256/ruby_libappindicator):
+
+	gem install ruby-libappindicator
+
+Note: be beware that this is an experimental feature and that the bindings are stated
+as 'beta' by their author.
+
 Usage
 -----
 

data/gloudapp.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
 	s.email       = GloudApp::Info::AUTHORS.map { |author| author[1] }
 	s.homepage    = GloudApp::Info::HOMEPAGE
 	s.summary     = GloudApp::Info::SUMMARY
-	#s.description = %q{CloudApp client for GNOME/GTK}
 
 	s.rubyforge_project = "gloudapp"
 
@@ -19,8 +18,6 @@ Gem::Specification.new do |s|
 	s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 	s.require_paths = ["lib"]
 
-	# specify any dependencies here; for example:
-	# s.add_development_dependency "rspec"
 	s.add_runtime_dependency "cloudapp_api"
 	s.add_runtime_dependency "gtk2"
 	s.add_runtime_dependency "json"

data/lib/gloudapp/info.rb

@@ -1,6 +1,6 @@
 module GloudApp
 	module Info
-		VERSION = "1.2.0"
+		VERSION = "1.3.0"
 		AUTHORS = [
 			["Christian Nicolai", "chrnicolai@gmail.com"],
 			["Jan Graichen", "jan.graichen@altimos.de"]

data/lib/gloudapp.rb

@@ -185,14 +185,14 @@ module GloudApp
 				# timeout to close file chooser before blocking gtk thread
 				Gtk.timeout_add 50 do
 					if upload_file(file)
-						@tray.icon = Icon.finish
+						@tray.icon = Icon.finish_path
 					end
 					false
 				end
 				false
 			else
 				file_dlg.destroy
-				@tray.icon = Icon.normal
+				@tray.icon = Icon.normal_path
 				false
 			end
 		end
@@ -228,7 +228,7 @@ module GloudApp
 			options = {:message => message} unless message.is_a?(Hash)
 			options = {:title => 'GloudApp - Error'}.merge(options)
 
-			@tray.icon = Icon.error
+			@tray.icon = Icon.error_path
 			@tray.message = options[:message]
 			ErrorDialog.run!(options[:title], options[:message])
 			false
@@ -237,14 +237,14 @@ module GloudApp
   
 	class Icon
 		def self.icon(icon) File.join(File.dirname(__FILE__), 'gloudapp', 'icons', icon + '.png') end
-		def self.normal_path; self.icon 'gloudapp' end
-		def self.finish_path; self.icon 'gloudapp_finish' end
-		def self.working_path; self.icon 'gloudapp_working' end
-		def self.error_path; self.icon 'gloudapp_error' end
-		def self.normal; Gdk::Pixbuf.new(normal_path) end
-		def self.finish; Gdk::Pixbuf.new(finish_path) end
+		def self.normal_path;  self.icon('gloudapp') end
+		def self.finish_path;  self.icon('gloudapp_finish') end
+		def self.working_path; self.icon('gloudapp_working') end
+		def self.error_path;   self.icon('gloudapp_error') end
+		def self.normal;  Gdk::Pixbuf.new(normal_path) end
+		def self.finish;  Gdk::Pixbuf.new(finish_path) end
 		def self.working; Gdk::Pixbuf.new(working_path) end
-		def self.error; Gdk::Pixbuf.new(error_path) end
+		def self.error;   Gdk::Pixbuf.new(error_path) end
 	end
 	
 	class Tray
@@ -282,15 +282,30 @@ module GloudApp
 							action[:show].call(action[:item])
 						end
 					end
-					self.icon = Icon.normal
+					self.icon = Icon.normal_path
 					self.message = nil
 					@menu.popup(nil, nil, button, time)
 				end
 			end
+			
+			begin
+				require 'ruby-libappindicator'
+				puts "Initialize AppIndicator..."
+				# params: id, icon name, category
+				@ai = AppIndicator::AppIndicator.new("gloudapp", GloudApp::Icon.normal_path, AppIndicator::Category::APPLICATION_STATUS);
+				@ai.set_menu(@menu)
+				@ai.set_status(AppIndicator::Status::ACTIVE)
+			rescue LoadError
+				puts "No AppIndicator support available."
+			end
 		end
 
 		def icon=(icon)
-			@si.pixbuf = icon.is_a?(Gdk::Pixbuf) ? icon : Gdk::Pixbuf.new(icon)
+			@si.pixbuf = Gdk::Pixbuf.new(icon)
+			if not @ai.nil?
+				# this relies on direct local file paths which works though it shouldn't
+				@ai.set_icon(icon)
+			end
 		end
 
 		def message=(message)
@@ -300,13 +315,13 @@ module GloudApp
 		private
 		def run_action(proc, no_icon_change = false)
 			if proc.is_a?(Proc)
-				self.icon = Icon.working unless no_icon_change
+				self.icon = Icon.working_path unless no_icon_change
 
 				# timeout action to get at least on repaint event after
 				# changing icon to working image
 				Gtk.timeout_add 50 do
 					if proc.call
-						self.icon = Icon.finish unless no_icon_change
+						self.icon = Icon.finish_path unless no_icon_change
 					end
 					false
 				end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gloudapp
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +02:00
-default_executable: 
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cloudapp_api
@@ -86,7 +85,6 @@ files:
 - lib/gloudapp/icons/gloudapp_working.png
 - lib/gloudapp/info.rb
 - lib/gloudapp/patches.rb
-has_rdoc: true
 homepage: https://github.com/cmur2/gloudapp
 licenses: []
 
@@ -116,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gloudapp
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CloudApp (tm) applet for Gnome/GTK2