Changeset 85e435a09ae3…
Parent 03082a7a0287…
by
Changes to 2 files · Browse files at 85e435a09ae3 Showing diff from parent 03082a7a0287 Diff from another changeset...
@@ -64,12 +64,14 @@ def setupUi(self):
SP = QSizePolicy
- self.hbox = QHBoxLayout(self)
- self.hbox.setSpacing(0)
- self.hbox.setMargin(0)
+ self.repotabs_splitter = QSplitter(orientation=Qt.Vertical)
+ self.setLayout(QVBoxLayout())
+ self.layout().setContentsMargins(0, 0, 0, 0)
+ self.layout().addWidget(self.repotabs_splitter)
self.repoview = HgRepoView(self.workbench)
- self.hbox.addWidget(self.repoview)
+ self.repotabs_splitter.addWidget(self.repoview)
+ self.repotabs_splitter.setCollapsible(0, False)
sp = SP(SP.Expanding, SP.Expanding)
sp.setHorizontalStretch(0)
sp.setVerticalStretch(1)
@@ -89,10 +91,11 @@ self.blankMessageWidget = w
def _inittasktabs(self):
- # TODO: move self.repotabs_splitter to RepoWidget
- self.taskTabsWidget = tt = QTabWidget(self.workbench.repotabs_splitter)
+ self.taskTabsWidget = tt = QTabWidget()
tt.setDocumentMode(True)
tt.setTabPosition(QTabWidget.East)
+ self.repotabs_splitter.addWidget(self.taskTabsWidget)
+
self.revDetailsStackedWidget = sw = QStackedWidget()
self.dummywidget = QWidget()
self.revDetailsStackedWidget.addWidget(self.dummywidget)
@@ -540,9 +543,17 @@
def storeSettings(self):
self.revDetailsWidget.storeSettings()
+ s = QSettings()
+ # TODO: should it be 'repowidget/xxx' ?
+ s.setValue('Workbench/repotabs_splitter',
+ self.repotabs_splitter.saveState())
def restoreSettings(self):
self.revDetailsWidget.restoreSettings()
+ s = QSettings()
+ # TODO: should it be 'repowidget/xxx' ?
+ self.repotabs_splitter.restoreState(
+ s.value('Workbench/repotabs_splitter').toByteArray())
def closeRepoWidget(self):
'''returns False if close should be aborted'''
|
@@ -61,8 +61,6 @@ self._quickbars = []
self.disab_shortcuts = []
- self.repotabs_splitter.setCollapsible(0, False)
-
self.currentRepoRoot = ''
self.setWindowTitle('TortoiseHg Workbench')
@@ -149,12 +147,7 @@ vl.setSpacing(0)
vl.setMargin(0)
- self.repotabs_splitter = sp = QSplitter(self.centralwidget)
- sp.hide()
- sp.setOrientation(Qt.Vertical)
- self.verticalLayout.addWidget(sp)
-
- self.repoTabsWidget = tw = QTabWidget(self.repotabs_splitter)
+ self.repoTabsWidget = tw = QTabWidget()
tw.setDocumentMode(True)
tw.setTabsClosable(True)
tw.setMovable(True)
@@ -163,6 +156,7 @@ sp.setVerticalStretch(1)
sp.setHeightForWidth(tw.sizePolicy().hasHeightForWidth())
tw.setSizePolicy(sp)
+ vl.addWidget(tw)
self.setCentralWidget(self.centralwidget)
@@ -386,11 +380,9 @@ else:
self.taskTabsWidget.setCurrentIndex(0)
w.switchedTo()
- self.repotabs_splitter.show()
else:
self.revDetailsStackedWidget.setCurrentWidget(self.dummywidget)
self.currentRepoRoot = ''
- self.repotabs_splitter.hide()
self.actionDiffMode.setEnabled(False)
self.actionAnnMode.setEnabled(False)
@@ -814,22 +806,12 @@ s.setValue(wb + 'geometry', self.saveGeometry())
s.setValue(wb + 'windowState', self.saveState())
- for n in self.splitternames:
- s.setValue(wb + n, getattr(self, n).saveState())
-
def restoreSettings(self):
s = QSettings()
wb = "Workbench/"
self.restoreGeometry(s.value(wb + 'geometry').toByteArray())
self.restoreState(s.value(wb + 'windowState').toByteArray())
- self.splitternames = []
- sn = ('repotabs', )
- for n in sn:
- n += '_splitter'
- self.splitternames.append(n)
- getattr(self, n).restoreState(s.value(wb + n).toByteArray())
-
def closeEvent(self, event):
if not self.closeRepoTabs():
event.ignore()
|
Loading...