7282421451
This implements an initial QtBuilder, which is used by
QtInstanceBuilder to create weld::Widget instances
using native Qt widgets.
This tries to be close to the VCL implementation (VclBuilder).
The selected approach is based on Caolán's suggestion in [1] to
rework VclBuilder to have overridable methods for widgets creation.
This way, we can have common code for the UI parser but the
function for widget creation is different.
Qt equivalents for Gtk's widget classes in the .ui files:
* GtkMessageDialog -> QMessageBox
* GtkBox -> QLayout (can be QVBoxLayout/QHBoxLayout based on
property in .ui file)
* GtkButtonBox -> QDialogButtonBox
* GtkButton -> QPushButton
As QMessageBox already comes with a layout and
a QDialogButtonBox, don't create new ones, but
return the existing ones in QtBuilder::makeObject.
This commit implements initial support for the
above-mentioned widget types and adds the first
message dialog to the list of supported .ui files
in QtInstanceBuilder::IsUIFileSupported,
so a native QMessageBox is used for it now, unless
environment variable SAL_VCL_QT_NO_WELDED_WIDGETS
is set when starting LibreOffice.
The dialog ("modules/swriter/ui/inforeadonlydialog.ui")
gets shown when taking the following steps:
* start Writer
* type "hello world"
* select text
* "Insert" -> "Section"
* tick the "Protect" checkbox in the "Write Protection" section
* close dialog via "Insert" button
* try to type in the protected section
The dialog can be dismissed using the default "OK" button.
(Handling for response codes for buttons is not implemented
yet, which will be needed when welding dialogs that have multiple
buttons resulting in different behavior depending on what button
gets clicked.)
This change was originally submitted as a WIP change as part of
Omkar Acharekar's Outreachy project "Implement Qt/KDE Frameworks
theming using native Qt widgets" (see [2]), then further refined
by Michael Weghorn.
[1] https://lists.freedesktop.org/archives/libreoffice/2023-December/091288.html
[2] https://lists.freedesktop.org/archives/libreoffice/2023-December/091281.html
Co-authored-by: Michael Weghorn <m.weghorn@posteo.de>
Change-Id: I6dd010a2138c245dc1e6d83dd08123898e9d9048
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161831
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
140 lines
3.5 KiB
Makefile
140 lines
3.5 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,vclplug_qt5))
|
|
|
|
$(eval $(call gb_Library_set_plugin_for,vclplug_qt5,vcl))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,vclplug_qt5,vcl/qt5))
|
|
|
|
$(eval $(call gb_Library_set_include,vclplug_qt5,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
-I$(SRCDIR)/vcl/inc/qt5 \
|
|
$(GSTREAMER_1_0_CFLAGS) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,vclplug_qt5,\
|
|
-DVCLPLUG_QT_IMPLEMENTATION \
|
|
-DVCL_INTERNALS \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,vclplug_qt5))
|
|
|
|
$(eval $(call gb_Library_use_libraries,vclplug_qt5,\
|
|
tl \
|
|
utl \
|
|
sot \
|
|
ucbhelper \
|
|
basegfx \
|
|
comphelper \
|
|
cppuhelper \
|
|
i18nlangtag \
|
|
i18nutil \
|
|
$(if $(ENABLE_JAVA), \
|
|
jvmaccess) \
|
|
cppu \
|
|
sal \
|
|
salhelper \
|
|
xmlreader \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,vclplug_qt5,\
|
|
boost_headers \
|
|
cairo \
|
|
epoxy \
|
|
graphite \
|
|
harfbuzz \
|
|
icu_headers \
|
|
icuuc \
|
|
qt5 \
|
|
))
|
|
|
|
ifneq ($(QT5_HAVE_GOBJECT),)
|
|
$(eval $(call gb_Library_add_cxxflags,vclplug_qt5,\
|
|
$(QT5_GOBJECT_CFLAGS) \
|
|
))
|
|
$(eval $(call gb_Library_add_libs,vclplug_qt5,\
|
|
$(QT5_GOBJECT_LIBS) \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
|
|
vcl/qt5/QtAccessibleEventListener \
|
|
vcl/qt5/QtAccessibleRegistry \
|
|
vcl/qt5/QtAccessibleWidget \
|
|
vcl/qt5/QtBitmap \
|
|
vcl/qt5/QtBuilder \
|
|
vcl/qt5/QtClipboard \
|
|
vcl/qt5/QtData \
|
|
vcl/qt5/QtDragAndDrop \
|
|
vcl/qt5/QtFilePicker \
|
|
vcl/qt5/QtFont \
|
|
vcl/qt5/QtFontFace \
|
|
vcl/qt5/QtFrame \
|
|
vcl/qt5/QtGraphics \
|
|
vcl/qt5/QtGraphicsBase \
|
|
vcl/qt5/QtGraphics_Controls \
|
|
vcl/qt5/QtGraphics_GDI \
|
|
vcl/qt5/QtGraphics_Text \
|
|
vcl/qt5/QtInstance \
|
|
vcl/qt5/QtInstance_Print \
|
|
vcl/qt5/QtInstanceBuilder \
|
|
vcl/qt5/QtInstanceButton \
|
|
vcl/qt5/QtInstanceContainer \
|
|
vcl/qt5/QtInstanceDialog \
|
|
vcl/qt5/QtInstanceMessageDialog \
|
|
vcl/qt5/QtInstanceWidget \
|
|
vcl/qt5/QtInstanceWindow \
|
|
vcl/qt5/QtMainWindow \
|
|
vcl/qt5/QtMenu \
|
|
vcl/qt5/QtObject \
|
|
vcl/qt5/QtOpenGLContext \
|
|
vcl/qt5/QtPainter \
|
|
vcl/qt5/QtPrinter \
|
|
vcl/qt5/QtSvpGraphics \
|
|
vcl/qt5/QtSvpSurface \
|
|
vcl/qt5/QtSystem \
|
|
vcl/qt5/QtTimer \
|
|
vcl/qt5/QtTools \
|
|
vcl/qt5/QtTransferable \
|
|
vcl/qt5/QtVirtualDevice \
|
|
vcl/qt5/QtWidget \
|
|
vcl/qt5/QtXAccessible \
|
|
$(if $(USING_X11), \
|
|
vcl/qt5/QtX11Support \
|
|
) \
|
|
))
|
|
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Library_add_libs,vclplug_qt5,\
|
|
-lm \
|
|
-ldl \
|
|
))
|
|
endif
|
|
|
|
# Workaround for clang+icecream (clang's -frewrite-includes
|
|
# doesn't handle Qt5's QT_HAS_INCLUDE that Qt5 uses for <chrono>).
|
|
ifeq ($(COM_IS_CLANG),TRUE)
|
|
$(eval $(call gb_Library_add_cxxflags,vclplug_qt5, \
|
|
-include chrono \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|