oqtopus 0.1.16__py3-none-any.whl → 0.1.17__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- oqtopus/gui/database_create_dialog.py +15 -6
- oqtopus/ui/database_create_dialog.ui +43 -54
- {oqtopus-0.1.16.dist-info → oqtopus-0.1.17.dist-info}/METADATA +1 -1
- {oqtopus-0.1.16.dist-info → oqtopus-0.1.17.dist-info}/RECORD +7 -7
- {oqtopus-0.1.16.dist-info → oqtopus-0.1.17.dist-info}/WHEEL +0 -0
- {oqtopus-0.1.16.dist-info → oqtopus-0.1.17.dist-info}/licenses/LICENSE +0 -0
- {oqtopus-0.1.16.dist-info → oqtopus-0.1.17.dist-info}/top_level.txt +0 -0
|
@@ -35,6 +35,11 @@ from ..utils.qt_utils import OverrideCursor
|
|
|
35
35
|
DIALOG_UI = PluginUtils.get_ui_class("database_create_dialog.ui")
|
|
36
36
|
|
|
37
37
|
|
|
38
|
+
DEFAULT_PG_PORT = "5432"
|
|
39
|
+
DEFAULT_PG_DB = "postgres"
|
|
40
|
+
DEFAULT_PG_HOST = "localhost"
|
|
41
|
+
|
|
42
|
+
|
|
38
43
|
class DatabaseCreateDialog(QDialog, DIALOG_UI):
|
|
39
44
|
def __init__(self, selected_service=None, parent=None):
|
|
40
45
|
QDialog.__init__(self, parent)
|
|
@@ -62,6 +67,11 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
|
|
|
62
67
|
self.parameters_ssl_comboBox.addItem("require", "require")
|
|
63
68
|
self.parameters_ssl_comboBox.addItem("verify-ca", "verify-ca")
|
|
64
69
|
self.parameters_ssl_comboBox.addItem("verify-full", "verify-full")
|
|
70
|
+
self.parameters_ssl_comboBox.setCurrentIndex(2) # Default to 'prefer'
|
|
71
|
+
|
|
72
|
+
self.parameters_host_lineEdit.setPlaceholderText(DEFAULT_PG_HOST)
|
|
73
|
+
self.parameters_port_lineEdit.setPlaceholderText(DEFAULT_PG_PORT)
|
|
74
|
+
self.parameters_database_lineEdit.setPlaceholderText(DEFAULT_PG_DB)
|
|
65
75
|
|
|
66
76
|
self.database_lineEdit.textChanged.connect(self._databaseTextChanged)
|
|
67
77
|
|
|
@@ -91,8 +101,7 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
|
|
|
91
101
|
self.parameters_ssl_comboBox.setCurrentIndex(parameter_ssl_index)
|
|
92
102
|
self.parameters_user_lineEdit.setText(service_user)
|
|
93
103
|
self.parameters_password_lineEdit.setText(service_password)
|
|
94
|
-
|
|
95
|
-
self.database_lineEdit.setText(service_dbname)
|
|
104
|
+
self.parameters_database_lineEdit.setText(service_dbname)
|
|
96
105
|
|
|
97
106
|
def _enterManuallyToggled(self, checked):
|
|
98
107
|
self.parameters_frame.setEnabled(checked)
|
|
@@ -195,16 +204,16 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
|
|
|
195
204
|
|
|
196
205
|
# Collect parameters from manual input fields
|
|
197
206
|
if self.parameters_host_lineEdit.text():
|
|
198
|
-
parameters["host"] = self.parameters_host_lineEdit.text()
|
|
207
|
+
parameters["host"] = self.parameters_host_lineEdit.text() or DEFAULT_PG_HOST
|
|
199
208
|
if self.parameters_port_lineEdit.text():
|
|
200
|
-
parameters["port"] = self.parameters_port_lineEdit.text()
|
|
209
|
+
parameters["port"] = self.parameters_port_lineEdit.text() or DEFAULT_PG_PORT
|
|
201
210
|
if self.parameters_ssl_comboBox.currentData():
|
|
202
211
|
parameters["sslmode"] = self.parameters_ssl_comboBox.currentData()
|
|
203
212
|
if self.parameters_user_lineEdit.text():
|
|
204
213
|
parameters["user"] = self.parameters_user_lineEdit.text()
|
|
205
214
|
if self.parameters_password_lineEdit.text():
|
|
206
215
|
parameters["password"] = self.parameters_password_lineEdit.text()
|
|
207
|
-
if self.
|
|
208
|
-
parameters["dbname"] = self.
|
|
216
|
+
if self.parameters_database_lineEdit.text():
|
|
217
|
+
parameters["dbname"] = self.parameters_database_lineEdit.text() or DEFAULT_PG_DB
|
|
209
218
|
|
|
210
219
|
return parameters
|
|
@@ -62,13 +62,23 @@
|
|
|
62
62
|
<enum>QFrame::Raised</enum>
|
|
63
63
|
</property>
|
|
64
64
|
<layout class="QGridLayout" name="gridLayout_5">
|
|
65
|
-
<item row="
|
|
66
|
-
<widget class="
|
|
65
|
+
<item row="5" column="1">
|
|
66
|
+
<widget class="QLineEdit" name="parameters_password_lineEdit">
|
|
67
|
+
<property name="clearButtonEnabled">
|
|
68
|
+
<bool>true</bool>
|
|
69
|
+
</property>
|
|
70
|
+
</widget>
|
|
71
|
+
</item>
|
|
72
|
+
<item row="5" column="0">
|
|
73
|
+
<widget class="QLabel" name="label_12">
|
|
67
74
|
<property name="text">
|
|
68
|
-
<string>
|
|
75
|
+
<string>Password</string>
|
|
69
76
|
</property>
|
|
70
77
|
</widget>
|
|
71
78
|
</item>
|
|
79
|
+
<item row="3" column="1">
|
|
80
|
+
<widget class="QComboBox" name="parameters_ssl_comboBox"/>
|
|
81
|
+
</item>
|
|
72
82
|
<item row="3" column="0">
|
|
73
83
|
<widget class="QLabel" name="label_11">
|
|
74
84
|
<property name="text">
|
|
@@ -76,38 +86,11 @@
|
|
|
76
86
|
</property>
|
|
77
87
|
</widget>
|
|
78
88
|
</item>
|
|
79
|
-
<item row="
|
|
80
|
-
<widget class="
|
|
81
|
-
<
|
|
82
|
-
<
|
|
83
|
-
|
|
84
|
-
</property>
|
|
85
|
-
</item>
|
|
86
|
-
<item>
|
|
87
|
-
<property name="text">
|
|
88
|
-
<string>allow</string>
|
|
89
|
-
</property>
|
|
90
|
-
</item>
|
|
91
|
-
<item>
|
|
92
|
-
<property name="text">
|
|
93
|
-
<string>prefer</string>
|
|
94
|
-
</property>
|
|
95
|
-
</item>
|
|
96
|
-
<item>
|
|
97
|
-
<property name="text">
|
|
98
|
-
<string>require</string>
|
|
99
|
-
</property>
|
|
100
|
-
</item>
|
|
101
|
-
<item>
|
|
102
|
-
<property name="text">
|
|
103
|
-
<string>verify-ca</string>
|
|
104
|
-
</property>
|
|
105
|
-
</item>
|
|
106
|
-
<item>
|
|
107
|
-
<property name="text">
|
|
108
|
-
<string>verify-full</string>
|
|
109
|
-
</property>
|
|
110
|
-
</item>
|
|
89
|
+
<item row="1" column="1">
|
|
90
|
+
<widget class="QLineEdit" name="parameters_host_lineEdit">
|
|
91
|
+
<property name="clearButtonEnabled">
|
|
92
|
+
<bool>true</bool>
|
|
93
|
+
</property>
|
|
111
94
|
</widget>
|
|
112
95
|
</item>
|
|
113
96
|
<item row="2" column="1">
|
|
@@ -117,45 +100,51 @@
|
|
|
117
100
|
</property>
|
|
118
101
|
</widget>
|
|
119
102
|
</item>
|
|
120
|
-
<item row="
|
|
121
|
-
<widget class="QLineEdit" name="
|
|
103
|
+
<item row="4" column="1">
|
|
104
|
+
<widget class="QLineEdit" name="parameters_user_lineEdit">
|
|
122
105
|
<property name="clearButtonEnabled">
|
|
123
106
|
<bool>true</bool>
|
|
124
107
|
</property>
|
|
125
108
|
</widget>
|
|
126
109
|
</item>
|
|
127
|
-
<item row="
|
|
128
|
-
<widget class="QLabel" name="
|
|
110
|
+
<item row="4" column="0">
|
|
111
|
+
<widget class="QLabel" name="label_8">
|
|
129
112
|
<property name="text">
|
|
130
|
-
<string>
|
|
113
|
+
<string>User</string>
|
|
131
114
|
</property>
|
|
132
115
|
</widget>
|
|
133
116
|
</item>
|
|
134
|
-
<item row="
|
|
135
|
-
<widget class="QLabel" name="
|
|
117
|
+
<item row="2" column="0">
|
|
118
|
+
<widget class="QLabel" name="label_10">
|
|
136
119
|
<property name="text">
|
|
137
|
-
<string>
|
|
120
|
+
<string>Port</string>
|
|
138
121
|
</property>
|
|
139
122
|
</widget>
|
|
140
123
|
</item>
|
|
141
|
-
<item row="
|
|
142
|
-
<widget class="
|
|
143
|
-
<property name="
|
|
144
|
-
<
|
|
124
|
+
<item row="1" column="0">
|
|
125
|
+
<widget class="QLabel" name="label_9">
|
|
126
|
+
<property name="text">
|
|
127
|
+
<string>Host</string>
|
|
145
128
|
</property>
|
|
146
129
|
</widget>
|
|
147
130
|
</item>
|
|
148
|
-
<item row="
|
|
149
|
-
<widget class="QLabel" name="
|
|
131
|
+
<item row="6" column="0">
|
|
132
|
+
<widget class="QLabel" name="label_3">
|
|
150
133
|
<property name="text">
|
|
151
|
-
<string>
|
|
134
|
+
<string>Database</string>
|
|
152
135
|
</property>
|
|
153
136
|
</widget>
|
|
154
137
|
</item>
|
|
155
|
-
<item row="
|
|
156
|
-
<widget class="QLineEdit" name="
|
|
157
|
-
<property name="
|
|
158
|
-
<
|
|
138
|
+
<item row="6" column="1">
|
|
139
|
+
<widget class="QLineEdit" name="parameters_database_lineEdit">
|
|
140
|
+
<property name="toolTip">
|
|
141
|
+
<string><html><head/><body><p>This is the database used to connect to the cluster. It must already exist.</p></body></html></string>
|
|
142
|
+
</property>
|
|
143
|
+
<property name="text">
|
|
144
|
+
<string/>
|
|
145
|
+
</property>
|
|
146
|
+
<property name="placeholderText">
|
|
147
|
+
<string>postgres</string>
|
|
159
148
|
</property>
|
|
160
149
|
</widget>
|
|
161
150
|
</item>
|
|
@@ -9,7 +9,7 @@ oqtopus/core/package_prepare_task.py,sha256=Eoq9i6tpaik8dpnMef8CKBlmEdXs16krogrQ
|
|
|
9
9
|
oqtopus/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
10
|
oqtopus/gui/about_dialog.py,sha256=dDNwHxKf_M82Z-TKmXW1fXmnI_WSV_7MShqz05trzRw,2345
|
|
11
11
|
oqtopus/gui/database_connection_widget.py,sha256=Uyhwj_jUY5nM5UTv95zkXBoBwbTwX4HsNvVuUzkcY7o,6096
|
|
12
|
-
oqtopus/gui/database_create_dialog.py,sha256=
|
|
12
|
+
oqtopus/gui/database_create_dialog.py,sha256=afltzI1s9B0QGnZl6mgsX-0EvwOUArMu1Vxar4RsYvs,9055
|
|
13
13
|
oqtopus/gui/database_duplicate_dialog.py,sha256=Oz8pob6HxZHbV5Thcrhy4dPvGEI4_brSxw9KIcTc2ZE,4017
|
|
14
14
|
oqtopus/gui/logs_widget.py,sha256=B9Kbwt6cD40CV5mfcyaHZ5foJIPvWRednbxIRdeRgpU,6593
|
|
15
15
|
oqtopus/gui/main_dialog.py,sha256=6nW76FzOg1w0B4bQl6l21YW03xfEf40fOxYb1Jv5WQI,5886
|
|
@@ -21,7 +21,7 @@ oqtopus/gui/settings_dialog.py,sha256=wgwVCuAIBh9iLrs9y5HfE99LrTV0rEYbL3frMBlW0c
|
|
|
21
21
|
oqtopus/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
22
22
|
oqtopus/ui/about_dialog.ui,sha256=2oa5u3LIvN3prHyELUG-bwDuEHlBn9-uuA4CwYsEARo,6236
|
|
23
23
|
oqtopus/ui/database_connection_widget.ui,sha256=0hLBaOx0KcLTH6RlkziVj-tsczjHDUGC-3EXQYgcTuE,3729
|
|
24
|
-
oqtopus/ui/database_create_dialog.ui,sha256=
|
|
24
|
+
oqtopus/ui/database_create_dialog.ui,sha256=wM_x54bfgdSaShdx6MwBgDx_R-O_ckeoynEhFjs-Sws,8261
|
|
25
25
|
oqtopus/ui/database_duplicate_dialog.ui,sha256=EzMRYhlxsiP_sr9ixBJn4lnefM5R_p1oXx4RCyMAj9U,3826
|
|
26
26
|
oqtopus/ui/logs_widget.ui,sha256=oAgEtRUBXB-DzLC0vmBP-PEA-Uu3d3ppFm0ahs1jHQI,2785
|
|
27
27
|
oqtopus/ui/main_dialog.ui,sha256=idp-jcLKdxbI22JrmXHsZtgmfT9YvOXkngMKxqqOJF0,4682
|
|
@@ -34,10 +34,10 @@ oqtopus/utils/plugin_utils.py,sha256=v-Oxu2zs8tQWzEdHnwEl1mseapyvpPS-lHimJNK2zHY
|
|
|
34
34
|
oqtopus/utils/qt_utils.py,sha256=HPe9tOQQH9R9xZp4rGphVhSJO7220q368xmreDu5-6g,3243
|
|
35
35
|
oqtopus/utils/tmmtlogging.py,sha256=BSAPrhQGCuH2boMG4bP8QFyLfoss1uR4pO_pXjTA1eQ,1733
|
|
36
36
|
oqtopus/utils/translation.py,sha256=p1d5N6CYIf94fGYdPQnJamdum9MVBlPkJ24c557rqdg,2647
|
|
37
|
-
oqtopus-0.1.
|
|
37
|
+
oqtopus-0.1.17.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
|
|
38
38
|
tests/__init__.py,sha256=z5CxS92efenLcDm64Sifx26EjZBCWPO4oVvaEEHJJ6w,444
|
|
39
39
|
tests/test_plugin_load.py,sha256=HuVLdrsn2PSjKIrvcLj0EH7vNE8-0jBMmHZHihsqB3Q,517
|
|
40
|
-
oqtopus-0.1.
|
|
41
|
-
oqtopus-0.1.
|
|
42
|
-
oqtopus-0.1.
|
|
43
|
-
oqtopus-0.1.
|
|
40
|
+
oqtopus-0.1.17.dist-info/METADATA,sha256=P3y3FtZ88V14L60n7isCWXQ9OlNVnapMyKxWX0uvwnA,21475
|
|
41
|
+
oqtopus-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
42
|
+
oqtopus-0.1.17.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
|
|
43
|
+
oqtopus-0.1.17.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|