From 716dcf82ecebb79d0f2f01550cc58a66fc14786e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Oct 2018 23:25:07 +0100 Subject: [PATCH] Add locations page for some player preferences. --- graphics/osx/preferences/locations.png | Bin 0 -> 1432 bytes graphics/src/locations.svg | 282 +++++++++++++++++++++++++ graphics/update | 2 +- graphics/web/favicon-128x128.png | Bin 25054 -> 25054 bytes graphics/web/favicon-16x16.png | Bin 1977 -> 1977 bytes graphics/web/favicon-32x32.png | Bin 3755 -> 3755 bytes graphics/web/favicon-64x64.png | Bin 9595 -> 9595 bytes platform/osx/make_dmg.sh | 1 + src/wx/player_config_dialog.cc | 125 +++++++---- 9 files changed, 371 insertions(+), 39 deletions(-) create mode 100644 graphics/osx/preferences/locations.png create mode 100644 graphics/src/locations.svg diff --git a/graphics/osx/preferences/locations.png b/graphics/osx/preferences/locations.png new file mode 100644 index 0000000000000000000000000000000000000000..ae585d3720aca5f64af77eaab42212f8637a96b8 GIT binary patch literal 1432 zcma)6Yfuwc6uuD%f`UX;f>vf5>`)!^B0NG2FIkk-Q3FIviV~L123E*!*xe9e6oJ+j z&^kV`BLY^7b)Z)1Sg6{fju#KndR-9tN0YhmjQl}cb8+E3SKi!$LXYbkb`0n@J z-5TwxwlW1I1=wbE8Dhf`q7a$hxne&6ym0O{jL|5CTNs=qfGAbWRf`}T zB?-txk!DDZKm`h5QcIBp$bTK7&Z81IV;?hd0>z*bjH223kW8YK#L50u#bKc#mI_E~%`3uD2qsyO zgzA4nTSj5UR*YbZN)5?$A!anBTQQp3Egi1IC^Ky!O@=izCQ&T=58h?T=^o5u-szvR zY`)IXl|o?%R}JZKGX^4Ma+z4B5J$%8WJ;ARN+plM$*wJI^6D2NS}7C*9Cb9y9cjS` zvi#65y=n4VO@NoyPq1*LO51U)x-BCSq_j#Np0plu#$LHy*Zj*gCJ*_wyH<6pE&NJ` z&+ZkK{O4yUofY2~Zx240r0))I*fg0l*4Q+#WWZ@P_o!iz@m7Se!Ha&hnp!V>C zulk)icYG=`10Rl!mFMX7rAy-D1CB@U&A9%~u(f$s6_hq7BxK3x=x8D_?NE2++SZ8; z2*PU|zF=J+RlhQ7Zh-RI?AGes^72l3Z0w|~eJBa{D=8^S5KE=!@Q(gPnwdfAIW8VN zuAUJQ5n&gG!`=d(B0C8gQrFE!OhVMcFpqwkd^TKPU!NX$vZJH-KtsdkfzgSWb-imG zX$zxsKik_~S-V*jIllP(eR;ph^d9nu)8%qq8X4Je51jAm>ABq8-2CC;%4l(mT7P3> z*4Y*z+BiQftdl=};ah$bfHb@B^wqgOi4Aq&!GfDnZ$N+gAAVESj?b%eEZTX->H69( zT%fu69q(tQd*1@TQ;y!dWwW&F2dO4GUo>+Ffbw}LKW44|2pGA&&1~WeQsaQ4DHOe@ z42197ui8Q&c-An0nZ~0F4_qCJzNmr*lV&$Qn;vvS-!9o_w|=4ZJ*2!VyyY9T>-Ti9 zCV0D-wz)DsSFzK)<74|CV_w&^3EnA3{^O@%wotoV;x320@B=&6RTcMK)_NOze{;Lt zaf%f`oHmoES~^{V?6*Zzj$03UF=yAu*t@ol(#MM9VrpRT;@2kGU&}|QBSd4cVik~` z^o^`Y?0Nbi0o;u8sWtF`YxBU2i{r&lgzgYkeEiD5z(7ew>lQc@9CbJxjU}oE+m1oC zK(HL%TO9;u3NH05YTZ*^(C?cBDysYD0PR~po(bC3mtb;-dSBS@bUIIfvP->R2H*Xl ctLnMWmihDBCTe{bvmYSPq^^QLUz%I>7lVj7wg3PC literal 0 HcmV?d00001 diff --git a/graphics/src/locations.svg b/graphics/src/locations.svg new file mode 100644 index 000000000..ba424c229 --- /dev/null +++ b/graphics/src/locations.svg @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + tango internet mail + 2010-03-29T08:04:16 + "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka + + + warszawianka + + + + + email + envelope + externalsource + icon + letter + tango + + + + + + + + + + + diff --git a/graphics/update b/graphics/update index 51336745e..33e6365d2 100755 --- a/graphics/update +++ b/graphics/update @@ -55,7 +55,7 @@ else # OS X preferences icons # servers.png does not have an SVG version mkdir -p osx/preferences - for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications accounts; do + for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications accounts locations; do $INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32 done diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png index d764c64658a7eaff35198c4c33ccc983c0eb6a15..483437a49cc2c94b4e323e3d01e82f3434c58c2f 100644 GIT binary patch delta 82 zcmcb2nDO3W#tp9-Ik`B+MI>6h_kP*@h4EpWgrR}1fn|u1v6Yd5m63_IfuWUwL7|1@ UzsYYCB(X{|q%L%tESGoy0E{vj&Hw-a delta 82 zcmcb2nDO3W#tp9-IoVm5l=<5`o_^T;h4EpWgn_xPfk}vgk(IHjm7%G&fuWUwK}yfN Uz{zhDB(X}0UJQFXSuXJa0JZEJa{vGU diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png index d187a034537a123e4b10158715eb4473bef8d3cd..021d1516ce3fc7a6de19bd1d64129791b0ab7241 100644 GIT binary patch delta 100 zcmdnVzmtDMIx8m^r?`kji}&6yn+sSS7(ERQbPX&+jEt>}46KYyv<(cc3=9e_B>yom mFsPQeMwFx^mZVzc=BH$)RWcYE7+UCJ)4-6r&}s5dwgUieyBod$ delta 100 zcmdnVzmtDMIx8nT3zIT`d&kocn+sSS7(ETlbq!2H42-OdO|1+~wG9ld3=C3w-UTu+ mFsPQeMwFx^mZVzc=BH$)RWcYE7+UCJ(;#{=?Cs>AYzF|Rbsb{> diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png index 22ff4f854f9d62246266eda72b802efd1ce394bc..3b859ebd6adfb8e56acab442ccce93d4cb2748c9 100644 GIT binary patch delta 100 zcmZ22yIOX`Yer5kPH_>57Vo`ZHh*DU$L(oople_mVq|P(WME}vqHSPkWnfTfA^DGi nfkCyzHKHUXu_VI?13FG delta 100 zcmZ22yIOX`Yer6X7A9r>_Kv3?Hh*DU$L(ogu4`ZtVqj!tY-(j_s%>CsWnhrf^DdBq nfkCyzHKHUXu_V57Vo`ZHh*EPQ}Q%4&^53OF*3F?GO#i-(Kax&GB7B#ko?EM nz@S><8c~vxSdwa$o1c=IR>@#wU}&L>O#?&fLZ`{QRSp0EM4KJ= delta 100 zcmezE_1kO1Yer6X7A9r>_Kv3?Hh*EPQ}Q%0*EKK+F)*?+HnlP|)iyA+GB8N#c^AmQ nz@S><8c~vxSdwa$o1c=IR>@#wU}&L>O@rvgu(y+Us~i9TeN`Wv diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 1972d2c59..487f03e15 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -128,6 +128,7 @@ function copy_resources { cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest" cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/accounts.png "$dest" + cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest" cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest" cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 29b30f8a7..a131a4668 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -110,22 +110,7 @@ private: table->Add (_log_file, wxGBPosition (r, 1)); ++r; - add_label_to_sizer (table, _panel, _("DCP directory"), true, wxGBPosition (r, 0)); - _dcp_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); - table->Add (_dcp_directory, wxGBPosition (r, 1)); - ++r; - - add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0)); - _kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); - table->Add (_kdm_directory, wxGBPosition (r, 1)); - ++r; - #ifdef DCPOMATIC_VARIANT_SWAROOP - add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0)); - _background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true); - table->Add (_background_image, wxGBPosition (r, 1)); - ++r; - add_label_to_sizer (table, _panel, _("KDM server URL"), true, wxGBPosition(r, 0)); _kdm_server_url = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1)); table->Add (_kdm_server_url, wxGBPosition (r, 1)); @@ -136,10 +121,7 @@ private: _image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this)); _respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this)); _log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::log_file_changed, this)); - _dcp_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&PlayerGeneralPage::dcp_directory_changed, this)); - _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&PlayerGeneralPage::kdm_directory_changed, this)); #ifdef DCPOMATIC_VARIANT_SWAROOP - _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::background_image_changed, this)); _kdm_server_url->Bind (wxEVT_TEXT, bind(&PlayerGeneralPage::kdm_server_url_changed, this)); #endif } @@ -167,16 +149,7 @@ private: if (config->player_log_file()) { checked_set (_log_file, *config->player_log_file()); } - if (config->player_dcp_directory()) { - checked_set (_dcp_directory, *config->player_dcp_directory()); - } - if (config->player_kdm_directory()) { - checked_set (_kdm_directory, *config->player_kdm_directory()); - } #ifdef DCPOMATIC_VARIANT_SWAROOP - if (config->player_background_image()) { - checked_set (_background_image, *config->player_background_image()); - } checked_set (_kdm_server_url, config->kdm_server_url()); #endif } @@ -212,6 +185,91 @@ private: Config::instance()->set_player_log_file(wx_to_std(_log_file->GetPath())); } +#ifdef DCPOMATIC_VARIANT_SWAROOP + void kdm_server_url_changed () + { + Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue())); + } +#endif + + wxChoice* _player_mode; + wxChoice* _image_display; + wxCheckBox* _respect_kdm; + FilePickerCtrl* _log_file; +#ifdef DCPOMATIC_VARIANT_SWAROOP + wxTextCtrl* _kdm_server_url; +#endif +}; + +class LocationsPage : public StandardPage +{ +public: + LocationsPage (wxSize panel_size, int border) + : StandardPage (panel_size, border) + {} + + wxString GetName () const + { + return _("Locations"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + +private: + void setup () + { + + int r = 0; + + wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); + + add_label_to_sizer (table, _panel, _("DCP directory"), true, wxGBPosition (r, 0)); + _dcp_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); + table->Add (_dcp_directory, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0)); + _kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); + table->Add (_kdm_directory, wxGBPosition (r, 1)); + ++r; + +#ifdef DCPOMATIC_VARIANT_SWAROOP + add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0)); + _background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true); + table->Add (_background_image, wxGBPosition (r, 1)); + ++r; +#endif + + _dcp_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::dcp_directory_changed, this)); + _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this)); +#endif + } + + void config_changed () + { + Config* config = Config::instance (); + + if (config->player_dcp_directory()) { + checked_set (_dcp_directory, *config->player_dcp_directory()); + } + if (config->player_kdm_directory()) { + checked_set (_kdm_directory, *config->player_kdm_directory()); + } +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (config->player_background_image()) { + checked_set (_background_image, *config->player_background_image()); + } +#endif + } + void dcp_directory_changed () { Config::instance()->set_player_dcp_directory(wx_to_std(_dcp_directory->GetPath())); @@ -227,22 +285,12 @@ private: { Config::instance()->set_player_background_image(wx_to_std(_background_image->GetPath())); } - - void kdm_server_url_changed () - { - Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue())); - } #endif - wxChoice* _player_mode; - wxChoice* _image_display; - wxCheckBox* _respect_kdm; - FilePickerCtrl* _log_file; wxDirPickerCtrl* _dcp_directory; wxDirPickerCtrl* _kdm_directory; #ifdef DCPOMATIC_VARIANT_SWAROOP FilePickerCtrl* _background_image; - wxTextCtrl* _kdm_server_url; #endif }; @@ -411,7 +459,8 @@ create_player_config_dialog () int const border = 8; #endif - e->AddPage (new PlayerGeneralPage(ps, border)); + e->AddPage (new PlayerGeneralPage(wxSize(-1, 500), border)); + e->AddPage (new LocationsPage(ps, border)); e->AddPage (new KeysPage(ps, border)); #ifdef DCPOMATIC_VARIANT_SWAROOP e->AddPage (new WatermarkPage(ps, border)); -- 2.30.2