Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

This commit is contained in:
2023-04-28 22:25:29 +02:00
parent 30e6180c82
commit d699ce79f7
481 changed files with 2310 additions and 130206 deletions
+12 -12
View File
@@ -8,6 +8,7 @@
#include <QVBoxLayout>
#include <QFileDialog>
#include <QDebug>
#include <QMessageBox>
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -61,11 +62,7 @@ MainWindow::MainWindow(QWidget *parent) :
}
((QVBoxLayout*)ui->navigation->layout())->addStretch(1);
if (Context::instance().db() != NULL)
{
ui->navigation->setEnabled(true);
}
ui->navigation->setEnabled(true);
}
MainWindow::~MainWindow()
@@ -89,7 +86,7 @@ void MainWindow::openPlugin()
void MainWindow::on_actionOpen_database_triggered()
{
closaAllTabs();
closeAllTabs();
closeDashboard();
QString dbFile = QFileDialog::getOpenFileName(this, "Open Database", "", "Database Files (*.db)");
@@ -116,7 +113,7 @@ void MainWindow::on_tabWidget_tabCloseRequested(int index)
void MainWindow::on_actionLogin_triggered()
{
closaAllTabs();
closeAllTabs();
closeDashboard();
QSharedPointer<User> u;
@@ -128,7 +125,7 @@ void MainWindow::on_actionLogin_triggered()
void MainWindow::showEvent(QShowEvent *evt)
{
QWidget::showEvent(evt);
if (Context::instance().db() != NULL && Context::instance().currentUser().data() == NULL)
if (Context::instance().dbOpened() && Context::instance().currentUser().data() == nullptr)
{
m_loginDialog->show();
}
@@ -150,7 +147,7 @@ void MainWindow::on_actionPost_register_triggered()
{
IPlugin *plugZipCodes = Context::instance().plugin("POSTREGISTER");
if (plugZipCodes != NULL)
if (plugZipCodes != nullptr)
{
openPlugin(plugZipCodes);
}
@@ -160,6 +157,9 @@ void MainWindow::openPlugin(IPlugin *plugin)
{
ui->tabWidget->setVisible(true);
ui->dashboard->setVisible(false);
#ifdef Q_OS_MAC
ui->tabWidget->setStyleSheet("QTabBar::tab { width: 150px; }");
#endif
for (int i = 0; i < ui->tabWidget->count(); i++) {
if (ui->tabWidget->widget(i)->objectName() == plugin->pluginId()) {
@@ -168,7 +168,7 @@ void MainWindow::openPlugin(IPlugin *plugin)
}
}
if (plugin->ui() != NULL)
if (plugin->ui() != nullptr)
{
ui->tabWidget->addTab(plugin->ui(), plugin->pluginIcon(), plugin->pluginName());
ui->tabWidget->widget(ui->tabWidget->count() - 1)->setObjectName(plugin->pluginId());
@@ -180,7 +180,7 @@ void MainWindow::on_actionCountry_register_triggered()
{
IPlugin *plugCountryReg = Context::instance().plugin("COUNTRYREGISTER");
if (plugCountryReg != NULL)
if (plugCountryReg != nullptr)
{
openPlugin(plugCountryReg);
}
@@ -236,7 +236,7 @@ void MainWindow::refreshDashboard()
}
}
void MainWindow::closaAllTabs()
void MainWindow::closeAllTabs()
{
ui->tabWidget->setVisible(false);
ui->dashboard->setVisible(true);