From a32c192781a6de6c534cff2a52f746dde897d435 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 16 Mar 2014 23:05:31 +0000
Subject: [PATCH] Add servers icon from David Vignoni
 (http://www.icon-king.com)

---
 icons/servers.png       | Bin 0 -> 1948 bytes
 run/dcpomatic           |   5 ++++-
 src/wx/about_dialog.cc  |   4 ++++
 src/wx/config_dialog.cc |   4 ++--
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 icons/servers.png

diff --git a/icons/servers.png b/icons/servers.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3781e45c85e9c89e5895d08f3c11db160b75a1d
GIT binary patch
literal 1948
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

literal 0
HcmV?d00001

diff --git a/run/dcpomatic b/run/dcpomatic
index 65cca4205..66d79d5c9 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -10,7 +10,8 @@ if [ `uname -s` == "Darwin" ]; then
   app=build/platform/osx/DCP-o-matic.app
   macos=$app/Contents/MacOS
   lib=$app/Contents/lib
-  mkdir -p $macos $lib
+  resources=$app/Contents/Resources
+  mkdir -p $macos $lib $resources
 
   cp build/src/tools/dcpomatic $macos
   cp build/src/lib/libdcpomatic.dylib $lib
@@ -56,6 +57,8 @@ if [ `uname -s` == "Darwin" ]; then
   cp $ENV/libquickmail*.dylib $lib
   cp $ENV/libcurl*.dylib $lib
   cp $ENV/libffi*.dylib $lib
+  cp icons/defaults.png $resources
+  cp icons/servers.png $resources
  
   sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist
 
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index be01548a4..01332dfcc 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -101,6 +101,10 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Markus Raab"));
 	add_section (_("Translated by"), translated_by);
 
+	wxArrayString artwork_by;
+	artwork_by.Add (wxT ("David Vignoni"));
+	add_section (_("Artwork by"), artwork_by);
+
 	wxArrayString supported_by;
 	supported_by.Add (wxT ("Manual AC"));
 	supported_by.Add (wxT ("Kambiz Afshar"));
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index d9a9f8978..7fe81de4e 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -425,13 +425,13 @@ class EncodingServersPage : public wxPreferencesPage
 public:
 	wxString GetName () const
 	{
-		return _("Encoding Servers");
+		return _("Servers");
 	}
 
 #ifdef DCPOMATIC_OSX	
 	wxBitmap GetLargeIcon () const
 	{
-		return wxBitmap ("blank", wxBITMAP_TYPE_PNG_RESOURCE);
+		return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
 	}
 #endif	
 
-- 
2.30.2