Stack canvas now shows something for unnamed objects and looks a bit …

…more 10.10 ish.

Stacksmith/Platforms/Mac/WILDStackCanvasWindowController.mm

@@ -106,7 +106,7 @@ -(NSPoint)		distributedView: (UKDistributedView*)distributedView
 		NSImage*		objectImage = currItem.mCard ? [NSImage imageNamed: @"CardIcon"] : (currItem.mBackground ? [NSImage imageNamed: @"BackgroundIcon"] : [NSImage imageNamed: @"StackIcon"]);
 		CStack* 			currStack = currItem.mStack;
 		CConcreteObject* 	currObject = currItem.mCard ? (CConcreteObject*)currItem.mCard : (currItem.mBackground ? (CConcreteObject*)currItem.mBackground : (CConcreteObject*)currItem.mStack);
-		NSString*		nameStr = [NSString stringWithUTF8String: currObject->GetName().c_str()];
+		NSString*		nameStr = (currObject->GetName().size() > 0) ? [NSString stringWithUTF8String: currObject->GetName().c_str()] : [NSString stringWithFormat: @"ID %lld", currObject->GetID()];
 		NSImage*		img = nil;
 
 		if( currObject == currStack )

Stacksmith/Portable Document/CConcreteObject.h

@@ -14,6 +14,7 @@
 #include <string>
 #include "CMap.h"
 #include "tinyxml2.h"
+#include "CObjectID.h"
 extern "C" {
 #include "LEOInterpreter.h"
 #include "LEOScript.h"
@@ -76,7 +77,8 @@ class CConcreteObject : public CScriptableObject
 	virtual std::string	GetName()			{ return mName; };
     virtual void        SetName( const std::string& inStr ) { mName = inStr; IncrementChangeCount(); };
 	virtual std::string	GetDisplayName()	{ return mName; };
-
+	virtual ObjectID	GetID()	const		{ return 0; };
+
 	virtual LEOContextGroup*	GetScriptContextGroupObject();
 
 	virtual void		SetBreakpointLines( const std::vector<size_t>& inBreakpointLines );
@@ -102,7 +104,7 @@ class CConcreteObject : public CScriptableObject
 	std::vector<size_t>					mBreakpointLines;	// Lines on which the user set breakpoints using the UI that should be applied to the script when compiled.
 
 	struct LEOScript *					mScriptObject;		// Compiled script, lazily created/recreated on changes.
-	LEOObjectID							mIDForScripts;		// The ID Leonie uses to refer to this object.
+	LEOObjectID							mIDForScripts;		// The ID Leonie uses to refer to this object. This is *not* the ID as Hammer understands it.
 	LEOObjectSeed						mSeedForScripts;	// The seed value to go with mIDForScripts.
 	struct LEOValueObject				mValueForScripts;	// A LEOValue so scripts can reference us (see mIDForScripts).
 	CDocument *							mDocument;			// Document that contains us.

Stacksmith/Portable Document/CLayer.h

@@ -35,8 +35,8 @@ class CLayer : public CConcreteObject
 	CLayer( std::string inURL, ObjectID inID, const std::string& inName, const std::string& inFileName, CStack* inStack ) : mURL(inURL), mStack(inStack), mID(inID), mFileName(inFileName), mLoaded(false), mLoading(false), mShowPict(true), mDontSearch(false), mCantDelete(false), mChangeCount(0), mPartIDSeed(0) { mName = inName; };
 	~CLayer();
 
-	ObjectID		GetID()	const			{ return mID; };
-	std::string		GetFileName() const		{ return mFileName; };
+	virtual ObjectID	GetID()	const			{ return mID; };
+	virtual std::string	GetFileName() const		{ return mFileName; };
 
 	virtual void	Load( std::function<void(CLayer*)> completionBlock );	//!< Load this layer from its XML file, asynchronously. Once successfully done, sets mLoaded.
 	virtual bool	Save( const std::string& inPackagePath );	//!< Save this layer to the given file package (i.e. .xstk folder) as an XML file.

Stacksmith/Portable Document/CPart.h

@@ -87,7 +87,7 @@ class CPart : public CConcreteObject
 	virtual CPart*				Retain();
 	virtual void				Release();
 
-	ObjectID					GetID()				{ return mID; };
+	virtual ObjectID			GetID()	const		{ return mID; };
 	virtual void				SetID( ObjectID i )	{ mID = i; };
 	LEOInteger					GetFamily()								{ return mFamily; };
 	virtual void				SetFamily( LEOInteger inFamily )		{ mFamily = inFamily; };