X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Ftool%2Fmain.cpp;h=77281c8fc8bcf2529198ff4befb11c2456d25527;hb=bb1dc53ed239937ec79467d2a30d5d933287f4bb;hp=fa6d785e7c9a5df399a1df801c63767ada1c0711;hpb=c1a1f2acbc7b262e8973f5f15b055136e94ef009;p=synfig.git

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index fa6d785..77281c8 100644
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -332,7 +332,7 @@ void display_help(int amount)
 		Argument("--start-time","<time>",_("Set the starting time"));
 		Argument("--end-time","<time>",_("Set the ending time"));
 		Argument("--dpi","<res>",_("Set the physical resolution (dots-per-inch)"));
-		Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch"));
+		Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch)"));
 		Argument("--dpi-y","<res>",_("Set the physical Y resolution (dots-per-inch)"));
 
 		Argument("--list-canvases",NULL,_("List the exported canvases in the composition"));
@@ -387,7 +387,7 @@ int process_global_flags(arg_list_t &arg_list)
 		if(*iter == "--info")
 		{
 			cout<<PACKAGE"-"VERSION<<endl;
-			cout<<"Compiled on "__DATE__ " at "__TIME__;
+			cout<<"Compiled on "__DATE__ /* " at "__TIME__ */;
 #ifdef __GNUC__
 			cout<<" with GCC "<<__VERSION__;
 #endif
@@ -845,6 +845,16 @@ int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
 	return SYNFIGTOOL_OK;
 }
 
+void list_child_canvases(string prefix, Canvas::Handle canvas)
+{
+	Canvas::Children children(canvas->children());
+	for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+	{
+		cout << prefix << ":" << (*iter)->get_id() << endl;
+		list_child_canvases(prefix + ":" + (*iter)->get_id(), *iter);
+	}
+}
+
 /* === M E T H O D S ======================================================= */
 
 /* === E N T R Y P O I N T ================================================= */
@@ -1121,10 +1131,8 @@ int main(int argc, char *argv[])
 		}
 		else if (job_list.front().list_canvases)
 		{
-			cerr << "Listing Canvases:" << endl;
-			Canvas::Children children(job_list.front().canvas->children());
-			for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
-				cout << "  " << job_list.front().filename << "#:" << (*iter)->get_id() << endl;
+			list_child_canvases(job_list.front().filename + "#", job_list.front().canvas);
+			cerr << endl;
 		}
 		else
 		{