mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using C++11 and Qt5 (#808)

Browse Source 
* grammar: Simplify code thanks to C++11 being there

* Use lambdas instead verbose slots for duplicating record

* travis: Use Qt5
This commit is contained in:
Martin Kleusberg
2016-10-18 17:31:20 +02:00
committed by GitHub
parent 65a2c24afc
commit 1ced897793
10 changed files with 37 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/MainWindow.cpp
View File

@@ -156,10 +156,12 @@ void MainWindow::init()
popupBrowseDataHeaderMenu->addSeparator();
popupBrowseDataHeaderMenu->addAction(ui->actionSetAllTablesEncoding);
popupRecordMenu = new QMenu(this);
popupRecordMenu->addAction(ui->actionDittoRecord);
QShortcut* dittoRecordShortcut = new QShortcut(QKeySequence("Ctrl+\""), this);
connect(dittoRecordShortcut, SIGNAL(activated()), this, SLOT(dittoRecord()));
connect(dittoRecordShortcut, &QShortcut::activated, [this]() {
int currentRow = ui->dataTable->currentIndex().row();
auto row = m_browseTableModel->dittoRecord(currentRow);
ui->dataTable->setCurrentIndex(row);
});
// Add menu item for log dock
ui->viewMenu->insertAction(ui->viewDBToolbarAction, ui->dockLog->toggleViewAction());
@@ -599,25 +601,6 @@ void MainWindow::deleteRecord()
}
}
void MainWindow::dittoRecord()
{
const QString sCurrentTable = ui->comboBrowseTable->currentText();
if (!(db.getObjectByName(sCurrentTable).gettype() == "table" && !db.readOnly()))
return;
int row;
if (qobject_cast<QShortcut*>(sender()))
row = ui->dataTable->currentIndex().row();
else
row = ui->actionDittoRecord->property("current_row").toInt();
if (row == -1)
return;
QModelIndex idx = m_browseTableModel->dittoRecord(row);
ui->dataTable->setCurrentIndex(idx);
}
void MainWindow::selectTableLine(int lineToSelect)
{
// Are there even that many lines?
@@ -2605,8 +2588,15 @@ void MainWindow::showRecordPopupMenu(const QPoint& pos)
if (row == -1)
return;
ui->actionDittoRecord->setProperty("current_row", row);
popupRecordMenu->exec(ui->dataTable->verticalHeader()->mapToGlobal(pos));
QMenu popupRecordMenu(this);
QAction* action = new QAction("Duplicate record", &popupRecordMenu);
popupRecordMenu.addAction(action);
connect(action, &QAction::triggered, [&]() {
m_browseTableModel->dittoRecord(row);
});
popupRecordMenu.exec(ui->dataTable->verticalHeader()->mapToGlobal(pos));
}
void MainWindow::editDataColumnDisplayFormat()