Skip to content
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

[stable-3.14] Native buttons #7077

Merged
merged 41 commits into from
Sep 6, 2024
Merged

[stable-3.14] Native buttons #7077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
6ff67c6
Change default Qt quick control style depending on the platform.
camilasan Aug 7, 2024
71535f3
set the windows native qml style on windows systems
mgallien Aug 7, 2024
8f94224
let's not make the background color of main dialog be transparent
mgallien Aug 7, 2024
65dd912
remove any use of custom palette: use the style palette
mgallien Aug 7, 2024
0fa4204
Remove component versions under src/gui/tray.
camilasan Aug 7, 2024
de5adad
Remove qml component version from import.
camilasan Aug 7, 2024
d09f7c9
Remove component import version from Style.qml.
camilasan Aug 7, 2024
bf6ca29
let main dialog have a transparent background again
mgallien Aug 27, 2024
5e07e49
add a QQuickStyle fallback: Fusion is fallback style
mgallien Aug 28, 2024
76200e1
use new QStyleHints::colorScheme feature to use light or dark mode
mgallien Aug 28, 2024
1ae70e2
remove broken system paellete detection within our custom style
mgallien Aug 28, 2024
7c585fc
Change default Qt quick control style depending on the platform.
camilasan Aug 7, 2024
a74812b
Replace NCToolTip for ToolTip.
camilasan Aug 27, 2024
2ed21d0
Fix repeaded call to QQuickStyle::setStyle.
camilasan Aug 28, 2024
40e2f69
Remove custom properties for background and opacity from CustomButton…
camilasan Aug 28, 2024
1aa2787
Remove custom properties for text color/hover from CustomButton and N…
camilasan Aug 28, 2024
f6a0c9a
Fix warning: The current style does not support customization of this…
camilasan Aug 28, 2024
7253ae1
Fix warning: The current style does not support customization of this…
camilasan Aug 28, 2024
af96f1e
Fix warning: The current style does not support customization of this…
camilasan Aug 28, 2024
88708d5
Fix warning: The current style does not support customization of this…
camilasan Aug 28, 2024
da077b0
Fix warning: The current style does not support customization of this…
camilasan Aug 28, 2024
0001a15
Fix warning: The current style does not support customization of this…
camilasan Aug 29, 2024
c8f4700
Clean HeaderButton component from customizations.
camilasan Aug 29, 2024
3fdb524
Remove setting contentsFont, not used anymore in CustomButton.
camilasan Aug 29, 2024
0ca6837
Remove customizations from CustomButton.
camilasan Aug 29, 2024
49c8224
NCRadioButton => RadioButton.
camilasan Aug 29, 2024
d0db0b9
Remove backround customization from ShareeSearchField.
camilasan Aug 29, 2024
fca287a
Remove the component version from import.
camilasan Aug 29, 2024
8392d3d
Remove duplicated header image.
camilasan Aug 31, 2024
43bafda
Remove image hover from NCButtonContents and CustomButton.
camilasan Aug 31, 2024
aaf9d6b
Remove cutomizations for text color and hover from ActivityActionButton.
camilasan Sep 1, 2024
fa275a5
Remove customizaton for placeholder text color from UnifiedSearchInpu…
camilasan Sep 1, 2024
d328919
Remove customization for text color and hover from TextButtonContents.
camilasan Sep 1, 2024
b5e8946
Remove backround rectangle from NCInputTextEdit.
camilasan Sep 1, 2024
523e165
Fix font color light/dark of time in ActivityItemContent.
camilasan Sep 3, 2024
04d13b2
Remove customizations for hover background from the user menu options.
camilasan Sep 3, 2024
1fb956e
Remove customization for font color from EnforcedPlainTextLabel.
camilasan Sep 3, 2024
760edd7
Remove background hover customization from UserLine.
camilasan Sep 3, 2024
255c099
Remove more color customizations from Window and TrayFoldersMenuButton.
camilasan Sep 3, 2024
2f26f31
qrc:/// => image://
camilasan Sep 5, 2024
4694aae
Fix talk app icon.
camilasan Sep 5, 2024
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
1 change: 0 additions & 1 deletion resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<file>src/gui/tray/EnforcedPlainTextLabel.qml</file>
<file>theme/Style/Style.qml</file>
<file>theme/Style/qmldir</file>
<file>src/gui/filedetails/NCRadioButton.qml</file>
<file>src/gui/tray/ListItemLineAndSubline.qml</file>
<file>src/gui/tray/TrayFoldersMenuButton.qml</file>
<file>src/gui/tray/TrayFolderListItem.qml</file>
Expand Down
8 changes: 4 additions & 4 deletions src/gui/BasicComboBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Qt5Compat.GraphicalEffects

import Style 1.0
import Style
import "./tray"

ComboBox {
Expand Down
12 changes: 6 additions & 6 deletions src/gui/ConflictDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
* for more details.
*/

import QtQml 2.15
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import Style 1.0
import com.nextcloud.desktopclient 1.0
import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Style
import com.nextcloud.desktopclient
import "./tray"

Item {
Expand Down
28 changes: 5 additions & 23 deletions src/gui/ConflictItemFileInfo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQml 2.15
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import Style 1.0
import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Style
import "./tray"

Item {
Expand All @@ -31,24 +31,6 @@ Item {
CheckBox {
id: selectItem

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter

Expand Down
9 changes: 4 additions & 5 deletions src/gui/EmojiPicker.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

import Style 1.0
import Style
import com.nextcloud.desktopclient 1.0 as NC
import "./tray"

Expand Down Expand Up @@ -134,7 +134,6 @@ ColumnLayout {
width: parent.width * 0.8
anchors.centerIn: parent
text: qsTr("No recent emojis")
color: palette.midlight
wrapMode: Text.Wrap
font.bold: true
visible: emojiView.count === 0
Expand Down
10 changes: 5 additions & 5 deletions src/gui/ErrorBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import Style 1.0
import Style
import "./tray"

Item {
Expand Down Expand Up @@ -70,7 +70,7 @@ Item {

background: null
icon.color: palette.buttonText
icon.source: "qrc:///client/theme/close.svg"
icon.source: "image://svgimage-custom-color/close.svg"

visible: errorBox.showCloseButton
enabled: visible
Expand Down
8 changes: 4 additions & 4 deletions src/gui/PredefinedStatusButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import Style 1.0
import Style
import "./tray"

AbstractButton {
Expand Down
72 changes: 8 additions & 64 deletions src/gui/ResolveConflictsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
* for more details.
*/

import QtQml 2.15
import QtQuick 2.15
import QtQuick.Window 2.15 as QtWindow
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQml.Models 2.15
import Style 1.0
import com.nextcloud.desktopclient 1.0
import QtQml
import QtQuick
import QtQuick.Window as QtWindow
import QtQuick.Layouts
import QtQuick.Controls
import QtQml.Models
import Style
import com.nextcloud.desktopclient
import "./tray"

ApplicationWindow {
Expand All @@ -36,26 +36,6 @@ ApplicationWindow {
minimumHeight: Style.minimumHeightResolveConflictsDialog
title: qsTr('Solve sync conflicts')

// TODO: Rather than setting all these palette colours manually,
// create a custom style and do it for all components globally
palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: Style.backgroundColor
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

onClosing: function(close) {
Systray.destroyDialog(self);
close.accepted = true
Expand Down Expand Up @@ -94,24 +74,6 @@ ApplicationWindow {

Layout.fillWidth: true

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

text: qsTr('All local versions')

leftPadding: 0
Expand All @@ -130,24 +92,6 @@ ApplicationWindow {

Layout.fillWidth: true

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

text: qsTr('All server versions')

leftPadding: 0
Expand Down
12 changes: 6 additions & 6 deletions src/gui/UserStatusSelector.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
* for more details.
*/

import QtQuick 2.6
import QtQuick
import QtQuick.Dialogs
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Window

import com.nextcloud.desktopclient 1.0 as NC
import Style 1.0
import com.nextcloud.desktopclient as NC
import Style
import "./tray"

ColumnLayout {
Expand Down
10 changes: 4 additions & 6 deletions src/gui/UserStatusSelectorButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQuick 2.6
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import Style 1.0
import Style

import "./tray"

Expand Down Expand Up @@ -71,7 +71,6 @@ AbstractButton {

text: root.text
wrapMode: Text.Wrap
color: root.colored ? palette.brightText : palette.buttonText
font.bold: root.primary
}

Expand All @@ -85,7 +84,6 @@ AbstractButton {

text: root.secondaryText
wrapMode: Text.Wrap
color: palette.midlight
visible: root.secondaryText !== ""
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/gui/UserStatusSelectorPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Controls 2.15
import Style 1.0
import QtQuick
import QtQuick.Controls
import Style

import com.nextcloud.desktopclient 1.0 as NC
import com.nextcloud.desktopclient as NC

Page {
id: page
Expand Down
10 changes: 5 additions & 5 deletions src/gui/filedetails/FileActivityView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import com.nextcloud.desktopclient 1.0
import Style 1.0
import com.nextcloud.desktopclient
import Style
import "../tray"

ActivityList {
Expand Down
16 changes: 6 additions & 10 deletions src/gui/filedetails/FileDetailsPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import com.nextcloud.desktopclient 1.0
import Style 1.0
import com.nextcloud.desktopclient
import Style
import "../tray"

Page {
Expand Down Expand Up @@ -139,8 +139,6 @@ Page {
Layout.rightMargin: headerGridLayout.textRightMargin

icon.source: "image://svgimage-custom-color/clear.svg" + "/" + palette.buttonText
bgColor: palette.highlight
bgNormalOpacity: 0
toolTipText: qsTr("Dismiss")

visible: root.showCloseButton
Expand All @@ -155,7 +153,6 @@ Page {
Layout.rightMargin: headerGridLayout.textRightMargin

text: `${root.fileDetails.sizeString} · ${root.fileDetails.lastChangedString}`
color: palette.midlight
wrapMode: Text.Wrap
}

Expand All @@ -166,7 +163,6 @@ Page {
Layout.rightMargin: headerGridLayout.textRightMargin

text: root.fileDetails.lockExpireString
color: palette.midlight
wrapMode: Text.Wrap
visible: headerGridLayout.showFileLockedString
}
Expand Down Expand Up @@ -208,7 +204,7 @@ Page {
id: hoverHandler
}

NCToolTip {
ToolTip {
visible: hoverHandler.hovered
text: tagRepeater.fileTagModel.overflowTagsString
}
Expand Down
Loading
Loading