From 9e1d0d9bc59a3e8afa41642ef2a7f9840f9b0c9b Mon Sep 17 00:00:00 2001 From: jwollert Date: Thu, 28 Oct 2010 10:43:58 +0200 Subject: [PATCH] Application uses globally shared icons now (Ticket #370) --- .../application/lib/application/speedbar.rb | 2 +- .../lib/application_swt/icon.rb | 6 ++-- .../lib/application_swt/tab.rb | 2 -- .../lib/application_swt/window.rb | 30 +++++++----------- plugins/swt/lib/swt.rb | 2 +- plugins/textmate/vendor/redcar-bundles | 2 +- .../application => share}/icons/close.png | Bin .../icons/darwin-file.png | Bin .../icons/darwin-folder.png | Bin .../icons/redcar-icon-beta-dev.png | Bin .../icons/redcar-icon-beta.png | Bin .../icons/redcar-splash.png | Bin 12 files changed, 17 insertions(+), 27 deletions(-) rename {plugins/application => share}/icons/close.png (100%) rename {plugins/application => share}/icons/darwin-file.png (100%) rename {plugins/application => share}/icons/darwin-folder.png (100%) rename plugins/application/icons/redcar_icon_beta_dev.png => share/icons/redcar-icon-beta-dev.png (100%) rename plugins/application/icons/redcar_icon_beta.png => share/icons/redcar-icon-beta.png (100%) rename {plugins/application => share}/icons/redcar-splash.png (100%) diff --git a/plugins/application/lib/application/speedbar.rb b/plugins/application/lib/application/speedbar.rb index f1a9f9f75..f1b8fef29 100644 --- a/plugins/application/lib/application/speedbar.rb +++ b/plugins/application/lib/application/speedbar.rb @@ -20,7 +20,7 @@ def self.append_item(item) end def self.close_image_path - File.join(Redcar.root, %w(plugins application icons close.png)) + File.join(Redcar::ICONS_DIRECTORY, "/close.png") end def self.define_item_finder(name) diff --git a/plugins/application_swt/lib/application_swt/icon.rb b/plugins/application_swt/lib/application_swt/icon.rb index 562c767d4..7bcc962db 100644 --- a/plugins/application_swt/lib/application_swt/icon.rb +++ b/plugins/application_swt/lib/application_swt/icon.rb @@ -24,13 +24,11 @@ def self.cached_images end def self.dir_image - path = File.join(Redcar.root, %w(plugins application icons darwin-folder.png)) - image(path) + swt_image(:darwin_folder) end def self.file_image - path = File.join(Redcar.root, %w(plugins application icons darwin-file.png)) - image(path) + swt_image(:darwin_file) end end end diff --git a/plugins/application_swt/lib/application_swt/tab.rb b/plugins/application_swt/lib/application_swt/tab.rb index a241685d9..2e22be478 100644 --- a/plugins/application_swt/lib/application_swt/tab.rb +++ b/plugins/application_swt/lib/application_swt/tab.rb @@ -4,8 +4,6 @@ class Tab attr_reader :item, :model, :notebook, :widget - FILE_ICON = File.join(Redcar.root, %w(plugins application lib application assets file.png)) - def initialize(model, notebook, position = nil) @model, @notebook = model, notebook create_item_widget(position || @notebook.tab_folder.item_count) diff --git a/plugins/application_swt/lib/application_swt/window.rb b/plugins/application_swt/lib/application_swt/window.rb index d36d2603d..b483d89ca 100644 --- a/plugins/application_swt/lib/application_swt/window.rb +++ b/plugins/application_swt/lib/application_swt/window.rb @@ -138,32 +138,26 @@ def refresh_menu end def refresh_toolbar - if Redcar.app.show_toolbar? - @toolbar_controller = ApplicationSWT::ToolBar.new(self, Redcar.app.main_toolbar, Swt::SWT::HORIZONTAL | Swt::SWT::BORDER) - @toolbar_controller.show() - @toolbar_height = @toolbar_controller.height.to_i - else - @toolbar_controller.hide() if @toolbar_controller - @toolbar_height = 0 - end - reset_sash_height + if Redcar.app.show_toolbar? + @toolbar_controller = ApplicationSWT::ToolBar.new(self, Redcar.app.main_toolbar, Swt::SWT::HORIZONTAL | Swt::SWT::BORDER) + @toolbar_controller.show() + @toolbar_height = @toolbar_controller.height.to_i + else + @toolbar_controller.hide() if @toolbar_controller + @toolbar_height = 0 + end + reset_sash_height end def set_icon - path = File.join(icon_dir, icon_file) - icon = Swt::Graphics::Image.new(ApplicationSWT.display, path) - shell.image = icon - end - - def icon_dir - File.join(Redcar.root, %w(plugins application icons)) + shell.image = Icon.swt_image(icon_file) end def icon_file if Redcar::VERSION =~ /dev$/ - "redcar_icon_beta_dev.png" + :redcar_icon_beta_dev else - "redcar_icon_beta.png" + :redcar_icon_beta end end diff --git a/plugins/swt/lib/swt.rb b/plugins/swt/lib/swt.rb index 65cccd94a..1edf08c6c 100644 --- a/plugins/swt/lib/swt.rb +++ b/plugins/swt/lib/swt.rb @@ -47,7 +47,7 @@ def initialize(max) end def show - @image = Swt::Graphics::Image.new(Swt.display, File.dirname(__FILE__) + "/../../application/icons/redcar-splash.png") + @image = Swt::Graphics::Image.new(Swt.display, Redcar::ICONS_DIRECTORY + "/redcar-splash.png") @splash = Swt::Widgets::Shell.new(Swt::SWT::NONE) @bar = Swt::Widgets::ProgressBar.new(@splash, Swt::SWT::NONE) @bar.setMaximum(max) diff --git a/plugins/textmate/vendor/redcar-bundles b/plugins/textmate/vendor/redcar-bundles index da8ecda82..a6de04f5f 160000 --- a/plugins/textmate/vendor/redcar-bundles +++ b/plugins/textmate/vendor/redcar-bundles @@ -1 +1 @@ -Subproject commit da8ecda8240c0bc03270ab3768a2a3ecd40a1b80 +Subproject commit a6de04f5f0fcb4dc5c3e71658399f94aff056545 diff --git a/plugins/application/icons/close.png b/share/icons/close.png similarity index 100% rename from plugins/application/icons/close.png rename to share/icons/close.png diff --git a/plugins/application/icons/darwin-file.png b/share/icons/darwin-file.png similarity index 100% rename from plugins/application/icons/darwin-file.png rename to share/icons/darwin-file.png diff --git a/plugins/application/icons/darwin-folder.png b/share/icons/darwin-folder.png similarity index 100% rename from plugins/application/icons/darwin-folder.png rename to share/icons/darwin-folder.png diff --git a/plugins/application/icons/redcar_icon_beta_dev.png b/share/icons/redcar-icon-beta-dev.png similarity index 100% rename from plugins/application/icons/redcar_icon_beta_dev.png rename to share/icons/redcar-icon-beta-dev.png diff --git a/plugins/application/icons/redcar_icon_beta.png b/share/icons/redcar-icon-beta.png similarity index 100% rename from plugins/application/icons/redcar_icon_beta.png rename to share/icons/redcar-icon-beta.png diff --git a/plugins/application/icons/redcar-splash.png b/share/icons/redcar-splash.png similarity index 100% rename from plugins/application/icons/redcar-splash.png rename to share/icons/redcar-splash.png