Euro-Office · pplupo · Jul 3, 2026 · Jul 3, 2026 · Jul 3, 2026 · Jul 4, 2026
diff --git a/.docker/desktop-apps.bake.Dockerfile b/.docker/desktop-apps.bake.Dockerfile
@@ -31,6 +31,7 @@ FROM core-base AS desktop-linux
                     bison \
                     libnotify-dev \
                     libcups2-dev \
+                    libwayland-dev \
                     libdbus-1-dev \
                     libxcb-util0-dev \
                     libxcb-xkb-dev \
@@ -102,7 +103,7 @@ FROM core-base AS desktop-linux
             -DVCPKG_MANIFEST_FEATURES="desktop-editors" \
             -DABOUT_PAGE_APP_NAME="${ABOUT_PAGE_APP_NAME}" \
             /desktop-apps/win-linux/ && \
-        cmake --build . && \
+        cmake --build . -- -j4 && \
         cmake --install . && \
         ccache --show-stats && \
         cp -a desktopeditors /desktopeditors

diff --git a/common/loginpage/src/document-creation-grid.js b/common/loginpage/src/document-creation-grid.js
@@ -88,6 +88,13 @@ window.DocumentCreationGrid = function (config = {}) {
                 `).join('')}
                 </div>`;
 
+			// clear any previous render (e.g. a re-render with a new
+			// DocumentCreationGrid instance after the default save format
+			// changed) -- queried against the DOM rather than the local
+			// $el, since a fresh instance's own $el starts out empty
+			// regardless of what an earlier instance already rendered here
+			parentElement.find('.document-creation-grid').remove();
+
 			$parent = parentElement;
 			$el = $parent.append(_template).find('.document-creation-grid');
 		},

diff --git a/common/loginpage/src/locale.js b/common/loginpage/src/locale.js
@@ -129,6 +129,10 @@ l10n.en = {
     settOptLaunchMode: 'Open file',
     settOptLaunchInTab: 'In its own tab',
     settOptLaunchInWindow: 'In its own window',
+    settDefaultSaveFormat: 'Default save format',
+    settOptFormatOoxml: 'Compatibility (OOXML)',
+    settOptFormatOdf: 'Sovereign (ODF)',
+    settDefaultSaveFormatManaged: 'Your default save format is managed by your organization.',
     settSpellcheckDetection: 'Spelling language detection',
     settOptDisabled: 'Disabled',
     settOptEnabled: 'Enabled',

diff --git a/common/loginpage/src/panelrecent.js b/common/loginpage/src/panelrecent.js
@@ -521,6 +521,76 @@
             });
         };
 
+        function _document_types(format) {
+            const isODF = format === 'ODF';
+            return [
+                {
+                    id: 'word',
+                    title: utils.Lang.newDoc,
+                    langKey: 'newDoc',
+                    formatLabel: {
+                        value: isODF ? 'ODT' : 'DOCX',
+                        gradientColorStart: '#4298C5',
+                        gradientColorEnd: '#2D84B2',
+                        bgColorWinXP: '#287ca9',
+                    },
+                    icon: '#docx-big',
+                },
+                {
+                    id: 'cell',
+                    title: utils.Lang.newXlsx,
+                    langKey: 'newXlsx',
+                    formatLabel: {
+                        value: isODF ? 'ODS' : 'XLSX',
+                        gradientColorStart: '#5BB514',
+                        gradientColorEnd: '#318C2B',
+                        bgColorWinXP: '#3aa133',
+                    },
+                    icon: '#xlsx-big',
+                },
+                {
+                    id: 'slide',
+                    title: utils.Lang.newPptx,
+                    langKey: 'newPptx',
+                    formatLabel: {
+                        value: isODF ? 'ODP' : 'PPTX',
+                        gradientColorStart: '#F4893A',
+                        gradientColorEnd: '#DE7341',
+                        bgColorWinXP: '#f36700',
+                    },
+                    icon: '#pptx-big',
+                },
+                {
+                    // forms always stay DOCXF/PDF regardless of the
+                    // ODF/OOXML default save format setting
+                    id: 'form',
+                    title: utils.Lang.newForm,
+                    langKey: 'newForm',
+                    formatLabel: {
+                        value: 'PDF',
+                        gradientColorStart: '#F36653',
+                        gradientColorEnd: '#D2402D',
+                        bgColorWinXP: '#e54d39',
+                    },
+                    icon: '#pdf-big',
+                }
+            ];
+        }
+
+        // (re)renders the "create new" tile grid for the given default save
+        // format ('ODF' or anything else, treated as OOXML). Safe to call
+        // repeatedly -- DocumentCreationGrid.render() clears its own previous
+        // output before appending.
+        function _render_document_grid(format) {
+            const docGrid = new DocumentCreationGrid({
+                documentTypes: _document_types(format),
+                onDocumentSelect: (docType) => {
+                    window.sdk.command("create:new", docType);
+                }
+            });
+            docGrid.render(this.view.$panel.find("#area-document-creation-grid"));
+        }
+
         function _init_ppmenu() {
             if (ppmenu) {
                 Menu.closeAll();
@@ -657,6 +727,17 @@
                         }
 
                         this.appready = true;
+                    } else if (/settings:init/.test(cmd)) {
+                        // read directly rather than relying solely on the
+                        // Settings panel's own defaultformat:changed relay,
+                        // since that panel (and its settings:init parsing)
+                        // isn't constructed until the user opens Settings --
+                        // this fires at genuine startup regardless
+                        try {
+                            const settings = JSON.parse($('<div>').html(param).text());
+                            if (settings.defaultsaveformat)
+                                _render_document_grid.call(this, settings.defaultsaveformat.format);
+                        } catch (e) { /* ignore malformed settings:init */ }
                     }
                 });
 
@@ -674,66 +755,15 @@
                 this.dndZone = new DnDFileZone();
                 this.dndZone.render(this.view.$panel.find("#area-dnd-file"));
 
-                const docGrid = new DocumentCreationGrid({
-                    documentTypes: [
-                        {
-                            id: 'word',
-                            title: utils.Lang.newDoc,
-                            langKey: 'newDoc',
-                            formatLabel: {
-                                value: 'DOCX',
-                                gradientColorStart: '#4298C5',
-                                gradientColorEnd: '#2D84B2',
-                                bgColorWinXP: '#287ca9',
-                            },
-                            icon: '#docx-big',
-                        },
-                        {
-                            id: 'cell',
-                            title: utils.Lang.newXlsx,
-                            langKey: 'newXlsx',
-                            formatLabel: {
-                                value: 'XLSX',
-                                gradientColorStart: '#5BB514',
-                                gradientColorEnd: '#318C2B',
-                                bgColorWinXP: '#3aa133',
-                            },
-                            icon: '#xlsx-big',
-                        },
-                        {
-                            id: 'slide',
-                            title: utils.Lang.newPptx,
-                            langKey: 'newPptx',
-                            formatLabel: {
-                                value: 'PPTX',
-                                gradientColorStart: '#F4893A',
-                                gradientColorEnd: '#DE7341',
-                                bgColorWinXP: '#f36700',
-                            },
-                            icon: '#pptx-big',
-                        },
-                        {
-                            id: 'form',
-                            title: utils.Lang.newForm,
-                            langKey: 'newForm',
-                            formatLabel: {
-                                value: 'PDF',
-                                gradientColorStart: '#F36653',
-                                gradientColorEnd: '#D2402D',
-                                bgColorWinXP: '#e54d39',
-                            },
-                            icon: '#pdf-big',
-                        }
-                    ],
-                    onDocumentSelect: (docType) => {
-                        window.sdk.command("create:new", docType);
-                    }
-                });
+                // renders with the OOXML labels first (matches the
+                // compiled-in Tier-1 default); corrected via settings:init
+                // above or defaultformat:changed below as soon as the
+                // actual resolved/chosen format is known
+                _render_document_grid.call(this, 'OOXML');
+                CommonEvents.on('defaultformat:changed', _render_document_grid.bind(this));
 
                 CommonEvents.on('lang:changed', _init_ppmenu.bind(this));
 
-                docGrid.render(this.view.$panel.find("#area-document-creation-grid"));
-
                 $('#idx-recent-filter', this.view.$panel).on('input', _on_filter_recents.bind(this));
 
                 return this;

diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js
@@ -247,6 +247,18 @@
                                                 </section>
                                             </div>
                                         </div>
+                                        <div class='settings-field' id="opts-default-save-format" style='display:none;'>
+                                            <label class='sett__caption' l10n>${_lang.settDefaultSaveFormat}</label>
+                                            <div class='sett--label-lift-top hbox'>
+                                                <section class='box-cmp-select'>
+                                                    <select class='combobox'>
+                                                        <option value='OOXML' l10n>${_lang.settOptFormatOoxml}</option>
+                                                        <option value='ODF' l10n>${_lang.settOptFormatOdf}</option>
+                                                    </select>
+                                                </section>
+                                            </div>
+                                            <label class='sett__caption' id='sett-save-format-managed' style='display:none;' l10n>${_lang.settDefaultSaveFormatManaged}</label>
+                                        </div>
                                         <div class='settings-field' id="opts-spellcheck-mode" style='display:none;'>
                                             <label class='sett__caption' l10n>${_lang.settSpellcheckDetection}</label>
                                             <div class='sett--label-lift-top hbox'>
@@ -318,6 +330,7 @@
             $optsUITheme,
             $optsSpellcheckMode,
             $optsLaunchMode,
+            $optsDefaultSaveFormat,
             $optsAutoupdateMode;
         let $chGpu,
             $chUseAI;
@@ -456,6 +469,15 @@
                     $optsSpellcheckMode.selectpicker('refresh');
                 }
 
+                /* an enforced format is administrator policy: the combo is
+                   disabled, so nothing is sent back for the native shell to store */
+                if ( $optsDefaultSaveFormat && !appSettings.defaultsaveformat.locked ) {
+                    _new_settings.defaultsaveformat = $optsDefaultSaveFormat.val();
+                    $optsDefaultSaveFormat.selectpicker('refresh');
+
+                    CommonEvents.fire('defaultformat:changed', [_new_settings.defaultsaveformat]);
+                }
+
                 if ( $chGpu ) {
                     _new_settings.usegpu = $chGpu.prop("checked");
 
@@ -651,6 +673,20 @@
                             });
                         }
 
+                        if ( !!appSettings.defaultsaveformat ) {
+                            ($optsDefaultSaveFormat = ($('#opts-default-save-format', $panel).show().find('select')))
+                            .val(appSettings.defaultsaveformat.format)
+                            .prop('disabled', !!appSettings.defaultsaveformat.locked)
+                            .selectpicker().on('change', e => {
+                                $btnApply.isdisabled() && $btnApply.disable(false);
+                            });
+
+                            if ( appSettings.defaultsaveformat.locked )
+                                $('#sett-save-format-managed', $panel).show();
+
+                            CommonEvents.fire('defaultformat:changed', [appSettings.defaultsaveformat.format]);
+                        }
+
                         if ( appSettings.spellcheckdetect !== undefined ) {
                             ($optsSpellcheckMode = ($('#opts-spellcheck-mode', $panel).show().find('select')))
                             .val(appSettings.spellcheckdetect)

diff --git a/win-linux/CMakeLists.txt b/win-linux/CMakeLists.txt
@@ -21,7 +21,6 @@ set(BUILD_DESKTOP TRUE CACHE INTERNAL "tell common to prepare third party for de
 include(${CORE_ROOT_DIR}/common.cmake)
 
 
-# 2. Find Qt Packages
 if(UNIX)
     find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus)
     add_definitions(-DLINUX -D_LINUX -D_WAYLAND)
@@ -115,6 +114,8 @@ if(NOT TARGET allthemesgen)
     add_subdirectory( "${CORE_ROOT_DIR}/DesktopEditor/allthemesgen" allthemesgen )
 endif()
 
+
+
 # 3. Definitions & Global Config
 add_definitions(-D__DONT_WRITE_IN_APP_TITLE)
 add_definitions(-DAPP_ICON_PATH="./res/icons/desktopeditors-eo.ico")
@@ -279,6 +280,9 @@ elseif(UNIX AND NOT APPLE)
         src/platform_linux/gtkprintdialog.cpp
         src/platform_linux/gtkutils.cpp
         src/platform_linux/linux_window_utils.cpp
+        src/platform_linux/x11backend.cpp
+        src/platform_linux/waylandbackend.cpp
+        src/platform_linux/platformbackendfactory.cpp
         extras/update-daemon/src/classes/csocket.cpp
     )
     list(APPEND COMMON_HEADERS 
@@ -294,11 +298,20 @@ elseif(UNIX AND NOT APPLE)
         src/platform_linux/gtkprintdialog.h
         src/platform_linux/gtkutils.h
         src/platform_linux/linux_window_utils.h
+        src/platform_linux/iplatformbackend.h
+        src/platform_linux/x11backend.h
+        src/platform_linux/waylandbackend.h
         extras/update-daemon/src/classes/csocket.h
     )
 
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GTK3 REQUIRED glib-2.0 gtk+-3.0 atk gtk+-unix-print-3.0 xcb xext libnotify)
+    pkg_check_modules(GTK3 REQUIRED glib-2.0 gtk+-3.0 atk gtk+-unix-print-3.0 libnotify)
+    pkg_check_modules(XCB_LIBS xcb xext)
+    pkg_check_modules(X11_LIBS x11 x11-xcb)
+    if(XCB_LIBS_FOUND AND X11_LIBS_FOUND)
+        add_definitions(-DHAVE_X11)
+    endif()
+    add_definitions(-DHAVE_WAYLAND)
 
     # Custom command for glib-compile-resources
     set(GRESOURCE_XML ${CMAKE_CURRENT_SOURCE_DIR}/res/gresource.xml)
@@ -310,7 +323,10 @@ elseif(UNIX AND NOT APPLE)
     )
     list(APPEND COMMON_SOURCES ${GRESOURCE_C})
 
-    set(PLATFORM_LIBS ${GTK3_LIBRARIES} X11 X11-xcb cups)
+    set(PLATFORM_LIBS ${GTK3_LIBRARIES} cups)
+    if(XCB_LIBS_FOUND AND X11_LIBS_FOUND)
+        list(APPEND PLATFORM_LIBS ${X11_LIBS_LIBRARIES} ${XCB_LIBS_LIBRARIES})
+    endif()
 endif()
 
 # 7. Create Executable
@@ -362,8 +378,9 @@ target_link_libraries(DesktopEditors PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
     Qt${QT_VERSION_MAJOR}::Svg
     Qt${QT_VERSION_MAJOR}::PrintSupport
-    Qt${QT_VERSION_MAJOR}::Multimedia 
+    Qt${QT_VERSION_MAJOR}::Multimedia
     Qt${QT_VERSION_MAJOR}::MultimediaWidgets
+    Qt${QT_VERSION_MAJOR}::OpenGLWidgets
     ${PLATFORM_LIBS}
     ${DBUS_LIBRARIES}
 

diff --git a/win-linux/res/icons/logo-dark-eo.svg b/win-linux/res/icons/logo-dark-eo.svg
diff --git a/win-linux/res/icons/logo-light-eo.svg b/win-linux/res/icons/logo-light-eo.svg
diff --git a/win-linux/res/icons/message_warn.svg b/win-linux/res/icons/message_warn.svg
diff --git a/win-linux/res/styles/styles.qss b/win-linux/res/styles/styles.qss
@@ -66,7 +66,7 @@ QPushButton#toolButtonMain {
     font-weight: bold;
     border-left: 0px;
     border-right: 1px solid %7;
-    qproperty-icon: url(:/logo-light-eo.png);
+    qproperty-icon: url(:/logo-light-eo.svg);
 }
 #mainPanel[rtl=true] QPushButton#toolButtonMain {border-right: 0px; border-left: 1px solid %7;}
 #mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 5px;}
@@ -94,7 +94,7 @@ QPushButton#toolButtonDownload {border-left: 0px; border-right: 1px solid %6; ma
 #mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min] {image: url(:/maximize_light.svg) center no-repeat;}
 #mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize {image: url(:/minimize_light.svg) center no-repeat;}
 #mainPanel[uithemetype=dark] QPushButton#toolButtonClose {image: url(:/close_light.svg) center no-repeat;}
-#mainPanel[uithemetype=dark] QPushButton#toolButtonMain {qproperty-icon: url(:/logo-dark-eo.png);}
+#mainPanel[uithemetype=dark] QPushButton#toolButtonMain {qproperty-icon: url(:/logo-dark-eo.svg);}
 
 /* Menu */