8000 GTK4 compiling branch by bhennion · Pull Request #5615 · xournalpp/xournalpp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

GTK4 compiling branch #5615

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
Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

GTK4 compiling branch #5615

wants to merge 49 commits into from

Conversation

bhennion
Copy link
Collaborator
@bhennion bhennion commented Apr 12, 2024 •
edited
Loading

It doesn't run yet, but we're closing in, I think.

This branch compiles (and links) and starts but the .glade files need to be adapted before testing anything. edit: and works

There are a couple of features I deactivated/commented out to get it to compile, so those need fixing either in gtk4, or before that, in gtk3 (e.g. the sidebar could be pre-ported).

  • Optimize cursor creation (cairo->pixbuf->texture->cursor)
  • Restore gtk-sourceview (5 is gtk4)
  • Zoom
    • Scrollzoom
    • Touch pinch zoom
    • Touchpad pinch zoom
    • Long term: refactor -> new Navigation = ScrollHandler + ZoomControl + unify event handling
  • Toolbar Customization
    • Create suitable GtkWidget for toolbars
    • Port ToolbarCustomizeDialog
    • Port drag'n'drop customization
  • Colorize svg for toolbar color icons (so they scale)
  • Sidebar
    • Port Sidebar
    • Restore page numbers
  • Clipboard
  • ImageDialog + add PdfPage dialog
  • Landscape/portrait icons in FormatDialog
  • Fix Gdk-CRITICAL **: 21:20:45.390: gdk_key_event_get_keyval: assertion 'GDK_IS_EVENT_TYPE (event, GDK_KEY_PRESS) || GDK_IS_EVENT_TYPE (event, GDK_KEY_RELEASE)' errors
  • Plugins
    • Refactor API for dialogs. Add callbacks
    • Port plugin dialog
    • Expose new action system. Retire old one.
  • Replace GdkPixbuf by GdkTexture?
  • Fix/report to GDK issues with x11 backend
  • Double and triple click
  • Fetch event history for stylus events? (see gdk_event_get_history())
  • Refactor device tool classification GTK4 compiling branch #5615 (comment)
  • Fix double/float conversion due to changes in GdkColor (4 x double became 4 x float)
  • Fix "Use Stock Icon" option - see IconNameHelper.cpp
  • Port or remove gui/inputdevices/touchdisable/TouchDisableX11.cpp (cf gui/inputdevices/HandRecognition.cpp:L74)
  • Remove code duplication: gui/toolbarMenubar/ToolMenuHandler.cpp:createItem() createIcon() load()
  • Fix accelerators priority (e.g. Ctrl + A when editing text selects the elements on the page, not the content of the current text box)
  • Fix MacOS copy/paste across instances pastes as image see this post
  • Opening Help URL fails on MacOS (at least ARM) see here and here
  • Fix cannot insert image on Windows see this post
  • Fix Icon while dragging in toolbar customization. see GTK4 compiling branch #5615 (comment)
  • Report and/or workaround GTK drag-n-drop bugs on MacOS/Windows (see GTK4 compiling branch #5615 (comment) for some bug reports)
  • Port MacOS ARM cirrus CI

NB: this branch is built on a merge of various PR's. Not really a pull request... Not anymore

@bhennion bhennion marked this pull request as draft April 12, 2024 08:48
@bhennion

This comment was marked as outdated.

Sign in to view
@rolandlo
Copy link
Member

Oh, wow, that's awesome! Great job @bhennion ! I'm really excited!

grafik

@rolandlo

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@bhennion

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@bhennion

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
@bhennion bhennion mentioned this pull request Apr 16, 2024
Open
@bhennion bhennion force-pushed the pr/GTK4 branch 2 times, most recently from 713ae8a to d5164fc Compare April 16, 2024 16:47
@rolandlo

This comment was marked as resolved.

Sign in to view
@bhennion bhennion force-pushed the pr/GTK4 branch 2 times, most recently from d640a73 to baaa7f8 Compare April 17, 2024 10:16
@bhennion

This comment was marked as resolved.

Sign in to view
@bhennion bhennion force-pushed the pr/GTK4 branch 3 times, most recently from fe1ba02 to 1887c63 Compare April 18, 2024 08:41
@bhennion
Copy link
Collaborator Author

This is now in a reasonably stable state. Everything works with a couple of exceptions (toolbar customization, touchpad pinch zoom, clipboard, plugins).
I'm not quite sure how to proceed from here on. I can cleanup the commit history a little bit and make a dedicated branch on the repository.

@rolandlo
Copy link
Member

Great work @bhennion! It's a giant step forward!
Sure, cleaning up the commit history and making a dedicated branch are good ideas. Probably I'd like to work on some of the remaining issues as well in the coming two weeks (e.g. the plugins), so I can then make a PR to the dedicated branch.

We should also review your previous PR's that went into this PR, so that they can be merged into master.

Moreover I think it's time for some testing of the features that are supposed to work. I will share my observations in this PR.

@rolandlo

This comment was marked as resolved.

Sign in to view
@bhennion

This comment was marked as resolved.

Sign in to view
@rolandlo

This comment was marked as resolved.

Sign in to view
bhennion and others added 29 commits May 28, 2025 20:35
@bhennion
Apply gtk4-builder-tool simplify --3to4 to goto.ui
def9a2d
@bhennion
Apply gtk4-builder-tool simplify --3to4 to latexSettings.ui
24e4dd8
@bhennion
Restore Audio Recording folder selection in SettingsDialog
24ee5a1
@bhennion
Port PageTemplateDialog
84c20b9
@bhennion
Apply gtk4-builder-tool simplify --3to4 to RenameLayerDialog
1648a0b
@bhennion
Apply gtk4-builder-tool simplify --3to4 to SelectOpacityDialog
ed72d40
@bhennion
Apply gtk4-builder-tool simplify --3to4 to ManageToolbarDialog
13584aa
@bhennion
Apply gtk4-builder-tool simplify --3to4 to SettingsButtonConfig.ui
2f72065
@bhennion
Run gtk4-builder-tool simplify on settingsDeviceClassConfig.ui
5e05e98
@bhennion
Apply gtk4-builder-tool simplify --3to4 to paletteSettings.ui
e859c32
@bhennion
Apply gtk4-builder-tool simplify --3to4 to texdialog.ui
57b999c
@bhennion
Apply gtk4-builder-tool simplify --3to4 to backgroundSelection.ui
880f26d
@bhennion
Implement toolbar container
a0ff557
@bhennion
Add proxy for toolbar zoom slider
1e5ee7e
@bhennion
Remove gtk4_helper and gdk4_helper and other GTK3 leftovers
0a9050b
@bhennion
Restore clipboard and Drag-n-Drop functions
af90f2b
@bhennion
Fix InputContext:
7c87aed 
    * Fix debug flags
    * Fix double/triple clicks
    * Fetch event backlogs for stylus input
@bhennion
Working Toolbar customization
1803285
@bhennion
Reenable plugins -- Remove deprecated API functions
6154943
@bhennion
Use GtkUriLauncher to open Help page if Gtk >= 4.10.0
1af5079
@bhennion
Add Debug information on drag'n'drop for toolbr customization
51030b7
@bhennion
Remove superfluous fireDocumentChanged() causing laggish document loa…
8419bdb 
…ding
@bhennion
Workaround sidebar miniature layout bug in HiDPI situations by keepin…
f960c0e 
…g lowDPI miniatures
@bhennion
Fix dragged icons in toolbar customization
b43f40b
@bhennion
Give menu shortcuts the lowest priority
e63e05b
@bhennion
Remove code duplication in ToolMenuHandler
6f650e4
@rolandlo @bhennion
Apply gtk4-builder-tool simplify --3to4
97fc158 
- plugin.glade -> plugin.ui
- pluginEntry.glade -> pluginEntry.ui
@bhennion
Adapt po/CMakeLists.txt to translate .ui files
8bd2768
@bhennion
Save device configuration separatly for GTK4
cd6d3bc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Febbe Febbe Febbe left review comments

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

Successfully merging this pull request may close these issues.

GTK4 preparation
6 participants
@bhennion @rolandlo @LittleHuba @Febbe @idotobi @Doublonmousse
0