Skip to content

Relax minimum width and default [CPP-423] #595

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
merged 3 commits into from
Jun 9, 2022
Merged

Relax minimum width and default [CPP-423] #595

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
9016000
Relax minimum width and default [CPP-423]
Jun 8, 2022
d822a99
Add spacer to improve min layout
Jun 8, 2022
b4884e8
reshuffle where line breaks appear
Jun 9, 2022
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
4 changes: 2 additions & 2 deletions resources/Constants/Globals.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ QtObject {
property bool showFileio: false
property int height: 600
property int minimumHeight: 600
property int width: 1050
property int minimumWidth: 1050
property int width: 1000
property int minimumWidth: 900
property string conn_state: Constants.connection.disconnected.toUpperCase()
property string copyClipboard: ""
property var tablesWithHighlights: []
Expand Down
8 changes: 4 additions & 4 deletions resources/SettingsTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ MainTab {
Layout.preferredWidth: parent.colWidth
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
padding: parent.buttonPadding
text: "Export to\nfile"
text: "Export\nto file"
icon.source: Constants.icons.exportPath
icon.width: Constants.settingsTab.buttonIconWidth
icon.height: Constants.settingsTab.buttonIconHeight
Expand All @@ -209,7 +209,7 @@ MainTab {
Layout.preferredWidth: parent.colWidth
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
padding: parent.buttonPadding
text: "Import from\nFile"
text: "Import\nfrom file"
icon.source: Constants.icons.importPath
icon.width: Constants.settingsTab.buttonIconWidth
icon.height: Constants.settingsTab.buttonIconHeight
Expand All @@ -224,7 +224,7 @@ MainTab {
Layout.preferredWidth: parent.colWidth
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
padding: parent.buttonPadding
text: "Reset to\nDefaults"
text: "Reset to\ndefaults"
icon.source: Constants.icons.warningPath
icon.width: Constants.settingsTab.buttonIconWidth
icon.height: Constants.settingsTab.buttonIconHeight
Expand Down Expand Up @@ -269,7 +269,7 @@ MainTab {
Layout.preferredWidth: parent.colWidth
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
padding: parent.buttonPadding
text: "Refresh from\ndevice"
text: "Refresh\nfrom device"
icon.source: Constants.icons.refreshPath
icon.width: Constants.settingsTab.buttonIconWidth
icon.height: Constants.settingsTab.buttonIconHeight
Expand Down
4 changes: 4 additions & 0 deletions resources/TabInfoBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ Rectangle {
Layout.fillWidth: true
}

Rectangle {
width: 10
}

Item {
implicitWidth: children[0].implicitWidth + rhsItemSpacing
Layout.fillHeight: true
Expand Down