diff --git a/.gitignore b/.gitignore index 18415e580c1a8679fd1ec947b815bbfcfebbaaeb..5c4aae5b80e651421a9af921bc5837cefd050fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store *.pyc *~ +.vscode/ diff --git a/launchGui.pyw b/launchGui.pyw index a1472a948a55d959d2c876cdda6ec4661f7c0010..2908b2f09ae215c472751d8fc697588387aa57b3 100755 --- a/launchGui.pyw +++ b/launchGui.pyw @@ -67,20 +67,26 @@ class LaunchGui(QWidget): hbox = QHBoxLayout() hbox.setContentsMargins(2,2,2,2) coFrame.setLayout(hbox) + # Ajout de la console #hbox.addWidget(self.myStream.console) self.buildConsole() - hbox.addWidget(self.console) + hbox.addWidget(self.console) + # Ajout du frame d'options + scroll = QScrollArea() + scroll.setMinimumSize(QSize(500,500)) + scroll.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding) + hbox.addWidget(scroll) + optFrame = QFrame() - optFrame.setMaximumSize(QSize(500,999999)) - hbox.addWidget(optFrame) optVBox = QVBoxLayout() optFrame.setLayout(optVBox) #Ajout des Widgets d'options self.buildParametersFrame(optVBox) #Ajout des Widgets d'action - self.buildButtonFrame(optVBox) + self.buildButtonFrame(optVBox) + scroll.setWidget(optFrame) # -------------------------------- self.resize(1100, 600) # --------------------------------