X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=DEVELOP.md;h=78231b89e72a5b9fd91688477baab88a2906e498;hb=d0188ed3e1ea5536e729e93b87d54114368120ac;hp=4d2b0fca8b420c5e79c7d041124a1ec3fc0453fc;hpb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;p=dcpomatic.git

diff --git a/DEVELOP.md b/DEVELOP.md
index 4d2b0fca8..78231b89e 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -4,6 +4,19 @@ This file collects a few notes relevant to DCP-o-matic developers.  There is als
 [on the web site](https://dcpomatic.com/development).
 
 
+## Branches
+
+The main dcpomatic repo has the following branches:
+
+* `main` - the main development branch; contains 2.16.x versions
+* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main`
+
+The `test/data` submodule has the following branches:
+
+* `v2.16.x` - branch for use with v2.16.x versions
+* `v2.18.x` - branch for use with v2.17.x versions (as will become v2.18.x)
+
+
 ## Player stress testing
 
 If you configure DCP-o-matic with `--enable-player-stress-test` you can make a script which
@@ -36,10 +49,14 @@ Stop any current playback.
 
 Seek to some point in the current DCP, where 0 is the start and 4095 is the end; for example
 
-```S 2048```
+```K 2048```
 
 seeks half-way through the DCP.
 
+* `E`
+
+Stops playback and closes the player.
+
 The script can be run using something like
 
 ```dcpomatic2_player -s stress```
@@ -49,8 +66,25 @@ to load a script file called `stress` and start executing it.
 
 ## Adding a new language
 
-- Edit src/wx/config_dialog.cc to add the language to languages.
-- Add to platform/windows/wscript, platform/osx/make_dmg.sh, cscript.
-- Add credit to src/wx/about_dialog.cc and database.
-- Add to i18n.php on website and update-i18n-stats script.
+- Edit `src/wx/config_dialog.cc` to add the language to languages.
+- Add to `platform/windows/wscript`, `platform/osx/make_dmg.sh`, `cscript`.
+- ./waf pot
+- cp build/src/lib/libdcpomatic.pot src/lib/po/$LANG.po
+- cp build/src/wx/libdcpomatic-wx.pot src/wx/po/$LANG.po
+- cp build/src/tools/libdcpomatic-wx.pot src/tools/po/$LANG.po
+- sed -i "s/CHARSET/UTF-8/" src/{lib,wx,tools}/po/$LANG.po
+- Commit / push
+- Add credit to `src/wx/about_dialog.cc` and database.
+- Add to `i18n.php` on website and `update-i18n-stats` script, then run `update-i18n-stats` script.
+
+
+## Taking screenshots for the manual
+
+The manual PDF looks nice if vector screenshots are used.  These can be taken as follows:
 
+- Build `gtk-vector-screenshot.git` (using meson/ninja)
+- Copy `libgtk-vector-screenshot.so` to `/usr/local/lib/gtk-3.0/modules/`
+- Run DCP-o-matic using `run/dcpomatic --screenshot`
+- Start `take-vector-screenshot`, click "Take screenshot" then click on the DCP-o-matic window.
+- Find a PDF in `/tmp/dcpomatic2.pdf`
+- Copy this to `doc/manual/raw-screenshots`