diff options
author | Toshiaki Asai <toshi.alternative@gmail.com> | 2014-12-31 19:02:05 +0900 |
---|---|---|
committer | Toshiaki Asai <toshi.alternative@gmail.com> | 2014-12-31 19:02:05 +0900 |
commit | 758cc27e207a097772f03ad5173869f737c60356 (patch) | |
tree | f6f24ef8b6aa35be7ff5356f55ad9b9e900defef | |
parent | 127937d2d00739be7d4eb5405d5dda2499bb1548 (diff) | |
download | mikutter-758cc27e207a097772f03ad5173869f737c60356.tar.gz |
デフォルトスキンを選択ている時、抽出タブのアイコン選択ダイアログの最初のディレクトリをデフォルトスキンのディレクトリにしてみた refs #740
-rwxr-xr-x | core/plugin/extract/edit_window.rb | 2 | ||||
-rw-r--r-- | core/skin.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/plugin/extract/edit_window.rb b/core/plugin/extract/edit_window.rb index 627b97e4..048423c0 100755 --- a/core/plugin/extract/edit_window.rb +++ b/core/plugin/extract/edit_window.rb @@ -111,7 +111,7 @@ class Plugin::Extract::EditWindow < Gtk::Window popup_modifier = generate_modifier :popup Plugin::Settings.new(Plugin[:extract]) do input _('名前'), name_modifier - fileselect _('アイコン'), icon_modifier, Skin.user_dir + fileselect _('アイコン'), icon_modifier, Skin.path settings _('通知') do fileselect _('サウンド'), sound_modifier boolean _('ポップアップ'), popup_modifier end end end diff --git a/core/skin.rb b/core/skin.rb index 3d4ab49d..5dbbdf8e 100644 --- a/core/skin.rb +++ b/core/skin.rb @@ -25,6 +25,10 @@ class Skin end end + def self.path + user_dir || default_dir + end + def self.get(filename, fallback_dirs = []) search_path = [ user_dir, fallback_dirs, default_dir ].flatten.compact |