Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

Conflicts:
	application/mainwindow.cpp

application/mainwindow.cpp

@@ -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());
 }

application/mainwindow.ui

@@ -29,18 +29,8 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>-1</number>
       </property>
-      <widget class="QWidget" name="tab">
-       <attribute name="title">
-        <string>Tab 1</string>
-       </attribute>
-      </widget>
-      <widget class="QWidget" name="tab_2">
-       <attribute name="title">
-        <string>Tab 2</string>
-       </attribute>
-      </widget>
      </widget>
     </item>
    </layout>