[ShareDaemon-CVS] ui-wx/src Images.cpp,1.52,1.53

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14602

Modified Files:
	Images.cpp 
Log Message:
Cleaned up the LoadImages method.

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Images.cpp	30 Dec 2003 15:47:23 -0000	1.52
+++ Images.cpp	30 Dec 2003 20:18:02 -0000	1.53
@@ -59,7 +59,32 @@
 /* TODO: Put names into temporary wxString array and use for-loop to load 'em.*/
 /******************************************************************************/
 void CImages::LoadImages() {
-	wxString path;
+wxString path;
+wxArrayString names;
+	names.Add(wxT("friend"));           names.Add(wxT("messages"));
+	names.Add(wxT("searchresults"));    names.Add(wxT("provider"));
+	names.Add(wxT("serverlist"));       names.Add(wxT("newserver"));
+	names.Add(wxT("updateservers"));    names.Add(wxT("info"));
+	names.Add(wxT("serverinfo"));       names.Add(wxT("log"));
+	names.Add(wxT("sharedfiles"));      names.Add(wxT("updown11"));
+	names.Add(wxT("updown00"));         names.Add(wxT("connectedhigh"));
+	names.Add(wxT("disconnected"));     names.Add(wxT("clock"));
+	names.Add(wxT("user"));             names.Add(wxT("server"));
+	names.Add(wxT("arrow"));            names.Add(wxT("statistics"));
+	names.Add(wxT("upload"));           names.Add(wxT("download"));
+	names.Add(wxT("partstats"));        names.Add(wxT("fullstats"));
+	names.Add(wxT("exclamation"));      names.Add(wxT("connection"));
+	names.Add(wxT("daily"));            names.Add(wxT("monthly"));
+	names.Add(wxT("yearly"));           names.Add(wxT("mule"));
+	names.Add(wxT("btn_connect"));      names.Add(wxT("btn_servers"));
+	names.Add(wxT("btn_transfer"));     names.Add(wxT("btn_search"));
+	names.Add(wxT("btn_shared"));       names.Add(wxT("btn_messages"));
+	names.Add(wxT("btn_statistics"));   names.Add(wxT("btn_guisettings"));
+	names.Add(wxT("btn_preferences"));  names.Add(wxT("splashscreen"));
+	names.Add(wxT("leftarrow"));        names.Add(wxT("rightarrow"));
+	names.Add(wxT("options"));          names.Add(wxT("help"));
+	names.Add(wxT("quit"));
+
 	tool_img_width = 32;
 
 	images.DeleteContents(true);
@@ -67,186 +92,14 @@
 
 	path = MakePath();
 
-	images.Append(
-		wxT("friend"),
-		new wxBitmap(path+wxT("friend.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("messages"),
-		new wxBitmap(path+wxT("messages.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("searchresults"),
-		new wxBitmap(path+wxT("searchresults.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("provider"),
-		new wxBitmap(path+wxT("provider.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("serverlist"),
-		new wxBitmap(path+wxT("serverlist.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("newserver"),
-		new wxBitmap(path+wxT("newserver.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("updateservers"),
-		new wxBitmap(path+wxT("updateservers.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("info"),
-		new wxBitmap(path+wxT("info.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("serverinfo"),
-		new wxBitmap(path+wxT("serverinfo.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("log"),
-		new wxBitmap(path+wxT("log.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("sharedfiles"),
-		new wxBitmap(path+wxT("sharedfiles.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("updown11"),
-		new wxBitmap(path+wxT("updown11.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("updown00"),
-		new wxBitmap(path+wxT("updown00.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("connectedhigh"),
-		new wxBitmap(path+wxT("connectedhigh.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("disconnected"),
-		new wxBitmap(path+wxT("disconnected.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("clock"),
-		new wxBitmap(path+wxT("clock.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("user"),
-		new wxBitmap(path+wxT("user.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("server"),
-		new wxBitmap(path+wxT("server.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("arrow"),
-		new wxBitmap(path+wxT("arrow.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("statistics"),
-		new wxBitmap(path+wxT("statistics.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("upload"),
-		new wxBitmap(path+wxT("upload.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("download"),
-		new wxBitmap(path+wxT("download.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("partstats"),
-		new wxBitmap(path+wxT("partstats.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("fullstats"),
-		new wxBitmap(path+wxT("fullstats.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("exclamation"),
-		new wxBitmap(path+wxT("exclamation.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("connection"),
-		new wxBitmap(path+wxT("connection.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("daily"),
-		new wxBitmap(path+wxT("daily.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("monthly"),
-		new wxBitmap(path+wxT("monthly.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("yearly"),
-		new wxBitmap(path+wxT("yearly.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("mule"),
-		new wxBitmap(path+wxT("mule.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_connect"),
-		new wxBitmap(path+wxT("btn_connect.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_servers"),
-		new wxBitmap(path+wxT("btn_servers.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_transfer"),
-		new wxBitmap(path+wxT("btn_transfer.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_search"),
-		new wxBitmap(path+wxT("btn_search.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_shared"),
-		new wxBitmap(path+wxT("btn_shared.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_messages"),
-		new wxBitmap(path+wxT("btn_messages.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_statistics"),
-		new wxBitmap(path+wxT("btn_statistics.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_guisettings"),
-		new wxBitmap(path+wxT("btn_guisettings.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("btn_preferences"),
-		new wxBitmap(path+wxT("btn_preferences.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("splashscreen"),
-		new wxBitmap(path+wxT("splashscreen.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("leftarrow"),
-		new wxBitmap(path+wxT("leftarrow.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("rightarrow"),
-		new wxBitmap(path+wxT("rightarrow.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("options"),
-		new wxBitmap(path+wxT("options.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("help"),
-		new wxBitmap(path+wxT("help.png"), wxBITMAP_TYPE_ANY)
-	);
-	images.Append(
-		wxT("quit"),
-		new wxBitmap(path+wxT("quit.png"), wxBITMAP_TYPE_ANY)
-	);
+	for (size_t i=0;i<names.GetCount();i++) {
+		images.Append(
+			names[i],
+			new wxBitmap(
+				path+names[i]+wxT(".png"), wxBITMAP_TYPE_ANY
+			)
+		);
+	}
 }
 
 /******************************************************************* GetImage */