Merge branch 'gui-remove-undo-redo' into 'develop'

Remove undo/redo from GUI, also layout fix for ubuntu

See merge request PUM_TDDD96/B-ASIC!62

b_asic/GUI/gui_interface.py

@@ -246,10 +246,6 @@ class Ui_main_window(object):
         self.load_operations.setObjectName("load_operations")
         self.exit_menu = QtWidgets.QAction(main_window)
         self.exit_menu.setObjectName("exit_menu")
-        self.actionUndo = QtWidgets.QAction(main_window)
-        self.actionUndo.setObjectName("actionUndo")
-        self.actionRedo = QtWidgets.QAction(main_window)
-        self.actionRedo.setObjectName("actionRedo")
         self.actionSimulateSFG = QtWidgets.QAction(main_window)
         self.actionSimulateSFG.setObjectName("actionSimulateSFG")
         self.actionShowPC = QtWidgets.QAction(main_window)
@@ -268,8 +264,6 @@ class Ui_main_window(object):
         self.file_menu.addAction(self.load_operations)
         self.file_menu.addSeparator()
         self.file_menu.addAction(self.exit_menu)
-        self.edit_menu.addAction(self.actionUndo)
-        self.edit_menu.addAction(self.actionRedo)
         self.view_menu.addAction(self.actionToolbar)
         self.run_menu.addAction(self.actionShowPC)
         self.run_menu.addAction(self.actionSimulateSFG)
@@ -319,8 +313,6 @@ class Ui_main_window(object):
         self.load_operations.setText(_translate("main_window", "Load Operations"))
         self.exit_menu.setText(_translate("main_window", "Exit"))
         self.exit_menu.setShortcut(_translate("main_window", "Ctrl+Q"))
-        self.actionUndo.setText(_translate("main_window", "Undo"))
-        self.actionRedo.setText(_translate("main_window", "Redo"))
         self.actionToolbar.setText(_translate("main_window", "Toolbar"))
 
 

b_asic/GUI/main_window.py

@@ -125,7 +125,7 @@ class MainWindow(QMainWindow):
 
     def resizeEvent(self, event):
         self.ui.operation_box.setGeometry(10, 10, self.ui.operation_box.width(), self.height())
-        self.graphic_view.setGeometry(self.ui.operation_box.width() + 20, 30, self.width() - self.ui.operation_box.width() - 20, self.height()-30)
+        self.graphic_view.setGeometry(self.ui.operation_box.width() + 20, 60, self.width() - self.ui.operation_box.width() - 20, self.height()-30)
         super(MainWindow, self).resizeEvent(event)
 
     def wheelEvent(self, event):