Backport fix for issue #2315

spyder-ide · Aug 22, 2015 · 31ead74 · 31ead74
1 parent c127954
commit 31ead74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spyderlib/widgets/dataframeeditor.py b/spyderlib/widgets/dataframeeditor.py
@@ -469,7 +469,7 @@ def setup_and_check(self, data, title=''):
         self.setLayout(self.layout)
         self.setWindowIcon(get_icon('arredit.png'))
         if title:
-            title = to_text_string(title)  # in case title is not a string
+            title = to_text_string(title) + " - %s" % data.__class__.__name__
         else:
             title = _("%s editor") % data.__class__.__name__
         if isinstance(data, TimeSeries):

diff --git a/spyderlib/widgets/dicteditor.py b/spyderlib/widgets/dicteditor.py
@@ -500,8 +500,8 @@ def createEditor(self, parent, option, index):
         elif isinstance(value, (DataFrame, TimeSeries))\
              and DataFrame is not FakeObject:
             editor = DataFrameEditor()
-            if not editor.setup_and_check(value):
-                return	
+            if not editor.setup_and_check(value, title=key):
+                return
             self.create_dialog(editor, dict(model=index.model(), editor=editor,
                                             key=key, readonly=readonly))
             return None