Compare commits

..

4 Commits

Author SHA1 Message Date
forbes
4bf74cf339 fix(build): fix DlgSettingsGeneral::applyMenuIconSize visibility and namespace
Some checks failed
Build and Test / build (pull_request) Has been cancelled
- Move applyMenuIconSize to public access so StartupProcess can call it
- Add Dialog:: namespace qualifier in StartupProcess.cpp
2026-02-08 17:04:41 -06:00
3b07a0f99b Merge pull request 'chore: update silo submodule with SSE, start panel, and activity pane' (#48) from chore/update-silo-submodule into main
Some checks failed
Build and Test / build (push) Has been cancelled
Reviewed-on: #48
2026-02-08 22:26:36 +00:00
forbes
9cabb29824 chore: update silo submodule to latest main
Some checks failed
Build and Test / build (pull_request) Has been cancelled
New features:
- SSE reconnect with exponential backoff and terminal state handling
- Silo_Diag connection diagnostics command
- Server mode UI reflection in client
- Silo-aware start panel
- Database Activity pane with comments, interaction, and badges
2026-02-08 16:25:59 -06:00
793e6bdd49 Merge pull request 'fix(gui): UI appearance polish - Wayland scaling, menu icon size pref, dialog cleanup' (#47) from fix/ui-appearance-polish into main
Some checks failed
Build and Test / build (push) Failing after 14m32s
Reviewed-on: #47
2026-02-08 21:37:03 +00:00
5 changed files with 47 additions and 115 deletions

View File

@@ -25,10 +25,6 @@
<FCUInt Name="colorLogging" Value="2497893887"/>
<FCUInt Name="colorWarning" Value="4192382975"/>
<FCUInt Name="colorError" Value="4086016255"/>
<FCBool Name="checkError" Value="1"/>
<FCBool Name="checkLogging" Value="1"/>
<FCBool Name="checkShowReportViewOnError" Value="1"/>
<FCBool Name="checkShowReportViewOnWarning" Value="1"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="BackgroundColor" Value="505294591"/>

View File

@@ -744,33 +744,6 @@ QGroupBox::title {
background-color: #1e1e2e;
}
QGroupBox::indicator {
width: 18px;
height: 18px;
border: 2px solid #585b70;
border-radius: 4px;
background-color: #313244;
}
QGroupBox::indicator:hover {
border-color: #cba6f7;
}
QGroupBox::indicator:checked {
background-color: #cba6f7;
border-color: #cba6f7;
}
QGroupBox::indicator:checked:disabled {
background-color: #6c7086;
border-color: #6c7086;
}
QGroupBox::indicator:disabled {
background-color: #181825;
border-color: #45475a;
}
/* =============================================================================
Tree View
============================================================================= */
@@ -988,11 +961,6 @@ QLabel:disabled {
color: #6c7086;
}
/* Link color — picked up by FreeCAD to set QPalette::Link */
QLabel[haslink="true"] {
color: #b4befe; /* Catppuccin Lavender */
}
/* =============================================================================
Frames
============================================================================= */

View File

@@ -744,33 +744,6 @@ QGroupBox::title {
background-color: #1e1e2e;
}
QGroupBox::indicator {
width: 18px;
height: 18px;
border: 2px solid #585b70;
border-radius: 4px;
background-color: #313244;
}
QGroupBox::indicator:hover {
border-color: #cba6f7;
}
QGroupBox::indicator:checked {
background-color: #cba6f7;
border-color: #cba6f7;
}
QGroupBox::indicator:checked:disabled {
background-color: #6c7086;
border-color: #6c7086;
}
QGroupBox::indicator:disabled {
background-color: #181825;
border-color: #45475a;
}
/* =============================================================================
Tree View
============================================================================= */
@@ -991,11 +964,6 @@ QLabel:disabled {
color: #6c7086;
}
/* Link color — picked up by FreeCAD to set QPalette::Link */
QLabel[haslink="true"] {
color: #b4befe; /* Catppuccin Lavender */
}
/* =============================================================================
Frames
============================================================================= */

View File

@@ -744,33 +744,6 @@ QGroupBox::title {
background-color: #1e1e2e;
}
QGroupBox::indicator {
width: 18px;
height: 18px;
border: 2px solid #585b70;
border-radius: 4px;
background-color: #313244;
}
QGroupBox::indicator:hover {
border-color: #cba6f7;
}
QGroupBox::indicator:checked {
background-color: #cba6f7;
border-color: #cba6f7;
}
QGroupBox::indicator:checked:disabled {
background-color: #6c7086;
border-color: #6c7086;
}
QGroupBox::indicator:disabled {
background-color: #181825;
border-color: #45475a;
}
/* =============================================================================
Tree View
============================================================================= */
@@ -1012,11 +985,6 @@ QLabel:disabled {
color: #6c7086;
}
/* Link color — picked up by FreeCAD to set QPalette::Link */
QLabel[haslink="true"] {
color: #b4befe; /* Catppuccin Lavender */
}
/* =============================================================================
Frames
============================================================================= */

View File

@@ -20,13 +20,34 @@
<string>Source</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="Gui::PrefRadioButton" name="radioButton_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Fetches the documentation from pages rendered on GitHub.
This is currently not available.</string>
</property>
<property name="text">
<string>GitHub (online)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>optionGithub</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Help</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="Gui::PrefRadioButton" name="radioOffline">
<property name="toolTip">
<string>Set this to a custom URL or the folder where the help files are located.
If this field is left blank, the application will automatically search for
the help files at the default location ($USERAPPDATADIR/Mod/offline-documentation).</string>
You can easily download the documentation for offline use by using the Addon
Manager and installing the &quot;offline-documentation&quot; addon. If this
field is left blank, FreeCAD will automatically search for the help files at
the default location ($USERAPPDATADIR/Mod/offline-documentation).</string>
</property>
<property name="text">
<string>Custom location</string>
@@ -63,8 +84,10 @@ to get French translation of the documentation.</string>
<widget class="Gui::PrefFileChooser" name="fileChooser">
<property name="toolTip">
<string>Set this to a custom URL or the folder where the help files are located.
If this field is left blank, the application will automatically search for
the help files at the default location ($USERAPPDATADIR/Mod/offline-documentation).</string>
Documentation can be downloaded for offline use via the Addon Manager and installing the
&quot;offline-documentation&quot; addon. If this field is left blank, FreeCAD will
automatically search for the help files at the default location
($USERAPPDATADIR/Mod/offline-documentation).</string>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
@@ -93,8 +116,8 @@ the help files at the default location ($USERAPPDATADIR/Mod/offline-documentatio
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioButton">
<property name="toolTip">
<string>The documentation pages will be fetched from the
FreeCAD wiki at https://wiki.freecad.org</string>
<string>The documentation pages will be fetched from the official
FreeCADwiki at https://wiki.freecad.org</string>
</property>
<property name="text">
<string>FreeCAD Wiki (online)</string>
@@ -114,9 +137,9 @@ FreeCAD wiki at https://wiki.freecad.org</string>
<widget class="Gui::PrefRadioButton" name="radioOnline">
<property name="toolTip">
<string>The documentation pages will be fetched from an automatic Markdown conversion
of the FreeCAD wiki. This can be styled with a custom stylesheet below and can
look nicer than the wiki option. The 'Markdown' or 'Pandoc' Python module should
be installed for optimal results.</string>
of the FreeCAD wiki,hosted on FreeCAD's GitHub account. This can be styled with a
custom stylesheet below and can look nicer than the wiki option. The 'Markdown' or
'Pandoc' Python module should be installed for optimal results.</string>
</property>
<property name="text">
<string>Markdown version (online)</string>
@@ -141,7 +164,16 @@ be installed for optimal results.</string>
<string>Display</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Note: if PySide Web components are not found on the system, help pages will open in the default web browser regardless of the options below.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefRadioButton" name="radioBrowser">
<property name="toolTip">
@@ -164,10 +196,10 @@ be installed for optimal results.</string>
<item>
<widget class="Gui::PrefRadioButton" name="radioTab">
<property name="toolTip">
<string>The documentation will open in a new tab inside the application. This requires the PySide QtWebEngineWidgets component.</string>
<string>The documentation will open in a new tab inside the FreeCAD interface. This requires the PySide QtWebengineWidgets component.</string>
</property>
<property name="text">
<string>In an application tab</string>
<string>In a FreeCAD tab</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -186,8 +218,8 @@ be installed for optimal results.</string>
<bool>true</bool>
</property>
<property name="toolTip">
<string>Documentation opens in a dockable dialog, allowing simultaneous work in the 3D view.
Requires the PySide QtWebEngineWidgets component.</string>
<string>Documentation opens in a dockable dialog within FreeCAD, allowing simultaneous work in the 3D view.
Requires the PySide QtWebengineWidgets component.</string>
</property>
<property name="text">
<string>In a separate, embeddable dialog</string>