kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'main' into vp_texture_ext

Browse Source
This commit is contained in:
Chris Hennes
2024-06-17 10:48:45 -05:00
committed by GitHub
parent 3fd2f64639 173733750b
commit 101118fdde
317 changed files with 11167 additions and 21683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake
View File

@@ -21,6 +21,7 @@ macro(SetGlobalCompilerAndLinkerSettings)
if(MSVC)
# set default compiler settings
add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zm150 /bigobj")
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm150 /bigobj")
# set default libs

13
src/App/PropertyStandard.cpp
View File

@@ -2651,6 +2651,18 @@ PropertyMaterialList::~PropertyMaterialList() = default;
//**************************************************************************
// Base class implementer
void PropertyMaterialList::setValues(const std::vector<App::Material>& newValues)
{
if (!newValues.empty()) {
PropertyListsT<Material>::setValues(newValues);
}
else {
aboutToSetValue();
setSize(1);
hasSetValue();
}
}
PyObject* PropertyMaterialList::getPyObject()
{
Py::Tuple tuple(getSize());
@@ -3233,7 +3245,6 @@ void PropertyMaterialList::readString(Base::InputStream& str, std::string& value
str >> uCt;
std::vector<char> temp(uCt);
str.read(temp.data(), uCt);
value.assign(temp.data(), temp.size());
}

1
src/App/PropertyStandard.h
View File

@@ -1118,6 +1118,7 @@ public:
{
PropertyListsT<Material>::setValue(materials);
}
void setValues(const std::vector<App::Material>& newValues = std::vector<App::Material>()) override;
void setValue(const Material& mat);
void setValue(int index, const Material& mat);

36
src/Gui/CommandView.cpp
View File

@@ -926,7 +926,7 @@ void StdCmdToggleTransparency::activated(int iMsg)
if (!obj)
continue;
bool isGroup = dynamic_cast<App::Part*>(obj)
bool isGroup = dynamic_cast<App::Part*>(obj)
|| dynamic_cast<App::LinkGroup*>(obj)
|| dynamic_cast<App::DocumentObjectGroup*>(obj);
@@ -2605,9 +2605,9 @@ private:
bool prevSelectionEn;
public:
// Creates a selection handler used to implement the common behaviour of BoxZoom, BoxSelection and BoxElementSelection.
// Creates a selection handler used to implement the common behaviour of BoxZoom, BoxSelection and BoxElementSelection.
// Takes the viewer, a selection mode, a cursor, a function pointer to be called on success and a void pointer for user data to be passed to the given function.
// The selection handler class stores all necessary previous states, registers a event callback and starts the selection in the given mode.
// The selection handler class stores all necessary previous states, registers a event callback and starts the selection in the given mode.
// If there is still a selection handler active, this call will generate a message and returns.
static void Create(View3DInventorViewer* viewer, View3DInventorViewer::SelectionMode selectionMode,
const QCursor& cursor, FnCb doFunction= nullptr, void* ud=nullptr)
@@ -2637,8 +2637,8 @@ public:
return userData;
}
// Implements the event handler. In the normal case the provided function is called.
// Also supports aborting the selection mode by pressing (releasing) the Escape key.
// Implements the event handler. In the normal case the provided function is called.
// Also supports aborting the selection mode by pressing (releasing) the Escape key.
static void selectionCallback(void * ud, SoEventCallback * n)
{
auto selectionHandler = static_cast<SelectionCallbackHandler*>(ud);
@@ -3543,7 +3543,7 @@ StdTreePreSelection::StdTreePreSelection()
{
sGroup = "TreeView";
sMenuText = QT_TR_NOOP("Pre-selection");
sToolTipText = QT_TR_NOOP("Preselect the object in 3D view when mouse over the tree item");
sToolTipText = QT_TR_NOOP("Preselect the object in 3D view when hovering the cursor over the tree item");
sStatusTip = sToolTipText;
sWhatsThis = "Std_TreePreSelection";
sPixmap = "tree-pre-sel";
@@ -3708,7 +3708,7 @@ StdCmdDockOverlayAll::StdCmdDockOverlayAll()
void StdCmdDockOverlayAll::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleAll);
}
@@ -3733,7 +3733,7 @@ StdCmdDockOverlayTransparentAll::StdCmdDockOverlayTransparentAll()
void StdCmdDockOverlayTransparentAll::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleTransparentAll);
}
@@ -3757,7 +3757,7 @@ StdCmdDockOverlayToggle::StdCmdDockOverlayToggle()
void StdCmdDockOverlayToggle::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleActive);
}
@@ -3782,7 +3782,7 @@ StdCmdDockOverlayToggleTransparent::StdCmdDockOverlayToggleTransparent()
void StdCmdDockOverlayToggleTransparent::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleTransparent);
}
@@ -3801,13 +3801,13 @@ StdCmdDockOverlayToggleLeft::StdCmdDockOverlayToggleLeft()
sWhatsThis = "Std_DockOverlayToggleLeft";
sStatusTip = sToolTipText;
sAccel = "Ctrl+Left";
sPixmap = "qss:overlay/close.svg";
sPixmap = "qss:overlay/icons/close.svg";
eType = 0;
}
void StdCmdDockOverlayToggleLeft::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleLeft);
}
@@ -3826,13 +3826,13 @@ StdCmdDockOverlayToggleRight::StdCmdDockOverlayToggleRight()
sWhatsThis = "Std_DockOverlayToggleRight";
sStatusTip = sToolTipText;
sAccel = "Ctrl+Right";
sPixmap = "qss:overlay/close.svg";
sPixmap = "qss:overlay/icons/close.svg";
eType = 0;
}
void StdCmdDockOverlayToggleRight::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleRight);
}
@@ -3851,13 +3851,13 @@ StdCmdDockOverlayToggleTop::StdCmdDockOverlayToggleTop()
sWhatsThis = "Std_DockOverlayToggleTop";
sStatusTip = sToolTipText;
sAccel = "Ctrl+Up";
sPixmap = "qss:overlay/close.svg";
sPixmap = "qss:overlay/icons/close.svg";
eType = 0;
}
void StdCmdDockOverlayToggleTop::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleTop);
}
@@ -3876,13 +3876,13 @@ StdCmdDockOverlayToggleBottom::StdCmdDockOverlayToggleBottom()
sWhatsThis = "Std_DockOverlayToggleBottom";
sStatusTip = sToolTipText;
sAccel = "Ctrl+Down";
sPixmap = "qss:overlay/close.svg";
sPixmap = "qss:overlay/icons/close.svg";
eType = 0;
}
void StdCmdDockOverlayToggleBottom::activated(int iMsg)
{
Q_UNUSED(iMsg);
Q_UNUSED(iMsg);
OverlayManager::instance()->setOverlayMode(OverlayManager::OverlayMode::ToggleBottom);
}

2
src/Gui/DlgExpressionInput.cpp
View File

@@ -732,7 +732,7 @@ void DlgExpressionInput::updateVarSetInfo(bool checkExpr)
checkExpression(ui->expression->text());
ui->okBtn->setEnabled(true);
}
catch (Base::Exception& e) {
catch (Base::Exception&) {
ui->okBtn->setDisabled(true);
}
}

46
src/Gui/Icons/TreeItemInvisible.svg
View File

@@ -2,20 +2,20 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="TreeItemInvisible.svg">
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
sodipodi:docname="TreeItemInvisible.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2818">
<linearGradient
@@ -509,8 +509,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.5"
inkscape:cx="35.267952"
inkscape:cy="19.835481"
inkscape:cx="35.363636"
inkscape:cy="19.818182"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
@@ -522,19 +522,27 @@
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:object-nodes="true"
inkscape:window-width="1301"
inkscape:window-height="744"
inkscape:window-x="65"
inkscape:window-y="24"
inkscape:window-width="3840"
inkscape:window-height="2074"
inkscape:window-x="3840"
inkscape:window-y="49"
inkscape:window-maximized="1"
inkscape:snap-global="true">
inkscape:snap-global="true"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid3234"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingy="1"
spacingx="1"
units="px" />
</sodipodi:namedview>
<metadata
id="metadata2821">
@@ -587,7 +595,7 @@
style="opacity:0.8479996;fill:#ffffff;stroke:none;stroke-width:0.18025407;stroke-opacity:1" />
</g>
<rect
style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="opacity:1;fill:#666666;fill-opacity:1;stroke:#ffffff;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4909"
width="6.1190372"
height="59.347763"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

2
src/Gui/MainWindow.cpp
View File

@@ -2563,7 +2563,7 @@ void MainWindow::setWindowTitle(const QString& string)
}
// allow to disable version number
ParameterGrp::handle hGen = +App::GetApplication().GetParameterGroupByPath(
ParameterGrp::handle hGen = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/General");
bool showVersion = hGen->GetBool("ShowVersionInTitle", true);

109
src/Gui/OverlayManager.cpp
View File

@@ -78,7 +78,7 @@ static inline OverlayTabWidget *findTabWidget(QWidget *widget=nullptr, bool filt
widget = qApp->focusWidget();
for(auto w=widget; w; w=w->parentWidget()) {
auto tabWidget = qobject_cast<OverlayTabWidget*>(w);
if(tabWidget)
if(tabWidget)
return tabWidget;
auto proxy = qobject_cast<OverlayProxyWidget*>(w);
if(proxy)
@@ -95,7 +95,7 @@ public:
OverlayStyleSheet() {
handle = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/MainWindow");
update();
handle->Attach(this);
@@ -146,18 +146,18 @@ private:
if (overlayStyleSheet.isEmpty()) {
// User did not choose any stylesheet, we need to choose one based on main stylesheet
if (mainStyleSheet.contains(QStringLiteral("light"), Qt::CaseInsensitive)) {
overlayStyleSheet = QStringLiteral("overlay:Light-Outline.qss");
overlayStyleSheet = QStringLiteral("overlay:Light Theme + Dark Background.qss");
}
else {
// by default FreeCAD uses somewhat dark background for 3D View.
// if user has not explicitly selected light theme, the "Dark Outline" looks best
overlayStyleSheet = QStringLiteral("overlay:Dark-Outline.qss");
overlayStyleSheet = QStringLiteral("overlay:Dark Theme + Dark Background.qss");
}
}
else if (!overlayStyleSheet.isEmpty() && !QFile::exists(overlayStyleSheet)) {
// User did choose one of predefined stylesheets, we need to qualify it with namespace
overlayStyleSheet = QStringLiteral("overlay:%1").arg(overlayStyleSheet);
}
overlayStyleSheet = QStringLiteral("overlay:%1").arg(overlayStyleSheet);
}
return overlayStyleSheet;
}
@@ -177,70 +177,7 @@ private:
static const QString _default;
};
const QString OverlayStyleSheet::_default = QStringLiteral(
"* {alternate-background-color: rgba(250,250,250,120)}"
"QComboBox, QComboBox:editable, QComboBox:!editable, QLineEdit,"
"QTextEdit, QPlainTextEdit, QAbstractSpinBox, QDateEdit, QDateTimeEdit,"
"Gui--PropertyEditor--PropertyEditor QLabel "
"{background : palette(base);}"
"QScrollBar { background: rgba(0,0,0,10);}"
"QTabWidget::pane { background-color: transparent; border: transparent }"
"Gui--OverlayTabWidget { qproperty-effectColor: rgba(0,0,0,0) }"
"Gui--OverlayTabWidget::pane { background-color: rgba(250,250,250,80) }"
"QTabBar {border : none;}"
"QTabBar::tab {color: palette(text);"
"background-color: rgba(100,100,100,50);"
"padding: 5px}"
"QTabBar::tab:selected {background-color: rgba(250,250,250,80);}"
"QTabBar::tab:hover {background-color: rgba(250,250,250,200);}"
"QHeaderView { background:transparent }"
"QHeaderView::section {color: palette(text);"
"background-color: rgba(250,250,250,50);"
"border: 1px solid palette(dark);"
"padding: 2px}"
"QTreeView, QListView, QTableView {"
"background: rgb(250,250,250);"
"border: transparent;"
"selection-background-color: rgba(94, 144, 250, 0.7);}"
"QListView::item:selected, QTreeView::item:selected {"
"background-color: rgba(94, 144, 250, 0.7);}"
"Gui--PropertyEditor--PropertyEditor {"
"border: 1px solid palette(dark);"
"qproperty-groupTextColor: rgb(100, 100, 100);"
"qproperty-groupBackground: rgba(180, 180, 180, 0.7);}"
"QToolTip {background-color: rgba(250,250,250,180);}"
"Gui--TreeWidget QHeaderView:section {"
"height: 0px;"
"background-color: transparent;"
"padding: 0px;"
"border: transparent;}"
"Gui--CallTipsList::item { background-color: rgba(200,200,200,200);}"
"Gui--CallTipsList::item::selected { background-color: palette(highlight);}"
"QPushButton { background: rgba(250,250,250,80);padding: 2px 4px;}"
"QPushButton::hover { background: rgba(250,250,250,200);}"
"QPushButton::focus { background: rgba(250,250,250,255);}"
"QPushButton::pressed { background-color: #5e90fa;"
"border: 1px inset palette(dark) }"
"QPushButton::checked { background: rgba(100,100,100,100);"
"border: 1px inset palette(dark) }"
"QPushButton::checked:hover { background: rgba(150,150,150,200);"
"border: 1px inset palette(dark) }"
"Gui--OverlayToolButton { background: transparent; padding: 0px; border: none }"
"Gui--OverlayTitleBar,"
"Gui--OverlaySplitterHandle { background-color: rgba(200, 200, 200, 150); }"
"QWidget#ClippingScrollAreaContents, "
"QScrollArea#ClippingScrollArea { border: none; background-color: #a0e6e6e6; }"
"Gui--PropertyEditor--PropertyEditor > QWidget > QPushButton {text-align:left;padding-left:2px;}"
const QString OverlayStyleSheet::_default = QStringLiteral("overlay:Light Theme + Dark Background.qss"
);
// -----------------------------------------------------------
@@ -270,7 +207,7 @@ struct OverlayInfo {
if (hGrp == Param && Name && !tabWidget->isSaving()) {
// This will prevent saving settings which will mess up the
// just restored ones
tabWidget->restore(nullptr);
tabWidget->restore(nullptr);
OverlayManager::instance()->reload();
}
});
@@ -411,7 +348,7 @@ public:
,_overlayInfos({&_left,&_right,&_top,&_bottom})
,_actions({&_actOverlay,&_actFloat,&_actClose})
{
_Overlays = {OverlayTabWidget::_LeftOverlay,
_Overlays = {OverlayTabWidget::_LeftOverlay,
OverlayTabWidget::_RightOverlay,
OverlayTabWidget::_TopOverlay,
OverlayTabWidget::_BottomOverlay};
@@ -465,9 +402,9 @@ public:
void refreshIcons()
{
_actFloat.setIcon(BitmapFactory().pixmap("qss:overlay/float.svg"));
_actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/overlay.svg"));
_actClose.setIcon(BitmapFactory().pixmap("qss:overlay/close.svg"));
_actFloat.setIcon(BitmapFactory().pixmap("qss:overlay/icons/float.svg"));
_actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/icons/overlay.svg"));
_actClose.setIcon(BitmapFactory().pixmap("qss:overlay/icons/close.svg"));
for (OverlayTabWidget *tabWidget : _Overlays) {
tabWidget->refreshIcons();
for (auto handle : tabWidget->findChildren<OverlaySplitterHandle*>())
@@ -610,7 +547,7 @@ public:
updateFocus = true;
else if(o->tabWidget == active)
updateActive = true;
else
else
o->tabWidget->setOverlayMode(true);
}
if(!o->tabWidget->getRevealTime().isNull()) {
@@ -628,12 +565,12 @@ public:
focus->raise();
if(reveal == focus)
reveal = nullptr;
} else
} else
focus->updateSplitterHandles();
}
if(active) {
if(active != focus && (active->isOverlaid(OverlayTabWidget::QueryOption::TransparencyChanged) || updateActive))
if(active != focus && (active->isOverlaid(OverlayTabWidget::QueryOption::TransparencyChanged) || updateActive))
active->setOverlayMode(false);
active->raise();
if(reveal == active)
@@ -646,7 +583,7 @@ public:
}
for(auto o : _overlayInfos) {
if(o->tabWidget != focus
if(o->tabWidget != focus
&& o->tabWidget != active
&& o->tabWidget != reveal
&& o->tabWidget->count()
@@ -703,7 +640,7 @@ public:
_bottom.tabWidget->setRect(QRect(ofs.width(),h-rect.height(),bw,rect.height()));
if (_bottom.tabWidget->count()
&& _bottom.tabWidget->isVisible()
&& _bottom.tabWidget->isVisible()
&& _bottom.tabWidget->getState() <= OverlayTabWidget::State::Normal)
rectBottom = _bottom.tabWidget->getRect();
@@ -722,7 +659,7 @@ public:
_left.tabWidget->setRect(QRect(ofs.height(),ofs.width(),rect.width(),lh));
if (_left.tabWidget->count()
&& _left.tabWidget->isVisible()
&& _left.tabWidget->isVisible()
&& _left.tabWidget->getState() <= OverlayTabWidget::State::Normal)
rectLeft = _left.tabWidget->getRect();
@@ -742,7 +679,7 @@ public:
_right.tabWidget->setRect(QRect(w-rect.width(),ofs.width(),rect.width(),rh));
if (_right.tabWidget->count()
&& _right.tabWidget->isVisible()
&& _right.tabWidget->isVisible()
&& _right.tabWidget->getState() <= OverlayTabWidget::State::Normal)
rectRight = _right.tabWidget->getRect();
@@ -1030,7 +967,7 @@ public:
dock->show();
dock->setFloating(true);
refresh();
} else
} else
dock->setFloating(!dock->isFloating());
}
return;
@@ -1220,7 +1157,7 @@ public:
resizeOffset = -1;
++i;
}
else
else
rect.setHeight(size/2);
}
else if (pos.x() > pt.x() + size/2) {
@@ -1480,7 +1417,7 @@ public:
void unregisterDockWidget(const QString &name, OverlayTabWidget *widget) {
auto it = _dockWidgetNameMap.find(name);
if (it != _dockWidgetNameMap.end() && it->second == widget)
if (it != _dockWidgetNameMap.end() && it->second == widget)
_dockWidgetNameMap.erase(it);
}
@@ -2024,7 +1961,7 @@ void OverlayManager::Private::interceptEvent(QWidget *widget, QEvent *ev)
case QEvent::ContextMenu: {
auto ce = static_cast<QContextMenuEvent*>(ev);
lastIntercept = getChildAt(widget, ce->globalPos());
QContextMenuEvent contextMenuEvent(ce->reason(),
QContextMenuEvent contextMenuEvent(ce->reason(),
lastIntercept->mapFromGlobal(ce->globalPos()),
ce->globalPos());
QApplication::sendEvent(lastIntercept, &contextMenuEvent);

16
src/Gui/OverlayWidgets.cpp
View File

@@ -440,13 +440,13 @@ OverlayTabWidget::OverlayTabWidget(QWidget *parent, Qt::DockWidgetArea pos)
void OverlayTabWidget::refreshIcons()
{
actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/overlay.svg"));
actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/mode.svg"));
actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/taskshow.svg"));
actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/editshow.svg"));
actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/edithide.svg"));
actTransparent.setIcon(BitmapFactory().pixmap("qss:overlay/transparent.svg"));
QPixmap pxAutoHide = BitmapFactory().pixmap("qss:overlay/autohide.svg");
actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/icons/overlay.svg"));
actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode.svg"));
actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow.svg"));
actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow.svg"));
actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide.svg"));
actTransparent.setIcon(BitmapFactory().pixmap("qss:overlay/icons/transparent.svg"));
QPixmap pxAutoHide = BitmapFactory().pixmap("qss:overlay/icons/autohide.svg");
switch(dockArea) {
case Qt::LeftDockWidgetArea:
actAutoHide.setIcon(pxAutoHide);
@@ -2103,7 +2103,7 @@ OverlaySplitterHandle::OverlaySplitterHandle(Qt::Orientation orientation, QSplit
void OverlaySplitterHandle::refreshIcons()
{
actFloat.setIcon(BitmapFactory().pixmap("qss:overlay/float.svg"));
actFloat.setIcon(BitmapFactory().pixmap("qss:overlay/icons/float.svg"));
}
void OverlaySplitterHandle::onTimer()

9
src/Gui/PreferencePacks/CMakeLists.txt
View File

@@ -5,14 +5,9 @@ SET(PreferencePacks_Files
SET(PreferencePacks_Directories
"Classic"
"Dark"
"Darker"
"Dark modern"
"Dark behave"
"Dark contrast"
"ProDark"
"Light"
"Light modern"
"Light theme"
"Dark theme"
)
ADD_CUSTOM_TARGET(PreferencePacks_data ALL

96
src/Gui/PreferencePacks/Dark contrast/Dark contrast.cfg
View File

@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="4294967295"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#9b4de6</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4294967295"/>
<FCUInt Name="SketchVertexColor" Value="4294967295"/>
<FCUInt Name="EditedEdgeColor" Value="4294967295"/>
<FCUInt Name="EditedVertexColor" Value="4280680703"/>
<FCUInt Name="ConstructionColor" Value="746455039"/>
<FCUInt Name="ExternalColor" Value="3425924095"/>
<FCUInt Name="InvalidSketchColor" Value="4285333759"/>
<FCUInt Name="FullyConstrainedColor" Value="16711935"/>
<FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4287987967"/>
<FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="11206655"/>
<FCUInt Name="ConstrainedDimColor" Value="4278255615"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
<FCUInt Name="CursorTextColor" Value="1437270015"/>
<FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
<FCUInt Name="CreateLineColor" Value="3435973887"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="2088533247"/>
<FCUInt Name="BackgroundColor3" Value="1010580735"/>
<FCUInt Name="BackgroundColor4" Value="2088533247"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="3465640191"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Dark-contrast.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

97
src/Gui/PreferencePacks/Dark modern/Dark modern.cfg
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="4294967295"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#9b4de6</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4294967295"/>
<FCUInt Name="SketchVertexColor" Value="4294967295"/>
<FCUInt Name="EditedEdgeColor" Value="4294967295"/>
<FCUInt Name="EditedVertexColor" Value="4280680703"/>
<FCUInt Name="ConstructionColor" Value="746455039"/>
<FCUInt Name="ExternalColor" Value="3425924095"/>
<FCUInt Name="InvalidSketchColor" Value="4285333759"/>
<FCUInt Name="FullyConstrainedColor" Value="16711935"/>
<FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4287987967"/>
<FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="11206655"/>
<FCUInt Name="ConstrainedDimColor" Value="4278255615"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
<FCUInt Name="CursorTextColor" Value="1437270015"/>
<FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
<FCUInt Name="CreateLineColor" Value="3435973887"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="2088533247"/>
<FCUInt Name="BackgroundColor3" Value="1010580735"/>
<FCUInt Name="BackgroundColor4" Value="2088533247"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="3465640191"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Dark-modern.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Dark-Modern_overlay.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

188
src/Gui/PreferencePacks/Dark theme/Dark theme.cfg Normal file
View File

@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4059297279"/>
<FCUInt Name="SketchVertexColor" Value="4059297279"/>
<FCUInt Name="EditedEdgeColor" Value="4059297279"/>
<FCUInt Name="EditedVertexColor" Value="4199699199"/>
<FCUInt Name="ConstructionColor" Value="865792255"/>
<FCUInt Name="ExternalColor" Value="3428706559"/>
<FCUInt Name="InvalidSketchColor" Value="4252898559"/>
<FCUInt Name="FullyConstrainedColor" Value="1958221567"/>
<FCUInt Name="InternalAlignedGeoColor" Value="865792255"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2462511359"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2462511359"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4205291519"/>
<FCUInt Name="ConstrainedIcoColor" Value="4199699199"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="865792255"/>
<FCUInt Name="ConstrainedDimColor" Value="4199699199"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4252898559"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
<FCUInt Name="CursorTextColor" Value="2914369023"/>
<FCUInt Name="CursorCrosshairColor" Value="4059297279"/>
<FCUInt Name="CreateLineColor" Value="4059297279"/>
<FCBool Name="ShowRotationCenter" Value="1"/>
<FCBool Name="ShowNaviCube" Value="1"/>
<FCBool Name="ShowSelectionBoundingBox" Value="0"/>
<FCBool Name="UseAutoRotation" Value="1"/>
<FCBool Name="UseVBO" Value="1"/>
<FCInt Name="AntiAliasing" Value="4"/>
<FCInt Name="RenderCache" Value="0"/>
<FCInt Name="SegmentsPerGeometry" Value="100"/>
<FCFloat Name="BoundingBoxFontSize" Value="10.000000000000"/>
<FCFloat Name="ViewScalingFactor" Value="1.000000000000"/>
<FCBool Name="EnableBacklight" Value="1"/>
<FCBool Name="Gradient" Value="0"/>
<FCBool Name="RadialGradient" Value="0"/>
<FCBool Name="RandomColor" Value="0"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="UseBackgroundColorMid" Value="0"/>
<FCInt Name="BacklightIntensity" Value="70"/>
<FCInt Name="DefaultShapeTransparency" Value="0"/>
<FCBool Name="Simple" Value="1"/>
<FCUInt Name="AnnotationTextColor" Value="2914369023"/>
<FCUInt Name="BackgroundColor" Value="993737727"/>
<FCUInt Name="BackgroundColor2" Value="1482187775"/>
<FCUInt Name="BackgroundColor3" Value="741103615"/>
<FCUInt Name="BackgroundColor4" Value="623200767"/>
<FCUInt Name="BacklightColor" Value="4059297279"/>
<FCUInt Name="BoundingBoxColor" Value="4059297279"/>
<FCUInt Name="DefaultShapeColor" Value="1920565503"/>
<FCUInt Name="HighlightColor" Value="424507647"/>
<FCUInt Name="SelectionColor" Value="543173631"/>
<FCUInt Name="CbLabelColor" Value="2914369023"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
<FCInt Name="FontSize" Value="10"/>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="OpenGL">
<FCBool Name="UseSoftwareOpenGL" Value="0"/>
</FCParamGroup>
<FCParamGroup Name="Mod">
<FCParamGroup Name="Start">
<FCUInt Name="BackgroundColor1" Value="556083711"/>
<FCUInt Name="BackgroundTextColor" Value="4059297279"/>
<FCUInt Name="PageColor" Value="876232959"/>
<FCUInt Name="PageTextColor" Value="4059297279"/>
<FCUInt Name="BoxColor" Value="1230002175"/>
<FCUInt Name="LinkColor" Value="4252898303"/>
<FCUInt Name="BackgroundColor2" Value="4278222847"/>
</FCParamGroup>
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Measure">
<FCParamGroup Name="Appearance">
<FCBool Name="DefaultMirror" Value="0"/>
<FCFloat Name="DefaultDistFactor" Value="1.000000000000"/>
<FCInt Name="DefaultFontSize" Value="18"/>
<FCUInt Name="DefaultTextColor" Value="4177132287"/>
<FCUInt Name="DefaultLineColor" Value="4177132287"/>
<FCUInt Name="DefaultTextBackgroundColor" Value="556083711"/>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="TechDraw">
<FCParamGroup Name="Decorations">
<FCUInt Name="SectionColor" Value="255"/>
<FCUInt Name="CenterColor" Value="255"/>
<FCUInt Name="VertexColor" Value="255"/>
<FCUInt Name="HighlightColor" Value="255"/>
</FCParamGroup>
<FCParamGroup Name="Colors">
<FCBool Name="ClearFace" Value="1"/>
<FCUInt Name="Hatch" Value="255"/>
<FCUInt Name="Background" Value="556083711"/>
<FCUInt Name="PreSelectColor" Value="4240710143"/>
<FCUInt Name="HiddenColor" Value="255"/>
<FCUInt Name="SelectColor" Value="1958221567"/>
<FCUInt Name="NormalColor" Value="255"/>
<FCUInt Name="CutSurfaceColor" Value="3470056191"/>
<FCUInt Name="GeomHatch" Value="255"/>
<FCUInt Name="FaceColor" Value="4059297279"/>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="Path">
<FCUInt Name="DefaultNormalPathColor" Value="1086347263"/>
<FCUInt Name="DefaultRapidPathColor" Value="4199699199"/>
<FCUInt Name="DefaultPathMarkerColor" Value="1958221567"/>
<FCUInt Name="DefaultProbePathColor" Value="4240710143"/>
<FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
<FCUInt Name="DefaultBBoxSelectionColor" Value="582537215"/>
<FCUInt Name="DefaultBBoxNormalColor" Value="4059297279"/>
</FCParamGroup>
<FCParamGroup Name="Part">
<FCUInt Name="Dimensions3dColor" Value="4199699199"/>
<FCUInt Name="DimensionsAngularColor" Value="865792255"/>
<FCUInt Name="DimensionsDeltaColor" Value="314085375"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="1230002175"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#1864ab</FCText>
<FCText Name="TextColor">#f8f9fa</FCText>
<FCText Name="PositiveNumberColor">#f8f9fa</FCText>
<FCText Name="NegativeNumberColor">#f8f9fa</FCText>
</FCParamGroup>
<FCParamGroup Name="Sketcher">
<FCParamGroup Name="General">
<FCUInt Name="GridLineColor" Value="1230002175"/>
<FCUInt Name="GridDivLineColor" Value="1230002175"/>
<FCInt Name="GridDivLinePattern" Value="65535"/>
<FCInt Name="GridLinePattern" Value="43690"/>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="556083711"/>
<FCInt Name="ItemBackgroundPadding" Value="11"/>
<FCInt Name="FontSize" Value="11"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Dark theme.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Dark Theme + Dark Background.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

97
src/Gui/PreferencePacks/Dark/Dark.cfg
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="4294967295"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#9b4de6</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4294967295"/>
<FCUInt Name="SketchVertexColor" Value="4294967295"/>
<FCUInt Name="EditedEdgeColor" Value="4294967295"/>
<FCUInt Name="EditedVertexColor" Value="4280680703"/>
<FCUInt Name="ConstructionColor" Value="746455039"/>
<FCUInt Name="ExternalColor" Value="3425924095"/>
<FCUInt Name="InvalidSketchColor" Value="4285333759"/>
<FCUInt Name="FullyConstrainedColor" Value="16711935"/>
<FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4287987967"/>
<FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="11206655"/>
<FCUInt Name="ConstrainedDimColor" Value="4278255615"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
<FCUInt Name="CursorTextColor" Value="1437270015"/>
<FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
<FCUInt Name="CreateLineColor" Value="3435973887"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="2088533247"/>
<FCUInt Name="BackgroundColor3" Value="1010580735"/>
<FCUInt Name="BackgroundColor4" Value="2088533247"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="3465640191"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Dark.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Dark_overlay.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

97
src/Gui/PreferencePacks/Darker/Darker.cfg
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="4294967295"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#9b4de6</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4294967295"/>
<FCUInt Name="SketchVertexColor" Value="4294967295"/>
<FCUInt Name="EditedEdgeColor" Value="4294967295"/>
<FCUInt Name="EditedVertexColor" Value="4280680703"/>
<FCUInt Name="ConstructionColor" Value="746455039"/>
<FCUInt Name="ExternalColor" Value="3425924095"/>
<FCUInt Name="InvalidSketchColor" Value="4285333759"/>
<FCUInt Name="FullyConstrainedColor" Value="16711935"/>
<FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4287987967"/>
<FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="11206655"/>
<FCUInt Name="ConstrainedDimColor" Value="4278255615"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
<FCUInt Name="CursorTextColor" Value="1437270015"/>
<FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
<FCUInt Name="CreateLineColor" Value="3435973887"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="2088533247"/>
<FCUInt Name="BackgroundColor3" Value="1010580735"/>
<FCUInt Name="BackgroundColor4" Value="2088533247"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="3465640191"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Darker.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Darker_overlay.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

63
src/Gui/PreferencePacks/Light modern/Light modern.cfg
View File

@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#feff9e</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="1684301055"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="1010580735"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCBool Name="EnableBacklight" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="AnnotationTextColor" Value="3823363071"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="3284386815"/>
<FCUInt Name="BackgroundColor3" Value="4143380223"/>
<FCUInt Name="BackgroundColor4" Value="3284386815"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BoundingBoxColor" Value="4294967295"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="2327243263"/>
<FCUInt Name="TreeActiveColor" Value="3707830271"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Light-modern.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Light-Modern_overlay.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

217
src/Gui/PreferencePacks/Light theme/Light theme.cfg Normal file
View File

@@ -0,0 +1,217 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Start">
<FCUInt Name="BackgroundColor1" Value="2914369023"/>
<FCUInt Name="BackgroundTextColor" Value="556083711"/>
<FCUInt Name="PageColor" Value="4059297279"/>
<FCUInt Name="PageTextColor" Value="556083711"/>
<FCUInt Name="BoxColor" Value="3739412223"/>
<FCUInt Name="LinkColor" Value="995875839"/>
<FCUInt Name="BackgroundColor2" Value="4278255615"/>
<FCText Name="AutoloadModule">StartWorkbench</FCText>
</FCParamGroup>
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="2914369023"/>
<FCUInt Name="StructureColor" Value="2257491711"/>
<FCUInt Name="RebarColor" Value="4252898559"/>
<FCUInt Name="WindowColor" Value="876232959"/>
<FCUInt Name="WindowGlassColor" Value="363511807"/>
<FCUInt Name="PanelColor" Value="4120838399"/>
<FCUInt Name="ColorHelpers" Value="1230002175"/>
<FCUInt Name="defaultSpaceColor" Value="3761320447"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="2914369023"/>
<FCUInt Name="snapcolor" Value="556083711"/>
<FCUInt Name="color" Value="1920565248"/>
<FCUInt Name="DefaultAnnoLineColor" Value="556083711"/>
</FCParamGroup>
<FCParamGroup Name="TechDraw">
<FCParamGroup Name="Decorations">
<FCUInt Name="SectionColor" Value="556083711"/>
<FCUInt Name="CenterColor" Value="556083711"/>
<FCUInt Name="VertexColor" Value="556083711"/>
<FCUInt Name="HighlightColor" Value="556083711"/>
</FCParamGroup>
<FCParamGroup Name="Colors">
<FCUInt Name="Background" Value="3553874943"/>
<FCUInt Name="PreSelectColor" Value="4120838399"/>
<FCUInt Name="HiddenColor" Value="556083711"/>
<FCUInt Name="SelectColor" Value="1722290175"/>
<FCUInt Name="NormalColor" Value="556083711"/>
<FCUInt Name="CutSurfaceColor" Value="3470056191"/>
<FCUInt Name="FaceColor" Value="4059297279"/>
<FCUInt Name="gridColor" Value="556083711"/>
<FCUInt Name="PageColor" Value="4059297279"/>
<FCUInt Name="LightTextColor" Value="1230002175"/>
<FCUInt Name="TemplateUnderlineColor" Value="995875839"/>
</FCParamGroup>
<FCParamGroup Name="Dimensions">
<FCUInt Name="Color" Value="556083711"/>
</FCParamGroup>
<FCParamGroup Name="Markups">
<FCUInt Name="Color" Value="556083711"/>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="Path">
<FCUInt Name="DefaultNormalPathColor" Value="798901503"/>
<FCUInt Name="DefaultRapidPathColor" Value="3761320447"/>
<FCUInt Name="DefaultPathMarkerColor" Value="798901503"/>
<FCUInt Name="DefaultProbePathColor" Value="4205839871"/>
<FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
<FCUInt Name="DefaultBBoxSelectionColor" Value="210082303"/>
<FCUInt Name="DefaultBBoxNormalColor" Value="1230002175"/>
</FCParamGroup>
<FCParamGroup Name="Part">
<FCUInt Name="Dimensions3dColor" Value="3761320447"/>
<FCUInt Name="DimensionsAngularColor" Value="426885887"/>
<FCUInt Name="DimensionsDeltaColor" Value="210082303"/>
<FCFloat Name="MeshAngularDeflection" Value="6.400000000000"/>
</FCParamGroup>
<FCParamGroup Name="Measure">
<FCParamGroup Name="Appearance">
<FCBool Name="DefaultMirror" Value="0"/>
<FCFloat Name="DefaultDistFactor" Value="1.000000000000"/>
<FCInt Name="DefaultFontSize" Value="18"/>
<FCUInt Name="DefaultTextColor" Value="556083711"/>
<FCUInt Name="DefaultLineColor" Value="556083711"/>
<FCUInt Name="DefaultTextBackgroundColor" Value="4177132287"/>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="Mesh">
<FCUInt Name="MeshColor" Value="2914369023"/>
<FCUInt Name="LineColor" Value="255"/>
<FCUInt Name="BackfaceColor" Value="2914369023"/>
</FCParamGroup>
<FCParamGroup Name="Sketcher">
<FCParamGroup Name="General">
<FCUInt Name="GridLineColor" Value="3082800383"/>
<FCUInt Name="GridDivLineColor" Value="3082800383"/>
<FCInt Name="GridDivLinePattern" Value="65535"/>
<FCInt Name="GridLinePattern" Value="43690"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCInt Name="EdgeWidth" Value="3"/>
<FCInt Name="ConstructionWidth" Value="2"/>
<FCInt Name="InternalWidth" Value="2"/>
<FCInt Name="ExternalWidth" Value="2"/>
<FCInt Name="EdgePattern" Value="65535"/>
<FCInt Name="ConstructionPattern" Value="64764"/>
<FCInt Name="InternalPattern" Value="61166"/>
<FCInt Name="ExternalPattern" Value="58596"/>
</FCParamGroup>
<FCBool Name="AutoRemoveRedundants" Value="1"/>
</FCParamGroup>
<FCParamGroup Name="PartDesign">
<FCBool Name="RefineModel" Value="1"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#bac8ff</FCText>
<FCText Name="TextColor">#212529</FCText>
<FCText Name="PositiveNumberColor">#212529</FCText>
<FCText Name="NegativeNumberColor">#212529</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="556083711"/>
<FCUInt Name="SketchVertexColor" Value="556083711"/>
<FCUInt Name="EditedEdgeColor" Value="1230002175"/>
<FCUInt Name="EditedVertexColor" Value="556083711"/>
<FCUInt Name="ConstructionColor" Value="995875839"/>
<FCUInt Name="ExternalColor" Value="2923350527"/>
<FCUInt Name="InvalidSketchColor" Value="4252898559"/>
<FCUInt Name="FullyConstrainedColor" Value="798901503"/>
<FCUInt Name="InternalAlignedGeoColor" Value="995875839"/>
<FCUInt Name="FullyConstraintElementColor" Value="798901503"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2443706367"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2443706367"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="730480383"/>
<FCUInt Name="ConstrainedIcoColor" Value="3761320447"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="2257491711"/>
<FCUInt Name="ConstrainedDimColor" Value="3761320447"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="3761320447"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
<FCUInt Name="CursorTextColor" Value="556083711"/>
<FCUInt Name="CursorCrosshairColor" Value="556083711"/>
<FCUInt Name="CreateLineColor" Value="556083711"/>
<FCUInt Name="AnnotationTextColor" Value="876232959"/>
<FCBool Name="UseBackgroundColorMid" Value="0"/>
<FCUInt Name="BackgroundColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor2" Value="3671783167"/>
<FCUInt Name="BackgroundColor3" Value="791639295"/>
<FCUInt Name="BackgroundColor4" Value="3470056191"/>
<FCUInt Name="BacklightColor" Value="4059297279"/>
<FCUInt Name="BoundingBoxColor" Value="1230002175"/>
<FCUInt Name="DefaultShapeColor" Value="2914369023"/>
<FCUInt Name="HighlightColor" Value="1553296639"/>
<FCUInt Name="SelectionColor" Value="1401005823"/>
<FCUInt Name="CbLabelColor" Value="556083711"/>
<FCUInt Name="DefaultShapeLineColor" Value="421075455"/>
<FCUInt Name="DefaultShapeVertexColor" Value="421075455"/>
<FCUInt Name="HeadlightColor" Value="4059297279"/>
<FCUInt Name="ShadowLightColor" Value="4043177728"/>
<FCUInt Name="ShadowGroundColor" Value="2105376000"/>
<FCUInt Name="HiddenLineFaceColor" Value="4294967040"/>
<FCUInt Name="HiddenLineBackground" Value="4294967040"/>
<FCBool Name="EnablePreselection" Value="1"/>
<FCBool Name="EnableSelection" Value="1"/>
<FCInt Name="AntiAliasing" Value="4"/>
<FCInt Name="TransparentObjectRenderType" Value="1"/>
<FCInt Name="MarkerSize" Value="7"/>
<FCBool Name="CornerCoordSystem" Value="0"/>
<FCBool Name="UseVBO" Value="1"/>
<FCBool Name="EnableBacklight" Value="1"/>
<FCBool Name="Simple" Value="1"/>
<FCBool Name="Gradient" Value="0"/>
<FCBool Name="RadialGradient" Value="0"/>
<FCInt Name="DefaultShapePointSize" Value="3"/>
<FCBool Name="CanAbortRecompute" Value="1"/>
<FCInt Name="SegmentsPerGeometry" Value="100"/>
<FCFloat Name="PickRadius" Value="16.000000000000"/>
<FCFloat Name="ViewScalingFactor" Value="0.640000000000"/>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="556083711"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
<FCBool Name="checkShowReportViewOnError" Value="0"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="556083456"/>
<FCUInt Name="Bookmark" Value="192054528"/>
<FCUInt Name="Breakpoint" Value="3374983680"/>
<FCUInt Name="Keyword" Value="911197952"/>
<FCUInt Name="Comment" Value="730480128"/>
<FCUInt Name="Block comment" Value="730480128"/>
<FCUInt Name="Number" Value="1230001920"/>
<FCUInt Name="String" Value="730480128"/>
<FCUInt Name="Character" Value="3374983680"/>
<FCUInt Name="Class name" Value="2251201536"/>
<FCUInt Name="Define name" Value="2251201536"/>
<FCUInt Name="Operator" Value="1230001920"/>
<FCUInt Name="Python output" Value="3645378304"/>
<FCUInt Name="Python error" Value="2787003648"/>
<FCUInt Name="Current line highlight" Value="3505127168"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="563609599"/>
<FCUInt Name="TreeActiveColor" Value="1538528255"/>
<FCBool Name="PreSelection" Value="1"/>
</FCParamGroup>
<FCParamGroup Name="NaviCube">
<FCUInt Name="BaseColor" Value="3505127423"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCText Name="StyleSheet">Light theme.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Light Theme + Light Background.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

63
src/Gui/PreferencePacks/Light/Light.cfg
View File

@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#feff9e</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="1684301055"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="1010580735"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCBool Name="EnableBacklight" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="AnnotationTextColor" Value="3823363071"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="3284386815"/>
<FCUInt Name="BackgroundColor3" Value="4143380223"/>
<FCUInt Name="BackgroundColor4" Value="3284386815"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BoundingBoxColor" Value="4294967295"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="2327243263"/>
<FCUInt Name="TreeActiveColor" Value="3707830271"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">Light.qss</FCText>
<FCText Name="OverlayActiveStyleSheet">Light_overlay.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

96
src/Gui/PreferencePacks/ProDark/ProDark.cfg
View File

@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FCParameters>
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Mod">
<FCParamGroup Name="Arch">
<FCUInt Name="WallColor" Value="3604403967"/>
<FCUInt Name="StructureColor" Value="2527705855"/>
<FCUInt Name="RebarColor" Value="3111475967"/>
<FCUInt Name="WindowColor" Value="556614399"/>
<FCUInt Name="WindowGlassColor" Value="1572326399"/>
<FCUInt Name="PanelColor" Value="3416289279"/>
<FCUInt Name="ColorHelpers" Value="1347440895"/>
<FCUInt Name="defaultSpaceColor" Value="4280090879"/>
</FCParamGroup>
<FCParamGroup Name="Draft">
<FCInt Name="gridTransparency" Value="0"/>
<FCUInt Name="constructioncolor" Value="746455039"/>
<FCUInt Name="gridColor" Value="4294967295"/>
<FCUInt Name="snapcolor" Value="4294967295"/>
</FCParamGroup>
<FCParamGroup Name="Spreadsheet">
<FCText Name="AliasedCellBackgroundColor">#9b4de6</FCText>
</FCParamGroup>
</FCParamGroup>
<FCParamGroup Name="OutputWindow">
<FCUInt Name="colorText" Value="3570717951"/>
<FCUInt Name="colorLogging" Value="1437270015"/>
<FCUInt Name="colorWarning" Value="4252787455"/>
<FCUInt Name="colorError" Value="4278190335"/>
</FCParamGroup>
<FCParamGroup Name="Editor">
<FCUInt Name="Text" Value="3570717696"/>
<FCUInt Name="Bookmark" Value="16776960"/>
<FCUInt Name="Breakpoint" Value="4278190080"/>
<FCUInt Name="Keyword" Value="1453118976"/>
<FCUInt Name="Comment" Value="1788433664"/>
<FCUInt Name="Block comment" Value="3465639936"/>
<FCUInt Name="Number" Value="3050219520"/>
<FCUInt Name="String" Value="3465639936"/>
<FCUInt Name="Character" Value="4278190080"/>
<FCUInt Name="Class name" Value="1321840640"/>
<FCUInt Name="Define name" Value="3705448960"/>
<FCUInt Name="Operator" Value="3570717696"/>
<FCUInt Name="Python output" Value="2863300352"/>
<FCUInt Name="Python error" Value="4252787200"/>
<FCUInt Name="Current line highlight" Value="524114944"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4294967295"/>
<FCUInt Name="SketchVertexColor" Value="4294967295"/>
<FCUInt Name="EditedEdgeColor" Value="4294967295"/>
<FCUInt Name="EditedVertexColor" Value="4280680703"/>
<FCUInt Name="ConstructionColor" Value="746455039"/>
<FCUInt Name="ExternalColor" Value="3425924095"/>
<FCUInt Name="InvalidSketchColor" Value="4285333759"/>
<FCUInt Name="FullyConstrainedColor" Value="16711935"/>
<FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
<FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
<FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
<FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
<FCUInt Name="FullyConstraintConstructionPointColor" Value="4287987967"/>
<FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="11206655"/>
<FCUInt Name="ConstrainedDimColor" Value="4278255615"/>
<FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
<FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
<FCUInt Name="CursorTextColor" Value="1437270015"/>
<FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
<FCUInt Name="CreateLineColor" Value="3435973887"/>
<FCBool Name="Simple" Value="0"/>
<FCBool Name="Gradient" Value="1"/>
<FCBool Name="RadialGradient" Value="1"/>
<FCBool Name="UseBackgroundColorMid" Value="1"/>
<FCUInt Name="BacklightColor" Value="4294967295"/>
<FCUInt Name="BackgroundColor" Value="1010580735"/>
<FCUInt Name="BackgroundColor2" Value="2088533247"/>
<FCUInt Name="BackgroundColor3" Value="1010580735"/>
<FCUInt Name="BackgroundColor4" Value="2088533247"/>
<FCUInt Name="HighlightColor" Value="327679"/>
<FCUInt Name="SelectionColor" Value="16711935"/>
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="1434171135"/>
<FCUInt Name="TreeActiveColor" Value="3465640191"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
<FCText Name="StyleSheet">ProDark.qss</FCText>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParamGroup>
</FCParameters>

80
src/Gui/PreferencePacks/package.xml
View File

@@ -18,49 +18,23 @@
<tag>no stylesheet</tag>
<tag>classic theme</tag>
</preferencepack>
<preferencepack>
<name>Dark</name>
<preferencepack>
<name>Light theme</name>
<type>Theme</type>
<description>Applies a dark background and a darker stylesheet.</description>
<version>0.5.0</version>
<description>Applies a basic light theme.</description>
<version>0.1.0</version>
<tag>built-in</tag>
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
<tag>light</tag>
</preferencepack>
<preferencepack>
<name>Darker</name>
<preferencepack>
<name>Dark theme</name>
<type>Theme</type>
<description>Applies a dark background and a darker stylesheet.</description>
<version>0.5.0</version>
<description>Applies a basic dark theme.</description>
<version>1.0.0</version>
<tag>built-in</tag>
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
<preferencepack>
<name>Dark modern</name>
<type>Theme</type>
<description>Applies a dark background and a darker stylesheet.</description>
<version>0.5.0</version>
<tag>built-in</tag>
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
<preferencepack>
<name>ProDark</name>
<type>Theme</type>
<description>Applies a dark background and a darker stylesheet.</description>
<version>0.5.0</version>
<tag>built-in</tag>
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
<tag>dark</tag>
</preferencepack>
<preferencepack>
<name>Dark behave</name>
@@ -71,40 +45,6 @@
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
<preferencepack>
<name>Dark contrast</name>
<type>Theme</type>
<description>Dark theme with high contrasts.</description>
<version>0.5.0</version>
<tag>built-in</tag>
<tag>dark</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
<preferencepack>
<name>Light</name>
<type>Theme</type>
<description>Applies a light background and a light stylesheet.</description>
<version>0.5.0</version>
<tag>built-in</tag>
<tag>light</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
<preferencepack>
<name>Light modern</name>
<type>Theme</type>
<description>Applies a light background and a light stylesheet.</description>
<version>0.5.0</version>
<tag>built-in</tag>
<tag>light</tag>
<tag>background</tag>
<tag>stylesheet</tag>
<tag>theme</tag>
</preferencepack>
</content>

2
src/Gui/PreferencePages/DlgSettingsSelection.ui
View File

@@ -202,7 +202,7 @@ Larger value eases to pick things, but can make small features impossible to sel
<item row="5" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="checkBoxPreselect">
<property name="text">
<string>Preselect the object in 3D view when mouse over the tree item</string>
<string>Preselect the object in 3D view when hovering the cursor over the tree item</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>PreSelection</cstring>

64
src/Gui/PythonWrapper.cpp
View File

@@ -583,39 +583,59 @@ QObject* PythonWrapper::toQObject(const Py::Object& pyobject)
return qt_getCppType<QObject>(pyobject.ptr());
}
qsizetype PythonWrapper::tryEnum(PyObject* pyPtr)
{
if (PyObject* number = PyNumber_Long(pyPtr)) {
Py::Long longObj(number, true);
return longObj.as_long();
}
// if PyNumber_Long failed then an exception is set
PyErr_Clear();
Py::Object object(pyPtr);
if (object.hasAttr(std::string("value"))) {
Py::Long longObj(object.getAttr(std::string("value")));
return longObj.as_long();
}
return 0;
}
qsizetype PythonWrapper::toEnum(PyObject* pyPtr)
{
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
if (PyLong_Check(pyPtr)) {
return PyLong_AsLong(pyPtr);
try {
return tryEnum(pyPtr);
}
catch (Py::Exception&) {
Base::PyException e;
e.ReportException();
return 0;
}
return Shiboken::Enum::getValue(pyPtr);
#else
return toEnum(Py::Object(pyPtr));
#endif
}
qsizetype PythonWrapper::toEnum(const Py::Object& pyobject)
{
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
return toEnum(pyobject.ptr());
#else
}
Py::Object PythonWrapper::tryToStandardButton(qsizetype value)
{
std::stringstream cmd;
cmd << "from PySide import QtWidgets\n";
cmd << "btn = QtWidgets.QDialogButtonBox.StandardButton(" << value << ")";
return Py::asObject(Base::Interpreter().getValue(cmd.str().c_str(), "btn"));
}
Py::Object PythonWrapper::toStandardButton(qsizetype value)
{
try {
qsizetype ret {};
if (pyobject.hasAttr(std::string("value"))) {
ret = Py::Int(pyobject.getAttr(std::string("value")));
}
else {
ret = Py::Int(pyobject);
}
return ret;
return tryToStandardButton(value);
}
catch (Py::Exception&) {
Base::PyException e; // extract the Python error text
e.ReportException();
return 0;
catch (Py::Exception& e) {
e.clear();
return Py::Long(value);
}
#endif
}
QGraphicsItem* PythonWrapper::toQGraphicsItem(PyObject* pyPtr)

5
src/Gui/PythonWrapper.h
View File

@@ -56,6 +56,7 @@ public:
QObject* toQObject(const Py::Object&);
qsizetype toEnum(PyObject* pyPtr);
qsizetype toEnum(const Py::Object& pyobject);
Py::Object toStandardButton(qsizetype);
QGraphicsItem* toQGraphicsItem(PyObject* ptr);
QGraphicsItem* toQGraphicsItem(const Py::Object& pyObject);
QGraphicsObject* toQGraphicsObject(PyObject* pyPtr);
@@ -79,6 +80,10 @@ public:
QDir* toQDir(PyObject* pyobj);
static void createChildrenNameAttributes(PyObject* root, QObject* object);
static void setParent(PyObject* pyWdg, QObject* parent);
private:
qsizetype tryEnum(PyObject* pyPtr);
Py::Object tryToStandardButton(qsizetype value);
};
} // namespace Gui

141
src/Gui/SelectionView.cpp
View File

@@ -119,12 +119,16 @@ void SelectionView::leaveEvent(QEvent *)
}
/// @cond DOXERR
void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
void SelectionView::onSelectionChanged(const SelectionChanges& Reason)
{
ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("Preferences")->GetGroup("Selection");
ParameterGrp::handle hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Selection");
bool autoShow = hGrp->GetBool("AutoShowSelectionView", false);
hGrp->SetBool("AutoShowSelectionView", autoShow); // Remove this line once the preferences window item is implemented
hGrp->SetBool("AutoShowSelectionView",
autoShow); // Remove this line once the preferences window item is implemented
if (autoShow) {
if (!parentWidget()->isVisible() && Selection().hasSelection()) {
@@ -139,90 +143,93 @@ void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
QString selObject;
QTextStream str(&selObject);
auto getSelectionName = [](QTextStream& str,
const char* docName,
const char* objName,
const char* subName,
App::DocumentObject* obj) {
str << docName;
str << "#";
str << objName;
if (subName != 0 && subName[0] != 0) {
str << ".";
/* Original code doesn't take account of histories in subelement names and displays
* them inadvertently. Let's not do that.
str << subName;
*/
/* Remove the history from the displayed subelement name */
std::pair<std::string, std::string> elementName;
App::GeoFeature::resolveElement(obj, subName, elementName);
str << elementName.second.c_str(); // Use the shortened element name not the full one.
/* Mark it visually if there was a history as a "tell" for if a given selection has TNP
* fixes in it. */
if (elementName.first.size() > 0) {
str << " []";
}
auto subObj = obj->getSubObject(subName);
if (subObj) {
obj = subObj;
}
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
};
if (Reason.Type == SelectionChanges::AddSelection) {
// save as user data
QStringList list;
list << QString::fromLatin1(Reason.pDocName);
list << QString::fromLatin1(Reason.pObjectName);
// insert the selection as item
str << Reason.pDocName;
str << "#";
str << Reason.pObjectName;
App::Document* doc = App::GetApplication().getDocument(Reason.pDocName);
App::DocumentObject* obj = doc->getObject(Reason.pObjectName);
if (Reason.pSubName[0] != 0 ) {
str << ".";
str << Reason.pSubName;
auto subObj = obj->getSubObject(Reason.pSubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, Reason.pDocName, Reason.pObjectName, Reason.pSubName, obj);
// insert the selection as item
QListWidgetItem* item = new QListWidgetItem(selObject, selectionView);
item->setData(Qt::UserRole, list);
}
else if (Reason.Type == SelectionChanges::ClrSelection) {
if(!Reason.pDocName[0]) {
if (!Reason.pDocName[0]) {
// remove all items
selectionView->clear();
}else{
}
else {
// build name
str << Reason.pDocName;
str << "#";
// remove all items
const auto items = selectionView->findItems(selObject,Qt::MatchStartsWith);
for(auto item : items)
const auto items = selectionView->findItems(selObject, Qt::MatchStartsWith);
for (auto item : items) {
delete item;
}
}
}
else if (Reason.Type == SelectionChanges::RmvSelection) {
// build name
str << Reason.pDocName;
str << "#";
str << Reason.pObjectName;
if (Reason.pSubName[0] != 0) {
str << ".";
str << Reason.pSubName;
}
str << " (";
App::Document* doc = App::GetApplication().getDocument(Reason.pDocName);
App::DocumentObject* obj = doc->getObject(Reason.pObjectName);
getSelectionName(str, Reason.pDocName, Reason.pObjectName, Reason.pSubName, obj);
// remove all items
QList<QListWidgetItem *> l = selectionView->findItems(selObject,Qt::MatchStartsWith);
if (l.size() == 1)
QList<QListWidgetItem*> l = selectionView->findItems(selObject, Qt::MatchStartsWith);
if (l.size() == 1) {
delete l[0];
}
}
else if (Reason.Type == SelectionChanges::SetSelection) {
// remove all items
selectionView->clear();
std::vector<SelectionSingleton::SelObj> objs = Gui::Selection().getSelection(Reason.pDocName, ResolveMode::NoResolve);
for (const auto & it : objs) {
std::vector<SelectionSingleton::SelObj> objs =
Gui::Selection().getSelection(Reason.pDocName, ResolveMode::NoResolve);
for (const auto& it : objs) {
// save as user data
QStringList list;
list << QString::fromLatin1(it.DocName);
list << QString::fromLatin1(it.FeatName);
// build name
str << it.DocName;
str << "#";
str << it.FeatName;
App::Document* doc = App::GetApplication().getDocument(it.DocName);
App::DocumentObject* obj = doc->getObject(it.FeatName);
if (it.SubName && it.SubName[0] != '\0') {
str << ".";
str << it.SubName;
auto subObj = obj->getSubObject(Reason.pSubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, it.DocName, it.FeatName, it.SubName, obj);
QListWidgetItem* item = new QListWidgetItem(selObject, selectionView);
item->setData(Qt::UserRole, list);
selObject.clear();
@@ -233,29 +240,21 @@ void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
enablePickList->setChecked(picking);
pickList->setVisible(picking);
pickList->clear();
if(picking) {
const auto &sels = Selection().getPickedList(Reason.pDocName);
for(const auto &sel : sels) {
if (picking) {
const auto& sels = Selection().getPickedList(Reason.pDocName);
for (const auto& sel : sels) {
App::Document* doc = App::GetApplication().getDocument(sel.DocName);
if(!doc) continue;
if (!doc) {
continue;
}
App::DocumentObject* obj = doc->getObject(sel.FeatName);
if(!obj) continue;
if (!obj) {
continue;
}
QString selObject;
QTextStream str(&selObject);
str << sel.DocName;
str << "#";
str << sel.FeatName;
if (sel.SubName[0] != 0 ) {
str << ".";
str << sel.SubName;
auto subObj = obj->getSubObject(sel.SubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, sel.DocName, sel.FeatName, sel.SubName, obj);
this->x = sel.x;
this->y = sel.y;

2
src/Gui/SoDatumLabel.cpp
View File

@@ -1496,7 +1496,7 @@ void SoDatumLabel::drawArcLength(const SbVec3f* points, float& angle, SbVec3f& t
float startangle = atan2f(vc1[1], vc1[0]);
float endangle = atan2f(vc2[1], vc2[0]);
if (endangle < startangle) {
endangle += 2. * M_PI;
endangle += 2. * (float)M_PI;
}
float radius = vc1.length();

9
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -71,6 +71,7 @@
#endif
#include <App/Document.h>
#include <App/GeoFeature.h>
#include <App/ElementNamingUtils.h>
#include <Base/Tools.h>
#include <Base/UnitsApi.h>
@@ -396,8 +397,14 @@ void SoFCUnifiedSelection::doAction(SoAction *action)
if (vp && (useNewSelection.getValue()||vp->useNewSelectionModel()) && vp->isSelectable()) {
SoDetail *detail = nullptr;
detailPath->truncate(0);
auto subName = selaction->SelChange.pSubName;
#ifdef FC_USE_TNP_FIX
std::pair<std::string, std::string> elementName;
App::GeoFeature::resolveElement(obj,subName,elementName);
subName = elementName.second.c_str(); // Use the shortened element name not the full one.
#endif
if(!selaction->SelChange.pSubName || !selaction->SelChange.pSubName[0] ||
vp->getDetailPath(selaction->SelChange.pSubName,detailPath,true,detail))
vp->getDetailPath(subName,detailPath,true,detail))
{
SoSelectionElementAction::Type type = SoSelectionElementAction::None;
if (selaction->SelChange.Type == SelectionChanges::AddSelection) {

79
src/Gui/Stylesheets/CMakeLists.txt
View File

@@ -1,66 +1,45 @@
SET(Stylesheets_Files
"Behave-dark.qss"
"Dark.qss"
"Darker.qss"
"Light.qss"
"Dark-contrast.qss"
"ProDark.qss"
"Dark-modern.qss"
"Light-modern.qss"
"Dark theme.qss"
"Light theme.qss"
)
SET(Overlay_Stylesheets_Files
"overlay/Dark.qss"
"overlay/Default_Dark-theme_dark-background.qss"
"overlay/Default_Dark-theme_Light-background.qss"
"overlay/Default_Light-theme_dark-background.qss"
"overlay/Default_Light-theme_light-background.qss"
"overlay/Light.qss"
"overlay/Dark-Outline.qss"
"overlay/Light-Outline.qss"
"overlay/Darker_overlay.qss"
"overlay/Dark_overlay.qss"
"overlay/Dark-Modern_overlay.qss"
"overlay/Light-Modern_overlay.qss"
"overlay/Light_overlay.qss"
"overlay/close.svg"
"overlay/overlay.svg"
"overlay/float.svg"
"overlay/autohide.svg"
"overlay/editshow.svg"
"overlay/taskshow.svg"
"overlay/edithide.svg"
"overlay/mode.svg"
"overlay/transparent.svg"
"overlay/taskshow_light.svg"
"overlay/mode_lighter.svg"
"overlay/overlay_lighter.svg"
"overlay/close_lighter.svg"
"overlay/close_light.svg"
"overlay/float_lighter.svg"
"overlay/overlay_light.svg"
"overlay/mode_light.svg"
"overlay/transparent_light.svg"
"overlay/float_light.svg"
"overlay/transparent_lighter.svg"
"overlay/close_red.svg"
"overlay/Dark Theme + Dark Background.qss"
"overlay/Dark Theme + Light Background.qss"
"overlay/Light Theme + Dark Background.qss"
"overlay/Light Theme + Light Background.qss"
"overlay/DarkBehave_overlay.qss"
)
# Find all the image files
FILE(GLOB Images_Files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/images_dark-light/*.svg")
SOURCE_GROUP("images_dark-light" FILES ${Images_Files})
SOURCE_GROUP("Images_dark-light" FILES ${Images_Files})
FILE(GLOB Images_Files2 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/images_classic/*.png")
SOURCE_GROUP("images_classic" FILES ${Images_Files2})
FILE(GLOB Overlay_icons RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/overlay/icons/*.svg")
SOURCE_GROUP("overlay_icons" FILES ${Overlay_icons})
ADD_CUSTOM_TARGET(Stylesheets_data ALL
SOURCES ${Stylesheets_Files} ${Images_Files} ${Overlay_Stylesheets_Files}
SOURCES ${Stylesheets_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} ${Overlay_icons}
)
fc_copy_sources(Stylesheets_data "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets"
${Stylesheets_Files}
${Images_Files}
${Overlay_Stylesheets_Files})
${Images_Files2}
${Overlay_Stylesheets_Files}
${Overlay_icons})
INSTALL(
FILES
@@ -74,9 +53,21 @@ INSTALL(
DESTINATION
${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/overlay
)
INSTALL(
FILES
${Overlay_icons}
DESTINATION
${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/overlay/icons
)
INSTALL(
FILES
${Images_Files}
DESTINATION
${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/images_dark-light
)
INSTALL(
FILES
${Images_Files2}
DESTINATION
${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/images_classic
)

1281
src/Gui/Stylesheets/Darker.qss → src/Gui/Stylesheets/Dark theme.qss
View File

File diff suppressed because it is too large Load Diff

2369
src/Gui/Stylesheets/Dark-contrast.qss
View File

File diff suppressed because it is too large Load Diff

2742
src/Gui/Stylesheets/Dark-modern.qss
View File

File diff suppressed because it is too large Load Diff

1457
src/Gui/Stylesheets/Dark.qss → src/Gui/Stylesheets/Light theme.qss
View File

File diff suppressed because it is too large Load Diff

2692
src/Gui/Stylesheets/Light-modern.qss
View File

File diff suppressed because it is too large Load Diff

2674
src/Gui/Stylesheets/Light.qss
View File

File diff suppressed because it is too large Load Diff

2583
src/Gui/Stylesheets/ProDark.qss
View File

File diff suppressed because it is too large Load Diff

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1012 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 942 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1015 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 930 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 921 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-down-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 581 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-down-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 593 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 585 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 590 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-down-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 578 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-left-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-left-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 672 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 656 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-left-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 520 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-leftDown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 521 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-right-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 616 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-right-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 619 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 633 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-right-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 612 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 524 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 529 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 526 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 524 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 538 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-up-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 534 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-up-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 536 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

BIN
src/Gui/Stylesheets/images_classic/Arrow-up-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 534 B

BIN
src/Gui/Stylesheets/images_classic/Check-Checked-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 851 B

BIN
src/Gui/Stylesheets/images_classic/Check-Checked-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 864 B

BIN
src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 856 B

BIN
src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 859 B

BIN
src/Gui/Stylesheets/images_classic/Check-Checked-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 846 B

BIN
src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 B

BIN
src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 B

BIN
src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
src/Gui/Stylesheets/images_classic/Check-indeterminate-mark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 213 B

BIN
src/Gui/Stylesheets/images_classic/Close-DarkRed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 904 B

BIN
src/Gui/Stylesheets/images_classic/Close-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B

BIN
src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

BIN
src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 695 B

BIN
src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

BIN
src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

Some files were not shown because too many files have changed in this diff Show More