diff --git a/src/View/Geometry/GeometryWindow.py b/src/View/Geometry/GeometryWindow.py index e6ec58f988e93003da78debb79dd4e9143d4dd73..2bbd100a3361062d78b9263b18b2010be0907505 100644 --- a/src/View/Geometry/GeometryWindow.py +++ b/src/View/Geometry/GeometryWindow.py @@ -84,20 +84,20 @@ class GeometryWindow(QMainWindow, WindowToolKit): self.plot_ac() def setup_connections(self): - self.ui.btn_open.clicked.connect(self.open_file_dialog) - self.ui.btn_sort_asc.clicked.connect(self.sort_ascending) - self.ui.btn_sort_desc.clicked.connect(self.sort_descending) - self.ui.btn_move_up.clicked.connect(self.move_row_up) - self.ui.btn_move_down.clicked.connect(self.move_row_down) - self.ui.btn_end_editing.clicked.connect(self.handleSave) - self.ui.btn_add.clicked.connect(self.insert_row) - self.ui.btn_delete.clicked.connect(self.delete_rows) - self.ui.btn_edit.clicked.connect(self.edit_profile) + self.ui.btn_open.triggered.connect(self.open_file_dialog) + self.ui.btn_sort_asc.triggered.connect(self.sort_ascending) + self.ui.btn_sort_desc.triggered.connect(self.sort_descending) + self.ui.btn_move_up.triggered.connect(self.move_row_up) + self.ui.btn_move_down.triggered.connect(self.move_row_down) + self.ui.btn_end_editing.triggered.connect(self.handleSave) + self.ui.btn_add.triggered.connect(self.insert_row) + self.ui.btn_delete.triggered.connect(self.delete_rows) + self.ui.btn_edit.triggered.connect(self.edit_profile) self.ui.verticalSlider.valueChanged.connect(self.changed_slider_value) self.ui.btn_slider_up.clicked.connect(self.decrement_value_slider) self.ui.btn_slider_down.clicked.connect(self.increment_value_slider) - self.ui.btn_move_up.clicked.connect(self.changed_profile_slot) + self.ui.btn_move_up.triggered.connect(self.changed_profile_slot) self.undo_sc.activated.connect(self.undo) self.redo_sc.activated.connect(self.redo) diff --git a/src/View/Geometry/Profile/ProfileWindow.py b/src/View/Geometry/Profile/ProfileWindow.py index 3654b8051050353bf9d1f94e0e03bc67f5b3471f..c4cb19844f118dc0b03d1c043ac5ec8adec423ee 100644 --- a/src/View/Geometry/Profile/ProfileWindow.py +++ b/src/View/Geometry/Profile/ProfileWindow.py @@ -89,15 +89,15 @@ class ProfileWindow(QMainWindow, WindowToolKit): self.ui.tableView.setItemDelegate(Delegate()) def setup_connections(self): - self.ui.btn_sort_asc_x.clicked.connect(self.sort_X_ascending) - self.ui.btn_sort_desc_x.clicked.connect(self.sort_X_descending) - self.ui.btn_sort_asc_y.clicked.connect(self.sort_Y_ascending) - self.ui.btn_sort_desc_y.clicked.connect(self.sort_Y_descending) - self.ui.btn_move_up.clicked.connect(self.move_row_up) - self.ui.btn_move_down.clicked.connect(self.move_row_down) - self.ui.btn_export.clicked.connect(self.handleSave) - self.ui.btn_add.clicked.connect(self.insert_row) - self.ui.btn_delete.clicked.connect(self.delete_row) + self.ui.btn_sort_asc_x.triggered.connect(self.sort_X_ascending) + self.ui.btn_sort_desc_x.triggered.connect(self.sort_X_descending) + self.ui.btn_sort_asc_y.triggered.connect(self.sort_Y_ascending) + self.ui.btn_sort_desc_y.triggered.connect(self.sort_Y_descending) + self.ui.btn_move_up.triggered.connect(self.move_row_up) + self.ui.btn_move_down.triggered.connect(self.move_row_down) + self.ui.btn_export.triggered.connect(self.handleSave) + self.ui.btn_add.triggered.connect(self.insert_row) + self.ui.btn_delete.triggered.connect(self.delete_row) # self.ui.btn_copy.clicked.connect(self.copyTable) # self.ui.btn_paste.clicked.connect(self.pasteTable) # self.ui.btn_check.clicked.connect(self.validate_changes) diff --git a/src/View/Geometry/Profile/mainwindow_ui_profile.py b/src/View/Geometry/Profile/mainwindow_ui_profile.py index 6ed564ca040df4ac40d87e3f2d6c217b6aaa5ae3..8de74df0e2ef9f5470b31cc8372741df1f7add71 100644 --- a/src/View/Geometry/Profile/mainwindow_ui_profile.py +++ b/src/View/Geometry/Profile/mainwindow_ui_profile.py @@ -41,159 +41,117 @@ class Ui_MainWindow(object): btn_size = QSize(40, 28) - self.btn_add = QtWidgets.QPushButton(self.widget) - self.btn_add.setMaximumSize(btn_size) - self.btn_add.setText("") + self.btn_add = QtWidgets.QAction(self.widget) self.btn_add.setObjectName("btn_add") icon_btn_add = QtGui.QIcon() icon_btn_add.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-add.png")) self.btn_add.setIcon(icon_btn_add) - self.btn_add.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_add) + self.toolBar.addAction(self.btn_add) - self.btn_delete = QtWidgets.QPushButton(self.widget) - self.btn_delete.setMaximumSize(btn_size) - self.btn_delete.setText("") + self.btn_delete = QtWidgets.QAction(self.widget) self.btn_delete.setObjectName("btn_delete") icon_btn_delete = QtGui.QIcon() icon_btn_delete.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-remove.png")) self.btn_delete.setIcon(icon_btn_delete) - self.btn_delete.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_delete) + self.toolBar.addAction(self.btn_delete) - self.btn_sort_asc_x = QtWidgets.QPushButton(self.widget) - self.btn_sort_asc_x.setMaximumSize(btn_size) - self.btn_sort_asc_x.setText("") + self.btn_sort_asc_x = QtWidgets.QAction(self.widget) self.btn_sort_asc_x.setObjectName("btn_sort_asc_x") icon_btn_sort_asc_x = QtGui.QIcon() icon_btn_sort_asc_x.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-ascending.png")) self.btn_sort_asc_x.setIcon(icon_btn_sort_asc_x) - self.btn_sort_asc_x.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_asc_x) + self.toolBar.addAction(self.btn_sort_asc_x) - self.btn_sort_desc_x = QtWidgets.QPushButton(self.widget) - self.btn_sort_desc_x.setMaximumSize(btn_size) - self.btn_sort_desc_x.setText("") + self.btn_sort_desc_x = QtWidgets.QAction(self.widget) self.btn_sort_desc_x.setObjectName("btn_sort_desc_x") icon_btn_sort_desc_x = QtGui.QIcon() icon_btn_sort_desc_x.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-descending.png")) self.btn_sort_desc_x.setIcon(icon_btn_sort_desc_x) - self.btn_sort_desc_x.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_desc_x) + self.toolBar.addAction(self.btn_sort_desc_x) - self.btn_sort_asc_y = QtWidgets.QPushButton(self.widget) - self.btn_sort_asc_y.setMaximumSize(btn_size) - self.btn_sort_asc_y.setText("") + self.btn_sort_asc_y = QtWidgets.QAction(self.widget) self.btn_sort_asc_y.setObjectName("btn_sort_asc_y") icon_btn_sort_asc_y = QtGui.QIcon() icon_btn_sort_asc_y.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-ascending.png")) self.btn_sort_asc_y.setIcon(icon_btn_sort_asc_y) - self.btn_sort_asc_y.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_asc_y) + self.toolBar.addAction(self.btn_sort_asc_y) - self.btn_sort_desc_y = QtWidgets.QPushButton(self.widget) - self.btn_sort_desc_y.setMaximumSize(btn_size) - self.btn_sort_desc_y.setText("") + self.btn_sort_desc_y = QtWidgets.QAction(self.widget) self.btn_sort_desc_y.setObjectName("btn_sort_desc_y") icon_btn_sort_desc_y = QtGui.QIcon() icon_btn_sort_desc_y.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-descending.png")) self.btn_sort_desc_y.setIcon(icon_btn_sort_desc_y) - self.btn_sort_desc_y.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_desc_y) + self.toolBar.addAction(self.btn_sort_desc_y) - self.btn_move_up = QtWidgets.QPushButton(self.widget) - self.btn_move_up.setMaximumSize(btn_size) - self.btn_move_up.setText("") + self.btn_move_up = QtWidgets.QAction(self.widget) self.btn_move_up.setObjectName("btn_move_up") icon_btn_move_up = QtGui.QIcon() icon_btn_move_up.addPixmap( QtGui.QPixmap(f"{icon_path}up.png")) self.btn_move_up.setIcon(icon_btn_move_up) - self.btn_move_up.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_move_up) + self.toolBar.addAction(self.btn_move_up) - self.btn_move_down = QtWidgets.QPushButton(self.widget) - self.btn_move_down.setMaximumSize(btn_size) - self.btn_move_down.setText("") + self.btn_move_down = QtWidgets.QAction(self.widget) self.btn_move_down.setObjectName("btn_move_down") icon_btn_move_down = QtGui.QIcon() icon_btn_move_down.addPixmap( QtGui.QPixmap(f"{icon_path}down.png")) self.btn_move_down.setIcon(icon_btn_move_down) - self.btn_move_down.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_move_down) + self.toolBar.addAction(self.btn_move_down) - self.btn_export = QtWidgets.QPushButton(self.widget) - self.btn_export.setMaximumSize(btn_size) - self.btn_export.setText("") + self.btn_export = QtWidgets.QAction(self.widget) self.btn_export.setObjectName("btn_export") icon_btn_export = QtGui.QIcon() icon_btn_export.addPixmap( QtGui.QPixmap(f"{icon_path}export.png")) self.btn_export.setIcon(icon_btn_export) - self.btn_export.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_export) + self.toolBar.addAction(self.btn_export) - self.btn_copy = QtWidgets.QPushButton(self.widget) - self.btn_copy.setMaximumSize(btn_size) - self.btn_copy.setText("") + self.btn_copy = QtWidgets.QAction(self.widget) self.btn_copy.setObjectName("btn_copy") icon_btn_copy = QtGui.QIcon() icon_btn_copy.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-copy.png")) self.btn_copy.setIcon(icon_btn_copy) - self.btn_copy.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_copy) + self.toolBar.addAction(self.btn_copy) - self.btn_paste = QtWidgets.QPushButton(self.widget) - self.btn_paste.setMaximumSize(btn_size) - self.btn_paste.setText("") + self.btn_paste = QtWidgets.QAction(self.widget) self.btn_paste.setObjectName("btn_paste") icon_btn_paste = QtGui.QIcon() icon_btn_paste.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-paste.png")) self.btn_paste.setIcon(icon_btn_paste) - self.btn_paste.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_paste) + self.toolBar.addAction(self.btn_paste) - self.btn_check = QtWidgets.QPushButton(self.widget) - self.btn_check.setMaximumSize(btn_size) - self.btn_check.setText("") + self.btn_check = QtWidgets.QAction(self.widget) self.btn_check.setObjectName("btn_check") icon_btn_check = QtGui.QIcon() icon_btn_check.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-apply.png")) self.btn_check.setIcon(icon_btn_check) - self.btn_check.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_check) + self.toolBar.addAction(self.btn_check) - self.btn_go_back = QtWidgets.QPushButton(self.widget) - self.btn_go_back.setMaximumSize(btn_size) - self.btn_go_back.setText("") + self.btn_go_back = QtWidgets.QAction(self.widget) self.btn_go_back.setObjectName("btn_go_back") icon_btn_go_back = QtGui.QIcon() icon_btn_go_back.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-undo.png")) self.btn_go_back.setIcon(icon_btn_go_back) - self.btn_go_back.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_go_back) + self.toolBar.addAction(self.btn_go_back) - self.btn_reset = QtWidgets.QPushButton(self.widget) - self.btn_reset.setMaximumSize(btn_size) - self.btn_reset.setText("") + self.btn_reset = QtWidgets.QAction(self.widget) self.btn_reset.setObjectName("btn_reset") icon_btn_reset = QtGui.QIcon() icon_btn_reset.addPixmap( QtGui.QPixmap(f"{icon_path}cancel.png")) self.btn_reset.setIcon(icon_btn_reset) - self.btn_reset.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_reset) + self.toolBar.addAction(self.btn_reset) self.verticalLayout_left.addLayout(self.horizontalLayout) diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py index 21fe89b953216d1e146288dc0e39d680fd127b83..b0b55323d520f4477c748b1cf43a8a10f99e41ab 100644 --- a/src/View/Geometry/mainwindow_ui_reach.py +++ b/src/View/Geometry/mainwindow_ui_reach.py @@ -47,135 +47,102 @@ class Ui_MainWindow(object): btn_size = QSize(40, 28) - self.btn_open = QtWidgets.QPushButton(self.widget) - self.btn_open.setMaximumSize(btn_size) + self.btn_open = QtWidgets.QAction(self.widget) self.btn_open.setObjectName("btn_open") icon_btn_open = QtGui.QIcon() icon_btn_open.addPixmap( QtGui.QPixmap(f"{icon_path}open.png")) self.btn_open.setIcon(icon_btn_open) - #self.btn_open.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_open) + self.toolBar.addAction(self.btn_open) - self.btn_add = QtWidgets.QPushButton(self.widget) - self.btn_add.setMaximumSize(btn_size) + self.btn_add = QtWidgets.QAction(self.widget) self.btn_add.setObjectName("btn_add") icon_btn_add = QtGui.QIcon() icon_btn_add.addPixmap( QtGui.QPixmap(f"{icon_path}gtk_add.png")) self.btn_add.setIcon(icon_btn_add) - #self.btn_add.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_add) + self.toolBar.addAction(self.btn_add) - self.btn_delete = QtWidgets.QPushButton(self.widget) - self.btn_delete.setMaximumSize(btn_size) + self.btn_delete = QtWidgets.QAction(self.widget) self.btn_delete.setObjectName("btn_delete") icon_btn_delete = QtGui.QIcon() icon_btn_delete.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-remove.png")) self.btn_delete.setIcon(icon_btn_delete) - #self.btn_delete.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_delete) + self.toolBar.addAction(self.btn_delete) - self.btn_edit = QtWidgets.QPushButton(self.widget) - self.btn_edit.setMaximumSize(btn_size) + self.btn_edit = QtWidgets.QAction(self.widget) self.btn_edit.setObjectName("btn_edit") icon_btn_edit = QtGui.QIcon() icon_btn_edit.addPixmap( QtGui.QPixmap(f"{icon_path}gnome-stock-edit.png")) self.btn_edit.setIcon(icon_btn_edit) - #self.btn_edit.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_edit) + self.toolBar.addAction(self.btn_edit) - self.btn_copy_selected_profile = QtWidgets.QPushButton(self.widget) - self.btn_copy_selected_profile.setMaximumSize(btn_size) + self.btn_copy_selected_profile = QtWidgets.QAction(self.widget) self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile") icon_btn_copy_selected_profile = QtGui.QIcon() icon_btn_copy_selected_profile.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-copy.png")) self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile) - #self.btn_copy_selected_profile.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_copy_selected_profile) + self.toolBar.addAction(self.btn_copy_selected_profile) - self.btn_paste_selected_profile = QtWidgets.QPushButton(self.widget) - self.btn_paste_selected_profile.setMaximumSize(btn_size) + self.btn_paste_selected_profile = QtWidgets.QAction(self.widget) self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile") icon_btn_paste_selected_profile = QtGui.QIcon() icon_btn_paste_selected_profile.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-paste.png")) self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile) - #self.btn_paste_selected_profile.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_paste_selected_profile) + self.toolBar.addAction(self.btn_paste_selected_profile) - self.btn_duplicate_selected_profile = QtWidgets.QPushButton(self.widget) - self.btn_duplicate_selected_profile.setMaximumSize(btn_size) + self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget) self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile") icon_btn_duplicate_selected_profile = QtGui.QIcon() icon_btn_duplicate_selected_profile.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png")) self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile) - #self.btn_duplicate_selected_profile.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_duplicate_selected_profile) + self.toolBar.addAction(self.btn_duplicate_selected_profile) - self.btn_sort_asc = QtWidgets.QPushButton(self.widget) - self.btn_sort_asc.setMaximumSize(btn_size) - self.btn_sort_asc.setText("") + self.btn_sort_asc = QtWidgets.QAction(self.widget) self.btn_sort_asc.setObjectName("btn_sort_asc") icon_btn_sort_asc = QtGui.QIcon() icon_btn_sort_asc.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-ascending.png")) self.btn_sort_asc.setIcon(icon_btn_sort_asc) - #self.btn_sort_asc.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_asc) + self.toolBar.addAction(self.btn_sort_asc) - self.btn_sort_desc = QtWidgets.QPushButton(self.widget) - self.btn_sort_desc.setMaximumSize(btn_size) - self.btn_sort_desc.setText("") + self.btn_sort_desc = QtWidgets.QAction(self.widget) self.btn_sort_desc.setObjectName("btn_sort_desc") icon_btn_sort_desc = QtGui.QIcon() icon_btn_sort_desc.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-sort-descending.png")) self.btn_sort_desc.setIcon(icon_btn_sort_desc) - #self.btn_sort_desc.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_sort_desc) + self.toolBar.addAction(self.btn_sort_desc) - self.btn_move_up = QtWidgets.QPushButton(self.widget) - self.btn_move_up.setMaximumSize(btn_size) - self.btn_move_up.setText("") + self.btn_move_up = QtWidgets.QAction(self.widget) self.btn_move_up.setObjectName("btn_move_up") icon_btn_move_up = QtGui.QIcon() icon_btn_move_up.addPixmap( QtGui.QPixmap(f"{icon_path}up.png")) self.btn_move_up.setIcon(icon_btn_move_up) - #self.btn_move_up.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_move_up) + self.toolBar.addAction(self.btn_move_up) - self.btn_move_down = QtWidgets.QPushButton(self.widget) - self.btn_move_down.setMaximumSize(btn_size) - self.btn_move_down.setText("") + self.btn_move_down = QtWidgets.QAction(self.widget) self.btn_move_down.setObjectName("btn_move_down") icon_btn_move_down = QtGui.QIcon() icon_btn_move_down.addPixmap( QtGui.QPixmap(f"{icon_path}down.png")) self.btn_move_down.setIcon(icon_btn_move_down) - #self.btn_move_down.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_move_down) + self.toolBar.addAction(self.btn_move_down) - self.btn_end_editing = QtWidgets.QPushButton(self.widget) - self.btn_end_editing.setMaximumSize(btn_size) - self.btn_end_editing.setText("") + self.btn_end_editing = QtWidgets.QAction(self.widget) self.btn_end_editing.setObjectName("btn_end_editing") icon_btn_save = QtGui.QIcon() icon_btn_save.addPixmap( QtGui.QPixmap(f"{icon_path}gtk-apply.png")) self.btn_end_editing.setIcon(icon_btn_save) - #self.btn_end_editing.setIconSize(btn_size) - self.toolBar.addWidget(self.btn_end_editing) + self.toolBar.addAction(self.btn_end_editing) - spacerItem = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) - #self.horizontalLayout.addItem(spacerItem) self.verticalLayout.addLayout(self.horizontalLayout) self.tableView = QtWidgets.QTableView(self.widget) self.tableView.setObjectName("tableView") @@ -256,6 +223,7 @@ class Ui_MainWindow(object): self.btn_slider_up = QtWidgets.QPushButton(self.widget1) self.btn_slider_up.setMaximumSize(btn_size) + self.btn_slider_up.setText("") self.btn_slider_up.setObjectName("btn_slider_up") icon_btn_slider_up = QtGui.QIcon() icon_btn_slider_up.addPixmap( @@ -266,6 +234,7 @@ class Ui_MainWindow(object): self.btn_slider_down = QtWidgets.QPushButton(self.widget1) self.btn_slider_down.setMaximumSize(btn_size) + self.btn_slider_down.setText("") self.btn_slider_down.setObjectName("btn_slider_down") icon_btn_slider_down = QtGui.QIcon() icon_btn_slider_down.addPixmap( @@ -281,6 +250,7 @@ class Ui_MainWindow(object): self.btn_slider_go_back = QtWidgets.QPushButton(self.widget1) self.btn_slider_go_back.setMaximumSize(btn_size) + self.btn_slider_go_back.setText("") self.btn_slider_go_back.setObjectName("btn_slider_go_back") icon_btn_slider_go_back = QtGui.QIcon() icon_btn_slider_go_back.addPixmap( @@ -292,6 +262,7 @@ class Ui_MainWindow(object): self.btn_slider_go_forward = QtWidgets.QPushButton(self.widget1) self.btn_slider_go_forward.setMaximumSize(btn_size) + self.btn_slider_go_forward.setText("") self.btn_slider_go_forward.setObjectName("btn_slider_go_forward") icon_btn_slider_go_forward = QtGui.QIcon() icon_btn_slider_go_forward.addPixmap(