diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-16 23:05:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-16 23:05:31 +0000 |
| commit | a32c192781a6de6c534cff2a52f746dde897d435 (patch) | |
| tree | 2569543315b86a4916c4f673339d92dfee5b8eca | |
| parent | 6deca3038ff7a9f2067ff266a21133e8181c56ce (diff) | |
Add servers icon from David Vignoni (http://www.icon-king.com)
| -rw-r--r-- | icons/servers.png | bin | 0 -> 1948 bytes | |||
| -rwxr-xr-x | run/dcpomatic | 5 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 4 |
4 files changed, 10 insertions, 3 deletions
diff --git a/icons/servers.png b/icons/servers.png Binary files differnew file mode 100644 index 000000000..b3781e45c --- /dev/null +++ b/icons/servers.png 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 |
