projects
/
euphoria.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The file dialog is broken atm, don't try to load it.
[euphoria.git]
/
bin
/
euphoria
diff --git
a/bin/euphoria
b/bin/euphoria
index 707d9e0b806d7c4e3bb1d327825facd81f20f943..abd51640f38ae565ce39acc6f371c3dfa66545da 100644
(file)
--- a/
bin/euphoria
+++ b/
bin/euphoria
@@
-1,9
+1,8
@@
#!/usr/bin/ruby -w
#!/usr/bin/ruby -w
-# $Id: euphoria,v 1.41 2006/09/07 13:38:26 tilman Exp $
-
require "ecore"
require "ecore_x"
require "ecore"
require "ecore_x"
+require "evas"
require "ecore_evas"
require "edje"
require "esmart"
require "ecore_evas"
require "edje"
require "esmart"
@@
-22,7
+21,7
@@
require "euphoria/slider"
require "euphoria/volume_box"
require "euphoria/playtime_updater"
require "euphoria/playback_status_handler"
require "euphoria/volume_box"
require "euphoria/playtime_updater"
require "euphoria/playback_status_handler"
-require "euphoria/file_dialog"
+
#
require "euphoria/file_dialog"
Config = Struct.new("Config", :ipc_path, :theme, :time_display_elapsed)
Config = Struct.new("Config", :ipc_path, :theme, :time_display_elapsed)
@@
-111,7
+110,7
@@
class Euphoria
end
=end
end
=end
- handle_current_pos(@xmms.playlist
_
current_pos.wait)
+ handle_current_pos(@xmms.playlist
.
current_pos.wait)
end
def show
end
def show
@@
-155,6
+154,7
@@
private
#@ee.evas.font_path_append("/usr/X11R6/lib/X11/fonts/TTF")
#@ee.evas.font_path_append(ENV["HOME"] + "/.fonts")
#@ee.evas.font_path_append("/usr/X11R6/lib/X11/fonts/TTF")
#@ee.evas.font_path_append(ENV["HOME"] + "/.fonts")
+ @ee.evas.font_hinting = Evas::Evas::AUTO
@ee.on_pre_render { Edje::thaw }
@ee.on_post_render { Edje::freeze }
@ee.on_pre_render { Edje::thaw }
@ee.on_post_render { Edje::freeze }
@@
-326,12
+326,7
@@
private
def ui_fill_track_info(item)
unless item.nil?
def ui_fill_track_info(item)
unless item.nil?
- if item.channel.nil?
- msg = Edje::Message.new(0, item.artist, item.title, item.album)
- else
- msg = Edje::Message.new(0, "", item.title, "")
- end
- @edje.send_message(msg)
+ @edje.send_message(item.track_info_message)
end
end
end
end