Added support for settings

This commit is contained in:
2016-02-24 22:46:36 +01:00
parent 2bb07716b9
commit e569dfbc12
29 changed files with 927 additions and 147 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = prodejna
TEMPLATE = app
DEFINES += _GLIBCXX_USE_CXX11_ABI=0
DEFINES += _GLIBCXX_USE_CXX11_ABI=1
win32 {
INCLUDEPATH += d:/prac/odb/libodb-2.4.0
+6
View File
@@ -121,3 +121,9 @@ void MainWindow::showEvent(QShowEvent *evt)
m_loginDialog->show();
}
}
void MainWindow::on_actionSettings_triggered()
{
SettingsForm *settings = new SettingsForm(this);
settings->show();
}
+2
View File
@@ -30,6 +30,8 @@ private slots:
void on_actionLogin_triggered();
void on_actionSettings_triggered();
private:
Ui::MainWindow *ui;
LoginDialog *m_loginDialog;
+10 -1
View File
@@ -56,7 +56,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>21</height>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -78,6 +78,7 @@
<bool>false</bool>
</attribute>
<addaction name="actionLogin"/>
<addaction name="actionSettings"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="actionExit">
@@ -99,6 +100,14 @@
<string>Login...</string>
</property>
</action>
<action name="actionSettings">
<property name="text">
<string>Settings</string>
</property>
<property name="toolTip">
<string>Settings</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>