From c0b1ef2e4f012d1e5463b76fef4767affffe855d Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 14:58:01 +0200 Subject: [PATCH 1/8] Pref: General: Remove useless and redundant 'General' groupbox. --- src/Gui/DlgGeneral.ui | 1090 ++++++++++++++++++++--------------------- 1 file changed, 533 insertions(+), 557 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index e3bfc7a53b..3703c062a6 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -13,627 +13,455 @@ General - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - General - - - - - - Language and number format - - - - 11 + + + + + Language and number format + + + + 11 + + + 11 + + + 11 + + + 11 + + + 6 + + + + + Language: - - 11 + + + + + + Language of the application's user interface - - 11 + + + + + + Unit system: - - 11 + + + + + + Unit system that should be used for all parts of the application - - 6 - - - + + + + + + - Language: + Number of decimals: - - + + - Language of the application's user interface + Number of decimals that should be shown for numbers and dimensions + + + 1 + + + 12 - - - - Unit system: - - + + + + + + Minimum fractional inch: + + + + + + + Minimum fractional inch to be displayed + + + + 1/2" + - - - - Unit system that should be used for all parts of the application - - + + + 1/4" + - - - - - - Number of decimals: - - - - - - - Number of decimals that should be shown for numbers and dimensions - - - 1 - - - 12 - - - - + + + 1/8" + - - - - Minimum fractional inch: - - + + + 1/16" + - - - - Minimum fractional inch to be displayed - - - - 1/2" - - - - - 1/4" - - - - - 1/8" - - - - - 1/16" - - - - - 1/32" - - - - - 1/64" - - - - - 1/128" - - - + + + 1/32" + - - - - Number format: - - + + + 1/64" + - - - - UseLocaleFormatting - - - General - - - - Operating system - - - - - Selected language - - - - - C/POSIX - - - + + + 1/128" + - - - - If enabled, numerical keypad decimal separator + + + + + + Number format: + + + + + + + UseLocaleFormatting + + + General + + + + Operating system + + + + + Selected language + + + + + C/POSIX + + + + + + + + If enabled, numerical keypad decimal separator will be substituted with locale separator, except in Python Console and Macro Editor where a dot/period will always be printed. + + + Substitute decimal separator (numpad) + + + SubstituteDecimalSeparator + + + General + + + + + + + + + + Preference packs + + + + + + + + Qt::ScrollBarAlwaysOff - - Substitute decimal separator (numpad) + + QAbstractScrollArea::AdjustToContents - - SubstituteDecimalSeparator + + QAbstractItemView::NoEditTriggers - - General + + false + + false + + + QAbstractItemView::NoSelection + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + false + + + true + + + true + + + 30 + + + 100 + + + true + + + false + + + 16 + + + 24 + + + + Name + + + + 75 + true + + + + + + Type + + + + 75 + true + + + + + + Load + + - - - - - - - Preference packs - - - + - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContents - - - QAbstractItemView::NoEditTriggers - - - false - - - false - - - QAbstractItemView::NoSelection - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - true - - - true - - - 30 - - - 100 - - - true - - - false - - - 16 - - - 24 - - - - Name - - - - 75 - true - - - - - - Type - - - - 75 - true - - - - - - Load - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Import config... - - - - - - - Save new... - - - - - - - - 0 - 0 - - - - Manage... - - - - - - - Revert... - - - - - - - - - - - - - - Main window - - - - 6 - - - 11 - - - 11 - - - 11 - - - 11 - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Size of recent file list - - - - - + Qt::Horizontal - - QSizePolicy::Expanding - - 20 + 40 20 - - - How many files should be listed in recent files list - - - 4 - - - RecentFiles - - - RecentFiles + + + Import config... - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - Background of the main window will consist of tiles of a special image. -See the FreeCAD Wiki for details about the image. + + + Save new... + + + + + + + + 0 + 0 + - Enable tiled background + Manage... - - - The text cursor will be blinking - + - Enable cursor blinking - - - true - - - EnableCursorBlinking - - - General - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Style sheet: - - - - - - - Style sheet how user interface will look like - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Size of toolbar icons: - - - - - - - Choose your preference for toolbar icon size. You can adjust -this according to your screen size or personal taste - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Tree view mode: - - - - - - - Customize how tree view is shown in the panel (restart required). - -'ComboView': combine tree view and property view into one panel. -'TreeView and PropertyView': split tree view and property view into separate panel. -'Both': keep all three panels, and you can have two sets of tree view and property view. + Revert... - - - - - - Start up - - - - 11 - - - 11 - - - 11 - - - 11 - + + + + + + + + Main window + + + + 6 + + + 11 + + + 11 + + + 11 + + + 11 + + + 6 - - + + 0 + + + 0 + + + 0 + + + 0 + + + + + Size of recent file list + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + - A Splash screen is a small loading window that is shown -when FreeCAD is launching. If this option is checked, FreeCAD will -display the splash screen + How many files should be listed in recent files list + + + 4 + + + RecentFiles + + + RecentFiles + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Background of the main window will consist of tiles of a special image. +See the FreeCAD Wiki for details about the image. - Enable splash screen at start up + Enable tiled background + + + + + + + The text cursor will be blinking + + + Enable cursor blinking true - ShowSplasher + EnableCursorBlinking General @@ -641,11 +469,159 @@ display the splash screen - - - - - + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Style sheet: + + + + + + + Style sheet how user interface will look like + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Size of toolbar icons: + + + + + + + Choose your preference for toolbar icon size. You can adjust +this according to your screen size or personal taste + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Tree view mode: + + + + + + + Customize how tree view is shown in the panel (restart required). + +'ComboView': combine tree view and property view into one panel. +'TreeView and PropertyView': split tree view and property view into separate panel. +'Both': keep all three panels, and you can have two sets of tree view and property view. + + + + + + + + + + + + Start up + + + + 11 + + + 11 + + + 11 + + + 11 + + + 6 + + + + + A Splash screen is a small loading window that is shown +when FreeCAD is launching. If this option is checked, FreeCAD will +display the splash screen + + + Enable splash screen at start up + + + true + + + ShowSplasher + + + General + + + + + + From 0e85859c4eec92fe9db8555906de2519c5962d82 Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 14:59:12 +0200 Subject: [PATCH 2/8] Pref: General: Move pref pack at the end of the page. --- src/Gui/DlgGeneral.ui | 304 +++++++++++++++++++++--------------------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 3703c062a6..01826a4666 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -190,158 +190,6 @@ dot/period will always be printed. - - - - Preference packs - - - - - - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContents - - - QAbstractItemView::NoEditTriggers - - - false - - - false - - - QAbstractItemView::NoSelection - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - true - - - true - - - 30 - - - 100 - - - true - - - false - - - 16 - - - 24 - - - - Name - - - - 75 - true - - - - - - Type - - - - 75 - true - - - - - - Load - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Import config... - - - - - - - Save new... - - - - - - - - 0 - 0 - - - - Manage... - - - - - - - Revert... - - - - - - - - - - @@ -622,6 +470,158 @@ display the splash screen + + + + Preference packs + + + + + + + + Qt::ScrollBarAlwaysOff + + + QAbstractScrollArea::AdjustToContents + + + QAbstractItemView::NoEditTriggers + + + false + + + false + + + QAbstractItemView::NoSelection + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + false + + + true + + + true + + + 30 + + + 100 + + + true + + + false + + + 16 + + + 24 + + + + Name + + + + 75 + true + + + + + + Type + + + + 75 + true + + + + + + Load + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Import config... + + + + + + + Save new... + + + + + + + + 0 + 0 + + + + Manage... + + + + + + + Revert... + + + + + + + + + + From 5ed95e01b0247e4d46aab7024bc9b1da9fa47afd Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 16:41:57 +0200 Subject: [PATCH 3/8] Pref: General: Rename 'Style sheet' to 'Theme' --- src/Gui/DlgGeneral.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 01826a4666..6488fb430e 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -338,7 +338,7 @@ See the FreeCAD Wiki for details about the image. - Style sheet: + Theme: From f301d8f6df3c475fb6390762cf71e906f56b4f24 Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 16:44:14 +0200 Subject: [PATCH 4/8] Pref: General: Remove 'start up' groupbox as it has a single element. --- src/Gui/DlgGeneral.ui | 56 +++++++++++++------------------------------ 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 6488fb430e..287cbe8bbd 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -426,48 +426,24 @@ this according to your screen size or personal taste - - - Start up - - - - 11 - - - 11 - - - 11 - - - 11 - - - 6 - - - - - A Splash screen is a small loading window that is shown + + + A Splash screen is a small loading window that is shown when FreeCAD is launching. If this option is checked, FreeCAD will display the splash screen - - - Enable splash screen at start up - - - true - - - ShowSplasher - - - General - - - - + + + Enable splash screen at start up + + + true + + + ShowSplasher + + + General + From a9badd74aaaebd989f7d80d961777718ce49b04b Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 16:59:43 +0200 Subject: [PATCH 5/8] Pref: General: The 'recent file' spinbox was very far away from the name. And the name missed ':' as others settings. --- src/Gui/DlgGeneral.ui | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 287cbe8bbd..2883cb42c6 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -231,7 +231,23 @@ dot/period will always be printed. - Size of recent file list + Size of recent file list: + + + + + + + How many files should be listed in recent files list + + + 4 + + + RecentFiles + + + RecentFiles @@ -251,22 +267,6 @@ dot/period will always be printed. - - - - How many files should be listed in recent files list - - - 4 - - - RecentFiles - - - RecentFiles - - - From 764ea0cdb9bd8f2ffc6b843ef7609fead75dd49c Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 17:26:56 +0200 Subject: [PATCH 6/8] Pref: General: Remove '(numpad)' string. It's tooltip stuff. --- src/Gui/DlgGeneral.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 2883cb42c6..d770d71c0c 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -177,7 +177,7 @@ in Python Console and Macro Editor where a dot/period will always be printed. - Substitute decimal separator (numpad) + Substitute decimal separator SubstituteDecimalSeparator From f5afba4852da6a5bd43ec25b717b07d57b1c9d7b Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 17:43:01 +0200 Subject: [PATCH 7/8] Pref: General: Rename 'Main Window' groupbox to 'Application' as it has settings unrelated to mainwindow (recent files). Reorder settings by importance and for the group to look better. --- src/Gui/DlgGeneral.ui | 333 ++++++++++++++---------------------------- 1 file changed, 111 insertions(+), 222 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index d770d71c0c..7ebf313e48 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -193,12 +193,9 @@ dot/period will always be printed. - Main window + Application - - - 6 - + 11 @@ -211,239 +208,131 @@ dot/period will always be printed. 11 - - - - 6 + + 6 + + + + + Theme: - - 0 - - - 0 - - - 0 - - - 0 - - - - - Size of recent file list: - - - - - - - How many files should be listed in recent files list - - - 4 - - - RecentFiles - - - RecentFiles - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - + - - - - 6 + + + + Style sheet how user interface will look like - - 0 - - - 0 - - - 0 - - - 0 - - - - - Background of the main window will consist of tiles of a special image. -See the FreeCAD Wiki for details about the image. - - - Enable tiled background - - - - - - - The text cursor will be blinking - - - Enable cursor blinking - - - true - - - EnableCursorBlinking - - - General - - - - + - - - - 6 + + + + Size of toolbar icons: - - 0 - - - 0 - - - 0 - - - 0 - - - - - Theme: - - - - - - - Style sheet how user interface will look like - - - - + - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Size of toolbar icons: - - - - - - - Choose your preference for toolbar icon size. You can adjust + + + + Choose your preference for toolbar icon size. You can adjust this according to your screen size or personal taste - - - - + + - - - - 6 + + + + Tree view mode: - - 0 - - - 0 - - - 0 - - - 0 - - - - - Tree view mode: - - - - - - - Customize how tree view is shown in the panel (restart required). + + + + + + Customize how tree view is shown in the panel (restart required). 'ComboView': combine tree view and property view into one panel. 'TreeView and PropertyView': split tree view and property view into separate panel. 'Both': keep all three panels, and you can have two sets of tree view and property view. - - - - + + - - - - - - - A Splash screen is a small loading window that is shown + + + + Size of recent file list: + + + + + + + How many files should be listed in recent files list + + + 4 + + + RecentFiles + + + RecentFiles + + + + + + + Background of the main window will consist of tiles of a special image. +See the FreeCAD Wiki for details about the image. + + + Enable tiled background + + + + + + + The text cursor will be blinking + + + Enable cursor blinking + + + true + + + EnableCursorBlinking + + + General + + + + + + + A Splash screen is a small loading window that is shown when FreeCAD is launching. If this option is checked, FreeCAD will display the splash screen - - - Enable splash screen at start up - - - true - - - ShowSplasher - - - General - + + + Enable splash screen at start up + + + true + + + ShowSplasher + + + General + + + + From e1e62659fefd6a25c1563e7be5720ea528954955 Mon Sep 17 00:00:00 2001 From: Paddle Date: Thu, 13 Apr 2023 18:14:55 +0200 Subject: [PATCH 8/8] Pref: General: revert change from stylesheet to theme. --- src/Gui/DlgGeneral.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 7ebf313e48..70a13f7c8d 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -214,7 +214,7 @@ dot/period will always be printed. - Theme: + Style sheet: @@ -284,7 +284,7 @@ this according to your screen size or personal taste - Background of the main window will consist of tiles of a special image. + Background of the main window (when no document is opened) will consist of tiles of a special image. See the FreeCAD Wiki for details about the image.