Port the MainWindow ui to a .ui file #724

leia-uwu · 2023-01-09T18:15:15Z

Some stuff still needs to be done in the c++ side because qt designer is dumb
(The instance toolbar icon and name buttons, and some shortcuts are still manually added in MainWindow.cpp)

Looks almost identical, with some minor tweaks:

The instance toolbar has been changed to a WideBar, allowing for customization of actions.
The instance toolbar buttons are now fullwidth.
The close window action has been moved to the end of the file menu and now has an icon.
The help menu has some layout changes.

This also fixes some stuff:

Menus not having tooltips.
The top toolbar not connecting to the title bar in kde.
The instance toolbar separators looking weird after you move the toolbar.

Closes #594, closes #69, closes #473

flowln

this looks pretty good overall!

there's only a couple minor things that I think could be improved, outside the comments i've made:

While you did fix the alt shortcuts on the WideBar, they still show up in the Right-click menu, even though you can't even use those without closing the menu :p
I'm not sure about having icons in that menu. In the instance WideBars, this was not an issues because the actions don't have icons, but here they do, and it becomes ambiguous whether clicking that option will toggle its visibility, or activate the action.
Maybe the old right-click menu actions, now only accessible through the top bar and the news bar, should be merged with this new menu somehow. It is quite weird to not be able to hide the Instance toolbar from interacting with that toolbar, but be able to by interacting with other toolbars. Perhaps they could be separated into two different sections, and the one to toggle the actions visibility have a name that would clear up the ambiguity I talked about in item 2, so the icons could be left there :)

launcher/ui/MainWindow.cpp

leia-uwu · 2023-01-09T23:09:15Z

even though you can't even use those without closing the menu :p

uh, for some reason the menu only closes when you press alt while using the fusion theme in my testing, this also happens in the instance view context menu and in the menubar :/

leia-uwu · 2023-01-10T15:09:37Z

:catstare:

DioEgizio · 2023-01-10T17:28:26Z

with this the status bar doesn't seem to follow my prism theme

this pr

without this pr

TayouVR · 2023-01-10T17:45:43Z

hmmm... its a different shade of grey and doesn't have the margins/paddings from the theme.
After scrolling through the code I can't spot any obvious reasons for that, maybe the various size constraints on the QStatusBar in the .ui are different from the defaults it had in code? 🤔

leia-uwu · 2023-01-10T22:33:58Z

with this the status bar doesn't seem to follow my prism theme

Fixed

Scrumplex

I couldn't find any differences, besides the news toolbar as @flowln already pointed out.
LGTM and thanks!

TayouVR

couldn't find any issues in my testing, looking good!

launcher/ui/MainWindow.cpp

Signed-off-by: leo78913 <leo3758@riseup.net>

some stuff still needs to be done in the c++ side because qt designer is dumb >:( the instance toolbar icon and instance name buttons are still added manually inside MainWindow.cpp looks almost identical, with some minor tweaks: - the instance toolbar is now a WideBar, so you can customize what actions you want :D - the instance toolbar buttons are now fullwidth - the close window button is now at the end of the file menu - the help menu has some layout changes this also fixes some stuff: - menus not having tooltips - the top toolbar not connecting to the title bar in kde - the instance toolbar separators looking weird after you move the toolbar Signed-off-by: leo78913 <leo3758@riseup.net>

Signed-off-by: leo78913 <leo3758@riseup.net>

WideBar::insertSeparator was adding the separator to the end of the toolbar Signed-off-by: leo78913 <leo3758@riseup.net>

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

Signed-off-by: leo78913 <leo3758@riseup.net>

this reverts it to how it was before the MainWindow .ui port Signed-off-by: leo78913 <leo3758@riseup.net>

i forgor 💀 Signed-off-by: leo78913 <leo3758@riseup.net>

this makes the accounts button and menubar item share the same QMenu and also refactors some code Signed-off-by: leo78913 <leo3758@riseup.net>

flowln

some nitpicks, but looks good overall!

launcher/ui/widgets/WideBar.cpp

launcher/ui/MainWindow.ui

Edgars-Cirulis · 2023-01-27T15:26:46Z

Kind of annoying, after toggling, the check automatically closes the menu.

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

Signed-off-by: leo78913 <leo3758@riseup.net>

flowln

lgtm, thanks!

leia-uwu force-pushed the dot-ui-mainwindow branch 3 times, most recently from b2d4803 to 71901fe Compare January 9, 2023 20:38

flowln reviewed Jan 9, 2023

View reviewed changes

launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved

launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved

launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved

launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved

flowln added bug Something isn't working enhancement New feature or request labels Jan 9, 2023

flowln added this to the 7.0 milestone Jan 9, 2023

Scrumplex self-requested a review January 10, 2023 05:41

txtsd self-requested a review January 10, 2023 17:36

Scrumplex approved these changes Jan 13, 2023

View reviewed changes

TayouVR approved these changes Jan 16, 2023

View reviewed changes

kumquat-ir reviewed Jan 17, 2023

View reviewed changes

launcher/ui/MainWindow.cpp Show resolved Hide resolved

leia-uwu and others added 11 commits January 20, 2023 19:44

feat: add Widebar::InsertWidgetBefore method

3da1d6a

Signed-off-by: leo78913 <leo3758@riseup.net>

feat(WideBar): Allow disabling alt shortcuts

b2de01b

Signed-off-by: leo78913 <leo3758@riseup.net>

fix(widebar): fix insertSeparator

ada5956

WideBar::insertSeparator was adding the separator to the end of the toolbar Signed-off-by: leo78913 <leo3758@riseup.net>

Fix: translate NoAccountsAdded text

3b38a4c

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

Fix: translate actionNoDefaultAcount text

55d4064

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

feat(WideBar): custom context menu actions

f16989b

Signed-off-by: leo78913 <leo3758@riseup.net>

remove useless setEnabled calls

4ed4fb2

Signed-off-by: leo78913 <leo3758@riseup.net>

Fix status bar name

6c5f6e8

Signed-off-by: leo78913 <leo3758@riseup.net>

Fix: make the newsLabel toolbutton fullwidth again

670cf8e

this reverts it to how it was before the MainWindow .ui port Signed-off-by: leo78913 <leo3758@riseup.net>

Fix main window icon and stuff

5a25ce8

i forgor 💀 Signed-off-by: leo78913 <leo3758@riseup.net>

leia-uwu force-pushed the dot-ui-mainwindow branch from d668720 to 5a25ce8 Compare January 20, 2023 22:47

refactor: clean up some MainWindow stuff

4d2b5c2

this makes the accounts button and menubar item share the same QMenu and also refactors some code Signed-off-by: leo78913 <leo3758@riseup.net>

flowln reviewed Jan 27, 2023

View reviewed changes

launcher/ui/widgets/WideBar.cpp Outdated Show resolved Hide resolved

launcher/ui/widgets/WideBar.cpp Outdated Show resolved Hide resolved

launcher/ui/MainWindow.ui Outdated Show resolved Hide resolved

launcher/ui/MainWindow.ui Outdated Show resolved Hide resolved

leia-uwu and others added 4 commits January 27, 2023 12:35

Update launcher/ui/MainWindow.ui

357b6ee

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

Update launcher/ui/MainWindow.ui

d5a0d4b

Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>

Remove unused BarEntry variable

df8df41

Signed-off-by: leo78913 <leo3758@riseup.net>

better fix for WideBar::insertSeparator

a27564e

Signed-off-by: leo78913 <leo3758@riseup.net>

flowln approved these changes Jan 27, 2023

View reviewed changes

flowln merged commit c78db54 into PrismLauncher:develop Jan 27, 2023

DioEgizio mentioned this pull request Jan 28, 2023

[DEVELOP] update and more news repeated 2 times #792

Closed

1 task

DioEgizio mentioned this pull request Mar 6, 2023

UI: make sidebar width of buttons consistent #914

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port the MainWindow ui to a .ui file #724

Port the MainWindow ui to a .ui file #724

leia-uwu commented Jan 9, 2023 •

edited by DioEgizio

flowln left a comment

leia-uwu commented Jan 9, 2023

leia-uwu commented Jan 10, 2023

DioEgizio commented Jan 10, 2023

TayouVR commented Jan 10, 2023

leia-uwu commented Jan 10, 2023

Scrumplex left a comment

TayouVR left a comment

flowln left a comment

Edgars-Cirulis commented Jan 27, 2023

flowln left a comment

Port the MainWindow ui to a .ui file #724

Port the MainWindow ui to a .ui file #724

Conversation

leia-uwu commented Jan 9, 2023 • edited by DioEgizio

flowln left a comment

Choose a reason for hiding this comment

leia-uwu commented Jan 9, 2023

leia-uwu commented Jan 10, 2023

DioEgizio commented Jan 10, 2023

TayouVR commented Jan 10, 2023

leia-uwu commented Jan 10, 2023

Scrumplex left a comment

Choose a reason for hiding this comment

TayouVR left a comment

Choose a reason for hiding this comment

flowln left a comment

Choose a reason for hiding this comment

Edgars-Cirulis commented Jan 27, 2023

flowln left a comment

Choose a reason for hiding this comment

leia-uwu commented Jan 9, 2023 •

edited by DioEgizio