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

src/Gui/TaskView/TaskView.cpp

@@ -132,6 +132,9 @@ public:
                   const QString &title,
                   QWidget *parent = 0)
       : iisIconLabel(icon, title, parent) {
+          // do not allow to get the focus because when hiding the task box
+          // it could cause to activate another MDI view.
+          setFocusPolicy(Qt::NoFocus);
     }
     void setTitle(const QString &text) {
         myText = text;

src/Mod/Draft/DraftSnap.py

@@ -288,8 +288,8 @@ class Snapper:
             origin = Vector(self.snapInfo['x'],self.snapInfo['y'],self.snapInfo['z'])
             winner = [Vector(0,0,0),None,Vector(0,0,0)]
             for snap in snaps:
-                if snap[0] == None:
-                    print "debug: Snapper: snap point = ",snap
+                if (not snap) or (snap[0] == None):
+                    print "debug: Snapper: invalid snap point: ",snaps
                 else:
                     delta = snap[0].sub(origin)
                     if delta.Length < shortest:

src/Mod/Draft/draftlibs/dxfReader.py

@@ -145,7 +145,10 @@ def convert(code, value):
 	elif 9 < code < 60 or 109 < code < 150 or 209 < code < 240 or 459 < code < 470 or 1009 < code < 1060:
 		value = float(value)
 	elif code == 105 or 309 < code < 380 or 389 < code < 400:
-		value = int(value, 16) # should be left as string?
+		try:
+			value = int(value, 16) # should be left as string?
+		except:
+			pass
 	else: # it's already a string so do nothing
 		pass
 	return value

src/Mod/PartDesign/Gui/Workbench.cpp

@@ -69,6 +69,17 @@ void Workbench::activated()
 
     //Watcher.push_back(new TaskWatcherRobot);
 
+    const char* Edge[] = {
+        "PartDesign_Fillet",
+        "PartDesign_Chamfer",
+        0};
+    Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
+        "SELECT Part::Feature SUBELEMENT Edge COUNT 1..",
+        Edge,
+        "Edge tools",
+        "Part_Box"
+    ));
+
     const char* Face[] = {
         "Sketcher_NewSketch",
         "PartDesign_Fillet",
@@ -81,6 +92,17 @@ void Workbench::activated()
         "Part_Box"
     ));
 
+    const char* Faces[] = {
+        "PartDesign_Fillet",
+        "PartDesign_Chamfer",
+        0};
+    Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
+        "SELECT Part::Feature SUBELEMENT Face COUNT 2..",
+        Faces,
+        "Face tools",
+        "Part_Box"
+    ));
+
     const char* Sketch[] = {
         "Sketcher_NewSketch",
         "PartDesign_Pad",

src/Mod/Start/StartPage/StartPage.py

@@ -70,6 +70,9 @@ text45 = translate("StartPage","This is the official user manual of FreeCAD, bui
 text46 = translate("StartPage","The tutorials section on the FreeCAD website")
 text47 = translate("StartPage","The section of the FreeCAd website dedicate dto python scripting, with examples, explanations, and API commands.")
 text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")
+text49 = translate("StartPage","Getting started")
+text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")
+text51 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Workbench_Concept")
 
 # here is the html page skeleton
 
@@ -342,7 +345,13 @@ def getLinks():
 
 def getWorkbenches():
     return """
-    <ul>    
+    <ul>
+        <li><img src="blank.png">&nbsp;
+            <a onMouseover="show('<h3>""" + text49 + """</h3> \
+            <p>""" + text50 + """</p>')" 
+            onMouseout="show('')" 
+            href=""" + text51 + """>""" + text49 + """</a>
+        </li>
         <li><img src="PartDesign.png">&nbsp;
             <a onMouseover="show('<h3>""" + text19 + """</h3> \
             <p>""" + text20 + """</p><p><small>""" + text21 + """ \