Merge branch 'master' of https://git.bukova.info/repos/git/prodejna
Conflicts: application/mainwindow.cpp
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QVBoxLayout>
|
||||
#include <QFileDialog>
|
||||
#include <QDebug>
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
@@ -56,5 +58,8 @@ void MainWindow::openPlugin()
|
||||
|
||||
void MainWindow::on_actionOpen_database_triggered()
|
||||
{
|
||||
Context::instance().openDb("D:/prac/prodejna.db");
|
||||
QFileDialog dialog(this);
|
||||
dialog.setNameFilter(tr("Database Files (*.db)"));
|
||||
dialog.setWindowTitle(tr("Open Database"));
|
||||
Context::instance().openDb(dialog.getOpenFileName());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user