diff --git a/AUTHORS.txt b/AUTHORS.txt index 5b9dd3361..492a223af 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,3 +1,4 @@ + Project initiator: Gábor Horváth diff --git a/CAVEATS.txt b/CAVEATS.txt deleted file mode 100644 index f1d6e9f02..000000000 --- a/CAVEATS.txt +++ /dev/null @@ -1,13 +0,0 @@ - -RT 4.0.7 CAVEATS - - - -Difference between Preview and Output image: - - -The color managed preview in RawTherapee is (and has always been) based on image data in the Working Space profile. Although the actual preview is rendered using a monitor profile (or sRGB profile, if monitor profile is not specified), it does not reflect the Output profile & Output Gamma settings. This can lead to a slightly different output rendering when Working Space profile and Output Space profiles are not the same. A workaround is to set them to the same values to ensure the preview accurately reflects the final render output. - -For generic use in sRGB workflow when output is targeting web-based image display, it is recommended to use the default values of the Color/ICM toolset. - -Future releases of RawTherapee are planned to support a more comprehensive color-managed preview that will allow accurate visualization of the final output render based on not only the working space and monitor profiles, but also on user-selected Output color profile and Output Gamma. \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index de2a9a628..266506b62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ endif(USE_CLANG) install (FILES AUTHORS.txt DESTINATION ${CREDITSDIR}) install (FILES LICENSE.txt DESTINATION ${LICENCEDIR}) install (FILES AboutThisBuild.txt DESTINATION ${CREDITSDIR}) -install (FILES CAVEATS.txt DESTINATION ${CREDITSDIR} OPTIONAL) +install (FILES RELEASE_NOTES.txt DESTINATION ${CREDITSDIR} OPTIONAL) add_subdirectory (rtexif) add_subdirectory (rtengine) diff --git a/ProcessorTargets.cmake b/ProcessorTargets.cmake index efe79626d..edcce68ca 100644 --- a/ProcessorTargets.cmake +++ b/ProcessorTargets.cmake @@ -27,7 +27,8 @@ set(PROC_TARGET_7_LABEL athlon-4 CACHE STRING "Processor-7 label - use it to pro set(PROC_TARGET_7_FLAGS "-march=athlon-4" CACHE STRING "Processor-7 flags") set(PROC_TARGET_8_LABEL athlon64 CACHE STRING "Processor-8 label - use it to provide a athlon64 optimized build, if you have this processor") -set(PROC_TARGET_8_FLAGS "-march=athlon64 -mtune=athlon64" CACHE STRING "Processor-8 flags") +#set(PROC_TARGET_8_FLAGS "-march=athlon64 -mtune=athlon64" CACHE STRING "Processor-8 flags") +set(PROC_TARGET_8_FLAGS "-mfpmath=sse -march=athlon64 -mtune=athlon64 -mmmx -msse -msse2 -mthreads -m64" CACHE STRING "Processor-8 flags") set(PROC_TARGET_9_LABEL phenomX4 CACHE STRING "Processor-9 label - use it to provide a phenomX4 optimized build, if you have this processor") set(PROC_TARGET_9_FLAGS "-march=amdfam10" CACHE STRING "Processor-9 flags") diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt new file mode 100644 index 000000000..060e1fe30 --- /dev/null +++ b/RELEASE_NOTES.txt @@ -0,0 +1,461 @@ + +RAWTHERAPEE 4.0.7 RELEASE NOTES +------------------------------- + +CAVEATS +- Memory requirements +Please read http://rawtherapee.com/blog/maximizing-memory-efficiency + +- Differences between the preview and the output image +The color-managed preview in RawTherapee is (and has always been) based on image data in the Working Space profile. Although the actual preview is rendered using a monitor profile (or sRGB profile, if the monitor profile is not specified), it does not reflect the Output Profile & Output Gamma settings. This can lead to a slightly different output rendering when Working Space profile and Output Space profiles are not the same. A workaround is to set them to the same values to ensure the preview accurately reflects the final rendered output. + +For generic use in an sRGB workflow when the output target is web-based image display, it is recommended to use the default values of the Color/ICM toolset (Working Profile = sRGB, Output Profile = RT_sRGB). + +Future releases of RawTherapee are planned to support a more comprehensive color-managed preview that will allow proofing with accurate visualization of the final output render based not only on the working space and monitor profiles, but also on the user-selected Output Profile and Output Gamma. + +- Auto Levels behavior has changed +The new algorithm drives the folowing parameters: + Exposure compensation, + Highlight recovery amount & threshold, + Black level & shadow compression, + RGB brightness, + RGB contrast. +The profiles supplied with RawTherapee were changed to be compatible with the new auto levels logic, as in older profiles RGB contrast and brightness were preset to a fixed value. Old Tuned-# profiles have been removed. + +- The new Exposure Compensation in thumbnail captions and file browser filter requires clearing of Rawtherapee's thumbnail cache (see Preferences > File Browser). If the thubmnail cache is not cleared, exposure compensation values will not be displayed in captions or recognised in filtering *for previously browsed images* only. + + +NEW FEATURES +- RGB curves, +- New white balance presets for specific spectra, +- Preview modes: red, green, blue, luminosity and focus mask (see which areas are in focus), +- DCRAW updated to 9.12 + Support added for these cameras: + Canon PowerShot S100 + Fujifilm X10 + Leica V-Lux 3 + Nikon 1 + Panasonic DMC-FZ4 + Panasonic DMC-GX1 + Samsung NX + Samsung NX200 + Sony NEX-7 +- Enhanced color matices and RT-specific input ICC profiles for the following cameras: + Canon EOS 5D + Canon PowerShot G10 + Nikon D3100 +- Additional crop ratios, +- Additional output ICC profiles, +- 1-click neutral setting for exposure values +- Exposure Compensation thumbnail caption and filter option in the file browser metadata filter, +- Automatic display of this RELEASE_NOTES.txt file on the first run after a RawTherapee upgrade (e.g. 4.0.6 > 4.0.7) + + +DOCUMENTATION +http://rawtherapee.com/blog/documentation + + +REPORTING BUGS +http://rawtherapee.com/forum/viewtopic.php?f=3&t=3639 + + +LIVE CHAT WITH RT USERS +Network: freenode +Server: chat.freenode.net +Channel #rawtherapee +http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1 +http://rawtherapee.com/forum/viewtopic.php?f=1&t=945 + + +REVISION HISTORY +The complete change log is available at +http://code.google.com/p/rawtherapee/source/list + +Changes since version 4.0.6: + +changeset: 1745:1782f47ae9c9 +tag: tip +user: natureh +date: Wed Jan 25 23:14:59 2012 +0100 +description: CAVEATS file now word-wrapped in the Text area. + +changeset: 1744:d4a2ae08dad5 +user: DrSlony +date: Tue Jan 24 20:53:13 2012 +0000 +description: Fixed a problem where the CAVEATS.txt file was not copied + into the compiled dir in Linux. Wrong capitalization in + CMakeLists.txt. Issue 1206 + +changeset: 1743:78b3abb4b606 +user: DrSlony +date: Tue Jan 24 01:17:18 2012 +0000 +description: Hopefully fixing two "default" heads or breaking it + further. See + http://code.google.com/p/rawtherapee/source/detail?r=3dbea14 + 75c8d1a1cf4aba06cbc5b22a9431dddab + +changeset: 1742:78318196e0de +user: natureh +date: Wed Jan 18 00:20:19 2012 +0100 +description: Solving issue 1206: "Caveats file handling". May also solve + issue 1089: "About RT: version window disappears". This + patch also cleanup the Gamma tool a little bite. The + CAVEATS.txt is optional and may be deleted in future + release. + +changeset: 1741:f55d097357ec +user: natureh +date: Mon Jan 16 02:16:09 2012 +0100 +description: Fix a bug in the Adjuster class that were causing system + Beep when reaching the limits, or at each move when the + limits where below 1.0 (like for Distortion). Also fix the + bug of the too small spin button (displaying not enough + digits). + +changeset: 1740:a51f811a74a9 +user: Michael Ezra +date: Sun Jan 15 15:54:24 2012 -0500 +description: Preview modes (RGBLF) - adding icons and code optimization + +changeset: 1739:357fb2cd4855 +user: Philippe Hupe +date: Sun Jan 15 21:11:09 2012 +0100 +description: gtk-paste and gtk-copy icons were missing for both Dark and + Light theme. They have been added. + +changeset: 1738:0f2d5a79b325 +user: jdc +date: Sun Jan 15 18:36:20 2012 +0100 +description: little correction for tags Output profiles + +changeset: 1737:51f334300825 +user: jdc +date: Sun Jan 15 18:32:37 2012 +0100 +description: modification of LUT of Output-profiles Output-gamma + Free-Gamma, suppression of discontinuity + +changeset: 1736:82d31eab71b1 +user: DrSlony +date: Sat Jan 14 03:22:07 2012 +0000 +description: Updated Polish translations + +changeset: 1735:2be56e1f68e1 +user: DrSlony +date: Sat Jan 14 03:20:03 2012 +0000 +description: Modified the generateTranslationDiffs.sh file, runs ~34% + faster + +changeset: 1734:43ae4752ef6e +user: natureh +date: Fri Jan 13 00:33:40 2012 +0100 +description: Updated french strings + added localisation for the "RGB + Curves" tool + +changeset: 1733:abfe22ba9400 +user: natureh +date: Wed Jan 11 02:06:23 2012 +0100 +description: Solving issue 1001: "Auto WB is saved as Custom in profile + files" and 929: "Crash on image open with WB method = Auto" + with a different workaround + +changeset: 1732:03d19f04768d +user: natureh +date: Wed Jan 11 01:50:10 2012 +0100 +description: Solving issue 1196: "Strange blown highlights with control + cage tone curve in 32 bit release builds" + +changeset: 1731:d25652ca80b3 +user: DrSlony +date: Sun Jan 08 18:29:38 2012 +0000 +description: Set InputProfile=(CameraICC), WorkingProfile=sRGB, + OutputProfile=RT_sRGB, GammaValue=2.22 and GammaSlope=4.5 + in all pp3 files. + +changeset: 1730:6e231b0019ee +user: DrSlony +date: Sun Jan 08 17:35:33 2012 +0000 +description: Code cleanup: size() vs empty(), possible memleaks, + initialization list order. On behalf of lebedev.ri, see + issue 1195 + +changeset: 1729:d91fe5efdbb2 +user: DrSlony +date: Mon Jan 02 15:00:48 2012 +0000 +description: Code cleanup: removal of unnessesary backslashes, committed + on behalf of lebedev.ri, issue 1162 + +changeset: 1728:d267c081df9d +user: DrSlony +date: Mon Jan 02 13:53:27 2012 +0000 +description: Updated German translation on behalf of maweso, issue 1164 + +changeset: 1727:d14be2436fef +user: DrSlony +date: Mon Jan 02 13:44:44 2012 +0000 +description: Updated Czech translation on behalf of mkyral, issue 1180 + +changeset: 1726:1620adfa76ca +user: Michael Ezra +date: Mon Jan 02 00:10:55 2012 -0500 +description: Focus Mask (beta) and shortcuts for preview modes (issue + 1172) + Preview Red channel: r + Preview Blue channel: b + Preview Green channel: g + Preview Luminosity: v + Preview Focus Mask: Shift-F + Before-After: changed to Shift-B + +changeset: 1725:513c6326fcdc +user: Oliver Duis +date: Sun Jan 01 20:37:34 2012 +0100 +description: New camera color profiles: Canon 5D, G10, Nikon D3100; + DCRAW cleanups + see issue 1186 + +changeset: 1724:2c1afe0fd883 +user: Oliver Duis +date: Fri Dec 30 11:57:11 2011 +0100 +description: Update to DCRAW 9.12, adding new cameras + see issue 1179 + +changeset: 1723:d14df629a92d +user: DrSlony +date: Wed Dec 28 19:05:15 2011 +0000 +description: Set all tools to SET by default in Preferences - Batch + Processing, issue 1154 + +changeset: 1722:264a8634e1b3 +user: Hombre +date: Wed Dec 28 12:23:56 2011 +0100 +description: Solving issue 1096: "Infinite loop when switching to + before/after view" + +changeset: 1721:449d8192217c +user: DrSlony +date: Tue Dec 27 20:00:47 2011 +0000 +description: Updated Nederlands translation on behalf of Paul + Matthijsse, issue 1129, and ran generateTranslationDiffs + +changeset: 1720:8478428eeb2e +user: Hombre +date: Mon Dec 26 14:24:33 2011 +0100 +description: Solving issue 1175: "Pls add the [Nikon's] file extension + nrw to the "Parsed Extensions" list by default". + +changeset: 1719:0c4018b036a8 +user: jdc +date: Mon Dec 26 06:18:19 2011 +0100 +description: Change with ICC files + +changeset: 1718:eb5b9a526b93 +user: jdc +date: Sun Dec 25 09:11:26 2011 +0100 +description: suppress RT_Middle_gsRGB.icc + +changeset: 1716:d6976838a524 +user: jdc +date: Sun Dec 25 07:57:59 2011 +0100 +description: New Output Profiles see #issue1166 + +changeset: 1712:8ed4c2edc88f +user: Michael Ezra +date: Sat Dec 24 12:12:01 2011 -0500 +description: Fix for typo in comment + +changeset: 1710:d3d4f7b28576 +user: Michael Ezra +date: Sat Dec 24 12:04:22 2011 -0500 +description: Preview modes: R,B,G channels and Luminosity (issue 1167) + +changeset: 1708:f3eea179e4de +user: Hombre +date: Sat Dec 24 15:57:48 2011 +0100 +description: Adding 2 lines forgotten in the previous WB patch: the LED + profiles wasn't applied. + +changeset: 1706:136288db1b0b +user: DrSlony +date: Mon Dec 19 20:48:54 2011 +0000 +description: Re-tagging 4.0.6, hopefully fixing the screwed up tag and + aligning the latesttagdistance back with what it should be + +changeset: 1704:40958891b202 +user: Michael Ezra +date: Sun Dec 18 19:12:47 2011 -0500 +description: Neutral Levels & tooltips (issue 1161) + +changeset: 1702:dca21e324066 +user: Michael Ezra +date: Sat Dec 17 12:14:44 2011 -0500 +description: Major rework of headers inclusion style Part2 on behalf of + lebedev.ri (issue 1079) + +changeset: 1700:bc56188f39df +user: Michael Ezra +date: Sat Dec 17 12:08:57 2011 -0500 +description: Major rework of headers inclusion style on behalf of + lebedev.ri (issue 1079) + +changeset: 1698:d40209c8298b +user: Emil Martinec +date: Fri Dec 16 11:25:46 2011 -0600 +description: Bugfix :) for flat field correction bugfix :( + +changeset: 1696:1a4d9d0f95fb +user: Hombre +date: Fri Dec 16 01:37:22 2011 +0100 +description: Patch from issue 1131: "Predefined White Balance values". + +changeset: 1694:29639856f89a +user: DrSlony +date: Thu Dec 15 23:05:19 2011 +0000 +description: Removed rtstart reference from CMakeLists.txt, see issue + 1160 + +changeset: 1692:0afb790abada +user: Emil Martinec +date: Thu Dec 15 09:43:22 2011 -0600 +description: Implementing RGB curves. + +changeset: 1690:218eac5d3a3b +user: Emil Martinec +date: Wed Dec 14 15:10:00 2011 -0600 +description: Bugfix for flatfield correction tool. + +changeset: 1688:f08ce67af335 +user: Michael Ezra +date: Mon Dec 12 15:58:20 2011 -0500 +description: Crop ratios: new values, code optimization (issue 1153) + +changeset: 1686:2bfb4b5255a7 +user: Michael Ezra +date: Fri Dec 09 21:17:37 2011 -0500 +description: Thumbnail Exif string: append exposure compensation (see + issue 1150) + In order for this option to work on previously browsed + thumbs the cache must be cleared. + (Please be sure to add to the build release notes) + +changeset: 1684:78fee2fd065b +user: Philippe Hupe +date: Wed Dec 07 20:45:06 2011 +0100 +description: lock-off.png and lock-on.png icon were trimmed, the header + height has been increased from 15 to 17 (issue 1116) + +changeset: 1682:69b8bd8bb944 +user: Michael Ezra +date: Tue Dec 06 19:33:37 2011 -0500 +description: File browser filter: Exposure Compensation (see issue 1003) + In order to use this new filter with previously browsed + thumbnails there are 2 options: + Option 1. Global fix: clear cache/data folder + Option 2. Local Fix: select thumbs, right click, Cache + /Clear from cache - partial + reload folder in file browser + +changeset: 1679:c7337c4732d3 +user: DrSlony +date: Sun Dec 04 10:40:24 2011 +0000 +description: Updated Japanese translation on behalf of a3novy, issue 1145 + +changeset: 1677:eda4134c4a2b +user: natureh +date: Sat Dec 03 19:10:34 2011 +0100 +description: Solving issue 1084 (please confirm): "White rectangles + appear in the final image file". See also issue 1112, + comment 150. + +changeset: 1675:643dcde3c0a2 +user: DrSlony +date: Thu Dec 01 00:53:19 2011 +0000 +description: - language file changes, + - profile changes, + - tagged 4.0.6 + - line endings normalized to CR+LF in language files and + postprocessing profiles + - fixed capitalization of "raw" + - patched generateTranslationDiffs.sh to properly sort + numbered entries, e.g. 113 should be after 11 and 12, not + between. Small change - now comments appear before the + "!!!!!" section. Not worth worrying about imho. Also used + sort's -unique capabilities to not unnecessarily spawn + another process. + see + http://code.google.com/p/rawtherapee/source/detail?r=71bb39a + b934e2e8654b35c1e36dcc1a572a26f03 + +changeset: 1673:2e2ca6d7bc56 +user: Emil Martinec +date: Wed Nov 30 16:02:00 2011 -0600 +description: remerging and eliminating 'fixit' + +changeset: 1670:1d533d5a4e9d +user: Emil Martinec +date: Wed Nov 30 15:59:32 2011 -0600 +description: Restoring changeset 286a06753099 + +changeset: 1667:112fc99c7186 +user: Emil Martinec +date: Wed Nov 30 15:06:33 2011 -0600 +description: More fixes + +changeset: 1665:ab4ae51a26f8 +user: Emil Martinec +date: Wed Nov 30 14:34:17 2011 -0600 +description: This is not corrupted (fingers crossed). + +changeset: 1662:5ed6967270a6 +user: Emil Martinec +date: Wed Nov 30 14:26:40 2011 -0600 +description: Backout changes + +changeset: 1660:3cccc96a2099 +user: Emil Martinec +date: Wed Nov 30 14:26:07 2011 -0600 +description: Backout changes + +changeset: 1658:edbb9fccb78e +user: Emil Martinec +date: Wed Nov 30 14:22:48 2011 -0600 +description: Backout changes + +changeset: 1656:25f86e70a8bb +user: Emil Martinec +date: Wed Nov 30 10:44:39 2011 -0600 +description: Backing out changes. + +changeset: 1654:d35165fc2162 +user: Emil Martinec +date: Wed Nov 30 10:41:28 2011 -0600 +description: Backing out changes. + +changeset: 1653:5fc887f050d5 +user: DrSlony +date: Tue Nov 29 20:06:42 2011 +0000 +description: Changed OutputProfile from 'No ICM: sRGB output' to + 'RT_sRGB'. Issue 1102, comments 34 onwards. + +changeset: 1652:286a06753099 +user: Michael Ezra +date: Mon Nov 28 21:40:22 2011 -0500 +description: Small fix to partialpaste/tone mapper + +changeset: 1651:0032d73774a1 +user: DrSlony +date: Tue Nov 29 00:42:56 2011 +0000 +description: Updated default and Polish translations with missing + HISTORY_MSG_162, and updated all profiles to + AppVersion=4.0.6 + +changeset: 1650:c13a0b4316f5 +user: DrSlony +date: Mon Nov 28 23:50:28 2011 +0000 +description: Added tag 4.0.6 for changeset 71bb39ab934e + +changeset: 1649:71bb39ab934e +tag: 4.0.6 +user: DrSlony +date: Mon Nov 28 23:49:05 2011 +0000 +description: Removed WindowsEnvironmentSetup.html Issue 1112 comments + 125 onwards. \ No newline at end of file diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 8b33d02b7..89b2f1f09 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -1,7 +1,7 @@ ABOUT_TAB_BUILD;Version -ABOUT_TAB_CAVEATS;Mise en garde ABOUT_TAB_CREDITS;Crédits ABOUT_TAB_LICENSE;Licence +ABOUT_TAB_RELEASENOTES;Notes de Mise ABOUT_TAB_SPLASH;Splash ADJUSTER_RESET_TO_DEFAULT;Réglages par défaut BATCHQUEUE_AUTOSTART;Démarrage auto diff --git a/rtdata/languages/default b/rtdata/languages/default index a0d49ee80..99a142d53 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1,7 +1,7 @@ ABOUT_TAB_BUILD;Version -ABOUT_TAB_CAVEATS;Caveats ABOUT_TAB_CREDITS;Credits ABOUT_TAB_LICENSE;License +ABOUT_TAB_RELEASENOTES;Release Notes ABOUT_TAB_SPLASH;Splash ADJUSTER_RESET_TO_DEFAULT;Reset to default BATCHQUEUE_AUTOSTART;Auto start diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 5e5860c32..e5895378c 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -233,7 +233,7 @@ void RTWindow::on_realize () { cursorManager.init (get_window()); - // Check if first run of this version, then display the caveats text + // Check if first run of this version, then display the Release Notes text if (options.version != versionString) { int prevVerNbr[4]; int currVerNbr[4]; @@ -243,19 +243,19 @@ void RTWindow::on_realize () { // Now we can update the version parameter with the right value options.version = versionString; - bool showCaveats = false; + bool showReleaseNotes = false; // Check if the current version is newer - if (currVerNbr[0] > prevVerNbr[0]) showCaveats = true; - else if (currVerNbr[1] > prevVerNbr[1]) showCaveats = true; - else if (currVerNbr[2] > prevVerNbr[2]) showCaveats = true; + if (currVerNbr[0] > prevVerNbr[0]) showReleaseNotes = true; + else if (currVerNbr[1] > prevVerNbr[1]) showReleaseNotes = true; + else if (currVerNbr[2] > prevVerNbr[2]) showReleaseNotes = true; - if (showCaveats) { + if (showReleaseNotes) { // this is a first run! splash = new Splash (*this); splash->set_transient_for (*this); splash->signal_delete_event().connect( sigc::mem_fun(*this, &RTWindow::splashClosed) ); - if (splash->hasCaveats()) { - splash->showCaveats(); + if (splash->hasReleaseNotes()) { + splash->showReleaseNotes(); splash->show (); } else { diff --git a/rtgui/splash.cc b/rtgui/splash.cc index 5bbb4370b..10e5deaf6 100644 --- a/rtgui/splash.cc +++ b/rtgui/splash.cc @@ -74,7 +74,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t set_border_width (4); - caveatsSW = NULL; + releaseNotesSW = NULL; nb = Gtk::manage (new Gtk::Notebook ()); get_vbox()->pack_start (*nb); @@ -102,6 +102,8 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t Gtk::ScrolledWindow *buildSW = Gtk::manage (new Gtk::ScrolledWindow()); Gtk::TextView *buildTV = Gtk::manage (new Gtk::TextView (textBuffer)); buildTV->set_editable(false); + buildTV->set_left_margin (10); + buildTV->set_right_margin (5); buildSW->add(*buildTV); nb->append_page (*buildSW, M("ABOUT_TAB_BUILD")); } @@ -124,6 +126,9 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t Gtk::ScrolledWindow *creditsSW = Gtk::manage (new Gtk::ScrolledWindow()); Gtk::TextView *creditsTV = Gtk::manage (new Gtk::TextView (textBuffer)); + creditsTV->set_left_margin (10); + creditsTV->set_right_margin (5); + creditsTV->set_wrap_mode(Gtk::WRAP_WORD); creditsTV->set_editable(false); creditsSW->add(*creditsTV); nb->append_page (*creditsSW, M("ABOUT_TAB_CREDITS")); @@ -147,16 +152,18 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t Gtk::ScrolledWindow *licenseSW = Gtk::manage (new Gtk::ScrolledWindow()); Gtk::TextView *licenseTV = Gtk::manage (new Gtk::TextView (textBuffer)); + licenseTV->set_left_margin (10); + licenseTV->set_right_margin (5); licenseTV->set_editable(false); licenseSW->add(*licenseTV); nb->append_page (*licenseSW, M("ABOUT_TAB_LICENSE")); } } - // Tab 5: the caveats - std::string caveatsFileName = Glib::build_filename (creditsPath, "CAVEATS.txt"); - if ( safe_file_test(caveatsFileName, (Glib::FILE_TEST_EXISTS)) ) { - FILE *f = safe_g_fopen (caveatsFileName, "rt"); + // Tab 5: the Release Notes + std::string releaseNotesFileName = Glib::build_filename (creditsPath, "RELEASE_NOTES.txt"); + if ( safe_file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) { + FILE *f = safe_g_fopen (releaseNotesFileName, "rt"); if (f != NULL) { char* buffer = new char[1024]; std::ostringstream ostr; @@ -168,12 +175,14 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t Glib::RefPtr textBuffer = Gtk::TextBuffer::create(); textBuffer->set_text((Glib::ustring)(ostr.str())); - caveatsSW = Gtk::manage (new Gtk::ScrolledWindow()); - Gtk::TextView *caveatsTV = Gtk::manage (new Gtk::TextView (textBuffer)); - caveatsTV->set_editable(false); - caveatsTV->set_wrap_mode(Gtk::WRAP_WORD); - caveatsSW->add(*caveatsTV); - nb->append_page (*caveatsSW, M("ABOUT_TAB_CAVEATS")); + releaseNotesSW = Gtk::manage (new Gtk::ScrolledWindow()); + Gtk::TextView *releaseNotesTV = Gtk::manage (new Gtk::TextView (textBuffer)); + releaseNotesTV->set_left_margin (10); + releaseNotesTV->set_right_margin (3); + releaseNotesTV->set_editable(false); + releaseNotesTV->set_wrap_mode(Gtk::WRAP_WORD); + releaseNotesSW->add(*releaseNotesTV); + nb->append_page (*releaseNotesSW, M("ABOUT_TAB_RELEASENOTES")); } } @@ -221,7 +230,7 @@ bool Splash::on_button_release_event (GdkEventButton* event) { } */ -void Splash::showCaveats() { - if (caveatsSW) - nb->set_current_page(nb->page_num(*caveatsSW)); +void Splash::showReleaseNotes() { + if (releaseNotesSW) + nb->set_current_page(nb->page_num(*releaseNotesSW)); } diff --git a/rtgui/splash.h b/rtgui/splash.h index 9a75d04fe..15ffbe000 100644 --- a/rtgui/splash.h +++ b/rtgui/splash.h @@ -40,14 +40,14 @@ class Splash : public Gtk::Dialog { private: SplashImage* splashImage; Gtk::Notebook* nb; - Gtk::ScrolledWindow* caveatsSW; + Gtk::ScrolledWindow* releaseNotesSW; public: Splash (Gtk::Window& parent, int maxtime); Splash (Gtk::Window& parent); - bool hasCaveats() { return caveatsSW != NULL; }; - void showCaveats(); + bool hasReleaseNotes() { return releaseNotesSW != NULL; }; + void showReleaseNotes(); bool on_timer (); //virtual bool on_button_release_event (GdkEventButton* event); };