diff --git a/.travis.yml b/.travis.yml index fab2ec052b..6347a0e33b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -258,7 +258,7 @@ before_install: # clcache stats before compilation cmd.exe /C 'C:\Users\travis\build\FreeCAD\FreeCAD\clcache.exe -s' - curl -L https://github.com/apeltauer/FreeCAD/releases/download/LibPack_12.1/FreeCADLibs_12.1.2_x64_VC15.7z --output FreeCADLibs.7z + curl -L https://github.com/FreeCAD/FreeCAD/releases/download/0.19_pre/FreeCADLibs_12.1.4_x64_VC15.7z --output FreeCADLibs.7z 7z x FreeCADLibs.7z -oFreeCADLibs > /dev/null rm -f FreeCADLibs.7z export LIBPACK_DIR="$TRAVIS_BUILD_DIR\FreeCADLibs" diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 9dd7c1db10..b4330209f6 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1895,12 +1895,22 @@ void Application::runApplication(void) Base::Console().Log("No OpenGL is present or no OpenGL context is current\n"); #endif + ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Bitmaps/Theme"); #if !defined(Q_OS_LINUX) QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString::fromLatin1(":/icons/FreeCAD-default")); QIcon::setThemeName(QLatin1String("FreeCAD-default")); +#else + // Option to opt-out from using a Linux desktop icon theme. + // https://forum.freecadweb.org/viewtopic.php?f=4&t=35624 + bool themePaths = hTheme->GetBool("ThemeSearchPaths",true); + if (!themePaths) { + QStringList searchPaths; + searchPaths.prepend(QString::fromUtf8(":/icons")); + QIcon::setThemeSearchPaths(searchPaths); + QIcon::setThemeName(QLatin1String("FreeCAD-default")); + } #endif - ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Bitmaps/Theme"); std::string searchpath = hTheme->GetASCII("SearchPath"); if (!searchpath.empty()) { QStringList searchPaths = QIcon::themeSearchPaths(); diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index d95df3122c..51decf4a19 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -280,7 +280,7 @@ set(Gui_MOC_HDRS Assistant.h AutoSaver.h CallTips.h - CombiView.h + ComboView.h Control.h Clipping.h DemoMode.h @@ -701,7 +701,7 @@ SOURCE_GROUP("Dialog\\Settings" FILES ${Dialog_Settings_SRCS}) # The dock windows sources SET(Dock_Windows_CPP_SRCS - CombiView.cpp + ComboView.cpp DockWindow.cpp PropertyView.cpp ReportView.cpp @@ -717,7 +717,7 @@ SET(Dock_Windows_CPP_SRCS DAGView/DAGFilter.cpp ) SET(Dock_Windows_HPP_SRCS - CombiView.h + ComboView.h DockWindow.h PropertyView.h ReportView.h diff --git a/src/Gui/CombiView.cpp b/src/Gui/ComboView.cpp similarity index 66% rename from src/Gui/CombiView.cpp rename to src/Gui/ComboView.cpp index 42a705cec1..3a2d9bac4a 100644 --- a/src/Gui/CombiView.cpp +++ b/src/Gui/ComboView.cpp @@ -28,7 +28,7 @@ /// Here the FreeCAD includes sorted by Base,App,Gui...... -#include "CombiView.h" +#include "ComboView.h" #include "BitmapFactory.h" #include "PropertyView.h" #include "ProjectView.h" @@ -42,12 +42,15 @@ using namespace Gui; using namespace Gui::DockWnd; -/* TRANSLATOR Gui::DockWnd::CombiView */ +/* TRANSLATOR Gui::DockWnd::ComboView */ -CombiView::CombiView(Gui::Document* pcDocument, QWidget *parent) - : DockWindow(pcDocument,parent), oldTabIndex(0) +ComboView::ComboView(bool showModel, Gui::Document* pcDocument, QWidget *parent) + : DockWindow(pcDocument,parent) + , oldTabIndex(0) + , modelIndex(-1) + , taskIndex(-1) { - setWindowTitle(tr("CombiView")); + setWindowTitle(tr("Combo View")); QGridLayout* pLayout = new QGridLayout(this); pLayout->setSpacing( 0 ); @@ -59,75 +62,83 @@ CombiView::CombiView(Gui::Document* pcDocument, QWidget *parent) tabs->setTabPosition(QTabWidget::North); pLayout->addWidget( tabs, 0, 0 ); - // splitter between tree and property view - QSplitter *splitter = new QSplitter(); - splitter->setOrientation(Qt::Vertical); + if (showModel) { + // splitter between tree and property view + QSplitter *splitter = new QSplitter(); + splitter->setOrientation(Qt::Vertical); - tree = new TreePanel("ComboView", this); - splitter->addWidget(tree); + tree = new TreePanel("ComboView", this); + splitter->addWidget(tree); - // property view - prop = new PropertyView(this); - splitter->addWidget(prop); - tabs->addTab(splitter,trUtf8("Model")); + // property view + prop = new PropertyView(this); + splitter->addWidget(prop); + modelIndex = tabs->addTab(splitter,trUtf8("Model")); + } // task panel taskPanel = new Gui::TaskView::TaskView(this); - tabs->addTab(taskPanel, trUtf8("Tasks")); + taskIndex = tabs->addTab(taskPanel, trUtf8("Tasks")); // task panel //projectView = new Gui::ProjectWidget(this); //tabs->addTab(projectView, trUtf8("Project")); } -CombiView::~CombiView() +ComboView::~ComboView() { } -void CombiView::showDialog(Gui::TaskView::TaskDialog *dlg) +void ComboView::showDialog(Gui::TaskView::TaskDialog *dlg) { static QIcon icon = Gui::BitmapFactory().pixmap("edit-edit.svg"); // switch to the TaskView tab oldTabIndex = tabs->currentIndex(); - tabs->setCurrentIndex(1); - tabs->setTabIcon(1, icon); + tabs->setCurrentIndex(taskIndex); + tabs->setTabIcon(taskIndex, icon); // set the dialog taskPanel->showDialog(dlg); + + // force to show the combo view + if (modelIndex < 0) { + if (parentWidget()) + parentWidget()->raise(); + } } -void CombiView::closeDialog() +void ComboView::closeDialog() { // close the dialog taskPanel->removeDialog(); } -void CombiView::closedDialog() +void ComboView::closedDialog() { static QIcon icon = QIcon(); // dialog has been closed tabs->setCurrentIndex(oldTabIndex); - tabs->setTabIcon(1, icon); + tabs->setTabIcon(taskIndex, icon); } -void CombiView::showTreeView() +void ComboView::showTreeView() { // switch to the tree view - tabs->setCurrentIndex(0); + tabs->setCurrentIndex(modelIndex); } -void CombiView::showTaskView() +void ComboView::showTaskView() { // switch to the task view - tabs->setCurrentIndex(1); + tabs->setCurrentIndex(taskIndex); } -void CombiView::changeEvent(QEvent *e) +void ComboView::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { - tabs->setTabText(0, trUtf8("Model")); - tabs->setTabText(1, trUtf8("Tasks")); + tabs->setTabText(modelIndex, trUtf8("Model")); + tabs->setTabText(taskIndex, trUtf8("Tasks")); //tabs->setTabText(2, trUtf8("Project")); } @@ -135,4 +146,4 @@ void CombiView::changeEvent(QEvent *e) } -#include "moc_CombiView.cpp" +#include "moc_ComboView.cpp" diff --git a/src/Gui/CombiView.h b/src/Gui/ComboView.h similarity index 89% rename from src/Gui/CombiView.h rename to src/Gui/ComboView.h index 4dc1cd70e1..c9488805f7 100644 --- a/src/Gui/CombiView.h +++ b/src/Gui/ComboView.h @@ -22,8 +22,8 @@ -#ifndef GUI_DOCKWND_COMBIVIEW_H -#define GUI_DOCKWND_COMBIVIEW_H +#ifndef GUI_DOCKWND_COMBOVIEW_H +#define GUI_DOCKWND_COMBOVIEW_H #include "DockWindow.h" #include "Selection.h" @@ -57,11 +57,11 @@ namespace Gui { class ControlSingleton; namespace DockWnd { -/** Combi View +/** Combo View * is a combination of a tree, property and TaskPanel for * integrated user action. */ -class GuiExport CombiView : public Gui::DockWindow +class GuiExport ComboView : public Gui::DockWindow { Q_OBJECT @@ -70,13 +70,13 @@ public: * A constructor. * A more elaborate description of the constructor. */ - CombiView(Gui::Document* pcDocument, QWidget *parent=0); + ComboView(bool showModel, Gui::Document* pcDocument, QWidget *parent=0); /** * A destructor. * A more elaborate description of the destructor. */ - virtual ~CombiView(); + virtual ~ComboView(); Gui::TaskView::TaskView *getTaskPanel(void){return taskPanel;} QTabWidget* getTabPanel() const { return tabs;} @@ -93,9 +93,10 @@ protected: void closedDialog(); void changeEvent(QEvent *e); - int oldTabIndex; - private: + int oldTabIndex; + int modelIndex; + int taskIndex; QTabWidget * tabs; Gui::PropertyView * prop; Gui::TreePanel * tree; diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp index 91c8c987fa..cf2eb9f55b 100644 --- a/src/Gui/Control.cpp +++ b/src/Gui/Control.cpp @@ -36,7 +36,7 @@ #include "TaskView/TaskView.h" #include -#include +#include #include @@ -61,11 +61,11 @@ ControlSingleton::~ControlSingleton() Gui::TaskView::TaskView* ControlSingleton::taskPanel() const { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - return pcCombiView->getTaskPanel(); + if (pcComboView) + return pcComboView->getTaskPanel(); // not all workbenches have the combo view enabled else if (_taskPanel) return _taskPanel; @@ -76,20 +76,20 @@ Gui::TaskView::TaskView* ControlSingleton::taskPanel() const void ControlSingleton::showTaskView() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - pcCombiView->showTaskView(); + if (pcComboView) + pcComboView->showTaskView(); else if (_taskPanel) _taskPanel->raise(); } void ControlSingleton::showModelView() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - pcCombiView->showTreeView(); + if (pcComboView) + pcComboView->showTreeView(); else if (_taskPanel) _taskPanel->raise(); } @@ -108,13 +108,13 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg) } return; } - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) { - pcCombiView->showDialog(dlg); + if (pcComboView) { + pcComboView->showDialog(dlg); // make sure that the combo view is shown - QDockWidget* dw = qobject_cast(pcCombiView->parentWidget()); + QDockWidget* dw = qobject_cast(pcComboView->parentWidget()); if (dw) { dw->setVisible(true); dw->toggleViewAction()->setVisible(true); @@ -151,11 +151,11 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg) QTabWidget* ControlSingleton::tabPanel() const { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - return pcCombiView->getTabPanel(); + if (pcComboView) + return pcComboView->getTabPanel(); return 0; } @@ -167,10 +167,10 @@ Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const Gui::TaskView::TaskView* ControlSingleton::getTaskPanel() { // should return the pointer to combo view - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); - if (pcCombiView) - return pcCombiView->getTaskPanel(); + if (pcComboView) + return pcComboView->getTaskPanel(); else return _taskPanel; } @@ -197,11 +197,11 @@ void ControlSingleton::reject() void ControlSingleton::closeDialog() { - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - if (pcCombiView) - pcCombiView->closeDialog(); + if (pcComboView) + pcComboView->closeDialog(); else if (_taskPanel) _taskPanel->removeDialog(); } @@ -209,13 +209,13 @@ void ControlSingleton::closeDialog() void ControlSingleton::closedDialog() { ActiveDialog = 0; - Gui::DockWnd::CombiView* pcCombiView = qobject_cast + Gui::DockWnd::ComboView* pcComboView = qobject_cast (Gui::DockWindowManager::instance()->getDockWindow("Combo View")); // should return the pointer to combo view - assert(pcCombiView); - pcCombiView->closedDialog(); + assert(pcComboView); + pcComboView->closedDialog(); // make sure that the combo view is shown - QDockWidget* dw = qobject_cast(pcCombiView->parentWidget()); + QDockWidget* dw = qobject_cast(pcComboView->parentWidget()); if (dw) dw->setFeatures(QDockWidget::AllDockWidgetFeatures); } diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index 43e1144fa1..0b83dac463 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -214,11 +214,11 @@ this according to your screen size or personal taste - Tree View Mode provides the option the option to -customize the properties panel. The options are: -1. 'Combiview' -2. 'TreeView + PropertyView -3. 'Both' + Customize how tree view is shown in the panel (restart required). + +'ComboView': combine tree view and property view into one panel. +'TreeView and PropertyView': split tree view and property view into separate panel. +'Both': keep all three panels, and you can have two sets of tree view and property view. diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 4dfcd10260..ff893d920e 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -144,7 +144,21 @@ void DlgGeneralImp::saveSettings() hGrp->SetInt("ToolbarIconSize", pixel); getMainWindow()->setIconSize(QSize(pixel,pixel)); - hGrp->SetInt("TreeViewMode",ui->treeMode->currentIndex()); + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); + bool treeView=false, propertyView=false, comboView=true; + switch(ui->treeMode->currentIndex()) { + case 1: + treeView = propertyView = true; + comboView = false; + break; + case 2: + comboView = true; + treeView = propertyView = true; + break; + } + hGrp->GetGroup("ComboView")->SetBool("Enabled",comboView); + hGrp->GetGroup("TreeView")->SetBool("Enabled",treeView); + hGrp->GetGroup("PropertyView")->SetBool("Enabled",propertyView); hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); hGrp->SetBool("TiledBackground", ui->tiledBackground->isChecked()); @@ -261,12 +275,18 @@ void DlgGeneralImp::loadSettings() } ui->toolbarIconSize->setCurrentIndex(index); - ui->treeMode->addItem(tr("CombiView")); - ui->treeMode->addItem(tr("TreeView + PropertyView")); + ui->treeMode->addItem(tr("Combo View")); + ui->treeMode->addItem(tr("TreeView and PropertyView")); ui->treeMode->addItem(tr("Both")); - index = hGrp->GetInt("TreeViewMode"); - if (index<0 || index>2) - index=0; + + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); + bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled",false); + bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled",false); + bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled",true); + index = 0; + if(propertyView || treeView) { + index = comboView?2:1; + } ui->treeMode->setCurrentIndex(index); hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); diff --git a/src/Gui/DlgParameter.ui b/src/Gui/DlgParameter.ui index 761b9db7a5..1f2ff08707 100644 --- a/src/Gui/DlgParameter.ui +++ b/src/Gui/DlgParameter.ui @@ -36,6 +36,16 @@ 6 + + + + Sorted + + + true + + + diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index 5b169fa7bb..1ad8b1e75a 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -63,11 +63,18 @@ DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WindowFlags fl ) , ui(new Ui_DlgParameter) { ui->setupUi(this); - QStringList groupLabels; + ui->checkSort->setVisible(false); // for testing + + QStringList groupLabels; groupLabels << tr( "Group" ); paramGroup = new ParameterGroup(ui->splitter3); paramGroup->setHeaderLabels(groupLabels); paramGroup->setRootIsDecorated(false); +#if QT_VERSION >= 0x050000 + paramGroup->setSortingEnabled(true); + paramGroup->sortByColumn(0, Qt::AscendingOrder); + paramGroup->header()->setProperty("showSortIndicator", QVariant(true)); +#endif QStringList valueLabels; valueLabels << tr( "Name" ) << tr( "Type" ) << tr( "Value" ); @@ -77,6 +84,7 @@ DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WindowFlags fl ) #if QT_VERSION >= 0x050000 paramValue->header()->setSectionResizeMode(0, QHeaderView::Stretch); paramValue->setSortingEnabled(true); + paramValue->sortByColumn(0, Qt::AscendingOrder); paramValue->header()->setProperty("showSortIndicator", QVariant(true)); #else paramValue->header()->setResizeMode(0, QHeaderView::Stretch); @@ -144,6 +152,21 @@ void DlgParameterImp::changeEvent(QEvent *e) } } +void DlgParameterImp::on_checkSort_toggled(bool on) +{ +#if QT_VERSION >= 0x050000 + paramGroup->setSortingEnabled(on); + paramGroup->sortByColumn(0, Qt::AscendingOrder); + paramGroup->header()->setProperty("showSortIndicator", QVariant(on)); +#endif + +#if QT_VERSION >= 0x050000 + paramValue->setSortingEnabled(on); + paramValue->sortByColumn(0, Qt::AscendingOrder); + paramValue->header()->setProperty("showSortIndicator", QVariant(on)); +#endif +} + void DlgParameterImp::on_closeButton_clicked() { close(); diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h index 2f86121ae2..fdea01bb3a 100644 --- a/src/Gui/DlgParameterImp.h +++ b/src/Gui/DlgParameterImp.h @@ -61,6 +61,7 @@ protected Q_SLOTS: void onGroupSelected(QTreeWidgetItem *); void on_closeButton_clicked(); + void on_checkSort_toggled(bool); protected: void changeEvent(QEvent *e); diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index 4548ac8901..1ddc4ef5c4 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -257,7 +257,7 @@ void DockWindowManager::retranslate() * \li Std_PropertyView * \li Std_ReportView * \li Std_ToolBox - * \li Std_CombiView + * \li Std_ComboView * \li Std_SelectionView * * To avoid name clashes the caller should use names of the form \a module_widgettype, i. e. if a analyse dialog for diff --git a/src/Gui/Language/FreeCAD_af.qm b/src/Gui/Language/FreeCAD_af.qm index b7b8f0201f..7321deb211 100644 Binary files a/src/Gui/Language/FreeCAD_af.qm and b/src/Gui/Language/FreeCAD_af.qm differ diff --git a/src/Gui/Language/FreeCAD_af.ts b/src/Gui/Language/FreeCAD_af.ts index fa64fd06d1..d7841766f2 100644 --- a/src/Gui/Language/FreeCAD_af.ts +++ b/src/Gui/Language/FreeCAD_af.ts @@ -3628,10 +3628,10 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView - SaamgesteldeVoorkoms + Combo View + Saamgestelde Voorkoms Tasks diff --git a/src/Gui/Language/FreeCAD_ar.qm b/src/Gui/Language/FreeCAD_ar.qm index e351971927..1baa6177ad 100644 Binary files a/src/Gui/Language/FreeCAD_ar.qm and b/src/Gui/Language/FreeCAD_ar.qm differ diff --git a/src/Gui/Language/FreeCAD_ar.ts b/src/Gui/Language/FreeCAD_ar.ts index 4a06971ece..d34732bd74 100644 --- a/src/Gui/Language/FreeCAD_ar.ts +++ b/src/Gui/Language/FreeCAD_ar.ts @@ -3630,10 +3630,10 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView - CombiView + Combo View + Combo View Tasks diff --git a/src/Gui/Language/FreeCAD_ca.qm b/src/Gui/Language/FreeCAD_ca.qm index 25fcce15ad..acb8fcd596 100644 Binary files a/src/Gui/Language/FreeCAD_ca.qm and b/src/Gui/Language/FreeCAD_ca.qm differ diff --git a/src/Gui/Language/FreeCAD_ca.ts b/src/Gui/Language/FreeCAD_ca.ts index 10da151da2..43c1d71798 100644 --- a/src/Gui/Language/FreeCAD_ca.ts +++ b/src/Gui/Language/FreeCAD_ca.ts @@ -3624,9 +3624,9 @@ La columna 'Estat? mostra si el document es pot recuperar. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista combinada diff --git a/src/Gui/Language/FreeCAD_cs.qm b/src/Gui/Language/FreeCAD_cs.qm index 2b25ddabe6..86fe5ef0d9 100644 Binary files a/src/Gui/Language/FreeCAD_cs.qm and b/src/Gui/Language/FreeCAD_cs.qm differ diff --git a/src/Gui/Language/FreeCAD_cs.ts b/src/Gui/Language/FreeCAD_cs.ts index 82a305298d..f27bf89c97 100644 --- a/src/Gui/Language/FreeCAD_cs.ts +++ b/src/Gui/Language/FreeCAD_cs.ts @@ -3623,10 +3623,10 @@ Sloupec "Status" ukazuje zda je možné dokument obnovit. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView - CombiView + Combo View + Combo View Tasks diff --git a/src/Gui/Language/FreeCAD_de.qm b/src/Gui/Language/FreeCAD_de.qm index 4dac8ff3d9..f194770385 100644 Binary files a/src/Gui/Language/FreeCAD_de.qm and b/src/Gui/Language/FreeCAD_de.qm differ diff --git a/src/Gui/Language/FreeCAD_de.ts b/src/Gui/Language/FreeCAD_de.ts index 9e22f746f4..dd7a2d4d6a 100644 --- a/src/Gui/Language/FreeCAD_de.ts +++ b/src/Gui/Language/FreeCAD_de.ts @@ -3624,9 +3624,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo-Ansicht Combi-Ansicht diff --git a/src/Gui/Language/FreeCAD_el.qm b/src/Gui/Language/FreeCAD_el.qm index 2dc3848b56..f1ba02f0d9 100644 Binary files a/src/Gui/Language/FreeCAD_el.qm and b/src/Gui/Language/FreeCAD_el.qm differ diff --git a/src/Gui/Language/FreeCAD_el.ts b/src/Gui/Language/FreeCAD_el.ts index 8499f6c533..4f1ea3df02 100644 --- a/src/Gui/Language/FreeCAD_el.ts +++ b/src/Gui/Language/FreeCAD_el.ts @@ -3629,9 +3629,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Συνδυασμένη Προβολή diff --git a/src/Gui/Language/FreeCAD_es-ES.qm b/src/Gui/Language/FreeCAD_es-ES.qm index 06fc643e46..868fd073a0 100644 Binary files a/src/Gui/Language/FreeCAD_es-ES.qm and b/src/Gui/Language/FreeCAD_es-ES.qm differ diff --git a/src/Gui/Language/FreeCAD_es-ES.ts b/src/Gui/Language/FreeCAD_es-ES.ts index eda59a6b5e..317fd93370 100644 --- a/src/Gui/Language/FreeCAD_es-ES.ts +++ b/src/Gui/Language/FreeCAD_es-ES.ts @@ -3627,9 +3627,9 @@ La columna 'Estado' muestra si el documento puede ser recuperado. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista combinada diff --git a/src/Gui/Language/FreeCAD_eu.qm b/src/Gui/Language/FreeCAD_eu.qm index e961968e68..84e4f9dfee 100644 Binary files a/src/Gui/Language/FreeCAD_eu.qm and b/src/Gui/Language/FreeCAD_eu.qm differ diff --git a/src/Gui/Language/FreeCAD_eu.ts b/src/Gui/Language/FreeCAD_eu.ts index c0cf86666e..fcd2f245e3 100644 --- a/src/Gui/Language/FreeCAD_eu.ts +++ b/src/Gui/Language/FreeCAD_eu.ts @@ -3627,9 +3627,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Ikuspegi konbinatua diff --git a/src/Gui/Language/FreeCAD_fi.qm b/src/Gui/Language/FreeCAD_fi.qm index 0fd6086bfc..4a97c2c51c 100644 Binary files a/src/Gui/Language/FreeCAD_fi.qm and b/src/Gui/Language/FreeCAD_fi.qm differ diff --git a/src/Gui/Language/FreeCAD_fi.ts b/src/Gui/Language/FreeCAD_fi.ts index e3c7be547c..d50e480511 100644 --- a/src/Gui/Language/FreeCAD_fi.ts +++ b/src/Gui/Language/FreeCAD_fi.ts @@ -3628,9 +3628,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View CombiView diff --git a/src/Gui/Language/FreeCAD_fil.qm b/src/Gui/Language/FreeCAD_fil.qm index 7d6e447859..3a6c5b2a5e 100644 Binary files a/src/Gui/Language/FreeCAD_fil.qm and b/src/Gui/Language/FreeCAD_fil.qm differ diff --git a/src/Gui/Language/FreeCAD_fil.ts b/src/Gui/Language/FreeCAD_fil.ts index 9c851f4aa2..6d49192bb3 100644 --- a/src/Gui/Language/FreeCAD_fil.ts +++ b/src/Gui/Language/FreeCAD_fil.ts @@ -3628,9 +3628,9 @@ Ang haligi ng 'Katayuan' ay nagpapakita kung ang dokumento ay maaaring mabawi. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View CombiView diff --git a/src/Gui/Language/FreeCAD_fr.qm b/src/Gui/Language/FreeCAD_fr.qm index 15ec5d7851..9eb0b09e1b 100644 Binary files a/src/Gui/Language/FreeCAD_fr.qm and b/src/Gui/Language/FreeCAD_fr.qm differ diff --git a/src/Gui/Language/FreeCAD_fr.ts b/src/Gui/Language/FreeCAD_fr.ts index 0e823816e5..b845a172b1 100644 --- a/src/Gui/Language/FreeCAD_fr.ts +++ b/src/Gui/Language/FreeCAD_fr.ts @@ -3625,9 +3625,9 @@ La colonne « État » indique si le document peut être récupéré. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vue combinée diff --git a/src/Gui/Language/FreeCAD_gl.qm b/src/Gui/Language/FreeCAD_gl.qm index b2817961b9..44359276de 100644 Binary files a/src/Gui/Language/FreeCAD_gl.qm and b/src/Gui/Language/FreeCAD_gl.qm differ diff --git a/src/Gui/Language/FreeCAD_gl.ts b/src/Gui/Language/FreeCAD_gl.ts index bafde026ae..b18ef670ab 100644 --- a/src/Gui/Language/FreeCAD_gl.ts +++ b/src/Gui/Language/FreeCAD_gl.ts @@ -3628,9 +3628,9 @@ A columna 'Estado' amosa se é posible recuperar o documento. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista combinada diff --git a/src/Gui/Language/FreeCAD_hr.qm b/src/Gui/Language/FreeCAD_hr.qm index ccdabffd9f..c77e4ce588 100644 Binary files a/src/Gui/Language/FreeCAD_hr.qm and b/src/Gui/Language/FreeCAD_hr.qm differ diff --git a/src/Gui/Language/FreeCAD_hr.ts b/src/Gui/Language/FreeCAD_hr.ts index 50a9af4abd..a78e1b0b4f 100644 --- a/src/Gui/Language/FreeCAD_hr.ts +++ b/src/Gui/Language/FreeCAD_hr.ts @@ -3623,9 +3623,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Mješani pogled diff --git a/src/Gui/Language/FreeCAD_hu.qm b/src/Gui/Language/FreeCAD_hu.qm index 99833fd7b3..f054a39379 100644 Binary files a/src/Gui/Language/FreeCAD_hu.qm and b/src/Gui/Language/FreeCAD_hu.qm differ diff --git a/src/Gui/Language/FreeCAD_hu.ts b/src/Gui/Language/FreeCAD_hu.ts index a20984fa71..35f79fe157 100644 --- a/src/Gui/Language/FreeCAD_hu.ts +++ b/src/Gui/Language/FreeCAD_hu.ts @@ -3626,9 +3626,9 @@ Az 'Állapot' oszlop tájékoztatja a visszaállítás sikerességéről. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Össz nézet diff --git a/src/Gui/Language/FreeCAD_id.qm b/src/Gui/Language/FreeCAD_id.qm index 0b911b7172..286e1b859d 100644 Binary files a/src/Gui/Language/FreeCAD_id.qm and b/src/Gui/Language/FreeCAD_id.qm differ diff --git a/src/Gui/Language/FreeCAD_id.ts b/src/Gui/Language/FreeCAD_id.ts index 43e0397eb1..c6607a2f29 100644 --- a/src/Gui/Language/FreeCAD_id.ts +++ b/src/Gui/Language/FreeCAD_id.ts @@ -3622,9 +3622,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View CombiView diff --git a/src/Gui/Language/FreeCAD_it.qm b/src/Gui/Language/FreeCAD_it.qm index ab1f787fc9..fb9ebab9db 100644 Binary files a/src/Gui/Language/FreeCAD_it.qm and b/src/Gui/Language/FreeCAD_it.qm differ diff --git a/src/Gui/Language/FreeCAD_it.ts b/src/Gui/Language/FreeCAD_it.ts index bba7b33288..3c2b4994e6 100644 --- a/src/Gui/Language/FreeCAD_it.ts +++ b/src/Gui/Language/FreeCAD_it.ts @@ -3626,9 +3626,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista combinata diff --git a/src/Gui/Language/FreeCAD_ja.qm b/src/Gui/Language/FreeCAD_ja.qm index 639d0c5ef6..1ca0a10314 100644 Binary files a/src/Gui/Language/FreeCAD_ja.qm and b/src/Gui/Language/FreeCAD_ja.qm differ diff --git a/src/Gui/Language/FreeCAD_ja.ts b/src/Gui/Language/FreeCAD_ja.ts index 66d22f250f..91c47e9783 100644 --- a/src/Gui/Language/FreeCAD_ja.ts +++ b/src/Gui/Language/FreeCAD_ja.ts @@ -3625,9 +3625,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View コンビビュー diff --git a/src/Gui/Language/FreeCAD_kab.qm b/src/Gui/Language/FreeCAD_kab.qm index 3c1a35a82b..68e50f1300 100644 Binary files a/src/Gui/Language/FreeCAD_kab.qm and b/src/Gui/Language/FreeCAD_kab.qm differ diff --git a/src/Gui/Language/FreeCAD_kab.ts b/src/Gui/Language/FreeCAD_kab.ts index 0a0da8e10d..a857a7fd50 100644 --- a/src/Gui/Language/FreeCAD_kab.ts +++ b/src/Gui/Language/FreeCAD_kab.ts @@ -3628,9 +3628,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vue combinée diff --git a/src/Gui/Language/FreeCAD_ko.qm b/src/Gui/Language/FreeCAD_ko.qm index b0d59c13db..ff76138b4c 100644 Binary files a/src/Gui/Language/FreeCAD_ko.qm and b/src/Gui/Language/FreeCAD_ko.qm differ diff --git a/src/Gui/Language/FreeCAD_ko.ts b/src/Gui/Language/FreeCAD_ko.ts index 47d702d3ab..4a1e01bdda 100644 --- a/src/Gui/Language/FreeCAD_ko.ts +++ b/src/Gui/Language/FreeCAD_ko.ts @@ -3626,9 +3626,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View 콤보 뷰 diff --git a/src/Gui/Language/FreeCAD_lt.qm b/src/Gui/Language/FreeCAD_lt.qm index 8da7d46044..95ace71941 100644 Binary files a/src/Gui/Language/FreeCAD_lt.qm and b/src/Gui/Language/FreeCAD_lt.qm differ diff --git a/src/Gui/Language/FreeCAD_lt.ts b/src/Gui/Language/FreeCAD_lt.ts index ba2a2e0f21..dc46c35546 100644 --- a/src/Gui/Language/FreeCAD_lt.ts +++ b/src/Gui/Language/FreeCAD_lt.ts @@ -3625,9 +3625,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Mišrus langas diff --git a/src/Gui/Language/FreeCAD_nl.qm b/src/Gui/Language/FreeCAD_nl.qm index 20264e29ad..dddeecf6bb 100644 Binary files a/src/Gui/Language/FreeCAD_nl.qm and b/src/Gui/Language/FreeCAD_nl.qm differ diff --git a/src/Gui/Language/FreeCAD_nl.ts b/src/Gui/Language/FreeCAD_nl.ts index b2934ed35b..1944b5fa59 100644 --- a/src/Gui/Language/FreeCAD_nl.ts +++ b/src/Gui/Language/FreeCAD_nl.ts @@ -3624,9 +3624,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Combi-Weergave diff --git a/src/Gui/Language/FreeCAD_no.qm b/src/Gui/Language/FreeCAD_no.qm index 6fc8f41ae9..76dfd480f8 100644 Binary files a/src/Gui/Language/FreeCAD_no.qm and b/src/Gui/Language/FreeCAD_no.qm differ diff --git a/src/Gui/Language/FreeCAD_no.ts b/src/Gui/Language/FreeCAD_no.ts index ffeb2a896f..caaf0728b1 100644 --- a/src/Gui/Language/FreeCAD_no.ts +++ b/src/Gui/Language/FreeCAD_no.ts @@ -3627,9 +3627,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Kombivisning diff --git a/src/Gui/Language/FreeCAD_pl.qm b/src/Gui/Language/FreeCAD_pl.qm index 79998280d4..c8e7735fc7 100644 Binary files a/src/Gui/Language/FreeCAD_pl.qm and b/src/Gui/Language/FreeCAD_pl.qm differ diff --git a/src/Gui/Language/FreeCAD_pl.ts b/src/Gui/Language/FreeCAD_pl.ts index 096f2afe9b..9e0180e21c 100644 --- a/src/Gui/Language/FreeCAD_pl.ts +++ b/src/Gui/Language/FreeCAD_pl.ts @@ -3625,9 +3625,9 @@ Kolumna "Stan" pokazuje, czy dokument może być odzyskany. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View MultiWidok diff --git a/src/Gui/Language/FreeCAD_pt-BR.qm b/src/Gui/Language/FreeCAD_pt-BR.qm index fd634cc5a3..8db70777c3 100644 Binary files a/src/Gui/Language/FreeCAD_pt-BR.qm and b/src/Gui/Language/FreeCAD_pt-BR.qm differ diff --git a/src/Gui/Language/FreeCAD_pt-BR.ts b/src/Gui/Language/FreeCAD_pt-BR.ts index 1d53901343..b7b59b6295 100644 --- a/src/Gui/Language/FreeCAD_pt-BR.ts +++ b/src/Gui/Language/FreeCAD_pt-BR.ts @@ -3622,9 +3622,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista Combinada diff --git a/src/Gui/Language/FreeCAD_pt-PT.qm b/src/Gui/Language/FreeCAD_pt-PT.qm index d0f59f3bce..427f6a4d5f 100644 Binary files a/src/Gui/Language/FreeCAD_pt-PT.qm and b/src/Gui/Language/FreeCAD_pt-PT.qm differ diff --git a/src/Gui/Language/FreeCAD_pt-PT.ts b/src/Gui/Language/FreeCAD_pt-PT.ts index 69b1eba9c5..24b0f9346e 100644 --- a/src/Gui/Language/FreeCAD_pt-PT.ts +++ b/src/Gui/Language/FreeCAD_pt-PT.ts @@ -3622,9 +3622,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Visualização Combinada diff --git a/src/Gui/Language/FreeCAD_ro.qm b/src/Gui/Language/FreeCAD_ro.qm index 8188b3abdb..1ddafc3259 100644 Binary files a/src/Gui/Language/FreeCAD_ro.qm and b/src/Gui/Language/FreeCAD_ro.qm differ diff --git a/src/Gui/Language/FreeCAD_ro.ts b/src/Gui/Language/FreeCAD_ro.ts index fc35c34f9b..13b58ceb96 100644 --- a/src/Gui/Language/FreeCAD_ro.ts +++ b/src/Gui/Language/FreeCAD_ro.ts @@ -3623,9 +3623,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vedere combi diff --git a/src/Gui/Language/FreeCAD_ru.qm b/src/Gui/Language/FreeCAD_ru.qm index 6d9d8206e6..53fce9fcf2 100644 Binary files a/src/Gui/Language/FreeCAD_ru.qm and b/src/Gui/Language/FreeCAD_ru.qm differ diff --git a/src/Gui/Language/FreeCAD_ru.ts b/src/Gui/Language/FreeCAD_ru.ts index f765210742..8f395c0e4a 100644 --- a/src/Gui/Language/FreeCAD_ru.ts +++ b/src/Gui/Language/FreeCAD_ru.ts @@ -3628,9 +3628,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View КомбоВид diff --git a/src/Gui/Language/FreeCAD_sk.qm b/src/Gui/Language/FreeCAD_sk.qm index 67a3a339a2..1f793f4965 100644 Binary files a/src/Gui/Language/FreeCAD_sk.qm and b/src/Gui/Language/FreeCAD_sk.qm differ diff --git a/src/Gui/Language/FreeCAD_sk.ts b/src/Gui/Language/FreeCAD_sk.ts index 84fe3873c3..18a933b760 100644 --- a/src/Gui/Language/FreeCAD_sk.ts +++ b/src/Gui/Language/FreeCAD_sk.ts @@ -3629,9 +3629,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Kombinovaný pohľad diff --git a/src/Gui/Language/FreeCAD_sl.qm b/src/Gui/Language/FreeCAD_sl.qm index e1cc66c317..bd123459a5 100644 Binary files a/src/Gui/Language/FreeCAD_sl.qm and b/src/Gui/Language/FreeCAD_sl.qm differ diff --git a/src/Gui/Language/FreeCAD_sl.ts b/src/Gui/Language/FreeCAD_sl.ts index 002ff7b5ae..e37518f06e 100644 --- a/src/Gui/Language/FreeCAD_sl.ts +++ b/src/Gui/Language/FreeCAD_sl.ts @@ -3626,9 +3626,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Sestavljen pogled diff --git a/src/Gui/Language/FreeCAD_sr.qm b/src/Gui/Language/FreeCAD_sr.qm index 6353f4f2fc..3466140c32 100644 Binary files a/src/Gui/Language/FreeCAD_sr.qm and b/src/Gui/Language/FreeCAD_sr.qm differ diff --git a/src/Gui/Language/FreeCAD_sr.ts b/src/Gui/Language/FreeCAD_sr.ts index db34c99290..7d9741201f 100644 --- a/src/Gui/Language/FreeCAD_sr.ts +++ b/src/Gui/Language/FreeCAD_sr.ts @@ -3627,9 +3627,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View CombiView diff --git a/src/Gui/Language/FreeCAD_sv-SE.qm b/src/Gui/Language/FreeCAD_sv-SE.qm index e825b78d20..ce112235d7 100644 Binary files a/src/Gui/Language/FreeCAD_sv-SE.qm and b/src/Gui/Language/FreeCAD_sv-SE.qm differ diff --git a/src/Gui/Language/FreeCAD_sv-SE.ts b/src/Gui/Language/FreeCAD_sv-SE.ts index b9678fd16d..dfa6c4ab57 100644 --- a/src/Gui/Language/FreeCAD_sv-SE.ts +++ b/src/Gui/Language/FreeCAD_sv-SE.ts @@ -3629,9 +3629,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Kombivy diff --git a/src/Gui/Language/FreeCAD_tr.qm b/src/Gui/Language/FreeCAD_tr.qm index d70f628ddd..629698e85b 100644 Binary files a/src/Gui/Language/FreeCAD_tr.qm and b/src/Gui/Language/FreeCAD_tr.qm differ diff --git a/src/Gui/Language/FreeCAD_tr.ts b/src/Gui/Language/FreeCAD_tr.ts index f442eaa0fe..5131afb497 100644 --- a/src/Gui/Language/FreeCAD_tr.ts +++ b/src/Gui/Language/FreeCAD_tr.ts @@ -3629,9 +3629,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Hepsı bir arada görünüm diff --git a/src/Gui/Language/FreeCAD_uk.qm b/src/Gui/Language/FreeCAD_uk.qm index a0f3b27d7f..7f97509109 100644 Binary files a/src/Gui/Language/FreeCAD_uk.qm and b/src/Gui/Language/FreeCAD_uk.qm differ diff --git a/src/Gui/Language/FreeCAD_uk.ts b/src/Gui/Language/FreeCAD_uk.ts index 05f344ef89..4bd0324c33 100644 --- a/src/Gui/Language/FreeCAD_uk.ts +++ b/src/Gui/Language/FreeCAD_uk.ts @@ -3626,9 +3626,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View КомбінованийВигляд diff --git a/src/Gui/Language/FreeCAD_val-ES.qm b/src/Gui/Language/FreeCAD_val-ES.qm index aaac864ad4..411a036dbd 100644 Binary files a/src/Gui/Language/FreeCAD_val-ES.qm and b/src/Gui/Language/FreeCAD_val-ES.qm differ diff --git a/src/Gui/Language/FreeCAD_val-ES.ts b/src/Gui/Language/FreeCAD_val-ES.ts index 089e5a7ebb..0c27110798 100644 --- a/src/Gui/Language/FreeCAD_val-ES.ts +++ b/src/Gui/Language/FreeCAD_val-ES.ts @@ -3623,9 +3623,9 @@ La columna 'Estat? mostra si el document es pot recuperar. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Vista combinada diff --git a/src/Gui/Language/FreeCAD_vi.qm b/src/Gui/Language/FreeCAD_vi.qm index 98e2709f8c..07254a3e62 100644 Binary files a/src/Gui/Language/FreeCAD_vi.qm and b/src/Gui/Language/FreeCAD_vi.qm differ diff --git a/src/Gui/Language/FreeCAD_vi.ts b/src/Gui/Language/FreeCAD_vi.ts index 53d6608b5e..22d7c7a81c 100644 --- a/src/Gui/Language/FreeCAD_vi.ts +++ b/src/Gui/Language/FreeCAD_vi.ts @@ -3629,9 +3629,9 @@ Cột 'Trạng thái' cho biết liệu tài liệu có thể được khôi ph - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View Chế độ xem kết hợp diff --git a/src/Gui/Language/FreeCAD_zh-CN.qm b/src/Gui/Language/FreeCAD_zh-CN.qm index 04171534e3..6841c6b089 100644 Binary files a/src/Gui/Language/FreeCAD_zh-CN.qm and b/src/Gui/Language/FreeCAD_zh-CN.qm differ diff --git a/src/Gui/Language/FreeCAD_zh-CN.ts b/src/Gui/Language/FreeCAD_zh-CN.ts index 7575ac9897..f90283af04 100644 --- a/src/Gui/Language/FreeCAD_zh-CN.ts +++ b/src/Gui/Language/FreeCAD_zh-CN.ts @@ -3623,9 +3623,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View 组合视图 diff --git a/src/Gui/Language/FreeCAD_zh-TW.qm b/src/Gui/Language/FreeCAD_zh-TW.qm index a0cedd28ed..8f79d954b2 100644 Binary files a/src/Gui/Language/FreeCAD_zh-TW.qm and b/src/Gui/Language/FreeCAD_zh-TW.qm differ diff --git a/src/Gui/Language/FreeCAD_zh-TW.ts b/src/Gui/Language/FreeCAD_zh-TW.ts index 3514aef72c..1e5b3a8def 100644 --- a/src/Gui/Language/FreeCAD_zh-TW.ts +++ b/src/Gui/Language/FreeCAD_zh-TW.ts @@ -3624,9 +3624,9 @@ The 'Status' column shows whether the document could be recovered. - Gui::DockWnd::CombiView + Gui::DockWnd::ComboView - CombiView + Combo View 組合檢視 diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 10b3f95961..c58d20f9eb 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -99,7 +99,7 @@ #include "MenuManager.h" //#include "ToolBox.h" #include "ReportView.h" -#include "CombiView.h" +#include "ComboView.h" #include "PythonConsole.h" #include "TaskView/TaskView.h" #include "DAGView/DAGView.h" @@ -381,17 +381,19 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } #endif + bool treeView = false, propertyView = false; if (hiddenDockWindows.find("Std_TreeView") == std::string::npos) { //work through parameter. ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("TreeView"); bool enabled = group->GetBool("Enabled", true); - if(enabled != group->GetBool("Enabled", false)) { + if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView",false); } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { + treeView = true; TreeDockWidget* tree = new TreeDockWidget(0, this); tree->setObjectName (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Tree view"))); @@ -406,12 +408,13 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("PropertyView"); bool enabled = group->GetBool("Enabled", true); - if(enabled != group->GetBool("Enabled", false)) { + if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView",false); } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { + propertyView = true; PropertyDockView* pcPropView = new PropertyDockView(0, this); pcPropView->setObjectName (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Property view"))); @@ -430,11 +433,18 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) } // Combo view - if (hiddenDockWindows.find("Std_CombiView") == std::string::npos) { - CombiView* pcCombiView = new CombiView(0, this); - pcCombiView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); - pcCombiView->setMinimumWidth(150); - pDockMgr->registerDockWindow("Std_CombiView", pcCombiView); + if (hiddenDockWindows.find("Std_ComboView") == std::string::npos) { + bool enable = !treeView || !propertyView; + if (!enable) { + ParameterGrp::handle group = App::GetApplication().GetUserParameter(). + GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView"); + enable = group->GetBool("Enabled", true); + } + + ComboView* pcComboView = new ComboView(enable, 0, this); + pcComboView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View"))); + pcComboView->setMinimumWidth(150); + pDockMgr->registerDockWindow("Std_ComboView", pcComboView); } #if QT_VERSION < 0x040500 diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index e1678c90f7..20463eee64 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -47,7 +47,7 @@ class Property; namespace Gui { class ControlSingleton; namespace DockWnd{ -class CombiView; +class ComboView; } namespace TaskView { @@ -180,7 +180,7 @@ public: virtual void OnChange(Gui::SelectionSingleton::SubjectType &rCaller, Gui::SelectionSingleton::MessageType Reason); - friend class Gui::DockWnd::CombiView; + friend class Gui::DockWnd::ComboView; friend class Gui::ControlSingleton; void addTaskWatcher(const std::vector &Watcher); diff --git a/src/Gui/ViewParams.h b/src/Gui/ViewParams.h index 9a94004658..92ac24dd72 100644 --- a/src/Gui/ViewParams.h +++ b/src/Gui/ViewParams.h @@ -56,6 +56,7 @@ public: FC_VIEW_PARAM(DefaultShapeLineColor,unsigned long,Unsigned,421075455UL) \ FC_VIEW_PARAM(DefaultShapeColor,unsigned long,Unsigned,0xCCCCCC00) \ FC_VIEW_PARAM(DefaultShapeLineWidth,int,Int,2) \ + FC_VIEW_PARAM(DefaultShapePointSize,int,Int,2) \ FC_VIEW_PARAM(CoinCycleCheck,bool,Bool,true) \ FC_VIEW_PARAM(EnablePropertyViewForInactiveDocument,bool,Bool,true) \ FC_VIEW_PARAM(ShowSelectionBoundingBox,bool,Bool,false) \ diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index 513ecef5c2..2a778b9d6a 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -41,7 +41,7 @@ #include "Window.h" #include "Selection.h" #include "MainWindow.h" -#include +#include #include #include @@ -704,7 +704,7 @@ DockWindowItems* StdWorkbench::setupDockWindows() const root->addDockWidget("Std_TreeView", Qt::LeftDockWidgetArea, true, false); root->addDockWidget("Std_PropertyView", Qt::LeftDockWidgetArea, true, false); root->addDockWidget("Std_SelectionView", Qt::LeftDockWidgetArea, false, false); - root->addDockWidget("Std_CombiView", Qt::LeftDockWidgetArea, false, false); + root->addDockWidget("Std_ComboView", Qt::LeftDockWidgetArea, false, false); root->addDockWidget("Std_ReportView", Qt::BottomDockWidgetArea, true, true); root->addDockWidget("Std_PythonView", Qt::BottomDockWidgetArea, true, true); diff --git a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg index c55eabaa85..6f8e34c47a 100755 --- a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg +++ b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2816" + height="64px" + width="64px"> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> - - - - - - - - - - - - - - - - - + y1="-0.52792466" + x1="93.501396" + id="linearGradient3787" + xlink:href="#linearGradient3781" /> + + + + + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-3" + xlink:href="#linearGradient3789-5" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-36" + xlink:href="#linearGradient3781-0" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-6" + xlink:href="#linearGradient3789-1" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-2" + xlink:href="#linearGradient3781-8" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-36" + xlink:href="#linearGradient3789-12" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-5" + xlink:href="#linearGradient3781-03" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-63" + xlink:href="#linearGradient3789-2" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-9" + xlink:href="#linearGradient3781-3" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-5" + xlink:href="#linearGradient3789-4" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + y1="-0.52792466" + x1="93.501396" + gradientUnits="userSpaceOnUse" + id="linearGradient3804-8" + xlink:href="#linearGradient3781-84" /> + style="stop-color:#d3d7cf;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:1" /> + y1="124.16501" + x1="140.23918" + gradientUnits="userSpaceOnUse" + id="linearGradient3806-4" + xlink:href="#linearGradient3789-9" /> + style="stop-color:#888a85;stop-opacity:1;" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> - - - + id="radialGradient3169" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.32526,0,28.08607)" + cx="25.1875" + cy="41.625" + fx="25.1875" + fy="41.625" + r="18.0625" /> + offset="0" /> + offset="1" /> + id="radialGradient3027" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.32526,0,28.08607)" + cx="25.1875" + cy="41.625" + fx="25.1875" + fy="41.625" + r="18.0625" /> - - - @@ -511,7 +334,7 @@ image/svg+xml - + [triplus] @@ -541,126 +364,89 @@ + id="layer1"> + d="m 43.25,41.625 a 18.0625,5.875 0 1 1 -36.125,0 18.0625,5.875 0 1 1 36.125,0 z" + transform="matrix(1.6349796,0,0,1.0662685,-9.1810484,1.3522451)" + id="path2267" /> + transform="translate(-71.999999,3.9999969)" + id="g3797"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0" /> + id="rect2840-3-5" /> + id="path3009" /> + id="path3011" /> + transform="translate(-50,10)" + id="g3797-4"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3-3" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0-0" /> + id="rect2840-3-5-7" /> + id="path3009-8" /> + id="path3011-6" /> + transform="translate(-61.000004,-5.0000014)" + id="g3797-6"> + d="m 82.146381,-7.6186648 23.470399,-2.1767614 0,12 -23.470399,2.1767615 z" + id="rect2840-3-8" /> + d="m 130.65607,112.26435 15.8371,4.33507 0,12 -15.8371,-4.33507 z" + id="rect2840-3-4-0-9" /> + id="rect2840-3-5-2" /> + id="path3009-6" /> + id="path3011-64" /> diff --git a/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg index 7865be2b97..5be7796e1e 100644 --- a/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg +++ b/src/Mod/Complete/Gui/Resources/icons/CompleteWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2989" + height="64" + width="64"> + style="stop-color:#c4a000;stop-opacity:1" /> + style="stop-color:#fce94f;stop-opacity:1" /> + x2="2.9672837" + y1="13.130123" + x1="8.2747869" + id="linearGradient3773" + xlink:href="#linearGradient3767" /> + y2="-9.1497173" + x2="15.07192" + y1="13.003332" + x1="-2.6557214" + id="linearGradient3773-7" + xlink:href="#linearGradient3767-4" /> + style="stop-color:#ff8d00;stop-opacity:1;" /> + style="stop-color:#fff000;stop-opacity:1;" /> - - - @@ -98,28 +61,20 @@ image/svg+xml - + + transform="translate(0,32)" + id="layer1"> + d="m 32,-29 c 0,0 4.925086,12.811302 8.961494,19.8000864 8.440078,0.9492735 20.038507,2.3539443 20.038507,2.3539443 0,0 -5.000454,4.9806248 -7.523802,7.49396506 -2.52335,2.51334264 -7.616292,7.58608884 -7.616292,7.58608884 0,0 0.549541,2.8086294 1.226719,6.2696154 C 47.763806,17.964686 49.922985,29 49.922985,29 c 0,0 -6.513844,-3.726583 -9.56694,-5.473264 -3.0531,-1.746685 -8.751643,-5.006834 -8.751643,-5.006834 0,0 -5.963387,3.565669 -8.884618,5.31235 C 19.798553,25.578938 14.077014,29 14.077014,29 c 0,0 1.657742,-9.358475 2.294172,-12.951327 0.636432,-3.592854 1.524412,-8.6057861 1.524412,-8.6057861 0,0 -4.22834,-4.0561077 -6.710937,-6.4375829 -2.4826013,-2.3814775 -8.1846612,-7.8512756 -8.1846612,-7.8512756 0,0 7.0833772,-0.8081066 12.2529842,-1.684563 5.169608,-0.8764543 8.425615,-1.1583674 8.425615,-1.1583674 z" + style="color:#000000;fill:url(#linearGradient3773);fill-opacity:1;fill-rule:nonzero;stroke:#3e2709;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 31.933023,-23.816732 c 0,0 4.446694,10.530732 7.926357,16.555546 7.27593,0.8183396 16.850384,1.8506563 16.850384,1.8506563 0,0 -4.042827,4.0480575 -6.218127,6.21473085 -2.175302,2.16667415 -6.632745,6.60670855 -6.632745,6.60670855 0,0 0.473741,2.8677493 1.057516,5.8513563 C 45.500183,16.245876 47.138287,25 47.138287,25 c 0,0 -5.347474,-2.989313 -7.979453,-4.495074 -2.631982,-1.505761 -7.499868,-4.226931 -7.499868,-4.226931 0,0 -5.185503,3.029202 -7.703805,4.534959 -2.518302,1.505766 -7.227405,4.276349 -7.227405,4.276349 0,0 1.429087,-7.933696 1.977735,-11.030982 0.548648,-3.097288 1.269497,-7.3294778 1.269497,-7.3294778 0,0 -3.890705,-3.8315319 -6.030876,-5.88452764 C 11.803939,-1.2086828 7.4018645,-5.3882065 7.4018645,-5.3882065 c 0,0 5.7937945,-0.8529261 10.2280285,-1.496861 4.434235,-0.6439348 7.419744,-0.931615 7.419744,-0.931615 z" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg index 8ec2468054..4e69418dd2 100644 --- a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg +++ b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2980" + height="64px" + width="64px"> + style="stop-color:#c4a000;stop-opacity:1" /> + style="stop-color:#fce94f;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#eeeeec;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + osb:paint="solid" + id="linearGradient3786"> + style="stop-color:#a0eb07;stop-opacity:1;" /> + id="stop3866" /> + id="stop3868" /> - + style="stop-color:#ffaa00;stop-opacity:1;" /> + style="stop-color:#faff2b;stop-opacity:1;" /> + y2="63.578461" + x2="9.3772163" + y1="28.663757" + x1="5.1754909" + id="linearGradient3863" + xlink:href="#linearGradient3855" /> + x2="60.769054" + y1="31.552309" + x1="3.9825215" + id="linearGradient3861-4" + xlink:href="#linearGradient3855-2" + gradientTransform="translate(63.406413,58.258077)" /> + style="stop-color:#d07200;stop-opacity:1;" /> + style="stop-color:#fcb200;stop-opacity:1;" /> + x2="23.852976" + y1="31.552309" + x1="3.9825215" + id="linearGradient3863-2" + xlink:href="#linearGradient3855-2" /> + style="stop-color:#d07200;stop-opacity:1;" /> + style="stop-color:#fcb200;stop-opacity:1;" /> + - - - - + id="linearGradient3921" + xlink:href="#linearGradient3855-2" /> + + + + style="stop-color:#e9b96e;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + x2="32" + y1="38" + x1="37" + id="linearGradient3896" + xlink:href="#linearGradient3890" /> - - - + id="layer1"> + height="58" + width="48" + id="rect3783" + style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z" + style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + height="54" + width="44" + id="rect3783-3" + style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 27,5 0,32 24,0 z m 6,18 6,8 -6,0 z" + style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 8,29 5,31.85285 5,54.171675 7.8160622,57 9,57 9,29 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 57,39 55,45 5,50 5,39 z" + style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 54.220725,41 53.465976,43.178411 6.9877375,47.816062 7,41 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 29,11 0,24 18,0 z" + style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -324,7 +247,7 @@ image/svg+xml - DraftWorkbench + Fri Feb 26 23:17:43 2016 +0100 diff --git a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg index 495ed189f9..4325237e95 100644 --- a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg +++ b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg @@ -1,129 +1,406 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - New Document - - - Jakub Steiner - - - http://jimmac.musichall.cz - - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg - - - FreeCAD LGPL2+ - - - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg index ad797d7812..6a9892f841 100755 --- a/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg +++ b/src/Mod/Fem/Gui/Resources/icons/FemWorkbench.svg @@ -1,112 +1,408 @@ - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + + [triplus] @@ -135,125 +431,438 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui index 60b42077ad..765fe657ef 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui @@ -6,7 +6,7 @@ 0 0 - 446 + 451 768 @@ -308,55 +308,64 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> - + + + + + + + + min. principal stress vector: s1x, s1y, s1z + + + + + + + med. principal stress vector: s2x, s2y, s2z + + + + + + + principal stresses: P1, P2, P3 + + + + + + + equivalent plastic strain: Peeq + + + + + + + reinforcement ratio: rx, ry, rz + + + + <html><head/><body><p><span style=" text-decoration: underline;">Available result types:</span></p></body></html> - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 - + + - <html><head/><body><p>displacement (x,y,z) and strain (exx,eyy,ezz,exy,exz,eyz)</p></body></html> - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - -1 - - - Qt::NoTextInteraction + strain: exx, eyy, ezz, exy, exz, eyz - + @@ -374,7 +383,7 @@ p, li { white-space: pre-wrap; } 1 - <html><head/><body><p>stresses (sxx,syy,szz,sxy,sxz,syz) and principal stresses (P1,P2,P3)</p></body></html> + stress: sxx, syy, szz, sxy, sxz, syz false @@ -393,6 +402,91 @@ p, li { white-space: pre-wrap; } + + + + von Mises stress: Von + + + + + + + mass flow rate: MF + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 1 + + + displacement: x, y, z + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + -1 + + + Qt::NoTextInteraction + + + + + + + + 0 + 0 + + + + network pressure: NP + + + + + + + temperature: T + + + + + + + Mohr Coulomb: mc + + + + + + + max. principal stress vector: s3x, s3y, s3z + + + diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py index c3c9fd8f22..27e81b677b 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py @@ -480,7 +480,7 @@ class _TaskPanelFemResultShow: s2y = np.array(ps2vector[:, 1]) s2z = np.array(ps2vector[:, 2]) if self.result_obj.PS3Vector: - ps3vector = np.array(self.result_obj.PS1Vector) + ps3vector = np.array(self.result_obj.PS3Vector) s3x = np.array(ps3vector[:, 0]) s3y = np.array(ps3vector[:, 1]) s3z = np.array(ps3vector[:, 2]) diff --git a/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg index e7a0a507b9..1f1259006c 100644 --- a/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg +++ b/src/Mod/Image/Gui/Resources/icons/ImageWorkbench.svg @@ -1,243 +1,177 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg index d83fa47056..3578e95e4f 100644 --- a/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg +++ b/src/Mod/Inspection/Gui/Resources/icons/InspectionWorkbench.svg @@ -1,253 +1,185 @@ - - - - - mesh_pipette - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - mesh_pipette - - - - FreeCAD LGPL2+ - - - - - FreeCAD - - - FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - pipette - eyedropper - sample - - - Pipette or eyedropper lit from above - - - [agryson] Alexander Gryson - - - Sat Feb 8 16:10:16 2014 +0100 - - - [wmayer] - - - - - - - - - - - - - - - - - + + + mesh_pipette + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + mesh_pipette + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + pipette + eyedropper + sample + + + Pipette or eyedropper lit from above + + + [agryson] Alexander Gryson + + + Sat Feb 8 16:10:16 2014 +0100 + + + [wmayer] + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg index 0b1f37eafd..d291b0dc19 100644 --- a/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg +++ b/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg @@ -1,367 +1,260 @@ - - - - - MeshWorkbench - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - MeshWorkbench - - - FreeCAD LGPL2+ - - - - - mesh - sphere - workbench - tessellated - - - - Tessellated sphere mesh, lit from top - - - [agryson] Alexander Gryson - - - - - - FreeCAD - - - - - [triplus] - - - Fri Feb 26 23:17:43 2016 +0100 - FreeCAD/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + MeshWorkbench + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + MeshWorkbench + + + FreeCAD LGPL2+ + + + + + mesh + sphere + workbench + tessellated + + + + Tessellated sphere mesh, lit from top + + + [agryson] Alexander Gryson + + + + + + FreeCAD + + + + + [triplus] + + + Fri Feb 26 23:17:43 2016 +0100 + FreeCAD/src/Mod/Mesh/Gui/Resources/icons/MeshWorkbench.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg index 800057f750..c9d31ec7b3 100644 --- a/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg +++ b/src/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg @@ -1,111 +1,426 @@ - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - - - - + - + image/svg+xml - - + + [triplus] @@ -134,26 +449,86 @@ - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp index 09ed8ba420..fb86da0bbf 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp @@ -62,7 +62,7 @@ void DlgSettingsObjectColor::saveSettings() ui->DefaultShapeLineColor->onSave(); ui->DefaultShapeLineWidth->onSave(); ui->DefaultShapeVertexColor->onSave(); - ui->DefaultShapeVertexWidth->onSave(); + ui->DefaultShapeVertexSize->onSave(); ui->BoundingBoxColor->onSave(); // Annotations ui->AnnotationTextColor->onSave(); @@ -76,7 +76,7 @@ void DlgSettingsObjectColor::loadSettings() ui->DefaultShapeLineColor->onRestore(); ui->DefaultShapeLineWidth->onRestore(); ui->DefaultShapeVertexColor->onRestore(); - ui->DefaultShapeVertexWidth->onRestore(); + ui->DefaultShapeVertexSize->onRestore(); ui->BoundingBoxColor->onRestore(); // Annotations ui->AnnotationTextColor->onRestore(); diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 51e135edbd..01a8a1cb7b 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -124,7 +124,7 @@ - + The default size for new vertices @@ -138,7 +138,7 @@ 2 - DefaultShapeVertexWidth + DefaultShapePointSize View diff --git a/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg index f94d8ae993..745c93470e 100644 --- a/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg +++ b/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg @@ -1,70 +1,152 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [triplus] - - - PartWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + [triplus] + + + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Part/Gui/Resources/icons/PartWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index 4b592f63a1..edd28bae5a 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -240,6 +240,7 @@ ViewProviderPartExt::ViewProviderPartExt() float r,g,b; r = ((lcol >> 24) & 0xff) / 255.0; g = ((lcol >> 16) & 0xff) / 255.0; b = ((lcol >> 8) & 0xff) / 255.0; int lwidth = Gui::ViewParams::instance()->getDefaultShapeLineWidth(); + int psize = Gui::ViewParams::instance()->getDefaultShapePointSize(); ParameterGrp::handle hPart = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/Mod/Part"); @@ -268,7 +269,7 @@ ViewProviderPartExt::ViewProviderPartExt() ADD_PROPERTY(LineWidth,(lwidth)); LineWidth.setConstraints(&sizeRange); PointSize.setConstraints(&sizeRange); - ADD_PROPERTY(PointSize,(lwidth)); + ADD_PROPERTY(PointSize,(psize)); ADD_PROPERTY(Deviation,(0.5f)); Deviation.setConstraints(&tessRange); ADD_PROPERTY(AngularDeflection,(28.65)); diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg index b988862c2e..a140bc71cc 100644 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg @@ -1,114 +1,331 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - PartDesignWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + PartDesignWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/PartDesignWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg index 26b81e1e61..98bba64cd7 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg @@ -1,6 +1,4 @@ - - + id="svg2901" + height="64px" + width="64px"> + id="stop3939" /> + style="stop-color:#ffff00;stop-opacity:1;" /> + id="stop3943" /> + id="stop3907" /> + style="stop-color:#ffff00;stop-opacity:1;" /> + id="stop3911" /> - - - - - + offset="0.40477183" + id="stop3901" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient3863"> + id="stop3865" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop3869" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="linearGradient3074" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.44761712,-0.03974624,0.03968572,-0.44819769,-44.347622,90.842439)" + x1="42.373707" + y1="5.7974987" + x2="52.323219" + y2="22.675821" /> + x2="-12.91594" + y1="55.312195" + x1="-13.054209" + id="linearGradient3895" + xlink:href="#linearGradient3897" /> + x2="13.874617" + y1="48.438316" + x1="17.603668" + id="linearGradient3935" + xlink:href="#linearGradient3937" /> + x2="-13.508098" + y1="54.813248" + x1="-13.22155" + id="linearGradient3882" + xlink:href="#linearGradient3937" /> - @@ -563,73 +489,42 @@ + id="layer1"> - + + id="path3815-2-3-8" + d="m -1.5700722,48.122238 a 11.543545,16.777716 0 1 1 -23.0870898,0 11.543545,16.777716 0 1 1 23.0870898,0 z" + transform="matrix(1.1357751,-0.74679771,0.75814626,1.1187739,6.8790101,-26.758312)" /> + d="m 15.748623,18.102341 c 6.326457,-3.916561 17.677642,-1.857519 25.961443,10.343973 7.531446,11.093323 6.233487,22.335097 -0.521518,27.196968 L 56.488591,44.631176 C 63.703947,39.149865 63.082169,27.921758 56.983564,18.077301 50.10104,6.9674261 38.626161,4.2123456 32.084664,7.9890807 z" /> + id="path3815" + d="m -2.4280634,48.122238 a 10.685554,16.777716 0 1 1 -21.3711066,0 10.685554,16.777716 0 1 1 21.3711066,0 z" + transform="matrix(0.83124933,-0.53551017,0.55487091,0.8022451,12.515187,-8.6993128)" /> + d="M 7.0663951,31.394552 C 17.066527,24.756926 36.306108,51.374843 25.695976,59.303434 l 11.929622,-8.914602 c 11.640747,-8.776616 -7.05728,-34.21213 -18.618933,-26.91968 z" /> - + + id="path3815-2-2" + d="m -2.2841215,48.122238 a 10.829495,16.777716 0 1 1 -21.6589905,0 10.829495,16.777716 0 1 1 21.6589905,0 z" + transform="matrix(0.3792391,-0.25314756,0.25314756,0.3792391,8.8844614,24.305486)" /> diff --git a/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg index 75589dd3ea..67a8075a95 100644 --- a/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg +++ b/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg @@ -1,161 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - PathWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + PathWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Path/Images/Tools/drill.svg b/src/Mod/Path/Images/Tools/drill.svg index 1eb08e786e..2d149e62aa 100644 --- a/src/Mod/Path/Images/Tools/drill.svg +++ b/src/Mod/Path/Images/Tools/drill.svg @@ -1,166 +1,114 @@ - - + version="1.1" + viewBox="0 0 210 297" + height="297mm" + width="210mm"> + style="overflow:visible;"> - - - - - - - - - - - - + id="marker8663" + style="overflow:visible;"> + + + + refY="0.0" + refX="0.0" + id="marker8589" + style="overflow:visible"> + id="path8587" + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" + transform="scale(0.8) translate(12.5,0)" /> + style="overflow:visible;" + id="Arrow1Lend" + refX="0.0" + refY="0.0" + orient="auto"> + + + + + + + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" /> + + + - - - @@ -174,107 +122,80 @@ + d="M 60.000001,36.999999 V 257 L 80,277.00001 100,257 V 36.999999 Z" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 60.000001,77 V 256.99999 L 80,277 100,256.99999 V 77 Z" + style="fill:#000000;fill-opacity:0.1372549;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 120,237 v 0 L 130,227 80,277.00001 30.000001,227 v 0 0" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path836" + style="opacity:1;fill:none;fill-opacity:0.1372549;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lend)" /> + d="M 60.000001,36.999999 V 17 17" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 100,36.999999 V 17" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 100,77 h 50" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 80,277.00001 h 70" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 140,77 V 277.00001" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker8617);marker-end:url(#marker8709)" /> + d="m 100,27 h 30" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker8589)" /> H + x="145.48189" + id="tspan8765">H D - D + α + x="70.101288" + id="tspan8783">α + d="M 30,27 H 59.999999" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8663-8)" /> diff --git a/src/Mod/Path/Images/Tools/endmill.svg b/src/Mod/Path/Images/Tools/endmill.svg index dbf3e746fc..a3a43ee4ba 100644 --- a/src/Mod/Path/Images/Tools/endmill.svg +++ b/src/Mod/Path/Images/Tools/endmill.svg @@ -1,404 +1,294 @@ - - + version="1.1" + viewBox="0 0 210 297.00001" + height="297mm" + width="210mm"> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1183" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1179" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1175" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1171" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path920" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path917" /> + refX="0" + refY="0" + orient="auto"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path899" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path923" /> + refX="0" + refY="0" + orient="auto"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path908" /> + refX="0" + refY="0" + orient="auto"> + id="path7495" /> + refX="0" + refY="0" + orient="auto"> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path7377" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -412,118 +302,95 @@ + transform="translate(0.19510138,82.181594)" + id="layer1"> + d="M 49.933333,-22.442786 V 68.899983 H 13 V 147.19377 H 160.73333 V 68.899983 H 123.8 v -91.342769 z" + style="fill:none;stroke:#000000;stroke-width:3.35350633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 86.866667,-35.491751 V 160.24274" + style="fill:none;stroke:#000000;stroke-width:1.26746702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:10.13973638, 2.53493409, 1.26746704, 2.53493409;stroke-dashoffset:0;stroke-opacity:1" /> + d="M 49.933333,-22.442786 V -61.589682" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 123.8,-22.442786 V -61.589682" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.73333,186.34067 v -39.1469" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 49.933333,-48.540717 H 123.8" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1181);marker-end:url(#marker1185)" /> + d="M 13,173.2917 H 160.73333" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1173);marker-end:url(#marker1177)" /> S + x="78.952225" + id="tspan5678">S D - D + HH + y="164.02852" + x="185.94191" /> + d="m 13,186.34067 v -39.1469" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 173.04444,68.899983 V 147.19377" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)" /> + d="m 160.73333,68.899983 h 24.62222" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.73333,147.19377 h 24.62222" + style="fill:none;stroke:#000000;stroke-width:0.82385355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="78.293793" + width="147.73334" + id="rect1191" + style="fill:#000000;fill-opacity:0.1365314;stroke:#000025;stroke-width:0.82385355;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/src/Mod/Path/Images/Tools/v-bit.svg b/src/Mod/Path/Images/Tools/v-bit.svg index ca9991a01d..d1f4f22e25 100644 --- a/src/Mod/Path/Images/Tools/v-bit.svg +++ b/src/Mod/Path/Images/Tools/v-bit.svg @@ -1,407 +1,294 @@ - - + version="1.1" + viewBox="0 0 210 297" + height="297mm" + width="210mm"> + style="overflow:visible"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(1.1,0,0,1.1,1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4878" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4730" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path4326" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(1.1,0,0,1.1,1.1,0)" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path3946" /> + refX="0" + refY="0" + orient="auto"> + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000025;fill-opacity:1;fill-rule:evenodd;stroke:#000025;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path920" /> + refX="0" + refY="0" + orient="auto"> - - - + id="path917" /> + + + + refX="0" + refY="0" + orient="auto"> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path7377" /> + style="overflow:visible"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -410,187 +297,143 @@ image/svg+xml - + + transform="translate(-2.9715041,189.05423)" + id="layer1"> + d="M 16.482124,-35.533338 H 161.08374 l -60.25067,63.90854 H 76.732798 Z" + style="fill:#000000;fill-opacity:0.1372549;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 52.632531,-125.00529 v 89.471952 H 16.482124 l 60.250677,63.90854 h 24.100269 l 60.25067,-63.90854 h -36.15041 v -89.471952 z" + style="fill:none;stroke:#000000;stroke-width:3.28361988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 88.782934,-137.787 V 41.156909" + style="fill:none;stroke:#000000;stroke-width:1.24105322;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:9.9284259, 2.48210647, 1.24105325, 2.48210647;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 52.632531,-125.00529 v -38.34513" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 124.93333,-125.00529 v -38.34513" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="matrix(12.050135,0,0,12.781708,4.431989,-176.13213)" + id="g7053"> + d="m 8,16 v 2" + id="path4536" /> + d="M 161.08374,79.502035 V -35.533338" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 52.632531,-150.56871 H 124.93333" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186);marker-end:url(#marker4584)" /> + d="m 100.83307,44.466662 v 0 h 24.10026" + style="fill:none;stroke:#000000;stroke-width:0.65865523;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4732)" /> + d="M 16.482124,66.720326 H 161.08374" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3948);marker-end:url(#marker4328)" /> S + x="81.176964" + id="tspan5678">S D + x="78.339798" + id="tspan5690">D + d="M 13.451117,38.457364 A 76.688599,72.377235 0 0 1 12.422369,139.63833" + id="path5698" + style="fill:none;fill-opacity:1;stroke:#000025;stroke-width:0.80668473;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)" /> α - α + d + x="28.921215" + id="tspan10475">d + d="m 50.833067,44.466662 v 0 h 24.100267" + style="fill:none;stroke:#000000;stroke-width:0.65865511;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4880)" /> + id="g7053-6" + transform="matrix(12.050135,0,0,12.781708,-19.668283,-176.13213)"> + d="m 8,16 v 2" + id="path4536-1" /> + d="M 16.482124,79.502035 V -35.533338" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 160.33172,-35.533338 24.60161,0" + style="fill:none;stroke:#000000;stroke-width:0.68599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 100.93333,28.466662 84,0" + style="fill:none;stroke:#000000;stroke-width:0.75753552;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 174.93333,28.466662 0,-64" + style="fill:none;stroke:#000000;stroke-width:0.80668455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker5072)" /> H + id="tspan7855">H diff --git a/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg index 655ee72326..baf553d109 100644 --- a/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg +++ b/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg @@ -1,51 +1,106 @@ - - - - - - image/svg+xml - - - - $committer - - - PointsWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + $committer + + + + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Points/Gui/Resources/icons/PointsWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg index 0d9c78ef36..0dacc1d718 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg @@ -1,306 +1,207 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - $committer - - - RaytracingWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + $committer + + + RaytracingWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + diff --git a/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg index 875408b268..08482c6463 100644 --- a/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg +++ b/src/Mod/ReverseEngineering/Gui/Resources/icons/ReverseEngineeringWorkbench.svg @@ -1,612 +1,309 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg index 08691975f2..63eee96477 100644 --- a/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg +++ b/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg @@ -1,90 +1,233 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - RobotWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + RobotWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Robot/Gui/Resources/icons/RobotWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index 9611416055..d76d0c9e19 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -121,6 +121,7 @@ PyMOD_INIT_FUNC(SketcherGui) SketcherGui::PropertyConstraintListItem ::init(); (void)new Gui::PrefPageProducer ( QT_TRANSLATE_NOOP("QObject","Sketcher") ); + (void)new Gui::PrefPageProducer ( QT_TRANSLATE_NOOP("QObject","Sketcher") ); (void)new Gui::PrefPageProducer ( QT_TRANSLATE_NOOP("QObject","Sketcher") ); // add resources and reloads the translators diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 190f38ddb3..c0db7a67eb 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -62,6 +62,7 @@ set(SketcherGui_UIC_SRCS SketchMirrorDialog.ui SketcherSettings.ui SketcherSettingsColors.ui + SketcherSettingsDisplay.ui SketchRectangularArrayDialog.ui SketcherRegularPolygonDialog.ui ) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 1cee7286d6..dce2f7c92f 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -7482,7 +7482,7 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() sToolTipText = QT_TR_NOOP("Create a regular polygon in the sketch"); sWhatsThis = "Sketcher_CreateRegularPolygon"; sStatusTip = sToolTipText; - sPixmap = "CreateRegularPolygon"; + sPixmap = "Sketcher_CreateRegularPolygon"; sAccel = ""; eType = ForEdit; } @@ -7490,7 +7490,11 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() void CmdSketcherCreateRegularPolygon::activated(int iMsg) { Q_UNUSED(iMsg); - ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(8) ); + + // Pop-up asking for values + SketcherRegularPolygonDialog srpd; + if (srpd.exec() == QDialog::Accepted) + ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd.sides)); } bool CmdSketcherCreateRegularPolygon::isActive(void) @@ -7530,12 +7534,9 @@ void CmdSketcherCompCreateRegularPolygon::activated(int iMsg) case 6: { // Pop-up asking for values - SketcherRegularPolygonDialog * srpd = new SketcherRegularPolygonDialog(); - - if (srpd->exec() == QDialog::Accepted) - ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd->sides)); - - delete srpd; + SketcherRegularPolygonDialog srpd; + if (srpd.exec() == QDialog::Accepted) + ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd.sides)); } break; default: @@ -7688,6 +7689,7 @@ void CreateSketcherCommandsCreateGeo(void) rcCmdMgr.addCommand(new CmdSketcherCreateHexagon()); rcCmdMgr.addCommand(new CmdSketcherCreateHeptagon()); rcCmdMgr.addCommand(new CmdSketcherCreateOctagon()); + rcCmdMgr.addCommand(new CmdSketcherCreateRegularPolygon()); rcCmdMgr.addCommand(new CmdSketcherCreateSlot()); rcCmdMgr.addCommand(new CmdSketcherCreateFillet()); //rcCmdMgr.addCommand(new CmdSketcherCreateText()); diff --git a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg index b84b01837d..95d9a6a2d8 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg @@ -1,190 +1,125 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [triplus] - - - SketcherWorkbench - 2016-02-26 - http://www.freecadweb.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + SketcherWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp index 09a7ef4f5d..2b9bae2c83 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp +++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp @@ -31,6 +31,7 @@ #include "SketcherSettings.h" #include "ui_SketcherSettings.h" +#include "ui_SketcherSettingsDisplay.h" #include "ui_SketcherSettingsColors.h" #include "TaskSketcherGeneral.h" #include @@ -48,13 +49,60 @@ SketcherSettings::SketcherSettings(QWidget* parent) : PreferencePage(parent), ui(new Ui_SketcherSettings) { ui->setupUi(this); - QGroupBox* groupBox = new QGroupBox(this); - QGridLayout* gridLayout = new QGridLayout(groupBox); + QGridLayout* gridLayout = new QGridLayout(ui->placeholder); gridLayout->setSpacing(0); gridLayout->setMargin(0); - form = new SketcherGeneralWidget(groupBox); + form = new SketcherGeneralWidget(ui->placeholder); gridLayout->addWidget(form, 0, 0, 1, 1); - ui->gridLayout_3->addWidget(groupBox, 1, 0, 1, 1); +} + +/** + * Destroys the object and frees any allocated resources + */ +SketcherSettings::~SketcherSettings() +{ + // no need to delete child widgets, Qt does it all for us + delete ui; +} + +void SketcherSettings::saveSettings() +{ + // Sketch editing + ui->checkBoxAdvancedSolverTaskBox->onSave(); + ui->checkBoxRecalculateInitialSolutionWhileDragging->onSave(); + ui->checkBoxNotifyConstraintSubstitutions->onSave(); + form->saveSettings(); +} + +void SketcherSettings::loadSettings() +{ + // Sketch editing + ui->checkBoxAdvancedSolverTaskBox->onRestore(); + ui->checkBoxRecalculateInitialSolutionWhileDragging->onRestore(); + ui->checkBoxNotifyConstraintSubstitutions->onRestore(); + form->loadSettings(); +} + +/** + * Sets the strings of the subwidgets using the current language. + */ +void SketcherSettings::changeEvent(QEvent *e) +{ + if (e->type() == QEvent::LanguageChange) { + ui->retranslateUi(this); + } + else { + QWidget::changeEvent(e); + } +} + + +/* TRANSLATOR SketcherGui::SketcherSettingsDisplay */ + +SketcherSettingsDisplay::SketcherSettingsDisplay(QWidget* parent) + : PreferencePage(parent), ui(new Ui_SketcherSettingsDisplay) +{ + ui->setupUi(this); QList < QPair > styles; styles << qMakePair(Qt::SolidLine, 0xffff) @@ -86,29 +134,24 @@ SketcherSettings::SketcherSettings(QWidget* parent) /** * Destroys the object and frees any allocated resources */ -SketcherSettings::~SketcherSettings() +SketcherSettingsDisplay::~SketcherSettingsDisplay() { // no need to delete child widgets, Qt does it all for us delete ui; } -void SketcherSettings::saveSettings() +void SketcherSettingsDisplay::saveSettings() { - // Sketch editing ui->EditSketcherFontSize->onSave(); ui->SegmentsPerGeometry->onSave(); ui->dialogOnDistanceConstraint->onSave(); ui->continueMode->onSave(); ui->constraintMode->onSave(); ui->checkBoxHideUnits->onSave(); - ui->checkBoxAdvancedSolverTaskBox->onSave(); - ui->checkBoxRecalculateInitialSolutionWhileDragging->onSave(); ui->checkBoxTVHideDependent->onSave(); ui->checkBoxTVShowLinks->onSave(); ui->checkBoxTVShowSupport->onSave(); ui->checkBoxTVRestoreCamera->onSave(); - ui->checkBoxNotifyConstraintSubstitutions->onSave(); - form->saveSettings(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Part"); QVariant data = ui->comboBox->itemData(ui->comboBox->currentIndex()); @@ -116,23 +159,18 @@ void SketcherSettings::saveSettings() hGrp->SetInt("GridLinePattern", pattern); } -void SketcherSettings::loadSettings() +void SketcherSettingsDisplay::loadSettings() { - // Sketch editing ui->EditSketcherFontSize->onRestore(); ui->SegmentsPerGeometry->onRestore(); ui->dialogOnDistanceConstraint->onRestore(); ui->continueMode->onRestore(); ui->constraintMode->onRestore(); ui->checkBoxHideUnits->onRestore(); - ui->checkBoxAdvancedSolverTaskBox->onRestore(); - ui->checkBoxRecalculateInitialSolutionWhileDragging->onRestore(); ui->checkBoxTVHideDependent->onRestore(); ui->checkBoxTVShowLinks->onRestore(); ui->checkBoxTVShowSupport->onRestore(); ui->checkBoxTVRestoreCamera->onRestore(); - ui->checkBoxNotifyConstraintSubstitutions->onRestore(); - form->loadSettings(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Part"); int pattern = hGrp->GetInt("GridLinePattern", 0x0f0f); @@ -144,7 +182,7 @@ void SketcherSettings::loadSettings() /** * Sets the strings of the subwidgets using the current language. */ -void SketcherSettings::changeEvent(QEvent *e) +void SketcherSettingsDisplay::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { ui->retranslateUi(this); @@ -154,7 +192,7 @@ void SketcherSettings::changeEvent(QEvent *e) } } -void SketcherSettings::onBtnTVApplyClicked(bool) +void SketcherSettingsDisplay::onBtnTVApplyClicked(bool) { QString errMsg; try{ diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.h b/src/Mod/Sketcher/Gui/SketcherSettings.h index 0b3ba698a8..6887f217f9 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.h +++ b/src/Mod/Sketcher/Gui/SketcherSettings.h @@ -28,6 +28,7 @@ namespace SketcherGui { class Ui_SketcherSettings; +class Ui_SketcherSettingsDisplay; class Ui_SketcherSettingsColors; class SketcherGeneralWidget; /** @@ -48,11 +49,34 @@ public: protected: void changeEvent(QEvent *e); +private: + Ui_SketcherSettings* ui; + SketcherGeneralWidget* form; +}; + +/** + * The SketcherSettings class implements a preference page to change sketcher display settings. + * @author Werner Mayer + */ +class SketcherSettingsDisplay : public Gui::Dialog::PreferencePage +{ + Q_OBJECT + +public: + SketcherSettingsDisplay(QWidget* parent = 0); + ~SketcherSettingsDisplay(); + + void saveSettings(); + void loadSettings(); + +protected: + void changeEvent(QEvent *e); + private Q_SLOTS: void onBtnTVApplyClicked(bool); private: - Ui_SketcherSettings* ui; + Ui_SketcherSettingsDisplay* ui; SketcherGeneralWidget* form; }; diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index fd0e88326e..0247f18a4c 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -7,380 +7,21 @@ 0 0 602 - 720 + 614 General - + - + - Sketch editing + Sketcher - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 0 - 0 - - - - Notifications - - - - - - Notifies about automatic constraint substitutions - - - Notify automatic constraint substitutions - - - true - - - NotifyConstraintSubstitutions - - - Mod/Sketcher/General - - - - - - - - - - - 182 - 0 - - - - Font size - - - - - - - Font size used for labels and constraints - - - px - - - 1 - - - 100 - - - 17 - - - EditSketcherFontSize - - - View - - - - - - - Line pattern used for grid lines - - - -1 - - - - - - - A dialog will pop up to input a value for new dimensional constraints - - - Ask for value after creating a dimensional constraint - - - true - - - ShowDialogOnDistanceConstraint - - - Mod/Sketcher - - - - - - - Grid line pattern - - - - - - - Current sketcher creation tool will remain active after creation - - - Geometry creation "Continue Mode" - - - true - - - ContinuousCreationMode - - - Mod/Sketcher - - - - - - - Current constraint creation tool will remain active after creation - - - Constraint creation "Continue Mode" - - - true - - - ContinuousConstraintMode - - - Mod/Sketcher - - - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 0 - 0 - - - - Visibility automation - - - - - - When opening sketch, hide all features that depend on it - - - Hide all objects that depend on the sketch - - - true - - - HideDependent - - - Mod/Sketcher/General - - - - - - - When opening sketch, show sources for external geometry links - - - Show objects used for external geometry - - - true - - - ShowLinks - - - Mod/Sketcher/General - - - - - - - When opening sketch, show objects the sketch is attached to - - - Show object(s) sketch is attached to - - - true - - - ShowSupport - - - Mod/Sketcher/General - - - - - - - When closing sketch, move camera back to where it was before sketch was opened - - - Restore camera position after editing - - - true - - - RestoreCamera - - - Mod/Sketcher/General - - - - - - - - 0 - 0 - - - - Note: these settings are defaults applied to new sketches. The behavior is remembered for each sketch individually as properties on View tab. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - true - - - - - - - - 0 - 0 - - - - Applies current visibility automation settings to all sketches in open documents - - - Apply to existing sketches - - - - - - - - - - Segments per geometry - - - - - - - Number of polygons for geometry approximation - - - 50 - - - 1000 - - - SegmentsPerGeometry - - - View - - - - - - - Base length units will not be displayed in constraints. -Supports all unit systems except 'US customary' and 'Building US/Euro'. - - - Hide base length units for supported unit systems - - - HideUnits - - - Mod/Sketcher - - - - - + Sketcher solver @@ -406,7 +47,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - + Dragging performance @@ -435,14 +76,77 @@ Requires to re-enter edit mode to take effect. + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + Notifications + + + + + + Notifies about automatic constraint substitutions + + + Notify automatic constraint substitutions + + + true + + + NotifyConstraintSubstitutions + + + Mod/Sketcher/General + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
- Gui::PrefCheckBox QCheckBox @@ -450,15 +154,6 @@ Requires to re-enter edit mode to take effect. - EditSketcherFontSize - comboBox - dialogOnDistanceConstraint - continueMode - checkBoxTVHideDependent - checkBoxTVShowLinks - checkBoxTVShowSupport - checkBoxTVRestoreCamera - btnTVApply checkBoxAdvancedSolverTaskBox diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui b/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui new file mode 100644 index 0000000000..55e3502b76 --- /dev/null +++ b/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui @@ -0,0 +1,368 @@ + + + SketcherGui::SketcherSettingsDisplay + + + + 0 + 0 + 602 + 608 + + + + Display + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Sketch editing + + + + + + A dialog will pop up to input a value for new dimensional constraints + + + Ask for value after creating a dimensional constraint + + + true + + + ShowDialogOnDistanceConstraint + + + Mod/Sketcher + + + + + + + Segments per geometry + + + + + + + Current constraint creation tool will remain active after creation + + + Constraint creation "Continue Mode" + + + true + + + ContinuousConstraintMode + + + Mod/Sketcher + + + + + + + Line pattern used for grid lines + + + -1 + + + + + + + Base length units will not be displayed in constraints. +Supports all unit systems except 'US customary' and 'Building US/Euro'. + + + Hide base length units for supported unit systems + + + HideUnits + + + Mod/Sketcher + + + + + + + + 182 + 0 + + + + Font size + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + Visibility automation + + + + + + When opening sketch, hide all features that depend on it + + + Hide all objects that depend on the sketch + + + true + + + HideDependent + + + Mod/Sketcher/General + + + + + + + When opening sketch, show sources for external geometry links + + + Show objects used for external geometry + + + true + + + ShowLinks + + + Mod/Sketcher/General + + + + + + + When opening sketch, show objects the sketch is attached to + + + Show object(s) sketch is attached to + + + true + + + ShowSupport + + + Mod/Sketcher/General + + + + + + + When closing sketch, move camera back to where it was before sketch was opened + + + Restore camera position after editing + + + true + + + RestoreCamera + + + Mod/Sketcher/General + + + + + + + + 0 + 0 + + + + Note: these settings are defaults applied to new sketches. The behavior is remembered for each sketch individually as properties on View tab. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + true + + + + + + + + 0 + 0 + + + + Applies current visibility automation settings to all sketches in open documents + + + Apply to existing sketches + + + + + + + + + + Font size used for labels and constraints + + + px + + + 1 + + + 100 + + + 17 + + + EditSketcherFontSize + + + View + + + + + + + Current sketcher creation tool will remain active after creation + + + Geometry creation "Continue Mode" + + + true + + + ContinuousCreationMode + + + Mod/Sketcher + + + + + + + Grid line pattern + + + + + + + Number of polygons for geometry approximation + + + 50 + + + 1000 + + + SegmentsPerGeometry + + + View + + + + + + + + + + + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+ + + Gui::PrefCheckBox + QCheckBox +
Gui/PrefWidgets.h
+ + + + EditSketcherFontSize + comboBox + dialogOnDistanceConstraint + continueMode + checkBoxTVHideDependent + checkBoxTVShowLinks + checkBoxTVShowSupport + checkBoxTVRestoreCamera + btnTVApply + + + + diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index d9d784bfc4..d870eadcd8 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -182,7 +182,8 @@ inline void SketcherAddWorkspaceRegularPolygon(Gui::MenuItem& geo << "Sketcher_CreatePentagon" << "Sketcher_CreateHexagon" << "Sketcher_CreateHeptagon" - << "Sketcher_CreateOctagon"; + << "Sketcher_CreateOctagon" + << "Sketcher_CreateRegularPolygon"; } template <> inline void SketcherAddWorkspaceRegularPolygon(Gui::ToolBarItem& geom){ diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg index 85c337b618..ca6cea97bd 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg @@ -1,30 +1,87 @@ - - - - - - + + + + + - - - - - + + + + + - - - + + - - - - + - + image/svg+xml - - + + [triplus] @@ -53,12 +110,37 @@ - - - - - - - + + + + + + + diff --git a/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg index c5583b64dd..4227f68e0b 100644 --- a/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg +++ b/src/Mod/Start/Gui/Resources/icons/StartWorkbench.svg @@ -1,6 +1,4 @@ - - + height="64px" + width="64px"> + id="stop3796" /> + id="stop3798" /> + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - + xlink:href="#linearGradient3841" /> - + + x2="3935.5251" + y1="1286.7291" + x1="3709.3296" + gradientUnits="userSpaceOnUse" + id="linearGradient2991-3" + xlink:href="#linearGradient3841-6" /> + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - - - @@ -163,20 +117,14 @@ + id="layer1"> + d="M 61,31 31,5 l 0,14 -24,0 0,24 24,0 0,14 z" + style="fill:url(#linearGradient2991);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="M 58,31 33.012263,9.3801382 33,21 9,21 l 0,20 24,0 0,11.600864 z" + style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp index 2851329ce1..41baf3deaf 100644 --- a/src/Mod/Start/Gui/Workbench.cpp +++ b/src/Mod/Start/Gui/Workbench.cpp @@ -168,6 +168,6 @@ Gui::DockWindowItems* StartGui::Workbench::setupDockWindows() const { Gui::DockWindowItems* root = Gui::StdWorkbench::setupDockWindows(); root->setVisibility(false); // hide all dock windows by default - root->setVisibility("Std_CombiView",true); // except of the combi view + root->setVisibility("Std_ComboView",true); // except of the combo view return root; } diff --git a/src/Mod/Start/StartPage/images/new_file_thumbnail.svg b/src/Mod/Start/StartPage/images/new_file_thumbnail.svg index d5250e9658..e1b1dfe3c1 100644 --- a/src/Mod/Start/StartPage/images/new_file_thumbnail.svg +++ b/src/Mod/Start/StartPage/images/new_file_thumbnail.svg @@ -1,6 +1,4 @@ - - + height="128" + width="128"> + style="stop-color:black;stop-opacity:0;" /> + id="stop5056" /> + style="stop-color:black;stop-opacity:0;" /> + style="stop-color:#000000;stop-opacity:1;" /> + style="stop-color:#000000;stop-opacity:0;" /> + r="15.821514" + fy="42.07798" + fx="24.306795" + cy="42.07798" + cx="24.306795" + id="radialGradient4548" + xlink:href="#linearGradient4542" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#f8f8f8;stop-opacity:1.0000000;" /> + cy="64.567902" + r="5.257" + fx="20.892099" + fy="64.567902" + gradientUnits="userSpaceOnUse"> + id="stop15573" /> + id="stop15575" /> + cy="114.5684" + r="5.256" + fx="20.892099" + fy="114.5684" + gradientUnits="userSpaceOnUse"> + id="stop15566" /> + id="stop15568" /> + style="stop-color:#a3a3a3;stop-opacity:1.0000000;" /> + style="stop-color:#4c4c4c;stop-opacity:1.0000000;" /> + style="stop-color:#fafafa;stop-opacity:1.0000000;" /> + style="stop-color:#bbbbbb;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#fff520;stop-opacity:0.89108908;" /> + style="stop-color:#fff300;stop-opacity:0.0000000;" /> - @@ -173,7 +139,7 @@ image/svg+xml - New Document + Jakub Steiner @@ -201,35 +167,29 @@ + transform="translate(0,80)" + id="layer6" /> + id="layer1" /> + id="layer4"> + y="-80" + x="0" + height="128" + width="128" + id="rect911" + style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.05882353;fill-rule:evenodd;stroke:none;stroke-width:7.5590539;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="M 63.939453 24 A 4.0004 4.0004 0 0 0 60 28.056641 L 60 60 L 28.056641 60 A 4.0004 4.0004 0 1 0 28.056641 68 L 60 68 L 60 99.943359 A 4.0004 4.0004 0 1 0 68 99.943359 L 68 68 L 99.943359 68 A 4.0004 4.0004 0 1 0 99.943359 60 L 68 60 L 68 28.056641 A 4.0004 4.0004 0 0 0 63.939453 24 z " + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.3137255;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index 4920d6228d..f23caf1293 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -441,11 +441,10 @@ double DrawView::prefScale(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); - double result = hGrp->GetInt("DefaultViewScale", 1.0); + double result = hGrp->GetFloat("DefaultViewScale", 1.0); return result; } - void DrawView::requestPaint(void) { // Base::Console().Message("DV::requestPaint() - %s\n", getNameInDocument()); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui index 27c66fc48a..2ee018e38b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui @@ -6,7 +6,7 @@ 0 0 - 439 + 460 829 @@ -216,7 +216,7 @@ for ProjectionGroups Normal line color - + 0 0 @@ -286,7 +286,7 @@ for ProjectionGroups Preselection color - + 255 255 @@ -318,7 +318,7 @@ for ProjectionGroups Section face color - + 225 225 @@ -350,7 +350,7 @@ for ProjectionGroups Selected item color - + 28 173 @@ -382,7 +382,7 @@ for ProjectionGroups Section face hatch color - + 0 0 @@ -414,7 +414,7 @@ for ProjectionGroups Window background color - + 80 80 @@ -446,7 +446,7 @@ for ProjectionGroups Geometric hatch color - + 0 0 @@ -473,7 +473,7 @@ for ProjectionGroups Color of Dimension lines and text. - + 0 0 @@ -565,7 +565,7 @@ for ProjectionGroups Face color - + 255 255 @@ -597,7 +597,7 @@ for ProjectionGroups Default color for annotations - + 0 0 @@ -733,7 +733,7 @@ for ProjectionGroups - + 0 @@ -743,7 +743,7 @@ for ProjectionGroups Label size - + 8.000000000000000 @@ -793,7 +793,7 @@ for ProjectionGroups - + 0 @@ -844,7 +844,7 @@ for ProjectionGroups - + 0 @@ -854,6 +854,9 @@ for ProjectionGroups Starting directory for menu 'Insert Page using Template' + + Gui::FileChooser::Directory + TemplateDir @@ -881,7 +884,7 @@ for ProjectionGroups - + 0 @@ -918,7 +921,7 @@ for ProjectionGroups - + 0 @@ -955,7 +958,7 @@ for ProjectionGroups - + 0 @@ -965,6 +968,9 @@ for ProjectionGroups Default directory for welding symbols + + Gui::FileChooser::Directory + WeldingDir @@ -992,7 +998,7 @@ for ProjectionGroups - + 0 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui index aa7d47f037..6d1470267e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui @@ -28,8 +28,20 @@ - - + + + + + true + + + + Edge End Cap + + + + + 0 @@ -37,31 +49,25 @@ - Dump intermediate results during Detail processing + Dump intermediate results during Section processing - Debug Detail + Debug Section - debugDetail + debugSection - Mod/TechDraw/debugDetail + Mod/TechDraw/debug - - - - Qt::Horizontal + + + + Max Svg Hatch Tiles - - - 40 - 20 - - - + @@ -90,6 +96,116 @@ + + + + + 0 + 0 + + + + Dump intermediate results during Detail processing + + + Debug Detail + + + debugDetail + + + Mod/TechDraw/debugDetail + + + + + + + Limit on number of 64x64 Svg tiles used to hatch a single face + + + 1 + + + 1000000 + + + 100 + + + 10000 + + + MaxSVGTile + + + Mod/TechDraw/Decorations + + + + + + + + 0 + 0 + + + + If checked, TechDraw will attempt to build faces using the +line segments returned by the hidden line removal algorithm. +Faces must be detected in order to use hatching, but there +can be a performance penalty in complex models. + + + Detect Faces + + + true + + + HandleFaces + + + /Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + Include edges with unexpected geometry (zero length etc) to be included in results. + + + Allow Crazy Edges + + + allowCrazyEdge + + + Mod/TechDraw/debug + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -129,68 +245,6 @@ - - - - - 0 - 0 - - - - Include edges with unexpected geometry (zero length etc) to be included in results. - - - Allow Crazy Edges - - - allowCrazyEdge - - - Mod/TechDraw/debug - - - - - - - - 0 - 0 - - - - If checked, TechDraw will attempt to build faces using the -line segments returned by the hidden line removal algorithm. -Faces must be detected in order to use hatching, but there -can be a performance penalty in complex models. - - - Detect Faces - - - true - - - UseGlobalDecimals - - - /Mod/TechDraw/Dimensions - - - - - - - - true - - - - Edge End Cap - - - @@ -213,25 +267,35 @@ can be a performance penalty in complex models. - - - - - 0 - 0 - - - - Dump intermediate results during Section processing - + + - Debug Section + Max PAT Hatch Segs + + + + + + + The maximum number of hatch line segments to use when hatching a face with a PAT pattern + + + 1 + + + 1000000 + + + 100 + + + 10000 - debugSection + MaxSeg - Mod/TechDraw/debug + Mod/TechDraw/PAT @@ -275,6 +339,11 @@ can be a performance penalty in complex models. + + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+ Gui::PrefCheckBox QCheckBox diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp index 9a61cee942..7ade224bc3 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp @@ -50,6 +50,8 @@ void DlgPrefsTechDraw4Imp::saveSettings() cbDebugDetail->onSave(); cbShowSectionEdges->onSave(); cbFuseBeforeSection->onSave(); + sbMaxTiles->onSave(); + sbMaxPat->onSave(); } void DlgPrefsTechDraw4Imp::loadSettings() @@ -61,6 +63,8 @@ void DlgPrefsTechDraw4Imp::loadSettings() cbDebugDetail->onRestore(); cbShowSectionEdges->onRestore(); cbFuseBeforeSection->onRestore(); + sbMaxTiles->onRestore(); + sbMaxPat->onRestore(); } /** diff --git a/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg index 9e278806e9..cb76960ed2 100644 --- a/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg +++ b/src/Mod/Test/Gui/Resources/icons/TestWorkbench.svg @@ -1,6 +1,4 @@ - - + id="svg2" + height="64" + width="64"> + style="stop-color:#555753;stop-opacity:1" /> + style="stop-color:#babdb6;stop-opacity:1" /> + style="stop-color:#888a85;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#888a85;stop-opacity:1" /> + style="stop-color:#d3d7cf;stop-opacity:1" /> + style="stop-color:#8f5902;stop-opacity:1" /> + style="stop-color:#e9b96e;stop-opacity:1" /> + x2="29.677343" + y1="56.068802" + x1="34.94899" + id="linearGradient3789" + xlink:href="#linearGradient3783" /> + x2="43.3125" + y1="22.874998" + x1="48.625" + id="linearGradient3815" + xlink:href="#linearGradient3809" /> + x2="35.803085" + y1="11.473497" + x1="38.244366" + id="linearGradient3841" + xlink:href="#linearGradient3835" /> + x2="51.800217" + y1="28.469421" + x1="52.817749" + id="linearGradient3867" + xlink:href="#linearGradient3861" /> - - - @@ -140,72 +97,49 @@ image/svg+xml - + + transform="translate(0,-988.36218)" + id="layer1"> + d="M 3,53 39,17 45,23 9,59 z" + style="fill:url(#linearGradient3789);stroke:#271903;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="m 5.8481613,1041.3622 33.2277577,-33.2657 3.392646,2.981 -33.4495852,33.4555 z" + style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="m 53,19 c 1,1 3,1 4,0 l 4,4 -10,10 -4,-4 c 1,-1 1,-3 0,-4 z" + style="fill:url(#linearGradient3867);stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="M 49,10 C 36,3 30,3 17,13 28,10 32,10 37,14 z" + style="fill:url(#linearGradient3841);stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" /> + d="m 46,999.36218 c -7.177936,-4.84816 -15.442467,-4.8363 -19.734282,-1.92408 8.810201,-1.5694 12.213523,4.8719 15.163701,5.5563 z" + style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:58.79999923999999800;stroke-opacity:1;stroke-dasharray:none" /> + d="m 51.993137,1009.0401 c 1.187891,0.9195 2.745311,1.4563 4.631081,0.7784 l 1.536831,1.5303 -7.134207,7.161 -1.530274,-1.4766 c 0.610798,-1.3489 -0.01342,-3.5973 -0.812109,-4.6376 z" + style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#2e3436;stroke-width:2.12500000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000" /> + id="path2989-7" + style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.83333302000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000" /> diff --git a/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg index cb1cb2822c..22fbb87c40 100644 --- a/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg +++ b/src/Mod/Web/Gui/Resources/icons/WebWorkbench.svg @@ -1,6 +1,4 @@ - - + height="64" + width="64"> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> - + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#fefefe;stop-opacity:1.0000000;" /> + style="stop-color:#1d1d1d;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + style="stop-color:#ffffff;stop-opacity:0.16494845;" /> + style="stop-color:#000000;stop-opacity:1;" /> + style="stop-color:#000000;stop-opacity:0;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#4074ae;stop-opacity:1.0000000;" /> + style="stop-color:#36486c;stop-opacity:1.0000000;" /> + fy="15.716079" + fx="18.247644" + cy="15.716079" + cx="18.247644" + gradientTransform="matrix(1.3888978,0,0,1.3889284,-2.124907,-18.68781)" + id="radialGradient3968" + xlink:href="#linearGradient3962" /> + fy="63.965389" + fx="15.115514" + cy="63.965389" + cx="15.115514" + gradientTransform="scale(1.64399,0.608276)" + id="radialGradient4120" + xlink:href="#linearGradient4114" /> + fy="12.142302" + fx="15.601279" + cy="12.142302" + cx="15.601279" + gradientTransform="matrix(1.3582501,0,0,1.3582491,-1.3715663,-17.89974)" + id="radialGradient4132" + xlink:href="#linearGradient4126" /> + fy="10.476453" + fx="11.826907" + cy="10.476453" + cx="11.826907" + gradientTransform="scale(1.179536,0.847791)" + id="radialGradient4356" + xlink:href="#linearGradient4350" /> + x2="21.962091" + y1="38.552639" + x1="29.357769" + id="linearGradient3908" + xlink:href="#linearGradient3902" /> + x2="14.566413" + y1="36.323967" + x1="31.576473" + id="linearGradient3908-3" + xlink:href="#linearGradient3902-6" /> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> + xlink:href="#linearGradient3902-6" /> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + id="linearGradient4365" + gradientUnits="userSpaceOnUse" + x1="31.576473" + y1="36.323967" + x2="14.566413" + y2="9.5799379" /> + id="filter4864" + color-interpolation-filters="sRGB"> + result="result6" /> - + + operator="atop" + in2="SourceAlpha" + in="result8" /> + style="stop-color:#4e9a06;stop-opacity:1" /> + style="stop-color:#8ae234;stop-opacity:1" /> + id="linearGradient4363-9" + gradientUnits="userSpaceOnUse" + x1="31.576473" + y1="36.323967" + x2="14.566413" + y2="9.5799379" /> + fy="15.716079" + fx="18.247644" + cy="15.716079" + cx="18.247644" + gradientTransform="matrix(1.3888978,0,0,1.3889284,-2.124907,-18.68781)" + id="radialGradient3968-4" + xlink:href="#linearGradient3962-7" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#d3e9ff;stop-opacity:1.0000000;" /> + style="stop-color:#4074ae;stop-opacity:1.0000000;" /> + style="stop-color:#36486c;stop-opacity:1.0000000;" /> - - - @@ -1024,7 +882,7 @@ image/svg+xml - Globe + Jakub Steiner @@ -1061,402 +919,359 @@ + transform="translate(0,16)" + id="layer1"> + id="path4112" + style="fill:url(#radialGradient4120);fill-opacity:1;stroke:none;stroke-width:1.29144747" /> + d="M 58.931509,13.931507 C 58.931509,28.806375 46.872822,40.864925 32,40.864925 17.125816,40.864925 5.0678105,28.806239 5.0678105,13.931507 5.0678105,-0.94267845 17.125816,-13 32,-13 c 14.872822,0 26.931509,12.05732155 26.931509,26.931507 l 0,0 z" + style="fill:url(#radialGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1" /> + id="path4348" + style="opacity:0.42159382000000001;fill:url(#radialGradient4356);fill-opacity:1;stroke:none;stroke-width:1.57495408" /> + id="g3216-2"> + style="color:#000000;fill:url(#linearGradient4289);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3218-9"> + style="color:#000000;fill:url(#linearGradient4287);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3222-1"> + id="path3224-2" + d="m 44.0713,20.7144 c 0,0.2627 0,0 0,0 l -0.5449,0.6172 c -0.334,-0.3936 -0.709,-0.7246 -1.0898,-1.0703 l -0.8359,0.123 -0.7637,-0.8633 0,1.0684 0.6543,0.4951 0.4355,0.4932 0.582,-0.6582 c 0.1465,0.2744 0.291,0.5488 0.4365,0.8232 l 0,0.8223 -0.6553,0.7402 -1.1992,0.8232 -0.9082,0.9063 -0.582,-0.6602 0.291,-0.7402 -0.5811,-0.6582 -0.9814,-2.0977 -0.8359,-0.9453 -0.2188,0.2461 0.3281,1.1934 0.6172,0.6992 c 0.3525,1.0176 0.7012,1.9902 1.1641,2.9629 0.7178,0 1.3945,-0.0762 2.1074,-0.166 l 0,0.5762 -0.8721,2.1392 -0.7998,0.9043 -0.6543,1.4004 c 0,0.7676 0,1.5352 0,2.3027 l 0.2188,0.9063 -0.3633,0.4102 -0.8008,0.4941 -0.8359,0.6992 0.6914,0.7813 -0.9453,0.8242 0.1816,0.5332 -1.418,1.6055 -0.9443,0 -0.7998,0.4941 -0.5098,0 0,-0.6582 -0.2168,-1.3184 c -0.2813,-0.8262 -0.5742,-1.6465 -0.8721,-2.4668 0,-0.6055 0.0361,-1.2051 0.0723,-1.8105 l 0.3643,-0.8223 -0.5098,-0.9883 0.0371,-1.3574 -0.6914,-0.7813 0.3457,-1.1309 -0.5625,-0.6382 -0.9824,0 -0.3271,-0.3701 -0.9814,0.6177 -0.3994,-0.4536 -0.9092,0.7817 c -0.6172,-0.6997 -1.2354,-1.3989 -1.8535,-2.0981 l -0.7266,-1.7285 0.6543,-0.9863 -0.3633,-0.4111 0.7988,-1.8936 c 0.6563,-0.8164 1.3418,-1.5996 2.0352,-2.3857 l 1.2363,-0.3291 1.3809,-0.1641 0.9453,0.2471 1.3447,1.3564 0.4727,-0.5342 0.6533,-0.082 1.2363,0.4111 0.9453,0 0.6543,-0.5762 0.291,-0.4111 -0.6553,-0.4111 -1.0908,-0.082 c -0.3027,-0.4199 -0.584,-0.8613 -0.9434,-1.2344 l -0.3643,0.1641 -0.1455,1.0703 -0.6543,-0.7402 -0.1445,-0.8242 -0.7266,-0.5742 -0.292,0 0.7275,0.8223 -0.291,0.7402 -0.5811,0.1641 0.3633,-0.7402 -0.6553,-0.3281 -0.5801,-0.6582 -1.0918,0.2461 -0.1445,0.3281 -0.6543,0.4121 -0.3633,0.9053 -0.9082,0.4521 -0.4004,-0.4521 -0.4355,0 0,-1.4814 0.9453,-0.4941 0.7266,0 -0.1465,-0.5752 -0.5801,-0.5762 0.9805,-0.2061 0.5449,-0.6162 0.4355,-0.7412 0.8008,0 -0.2188,-0.5752 0.5098,-0.3291 0,0.6582 1.0898,0.2461 1.0898,-0.9043 0.0732,-0.4121 0.9443,-0.6577 c -0.3418,0.0425 -0.6836,0.0737 -1.0176,0.1646 l 0,-0.7411 0.3633,-0.8228 -0.3633,0 -0.7984,0.7402 -0.2188,0.4116 0.2188,0.5767 -0.3643,0.9863 -0.5811,-0.3291 -0.5078,-0.5752 -0.8008,0.5752 -0.291,-1.3159 1.3809,-0.9048 0,-0.4941 0.873,-0.5757 1.3809,-0.3296 0.9453,0.3296 1.7441,0.3291 -0.4355,0.4932 -0.9453,0 0.9453,0.9873 0.7266,-0.8223 0.2207,-0.3618 c 0,0 2.7871,2.498 4.3799,5.2305 1.5928,2.7334 2.3408,5.9551 2.3408,6.6094 z" /> + style="color:#000000;fill:url(#linearGradient4295);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3226-7"> + style="color:#000000;fill:url(#linearGradient4293);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3230-0"> + id="path3232-9" + d="m 26.0703,9.2363 -0.0732,0.4932 0.5098,0.3291 0.8711,-0.5757 -0.4355,-0.4937 -0.582,0.3296 -0.29,-0.0825" /> + style="color:#000000;fill:url(#linearGradient4301);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3234-3"> + style="color:#000000;fill:url(#linearGradient4299);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3238-6"> + id="path3240-0" + d="m 26.8701,5.8633 -1.8906,-0.7407 -2.1797,0.2466 -2.6904,0.7402 -0.5088,0.4941 1.6719,1.1514 0,0.6582 -0.6543,0.6582 0.873,1.729 0.5801,-0.3301 0.7285,-1.1514 c 1.123,-0.3472 2.1299,-0.7407 3.1973,-1.2344 l 0.873,-2.2212" /> + style="color:#000000;fill:url(#linearGradient4307);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3242-6"> + style="color:#000000;fill:url(#linearGradient4305);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3246-2"> + id="path3248-6" + d="m 28.833,12.7749 -0.291,-0.7412 -0.5098,0.165 0.1465,0.9043 0.6543,-0.3281" /> + style="color:#000000;fill:url(#linearGradient4313);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3250-1"> + style="color:#000000;fill:url(#linearGradient4311);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3254-8"> + id="path3256-7" + d="m 29.123,12.6089 -0.1455,0.9883 0.7998,-0.165 0.5811,-0.5752 -0.5088,-0.4941 C 29.6787,11.9078 29.4824,11.483 29.2685,11.0465 l -0.4355,0 0,0.4932 0.29,0.3291 0,0.7402" /> + style="color:#000000;fill:url(#linearGradient4319);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3258-9"> + style="color:#000000;fill:url(#linearGradient4317);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3262-2"> + id="path3264-0" + d="m 18.3652,28.2422 -0.582,-1.1523 -1.0903,-0.2466 -0.5815,-1.5625 -1.4536,0.1641 -1.2354,-0.9043 -1.3091,1.1514 0,0.1816 c -0.396,-0.1143 -0.8828,-0.1299 -1.2354,-0.3467 l -0.291,-0.8223 0,-0.9053 -0.8721,0.082 c 0.0728,-0.5762 0.145,-1.1514 0.2183,-1.7275 l -0.5093,0 -0.5083,0.6582 -0.5093,0.2461 -0.7271,-0.4102 -0.0728,-0.9053 0.1455,-0.9873 1.0908,-0.8223 0.8721,0 0.145,-0.4941 1.0903,0.2461 0.7998,0.9883 0.1455,-1.6465 1.3813,-1.1514 0.5088,-1.2344 1.0176,-0.4111 0.5815,-0.8223 1.3081,-0.248 0.6548,-0.9863 c -0.6543,0 -1.3086,0 -1.9629,0 l 1.2358,-0.5762 0.8716,0 1.2363,-0.4121 0.1455,-0.4922 -0.4365,-0.4121 -0.5088,-0.165 0.1455,-0.4932 -0.3633,-0.7402 -0.8726,0.3281 0.1455,-0.6577 -1.0176,-0.5762 -0.7993,1.3979 0.0723,0.4941 -0.7993,0.3301 -0.5093,1.0693 -0.2178,-0.9873 -1.3813,-0.5762 -0.2183,-0.7402 1.8174,-1.0703 0.7998,-0.7402 0.0728,-0.9048 -0.436,-0.2471 -0.5815,-0.0825 -0.3633,0.9053 c 0,0 -0.6079,0.1191 -0.7642,0.1577 -1.9961,1.8394 -6.0293,5.8101 -6.9663,13.3062 0.0371,0.1738 0.6792,1.1816 0.6792,1.1816 l 1.5264,0.9043 1.5264,0.4121 0.6548,0.8232 1.0171,0.7402 0.5815,-0.082 0.436,0.1963 0,0.1328 -0.5811,1.563 -0.4365,0.6582 0.1455,0.3301 -0.3633,1.2324 1.3086,2.3867 1.3081,1.1523 0.582,0.8223 -0.0732,1.7285 0.4365,0.9863 -0.4365,1.8926 c 0,0 -0.0342,-0.0117 0.0215,0.1777 0.0562,0.1895 2.3291,1.4512 2.4736,1.3438 0.144,-0.1094 0.2671,-0.2051 0.2671,-0.2051 l -0.145,-0.4102 0.5811,-0.5762 0.2183,-0.5762 0.9453,-0.3301 0.7266,-1.8105 -0.2178,-0.4922 0.5078,-0.7402 1.0908,-0.248 0.582,-1.3164 -0.1455,-1.6445 0.8721,-1.2344 0.1455,-1.2344 C 20.7331,29.4607 19.5495,28.8513 18.365,28.242" /> + style="color:#000000;fill:url(#linearGradient4325);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3266-2"> + style="color:#000000;fill:url(#linearGradient4323);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3270-3"> + id="path3272-7" + d="m 16.7656,9.5649 0.7266,0.4937 0.582,0 0,-0.5757 -0.7266,-0.3291 -0.582,0.4111" /> + style="color:#000000;fill:url(#linearGradient4331);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3274-5"> + style="color:#000000;fill:url(#linearGradient4329);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3278-9"> + id="path3280-2" + d="m 14.876,8.9072 -0.3638,0.9048 0.7271,0 0.3638,-0.8228 C 15.9166,8.7675 16.2286,8.5444 16.5479,8.331 l 0.7271,0.2471 c 0.4844,0.3291 0.9688,0.6582 1.4536,0.9868 L 19.4561,8.9072 18.6558,8.5781 18.292,7.8374 16.9111,7.6728 16.8383,7.2612 16.184,7.4262 15.8936,8.002 15.5298,7.2613 l -0.145,0.3291 0.0728,0.8228 -0.5816,0.494" /> + style="color:#000000;fill:url(#linearGradient4341);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3282-2"> + id="g3284-8" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient4335);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"> + style="color:#000000;fill:url(#linearGradient4333);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + d="" /> + style="color:#000000;fill:url(#linearGradient4339);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3288-7"> + id="path3290-3" + d="" /> + style="color:#000000;fill:url(#linearGradient4351);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3292-6"> + id="g3294-1" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient4345);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"> + style="color:#000000;fill:url(#linearGradient4343);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + d="" /> + style="color:#000000;fill:url(#linearGradient4349);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3298-9"> + id="path3300-3" + d="" /> + style="color:#000000;fill:url(#linearGradient4357);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3302-1"> + style="color:#000000;fill:url(#linearGradient4355);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3306-9"> + id="path3308-4" + d="M 17.4922,6.8496 17.856,6.521 18.5831,6.3564 c 0.498,-0.2422 0.998,-0.4053 1.5264,-0.5762 l -0.29,-0.4937 -0.9385,0.1348 -0.4434,0.4419 -0.731,0.106 -0.6499,0.3052 -0.3159,0.1528 -0.1929,0.2583 0.9443,0.1641" /> + style="color:#000000;fill:url(#linearGradient4363);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3310-7"> + style="color:#000000;fill:url(#linearGradient4361);fill-opacity:1;stroke-width:1.46614679999999997;marker:none;visibility:visible;display:inline;overflow:visible;stroke:#172a04;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" + id="g3314-8"> + id="path3316-4" + d="m 18.7285,14.6665 0.4365,-0.6582 -0.6548,-0.4932 0.2183,1.1514" /> + id="g3216"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3218"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3222"> + d="m 44.0713,20.7144 c 0,0.2627 0,0 0,0 l -0.5449,0.6172 c -0.334,-0.3936 -0.709,-0.7246 -1.0898,-1.0703 l -0.8359,0.123 -0.7637,-0.8633 0,1.0684 0.6543,0.4951 0.4355,0.4932 0.582,-0.6582 c 0.1465,0.2744 0.291,0.5488 0.4365,0.8232 l 0,0.8223 -0.6553,0.7402 -1.1992,0.8232 -0.9082,0.9063 -0.582,-0.6602 0.291,-0.7402 -0.5811,-0.6582 -0.9814,-2.0977 -0.8359,-0.9453 -0.2188,0.2461 0.3281,1.1934 0.6172,0.6992 c 0.3525,1.0176 0.7012,1.9902 1.1641,2.9629 0.7178,0 1.3945,-0.0762 2.1074,-0.166 l 0,0.5762 -0.8721,2.1392 -0.7998,0.9043 -0.6543,1.4004 c 0,0.7676 0,1.5352 0,2.3027 l 0.2188,0.9063 -0.3633,0.4102 -0.8008,0.4941 -0.8359,0.6992 0.6914,0.7813 -0.9453,0.8242 0.1816,0.5332 -1.418,1.6055 -0.9443,0 -0.7998,0.4941 -0.5098,0 0,-0.6582 -0.2168,-1.3184 c -0.2813,-0.8262 -0.5742,-1.6465 -0.8721,-2.4668 0,-0.6055 0.0361,-1.2051 0.0723,-1.8105 l 0.3643,-0.8223 -0.5098,-0.9883 0.0371,-1.3574 -0.6914,-0.7813 0.3457,-1.1309 -0.5625,-0.6382 -0.9824,0 -0.3271,-0.3701 -0.9814,0.6177 -0.3994,-0.4536 -0.9092,0.7817 c -0.6172,-0.6997 -1.2354,-1.3989 -1.8535,-2.0981 l -0.7266,-1.7285 0.6543,-0.9863 -0.3633,-0.4111 0.7988,-1.8936 c 0.6563,-0.8164 1.3418,-1.5996 2.0352,-2.3857 l 1.2363,-0.3291 1.3809,-0.1641 0.9453,0.2471 1.3447,1.3564 0.4727,-0.5342 0.6533,-0.082 1.2363,0.4111 0.9453,0 0.6543,-0.5762 0.291,-0.4111 -0.6553,-0.4111 -1.0908,-0.082 c -0.3027,-0.4199 -0.584,-0.8613 -0.9434,-1.2344 l -0.3643,0.1641 -0.1455,1.0703 -0.6543,-0.7402 -0.1445,-0.8242 -0.7266,-0.5742 -0.292,0 0.7275,0.8223 -0.291,0.7402 -0.5811,0.1641 0.3633,-0.7402 -0.6553,-0.3281 -0.5801,-0.6582 -1.0918,0.2461 -0.1445,0.3281 -0.6543,0.4121 -0.3633,0.9053 -0.9082,0.4521 -0.4004,-0.4521 -0.4355,0 0,-1.4814 0.9453,-0.4941 0.7266,0 -0.1465,-0.5752 -0.5801,-0.5762 0.9805,-0.2061 0.5449,-0.6162 0.4355,-0.7412 0.8008,0 -0.2188,-0.5752 0.5098,-0.3291 0,0.6582 1.0898,0.2461 1.0898,-0.9043 0.0732,-0.4121 0.9443,-0.6577 c -0.3418,0.0425 -0.6836,0.0737 -1.0176,0.1646 l 0,-0.7411 0.3633,-0.8228 -0.3633,0 -0.7984,0.7402 -0.2188,0.4116 0.2188,0.5767 -0.3643,0.9863 -0.5811,-0.3291 -0.5078,-0.5752 -0.8008,0.5752 -0.291,-1.3159 1.3809,-0.9048 0,-0.4941 0.873,-0.5757 1.3809,-0.3296 0.9453,0.3296 1.7441,0.3291 -0.4355,0.4932 -0.9453,0 0.9453,0.9873 0.7266,-0.8223 0.2207,-0.3618 c 0,0 2.7871,2.498 4.3799,5.2305 1.5928,2.7334 2.3408,5.9551 2.3408,6.6094 z" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3226"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3230"> + d="m 26.0703,9.2363 -0.0732,0.4932 0.5098,0.3291 0.8711,-0.5757 -0.4355,-0.4937 -0.582,0.3296 -0.29,-0.0825" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3234"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3238"> + d="m 26.8701,5.8633 -1.8906,-0.7407 -2.1797,0.2466 -2.6904,0.7402 -0.5088,0.4941 1.6719,1.1514 0,0.6582 -0.6543,0.6582 0.873,1.729 0.5801,-0.3301 0.7285,-1.1514 c 1.123,-0.3472 2.1299,-0.7407 3.1973,-1.2344 l 0.873,-2.2212" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3242"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3246"> + d="m 28.833,12.7749 -0.291,-0.7412 -0.5098,0.165 0.1465,0.9043 0.6543,-0.3281" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3250"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3254"> + d="m 29.123,12.6089 -0.1455,0.9883 0.7998,-0.165 0.5811,-0.5752 -0.5088,-0.4941 C 29.6787,11.9078 29.4824,11.483 29.2685,11.0465 l -0.4355,0 0,0.4932 0.29,0.3291 0,0.7402" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3258"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3262"> + d="m 18.3652,28.2422 -0.582,-1.1523 -1.0903,-0.2466 -0.5815,-1.5625 -1.4536,0.1641 -1.2354,-0.9043 -1.3091,1.1514 0,0.1816 c -0.396,-0.1143 -0.8828,-0.1299 -1.2354,-0.3467 l -0.291,-0.8223 0,-0.9053 -0.8721,0.082 c 0.0728,-0.5762 0.145,-1.1514 0.2183,-1.7275 l -0.5093,0 -0.5083,0.6582 -0.5093,0.2461 -0.7271,-0.4102 -0.0728,-0.9053 0.1455,-0.9873 1.0908,-0.8223 0.8721,0 0.145,-0.4941 1.0903,0.2461 0.7998,0.9883 0.1455,-1.6465 1.3813,-1.1514 0.5088,-1.2344 1.0176,-0.4111 0.5815,-0.8223 1.3081,-0.248 0.6548,-0.9863 c -0.6543,0 -1.3086,0 -1.9629,0 l 1.2358,-0.5762 0.8716,0 1.2363,-0.4121 0.1455,-0.4922 -0.4365,-0.4121 -0.5088,-0.165 0.1455,-0.4932 -0.3633,-0.7402 -0.8726,0.3281 0.1455,-0.6577 -1.0176,-0.5762 -0.7993,1.3979 0.0723,0.4941 -0.7993,0.3301 -0.5093,1.0693 -0.2178,-0.9873 -1.3813,-0.5762 -0.2183,-0.7402 1.8174,-1.0703 0.7998,-0.7402 0.0728,-0.9048 -0.436,-0.2471 -0.5815,-0.0825 -0.3633,0.9053 c 0,0 -0.6079,0.1191 -0.7642,0.1577 -1.9961,1.8394 -6.0293,5.8101 -6.9663,13.3062 0.0371,0.1738 0.6792,1.1816 0.6792,1.1816 l 1.5264,0.9043 1.5264,0.4121 0.6548,0.8232 1.0171,0.7402 0.5815,-0.082 0.436,0.1963 0,0.1328 -0.5811,1.563 -0.4365,0.6582 0.1455,0.3301 -0.3633,1.2324 1.3086,2.3867 1.3081,1.1523 0.582,0.8223 -0.0732,1.7285 0.4365,0.9863 -0.4365,1.8926 c 0,0 -0.0342,-0.0117 0.0215,0.1777 0.0562,0.1895 2.3291,1.4512 2.4736,1.3438 0.144,-0.1094 0.2671,-0.2051 0.2671,-0.2051 l -0.145,-0.4102 0.5811,-0.5762 0.2183,-0.5762 0.9453,-0.3301 0.7266,-1.8105 -0.2178,-0.4922 0.5078,-0.7402 1.0908,-0.248 0.582,-1.3164 -0.1455,-1.6445 0.8721,-1.2344 0.1455,-1.2344 C 20.7331,29.4607 19.5495,28.8513 18.365,28.242" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3266"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3270"> + d="m 16.7656,9.5649 0.7266,0.4937 0.582,0 0,-0.5757 -0.7266,-0.3291 -0.582,0.4111" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3274"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3278"> + d="m 14.876,8.9072 -0.3638,0.9048 0.7271,0 0.3638,-0.8228 C 15.9166,8.7675 16.2286,8.5444 16.5479,8.331 l 0.7271,0.2471 c 0.4844,0.3291 0.9688,0.6582 1.4536,0.9868 L 19.4561,8.9072 18.6558,8.5781 18.292,7.8374 16.9111,7.6728 16.8383,7.2612 16.184,7.4262 15.8936,8.002 15.5298,7.2613 l -0.145,0.3291 0.0728,0.8228 -0.5816,0.494" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3282"> + id="g3284" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3288"> + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3292"> + id="g3294" + style="opacity:0.75000000000000000;color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3298"> + d="" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3302"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3306"> + d="M 17.4922,6.8496 17.856,6.521 18.5831,6.3564 c 0.498,-0.2422 0.998,-0.4053 1.5264,-0.5762 l -0.29,-0.4937 -0.9385,0.1348 -0.4434,0.4419 -0.731,0.106 -0.6499,0.3052 -0.3159,0.1528 -0.1929,0.2583 0.9443,0.1641" /> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3310"> + style="color:#000000;fill:url(#linearGradient3908);stroke-width:1.46581578000000001;marker:none;visibility:visible;display:inline;overflow:visible;fill-opacity:1" + id="g3314"> + id="path3316" + d="m 18.7285,14.6665 0.4365,-0.6582 -0.6548,-0.4932 0.2183,1.1514" /> + d="M 57,13.999113 C 57,27.806675 45.806296,38.999999 32.000317,38.999999 18.193071,38.999999 6.9999999,27.806549 6.9999999,13.999113 6.9999999,0.19218278 18.193071,-11 32.000317,-11 45.806296,-11 57,0.19218278 57,13.999113 l 0,0 z" + style="fill:none;stroke:url(#radialGradient4132);stroke-width:1.99999976;stroke-miterlimit:4;stroke-opacity:1" /> + d="M 58.931508,13.931507 C 58.931508,28.806375 46.872821,40.864925 32,40.864925 17.125816,40.864925 5.0678105,28.806239 5.0678105,13.931507 5.0678105,-0.942678 17.125816,-13 32,-13 c 14.872821,0 26.931508,12.057322 26.931508,26.931507 l 0,0 z" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1" /> diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp index aa54f2e176..950549f897 100644 --- a/src/Mod/Web/Gui/Workbench.cpp +++ b/src/Mod/Web/Gui/Workbench.cpp @@ -351,6 +351,6 @@ Gui::DockWindowItems* Workbench::setupDockWindows() const { Gui::DockWindowItems* root = Gui::StdWorkbench::setupDockWindows(); //root->setVisibility(false); // hide all dock windows by default - //root->setVisibility("Std_CombiView",true); // except of the combi view + //root->setVisibility("Std_ComboView",true); // except of the combo view return root; }