diff --git a/src/Gui/AboutApplication.ui b/src/Gui/AboutApplication.ui index 7ab150d186..dc8efad099 100644 --- a/src/Gui/AboutApplication.ui +++ b/src/Gui/AboutApplication.ui @@ -17,36 +17,6 @@ true - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 160 - 31 - - - - - - - - OK - - - - - @@ -145,8 +115,43 @@ 6 - - + + + + Version + + + + + + + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> + + + + + + + Revision number + + + + + + + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> + + + + + + + Release date + + + + + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> @@ -159,6 +164,13 @@ + + + + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> + + + @@ -173,55 +185,6 @@ - - - - Release date - - - - - - - <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - - - - - - - <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - - - - - - - <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - - - - - - - Revision number - - - - - - - <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - - - - - - - Version - - - @@ -243,7 +206,14 @@ - + + + + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> + + + + @@ -388,7 +358,37 @@ p, li { white-space: pre-wrap; } - + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + + 160 + 31 + + + + + + + + OK + + + + + + diff --git a/src/Gui/Clipping.ui b/src/Gui/Clipping.ui index 6b52b759c9..82b50229d2 100644 --- a/src/Gui/Clipping.ui +++ b/src/Gui/Clipping.ui @@ -26,16 +26,16 @@ false - - - - - + + - Flip + Offset + + + @@ -49,14 +49,14 @@ - - + + - Offset + Flip - + @@ -71,16 +71,16 @@ false - - - - - + + - Flip + Offset + + + @@ -94,14 +94,14 @@ - - + + - Offset + Flip - + @@ -116,16 +116,16 @@ false - - - - - + + - Flip + Offset + + + @@ -139,14 +139,14 @@ - - + + - Offset + Flip - + @@ -161,7 +161,17 @@ false - + + + + Offset + + + + + + + Qt::Horizontal @@ -206,17 +216,7 @@ - - - - Offset - - - - - - - + diff --git a/src/Gui/DemoMode.ui b/src/Gui/DemoMode.ui index 125f8eae59..785d680995 100644 --- a/src/Gui/DemoMode.ui +++ b/src/Gui/DemoMode.ui @@ -32,6 +32,48 @@ 6 + + + + Angle + + + + 9 + + + 6 + + + + + -90° + + + + + + + -90 + + + 90 + + + Qt::Horizontal + + + + + + + 90° + + + + + + @@ -44,7 +86,14 @@ 6 - + + + + Minimum + + + + 1 @@ -67,17 +116,23 @@ - - - - Minimum - - - - + - + + + + Qt::Vertical + + + + 20 + 40 + + + + + 6 @@ -117,62 +172,7 @@ - - - - Angle - - - - 9 - - - 6 - - - - - -90 - - - 90 - - - Qt::Horizontal - - - - - - - 90° - - - - - - - -90° - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + diff --git a/src/Gui/DlgActions.ui b/src/Gui/DlgActions.ui index a89006d8bc..b2680b7369 100644 --- a/src/Gui/DlgActions.ui +++ b/src/Gui/DlgActions.ui @@ -55,21 +55,74 @@ - - - - Qt::Horizontal + + + + + + + Menu text: - - QSizePolicy::Expanding + + + + + + + + + Tool tip: - - - 20 - 20 - + + + + + + + 7 + 0 + 0 + 0 + - + + + + + + Status text: + + + + + + + + + + What's this: + + + + + + + + + + Accelerator: + + + + + + + + + + Pixmap + + @@ -98,75 +151,6 @@ - - - - Pixmap - - - - - - - - - - Accelerator: - - - - - - - - - - What's this: - - - - - - - - - - Status text: - - - - - - - - 7 - 0 - 0 - 0 - - - - - - - - Tool tip: - - - - - - - - - - Menu text: - - - - - - @@ -186,10 +170,10 @@ - + - Qt::Vertical + Qt::Horizontal QSizePolicy::Expanding @@ -202,17 +186,17 @@ - + - Qt::Horizontal + Qt::Vertical QSizePolicy::Expanding - 41 + 20 20 @@ -239,7 +223,23 @@ - + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 41 + 20 + + + + + diff --git a/src/Gui/DlgAuthorization.ui b/src/Gui/DlgAuthorization.ui index afbed6e518..52eaa3ecf3 100644 --- a/src/Gui/DlgAuthorization.ui +++ b/src/Gui/DlgAuthorization.ui @@ -17,7 +17,30 @@ true - + + + + Site: + + + + + + + + 75 + true + + + + %1 at %2 + + + true + + + + Username: @@ -64,30 +87,7 @@ - - - - Site: - - - - - - - - 75 - true - - - - %1 at %2 - - - true - - - - + diff --git a/src/Gui/DlgCommands.ui b/src/Gui/DlgCommands.ui index 8e5293b529..ffd79ba6e0 100644 --- a/src/Gui/DlgCommands.ui +++ b/src/Gui/DlgCommands.ui @@ -23,7 +23,28 @@ 6 - + + + + + 4 + 7 + 0 + 0 + + + + + 150 + 16777215 + + + + false + + + + false @@ -52,28 +73,7 @@ - - - - - 4 - 7 - 0 - 0 - - - - - 150 - 16777215 - - - - false - - - - + diff --git a/src/Gui/DlgDisplayProperties.ui b/src/Gui/DlgDisplayProperties.ui index 8515901bc8..4e1961c9b3 100644 --- a/src/Gui/DlgDisplayProperties.ui +++ b/src/Gui/DlgDisplayProperties.ui @@ -168,50 +168,6 @@ 6 - - - - Line transparency: - - - - - - - Transparency: - - - - - - - 6 - - - 0 - - - - - 100 - - - Qt::Horizontal - - - - - - - 100 - - - 5 - - - - - @@ -304,6 +260,13 @@ + + + + Transparency: + + + @@ -340,7 +303,44 @@ - + + + + Line transparency: + + + + + + + 6 + + + 0 + + + + + 100 + + + Qt::Horizontal + + + + + + + 100 + + + 5 + + + + + + diff --git a/src/Gui/DlgEditor.ui b/src/Gui/DlgEditor.ui index b51c1c0279..ac5ea06568 100644 --- a/src/Gui/DlgEditor.ui +++ b/src/Gui/DlgEditor.ui @@ -29,143 +29,6 @@ 6 - - - - - 0 - 0 - - - - Display items - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - - 0 - 0 - - - - Preview: - - - - - - - - - - - - 0 - 0 - - - - Font family to be used for selected code type - - - - - - - Size: - - - - - - - Color: - - - - - - - Color and font settings will be applied to selected type - - - false - - - - 1 - - - - - - - - - 0 - 0 - - - - Font size to be used for selected code type - - - 1 - - - 10 - - - FontSize - - - Editor - - - - - - - Family: - - - - - - - - 140 - 0 - - - - Qt::TabFocus - - - - - - - - - @@ -287,22 +150,6 @@ 6 - - - - Pressing <Tab> will insert amount of defined indent size - - - Insert spaces - - - Spaces - - - Editor - - - @@ -368,10 +215,163 @@ - + + + + Pressing <Tab> will insert amount of defined indent size + + + Insert spaces + + + Spaces + + + Editor + + + + - + + + + + 0 + 0 + + + + Display items + + + + 9 + + + 9 + + + 9 + + + 9 + + + 6 + + + + + Color and font settings will be applied to selected type + + + false + + + + 1 + + + + + + + + Family: + + + + + + + + 0 + 0 + + + + Font family to be used for selected code type + + + + + + + Size: + + + + + + + + 0 + 0 + + + + Font size to be used for selected code type + + + 1 + + + 10 + + + FontSize + + + Editor + + + + + + + Color: + + + + + + + + 140 + 0 + + + + Qt::TabFocus + + + + + + + + + + + 0 + 0 + + + + Preview: + + + + + + + + + + + diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index ed5e2b7b31..9312c3b95b 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -89,22 +89,6 @@ - - - - If enabled, numerical keypad decimal separator will be substituted with locale separator - - - Substitute decimal separator (needs restart) - - - SubstituteDecimalSeparator - - - General - - - @@ -130,7 +114,23 @@ - + + + + If enabled, numerical keypad decimal separator will be substituted with locale separator + + + Substitute decimal separator (needs restart) + + + SubstituteDecimalSeparator + + + General + + + + @@ -534,27 +534,6 @@ this according to your screen size or personal taste 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 - - - @@ -589,7 +568,28 @@ after FreeCAD launches - + + + + 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 + + + + diff --git a/src/Gui/DlgKeyboard.ui b/src/Gui/DlgKeyboard.ui index e32224d091..13266b2f81 100644 --- a/src/Gui/DlgKeyboard.ui +++ b/src/Gui/DlgKeyboard.ui @@ -20,46 +20,6 @@ 6 - - - - 6 - - - 0 - - - - - Description: - - - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - @@ -176,6 +136,22 @@ + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + @@ -239,7 +215,31 @@ - + + + + 6 + + + 0 + + + + + Description: + + + + + + + + + + + + + diff --git a/src/Gui/DlgMacroExecute.ui b/src/Gui/DlgMacroExecute.ui index 98a5c4955e..58dc4223bb 100644 --- a/src/Gui/DlgMacroExecute.ui +++ b/src/Gui/DlgMacroExecute.ui @@ -70,7 +70,14 @@ 6 - + + + + false + + + + QTabWidget::North @@ -130,48 +137,7 @@ - - - - false - - - - - - - - - - User macros location: - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - Qt::StrongFocus - - - Gui::FileChooser::Directory - - - - + @@ -309,7 +275,41 @@ - + + + + User macros location: + + + + 9 + + + 9 + + + 9 + + + 9 + + + 6 + + + + + Qt::StrongFocus + + + Gui::FileChooser::Directory + + + + + + + diff --git a/src/Gui/DlgMaterialProperties.ui b/src/Gui/DlgMaterialProperties.ui index cdcfc9b586..45d16fa709 100644 --- a/src/Gui/DlgMaterialProperties.ui +++ b/src/Gui/DlgMaterialProperties.ui @@ -32,20 +32,6 @@ 6 - - - - Emissive color: - - - - - - - Specular color: - - - @@ -53,13 +39,34 @@ - + + + + + + + + Diffuse color: + + + + + + + + + + + Emissive color: + + + @@ -67,6 +74,13 @@ + + + + Specular color: + + + @@ -114,21 +128,7 @@ - - - - - - - - - - - - - - - + diff --git a/src/Gui/DlgOnlineHelp.ui b/src/Gui/DlgOnlineHelp.ui index dd5d335957..3dcacbf08b 100644 --- a/src/Gui/DlgOnlineHelp.ui +++ b/src/Gui/DlgOnlineHelp.ui @@ -20,22 +20,6 @@ 6 - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 373 - 291 - - - - @@ -68,7 +52,23 @@ - + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 373 + 291 + + + + + diff --git a/src/Gui/DlgParameter.ui b/src/Gui/DlgParameter.ui index a618d3ef3f..30af027efe 100644 --- a/src/Gui/DlgParameter.ui +++ b/src/Gui/DlgParameter.ui @@ -29,6 +29,16 @@ 6 + + + + + + + Qt::Horizontal + + + @@ -127,17 +137,7 @@ - - - - Qt::Horizontal - - - - - - - + diff --git a/src/Gui/DlgPreferencePackManagement.ui b/src/Gui/DlgPreferencePackManagement.ui index 04ef287480..15cd346551 100644 --- a/src/Gui/DlgPreferencePackManagement.ui +++ b/src/Gui/DlgPreferencePackManagement.ui @@ -35,7 +35,31 @@ 6 - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Open Addon Manager... + + + + + + QAbstractItemView::NoEditTriggers @@ -73,31 +97,7 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Open Addon Manager... - - - - - - + diff --git a/src/Gui/DlgPropertyLink.ui b/src/Gui/DlgPropertyLink.ui index 539d920607..c038f50c9f 100644 --- a/src/Gui/DlgPropertyLink.ui +++ b/src/Gui/DlgPropertyLink.ui @@ -14,52 +14,6 @@ Link - - - - - - Search - - - - - - - A search pattern to filter the results above - - - - - - - - - QAbstractItemView::ExtendedSelection - - - false - - - true - - - false - - - - 1 - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - @@ -105,7 +59,53 @@ - + + + + QAbstractItemView::ExtendedSelection + + + false + + + true + + + false + + + + 1 + + + + + + + + + + Search + + + + + + + A search pattern to filter the results above + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + diff --git a/src/Gui/DlgReportView.ui b/src/Gui/DlgReportView.ui index f4df7ee122..e2aef52db7 100644 --- a/src/Gui/DlgReportView.ui +++ b/src/Gui/DlgReportView.ui @@ -225,22 +225,6 @@ on-screen while displaying the log message 6 - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 40 - 20 - - - - @@ -492,7 +476,23 @@ on-screen while displaying the log message - + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 40 + 20 + + + + + diff --git a/src/Gui/DlgSettings3DView.ui b/src/Gui/DlgSettings3DView.ui index 6dadb4bf13..1827b942d6 100644 --- a/src/Gui/DlgSettings3DView.ui +++ b/src/Gui/DlgSettings3DView.ui @@ -588,7 +588,23 @@ bounding box size of the 3D object that is currently displayed. 6 - + + + + Objects will appear in a perspective projection + + + Perspective renderin&g + + + Perspective + + + View + + + + Objects will be projected in orthographic projection @@ -607,23 +623,7 @@ bounding box size of the 3D object that is currently displayed. - - - - Objects will appear in a perspective projection - - - Perspective renderin&g - - - Perspective - - - View - - - - + diff --git a/src/Gui/DlgSettingsColorGradient.ui b/src/Gui/DlgSettingsColorGradient.ui index b4e3cf8478..2f4ed4a12e 100644 --- a/src/Gui/DlgSettingsColorGradient.ui +++ b/src/Gui/DlgSettingsColorGradient.ui @@ -100,16 +100,6 @@ 6 - - - - &Zero - - - Alt+Z - - - @@ -123,7 +113,17 @@ - + + + + &Zero + + + Alt+Z + + + + @@ -191,22 +191,6 @@ 6 - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 35 - 20 - - - - @@ -224,11 +208,18 @@ 6 - - + + + + Ma&ximum: + + + floatLineEditMax + + - - + + @@ -240,17 +231,26 @@ - - - - Ma&ximum: - - - floatLineEditMax - - + + - + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 35 + 20 + + + @@ -269,19 +269,6 @@ 6 - - - - - - - 6 - - - 2 - - - @@ -292,6 +279,9 @@ + + + @@ -302,7 +292,17 @@ - + + + + 6 + + + 2 + + + + diff --git a/src/Gui/DlgSettingsLazyLoaded.ui b/src/Gui/DlgSettingsLazyLoaded.ui index b1272ae89c..66614d92b7 100644 --- a/src/Gui/DlgSettingsLazyLoaded.ui +++ b/src/Gui/DlgSettingsLazyLoaded.ui @@ -14,7 +14,29 @@ Available Workbenches - + + + + + 0 + 0 + + + + + 0 + 50 + + + + <html><head/><body><p>To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.</p><p>The following workbenches are available in your installation:</p></body></html> + + + true + + + + false @@ -47,29 +69,7 @@ - - - - - 0 - 0 - - - - - 0 - 50 - - - - <html><head/><body><p>To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.</p><p>The following workbenches are available in your installation:</p></body></html> - - - true - - - - + diff --git a/src/Gui/DlgSettingsMacro.ui b/src/Gui/DlgSettingsMacro.ui index d89bf02073..e4132a3c28 100644 --- a/src/Gui/DlgSettingsMacro.ui +++ b/src/Gui/DlgSettingsMacro.ui @@ -63,6 +63,108 @@ 6 + + + + Macro path + + + + 11 + + + 11 + + + 11 + + + 11 + + + 6 + + + + + The directory in which the application will search for macros + + + Gui::FileChooser::Directory + + + MacroPath + + + Macro + + + + + + + + + + Gui commands + + + + 11 + + + 11 + + + 11 + + + 11 + + + 6 + + + + + Recorded macros will also contain user interface commands + + + Record GUI commands + + + true + + + RecordGui + + + Macro + + + + + + + Recorded macros will also contain user interface commands as comments + + + Record as comment + + + true + + + GuiAsComment + + + Macro + + + + + + @@ -132,109 +234,7 @@ - - - - Gui commands - - - - 11 - - - 11 - - - 11 - - - 11 - - - 6 - - - - - Recorded macros will also contain user interface commands - - - Record GUI commands - - - true - - - RecordGui - - - Macro - - - - - - - Recorded macros will also contain user interface commands as comments - - - Record as comment - - - true - - - GuiAsComment - - - Macro - - - - - - - - - - Macro path - - - - 11 - - - 11 - - - 11 - - - 11 - - - 6 - - - - - The directory in which the application will search for macros - - - Gui::FileChooser::Directory - - - MacroPath - - - Macro - - - - - - - + diff --git a/src/Gui/DlgSettingsUnits.ui b/src/Gui/DlgSettingsUnits.ui index 6e2d48d86c..39e783252e 100644 --- a/src/Gui/DlgSettingsUnits.ui +++ b/src/Gui/DlgSettingsUnits.ui @@ -20,18 +20,23 @@ Units settings - - - - Qt::Vertical - - - - 20 - 79 - - - + + + + + + Unit system: + + + + + + + Unit system that should be used for all parts the application + + + + @@ -57,47 +62,6 @@ - - - - - - Unit system: - - - - - - - Unit system that should be used for all parts the application - - - - - - - - - - 0 - 0 - - - - QAbstractItemView::NoEditTriggers - - - - Magnitude - - - - - Unit - - - - @@ -151,7 +115,43 @@ - + + + + + 0 + 0 + + + + QAbstractItemView::NoEditTriggers + + + + Magnitude + + + + + Unit + + + + + + + + Qt::Vertical + + + + 20 + 79 + + + + + diff --git a/src/Gui/DlgSettingsViewColor.ui b/src/Gui/DlgSettingsViewColor.ui index 5d90f93e26..a6e28a6e25 100644 --- a/src/Gui/DlgSettingsViewColor.ui +++ b/src/Gui/DlgSettingsViewColor.ui @@ -50,19 +50,6 @@ 6 - - - - Qt::Horizontal - - - - 183 - 23 - - - - @@ -80,29 +67,6 @@ 6 - - - - false - - - - - - - 28 - 173 - 28 - - - - SelectionColor - - - View - - - @@ -176,9 +140,45 @@ - + + + + false + + + + + + + 28 + 173 + 28 + + + + SelectionColor + + + View + + + + - + + + + Qt::Horizontal + + + + 183 + 23 + + + + + @@ -205,19 +205,6 @@ 6 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -235,23 +222,29 @@ 6 - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - + + + - 171 - 20 + 240 + 0 - + + Background will have selected color + + + Simple color + + + Simple + + + View + + - + false @@ -283,71 +276,6 @@ - - - - Color gradient will get selected color as middle color - - - Middle color - - - UseBackgroundColorMid - - - View - - - - - - - Bottom color - - - - - - - 151 - 151 - 170 - - - - BackgroundColor3 - - - View - - - - - - - false - - - Middle color - - - - - - - 111 - 111 - 147 - - - - BackgroundColor4 - - - View - - - @@ -390,31 +318,103 @@ - - - + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + - 240 - 0 + 171 + 20 + + + + - Background will have selected color + Bottom color - Simple color + + + + + 151 + 151 + 170 + - Simple + BackgroundColor3 View - + + + + Color gradient will get selected color as middle color + + + Middle color + + + UseBackgroundColorMid + + + View + + + + + + + false + + + Middle color + + + + + + + 111 + 111 + 147 + + + + BackgroundColor4 + + + View + + + + - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -438,19 +438,6 @@ 6 - - - - Qt::Horizontal - - - - 183 - 23 - - - - @@ -545,7 +532,20 @@ - + + + + Qt::Horizontal + + + + 183 + 23 + + + + + diff --git a/src/Gui/DlgToolbars.ui b/src/Gui/DlgToolbars.ui index 98bae2db0f..13a8777974 100644 --- a/src/Gui/DlgToolbars.ui +++ b/src/Gui/DlgToolbars.ui @@ -23,154 +23,6 @@ 6 - - - - <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html> - - - - - - - true - - - - 30 - 30 - - - - Move right - - - <b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p> - - - - - - :/icons/button_right.svg - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 33 - 57 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 33 - 58 - - - - - - - - true - - - - 30 - 30 - - - - Move left - - - <b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p> - - - - - - :/icons/button_left.svg - - - true - - - false - - - - - - - true - - - - 30 - 30 - - - - Move down - - - <b>Move the selected item down.</b><p>The item will be moved within the hierarchy level.</p> - - - - - - :/icons/button_down.svg - - - true - - - - - - - true - - - - 30 - 30 - - - - Move up - - - <b>Move the selected item up.</b><p>The item will be moved within the hierarchy level.</p> - - - - - - :/icons/button_up.svg - - - @@ -191,6 +43,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 33 + 58 + + + + @@ -271,7 +139,139 @@ - + + + + true + + + + 30 + 30 + + + + Move right + + + <b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p> + + + + + + :/icons/button_right.svg + + + + + + + true + + + + 30 + 30 + + + + Move left + + + <b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p> + + + + + + :/icons/button_left.svg + + + true + + + false + + + + + + + true + + + + 30 + 30 + + + + Move up + + + <b>Move the selected item up.</b><p>The item will be moved within the hierarchy level.</p> + + + + + + :/icons/button_up.svg + + + + + + + true + + + + 30 + 30 + + + + Move down + + + <b>Move the selected item down.</b><p>The item will be moved within the hierarchy level.</p> + + + + + + :/icons/button_down.svg + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 33 + 57 + + + + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html> + + + + diff --git a/src/Gui/DlgWorkbenches.ui b/src/Gui/DlgWorkbenches.ui index 370a1e1fc1..9fc1d72982 100644 --- a/src/Gui/DlgWorkbenches.ui +++ b/src/Gui/DlgWorkbenches.ui @@ -20,42 +20,6 @@ 6 - - - - 6 - - - 0 - - - - - Enabled workbenches - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 33 - 57 - - - - @@ -76,24 +40,28 @@ - - - - Qt::Vertical + + + + 6 - - QSizePolicy::Expanding + + 0 - - - 33 - 57 - - - + + + + Enabled workbenches + + + + + + + - - + + true @@ -104,17 +72,101 @@ - Move down + Move right - <html><head/><body><p><span style=" font-weight:600;">Move the selected item down.</span></p><p>The item will be moved down</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Move the selected workbench to enabled workbenches.</span></p></body></html> - :/icons/button_down.svg:/icons/button_down.svg + :/icons/button_right.svg:/icons/button_right.svg + + + + + + + true + + + + 30 + 30 + + + + Move up + + + <html><head/><body><p><span style=" font-weight:600;">Move the selected item up.</span></p><p>The item will be moved up.</p></body></html> + + + + + + + :/icons/button_up.svg:/icons/button_up.svg + + + + + + + true + + + + 30 + 30 + + + + Add all to enabled workbenches + + + <html><head/><body><p><span style=" font-weight:600;">Remove the selected workbench from enabled workbenches</span></p></body></html> + + + + + + + :/icons/button_add_all.svg:/icons/button_add_all.svg + + + true + + + false + + + + + + + true + + + + 30 + 30 + + + + Sort enabled workbenches + + + <p>Sort enabled workbenches</p> + + + + + + + :/icons/button_sort.svg:/icons/button_sort.svg true @@ -153,8 +205,8 @@ - - + + true @@ -165,74 +217,54 @@ - Move right + Move down - <html><head/><body><p><span style=" font-weight:600;">Move the selected workbench to enabled workbenches.</span></p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Move the selected item down.</span></p><p>The item will be moved down</p></body></html> - :/icons/button_right.svg:/icons/button_right.svg - - - - - - - true - - - - 30 - 30 - - - - Sort enabled workbenches - - - <p>Sort enabled workbenches</p> - - - - - - - :/icons/button_sort.svg:/icons/button_sort.svg + :/icons/button_down.svg:/icons/button_down.svg true - - - - true + + + + Qt::Vertical - + + QSizePolicy::Expanding + + - 30 - 30 + 33 + 57 - - Move up + + + + + + Qt::Vertical - - <html><head/><body><p><span style=" font-weight:600;">Move the selected item up.</span></p><p>The item will be moved up.</p></body></html> + + QSizePolicy::Expanding - - + + + 33 + 57 + - - - :/icons/button_up.svg:/icons/button_up.svg - - + @@ -241,39 +273,7 @@ - - - - true - - - - 30 - 30 - - - - Add all to enabled workbenches - - - <html><head/><body><p><span style=" font-weight:600;">Remove the selected workbench from enabled workbenches</span></p></body></html> - - - - - - - :/icons/button_add_all.svg:/icons/button_add_all.svg - - - true - - - false - - - - + diff --git a/src/Gui/InputVector.ui b/src/Gui/InputVector.ui index 621c9eebb5..4119b203b4 100644 --- a/src/Gui/InputVector.ui +++ b/src/Gui/InputVector.ui @@ -26,16 +26,27 @@ 6 - - + + + + X: + + + + + -2147480000.000000000000000 2147480000.000000000000000 - - 1.000000000000000 + + + + + + Y: @@ -49,16 +60,6 @@ - - - - -2147480000.000000000000000 - - - 2147480000.000000000000000 - - - @@ -66,21 +67,20 @@ - - - - Y: + + + + -2147480000.000000000000000 + + + 2147480000.000000000000000 + + + 1.000000000000000 - - - - X: - - - - + diff --git a/src/Gui/Placement.ui b/src/Gui/Placement.ui index a8fc09cedd..6ae43e3261 100644 --- a/src/Gui/Placement.ui +++ b/src/Gui/Placement.ui @@ -41,45 +41,6 @@ 6 - - - - - 0 - 0 - - - - Axial: - - - - - - - - 0 - 0 - - - - Z: - - - - - - - - 0 - 0 - - - - Y: - - - @@ -96,12 +57,51 @@ + + + + + 0 + 0 + + + + Y: + + + + + + + + 0 + 0 + + + + Z: + + + + + + + + 0 + 0 + + + + Axial: + + + @@ -139,32 +139,6 @@ 6 - - - - - 0 - 0 - - - - Z: - - - - - - - - 0 - 0 - - - - Y: - - - @@ -181,9 +155,35 @@ + + + + + 0 + 0 + + + + Y: + + + + + + + + 0 + 0 + + + + Z: + + + @@ -225,7 +225,21 @@ 6 - + + + + + Rotation axis with angle + + + + + Euler angles (zy'x'') + + + + + 1 @@ -264,26 +278,6 @@ 6 - - - - - 0 - 0 - - - - Angle: - - - - - - - -1 - - - @@ -297,6 +291,26 @@ + + + + -1 + + + + + + + + 0 + 0 + + + + Angle: + + + @@ -338,32 +352,6 @@ 6 - - - - - 0 - 0 - - - - Pitch (around y-axis): - - - - - - - - 0 - 0 - - - - Roll (around x-axis): - - - @@ -384,6 +372,19 @@ + + + + + 0 + 0 + + + + Pitch (around y-axis): + + + @@ -391,6 +392,19 @@ + + + + + 0 + 0 + + + + Roll (around x-axis): + + + @@ -405,21 +419,7 @@ - - - - - Rotation axis with angle - - - - - Euler angles (zy'x'') - - - - - + diff --git a/src/Gui/TaskElementColors.ui b/src/Gui/TaskElementColors.ui index a2810bd741..08235f680d 100644 --- a/src/Gui/TaskElementColors.ui +++ b/src/Gui/TaskElementColors.ui @@ -32,22 +32,8 @@ - - - - Recompute after commit - - - - - - - Remove - - - @@ -55,13 +41,6 @@ - - - - Remove all - - - @@ -69,6 +48,20 @@ + + + + Remove + + + + + + + Remove all + + + @@ -78,6 +71,13 @@ + + + + Recompute after commit + + +