Skip to content

Commit ef8e21a

Browse files
committed
Fix UI/UX issues on macOS:
- Remove horizontal scrollbar from Connection Settings dialog - Fix title of Connection Settings dialog - Hide External formatters section in Global Settings dialog - Fix giant buttons in database inline menu - Fix RedisInsight#4698
1 parent 5c916ec commit ef8e21a

File tree

5 files changed

+23
-10
lines changed

5 files changed

+23
-10
lines changed

src/qml/ConnectionSettignsDialog.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "./common/platformutils.js" as PlatformUtils
99

1010
Dialog {
1111
id: root
12-
title: isNewConnection ? qsTranslate("RDM","New Connection Settings") : qsTranslate("RDM","Edit Connection Settings") + settings.name
12+
title: isNewConnection ? qsTranslate("RDM","New Connection Settings") : qsTranslate("RDM","Edit Connection Settings") + " " + settings.name
1313

1414
modality: Qt.ApplicationModal
1515

@@ -139,11 +139,11 @@ Dialog {
139139

140140
ScrollView {
141141
id: mainSettingsScrollView
142-
width: settingsTabs.width - 20
142+
width: settingsTabs.width - 20
143143
height: settingsTabs.height
144144

145145
ColumnLayout {
146-
width: mainSettingsScrollView.width
146+
width: PlatformUtils.isOSX()? mainSettingsScrollView.width - 20 : mainSettingsScrollView.width
147147
height: children.height
148148

149149
SettingsGroupTitle { text: qsTranslate("RDM","Main Settings") }

src/qml/GlobalSettings.qml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Dialog {
1717
contentItem: Rectangle {
1818
id: dialogRoot
1919
implicitWidth: 800
20-
implicitHeight: PlatformUtils.isOSX()? 680 : 600
20+
implicitHeight: PlatformUtils.isOSX()? 500 : 600
2121

2222
border.color: "#eeeeee"
2323
border.width: 1
@@ -149,16 +149,19 @@ Dialog {
149149
}
150150

151151
SettingsGroupTitle {
152-
text: qsTranslate("RDM","Custom Value View Formatters")
152+
visible: !PlatformUtils.isOSX()
153+
text: qsTranslate("RDM","External Value View Formatters")
153154
}
154155

155156
Text {
157+
visible: !PlatformUtils.isOSX()
156158
text: qsTranslate("RDM","Formatters path: %0").arg(formattersManager.formattersPath())
157159
font.pixelSize: 12
158160
color: "grey"
159161
}
160162

161163
TableView {
164+
visible: !PlatformUtils.isOSX()
162165
Layout.fillWidth: true
163166
Layout.fillHeight: true
164167
verticalScrollBarPolicy: Qt.ScrollBarAlwaysOn

src/qml/app.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ ApplicationWindow {
272272
BetterTabView {
273273
id: bottomTabView
274274
Layout.fillWidth: true
275-
Layout.minimumHeight: PlatformUtils.isOSXRetina()? 15 : 30
275+
Layout.minimumHeight: PlatformUtils.isOSXRetina(Screen)? 15 : 30
276276

277277
tabPosition: Qt.BottomEdge
278278

src/qml/common/FilePathInput.qml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import QtQuick 2.3
22
import QtQuick.Layouts 1.1
33
import QtQuick.Controls 1.2
44
import QtQuick.Dialogs 1.2
5+
import "./platformutils.js" as PlatformUtils
6+
57

68
RowLayout {
79
id: root
@@ -14,11 +16,12 @@ RowLayout {
1416

1517
TextField {
1618
id: textField
19+
readOnly: PlatformUtils.isOSX()
1720
Layout.fillWidth: true
1821
}
1922

2023
Button {
21-
text: "..."
24+
text: qsTranslate("RDM","Select File")
2225
onClicked: fileDialog.open()
2326
}
2427

src/qml/connections-tree/menu/database.qml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import QtQuick.Controls 1.4
44
import QtQuick.Window 2.2
55
import "./../../common/platformutils.js" as PlatformUtils
66
import "."
7+
import "./../../common/"
78

89
RowLayout {
910
id: root
@@ -160,7 +161,7 @@ RowLayout {
160161
}
161162
}
162163

163-
ToolButton {
164+
ImageButton {
164165
id: filterOk
165166
iconSource: "qrc:/images/ok.svg"
166167
objectName: "rdm_inline_menu_button_apply_filter"
@@ -176,14 +177,20 @@ RowLayout {
176177
}
177178
}
178179

179-
ToolButton {
180+
ImageButton {
180181
id: filterHelp
182+
183+
imgWidth: PlatformUtils.isOSXRetina(Screen)? 20 : 25
184+
imgHeight: PlatformUtils.isOSXRetina(Screen)? 20 : 25
181185
iconSource: "qrc:/images/help.svg"
182186
onClicked: Qt.openUrlExternally("http://docs.redisdesktop.com/en/latest/features/#search-in-connection-tree")
183187
}
184188

185-
ToolButton {
189+
ImageButton {
186190
id: filterCancel
191+
192+
imgWidth: PlatformUtils.isOSXRetina(Screen)? 20 : 25
193+
imgHeight: PlatformUtils.isOSXRetina(Screen)? 20 : 25
187194
iconSource: "qrc:/images/clear.svg"
188195
objectName: "rdm_inline_menu_button_reset_filter"
189196

0 commit comments

Comments
 (0)