From feeddff73a280ac0d71e0b485ba6c0bb683369c6 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 2 Apr 2026 22:18:08 +0200 Subject: [PATCH] vcl: Drop vcl/qa/cppunit/builder/demo.ui This file was originally added in commit 9543bbaecf980aecec3ee71a4305573866d411d1 Date: Mon Mar 26 12:15:22 2012 +0100 bootstrap a ui-previewer for rendering GtkBuilder xml with vcl widgets , but that ui-previewer was dropped in the meantime in commit c26ce14c2bc2f4583cb02af56fdf7c00df3c5aac Date: Thu Dec 16 15:31:07 2021 +0000 drop ui-previewer and the .ui file also doesn't seem to be used otherwise. `bin/run vcldemo` doesn't make use of it, and there is cui/uiconfig/ui/widgettestdialog.ui for a widget test/demo dialog by now which can probably fulfil the test/demo purpose that the now dropped file presumably had originally. It was added as a dependency via `gb_UIConfig_add_a11yerrors_uifiles` earlier in commit 305285bd1450bb847058a877b0dc2adface4e521 Date: Fri May 4 14:08:27 2018 +0200 vcl: Run gla11y on demo.ui , but the a11y issues have also been fixed in the meantime. Just drop that dependency again. The file is the last one still making use of attributes directly in the .ui file to define data for a GtkListStore. Don't do that in a demo file when this approach is not used anywhere else in the code base any more. For the (non-)use of in . ui files, see also commit 3906bb7bed74619b1de2c556bd98bbbaec44cce8 Author: Michael Weghorn Date: Tue Mar 17 15:23:14 2026 +0100 tdf#130857 widgettestdialog: Use GtkComboBoxText for some more details/background. Also, defining the tabs of a weld::Notebook/GtkNotebook directly in the .ui file is no longer the usual approach since most dialogs were switched to define tabs in C++ code as part of the introduction of vertical tabs, see e.g. commit ce56a263a5bcb2329f52180e435dbe9eb0f41aa3 Author: Michael Weghorn Date: Tue Mar 10 11:39:29 2026 +0100 tdf#130857 dbaccess: Don't define tab pages in .ui file As has been done almost everywhere else already, switch from defining (skeleton) tab pages in the .ui file for the database "Advanced Settings" dialog and adding the actual content only later. [...] as well as commits by Heiko Tietze that switched to vertical tabs. (The `git log -G ''` output shows some.) Change-Id: Icf3279d975729c60ffcb4cb3e7dfc2474c59e23c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203191 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- vcl/UIConfig_vcl.mk | 4 - vcl/qa/cppunit/builder/demo.ui | 1883 -------------------------------- 2 files changed, 1887 deletions(-) delete mode 100644 vcl/qa/cppunit/builder/demo.ui diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk index 0ccfb2f5dd84..d84975427dc3 100644 --- a/vcl/UIConfig_vcl.mk +++ b/vcl/UIConfig_vcl.mk @@ -31,8 +31,4 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\ vcl/uiconfig/ui/openlockedquerybox \ )) -$(eval $(call gb_UIConfig_add_a11yerrors_uifiles,vcl,\ - vcl/qa/cppunit/builder/demo \ -)) - # vim: set noet sw=4 ts=4: diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui deleted file mode 100644 index 25882997d43a..000000000000 --- a/vcl/qa/cppunit/builder/demo.ui +++ /dev/null @@ -1,1883 +0,0 @@ - - - - - - - - - - - - [None] - - - Normal - - - - - - - - - - - 1 - - - 2 - - - 3 - - - 4 - - - 5 - - - 6 - - - 7 - - - 8 - - - 9 - - - 10 - - - 1 - 10 - - - - - False - 5 - dialog - - - False - vertical - 2 - - - False - end - - - _Cancel - True - True - True - True - - - False - True - 0 - - - - - _OK - True - True - True - True - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - True - - - True - False - vertical - - - - True - False - 4 - 2 - True - True - - - True - False - cell 1.1 - - - 0 - 0 - - - - - True - False - cell 3.3 - 1 - - - 2 - 2 - - - - - True - False - A label that spans three rows - - - 0 - 1 - 3 - - - - - - - - - - - - - - - - - True - True - 0 - - - - - True - False - - - True - True - True - True - - - False - True - 0 - - - - - True - False - 0 - 1 - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - - - EXPAND - True - True - True - A tooltip example - - - True - True - 0 - - - - - FILL - True - True - True - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - - - button - True - True - True - - - False - True - 0 - - - - - radiobutton - True - True - False - True - True - True - - - False - True - 1 - - - - - checkbutton - True - True - False - True - True - - - False - True - 2 - - - - - False - True - 3 - - - - - True - False - 0 - none - - - True - False - 12 - vertical - 6 - True - - - True - False - left - 0 - - - False - True - 0 - - - - - True - False - right - 1 - - - False - True - 1 - - - - - True - False - center - - - False - True - 2 - - - - - True - True - True - True - an edit control - - - False - True - 3 - - - - - - - True - False - Frame Label - - - - - False - True - 4 - - - - - - - True - False - page 1 - - - False - - - - - True - False - vertical - 10 - - - True - False - 0 - none - - - - True - False - 12 - 5 - True - - - True - False - _Number of title pages - True - NF_PAGE_COUNT - 0 - - - 0 - 2 - - - - - True - False - Place title pages at - 0 - - - 0 - 3 - - - - - True - False - pages - 0 - - - 2 - 2 - 2 - - - - - True - True - True - True - - - 1 - 2 - - - - - True - False - True - True - True - - - - - - 2 - 4 - 2 - - - - - Converting existing pages to title pages - True - True - False - True - True - RB_INSERT_NEW_PAGES - - - 0 - 0 - 4 - - - - - Insert new title pages - True - True - False - True - True - RB_USE_EXISTING_PAGES - - - 0 - 1 - 4 - - - - - Document Start - True - True - False - True - True - RB_PAGE_START - - - 1 - 3 - 3 - - - - - Page - True - True - False - True - True - RB_DOCUMENT_START - - - - - - 1 - 4 - - - - - - - - - - True - False - Make Title Pages - - - - - True - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - vertical - True - - - Reset Page Numbering after title pages - True - True - False - True - True - - - False - True - 0 - - - - - True - False - - - True - False - Page number - - - - - - False - True - 0 - - - - - True - False - True - True - True - - - - - - False - True - 1 - - - - - False - True - 1 - - - - - Set Page Number for first title page - True - True - False - True - True - - - False - True - 2 - - - - - True - False - - - True - False - Page number - - - - - - False - True - 0 - - - - - True - False - True - True - True - - - - - - False - True - 1 - - - - - False - True - 3 - - - - - - - True - False - Page Numbering - - - - - True - True - 1 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - 0 - 1 - - - True - True - 0 - - - - - Edit... - True - True - True - - - False - True - 1 - - - - - - - True - False - Edit Page Properties - - - - - False - True - 2 - - - - - 1 - - - - - True - False - page 2 - - - 1 - False - - - - - True - False - 0 - none - - - True - False - 12 - vertical - - - Line break - True - True - False - True - True - True - - - False - True - 0 - - - - - Column break - True - True - False - True - True - 2 - - - False - True - 1 - - - - - Page break - True - True - False - True - True - 2 - - - False - True - 2 - - - - - True - False - Style - 5 - 0 - - - False - True - 3 - - - - - True - False - liststore1 - 0 - 1 - - - False - True - 4 - - - - - Change page number - True - True - False - True - True - - - - - - False - True - 5 - - - - - True - False - - - True - True - True - - - - - - False - True - 0 - - - - - - - - False - True - 6 - - - - - - - True - False - Type - - - - - 2 - - - - - True - False - page 3 - - - 2 - False - - - - - True - False - True - - - True - False - 0 - none - - - True - False - 12 - vertical - - - Optimal - True - True - False - True - True - True - - - False - True - 0 - - - - - Fit width and height - True - True - False - True - True - 15 - - - False - True - 1 - - - - - Fit width - True - True - False - True - True - 15 - - - False - True - 2 - - - - - 100% - True - True - False - True - True - 15 - - - False - True - 3 - - - - - True - False - - - Variable - True - True - False - True - True - 15 - - - - - - False - True - 0 - - - - - True - True - True - - - - - - False - True - 1 - - - - - False - True - 4 - - - - - - - True - False - Zoom Factor - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - vertical - - - Automatic - True - True - False - True - True - True - - - False - True - 0 - - - - - Single page - True - True - False - True - True - 22 - - - False - True - 1 - - - - - True - False - - - Columns - True - True - False - True - True - 22 - - - - - - False - True - 0 - - - - - True - True - True - - - - - - False - True - 1 - - - - - False - True - 2 - - - - - Book mode - True - True - False - 10 - True - True - - - False - True - 3 - - - - - - - True - False - View Layout - - - - - False - True - 1 - - - - - 3 - - - - - True - False - page 4 - - - 3 - False - - - - - True - False - 10 - 10 - - - True - False - 0 - none - - - True - True - 12 - liststore2 - False - 0 - - - - - True - False - Level - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - 10 - - - True - False - vertical - - - - True - False - 10 - - - True - False - Paragraph Style - combobox2 - 0 - - - 0 - 0 - 2 - - - - - True - False - 0 - 1 - - - 0 - 1 - 2 - - - - - True - False - Number - combobox3 - 0 - - - 0 - 2 - - - - - True - False - Character Style - combobox4 - 0 - - - 0 - 3 - - - - - True - False - Show sublevels - spinbutton2 - 0 - - - 0 - 4 - - - - - True - False - Separator - 0 - - - 0 - 5 - 2 - - - - - True - False - 0 - 1 - - - 1 - 2 - - - - - True - False - 0 - 1 - - - 1 - 3 - - - - - True - True - True - - - 1 - 4 - - - - - True - True - True - - - 1 - 6 - - - - - True - True - True - - - 1 - 7 - - - - - True - True - True - - - 1 - 8 - - - - - True - False - Start at - spinbutton3 - 0 - - - 0 - 8 - - - - - True - False - 20 - After - entry3 - 0 - - - 0 - 7 - - - - - True - False - 20 - Before - entry2 - 0 - - - 0 - 6 - - - - - False - True - 0 - - - - - False - True - 0 - - - - - 150 - 200 - True - False - - - True - True - 1 - - - - - - - True - False - Numbering - - - - - True - True - 1 - - - - - 4 - - - - - True - False - page 5 - - - 4 - False - - - - - True - False - 10 - 10 - - - True - False - 0 - none - - - True - True - 12 - liststore2 - False - 0 - - - - - True - False - Level - - - - - False - True - 0 - - - - - True - False - 0 - none - - - - True - False - 12 - 10 - 10 - - - True - False - Numbering followed by - combobox5 - 0 - - - 0 - 0 - - - - - True - False - Numbering Alignment - combobox6 - 0 - - - 0 - 2 - - - - - True - False - Aligned at - spinbutton6 - 0 - - - 0 - 3 - - - - - True - False - Indent at - spinbutton4 - 0 - - - 0 - 4 - - - - - True - False - 0 - 1 - - - 1 - 2 - - - - - True - True - True - - - 1 - 4 - - - - - True - False - at - spinbutton5 - 1 - - - 0 - 1 - - - - - True - True - True - - - 1 - 1 - - - - - True - True - True - - - 1 - 3 - - - - - True - False - 0 - 1 - - - 1 - 0 - - - - - 300 - 150 - True - False - - - 0 - 5 - - - - - Default - True - True - True - end - - - 1 - 5 - - - - - - - True - False - Position and Spacing - - - - - True - True - 1 - - - - - 5 - - - - - True - False - page 6 - - - 5 - False - - - - - True - True - True - - - - True - False - 200 - 400 - - - True - False - label - - - 0 - 0 - - - - - True - False - label - - - 0 - 1 - - - - - True - False - label - - - 0 - 2 - - - - - True - False - label - - - 1 - 0 - - - - - True - False - label - - - 1 - 1 - - - - - True - False - label - - - 1 - 2 - - - - - - - True - False - Details - - - - - 6 - - - - - True - False - page 7 - - - 6 - False - - - - - True - True - 1 - - - - - - cancel - ok - - -