File tree Expand file tree Collapse file tree 8 files changed +95
-42
lines changed Expand file tree Collapse file tree 8 files changed +95
-42
lines changed Original file line number Diff line number Diff line change @@ -4,15 +4,19 @@ import QtQuick.Controls 2.3
4
4
TextField {
5
5
id: control
6
6
property bool validationError: false
7
+ property int bgImplicitWidth: 200
8
+ property int bgImplicitHeight: 30
9
+ property string tooltip
10
+
7
11
selectByMouse: true
8
12
9
13
color: sysPalette .text
10
14
selectionColor: sysPalette .highlight
11
15
selectedTextColor: sysPalette .highlightedText
12
16
13
17
background: Rectangle {
14
- implicitWidth: 200
15
- implicitHeight: 30
18
+ implicitWidth: control . bgImplicitWidth
19
+ implicitHeight: control . bgImplicitHeight
16
20
color: sysPalette .button
17
21
border .width : control .validationError ? 2 : 1
18
22
border .color : {
@@ -22,4 +26,8 @@ TextField {
22
26
return control .activeFocus ? sysPalette .highlight : sysPalette .mid
23
27
}
24
28
}
29
+
30
+ BetterToolTip {
31
+ title: control .tooltip
32
+ }
25
33
}
Original file line number Diff line number Diff line change @@ -5,28 +5,43 @@ import "../common"
5
5
6
6
ColumnLayout {
7
7
GridLayout {
8
- columns: 3
8
+ columns: 2
9
9
Layout .fillWidth : true
10
10
11
11
BetterLabel {
12
- text: qsTranslate (" RDM" ," Page" ) + " "
12
+ text: qsTranslate (" RDM" ," Page" ) + " : "
13
13
wrapMode: Text .WrapAnywhere
14
14
}
15
15
16
- BetterLabel {
16
+ BetterTextField {
17
17
id: pageField;
18
+
18
19
text: table .currentPage ;
19
- Layout .maximumWidth : 60 ;
20
- }
21
20
22
- BetterLabel {
23
- Layout .maximumWidth : 130
24
- text: " of " + table .totalPages
25
- wrapMode: Text .WrapAnywhere
21
+ tooltip: qsTranslate (" RDM" , " Total pages: " ) + table .totalPages
22
+
23
+ Layout .fillWidth : true
24
+
25
+ validator: IntValidator {
26
+ locale: pageField .locale .name
27
+ bottom: 1
28
+ top: table .totalPages
29
+ }
30
+
31
+ onFocusChanged: {
32
+ if (focus)
33
+ return ;
34
+
35
+ text = Qt .binding (function () { return table .currentPage ; });
36
+ }
37
+
38
+ onAccepted: {
39
+ table .goToPage (text)
40
+ }
26
41
}
27
42
28
43
BetterLabel {
29
- Layout .columnSpan : 3
44
+ Layout .columnSpan : 2
30
45
text: qsTranslate (" RDM" ," Size: " ) + keyRowsCount
31
46
}
32
47
}
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation type =" unfinished" ></translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation type =" unfinished" ></translation >
164
164
</message >
360
360
<translation type =" unfinished" ></translation >
361
361
</message >
362
362
<message >
363
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
363
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
364
+ <source >Total pages: </source >
365
+ <translation type =" unfinished" ></translation >
366
+ </message >
367
+ <message >
368
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
364
369
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
365
370
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
366
371
<source >Size: </source >
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation >No se puede conectar al nodo del cluster %1:%2</translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation >No se puede vaciar db (%1): %2</translation >
164
164
</message >
406
406
<translation >Nuevo nombre:</translation >
407
407
</message >
408
408
<message >
409
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
409
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
410
+ <source >Total pages: </source >
411
+ <translation type =" unfinished" ></translation >
412
+ </message >
413
+ <message >
414
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
410
415
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
411
416
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
412
417
<source >Size: </source >
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation >クラスタノードに書き込みできません  %1:%2</translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation >DBをフラッシュできません  (%1): %2</translation >
164
164
</message >
366
366
<translation >新しい名前:</translation >
367
367
</message >
368
368
<message >
369
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
369
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
370
+ <source >Total pages: </source >
371
+ <translation type =" unfinished" ></translation >
372
+ </message >
373
+ <message >
374
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
370
375
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
371
376
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
372
377
<source >Size: </source >
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation type =" unfinished" ></translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation type =" unfinished" ></translation >
164
164
</message >
386
386
<translation >Новое имя:</translation >
387
387
</message >
388
388
<message >
389
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
389
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
390
+ <source >Total pages: </source >
391
+ <translation type =" unfinished" ></translation >
392
+ </message >
393
+ <message >
394
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
390
395
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
391
396
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
392
397
<source >Size: </source >
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation >无法连接集群节点 %1:%2</translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation >无法刷新库 (%1): %2</translation >
164
164
</message >
406
406
<translation >新名称:</translation >
407
407
</message >
408
408
<message >
409
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
409
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
410
+ <source >Total pages: </source >
411
+ <translation type =" unfinished" ></translation >
412
+ </message >
413
+ <message >
414
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
410
415
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
411
416
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
412
417
<source >Size: </source >
Original file line number Diff line number Diff line change 151
151
<context >
152
152
<name >QObject</name >
153
153
<message >
154
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
154
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 357" />
155
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 389" />
156
156
<source >Cannot connect to cluster node %1:%2</source >
157
157
<translation >無法連接到叢集節點 %1:%2</translation >
158
158
</message >
159
159
<message >
160
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
- <location filename =" ../../../3rdparty /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
160
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 400" />
161
+ <location filename =" ../../../.. /qredisclient/src/qredisclient/connection.cpp" line =" 418" />
162
162
<source >Cannot flush db (%1): %2</source >
163
163
<translation >無法清空資料庫 (%1): %2</translation >
164
164
</message >
406
406
<translation >新名稱:</translation >
407
407
</message >
408
408
<message >
409
- <location filename =" ../../qml/value-editor/Pagination.qml" line =" 30" />
409
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 21" />
410
+ <source >Total pages: </source >
411
+ <translation type =" unfinished" ></translation >
412
+ </message >
413
+ <message >
414
+ <location filename =" ../../qml/value-editor/Pagination.qml" line =" 45" />
410
415
<location filename =" ../../qml/value-editor/ValueTabs.qml" line =" 223" />
411
416
<location filename =" ../../qml/value-editor/editors/MultilineEditor.qml" line =" 316" />
412
417
<source >Size: </source >
You can’t perform that action at this time.
0 commit comments