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

Jump to bottom

No MacSettingsDialog #7371 #7492

Merged
merged 2 commits into from
Oct 7, 2019
Merged

No MacSettingsDialog #7371 #7492

merged 2 commits into from
Oct 7, 2019

Conversation

guruz
Copy link
Contributor

@guruz guruz commented Sep 25, 2019

We could have this for 2.6.0 and fix the issue mentioned in #7043 (comment) and #7371 (comment) for 2.6.1 or so :/

Bildschirmfoto 2019-09-25 um 10 15 43

Maybe the elliding is a bit too agressive?

FYI @ChrisEdS @TheOneRing @dschmidt

@guruz guruz added this to the 2.6.0 milestone Sep 25, 2019
@guruz guruz mentioned this pull request Sep 25, 2019
Closed
@guruz
Copy link
Contributor Author

guruz commented Sep 25, 2019

@ChrisEdS i only tested High Sierra, so maybe you want to make a build and check out Dark Mode with it... I'll update the PR for that

@ChrisEdS
Copy link

@ChrisEdS i only tested High Sierra, so maybe you want to make a build and check out Dark Mode with it... I'll update the PR for that

Yes, I will test that on Mojave.

@TheOneRing
Copy link
Contributor

Hm is eliding in the middle a mac thing? I always prefer it at the end.

@guruz
Copy link
Contributor Author

guruz commented Sep 25, 2019

Hm is eliding in the middle a mac thing? I always prefer it at the end.

I think we do it on purpose to show both the username and the server name in case you are hanna@ on multiple servers

(Check the source..)

@TheOneRing
Copy link
Contributor

Hm is eliding in the middle a mac thing? I always prefer it at the end.

I think we do it on purpose to show both the username and the server name in case you are hanna@ on multiple servers

(Check the source..)

Makes sense.
With the space available it looks reasonable

@guruz
Copy link
Contributor Author

guruz commented Oct 2, 2019

I think we should merge this if it fixes the UI glitches. So maybe it's not a WiP at all?

michaelstingl
michaelstingl approved these changes Oct 2, 2019
View reviewed changes
Copy link
Contributor

@michaelstingl michaelstingl left a comment

Choose a reason for hiding this comment

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

LGTM

@jnweiger @guruz
Allow Dark Mode
bdf4458 
(cherry picked from commit 1e101cb)
@CLAassistant
Copy link

CLAassistant commented Oct 7, 2019 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@guruz guruz changed the base branch from master to 2.6 October 7, 2019 12:56
@guruz
Copy link
Contributor Author

guruz commented Oct 7, 2019

continuous-integration/drone/pr — Build is passing

@ckamm @ogoffart merge?

@guruz guruz changed the title No MacSettingsDialog (WiP) #7371 No MacSettingsDialog #7371 Oct 7, 2019
@guruz guruz force-pushed the 26_nomacsettings branch 3 times, most recently from 71c5cb5 to a26d4a8 Compare October 7, 2019 14:32
@guruz
Copy link
Contributor Author

guruz commented Oct 7, 2019

Great, failure only in SelectiveSyncTest but that might be fixed in another PR

@guruz guruz merged commit cb4973b into 2.6 Oct 7, 2019
@delete-merged-branch delete-merged-branch bot deleted the 26_nomacsettings branch October 7, 2019 18:50
misch7 added a commit to nextcloud/desktop that referenced this pull request Dec 1, 2019
@misch7
Remove submodule qtmacgoodies and the MacSettingsDialog class
0503311 
Reverts back to the SettingsDialog class because of bugs and glitches with
more recent Qt versions (Qt 5.12) and with the macOS Dark Mode.

See upstream: owncloud/client#7492

Signed-off-by: Michael Schuster <michael@schuster.ms>
@misch7 misch7 mentioned this pull request Dec 1, 2019
Merged
misch7 added a commit to nextcloud/desktop that referenced this pull request Dec 9, 2019
@misch7
Remove submodule qtmacgoodies and the MacSettingsDialog class
b4f926d 
Reverts back to the SettingsDialog class because of bugs and glitches with
more recent Qt versions (Qt 5.12) and with the macOS Dark Mode.

See upstream: owncloud/client#7492

Signed-off-by: Michael Schuster <michael@schuster.ms>
misch7 added a commit to nextcloud/desktop that referenced this pull request Dec 9, 2019
@misch7
Remove submodule qtmacgoodies and the MacSettingsDialog class
5e1a2a4 
Reverts back to the SettingsDialog class because of bugs and glitches with
more recent Qt versions (Qt 5.12) and with the macOS Dark Mode.

See upstream: owncloud/client#7492

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit b4f926d)
Signed-off-by: Michael Schuster <michael@schuster.ms>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelstingl michaelstingl michaelstingl approved these changes

@TheOneRing TheOneRing TheOneRing approved these changes

@dschmidt dschmidt Awaiting requested review from dschmidt

@ogoffart ogoffart Awaiting requested review from ogoffart

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.6.0
Development

Successfully merging this pull request may close these issues.
6 participants
@guruz @ChrisEdS @TheOneRing @CLAassistant @michaelstingl @jnweiger