X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=bin%2Fembrace;h=dc4fafc4904c2eff5a7d374190193f7d80fd0622;hb=91515591d2ece0ad027d72c525d20e199ff6a3d0;hp=4e5b64ebf3cbac0097ccb61b9c1af74a686c0007;hpb=14d1460090aee21970fe84463764b4f9573f8122;p=embrace.git diff --git a/bin/embrace b/bin/embrace index 4e5b64e..dc4fafc 100755 --- a/bin/embrace +++ b/bin/embrace @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +require "evas" require "ecore" require "ecore_x" require "ecore_evas" @@ -27,29 +28,9 @@ require "embrace/imap" PKG_NAME = "embrace" DATADIR = "/usr/local/share/#{PKG_NAME}/" -class Evas::EvasObject - def move_relative(obj, x, y) - # FIXME investigate whether there's an easier way - move(*obj.geometry[0..1].zip([x, y]).map { |(a, b)| a + b }) - end - - def center(obj) - a = geometry - b = obj.geometry - - move_relative(obj, (b[2] / 2) - (a[2] / 2), - (b[3] / 2) - (a[3] / 2)) - end - - def alpha=(alpha) - set_color(*(get_color[0..-2] << alpha)) - end -end - module Embrace VERSION = "0.0.1" ICON_FILE = DATADIR + "l33t_MAI_envelope.png" - MAX_ICONS = 11 class ZeroToOneAnimator < Ecore::Animator def initialize(duration) @@ -81,11 +62,22 @@ module Embrace # an animator that runs for the specified number of seconds, # and yields values between 0 and 255 class AlphaAnimator < ZeroToOneAnimator - def initialize(duration, *objects) + def initialize(duration, object) super(duration) do |v| - objects.each { |o| o.alpha = (255 * v).to_i } + a = compute_alpha(v) + object.set_color(a, a, a, a) end end + + def compute_alpha(v) + (255 * v).to_i + end + end + + class InverseAlphaAnimator < AlphaAnimator + def compute_alpha(v) + super((1.0 - v).abs) + end end class MoveAnimator < ZeroToOneAnimator @@ -105,6 +97,16 @@ module Embrace end class MailboxIcon < Evas::Smart + class FadeOutFinishedEvent < Ecore::Event + attr_reader :icon + + def initialize(icon) + super() + + @icon = icon + end + end + attr_accessor :slot def initialize(evas, label) @@ -121,8 +123,7 @@ module Embrace @objects = [@img, @label] @objects.each { |o| add_member(o) } - @img.set_color(255, 255, 255, 0) - @label.set_color(255, 0, 0, 0) + set_color(0, 0, 0, 0) @img.set_file(ICON_FILE) @img.set_fill(0, 0, *@img.get_size) @@ -130,15 +131,33 @@ module Embrace @label.text = name @label.set_font("VeraBd", 10) + a = @label.geometry + b = *@img.get_size + + @label_offset_x = (b[0] / 2) - (a[2] / 2) + @label_offset_y = (b[1] / 2) - (a[3] / 2) + resize(*@img.get_size) end + def fade_in + show + + @alpha_anim ||= AlphaAnimator.new(2, self) + @alpha_anim.on_finished { @alpha_anim = nil } + end + + def fade_out + @alpha_anim ||= InverseAlphaAnimator.new(2, self) + @alpha_anim.on_finished do + @alpha_anim = nil + FadeOutFinishedEvent.raise(self) + end + end + # smart callbacks def smart_show @objects.each { |o| o.show } - - @alpha_anim ||= AlphaAnimator.new(2, @img, @label) - @alpha_anim.on_finished { @alpha_anim = nil } end def smart_hide @@ -158,14 +177,21 @@ module Embrace end def smart_move(x, y) - @objects.each { |o| o.move(x, y) } + @img.move(x, y) - @label.center(self) + # center the label on the image + @label.move(x + @label_offset_x, + y + @label_offset_y) end def smart_resize(w, h) @img.resize(w, h) end + + def smart_color_set(r, g, b, a) + @img.set_color(r, g, b, a) + @label.set_color(r, 0, 0, a) + end end class Container < Evas::Smart @@ -177,7 +203,7 @@ module Embrace super @bg = Evas::Rectangle.new(evas) - @bg.set_color(0, 0, 0, 255) + @bg.set_color(0, 0, 0, 0) add_member(@bg) @@ -186,6 +212,11 @@ module Embrace @about_to_add = 0 @add_lock_count = 0 + + @handlers = [ + Ecore::EventHandler.new(MailboxIcon::FadeOutFinishedEvent, + &method(:on_icon_fade_out_finished)) + ] end def can_add? @@ -200,10 +231,14 @@ module Embrace Kernel.raise(ContainerFullError) if slots_left.zero? Kernel.raise(ContainerLockedError) unless @add_lock_count.zero? - i.move_relative(self, 0, 0) + geo = geometry + + i.move(geo[0], + geo[1] + geo[3] % Main.instance.icon_height) + i.slot = next_slot i.clip = self - i.show + i.fade_in # check whether we need to need to move this icon if slots_left == 1 @@ -237,16 +272,23 @@ module Embrace Kernel.raise(ContainerLockedError) unless @about_to_add.zero? Kernel.raise(ContainerLockedError) unless @add_lock_count.zero? - # icons that are placed above the one that's deleted need - # to be moved - ar = @icons[(i + 1)..-1] + @add_lock_count += 1 + @icons[i].fade_out + end - @icons[i].delete + def on_icon_fade_out_finished(ev) + i = @icons.index(ev.icon) + ev.icon.delete @icons.delete_at(i) - return if ar.empty? + # icons that are placed above the one that's deleted need + # to be moved. check whether are there any first + if i == @icons.length + @add_lock_count -= 1 + return + end - @add_lock_count += 1 + ar = @icons[i..-1] @animators << MoveAnimator.new(2, Main.instance.icon_height, *ar) @animators.last.on_finished do |ani| @@ -278,8 +320,12 @@ module Embrace end private + def max_icons + geometry.pop / Main.instance.icon_height + end + def slots_left - MAX_ICONS - @icons.nitems - @about_to_add + max_icons - @icons.nitems - @about_to_add end def next_slot @@ -295,6 +341,7 @@ module Embrace def initialize super + self.has_alpha = true self.title = "Embrace" self.borderless = true @@ -307,7 +354,15 @@ module Embrace @container.layer = -1 @container.show - size = [@icon_dim.first, icon_height * MAX_ICONS] + size = [@icon_dim.first] + + arg = ARGV.shift + if arg.nil? + size << icon_height * 11 + else + size << arg.to_i + end + resize(*size) set_size_min(*size) set_size_max(*size) @@ -339,9 +394,7 @@ module Embrace private def on_timer - return unless @server.nil? - - @server = IMAP::Session.new(@config) + @server ||= IMAP::Session.new(@config) true end