Add servers icon from David Vignoni (http://www.icon-king.com)

diff --git a/icons/servers.png b/icons/servers.png
new file mode 100644 (file)
index 0000000..b3781e4
Binary files /dev/null and b/icons/servers.png differ

diff --git a/run/dcpomatic b/run/dcpomatic
index 65cca420596e7e520985501c0836c8e110b4f1dc..66d79d5c9138fdb708edc089901208d65562679f 100755 (executable)
--- 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 be01548a4db3ae9405c65e51225e67722ae706c0..01332dfcc131d6b4834ba09ed65ea919d00f6b0a 100644 (file)
--- 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 d9a9f89786cac6f1a4c64d1614df61c90f185b93..7fe81de4eb3297a3f1bcef75f17e744d6b614835 100644 (file)
--- 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