From 7cac0891c07d13c9220b0d9e5c04bacc49380bf3 Mon Sep 17 00:00:00 2001 From: bouyer Date: Mon, 4 Apr 2022 21:14:51 +0000 Subject: Fix icon handling, especially for toolbar. Bump PKGREVISION --- geography/opencpn-plugin-plots/Makefile | 3 +- geography/opencpn-plugin-plots/distinfo | 4 +- .../patches/patch-src_icons.cpp | 49 ++++++++++++++++++++++ .../patches/patch-src_plots_pi.cpp | 41 ++++++++++++++++++ 4 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 geography/opencpn-plugin-plots/patches/patch-src_icons.cpp create mode 100644 geography/opencpn-plugin-plots/patches/patch-src_plots_pi.cpp (limited to 'geography') diff --git a/geography/opencpn-plugin-plots/Makefile b/geography/opencpn-plugin-plots/Makefile index 0f98fbb924d..4d676c1a553 100644 --- a/geography/opencpn-plugin-plots/Makefile +++ b/geography/opencpn-plugin-plots/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2022/03/28 19:32:38 bouyer Exp $ +# $NetBSD: Makefile,v 1.2 2022/04/04 21:14:51 bouyer Exp $ # VERSION= 2.2.12 +PKGREVISION= 1 DISTNAME= ocpn_plots_pi-${VERSION} PKGNAME= opencpn-plugin-plots-${VERSION} CATEGORIES= geography diff --git a/geography/opencpn-plugin-plots/distinfo b/geography/opencpn-plugin-plots/distinfo index 0dd572799c7..16d9e2cc202 100644 --- a/geography/opencpn-plugin-plots/distinfo +++ b/geography/opencpn-plugin-plots/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1 2022/03/28 19:32:38 bouyer Exp $ +$NetBSD: distinfo,v 1.2 2022/04/04 21:14:51 bouyer Exp $ BLAKE2s (ocpn_plots_pi-2.2.12.tar.gz) = 3e34c9c075351a38bad983a784b5faee10b863a107d542b2bb21f4766314667e SHA512 (ocpn_plots_pi-2.2.12.tar.gz) = fb2bb19da0866f08835b82c76e9b14c042aab531230f4398db9b912733446e9ab1e9c52804f2d8698de6c0b496a67645a89e60f2234587b7d5e0cb001b0d9304 Size (ocpn_plots_pi-2.2.12.tar.gz) = 921352 bytes SHA1 (patch-cmake_PluginSetup.cmake) = 5cd62f288bea7993da60ff58af01b4c427afa99f +SHA1 (patch-src_icons.cpp) = 4c3e9e5b2317dfda9a7c68610a7b6dd0b83a1a1c +SHA1 (patch-src_plots_pi.cpp) = d26ef2ba3c08c78cb4abb6b7a4f041d3281c5689 diff --git a/geography/opencpn-plugin-plots/patches/patch-src_icons.cpp b/geography/opencpn-plugin-plots/patches/patch-src_icons.cpp new file mode 100644 index 00000000000..00a1bea956c --- /dev/null +++ b/geography/opencpn-plugin-plots/patches/patch-src_icons.cpp @@ -0,0 +1,49 @@ +$NetBSD: patch-src_icons.cpp,v 1.1 2022/04/04 21:14:51 bouyer Exp $ + +Fix icons handling + +--- src/icons.cpp.orig 2022-04-04 11:24:07.480802638 +0200 ++++ src/icons.cpp 2022-04-04 11:24:57.651441818 +0200 +@@ -29,31 +29,18 @@ + _img_plots = new wxBitmap(wxImage(sm)); + } + +-// wxFileName fn; +-// fn.SetPath(*GetpSharedDataLocation()); +-// fn.AppendDir(_T("plugins")); +-// fn.AppendDir(_T("plots_pi")); +-// fn.AppendDir(_T("data")); +-// fn.SetFullName(_T("plots_pi.svg")); +-// _svg_plots = fn.GetFullPath(); +-// fn.SetFullName(_T("plots_pi_rollover.svg")); +-// _svg_plots_rollover = fn.GetFullPath(); +-// fn.SetFullName(_T("plots_pi_toggled.svg")); +-// _svg_plots_toggled = fn.GetFullPath(); +- + #ifdef PLUGIN_USE_SVG +- wxFileName fn; +- fn.SetPath(GetPluginDataDir("plots_pi")); +- fn.AppendDir(_T("data")); +- fn.SetFullName(_T("plots_pi.svg")); +- _svg_plots = fn.GetFullPath(); +- wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots); +- fn.SetFullName(_T("plots_pi_rollover.svg")); +- _svg_plots_rollover = fn.GetFullPath(); +- wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots_rollover); +- fn.SetFullName(_T("plots_pi_toggled.svg")); +- _svg_plots_toggled = fn.GetFullPath(); +- wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots_toggled); ++ wxFileName fn; ++ fn.SetPath(*GetpSharedDataLocation()); ++ fn.AppendDir(_T("plugins")); ++ fn.AppendDir(_T("plots_pi")); ++ fn.AppendDir(_T("data")); ++ fn.SetFullName(_T("plots_pi.svg")); ++ _svg_plots = fn.GetFullPath(); ++ fn.SetFullName(_T("plots_pi.svg")); ++ _svg_plots_rollover = fn.GetFullPath(); ++ fn.SetFullName(_T("plots_pi_toggled.svg")); ++ _svg_plots_toggled = fn.GetFullPath(); + #endif + + return; diff --git a/geography/opencpn-plugin-plots/patches/patch-src_plots_pi.cpp b/geography/opencpn-plugin-plots/patches/patch-src_plots_pi.cpp new file mode 100644 index 00000000000..41ceeecd32e --- /dev/null +++ b/geography/opencpn-plugin-plots/patches/patch-src_plots_pi.cpp @@ -0,0 +1,41 @@ +$NetBSD: patch-src_plots_pi.cpp,v 1.1 2022/04/04 21:14:51 bouyer Exp $ + +Fix icons handling + +--- src/plots_pi.cpp.orig 2022-04-04 11:20:38.672711152 +0200 ++++ src/plots_pi.cpp 2022-04-04 11:22:24.085248480 +0200 +@@ -76,6 +76,7 @@ + // Create the PlugIn icons + initialize_images(); + ++#if 0 + // Create the PlugIn icons -from shipdriver + // loads png file for the listing panel icon + wxFileName fn; +@@ -99,6 +100,7 @@ + else + wxLogWarning("Climatology panel icon has NOT been loaded"); + // End of from Shipdriver ++#endif + + + m_declination = NAN; +@@ -193,14 +195,10 @@ + } + + // Converts icon.cpp file to an image. Original process +-//wxBitmap *plots_pi::GetPlugInBitmap() +-//{ +-// return new wxBitmap(_img_plots->ConvertToImage().Copy()); +-//} +- +-// Shipdriver uses the climatology_panel.png file to make the bitmap. +-wxBitmap *plots_pi::GetPlugInBitmap() { return &m_panelBitmap; } +-// End of shipdriver process ++wxBitmap *plots_pi::GetPlugInBitmap() ++{ ++ return _img_plots; ++} + + + wxString plots_pi::GetCommonName() -- cgit v1.2.3