Merge pull request #4719 from ccordoba12/some-ui-fixes

PR: Fix running in dedicated consoles and other UI fixes

spyder/app/mainwindow.py

@@ -432,7 +432,7 @@ def signal_handler(signum, frame=None):
         if options.window_title is not None:
             title += ' -- ' + options.window_title
 
-        if DEV or DEBUG or PYTEST:
+        if DEBUG or PYTEST:
             # Show errors in internal console when developing or testing.
             CONF.set('main', 'show_internal_console_if_traceback', True)
 

spyder/plugins/configdialog.py

@@ -39,6 +39,9 @@
 from spyder.widgets.sourcecode.codeeditor import CodeEditor
 
 
+HDPI_QT_PAGE = "http://doc.qt.io/qt-5/highdpi.html"
+
+
 class ConfigAccessMixin(object):
     """Namespace for methods that access config storage"""
     CONF_SECTION = None
@@ -872,9 +875,6 @@ def setup_page(self):
         tear_off_box = newcb(_("Tear off menus"), 'tear_off_menus',
                              tip=_("Set this to detach any<br> "
                                    "menu from the main window"))
-        high_dpi_scaling_box = newcb(_("Enable high DPI scaling"), 
-                                     'high_dpi_scaling',
-                                     tip=_("Set this for high DPI displays"))
         margin_box = newcb(_("Custom margin for panes:"),
                            'use_custom_margin')
         margin_spin = self.create_spinbox("", _("pixels"), 'custom_margin',
@@ -901,7 +901,6 @@ def setup_page(self):
         interface_layout.addWidget(verttabs_box)
         interface_layout.addWidget(animated_box)
         interface_layout.addWidget(tear_off_box)
-        interface_layout.addWidget(high_dpi_scaling_box)
         interface_layout.addLayout(margins_layout)
         interface_group.setLayout(interface_layout)
 
@@ -953,9 +952,13 @@ def setup_page(self):
         # --- Screen resolution Group (hidpi)
         screen_resolution_group = QGroupBox(_("Screen resolution"))
         screen_resolution_bg = QButtonGroup(screen_resolution_group)
-        screen_resolution_label = QLabel(_("Configurations for highdpi screens, "
-                                "See: <a href=\"http://doc.qt.io/qt-5/highdpi.html\">http://doc.qt.io/qt-5/highdpi.html</a><> "
-                                "for more information"))
+        screen_resolution_label = QLabel(_("Configuration for high DPI "
+                                           "screens<br><br>"
+                                           "Please see "
+                                           "<a href=\"{0}\">{0}</a><> "
+                                           "for more information about "
+                                           "these options (in "
+                                           "English).").format(HDPI_QT_PAGE))
         screen_resolution_label.setWordWrap(True)
 
         normal_radio = self.create_radiobutton(

spyder/plugins/ipythonconsole.py

@@ -1285,8 +1285,9 @@ def create_client_for_file(self, filename):
     def get_client_for_file(self, filename):
         """Get client associated with a given file."""
         client = None
-        for cl in self.get_clients():
-            if cl.given_name == filename:
+        for idx, cl in enumerate(self.get_clients()):
+            if self.filenames[idx] == filename:
+                self.tabwidget.setCurrentIndex(idx)
                 client = cl
                 break
         return client
@@ -1383,6 +1384,7 @@ def move_tab(self, index_from, index_to):
         client = self.clients.pop(index_from)
         self.filenames.insert(index_to, filename)
         self.clients.insert(index_to, client)
+        self.update_tabs_text()
         self.update_plugin_title.emit()
 
     def disambiguate_fname(self, fname):
@@ -1394,9 +1396,11 @@ def disambiguate_fname(self, fname):
     def update_tabs_text(self):
         """Update the text from the tabs."""
         for index, fname in enumerate(self.filenames):
+            client = self.clients[index]
             if fname:
-                client = self.clients[index]
                 self.rename_client_tab(client, self.disambiguate_fname(fname))
+            else:
+                self.rename_client_tab(client, None)
 
     def rename_client_tab(self, client, given_name):
         """Rename client's tab"""

spyder/widgets/editor.py

@@ -358,7 +358,7 @@ def load_data(self):
         for index in reversed(self.stack_history):
             text = self.tabs.tabText(index)
             text = text.replace('&', '')
-            item = QListWidgetItem(ima.icon('FileIcon'), text)
+            item = QListWidgetItem(ima.icon('TextFileIcon'), text)
             self.addItem(item)
 
     def item_selected(self, item=None):

spyder/widgets/tabs.py

@@ -17,15 +17,16 @@
 
 # Third party imports
 from qtpy import PYQT5
-from qtpy.QtCore import QByteArray, QMimeData, QPoint, Qt, Signal, QEvent
+from qtpy.QtCore import (QByteArray, QEvent, QMimeData, QPoint, Qt, Signal,
+                         Slot)
 from qtpy.QtGui import QDrag
 from qtpy.QtWidgets import (QApplication, QHBoxLayout, QMenu, QTabBar,
                             QTabWidget, QWidget, QLineEdit)
 
 # Local imports
 from spyder.config.base import _
 from spyder.config.gui import config_shortcut
-from spyder.py3compat import PY2, to_text_string
+from spyder.py3compat import PY2, to_binary_string, to_text_string
 from spyder.utils import icon_manager as ima
 from spyder.utils.misc import get_common_path
 from spyder.utils.qthelpers import (add_actions, create_action,
@@ -172,51 +173,49 @@ def mouseMoveEvent(self, event):
                 QApplication.startDragDistance():
             drag = QDrag(self)
             mimeData = QMimeData()
-            # Converting id's to long to avoid an OverflowError with PySide
-            if PY2:
-                ancestor_id = long(id(self.ancestor))
-                parent_widget_id = long(id(self.parentWidget()))
-                self_id = long(id(self))
-            else:
-                ancestor_id = id(self.ancestor)
-                parent_widget_id = id(self.parentWidget())
-                self_id = id(self)
-            mimeData.setData("parent-id", QByteArray.number(ancestor_id))
+
+            ancestor_id = to_text_string(id(self.ancestor))
+            parent_widget_id = to_text_string(id(self.parentWidget()))
+            self_id = to_text_string(id(self))
+            source_index = to_text_string(self.tabAt(self.__drag_start_pos))
+
+            mimeData.setData("parent-id", to_binary_string(ancestor_id))
             mimeData.setData("tabwidget-id",
-                             QByteArray.number(parent_widget_id))
-            mimeData.setData("tabbar-id", QByteArray.number(self_id))
-            mimeData.setData("source-index", 
-                         QByteArray.number(self.tabAt(self.__drag_start_pos)))
+                             to_binary_string(parent_widget_id))
+            mimeData.setData("tabbar-id", to_binary_string(self_id))
+            mimeData.setData("source-index", to_binary_string(source_index))
+
             drag.setMimeData(mimeData)
             drag.exec_()
         QTabBar.mouseMoveEvent(self, event)
 
     def dragEnterEvent(self, event):
         """Override Qt method"""
         mimeData = event.mimeData()
-        formats = list( mimeData.formats() )
+        formats = list(mimeData.formats())
+
         if "parent-id" in formats and \
-           mimeData.data("parent-id").toLong()[0] == id(self.ancestor):
+          int(mimeData.data("parent-id")) == id(self.ancestor):
             event.acceptProposedAction()
+
         QTabBar.dragEnterEvent(self, event)
 
     def dropEvent(self, event):
         """Override Qt method"""
         mimeData = event.mimeData()
-        index_from = mimeData.data("source-index").toInt()[0]
+        index_from = int(mimeData.data("source-index"))
         index_to = self.tabAt(event.pos())
         if index_to == -1:
             index_to = self.count()
-        if mimeData.data("tabbar-id").toLong()[0] != id(self):
-            tabwidget_from = str(mimeData.data("tabwidget-id").toLong()[0])
+        if int(mimeData.data("tabbar-id")) != id(self):
+            tabwidget_from = to_text_string(mimeData.data("tabwidget-id"))
 
             # We pass self object ID as a QString, because otherwise it would 
             # depend on the platform: long for 64bit, int for 32bit. Replacing 
             # by long all the time is not working on some 32bit platforms 
             # (see Issue 1094, Issue 1098)
             self.sig_move_tab[(str, int, int)].emit(tabwidget_from, index_from,
                                                     index_to)
-
             event.acceptProposedAction()
         elif index_from != index_to:
             self.sig_move_tab.emit(index_from, index_to)
@@ -441,6 +440,7 @@ def tab_navigate(self, delta=1):
             index = self.currentIndex()+delta
         self.setCurrentIndex(index)
 
+    @Slot(int, int)
     def move_tab(self, index_from, index_to):
         """Move tab inside a tabwidget"""
         self.move_data.emit(index_from, index_to)
@@ -456,6 +456,7 @@ def move_tab(self, index_from, index_to):
         self.setCurrentWidget(current_widget)
         self.move_tab_finished.emit()
 
+    @Slot(str, int, int)
     def move_tab_from_another_tabwidget(self, tabwidget_from,
                                         index_from, index_to):
         """Move tab from a tabwidget to another"""
@@ -464,5 +465,5 @@ def move_tab_from_another_tabwidget(self, tabwidget_from,
         # depend on the platform: long for 64bit, int for 32bit. Replacing 
         # by long all the time is not working on some 32bit platforms 
         # (see Issue 1094, Issue 1098)
-        self.sig_move_tab.emit(tabwidget_from, str(id(self)), index_from,
-                               index_to)
+        self.sig_move_tab.emit(tabwidget_from, to_text_string(id(self)),
+                               index_from, index_to)