suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

Browse Source
This commit is contained in:
Yorik van Havre 2012-12-20 21:26:41 -02:00
commit 0d17470a37
8 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/CADNavigationStyle.cpp
View File

@ -71,7 +71,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode)
case NavigationStyle::DRAGGING:
return QT_TR_NOOP("Press left and middle mouse button");
case NavigationStyle::ZOOMING:
return QT_TR_NOOP("Scroll middle mouse button");
return QT_TR_NOOP("Scroll middle mouse button or middle and left click");
default:
return "No description";
}

7
src/Gui/DlgSettings3DView.ui
View File

@ -176,7 +176,7 @@
<double>0.050000000000000</double>
</property>
<property name="value">
<double>0.050000000000000</double>
<double>0.200000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>ZoomStep</cstring>
@ -190,7 +190,10 @@
</item>
<item row="5" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxInvertZoom">
<property name="text">
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Invert zoom</string>
</property>
<property name="prefEntry" stdset="0">

9
src/Gui/DlgSettingsViewColor.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>601</width>
<height>445</height>
<height>565</height>
</rect>
</property>
<property name="windowTitle">
@ -652,17 +652,20 @@
<tabstop>checkBoxSelection</tabstop>
<tabstop>HighlightColor</tabstop>
<tabstop>SelectionColor</tabstop>
<tabstop>DefaultShapeColor</tabstop>
<tabstop>DefaultShapeLineWidth</tabstop>
<tabstop>DefaultShapeLineColor</tabstop>
<tabstop>CursorTextColor</tabstop>
<tabstop>EditedEdgeColor</tabstop>
<tabstop>EditedVertexColor</tabstop>
<tabstop>ConstructionColor</tabstop>
<tabstop>FullyConstrainedColor</tabstop>
<tabstop>radioButtonSimple</tabstop>
<tabstop>radioButtonGradient</tabstop>
<tabstop>checkMidColor</tabstop>
<tabstop>SelectionColor_Background</tabstop>
<tabstop>radioButtonGradient</tabstop>
<tabstop>backgroundColorFrom</tabstop>
<tabstop>backgroundColorTo</tabstop>
<tabstop>checkMidColor</tabstop>
<tabstop>backgroundColorMid</tabstop>
</tabstops>
<resources/>

4
src/Gui/NavigationStyle.cpp
View File

@ -226,11 +226,11 @@ void NavigationStyle::initialize()
this->shiftdown = FALSE;
this->altdown = FALSE;
this->invertZoom = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",false);
("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",true);
this->zoomAtCursor = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("ZoomAtCursor",false);
this->zoomStep = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.05f);
("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.2f);
}
void NavigationStyle::finalize()

25
src/Gui/TaskView/TaskWatcher.cpp
View File

@ -143,5 +143,30 @@ bool TaskWatcherCommandsEmptyDoc::shouldShow()
return doc && doc->countObjects() == 0;
}
//**************************************************************************
//**************************************************************************
// TaskWatcherCommandsEmptySelection
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskWatcherCommandsEmptySelection::TaskWatcherCommandsEmptySelection(const char* commands[],
const char* name,
const char* pixmap )
: TaskWatcherCommands(0,commands,name,pixmap)
{
}
TaskWatcherCommandsEmptySelection::~TaskWatcherCommandsEmptySelection()
{
}
//==== implementer ===========================================================================
//==== calls from the TaskView ===============================================================
bool TaskWatcherCommandsEmptySelection::shouldShow()
{
return (App::GetApplication().getActiveDocument() && Gui::Selection().size() == 0);
}
#include "moc_TaskWatcher.cpp"

17
src/Gui/TaskView/TaskWatcher.h
View File

@ -97,6 +97,23 @@ public:
};
// --------------------------------------------------------------------------
/// Special watcher class for showing commands when there is nothing selected
class GuiExport TaskWatcherCommandsEmptySelection : public TaskWatcherCommands
{
Q_OBJECT
public:
TaskWatcherCommandsEmptySelection(const char* commands[], const char* name, const char* pixmap);
~TaskWatcherCommandsEmptySelection();
public:
/// is called wenn the document or the Selection changes.
virtual bool shouldShow(void);
};
} //namespace TaskView

9
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@ -860,9 +860,10 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape)
Base::Console().Error("Cannot compute Inventor representation for the shape of %s.\n",pcObject->getNameInDocument());
}
// printing some informations
Base::Console().Log("ViewProvider update time: %f s\n",Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo()));
Base::Console().Log("Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d\n",nbrFaces,nbrEdges,nbrNodes,nbrTriangles,nbrLines);
# ifdef FC_DEBUG
// printing some informations
Base::Console().Log("ViewProvider update time: %f s\n",Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo()));
Base::Console().Log("Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d\n",nbrFaces,nbrEdges,nbrNodes,nbrTriangles,nbrLines);
# endif
VisualTouched = false;
}

2
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@ -140,7 +140,7 @@ void Workbench::activated()
"Part_Box",
"Part_Cylinder",
0};
Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptyDoc(
Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptySelection(
Empty,
"Create Geometry",
"Part_Box"