themactep-fliewr 2.1.0 → 2.1.1

data/.gitignore

@@ -1 +1,2 @@
-nbproject
+nbproject
+pkg

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/bin/fliewr

@@ -10,10 +10,6 @@
   http://creativecommons.org/licenses/BSD/
 =end
 
-app_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-APP_ROOT = File.expand_path(File.dirname(app_file))
-Dir.glob(APP_ROOT + '/../**/').reverse.each { |d| $:.unshift d }
-
 begin
   require 'rubygems'
 rescue LoadError

data/fliewr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fliewr}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Philippov"]

data/lib/fliewr/ui.rb

@@ -6,8 +6,9 @@ Gtk::MozEmbed.set_profile_path ENV['HOME'] + '/.mozilla', 'fliewr'
 module Fliewr
 
   SECONDS_PER_MINUTE = 60
-  IMAGE_ROOT = File.expand_path(File.join(APP_ROOT, '..', 'data'))
 
+  DATA_ROOT = File.expand_path(File.join(File.dirname(__FILE__),'..','..','data'))
+  
   class UI < Gtk::Window
 
     attr_accessor :logo, :statusbar, :theme_base, :theme_item, :theme_error, :theme_style
@@ -15,7 +16,7 @@ module Fliewr
     def initialize
       super Gtk::Window::TOPLEVEL
 
-      filename = File.join(Fliewr::IMAGE_ROOT, 'fliewr.svg')
+      filename = File.join(Fliewr::DATA_ROOT, 'fliewr.svg')
       self.logo = Gdk::Pixbuf.new filename, 128, 128
 
       self.set_title 'Fliewr'
@@ -28,7 +29,7 @@ module Fliewr
       self.move $cfg.get(:window_x_pos).to_i, $cfg.get(:window_y_pos).to_i
 
       theme = $cfg.get(:theme) || 'default'
-      theme_root = File.join(APP_ROOT,'..','data','themes',theme)
+      theme_root = File.join(DATA_ROOT,'themes',theme)
       self.theme_base  = File.open(File.join(theme_root,'theme.html'), "r") { |f| f.read }
       self.theme_item  = File.open(File.join(theme_root,'item.html'), "r") { |f| f.read }
       self.theme_error = File.open(File.join(theme_root,'error.html'), "r") { |f| f.read }
@@ -181,7 +182,7 @@ module Fliewr
   class StatusIcon < Gtk::StatusIcon
     def initialize
       super
-      self.file = File.join(Fliewr::IMAGE_ROOT, 'fliewr.svg')
+      self.file = File.join(Fliewr::DATA_ROOT, 'fliewr.svg')
       self.set_tooltip 'Flickr Viewr'
       self.signal_connect(:activate) do
         if $gui.visible?
@@ -192,14 +193,14 @@ module Fliewr
         end
       end
 
+      menu = Gtk::Menu.new
+
       self.signal_connect(:popup_menu) do |icon, button, time|
         menu.popup nil, nil, button, time
       end
 
       separator = Gtk::SeparatorMenuItem.new
 
-      menu = Gtk::Menu.new
-
       item = Gtk::ImageMenuItem.new Gtk::Stock::HOME
       item.signal_connect(:activate) do
         $app.visit_user_profile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: themactep-fliewr
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Paul Philippov