no_build_about_resources.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131
  1. --- a/src/dlg_ui_ex.cpp 2019-07-16 16:54:55.000000000 +0000
  2. +++ b/src/dlg_ui_ex.cpp 2020-12-19 18:28:04.920908321 +0000
  3. @@ -13,16 +13,16 @@
  4. #include "fluid/dlg_ui.hpp"
  5. #include "version.hpp"
  6. -extern "C"
  7. -{
  8. - extern char _binary_LICENSE_res_start;
  9. - extern char _binary_LICENSE_res_end;
  10. - extern char _binary_LICENSE_res_size;
  11. -
  12. - extern char _binary_KEYS_res_start;
  13. - extern char _binary_KEYS_res_end;
  14. - extern char _binary_KEYS_res_size;
  15. -}
  16. +//extern "C"
  17. +//{
  18. +// extern char _binary_LICENSE_res_start;
  19. +// extern char _binary_LICENSE_res_end;
  20. +// extern char _binary_LICENSE_res_size;
  21. +
  22. +// extern char _binary_KEYS_res_start;
  23. +// extern char _binary_KEYS_res_end;
  24. +// extern char _binary_KEYS_res_size;
  25. +//}
  26. static dlg_ui *ui;
  27. @@ -188,8 +188,8 @@
  28. m_menuitem_gpsd_lockcursor->label(_("Lock to cursor"));
  29. // Help
  30. m_menuitem_help->label(_("Help"));
  31. - m_menuitem_help_about->label(_("About"));
  32. - m_menuitem_help_usage->label(_("Usage"));
  33. +// m_menuitem_help_about->label(_("About"));
  34. +// m_menuitem_help_usage->label(_("Usage"));
  35. // Populate the Basemap selector
  36. update_choice_map_ex();
  37. @@ -492,38 +492,38 @@
  38. m_dlg_search->show();
  39. }
  40. -void dlg_ui::about_ex()
  41. -{
  42. +//void dlg_ui::about_ex()
  43. +//{
  44. // Show about dialog
  45. - if (!m_dlg_txtdisp)
  46. - m_dlg_txtdisp = new dlg_txtdisp;
  47. -
  48. - std::string v(std::string(_("Version: ")) + std::string(FLORB_PROGSTR));
  49. - std::string l(&_binary_LICENSE_res_start, (size_t)&_binary_LICENSE_res_size);
  50. -
  51. - m_dlg_txtdisp->title(_("About / License"));
  52. - m_dlg_txtdisp->clear();
  53. - m_dlg_txtdisp->append(v);
  54. - m_dlg_txtdisp->append("\n\n");
  55. - m_dlg_txtdisp->append(florb::utils::str_split(l, "\n\n"), "\n\n", true);
  56. -
  57. - m_dlg_txtdisp->show();
  58. -}
  59. -void dlg_ui::usage_ex()
  60. -{
  61. +// if (!m_dlg_txtdisp)
  62. +// m_dlg_txtdisp = new dlg_txtdisp;
  63. +//
  64. +// std::string v(std::string(_("Version: ")) + std::string(FLORB_PROGSTR));
  65. +// std::string l(&_binary_LICENSE_res_start, (size_t)&_binary_LICENSE_res_size);
  66. +//
  67. +// m_dlg_txtdisp->title(_("About / License"));
  68. +// m_dlg_txtdisp->clear();
  69. +// m_dlg_txtdisp->append(v);
  70. +// m_dlg_txtdisp->append("\n\n");
  71. +// m_dlg_txtdisp->append(florb::utils::str_split(l, "\n\n"), "\n\n", true);
  72. +//
  73. +// m_dlg_txtdisp->show();
  74. +//}
  75. +//void dlg_ui::usage_ex()
  76. +//{
  77. // Show about dialog
  78. - if (!m_dlg_txtdisp)
  79. - m_dlg_txtdisp = new dlg_txtdisp;
  80. -
  81. - std::string u(&_binary_KEYS_res_start, (size_t)&_binary_KEYS_res_size);
  82. -
  83. - m_dlg_txtdisp->title(_("Usage"));
  84. - m_dlg_txtdisp->clear();
  85. - m_dlg_txtdisp->append(florb::utils::str_split(u, "\n\n"), "\n\n", true);
  86. -
  87. - m_dlg_txtdisp->show();
  88. -}
  89. -
  90. +// if (!m_dlg_txtdisp)
  91. +// m_dlg_txtdisp = new dlg_txtdisp;
  92. +//
  93. +// std::string u(&_binary_KEYS_res_start, (size_t)&_binary_KEYS_res_size);
  94. +//
  95. +// m_dlg_txtdisp->title(_("Usage"));
  96. +// m_dlg_txtdisp->clear();
  97. +// m_dlg_txtdisp->append(florb::utils::str_split(u, "\n\n"), "\n\n", true);
  98. +//
  99. +// m_dlg_txtdisp->show();
  100. +//}
  101. +//
  102. void dlg_ui::cb_btn_loadtrack_ex(Fl_Widget *widget)
  103. {
  104. @@ -709,13 +709,13 @@
  105. }
  106. // Help submenu
  107. - else if (mit == m_menuitem_help_about) {
  108. - about_ex();
  109. - }
  110. - else if (mit == m_menuitem_help_usage) {
  111. - usage_ex();
  112. - }
  113. -
  114. +// else if (mit == m_menuitem_help_about) {
  115. +// about_ex();
  116. +// }
  117. +// else if (mit == m_menuitem_help_usage) {
  118. +// usage_ex();
  119. +// }
  120. +//
  121. m_wgtmap->take_focus();
  122. }