diff -r 6268db2f966d -r a915f8dd1ca6 Project/ProjectBrowser.py
--- a/Project/ProjectBrowser.py Sun Jul 08 17:33:25 2018 +0200
+++ b/Project/ProjectBrowser.py Sun Jul 08 18:55:21 2018 +0200
@@ -13,8 +13,6 @@
from PyQt5.QtGui import QColor
from PyQt5.QtWidgets import QApplication
-from UI.Browser import Browser
-
from E5Gui.E5TabWidget import E5TabWidget
from E5Gui.E5Led import E5ClickableLed
@@ -37,16 +35,12 @@
that doesn't fit these categories. Optionally it contains an additional
tab with the file system browser.
"""
- def __init__(self, project, parent=None, embeddedBrowser=True):
+ def __init__(self, project, parent=None):
"""
Constructor
@param project reference to the project object
@param parent parent widget (QWidget)
- @param embeddedBrowser flag indicating whether the file browser should
- be included. This flag is set to False by those layouts, that
- have the file browser in a separate window or embedded
- in the debeug browser instead
"""
E5TabWidget.__init__(self, parent)
self.project = project
@@ -101,11 +95,6 @@
# others browser
self.poBrowser = ProjectOthersBrowser(self.project)
- # add the file browser, if it should be embedded here
- self.embeddedBrowser = embeddedBrowser
- if embeddedBrowser:
- self.fileBrowser = Browser()
-
# step 2: connect all the browsers
# connect the sources browser
self.project.projectClosed.connect(self.psBrowser._projectClosed)
@@ -174,10 +163,7 @@
self.__currentBrowsersFlags = 0
self.__projectPropertiesChanged()
- if self.embeddedBrowser:
- self.setCurrentWidget(self.fileBrowser)
- else:
- self.setCurrentIndex(0)
+ self.setCurrentIndex(0)
def __setBrowsersAvailable(self, browserFlags):
"""
@@ -232,24 +218,8 @@
UI.PixmapCache.getIcon("projectOthers.png"), '')
self.setTabToolTip(index, self.poBrowser.windowTitle())
- if self.embeddedBrowser:
- index = self.addTab(
- self.fileBrowser,
- UI.PixmapCache.getIcon("browser.png"), '')
- self.setTabToolTip(index, self.fileBrowser.windowTitle())
-
QApplication.processEvents()
- def showEvent(self, evt):
- """
- Protected method handleing the show event.
-
- @param evt show event to handle (QShowEvent)
- """
- E5TabWidget.showEvent(self, evt)
- if self.embeddedBrowser:
- self.fileBrowser.layoutDisplay()
-
def __currentChanged(self, index):
"""
Private slot to handle the currentChanged(int) signal.
@@ -274,10 +244,7 @@
Private slot to handle the projectClosed signal.
"""
self.__projectPropertiesChanged()
- if self.embeddedBrowser:
- self.setCurrentWidget(self.fileBrowser)
- else:
- self.setCurrentIndex(0)
+ self.setCurrentIndex(0)
self.__setSourcesIcon()
self.__vcsStateChanged(" ")
@@ -302,10 +269,7 @@
self.__currentBrowsersFlags = flags
self.__setBrowsersAvailable(flags)
- if self.embeddedBrowser:
- endIndex = self.count() - 1
- else:
- endIndex = self.count()
+ endIndex = self.count()
for index in range(endIndex):
self.setTabEnabled(index, self.project.isOpen())
