Commit 3cff355e authored by Aurélien's avatar Aurélien
Browse files

menu bar cliquable et bien alignée sur un jeu (à généraliser)

parent 4db3725f

controller/menuController.py

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ class MenuController: 
        self.level = None

        self.menu = Menu(self)

        self.game = None

        self.diaplayMenu()

        self.displayMenu()



    def lauchApplication(self):

        self.menu.window.show()



    def diaplayMenu(self):

    def displayMenu(self):

        self.menu.displayGames()



    def on_DyckWordToBinaryTree_Button_Pressed(self):

view/binaryTreeToDyckWordGui.py

+15 −7
Original line number Diff line number Diff line
@@ -16,16 +16,24 @@ class BinaryTreeToDyckWordGui(LevelGui): 
        self.createScoreLabel()



        self.layout = QGridLayout()

        self.layout.addWidget(self.menuWidget, 0, 0, alignment=Qt.AlignLeft)

        self.layout.addWidget(self.levelWidget, 0, 1, alignment=Qt.AlignLeft)

        self.layout.addWidget(self.scoreLabel, 0, 3, alignment=Qt.AlignRight)

        self.layout.addWidget(self.treeView, 1, 0, 1, 2)

        self.layout.addWidget(self.dyckWordGroupBox, 1, 2, 1, 2)

        self.layout.setColumnStretch(1, 2)

        self.layout.setColumnStretch(2, 1)

        self.createMenuBar()

        self.layout.addLayout(self.menuBarLayout, 0, 0, 1, 0)

        self.layout.addWidget(self.treeView, 1, 0)

        self.layout.addWidget(self.dyckWordGroupBox, 1, 1)

        self.layout.setColumnStretch(0, 2)

        self.layout.setColumnStretch(1, 1)



        self.setLayout(self.layout)





    def createMenuBar(self):

        self.menuBarLayout = QHBoxLayout()

        self.menuBarLayout.addWidget(self.menuWidget, alignment=Qt.AlignLeft)

        self.menuBarLayout.addWidget(self.levelWidget, alignment=Qt.AlignLeft)

        self.menuBarLayout.addStretch(1)

        self.menuBarLayout.addWidget(self.scoreLabel, alignment=Qt.AlignRight)

        self.menuBarLayout.addWidget(self.numberPointsLabel, alignment=Qt.AlignRight)



    def createDyckWordGroupBox(self):

        self.dyckWordGroupBox = QGroupBox()

        self.dyckWordGroupBox.setStyleSheet("background: white;")

view/binaryTreeToPlanarTreeGui.py

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class BinaryTreeToPlanarTreeGui(LevelGui): 
        self.createTreeView()



        self.layout = QGridLayout()

        self.layout.addWidget(self.scoreLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.numberPointsLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.treeView, 1, 0)

        self.layout.addWidget(self.planarTreeView, 1, 1)

view/dyckWordToBinaryTreeGui.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ class DyckWordToBinaryTreeGui(LevelGui): 




        self.layout = QGridLayout()

        self.layout.addWidget(self.scoreLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.numberPointsLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.dyckWordGroupBox, 1, 0)

        self.layout.addWidget(self.treeView, 1, 1)

        self.layout.setColumnStretch(0, 1)

view/dyckWordToPlanarTreeGui.py

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ class DyckWordToPlanarTreeGui(LevelGui): 
        self.createTreeView()



        self.layout = QGridLayout()

        self.layout.addWidget(self.scoreLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.numberPointsLabel, 0, 1, alignment=Qt.AlignRight)

        self.layout.addWidget(self.dyckWordGroupBox, 1, 0)

        self.layout.addWidget(self.treeView, 1, 1)

        self.layout.setColumnStretch(0, 1)