diff options
author | Toshiaki Asai <toshi.alternative@gmail.com> | 2015-08-31 15:20:30 +0900 |
---|---|---|
committer | Toshiaki Asai <toshi.alternative@gmail.com> | 2015-08-31 15:20:30 +0900 |
commit | 2912f3f9795c47d791c40bbbdcf202f4ddbc4e74 (patch) | |
tree | 9d3324a82f0854d17f77b6e7d7521fece3f0200a | |
parent | 103227960808a7ca2a6562c8297c8949502708ff (diff) | |
download | mikutter-2912f3f9795c47d791c40bbbdcf202f4ddbc4e74.tar.gz |
非公開アカウントを示すアイコンを表示
-rw-r--r-- | core/mui/cairo_miracle_painter.rb | 16 | ||||
-rw-r--r-- | core/plugin/set_view/set_view.rb | 5 | ||||
-rw-r--r-- | core/skin/data/protected.png | bin | 0 -> 18343 bytes | |||
-rw-r--r-- | core/user.rb | 4 |
4 files changed, 18 insertions, 7 deletions
diff --git a/core/mui/cairo_miracle_painter.rb b/core/mui/cairo_miracle_painter.rb index 1fadfddd..cd4147bb 100644 --- a/core/mui/cairo_miracle_painter.rb +++ b/core/mui/cairo_miracle_painter.rb @@ -183,15 +183,18 @@ class Gdk::MiraclePainter < Gtk::Object textselector_unselect end def iob_icon_pixbuf - [ ["reply.png", "etc.png"], - ["retweet.png", - message.favorite? ? "unfav.png" : "fav.png"] ] end + [ ["reply.png".freeze, "etc.png".freeze], + [if message.user.protected?; then "protected.png".freeze else "retweet.png".freeze end, + message.favorite? ? "unfav.png".freeze : "fav.png".freeze] ] end def iob_icon_pixbuf_off - [ [(UserConfig[:show_replied_icon] and message.mentioned_by_me? and "reply.png"), + [ [(UserConfig[:show_replied_icon] and message.mentioned_by_me? and "reply.png".freeze), nil], - [message.retweeted? ? "retweet.png" : nil, - message.favorite? ? "unfav.png" : nil] + [ if UserConfig[:show_protected_icon] and message.user.protected? + "protected.png".freeze + elsif message.retweeted? + "retweet.png".freeze end, + message.favorite? ? "unfav.png".freeze : nil] ] end @@ -426,4 +429,3 @@ class Gdk::MiraclePainter < Gtk::Object end end - diff --git a/core/plugin/set_view/set_view.rb b/core/plugin/set_view/set_view.rb index 60eb17e6..d0656b26 100644 --- a/core/plugin/set_view/set_view.rb +++ b/core/plugin/set_view/set_view.rb @@ -74,6 +74,11 @@ Plugin::create(:set_view) do tooltip(_("自分がふぁぼったつぶやきを、TLの一番上に上げます")) end + settings(_('非公開アカウント')) do + boolean(_('非公開アカウントのつぶやきにはアイコンを表示'), :show_protected_icon). + tooltip(_("非公開アカウントのつぶやきのアイコン上に、リツイートできないこと示すアイコンを隠さずにずっと表示しておきます。")) + end + settings(_('短縮URL')) do boolean(_('短縮URLを展開して表示'), :shrinkurl_expand). tooltip(_("受信したつぶやきに短縮URLが含まれていた場合、それを短縮されていない状態に戻してから表示します。")) diff --git a/core/skin/data/protected.png b/core/skin/data/protected.png Binary files differnew file mode 100644 index 00000000..1c23c1b8 --- /dev/null +++ b/core/skin/data/protected.png diff --git a/core/user.rb b/core/user.rb index 2b68b67e..b1e018c3 100644 --- a/core/user.rb +++ b/core/user.rb @@ -59,6 +59,10 @@ class User < Retriever::Model self[:idname] end alias to_s idname + def protected? + !!self[:protected] + end + # 大きいサイズのアイコンのURLを返す # ==== Return # 元のサイズのアイコンのURL |