Merge branch 'test'

2 files changed, 7 insertions, 1 deletions

diff --git a/engine/tables.py b/engine/tables.py
index a59306e..3cffd03 100644
--- a/engine/tables.py
+++ b/engine/tables.py
@@ -599,7 +599,9 @@ hiragana_katakana_table = {
     u"｜" : (u"｜", u"|"),
     u"\u2018"  : (u"\u2018", u"`"),
     u"＠" : (u"＠", u"@"),
+    u"゛" : (u"゛", u"ﾞ"),
     u"｛" : (u"｛", u"{"),
+    u"゜" : (u"゜", u"ﾟ"),
     u"「" : (u"「", u"｢"),
     u"＋" : (u"＋", u"+"),
     u"；" : (u"；", u";"),
@@ -610,6 +612,7 @@ hiragana_katakana_table = {
     u"＜" : (u"＜", u"<"),
     u"＞" : (u"＞", u">"),
     u"？" : (u"？", u"?"),
+    u"・" : (u"・", u"･"),
     u"／" : (u"／", u"/"),
     u"＿" : (u"＿", u"_"),
     u"￥" : (u"￥", u"¥"),
diff --git a/setup/main.py b/setup/main.py
index bb903d7..47752bd 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -1,5 +1,6 @@
 from os import path
 import gtk
+import pango
 from gtk import glade
 from ibus import keysyms, modifier
 from gettext import dgettext
@@ -36,8 +37,10 @@ class AnthySetup(object):
         tv = xml.get_widget('shortcut')
         tv.append_column(gtk.TreeViewColumn('Command',
                                              gtk.CellRendererText(), text=0))
+        renderer = gtk.CellRendererText()
+        renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
         tv.append_column(gtk.TreeViewColumn('Shortcut',
-                                             gtk.CellRendererText(), text=1))
+                                             renderer, text=1))
         tv.get_selection().connect_after('changed',
                                           self.on_selection_changed, 0)
         ls = gtk.ListStore(str, str)