Skip to content

Rearrange preferences database #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgrojo merged 3 commits into from
Jun 2, 2020
Merged

Rearrange preferences database #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73453d3
rearrange preferences database
horst-p-w-neubauer May 11, 2020
f13ed19
fix ui mistake (reset currenIndex to 0)
horst-p-w-neubauer May 16, 2020
2c16dd5
fix ui mistake (4x XyMargin)
horst-p-w-neubauer May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/PreferencesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Tabs tab)
{
ui->setupUi(this);
ui->treeSyntaxHighlighting->setColumnHidden(0, true);
ui->labelDatabaseDefaultSqlText->setVisible(false);
ui->editDatabaseDefaultSqlText->setVisible(false);
ui->tableClientCerts->setColumnHidden(0, true);

ui->fr_bin_bg->installEventFilter(this);
Expand Down
309 changes: 128 additions & 181 deletions src/PreferencesDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,159 +555,140 @@
<attribute name="title">
<string>&amp;Database</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::FieldsStayAtSizeHint</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Database &amp;encoding</string>
</property>
<property name="buddy">
<cstring>encodingComboBox</cstring>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::FieldsStayAtSizeHint</enum>
</property>
</widget>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Database &amp;encoding</string>
</property>
<property name="buddy">
<cstring>encodingComboBox</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Open databases with foreign keys enabled.</string>
</property>
<property name="text">
<string>&amp;Foreign keys</string>
</property>
<property name="buddy">
<cstring>foreignKeysCheckBox</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Remove line breaks in schema &amp;view</string>
</property>
<property name="buddy">
<cstring>checkHideSchemaLinebreaks</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Prefetch block si&amp;ze</string>
</property>
<property name="buddy">
<cstring>spinPrefetchSize</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="defaultFieldTypeLabel">
<property name="text">
<string>Default field type</string>
</property>
<property name="buddy">
<cstring>defaultFieldTypeComboBox</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="defaultFieldTypeComboBox"/>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="spinPrefetchSize">
<property name="minimum">
<number>255</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkHideSchemaLinebreaks">
<property name="toolTip">
<string>When enabled, the line breaks in the Schema column of the DB Structure tab, dock and printed output are removed.</string>
</property>
<property name="text">
<string>enabled</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="foreignKeysCheckBox">
<property name="text">
<string>enabled</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="encodingComboBox">
<item>
<property name="text">
<string notr="true">UTF-8</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">UTF-16</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="encodingComboBox">
<item>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<property name="text">
<string notr="true">UTF-8</string>
</property>
<widget class="QLabel" name="labelDatabaseDefaultSqlText">
<property name="text">
<string>SQ&amp;L to execute after opening database</string>
</property>
<property name="buddy">
<cstring>editDatabaseDefaultSqlText</cstring>
</property>
</widget>
</item>
<item>
<property name="text">
<string notr="true">UTF-16</string>
</property>
<widget class="SqlTextEdit" name="editDatabaseDefaultSqlText">
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Open databases with foreign keys enabled.</string>
</property>
<property name="text">
<string>&amp;Foreign keys</string>
</property>
<property name="buddy">
<cstring>foreignKeysCheckBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="foreignKeysCheckBox">
<property name="text">
<string>enabled</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Remove line breaks in schema &amp;view</string>
</property>
<property name="buddy">
<cstring>checkHideSchemaLinebreaks</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkHideSchemaLinebreaks">
<property name="toolTip">
<string>When enabled, the line breaks in the Schema column of the DB Structure tab, dock and printed output are removed.</string>
</property>
<property name="text">
<string>enabled</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Prefetch block si&amp;ze</string>
</property>
<property name="buddy">
<cstring>spinPrefetchSize</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="spinPrefetchSize">
<property name="minimum">
<number>255</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="buttonDatabaseAdvanced">
<property name="text">
<string>Advanced</string>
</property>
<property name="icon">
<iconset resource="icons/icons.qrc">
<normaloff>:/icons/down</normaloff>:/icons/down</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="SqlTextEdit" name="editDatabaseDefaultSqlText">
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
</size>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="labelDatabaseDefaultSqlText">
<property name="text">
<string>SQ&amp;L to execute after opening database</string>
</property>
<property name="buddy">
<cstring>editDatabaseDefaultSqlText</cstring>
</property>
</widget>
</item>
<item row="8" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>180</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="defaultFieldTypeComboBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="defaultFieldTypeLabel">
<property name="text">
<string>Default field type</string>
</property>
<property name="buddy">
<cstring>defaultFieldTypeComboBox</cstring>
</property>
</widget>
</layout>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -1902,8 +1883,6 @@ Can be set to 0 for disabling completion.</string>
<tabstop>checkHideSchemaLinebreaks</tabstop>
<tabstop>spinPrefetchSize</tabstop>
<tabstop>defaultFieldTypeComboBox</tabstop>
<tabstop>buttonDatabaseAdvanced</tabstop>
<tabstop>editDatabaseDefaultSqlText</tabstop>
<tabstop>comboDataBrowserFont</tabstop>
<tabstop>spinDataBrowserFontSize</tabstop>
<tabstop>spinSymbolLimit</tabstop>
Expand Down Expand Up @@ -2013,38 +1992,6 @@ Can be set to 0 for disabling completion.</string>
</hint>
</hints>
</connection>
<connection>
<sender>buttonDatabaseAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>labelDatabaseDefaultSqlText</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>344</x>
<y>230</y>
</hint>
<hint type="destinationlabel">
<x>119</x>
<y>273</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonDatabaseAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>editDatabaseDefaultSqlText</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>344</x>
<y>230</y>
</hint>
<hint type="destinationlabel">
<x>365</x>
<y>252</y>
</hint>
</hints>
</connection>
<connection>
<sender>checkUseRemotes</sender>
<signal>toggled(bool)</signal>
Expand Down