Skip to content

idil77soltahanov/idil77soltahanov.github.io

BranchesTags

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

7 Commits
README.md
README.md
 
 
index.html
index.html
 
 
readme-edits
readme-edits
 
 

Repository files navigation

idil77soltahanov.github.io

line diff 1.1 --- a/CMakeLists.txt Mon Nov 08 15:14:51 2010 +0000 1.2 +++ b/CMakeLists.txt Mon Nov 08 21:00:19 2010 +0100 1.3 @@ -262,6 +262,14 @@ 1.4 MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") 1.5 ENDIF(MSGFMT_FOUND) 1.6
1.7 +IF(WIN32) 1.8 + # HTML Helpworkshop for creating help file 1.9 + FIND_PACKAGE(HTMLHelp) 1.10 + IF(${HTML_HELP_COMPILER} MATCHES "-NOTFOUND") 1.11 + MESSAGE(FATAL_ERROR "MS HTML Help Workshop not found. It is required to build Hugins help file.") 1.12 + ENDIF() 1.13 +ENDIF(WIN32) 1.14 + 1.15 ## 1.16 ## LAPACK (optional, enable by -DENABLE_LAPACK=ON) 1.17 ## 2.1 --- a/src/hugin1/hugin/MainFrame.cpp Mon Nov 08 15:14:51 2010 +0000 2.2 +++ b/src/hugin1/hugin/MainFrame.cpp Mon Nov 08 21:00:19 2010 +0100 2.3 @@ -1206,6 +1206,9 @@ 2.4
2.5 DEBUG_TRACE(""); 2.6
2.7 +#ifdef WXMSW 2.8 + GetHelpController().DisplaySection(section); 2.9 +#else 2.10 #if defined WXMAC && defined MAC_SELF_CONTAINED_BUNDLE 2.11 // On Mac, xrc/data/help_LOCALE should be in the bundle as LOCALE.lproj/help 2.12 // which we can rely on the operating sytem to pick the right locale's. 2.13 @@ -1240,6 +1243,7 @@ 2.14 { 2.15 wxLogError(_("Can't start system's web browser")); 2.16 } 2.17 +#endif 2.18 } 2.19
2.20 void MainFrame::OnTipOfDay(wxCommandEvent& WXUNUSED(e)) 3.1 --- a/src/hugin1/hugin/MainFrame.h Mon Nov 08 15:14:51 2010 +0000 3.2 +++ b/src/hugin1/hugin/MainFrame.h Mon Nov 08 21:00:19 2010 +0100 3.3 @@ -32,6 +32,9 @@ 3.4 #include "PT/Panorama.h" 3.5
3.6 #include "wx/docview.h" 3.7 +#ifdef WXMSW 3.8 +#include "wx/msw/helpchm.h" 3.9 +#endif 3.10
3.11 #include "hugin/OptimizePanel.h" 3.12 #include "hugin/PreferencesDialog.h" 3.13 @@ -154,6 +157,9 @@ 3.14 struct celeste::svm_model* GetSVMModel(); 3.15
3.16 GLPreviewFrame * getGLPreview(); 3.17 +#ifdef WXMSW 3.18 + wxCHMHelpController& GetHelpController() { return m_msHtmlHelp; } 3.19 +#endif 3.20
3.21 protected: 3.22 // called when a progress message should be displayed 3.23 @@ -244,6 +250,10 @@ 3.24 double m_progressMax; 3.25 double m_progress; 3.26 wxString m_progressMsg; 3.27 +#ifdef WXMSW 3.28 + wxCHMHelpController m_msHtmlHelp; 3.29 +#endif 3.30 + 3.31
3.32 DECLARE_EVENT_TABLE() 3.33 }; 4.1 --- a/src/hugin1/hugin/huginApp.cpp Mon Nov 08 15:14:51 2010 +0000 4.2 +++ b/src/hugin1/hugin/huginApp.cpp Mon Nov 08 21:00:19 2010 +0100 4.3 @@ -56,9 +56,9 @@ 4.4 #include "base_wx/huginConfig.h" 4.5 #ifdef WXMSW 4.6 #include "wx/dir.h" 4.7 +#include "wx/cshelp.h" 4.8 #endif 4.9
4.10 - 4.11 #include <tiffio.h> 4.12
4.13 #include "AboutDialog.h" 4.14 @@ -137,6 +137,10 @@ 4.15
4.16
4.17 #if defined WXMSW 4.18 + // initialize help provider 4.19 + wxHelpControllerHelpProvider* provider = new wxHelpControllerHelpProvider; 4.20 + wxHelpProvider::Set(provider); 4.21 + 4.22 wxString huginExeDir = getExePath(argv[0]); 4.23
4.24 wxString huginRoot; 4.25 @@ -277,6 +281,8 @@ 4.26 // setup main frame size, after it has been created. 4.27 RestoreFramePosition(frame, wxT("MainFrame")); 4.28 #ifdef WXMSW 4.29 + provider->SetHelpController(&frame->GetHelpController()); 4.30 + frame->GetHelpController().Initialize(m_xrcPrefix+wxT("data/hugin_help_en_EN.chm")); 4.31 frame->SendSizeEvent(); 4.32 #endif 4.33
5.1 --- a/src/hugin1/hugin/xrc/data/help_en_EN/CMakeLists.txt Mon Nov 08 15:14:51 2010 +0000 5.2 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/CMakeLists.txt Mon Nov 08 21:00:19 2010 +0100 5.3 @@ -1,6 +1,47 @@ 5.4 + 5.5 +# install help/manual 5.6 +IF(WIN32) 5.7 + 5.8 +# running hhc with relative path does not work correctly, so we copy all manual file into temporary 5.9 +# directory and run hhc there 5.10 + 5.11 +FILE(GLOB HELPFILES 5.12 + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 5.13 + *.htm *.html *.ico *.gif *.JPG *.jpg *.png *.xpm hugin_help_en_EN.hhp help_index_en.hhk help_toc_en.hhc hhc.cmake 5.14 +) 5.15 + 5.16 +SET(HELP_DIR ${CMAKE_BINARY_DIR}/help) 5.17 +SET(HELPFILES2) # empty list 5.18 + 5.19 +FOREACH(_file ${HELPFILES}) 5.20 + ADD_CUSTOM_COMMAND( 5.21 + OUTPUT "${HELP_DIR}/${_file}" 5.22 + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${_file}" "${HELP_DIR}/${_file}" 5.23 + DEPENDS ${_file} 5.24 + COMMENT "Copy ${_file} to ${HELP_DIR}" 5.25 + ) 5.26 + SET_SOURCE_FILES_PROPERTIES("${HELP_DIR}/${_file}" GENERATED) 5.27 + LIST(APPEND HELPFILES2 "${HELP_DIR}/${_file}") 5.28 +ENDFOREACH() 5.29 + 5.30 +ADD_CUSTOM_COMMAND( 5.31 + OUTPUT ${HELP_DIR}/hugin_help_en_EN.chm 5.32 + COMMAND ${CMAKE_COMMAND} -DHTML_HELP_COMPILER=${HTML_HELP_COMPILER} -P hhc.cmake 5.33 + # COMMAND ${HTML_HELP_COMPILER} hugin_help_en_EN.hhp 5.34 + DEPENDS ${HELPFILES2} 5.35 + WORKING_DIRECTORY ${HELP_DIR} 5.36 + COMMENT "Building help file" 5.37 +) 5.38 +SET_SOURCE_FILES_PROPERTIES("${HELP_DIR}/hugin_help_en_EN.chm" GENERATED) 5.39 +ADD_CUSTOM_TARGET(help ALL DEPENDS ${HELPFILE2} ${HELP_DIR}/hugin_help_en_EN.chm ) 5.40 + 5.41 +INSTALL(FILES ${CMAKE_BINARY_DIR}/help/hugin_help_en_EN.chm DESTINATION ${HUGINDATADIR}/xrc/data/) 5.42 + 5.43 +ELSE(WIN32) 5.44
5.45 FILE(GLOB DATAFILES *.htm *.html *.ico *.gif *.JPG *.jpg *.png *.xpm *.hhc *.hhk *.hhp 5.46 *.manual) 5.47
5.48 INSTALL(FILES ${DATAFILES} DESTINATION ${HUGINDATADIR}/xrc/data/help_en_EN) 5.49
5.50 +ENDIF(WIN32) 6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk Mon Nov 08 21:00:19 2010 +0100 6.3 @@ -0,0 +1,789 @@ 6.4 + 6.5 + 6.6 + 6.7 + 6.8 + 6.9 + 6.10 +

    6.11 +
  • 6.12 + 6.13 + 6.14 + html"> 6.15 + 6.16 + 6.17 + 6.18 +
  • 6.19 + 6.20 + 6.21 + 6.22 + 6.23 +
  • 6.24 + 6.25 + 6.26 + html"> 6.27 + 6.28 + 6.29 + 6.30 +
  • 6.31 + 6.32 + 6.33 + 6.34 + 6.35 + 6.36 + 6.37 +
  • 6.38 + 6.39 + 6.40 + 6.41 + 6.42 +
  • 6.43 + 6.44 + 6.45 + 6.46 + 6.47 + 6.48 +
  • 6.49 + 6.50 + 6.51 + 6.52 + 6.53 +
  • 6.54 + 6.55 + 6.56 + 6.57 + 6.58 +
  • 6.59 + 6.60 + 6.61 + 6.62 + 6.63 + 6.64 + 6.65 + 6.66 + 6.67 +
  • 6.68 + 6.69 + 6.70 + 6.71 + 6.72 + 6.73 + 6.74 +
  • 6.75 + 6.76 + 6.77 + 6.78 + 6.79 +
  • 6.80 + 6.81 + 6.82 + 6.83 + 6.84 +
  • 6.85 + 6.86 + 6.87 + 6.88 + 6.89 +
  • 6.90 + 6.91 + 6.92 + 6.93 + 6.94 +
  • 6.95 + 6.96 + 6.97 + 6.98 + 6.99 +
  • 6.100 + 6.101 + 6.102 + 6.103 + 6.104 +
  • 6.105 + 6.106 + 6.107 + 6.108 + 6.109 +
  • 6.110 + 6.111 + 6.112 + 6.113 + 6.114 +
  • 6.115 + 6.116 + 6.117 + 6.118 + 6.119 +
  • 6.120 + 6.121 + 6.122 + 6.123 + 6.124 + 6.125 + 6.126 + 6.127 + 6.128 +
  • 6.129 + 6.130 + 6.131 + 6.132 + 6.133 +
  • 6.134 + 6.135 + 6.136 + 6.137 + 6.138 +
  • 6.139 + 6.140 + 6.141 + 6.142 + 6.143 +
  • 6.144 + 6.145 + 6.146 + 6.147 + 6.148 +
  • 6.149 + 6.150 + 6.151 + 6.152 + 6.153 +
  • 6.154 + 6.155 + 6.156 + 6.157 + 6.158 + html"> 6.159 + 6.160 + 6.161 + 6.162 + 6.163 + 6.164 +
  • 6.165 + 6.166 + 6.167 + 6.168 + 6.169 + 6.170 + 6.171 + 6.172 + 6.173 + 6.174 + 6.175 + 6.176 + 6.177 + 6.178 + 6.179 + html"> 6.180 + 6.181 + 6.182 + 6.183 +
  • 6.184 + 6.185 + 6.186 + 6.187 + 6.188 + html"> 6.189 + 6.190 +
  • 6.191 + 6.192 + 6.193 + 6.194 + 6.195 + 6.196 + 6.197 + 6.198 + 6.199 + 6.200 + 6.201 + 6.202 + 6.203 + 6.204 + 6.205 + 6.206 + 6.207 +
  • 6.208 + 6.209 + 6.210 + 6.211 + 6.212 +
  • 6.213 + 6.214 + 6.215 + 6.216 + 6.217 +
  • 6.218 + 6.219 + 6.220 + html"> 6.221 + 6.222 +
  • 6.223 + 6.224 + 6.225 + 6.226 + 6.227 +
  • 6.228 + 6.229 + 6.230 + 6.231 + 6.232 +
  • 6.233 + 6.234 + 6.235 + 6.236 + 6.237 +
  • 6.238 + 6.239 + 6.240 + 6.241 + 6.242 +
  • 6.243 + 6.244 + 6.245 + 6.246 + 6.247 +
  • 6.248 + 6.249 + 6.250 + 6.251 + 6.252 +
  • 6.253 + 6.254 + 6.255 + 6.256 + 6.257 +
  • 6.258 + 6.259 + 6.260 + 6.261 + 6.262 + 6.263 + 6.264 + 6.265 + 6.266 + 6.267 + 6.268 +
  • 6.269 + 6.270 + 6.271 + 6.272 + 6.273 +
  • 6.274 + 6.275 + 6.276 + 6.277 + 6.278 +
  • 6.279 + 6.280 + 6.281 + html"> 6.282 + 6.283 +
  • 6.284 + 6.285 + 6.286 + 6.287 + 6.288 + 6.289 + 6.290 +
  • 6.291 + 6.292+ 6.293 + 6.294 + 6.295 + 6.296 + 6.297 +
  • 6.298 + 6.299 + 6.300 + 6.301 + 6.302 + 6.303 + 6.304 +
  • 6.305 + 6.306 + 6.307 + 6.308 + 6.309 +
  • 6.310 + 6.311 + 6.312 + 6.313 + 6.314 +
  • 6.315 + 6.316 + 6.317 + html"> 6.318 + 6.319 +
  • 6.320 + 6.321 + 6.322 + 6.323 + 6.324 +
  • 6.325 + 6.326 + 6.327 + 6.328 + 6.329 +
  • 6.330 + 6.331 + 6.332 + 6.333 + 6.334 +
  • 6.335 + 6.336 + 6.337 + 6.338 + 6.339 +
  • 6.340 + 6.341 + 6.342 + html"> 6.343 + 6.344 +
  • 6.345 + 6.346 + 6.347 + 6.348 + 6.349 +
  • 6.350 + 6.351 + 6.352 + 6.353 + 6.354 +
  • 6.355 + 6.356 + 6.357 + 6.358 + 6.359 +
  • 6.360 + 6.361 + 6.362 + 6.363 + 6.364 +
  • 6.365 + 6.366 + 6.367 + 6.368 + 6.369 +
  • 6.370 + 6.371 + 6.372 + 6.373 + 6.374 + 6.375 + 6.376 +
  • 6.377 + 6.378 + 6.379 + 6.380 + 6.381 +
  • 6.382 + 6.383 + 6.384 + 6.385 + 6.386 +
  • 6.387 + 6.388 + 6.389 + 6.390 + 6.391 +
  • 6.392 + 6.393 + 6.394 + 6.395 + 6.396 + 6.397 + 6.398 + 6.399 + 6.400 + 6.401 + 6.402 + 6.403 + 6.404 + 6.405 + 6.406 +
  • 6.407 + 6.408 + 6.409 + 6.410 + 6.411 +
  • 6.412 + 6.413 + 6.414 + 6.415 + 6.416 +
  • 6.417 + 6.418 + 6.419 + 6.420 + 6.421 +
  • 6.422 + 6.423 + 6.424 + 6.425 + 6.426 +
  • 6.427 + 6.428 + 6.429 + 6.430 + 6.431 +
  • 6.432 + 6.433 + 6.434 + 6.435 + 6.436 +
  • 6.437 + 6.438 + 6.439 + 6.440 + 6.441 + 6.442 + 6.443 + html"> 6.444 + 6.445 + 6.446 + 6.447 +
  • 6.448 + 6.449 + 6.450 + 6.451 + 6.452 +
  • 6.453 + 6.454 + 6.455 + html"> 6.456 + 6.457 +
  • 6.458 + 6.459 + 6.460 + 6.461 + 6.462 +
  • 6.463 + 6.464 + 6.465 + 6.466 + 6.467 +
  • 6.468 + 6.469 + 6.470 + 6.471 + 6.472 +
  • 6.473 + 6.474 + 6.475 + 6.476 + 6.477 +
  • 6.478+ 6.479 + 6.480 + 6.481 + 6.482 +
  • 6.483 + 6.484 + 6.485 + 6.486 + 6.487 +
  • 6.488 + 6.489 + 6.490 + 6.491 + 6.492 +
  • 6.493 + 6.494 + 6.495 + 6.496 + 6.497 +
  • 6.498 + 6.499 + 6.500 + 6.501 + 6.502 +
  • 6.503 + 6.504 + 6.505 + 6.506 + 6.507 +
  • 6.508 + 6.509 + 6.510 + 6.511 + 6.512 +
  • 6.513 + 6.514 + 6.515 + 6.516 + 6.517 +
  • 6.518 + 6.519 + 6.520 + html"> 6.521 + 6.522 +
  • 6.523 + 6.524 + 6.525 + 6.526 + 6.527 +
  • 6.528 + 6.529 + 6.530 + 6.531 + 6.532 +
  • 6.533 + 6.534 + 6.535 + 6.536 + 6.537 +
  • 6.538 + 6.539 + 6.540 + 6.541 + 6.542 +
  • 6.543 + 6.544 + 6.545 + 6.546 + 6.547 +
  • 6.548 + 6.549 + 6.550 + 6.551 + 6.552 +
  • 6.553 + 6.554 + 6.555 + 6.556 + 6.557 +
  • 6.558 + 6.559 + 6.560 + 6.561 + 6.562 +
  • 6.563 + 6.564 + 6.565 + 6.566 + 6.567 +
  • 6.568 + 6.569 + 6.570 + 6.571 + 6.572 +
  • 6.573 + 6.574 + 6.575 + 6.576 + 6.577 +
  • 6.578 + 6.579 + 6.580 + 6.581 + 6.582 +
  • 6.583 + 6.584 + 6.585 + html"> 6.586 + 6.587 +
  • 6.588 + 6.589 + 6.590 + 6.591 + 6.592 +
  • 6.593 + 6.594 + 6.595 + 6.596 + 6.597 +
  • 6.598 + 6.599 + 6.600 + 6.601 + 6.602 +
  • 6.603 + 6.604 + 6.605 + 6.606 + 6.607 +
  • 6.608 + 6.609 + 6.610 + 6.611 + 6.612 + 6.613 + 6.614 + 6.615 + 6.616 + 6.617 + 6.618 + 6.619 + 6.620 + html"> 6.621 + 6.622 + 6.623 + 6.624 + 6.625 + 6.626 +
  • 6.627 + 6.628 + 6.629 + 6.630 + 6.631 +
  • 6.632 + 6.633 + 6.634 + 6.635 + 6.636 +
  • 6.637 + 6.638 + 6.639 + 6.640 + 6.641 +
  • 6.642 + 6.643 + 6.644 + html"> 6.645 + 6.646 +
  • 6.647 + 6.648 + 6.649 + 6.650 + 6.651 +
  • 6.652 + 6.653 + 6.654 + 6.655 + 6.656 +
  • 6.657 + 6.658 + 6.659 + 6.660 + 6.661 +
  • 6.662 + 6.663 + 6.664 + 6.665 + 6.666 +
  • 6.667 + 6.668 + 6.669 + 6.670 + 6.671 +
  • 6.672 + 6.673 + 6.674 + 6.675 + 6.676 +
  • 6.677 + 6.678 + 6.679 + 6.680 + 6.681 +
  • 6.682 + 6.683 + 6.684 + html"> 6.685 + 6.686 +
  • 6.687 + 6.688 + 6.689 + 6.690 + 6.691 +
  • 6.692 + 6.693 + 6.694 + 6.695 + 6.696 +
  • 6.697 + 6.698 + 6.699 + 6.700 + 6.701 +
  • 6.702 + 6.703 + 6.704 + 6.705 + 6.706 +
  • 6.707 + 6.708 + 6.709 + html"> 6.710 + 6.711 +
  • 6.712 + 6.713 + 6.714 + 6.715 + 6.716 +
  • 6.717 + 6.718 + 6.719 + 6.720 + 6.721 +
  • 6.722 + 6.723 + 6.724 + 6.725 + 6.726 +
  • 6.727 + 6.728 + 6.729 + 6.730 + 6.731 +
  • 6.732 + 6.733 + 6.734 + 6.735 + 6.736 +
  • 6.737 + 6.738 + 6.739 + 6.740 + 6.741 +
  • 6.742 + 6.743 + 6.744 + 6.745 + 6.746 +
  • 6.747 + 6.748 + 6.749 + 6.750 + 6.751 +
  • 6.752 + 6.753 + 6.754 + 6.755 + 6.756 +
  • 6.757 + 6.758 + 6.759 + html"> 6.760 + 6.761 +
  • 6.762 + 6.763 + 6.764 + 6.765 + 6.766 +
  • 6.767 + 6.768 + 6.769 + 6.770 + 6.771 +
  • 6.772 + 6.773 + 6.774 + 6.775 + 6.776 +
  • 6.777 + 6.778 + 6.779 + 6.780 + 6.781 +
  • 6.782 + 6.783 + 6.784 + html"> 6.785 + 6.786 +
  • 6.787 + 6.788 + 6.789 + 6.790 + 6.791 +
6.792 + 7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc Mon Nov 08 21:00:19 2010 +0100 7.3 @@ -0,0 +1,333 @@ 7.4 + 7.5 + 7.6 + 7.7 + 7.8 + 7.9 + 7.10 + 7.11 + 7.12 + 7.13 + 7.14 +
    7.15 +
  • 7.16 + 7.17 + 7.18 + 7.19 +
      7.20 +
    • 7.21 + 7.22 + 7.23 + 7.24 +
    • 7.25 + 7.26 + 7.27 + 7.28 +
    • 7.29 + 7.30 + 7.31 + 7.32 +
    • 7.33 + 7.34 + 7.35 + 7.36 +
    • 7.37 + 7.38 + 7.39 + 7.40 +
    • 7.41 + 7.42 + 7.43 + 7.44 +
    • 7.45 + 7.46 + 7.47 + 7.48 +
    • 7.49 + 7.50 + 7.51 + 7.52 +
    • 7.53 + 7.54 + 7.55 + 7.56 +
    • 7.57 + 7.58 + 7.59 + 7.60 +
    • 7.61 + 7.62 + 7.63 + 7.64 +
    • 7.65 + 7.66 + 7.67 + 7.68 +
    • 7.69 + 7.70 + 7.71 + 7.72 +
    • 7.73 + 7.74 + 7.75 + 7.76 +
    • 7.77 + 7.78 + 7.79 + 7.80 +
    • 7.81 + 7.82 + 7.83 + 7.84 +
    • 7.85 + 7.86 + 7.87 + 7.88 +
    7.89 +
  • 7.90 + 7.91 + 7.92 +
      7.93 +
    • 7.94 + 7.95 + 7.96 + 7.97 +
    • 7.98 + 7.99 + 7.100 + 7.101 +
    • 7.102 + 7.103 + 7.104 + 7.105 +
    • 7.106 + 7.107 + 7.108 + 7.109 +
    • 7.110 + 7.111 + 7.112 + 7.113 +
    • 7.114 + 7.115 + 7.116 + 7.117 +
    • 7.118 + 7.119 + 7.120 + 7.121 +
    • 7.122 + 7.123 + 7.124 + 7.125 +
    • 7.126 + 7.127 + 7.128 + 7.129 +
    • 7.130 + 7.131 + 7.132 + 7.133 +
    • 7.134 + 7.135 + 7.136 + 7.137 +
    • 7.138 + 7.139 + 7.140 + 7.141 +
    • 7.142 + 7.143 + 7.144 + 7.145 +
    • 7.146 + 7.147 + 7.148 + 7.149 +
    • 7.150 + 7.151 + 7.152 + 7.153 +
    • 7.154 + 7.155 + 7.156 + 7.157 +
    • 7.158 + 7.159 + 7.160 + 7.161 +
    • 7.162 + 7.163 + 7.164 +
        7.165 +
      • 7.166 + 7.167 + 7.168 +
          7.169 +
        • 7.170 + 7.171 + 7.172 + 7.173 +
        • 7.174 + 7.175 + 7.176 + 7.177 +
        • 7.178 + 7.179 + 7.180 + 7.181 +
        • 7.182 + 7.183 + 7.184 + 7.185 +
        7.186 +
      • 7.187 + 7.188 + 7.189 + 7.190 +
          7.191 +
        • 7.192 + 7.193 + 7.194 + 7.195 +
        • 7.196 + 7.197 + 7.198 + 7.199 +
        • 7.200 + 7.201 + 7.202 + 7.203 +
        • 7.204 + 7.205 + 7.206 + 7.207 +
        7.208 +
      • 7.209 + 7.210 + 7.211 + 7.212 +
      7.213 +
    7.214 +
  • 7.215 + 7.216 + 7.217 +
      7.218 +
    • 7.219 + 7.220 + 7.221 + 7.222 +
    • 7.223 + 7.224 + 7.225 + 7.226 +
    • 7.227 + 7.228 + 7.229 + 7.230 +
    • 7.231 + 7.232 + 7.233 + 7.234 +
    • 7.235 + 7.236 + 7.237 + 7.238 +
    • 7.239 + 7.240 + 7.241 + 7.242 +
    • 7.243 + 7.244 + 7.245 + 7.246 +
    • 7.247 + 7.248 + 7.249 + 7.250 +
    • 7.251 + 7.252 + 7.253 + 7.254 +
    7.255 +
  • 7.256 + 7.257 + 7.258 +
      7.259 +
    • 7.260 + 7.261 + 7.262 + 7.263 +
    • 7.264 + 7.265 + 7.266 + 7.267 +
    • 7.268 + 7.269 + 7.270 + 7.271 +
    • 7.272 + 7.273 + 7.274 + 7.275 +
    • 7.276 + 7.277 + 7.278 + 7.279 +
    7.280 +
  • 7.281 + 7.282 + 7.283 +
      7.284 +
    • 7.285 + 7.286 + 7.287 + 7.288 +
    • 7.289 + 7.290 + 7.291 + 7.292 +
    • 7.293 + 7.294 + 7.295 + 7.296 +
        7.297 +
      • 7.298 + 7.299 + 7.300 + 7.301 +
      • 7.302 + 7.303 + 7.304 + 7.305 +
      • 7.306 + 7.307 + 7.308 + 7.309 +
      • 7.310 + 7.311 + 7.312 + 7.313 +
      • 7.314 + 7.315 + 7.316 + 7.317 +
      • 7.318 + 7.319 + 7.320 + 7.321 +
      • 7.322 + 7.323 + 7.324 + 7.325 +
      7.326 +
    • 7.327 + 7.328 + 7.329 + 7.330 +
    7.331 +
  • 7.332 + 7.333 + 7.334 + 7.335 +
7.336 + 8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/hhc.cmake Mon Nov 08 21:00:19 2010 +0100 8.3 @@ -0,0 +1,3 @@ 8.4 +# html help compiler is returning non zero retun value 8.5 +# so using execute_process to discard the return value 8.6 +EXECUTE_PROCESS(COMMAND ${HTML_HELP_COMPILER} hugin_help_en_EN.hhp ERROR_QUIET) 8.7 \ No newline at end of file 9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp Mon Nov 08 21:00:19 2010 +0100 9.3 @@ -0,0 +1,155 @@ 9.4 +[OPTIONS] 9.5 +Compatibility=1.1 or later 9.6 +Compiled file=hugin_help_en_EN.chm 9.7 +Contents file=help_toc_en.hhc 9.8 +Default topic=Hugin.html 9.9 +Display compile progress=Yes 9.10 +Flat=Yes 9.11 +Full-text search=Yes 9.12 +Index file=help_index_en.hhk 9.13 +Language=0x809 Englisch (Gro�britannien) 9.14 +Title=Hugin Help 9.15 + 9.16 + 9.17 +[FILES] 9.18 +16bit.html 9.19 +16bit_workflow_with_hugin.html 9.20 +Aliasing.html 9.21 +Align_a_stack_of_photos.html 9.22 +Align_image_stack.html 9.23 +Alpha_channel.html 9.24 +Aspect_Ratio.html 9.25 +Autooptimiser.html 9.26 +Autopano.html 9.27 +Autopano-sift.html 9.28 +Autopano-sift-C.html 9.29 +Banding.html 9.30 +Barrel_distortion.html 9.31 +Bracketing.html 9.32 +Camera_response_curve.html 9.33 +CCD.html 9.34 +Celeste_standalone.html 9.35 +Chromatic_aberration.html 9.36 +Color_correct_tiff.html 9.37 +Colour_profile.html 9.38 +Contrast.html 9.39 +Control_Point_Detector_Parameters.html 9.40 +Control_point_generators.html 9.41 +Control_points.html 9.42 +Cpclean.html 9.43 +Cpfind.html 9.44 +Crop_factor.html 9.45 +Cropped_TIFF.html 9.46 +Cubic_Projection.html 9.47 +Cylindrical_panorama.html 9.48 +Cylindrical_Projection.html 9.49 +Depth_of_Field.html 9.50 +DSLR_spherical_resolution.html 9.51 +Dust_Removal_with_Flatfield.html 9.52 +Dynamic_range.html 9.53 +Enblend.html 9.54 +Enblend_reference_manual.html 9.55 +Enfuse.html 9.56 +Enfuse_reference_manual.html 9.57 +Equirectangular_Projection.html 9.58 +EXIF.html 9.59 +Field_of_View.html 9.60 +Fisheye_Projection.html 9.61 +Focal_Length.html 9.62 +Freepv.html 9.63 +Fulla.html 9.64 +Gamma.html 9.65 +GIF.html 9.66 +HDR.html 9.67 +HDR_workflow_with_hugin.html 9.68 +Horizontal_control_points.html 9.69 +Hugin.html 9.70 +Hugin_Assistant_tab.html 9.71 +Hugin_Batch_Processor.html 9.72 +Hugin_Camera_and_Lens_tab.html 9.73 +Hugin_Control_Points_tab.html 9.74 +Hugin_Control_Points_table.html 9.75 +Hugin_Crop_tab.html 9.76 +Hugin_Exposure_tab.html 9.77 +Hugin_FAQ.html 9.78 +Hugin_Fast_Preview_window.html 9.79 +Hugin_Images_tab.html 9.80 +Hugin_Keyboard_shortcuts.html 9.81 +Hugin_Main_window.html 9.82 +Hugin_Mask_tab.html 9.83 +Hugin_Optimizer_tab.html 9.84 +Hugin_Parameters_for_Control_Point_Detectors_dialog.html 9.85 +Hugin_Preferences.html 9.86 +Hugin_Preview_window.html 9.87 +Hugin_Reset_Values_window.html 9.88 +Hugin_Stitcher_tab.html 9.89 +Hugin_Trackers.html 9.90 +Hugin_translation_guide.html 9.91 +Icpfind.html 9.92 +Interpolation.html 9.93 +JPEG.html 9.94 +Landscape.html 9.95 +Lens_correction_model.html 9.96 +Lens_distortion.html 9.97 +license.html 9.98 +Lightprobe.html 9.99 +MatchPoint.html 9.100 +Nadir.html 9.101 +Nodal_Point.html 9.102 +Nona.html 9.103 +Nona_gui.html 9.104 +No-parallax_point.html 9.105 +OpenEXR.html 9.106 +Optimization.html 9.107 +Pano12.html 9.108 +Pano_modify.html 9.109 +Panoglview.html 9.110 +Panoinfo.html 9.111 +Panomatic.html 9.112 +Panorama.html 9.113 +Panorama_formats.html 9.114 +Panorama_scripting_in_a_nutshell.html 9.115 +Panorama_tools.html 9.116 +Parallax.html 9.117 +Perspective_correction.html 9.118 +Perspective_distortion.html 9.119 +Pfstmo.html 9.120 +Pincushion_distortion.html 9.121 +Pitch.html 9.122 +PNG.html 9.123 +Portrait.html 9.124 +PPI.html 9.125 +Projections.html 9.126 +PSD.html 9.127 +PTblender.html 9.128 +PTmender.html 9.129 +Pto2mk.html 9.130 +Pto_merge.html 9.131 +PTOptimizer.html 9.132 +PTStitcher.html 9.133 +PTtiff2psd.html 9.134 +QTVR.html 9.135 +Qtvr2img.html 9.136 +RAW.html 9.137 +Rectilinear_Projection.html 9.138 +RGBE.html 9.139 +Roll.html 9.140 +SmartBlend.html 9.141 +Spherical.html 9.142 +Stereographic_Projection.html 9.143 +Straight_line_control_points.html 9.144 +Swing_rod.html 9.145 +Tca_correct.html 9.146 +The_General_Panini_Projection.html 9.147 +TIFF.html 9.148 +Tone_mapping.html 9.149 +Using_Celeste_with_hugin.html 9.150 +Vertical_control_points.html 9.151 +Vig_optimize.html 9.152 +Vignetting.html 9.153 +Wavy_distortion.html 9.154 +Yaw.html 9.155 +Zenith.html 9.156 + 9.157 +[INFOTYPES] 9.158 + 10.1 --- a/src/hugin1/hugin/xrc/data/help_it_IT/CMakeLists.txt Mon Nov 08 15:14:51 2010 +0000 10.2 +++ b/src/hugin1/hugin/xrc/data/help_it_IT/CMakeLists.txt Mon Nov 08 21:00:19 2010 +0100 10.3 @@ -1,6 +1,13 @@ 10.4 + 10.5 +IF(WIN32) 10.6 + 10.7 +#TODO generate italian version of help file 10.8 + 10.9 +ELSE(WIN32) 10.10
10.11 FILE(GLOB DATAFILES *.htm *.html *.ico *.gif *.JPG *.jpg .png .xpm .hhc .hhk .hhp 10.12 .manual) 10.13
10.14 INSTALL(FILES ${DATAFILES} DESTINATION ${HUGINDATADIR}/xrc/data/help_it_IT) 10.15
10.16 +ENDIF(WIN32) 10.17 \ No newline at end of file 11.1 --- a/src/hugin1/ptbatcher/BatchFrame.cpp Mon Nov 08 15:14:51 2010 +0000 11.2 +++ b/src/hugin1/ptbatcher/BatchFrame.cpp Mon Nov 08 21:00:19 2010 +0100 11.3 @@ -111,7 +111,9 @@ 11.4 m_cancelled = false; 11.5 m_closeThread = false; 11.6 //m_paused = false; 11.7 +#ifndef WXMSW 11.8 m_help=0; 11.9 +#endif 11.10
11.11 //load xrc resources 11.12 wxXmlResource::Get()->LoadFrame(this, (wxWindow )NULL, wxT("batch_frame")); 11.13 @@ -492,6 +494,9 @@ 11.14 void BatchFrame::OnButtonHelp(wxCommandEvent &event) 11.15 { 11.16 DEBUG_TRACE(""); 11.17 +#ifdef WXMSW 11.18 + GetHelpController().DisplaySection(wxT("Hugin_Batch_Processor.html")); 11.19 +#else 11.20 if (m_help == 0) 11.21 { 11.22 #if defined WXMAC && defined MAC_SELF_CONTAINED_BUNDLE 11.23 @@ -531,6 +536,7 @@ 11.24 } 11.25 m_help->Display(wxT("Hugin_Batch_Processor.html")); 11.26 //DisplayHelp(wxT("Hugin_Batch_Processor.html")); 11.27 +#endif 11.28 } 11.29 void BatchFrame::OnButtonMoveDown(wxCommandEvent &event) 11.30 { 11.31 @@ -947,7 +953,9 @@ 11.32 m_closeThread = true; 11.33 this->GetThread()->Wait(); 11.34 //wxMessageBox(_T("Closing frame...")); 11.35 - delete m_help; 11.36 +#ifndef WXMSW 11.37 + delete m_help; 11.38 +#endif 11.39 this->Destroy(); 11.40 } 11.41
12.1 --- a/src/hugin1/ptbatcher/BatchFrame.h Mon Nov 08 15:14:51 2010 +0000 12.2 +++ b/src/hugin1/ptbatcher/BatchFrame.h Mon Nov 08 21:00:19 2010 +0100 12.3 @@ -31,6 +31,9 @@ 12.4 #include "Batch.h" 12.5 #include "ProjectListBox.h" 12.6 #include "DirTraverser.h" 12.7 +#ifdef WXMSW 12.8 +#include "wx/msw/helpchm.h" 12.9 +#endif 12.10 //#include <wx/app.h> 12.11
12.12 / Simple class that forward the drop to the mainframe / 12.13 @@ -110,6 +113,11 @@ 12.14 void AddDirToList(wxString aDir); 12.15 void ChangePrefix(int index,wxString newPrefix); 12.16
12.17 +#ifdef WXMSW 12.18 + / return help controller for open help / 12.19 + wxCHMHelpController& GetHelpController() { return m_msHtmlHelp; } 12.20 +#endif 12.21 + 12.22 //wxMutex projListMutex; 12.23 ProjectListBox projListBox; 12.24
12.25 @@ -122,7 +130,11 @@ 12.26 bool m_closeThread; //included to signal the thread to finish execution 12.27 //TO-DO: include a batch or project progress gauge? Test initialization commented out in constructor 12.28 //wxGauge m_gauge; 12.29 - wxHtmlHelpController * m_help; 12.30 +#ifdef WXMSW 12.31 + wxCHMHelpController m_msHtmlHelp; 12.32 +#else 12.33 + wxHtmlHelpController * m_help; 12.34 +#endif 12.35
12.36 void OnProcessTerminate(wxProcessEvent & event); 12.37 / called by thread when queue was changed outside of PTBatcherGUI 13.1 --- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp Mon Nov 08 15:14:51 2010 +0000 13.2 +++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp Mon Nov 08 21:00:19 2010 +0100 13.3 @@ -25,6 +25,9 @@ 13.4 / 13.5
13.6 #include "PTBatcherGUI.h" 13.7 +#ifdef WXMSW 13.8 +#include "wx/cshelp.h" 13.9 +#endif 13.10
13.11 // make wxwindows use this class as the main application 13.12 IMPLEMENT_APP(PTBatcherGUI) 13.13 @@ -42,6 +45,10 @@ 13.14 #if defined WXMSW 13.15 int localeID = wxConfigBase::Get()->Read(wxT("language"), (long) wxLANGUAGE_DEFAULT); 13.16 m_locale.Init(localeID); 13.17 + // initialize help provider 13.18 + wxHelpControllerHelpProvider provider = new wxHelpControllerHelpProvider; 13.19 + wxHelpProvider::Set(provider); 13.20 + 13.21 #else 13.22 m_locale.Init(wxLANGUAGE_DEFAULT); 13.23 #endif 13.24 @@ -165,6 +172,10 @@ 13.25 { 13.26 m_frame = new BatchFrame(&m_locale,m_xrcPrefix); 13.27 m_frame->RestoreSize(); 13.28 +#ifdef WXMSW 13.29 + provider->SetHelpController(&m_frame->GetHelpController()); 13.30 + m_frame->GetHelpController().Initialize(m_xrcPrefix+wxT("data/hugin_help_en_EN.chm")); 13.31 +#endif 13.32 SetTopWindow(m_frame); 13.33 m_frame->Show(true); 13.34 m_server = new BatchIPCServer();

About

No description, website, or topics provided.

Resources

Readme
Activity

Stars

0 stars

Watchers

0 watching

Forks

1 fork
Report repository

Releases

No releases published

Packages

No packages published

Languages