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

Theme/Language #7288

Closed
wants to merge 5 commits into from
Closed

Theme/Language #7288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e752ba
Theme/Language
wfxey Oct 9, 2024
e0d4f91
Create .gitattributes
wfxey Oct 9, 2024
0522932
Create .gitignore
wfxey Oct 9, 2024
6aceccc
Update .tag
wfxey Oct 9, 2024
0d82bb6
Create .gitignore
wfxey Oct 9, 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
Empty file removed doc/_shared_assets/static/.gitignore
View file
Open in desktop
Empty file.
Empty file removed doc/_shared_assets/templates/.gitignore
View file
Open in desktop
Empty file.
14 changes: 7 additions & 7 deletions theme/Style/Style.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ QtObject {
}

// Colors
readonly property color ncBlue: Theme.wizardHeaderBackgroundColor
readonly property color ncBlue: Theme.wizardHeaderBackgroundColor
readonly property color ncHeaderTextColor: Theme.wizardHeaderTitleColor
readonly property color ncTextColor: nativePalette.text
readonly property color ncTextBrightColor: "white"
readonly property color ncSecondaryTextColor: "#808080"
readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)
readonly property color darkerHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2.35) : Qt.darker(backgroundColor, 1.25)
readonly property color menuBorder: Theme.darkMode ? Qt.lighter(backgroundColor, 2.5) : Qt.darker(backgroundColor, 1.5)
readonly property color ncSecondaryTextColor: "#A9A9A9"
readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 1.15) : Qt.darker(backgroundColor, 1.05)
readonly property color darkerHover: Theme.darkMode ? Qt.lighter(backgroundColor, 1.25) : Qt.darker(backgroundColor, 1.15)
readonly property color menuBorder: Theme.darkMode ? Qt.lighter(backgroundColor, 2.0) : Qt.darker(backgroundColor, 1.5)
readonly property color backgroundColor: nativePalette.window
readonly property color buttonBackgroundColor: nativePalette.button
readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)

readonly property color currentUserHeaderColor: UserModel.currentUser ? UserModel.currentUser.headerColor : ncBlue
readonly property color currentUserHeaderTextColor: UserModel.currentUser ? UserModel.currentUser.headerTextColor : ncHeaderTextColor
readonly property color adjustedCurrentUserHeaderColor: Theme.darkMode ? Qt.lighter(currentUserHeaderColor, 2)
: Qt.darker(currentUserHeaderColor, 1.5)
readonly property color adjustedCurrentUserHeaderColor: Theme.darkMode ? Qt.lighter(currentUserHeaderColor, 1.15) : Qt.darker(currentUserHeaderColor, 1.25)


// ErrorBox colors
readonly property color errorBoxBackgroundColor: Qt.rgba(0.89, 0.18, 0.18, 1)
Expand Down
12 changes: 6 additions & 6 deletions translations/client_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
<message>
<location filename="../src/gui/tray/ActivityList.qml" line="108"/>
<source>No activities yet</source>
<translation>Noch keine Aktivitäten vorhanden</translation>
<translation>Keine Aktivitäten verfügbar</translation>
</message>
</context>
<context>
<name>BasicComboBox</name>
<message>
<location filename="../src/gui/BasicComboBox.qml" line="62"/>
<source>Clear status message menu</source>
<translation>Statusmeldungs-Menü löschen</translation>
<translation>Statusnachrichten-Menü löschen</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -79,12 +79,12 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="123"/>
<source>Checking for changes in &quot;%1&quot;</source>
<translation>Nach Änderungen suchen in &quot;%1&quot;</translation>
<translation>Überprüfe Änderungen in &quot;%1&quot;</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="128"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisiere %1 von %2 (%3 übrig)</translation>
<translation>Synchronisiere %1 von %2 (%3 verbleibend)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="133"/>
Expand All @@ -94,7 +94,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="140"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisiere %1 (%2 übrig)</translation>
<translation>Synchronisiere %1 (%2 verbleibend)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="143"/>
Expand All @@ -105,7 +105,7 @@
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="164"/>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="226"/>
<source>No recently changed files</source>
<translation>Keine kürzlich geänderte Dateien</translation>
<translation>Keine zuletzt geänderten Dateien</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="180"/>
Expand Down