Kouhei Sutou
kous****@users*****
Thu Jun 8 22:39:19 JST 2006
Index: kazehakase/data/ext/ruby/kz/actions/install-as-ruby-extension.rb
diff -u kazehakase/data/ext/ruby/kz/actions/install-as-ruby-extension.rb:1.4 kazehakase/data/ext/ruby/kz/actions/install-as-ruby-extension.rb:1.5
--- kazehakase/data/ext/ruby/kz/actions/install-as-ruby-extension.rb:1.4 Thu May 11 10:41:21 2006
+++ kazehakase/data/ext/ruby/kz/actions/install-as-ruby-extension.rb Thu Jun 8 22:39:19 2006
@@ -20,7 +20,7 @@
def act_install_as_ruby_extension(action, group, kz)
statusbar_timeout = 3 * 1000
- statusbar_id = kz.statusbar.get_context_id(action.name)
+ name = action.name
uri = nil
uri = kz.mouse_event_info.link if kz.mouse_event_info
uri = kz.current_page.location if uri.nil? and kz.current_page
@@ -31,12 +31,12 @@
dl = Kz::Downloader.new(uri, filename)
dl.signal_connect("completed") do
Kz::Actions.install_action(kz, filename)
- kz.statusbar.push(statusbar_id, _("installed Ruby extension successfully"))
- Kz.pop_statusbar(kz, statusbar_id, statusbar_timeout)
+ kz.statusbar.set_text(_("installed Ruby extension successfully"), name)
+ Kz.pop_statusbar(kz, name, statusbar_timeout)
end
dl.signal_connect("error") do
- kz.statusbar.push(statusbar_id, _("failed Ruby extension install"))
- Kz.pop_statusbar(kz, statusbar_id, statusbar_timeout)
+ kz.statusbar.set_text(_("failed Ruby extension install"), name)
+ Kz.pop_statusbar(kz, name, statusbar_timeout)
end
Kz::DownloaderGroup.add(dl)
dl.to_file
Index: kazehakase/data/ext/ruby/kz/actions/text-link.rb
diff -u kazehakase/data/ext/ruby/kz/actions/text-link.rb:1.4 kazehakase/data/ext/ruby/kz/actions/text-link.rb:1.5
--- kazehakase/data/ext/ruby/kz/actions/text-link.rb:1.4 Thu May 11 10:41:21 2006
+++ kazehakase/data/ext/ruby/kz/actions/text-link.rb Thu Jun 8 22:39:19 2006
@@ -1,7 +1,7 @@
require 'nkf'
def act_text_link(action, group, kz)
statusbar_timeout = 3 * 1000
- statusbar_id = kz.statusbar.get_context_id(action.name)
+ name = action.name
return unless kz.current_page
uri = kz.current_page.selection_string
normalized_uri = NKF.nkf("-m0 -Z -Z1 -W -w", uri).gsub(/\s/, '')
@@ -13,13 +13,12 @@
normalized_uri = normalized_uri.sub(/^[^:]+(s?)/, "http\\1")
matched = true
else
- kz.statusbar.pop(statusbar_id)
- kz.statusbar.push(statusbar_id, _("couldn't open %s as URI") % uri)
- Kz.pop_statusbar(kz, statusbar_id, statusbar_timeout)
+ kz.statusbar.set_text(_("couldn't open %s as URI") % uri, name)
+ Kz.pop_statusbar(kz, name, statusbar_timeout)
end
if matched
- kz.statusbar.pop(statusbar_id)
+ kz.statusbar.set_text(nil, name)
new_tab = Kz::Conf["Global", "entry_open_in_new_tab", Kz::Conf::BOOL]
if new_tab
kz.open_new_tab(normalized_uri)
Index: kazehakase/data/ext/ruby/kz/actions/view-pdf-as-image.rb
diff -u kazehakase/data/ext/ruby/kz/actions/view-pdf-as-image.rb:1.5 kazehakase/data/ext/ruby/kz/actions/view-pdf-as-image.rb:1.6
--- kazehakase/data/ext/ruby/kz/actions/view-pdf-as-image.rb:1.5 Sat May 27 19:07:24 2006
+++ kazehakase/data/ext/ruby/kz/actions/view-pdf-as-image.rb Thu Jun 8 22:39:19 2006
@@ -40,9 +40,9 @@
def ruby_poppler_is_unavailable(action, kz)
statusbar_timeout = 3 * 1000
- statusbar_id = kz.statusbar.get_context_id(action.name)
- kz.statusbar.push(statusbar_id, _("need to install Ruby/Poppler"))
- Kz.pop_statusbar(kz, statusbar_id, statusbar_timeout)
+ name = action.name
+ kz.statusbar.push(_("need to install Ruby/Poppler"), name)
+ Kz.pop_statusbar(kz, name, statusbar_timeout)
end
def start_downloader(kz, uri)