#31462対応

git-svn-id: https://svn.osdn.net/svnroot/pydun/trunk@41 44a3fe10-d6a8-4042-99bc-5bf971f0e03b

diff --git a/Pydun.exe b/Pydun.exe
index b4f70b8..a7fb778 100644 (file)
Binary files a/Pydun.exe and b/Pydun.exe differ

diff --git a/Pydun.py b/Pydun.py
index 0ba403e..d2cd649 100644 (file)
--- a/Pydun.py
+++ b/Pydun.py
@@ -380,7 +380,7 @@ class MainFrame(QtGui.QFrame):
     def create_wall_menu(self, direction):\r
         menu = QtGui.QMenu(self)\r
         for idx, img in enumerate(_mapimages.wall_icons):\r
-            act = QtGui.QAction(self)\r
+            act = QtGui.QAction(_mapimages.wall_texts[idx][direction], self)\r
             act.setIcon(img[direction])\r
 \r
             def triggerd(idx):\r
@@ -942,11 +942,15 @@ class SetSizeDialog(QtGui.QDialog):
 \r
 class MapImages(object):\r
     def __init__(self):\r
+        vtext = [u"なし", u"壁", u"扉", u"扉(→)", u"扉(←)", u"一通(→)", u"一通(←)", u"隠", u"隠(→)", u"隠(←)",]\r
+        htext = [u"なし", u"壁", u"扉", u"扉(↓)", u"扉(↑)", u"一通(↓)", u"一通(↑)", u"隠", u"隠(↓)", u"隠(↑)",]\r
         self.wall_images = list()\r
         self.wall_icons = list()\r
+        self.wall_texts = list()\r
         for index in range(10):\r
             self.wall_images.append(dict())\r
             self.wall_icons.append(dict())\r
+            self.wall_texts.append(dict())\r
             for direction in ["v", "h"]:\r
                 filename = os.path.join(\r
                     basedir(),\r
@@ -956,6 +960,8 @@ class MapImages(object):
                 self.wall_images[index][direction] = QtGui.QImage()\r
                 self.wall_images[index][direction].load(filename)\r
                 self.wall_icons[index][direction] = QtGui.QIcon(filename)\r
+            self.wall_texts[index]["v"] = vtext[index]\r
+            self.wall_texts[index]["h"] = htext[index]\r
 \r
     @property\r
     def width(self):\r