Skip to content

Commit f8651b4

Browse files
committed
Added confirmation popup for deleting rows and switched overwrite default top yes for paste function
1 parent 3ffbea6 commit f8651b4

4 files changed

Lines changed: 18 additions & 5 deletions

File tree

core/table_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def paste(self, model, start_index):
9393
"Overwrite existing cells",
9494
"This operation will overwrite existing data. Do you want to proceed?",
9595
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
96-
QMessageBox.StandardButton.No
96+
QMessageBox.StandardButton.Yes
9797
)
9898
if reply !=QMessageBox.StandardButton.Yes:
9999
return

ui/delegates.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from PyQt6.QtWidgets import (QStyledItemDelegate, QLineEdit, QComboBox,
22
QCompleter, QStyleOptionViewItem, QApplication, QStyle)
3-
from PyQt6.QtCore import Qt, QModelIndex, QTimer, QStringListModel
3+
from PyQt6.QtCore import Qt, QModelIndex, QTimer, QStringListModel, QMetaObject
44
from PyQt6.QtGui import QColor, QPalette
55

66
from core.undo_commands import EditCellCommand
@@ -147,6 +147,7 @@ def setEditorData(self, editor, index):
147147
blocked = editor.blockSignals(True)
148148
editor.setCurrentText(value_str)
149149
editor.blockSignals(blocked)
150+
editor.lineEdit().selectAll()
150151
elif isinstance(editor, QLineEdit):
151152
editor.setText(value_str)
152153
else:

ui/styles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def get_stylesheet(theme) -> str:
110110
border: 1px solid {theme.BORDER};
111111
border-radius: 4px;
112112
selection-color: {theme.TEXT};
113-
selection-background-color: {theme.INFO};
113+
selection-background-color: {theme.BORDER_MUTED};
114114
}}
115115
116116
QTableView::item:focus {{

ui/table.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyQt6.QtWidgets import QWidget, QVBoxLayout, QTableView, QHeaderView, QMenu, QInputDialog
1+
from PyQt6.QtWidgets import QWidget, QVBoxLayout, QTableView, QHeaderView, QMenu, QInputDialog, QMessageBox
22
from PyQt6.QtCore import Qt, pyqtSignal, QItemSelection, QModelIndex
33
from PyQt6.QtGui import QAction, QKeySequence, QShortcut
44

@@ -169,7 +169,19 @@ def delete_rows(self):
169169
else:
170170
return
171171
if rows:
172-
self.deleteRowsRequested.emit(rows)
172+
reply = QMessageBox.question(
173+
self,
174+
"Confirm Delete",
175+
f"Are you sure you want to delete {len(rows)} row(s)",
176+
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
177+
QMessageBox.StandardButton.Yes
178+
)
179+
if reply == QMessageBox.StandardButton.Yes:
180+
self.deleteRowsRequested.emit(rows)
181+
else:
182+
return
183+
184+
173185

174186
def merge_cells(self):
175187
self.table.clearSpans()

0 commit comments

Comments
 (0)