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.

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

Improve Settings dialog design. #6150

Merged
merged 1 commit into from
Oct 23, 2023

Conversation

allexzander
Copy link
Contributor

@allexzander allexzander commented Oct 19, 2023

For #5142

Before:

settings_and_network_dialog_before.mp4

After:

settings_and_network_dialog_after.mp4

@codecov
Copy link

codecov bot commented Oct 19, 2023

Codecov Report

Merging #6150 (bc91eac) into master (727cd79) will decrease coverage by 0.20%.
Report is 4 commits behind head on master.
The diff coverage is 0.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6150      +/-   ##
==========================================
- Coverage   60.74%   60.54%   -0.20%     
==========================================
  Files         145      145              
  Lines       18829    18833       +4     
==========================================
- Hits        11438    11403      -35     
- Misses       7391     7430      +39     
Files Coverage Δ
src/libsync/theme.h 60.00% <ø> (ø)
src/libsync/theme.cpp 19.20% <0.00%> (+0.42%) ⬆️

... and 6 files with indirect coverage changes

Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great improvement! Looks really nice :)
Some small wording changes:

  • "No Proxy" --> "No proxy"
  • "Specify proxy manually as" --> "Manually specify proxy"

No other comments from me :)

@allexzander
Copy link
Contributor Author

Great improvement! Looks really nice :) Some small wording changes:

  • "No Proxy" --> "No proxy"
  • "Specify proxy manually as" --> "Manually specify proxy"

No other comments from me :)

Done d58dd8d

@allexzander allexzander force-pushed the feature/settings-dialog-design-improvements branch from d58dd8d to 8d7a2f8 Compare October 20, 2023 12:56
QString about = Theme::instance()->about();
Theme::replaceLinkColorStringBackgroundAware(about);
_ui->aboutLabel->setText(about);
auto aboutText = Theme::instance()->about();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
auto aboutText = Theme::instance()->about();
const auto aboutText = Theme::instance()->about();

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgallien Impossible, see void Theme::replaceLinkColorStringBackgroundAware(QString &linkString); that expects non-const reference


devString += tr("<p>Version %1. For more information please click <a href='%2'>here</a>.</p>")
.arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)) + QString(" (%1)").arg(osName))
.arg(helpUrl());
.arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)) + QString(" (%1)").arg(osName))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use the arg overload taking multiple strings at once. they are faster

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe even try to change this long complicated method to build teh string by using placeholders and a single arg call ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgallien modified where string translations don't break

src/libsync/theme.cpp Outdated Show resolved Hide resolved
@allexzander allexzander requested a review from mgallien October 20, 2023 17:12
Signed-off-by: alex-z <blackslayer4@gmail.com>
@allexzander allexzander force-pushed the feature/settings-dialog-design-improvements branch from 71e0aa7 to bc91eac Compare October 23, 2023 10:45
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6150-bc91eac2e55097c12dbe65bd559315fc65f41c1c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 3 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@allexzander allexzander merged commit b362187 into master Oct 23, 2023
10 of 13 checks passed
@allexzander allexzander deleted the feature/settings-dialog-design-improvements branch October 23, 2023 14:45
@jancborchardt
Copy link
Member

Btw @allexzander the general style which still looks a bit outdated (grey background and the containers) I assume is blocked by having a new Qt version which looks more like Windows 10 or hopefully even 11?

@jospoortvliet
Copy link
Member

@jancborchardt I guess tracked here #4584

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants