Skip to content

Commit 06da4e8

Browse files
committedOct 31, 2012
Add resize splitter for console
as it was from f15b4e1
1 parent d6e832d commit 06da4e8

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed
 

‎python/console.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ def __init__(self, parent=None):
8888

8989
self.options = optionsDialog(self)
9090

91+
self.splitter = QSplitter(self)
92+
self.splitter.setOrientation(Qt.Vertical)
93+
self.splitter.setHandleWidth(3)
94+
self.splitter.setChildrenCollapsible(False)
95+
9196
self.toolBar = QToolBar()
9297
self.toolBar.setEnabled(True)
9398
self.toolBar.setFocusPolicy(Qt.NoFocus)
@@ -262,25 +267,20 @@ def __init__(self, parent=None):
262267
sizePolicy.setHeightForWidth(self.widgetButton.sizePolicy().hasHeightForWidth())
263268
self.widgetButton.setSizePolicy(sizePolicy)
264269

265-
self.consoleFrame = QFrame(self)
266-
self.consoleFrame.setObjectName("consoleFrame")
267-
self.consoleLayout = QVBoxLayout(self.consoleFrame)
268-
self.consoleLayout.setSpacing(0)
269-
self.consoleLayout.setMargin(0)
270+
self.splitter.addWidget(self.textEditOut)
271+
self.splitter.addWidget(self.edit)
272+
273+
sizes = self.splitter.sizes()
274+
self.splitter.setSizes(sizes)
275+
276+
self.f.addWidget(self.widgetButton, 0, 0)
277+
self.f.addWidget(self.splitter, 0, 1)
270278

271279
sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
272280
sizePolicy.setHorizontalStretch(0)
273281
sizePolicy.setVerticalStretch(0)
274282
sizePolicy.setHeightForWidth(self.textEditOut.sizePolicy().hasHeightForWidth())
275283
self.textEditOut.setSizePolicy(sizePolicy)
276-
self.consoleLayout.addWidget(self.textEditOut)
277-
278-
self.edit.setMinimumSize(QSize(0, 32))
279-
self.edit.setMaximumSize(QSize(16777215, 32))
280-
self.consoleLayout.addWidget(self.edit)
281-
282-
self.f.addWidget(self.widgetButton, 0, 0)
283-
self.f.addWidget(self.consoleFrame, 0, 1)
284284

285285
self.clearButton.triggered.connect(self.textEditOut.clearConsole)
286286
self.optionsButton.triggered.connect(self.openSettings)

‎python/console_output.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def __init__(self, parent=None):
9494
self.setCaretLineVisible(True)
9595
self.setCaretLineBackgroundColor(QColor("#fcf3ed"))
9696

97+
self.setMinimumHeight(80)
9798

9899
# Folding
99100
#self.setFolding(QsciScintilla.BoxedTreeFoldStyle)

‎python/console_sci.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self, parent=None):
5050

5151
self.buffer = []
5252

53-
#self.insertInitText()
53+
self.insertInitText()
5454
self.displayPrompt(False)
5555

5656
for line in _init_commands:
@@ -94,10 +94,9 @@ def __init__(self, parent=None):
9494
self.SendScintilla(QsciScintilla.SCI_SETHSCROLLBAR, 0)
9595
self.SendScintilla(QsciScintilla.SCI_SETVSCROLLBAR, 0)
9696

97-
9897
# not too small
9998
#self.setMinimumSize(500, 300)
100-
self.setMinimumHeight(32)
99+
self.setMinimumHeight(50)
101100

102101
self.SendScintilla(QsciScintilla.SCI_SETWRAPMODE, 2)
103102
self.SendScintilla(QsciScintilla.SCI_EMPTYUNDOBUFFER)
@@ -553,6 +552,6 @@ def write(self, txt):
553552

554553
def write_stdout(self, txt):
555554
if len(txt) > 0:
556-
getCmdString = self.text()
555+
getCmdString = self.text(2)
557556
prompt = getCmdString[0:4]
558557
sys.stdout.write(prompt+txt+'\n')

0 commit comments

Comments
 (0)
Please sign in to comment.