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

User status bug fixing... #3069

Merged
merged 10 commits into from
Apr 8, 2021
Merged

User status bug fixing... #3069

merged 10 commits into from
Apr 8, 2021

Conversation

camilasan
Copy link
Member

  • address Kevin's last comments in the PR Status feature #2505
  • if there is no emoji in the status message (and for the default "Online, offline, etc" ones), the text is a bit off to the right, not left-aligned with name and server link
  • the menu icon for the other apps is missing on the right next to the Talk icon, and Talk icon moved over? Unrelated to status, but visible in the screenshots and also in the release it seems
    apps

@camilasan camilasan added this to the Desktop 3.2 milestone Apr 6, 2021
@camilasan camilasan changed the title Status featur improvements and fixes Status feature bug fixing... Apr 6, 2021
@camilasan camilasan changed the title Status feature bug fixing... User status bug fixing... Apr 6, 2021
@camilasan camilasan force-pushed the feature/user-status branch from 79ba65e to 99b3e61 Compare April 6, 2021 21:00
@camilasan camilasan mentioned this pull request Apr 6, 2021
src/gui/userstatus.h Outdated Show resolved Hide resolved
src/gui/userstatus.cpp Show resolved Hide resolved
src/gui/userstatus.cpp Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Show resolved Hide resolved
src/gui/tray/Window.qml Show resolved Hide resolved
src/gui/tray/Window.qml Show resolved Hide resolved
src/gui/tray/Window.qml Show resolved Hide resolved
src/gui/userstatus.cpp Outdated Show resolved Hide resolved
src/gui/userstatus.cpp Show resolved Hide resolved
src/gui/userstatus.cpp Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Outdated Show resolved Hide resolved
@er-vin
Copy link
Member

er-vin commented Apr 7, 2021 via email

@allexzander
Copy link
Contributor

Well, that's why I mentioned "in the middle". Typically sometimes you'd have something which is still within bounds but without the message you expect. Of course in other cases, you'd have something outside of bounds but this is easier to catch.
@er-vin In one of my past jobs, we were using a command-line tool that would generate all that's needed for enum (array with strings and conversion functions). So, adding an enum index in the middle would just be a simple insertion into an enum template file which is then fed to a command-line tool during the build :)

@er-vin
Copy link
Member

er-vin commented Apr 7, 2021 via email

@camilasan camilasan force-pushed the feature/user-status branch from 223a36b to 63fbc0f Compare April 7, 2021 11:38
src/gui/userstatus.cpp Outdated Show resolved Hide resolved
@allexzander allexzander self-requested a review April 7, 2021 12:16
Copy link
Contributor

@allexzander allexzander left a comment

Choose a reason for hiding this comment

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

Looks fine. Let's fix QML warnings in 3.2.1.

@camilasan camilasan mentioned this pull request Apr 7, 2021
@er-vin
Copy link
Member

er-vin commented Apr 7, 2021 via email

@allexzander
Copy link
Contributor

/rebase

Camila added 8 commits April 8, 2021 07:10
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
- Make preDefinedStatus a local var.
- Add function to get the status user string.

Signed-off-by: Camila <hello@camila.codes>
Cleans the space in the beginning of the string when there is no emoji
set.

Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Camila added 2 commits April 8, 2021 07:10
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
@github-actions github-actions bot force-pushed the feature/user-status branch from 67a638d to 1ca0ea4 Compare April 8, 2021 07:11
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-3069-1ca0ea49dd9fee42af0b0a4d8281941afb1f163e-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.

@allexzander allexzander merged commit f6afb62 into master Apr 8, 2021
@allexzander allexzander deleted the feature/user-status branch April 8, 2021 07:18
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.

6 participants