diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-04 23:08:41 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-09 00:35:10 +0200 |
| commit | 9386e9c7c911df62f228b466cdb57c1d2eefb056 (patch) | |
| tree | cc1747dee3d64b336a9df798ab046e640ea4469b | |
| parent | 0c673b9db3dd530fb8fc4303acb4b7ab722bd09e (diff) | |
Rename TMS -> Upload in prefs.
| -rw-r--r-- | graphics/osx/preferences/upload@2x_black.png (renamed from graphics/osx/preferences/tms@2x_black.png) | bin | 1271 -> 1271 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/upload@2x_white.png (renamed from graphics/osx/preferences/tms@2x_white.png) | bin | 1041 -> 1041 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/upload_black.png (renamed from graphics/osx/preferences/tms_black.png) | bin | 681 -> 681 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/upload_white.png (renamed from graphics/osx/preferences/tms_white.png) | bin | 524 -> 524 bytes | |||
| -rw-r--r-- | graphics/src/preferences_black.svg | 4 | ||||
| -rw-r--r-- | graphics/src/preferences_white.svg | 4 | ||||
| -rw-r--r-- | graphics/src/upload.svg (renamed from graphics/src/tms.svg) | 0 | ||||
| -rwxr-xr-x | graphics/update | 2 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 2 | ||||
| -rw-r--r-- | src/wx/full_config_dialog.cc | 24 |
10 files changed, 18 insertions, 18 deletions
diff --git a/graphics/osx/preferences/tms@2x_black.png b/graphics/osx/preferences/upload@2x_black.png Binary files differindex a4e016996..a4e016996 100644 --- a/graphics/osx/preferences/tms@2x_black.png +++ b/graphics/osx/preferences/upload@2x_black.png diff --git a/graphics/osx/preferences/tms@2x_white.png b/graphics/osx/preferences/upload@2x_white.png Binary files differindex 6fc63341c..6fc63341c 100644 --- a/graphics/osx/preferences/tms@2x_white.png +++ b/graphics/osx/preferences/upload@2x_white.png diff --git a/graphics/osx/preferences/tms_black.png b/graphics/osx/preferences/upload_black.png Binary files differindex 89c928e29..89c928e29 100644 --- a/graphics/osx/preferences/tms_black.png +++ b/graphics/osx/preferences/upload_black.png diff --git a/graphics/osx/preferences/tms_white.png b/graphics/osx/preferences/upload_white.png Binary files differindex b3deaef76..b3deaef76 100644 --- a/graphics/osx/preferences/tms_white.png +++ b/graphics/osx/preferences/upload_white.png diff --git a/graphics/src/preferences_black.svg b/graphics/src/preferences_black.svg index 7db9867bb..cb747c252 100644 --- a/graphics/src/preferences_black.svg +++ b/graphics/src/preferences_black.svg @@ -357,7 +357,7 @@ x="221.81526" y="126.41271" /> <image - xlink:href="tms.svg" + xlink:href="upload.svg" id="image2918" height="8.4666662" width="8.4666662" @@ -792,7 +792,7 @@ x="158.31526" height="8.4666595" width="8.4666796" - id="bounds-tms" + id="bounds-upload" style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> <rect y="142.13316" diff --git a/graphics/src/preferences_white.svg b/graphics/src/preferences_white.svg index 333208197..641aad8de 100644 --- a/graphics/src/preferences_white.svg +++ b/graphics/src/preferences_white.svg @@ -378,7 +378,7 @@ x="221.81526" y="126.41271" /> <image - xlink:href="tms.svg" + xlink:href="upload.svg" id="image2918" height="8.4666662" width="8.4666662" @@ -1207,7 +1207,7 @@ x="158.31526" height="8.4666595" width="8.4666796" - id="bounds-tms" + id="bounds-upload" style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> <rect y="142.13316" diff --git a/graphics/src/tms.svg b/graphics/src/upload.svg index 1e3abf913..1e3abf913 100644 --- a/graphics/src/tms.svg +++ b/graphics/src/upload.svg diff --git a/graphics/update b/graphics/update index 83a332dc1..590a8ca9e 100755 --- a/graphics/update +++ b/graphics/update @@ -84,7 +84,7 @@ else # OS X preferences icons mkdir -p osx/preferences for c in black white; do - for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced non_standard; do + for i in defaults email kdm_email cover_sheet keys upload notifications locations sound identifiers servers general advanced non_standard; do inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}_${c}.png --width 32 --height 32 src/preferences_$c.svg inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}@2x_${c}.png --width 64 --height 64 src/preferences_$c.svg done diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 79232dd31..f5db14410 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -249,7 +249,7 @@ function copy_resources { cp $source/graphics/osx/preferences/kdm_email*.png "$dest" cp $source/graphics/osx/preferences/email*.png "$dest" cp $source/graphics/osx/preferences/servers*.png "$dest" - cp $source/graphics/osx/preferences/tms*.png "$dest" + cp $source/graphics/osx/preferences/upload*.png "$dest" cp $source/graphics/osx/preferences/keys*.png "$dest" cp $source/graphics/osx/preferences/cover_sheet*.png "$dest" cp $source/graphics/osx/preferences/notifications*.png "$dest" diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 162239e41..d4d7af686 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -513,22 +513,22 @@ private: }; -class TMSPage : public preferences::Page +class UploadPage : public preferences::Page { public: - TMSPage(wxSize panel_size, int border) + UploadPage(wxSize panel_size, int border) : Page(panel_size, border) {} wxString GetName() const override { - return _("TMS"); + return _("Upload"); } #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon() const override { - return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("upload"), wxBITMAP_TYPE_PNG); } #endif @@ -569,14 +569,14 @@ private: _tms_protocol->Append(_("SCP (for AAM and Doremi)")); _tms_protocol->Append(_("FTP (for Dolby)")); - _upload->bind(&TMSPage::upload_changed, this); - _tms_protocol->Bind(wxEVT_CHOICE, boost::bind(&TMSPage::tms_changed, this)); - _tms_passive->bind(&TMSPage::tms_changed, this); + _upload->bind(&UploadPage::upload_changed, this); + _tms_protocol->Bind(wxEVT_CHOICE, boost::bind(&UploadPage::tms_changed, this)); + _tms_passive->bind(&UploadPage::tms_changed, this); - _tms_ip->Bind(wxEVT_TEXT, boost::bind(&TMSPage::tms_changed, this)); - _tms_path->Bind(wxEVT_TEXT, boost::bind(&TMSPage::tms_changed, this)); - _tms_user->Bind(wxEVT_TEXT, boost::bind(&TMSPage::tms_changed, this)); - _tms_password->Changed.connect(boost::bind(&TMSPage::tms_changed, this)); + _tms_ip->Bind(wxEVT_TEXT, boost::bind(&UploadPage::tms_changed, this)); + _tms_path->Bind(wxEVT_TEXT, boost::bind(&UploadPage::tms_changed, this)); + _tms_user->Bind(wxEVT_TEXT, boost::bind(&UploadPage::tms_changed, this)); + _tms_password->Changed.connect(boost::bind(&UploadPage::tms_changed, this)); } void config_changed() override @@ -1485,7 +1485,7 @@ create_full_config_dialog() e->AddPage(new GPUPage(ps, border)); #endif e->AddPage(new preferences::KeysPage(ps, border)); - e->AddPage(new TMSPage(ps, border)); + e->AddPage(new UploadPage(ps, border)); e->AddPage(new preferences::EmailPage(ps, border)); e->AddPage(new preferences::KDMEmailPage(ps, border)); e->AddPage(new NotificationsPage(ps, border)); |
