Skip to content

Commit

Permalink
workaround for https://bugreports.qt.io/browse/QTBUG-114916
Browse files Browse the repository at this point in the history
  • Loading branch information
Fanda Vacek committed Jul 9, 2023
1 parent 0d48d9d commit 1a06b3a
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 53 deletions.
18 changes: 14 additions & 4 deletions quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ ConnectDbDialogWidget::ConnectDbDialogWidget(QWidget *parent) :
setTitle(tr("Data storage setup"));

ui->setupUi(this);
ui->btSqlServer->setChecked(true);
ui->dataStorageStackedWidget->setCurrentWidget(ui->pgSqlServer);
connect(ui->btSqlServer, &QAbstractButton::toggled, this, [this](bool checked) {
if(checked)
ui->dataStorageStackedWidget->setCurrentWidget(ui->pgSqlServer);
});
connect(ui->btSingleFile, &QAbstractButton::toggled, this, [this](bool checked) {
if(checked)
ui->dataStorageStackedWidget->setCurrentWidget(ui->pgSingleFile);
});
}

ConnectDbDialogWidget::~ConnectDbDialogWidget()
Expand All @@ -27,7 +37,7 @@ QString ConnectDbDialogWidget::eventName()

Event::EventPlugin::ConnectionType ConnectDbDialogWidget::connectionType()
{
if(ui->dataStorageTabWidget->currentIndex() == 0)
if(ui->dataStorageStackedWidget->currentWidget() == ui->pgSqlServer)
return Event::EventPlugin::ConnectionType::SqlServer;
return Event::EventPlugin::ConnectionType::SingleFile;
}
Expand Down Expand Up @@ -63,10 +73,10 @@ void ConnectDbDialogWidget::loadSettings()
ui->edEventName->setText(settings.eventName());
switch(settings.connectionType()) {
case Event::EventPlugin::ConnectionType::SqlServer:
ui->dataStorageTabWidget->setCurrentWidget(ui->tabPostgres);
ui->btSqlServer->setChecked(true);
break;
case Event::EventPlugin::ConnectionType::SingleFile:
ui->dataStorageTabWidget->setCurrentWidget(ui->tabSqlite);
ui->btSingleFile->setChecked(true);
break;
}
ui->edServerHost->setText(settings.serverHost());
Expand All @@ -83,7 +93,7 @@ void ConnectDbDialogWidget::saveSettings()
ConnectionSettings settings;
settings.setEventName(ui->edEventName->text());
auto connection_type = Event::EventPlugin::ConnectionType::SqlServer;
if(ui->dataStorageTabWidget->currentWidget() == ui->tabSqlite)
if(ui->dataStorageStackedWidget->currentWidget() == ui->pgSingleFile)
connection_type = Event::EventPlugin::ConnectionType::SingleFile;
settings.setConnectionType(connection_type);
settings.setServerHost(ui->edServerHost->text());
Expand Down
121 changes: 73 additions & 48 deletions quickevent/app/quickevent/plugins/Event/src/connectdbdialogwidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,72 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QRadioButton" name="btSqlServer">
<property name="text">
<string>&amp;SQL server</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="btSingleFile">
<property name="text">
<string>Single &amp;file</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Data storage</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
Expand All @@ -89,14 +149,11 @@
<number>3</number>
</property>
<item>
<widget class="QTabWidget" name="dataStorageTabWidget">
<widget class="QStackedWidget" name="dataStorageStackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tabPostgres">
<attribute name="title">
<string>S&amp;ql server</string>
</attribute>
<widget class="QWidget" name="pgSqlServer">
<layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand All @@ -108,25 +165,22 @@
<number>6</number>
</property>
<property name="leftMargin">
<number>18</number>
<number>3</number>
</property>
<property name="topMargin">
<number>18</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>18</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>18</number>
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Host</string>
</property>
<property name="buddy">
<cstring>edServerHost</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
Expand All @@ -141,9 +195,6 @@
<property name="text">
<string>&amp;Port</string>
</property>
<property name="buddy">
<cstring>edServerPort</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
Expand All @@ -167,9 +218,6 @@
<property name="text">
<string>&amp;User</string>
</property>
<property name="buddy">
<cstring>edServerUser</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
Expand All @@ -184,9 +232,6 @@
<property name="text">
<string>Pa&amp;ssword</string>
</property>
<property name="buddy">
<cstring>edServerPassword</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
Expand All @@ -201,25 +246,22 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tabSqlite">
<attribute name="title">
<string>Single &amp;file</string>
</attribute>
<widget class="QWidget" name="pgSingleFile">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>9</number>
<number>6</number>
</property>
<property name="leftMargin">
<number>18</number>
<number>3</number>
</property>
<property name="topMargin">
<number>18</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>18</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>18</number>
<number>3</number>
</property>
<item>
<widget class="QLabel" name="label_6">
Expand Down Expand Up @@ -267,23 +309,6 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>FIXME</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>will be removed, when https://bugreports.qt.io/browse/QTBUG-114916 will be fixed</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand All @@ -294,7 +319,7 @@
<layoutdefault spacing="3" margin="3"/>
<tabstops>
<tabstop>edEventName</tabstop>
<tabstop>dataStorageTabWidget</tabstop>
<tabstop>dataStorageStackedWidget</tabstop>
<tabstop>edServerHost</tabstop>
<tabstop>edServerPort</tabstop>
<tabstop>edServerUser</tabstop>
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/src/appversion.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once

#define APP_VERSION "3.0.2"
#define APP_VERSION "3.0.3"

0 comments on commit 1a06b3a

Please sign in to comment.