Add NEWS for 2.0, update documentation screenshots and add docs for the "Change history" feature.
Remarks for the NEWS items: - I left out names for Jiří and Thomas as you count as core developers for long I'd say. This doesn't mean your work is less appreciated :heart: - I skipped many smaller or non user visible changes or follow-up PRs to not bloat the list too much - @techee are tere any macOS specific items missing? - if anyone miss his favorite PR or so, shout out - based on the amount of commits and PRs, this is a Jiří+Thomas release :). Thank you! - Should we maybe better highlight the many ctags changes?
Thanks @b4n, @kugel-, @elextr, @techee, @frlan and all the others! You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3593
-- Commit Summary --
* Add NEWS for Geany 2.0 * Add documentation for new Scintilla feature "Change history" * Update documentation screenshots
-- File Changes --
M NEWS (46) M doc/geany.txt (31) M doc/images/build_menu_commands_dialog.png (0) A doc/images/edit_change_history.png (0) M doc/images/find_dialog.png (0) M doc/images/find_in_files_dialog.png (0) M doc/images/main_window.png (0) M doc/images/pref_dialog_edit_completions.png (0) M doc/images/pref_dialog_edit_display.png (0) M doc/images/pref_dialog_edit_features.png (0) M doc/images/pref_dialog_edit_indentation.png (0) M doc/images/pref_dialog_files.png (0) M doc/images/pref_dialog_gen_misc.png (0) M doc/images/pref_dialog_gen_startup.png (0) M doc/images/pref_dialog_interface_interface.png (0) M doc/images/pref_dialog_interface_notebook.png (0) M doc/images/pref_dialog_interface_toolbar.png (0) M doc/images/pref_dialog_keys.png (0) M doc/images/pref_dialog_printing.png (0) M doc/images/pref_dialog_templ.png (0) M doc/images/pref_dialog_tools.png (0) M doc/images/pref_dialog_various.png (0) M doc/images/pref_dialog_vte.png (0) M doc/images/replace_dialog.png (0)
-- Patch Links --
https://github.com/geany/geany/pull/3593.patch https://github.com/geany/geany/pull/3593.diff
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
wait… how come the icons are so big? HiDPI issue?
Thanks for updating all this! But… I really think there's a problem with the inline icons in the screenshots, they shouldn't be that big -- and they aren't on my end with Adwaita (which seems to be what you used, which makes sense to use IMO).
@elextr commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Which icons? Looks pretty normal (for dead tortoise) except the set build commands looks like the window has been stretched vertically by the user.
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Look at the clear icons. My version (yeah, no window borders, but you get the idea): 
@elextr commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Yeah ok, the delete icon seems to be larger than any other icon, see also the general startup preference dialog, compare the delete icons and the folder icons size on the paths lines, on my system the folder is bigger than the delete, here the delete is bigger than the folder. Maybe Enrico's system is missing an icon size for delete and its picking the next up.
Also as I said the set build tools dialog seems to have been expanded vertically (as well as the icons).
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Also as I said the set build tools dialog seems to have been expanded vertically (as well as the icons).
To me that looks like the dialog is making room for those ginormous icons :)
@ntrel commented on this pull request.
Thanks for updating the docs - I made a few tweaks.
Interface
* The document list in the sidebar has a new tree view. This mode is the new default and existing installations automatically use it (PR#1813). + * Use dark-theme friendly colors for compiler messages (PR#3013). + * Add a confirmation dialog on search & replace for the whole session + (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Improve user experience when creating new projects (PR#3042). + * Add option to show symbols in symbol tree without root groups (PR#3172).
```suggestion * Add option to show symbols in symbol tree without category groups (PR#3172). ```
@@ -2383,6 +2383,37 @@ Always
Always show virtual spaces beyond the end of lines
+Change History +`````````````` + +The change history features enables displaying of document changes in the markers margin or in the text.
```suggestion The *change history* feature enables changed text in a document to be shown in the markers margin or by underlining the text. ```
@@ -2383,6 +2383,37 @@ Always
Always show virtual spaces beyond the end of lines
+Change History +`````````````` + +The change history features enables displaying of document changes in the markers margin or in the text. + +Newly added, modified and removed lines or words are highlighted to easily track changes to the opened +document. The changes can be shown as vertical bars in the markers margin and/or as underlines in +the text directly. + +.. note:: + This feature may use a moderate amount of memory, especially if there are many or big changes in the document. + Also, the state of the modifications is not persisted, i.e. when closing the document or Geany, all change markers will be lost.
```suggestion Also, modification information is not kept when re-opening a document - all change markers will be lost. ```
@elextr commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Yeah maybe, but there is a lot of padding above and below the icons, anyway its something to be looked at when re-taking the screengrab after the delete icon is fixed.
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
I booted up a Debian Bookworm VM from the live ISO image without any modifications to the theme. The only thing changed was to reduce the font size, otherwise everything would be even bigger. There was nothing HiDPI related involved.
Do you have any suggestion on how to get a sane looking Gnome running? That whole desktop felt very bugged to me but this is another topic :).
@eht16 pushed 1 commit.
6601ca02e3e589f1dc76ad89893cbf929420fe50 Apply geany.txt suggestions from code review
@eht16 pushed 1 commit.
e754f79d16dcac69bcad0da13a0fd2aaf03e6a65 Update NEWS
Thanks for updating the docs - I made a few tweaks.
Thank you, applied them all.
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Reducing the font size might be the reason for icons to look too big in comparison, whereas the display was just entirely scaled up somehow… I have no idea (my Bookworm looks as above, but it's not 100% stock), but maybe try X11 instead of Wayland (if that was Wayland), just in case it's a weird misdetection of the VM's screen characteristics?
I might give this a try later if need be, I have a VM at hand (not under GNOME per se, but that could change and could be made not to matter)
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
I totally don't mind how we create the screenshots. I just don't want to do it 10 times and do not want to install a dozen VMs :). Trying X11 might get better results. Within Gnome, I didn't find any way to make it look less huge. There are simply no helpful settings :(.
@eht16 Thanks for doing the boring job!
I left out names for Jiří and Thomas as you count as core developers for long I'd say. This doesn't mean your work is less appreciated ❤️
No problem at all :-).
@techee are tere any macOS specific items missing?
There were some fixes but nothing really major worth mentioning I think.
Should we maybe better highlight the many ctags changes?
I don't think it's necessary, the big refactorings weren't user-visible. But maybe if https://github.com/geany/geany/pull/3049 gets merged, an "improved support of ctags file format" could be mentioned so users know they can use these files and there should be no issues with them.
if anyone miss his favorite PR or so, shout out
I would maybe just rephrase "Improve user experience when creating new projects" to something like "Simplify project creation from existing directories with sources" to make it clearer what it is about.
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
I'll give it another try tomorrow.
@eht16 pushed 1 commit.
b11817519cb0e9d2232958c54ce6c3d37c1ec599 Improve wording for PR3042 item
Should we maybe better highlight the many ctags changes?
I don't think it's necessary, the big refactorings weren't user-visible. But maybe if #3049 gets merged, an "improved support of ctags file format" could be mentioned so users know they can use these files and there should be no issues with them.
Yeah, will happily add it once it is merged :crossed_fingers:
if anyone miss his favorite PR or so, shout out
I would maybe just rephrase "Improve user experience when creating new projects" to something like "Simplify project creation from existing directories with sources" to make it clearer what it is about.
Done, thanks.
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
It won't get better. No idea what I'm doing wrong.
I managed to scale the display to 60% (after enabling some experimental feature in mutter via gsettings and then changing the scale in some XML file) but it this really scales the display only, the GTK widgets are still huge. Completely unmodified Gnome:  Scaled down to 60% but the widgets are still huge: 
Either someone else can create the screenshots or I will use my local Xfce with Adwaita theme to create them.
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
I'll try and grab my girlfriend's Bullseye (yeah, not updated yet…) which has whatever version of GNOME shell that came with it, and see if it looks more "normal". If it does, I'll take the screenshots later today or tonight.
Yeah, will happily add it once it is merged 🤞
It just got in :wink:
"improved support of ctags file format" could be mentioned so users know they can use these files and there should be no issues with them.
Maybe also worth mentioning that this is the recommended way of generating tag files.
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
FWIW I just tried in Bookworm VM as well, and was shocked that @eht16 is not crazy and it *does* look like this, be it on Wayland or X11… playing a tad with it, it's due to the Adwaita icons, if I use that on my regular desktop it goes crazy as well. Will see if it's the same on Bullseye, and if it is… I guess it won't be Adwaita icons for the screenshots :)
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
@eht16 if you move those out of the way:
* */usr/share/icons/Adwaita/48x48/legacy/edit-clear-all.png* * */usr/share/icons/Adwaita/48x48/legacy/edit-clear.png* * */usr/share/icons/Adwaita/48x48/legacy/window-close.png* * */usr/share/icons/Adwaita/24x24/legacy/window-close.png*
and then run `sudo gtk-update-icon-cache /usr/share/icons/Adwaita/` you'll get a more reasonable look.
Looks like what's happening is that they distribute those three icons (well, *edit-clear-all* is probably not necessary for us) in only *some* sizes, and although there is a `-symbolic` version, it's not picked up by GTK if there's a non-symbolic at any size.
@eht16 pushed 1 commit.
36930bc6bfff50be25831760db3aec9311b519fd Update NEWS
@b4n commented on this pull request.
- Improved support of ctags file format, this is also the
+ recommended format for generating tags files (PR#3049).
```suggestion * Improved support for the ctags file format, which is now the recommended format for tags files (PR#3049). ```
We're not generating them, so I suggest amending the wording
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
@eht16 do you want me to take care of the screenshots, or can you do it with what I mentioned?
@eht16 pushed 1 commit.
1b2d4f04b7a1026148a12eee3e0a39f789f9797c Update screenshots - without super bloated Adwaita legacy icons
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
Mighty @b4n, that's it.
Screenshots are updated again and look a lot better now. The Gnome default screenshot tool adds a think transparent border around the images. I could remove it but actually I think it's nice because it gives the images some margin when embedded in the HTML document. What do you think?
And I'm happy to be confirmed not being crazy, at least in this matter :).
@eht16 commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
@eht16 do you want me to take care of the screenshots, or can you do it with what I mentioned?
Decide yourself :). I was too busy with making screenshots to notice your comment.
@eht16 pushed 1 commit.
c0b429f59fd2dc4436366e146a5016ccedf2f4fa Update NEWS
@b4n commented on this pull request.
On doc/images/pref_dialog_templ.png:
Haha I didn't remember I was there :D
@eht16 commented on this pull request.
On doc/images/pref_dialog_templ.png:
Last chance to get you out of there :). To be honest, I just re-used the values from the 1.38 screenshot.
@b4n commented on this pull request.
On doc/images/replace_dialog.png:
That one still needs updating, sorry
@b4n commented on this pull request.
On doc/images/build_menu_commands_dialog.png:
The Gnome default screenshot tool adds a think transparent border around the images. I could remove it but actually I think it's nice because it gives the images some margin when embedded in the HTML document. What do you think?
LGTM
@eht16 pushed 1 commit.
f87a878c9c77404f46fbe3af348c04cb8b9543f6 Update screenshots
@eht16 commented on this pull request.
On doc/images/replace_dialog.png:
I'm sorry! Forgot this one but now added.
@kugel- commented on this pull request.
On doc/images/pref_dialog_various.png:
Hm, the older screenshot shows some contrast between the list items. We kind of regressed here.
@kugel- commented on this pull request.
On doc/images/main_window.png:
I like the proportions of the older screenshot better (msgwin is huge now)
@kugel- commented on this pull request.
- Add a confirmation dialog on search & replace for the whole session
+ (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Simplify project creation from existing directories with sources + (PR#3042). + * Add option to show symbols in symbol tree without category groups + (PR#3172). + * Add option to only show line endings if they differ from file default + (PR#3287). + * Make tab label length and window title length configurable + (Abdul Rafey, #3365). + * Make Go to Symbol commands show signature list (PR#3475). + + Editor + * Update Scintilla to 5.3.7 and Lexilla to 5.2.7 (PR#2867, PR#3551). + * Add "Change history" feature (PR#3551).
Might mention that it's disabled by default (without explaining why)
Awesome! Can't find words for how much I appreciative your effort.
@eht16 commented on this pull request.
On doc/images/main_window.png:
Me too but this is the great Adwaita we all love so much...
@eht16 commented on this pull request.
On doc/images/pref_dialog_various.png:
This is also theme-dependent, isn't it? I don't remember we changed anything in the dialog?
We could discuss if we do not want to use that theme for screenshots but given the time left, I would postpone this discussion to 2.1+.
@techee commented on this pull request.
On doc/images/main_window.png:
I think Enrico wanted to show all the tabs of the message window but unfortunately these are the Adwaita's infamous "bloated and scaled up" tabs from #3063 so they take a huge amount of space :(.
@eht16 commented on this pull request.
- Add a confirmation dialog on search & replace for the whole session
+ (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Simplify project creation from existing directories with sources + (PR#3042). + * Add option to show symbols in symbol tree without category groups + (PR#3172). + * Add option to only show line endings if they differ from file default + (PR#3287). + * Make tab label length and window title length configurable + (Abdul Rafey, #3365). + * Make Go to Symbol commands show signature list (PR#3475). + + Editor + * Update Scintilla to 5.3.7 and Lexilla to 5.2.7 (PR#2867, PR#3551). + * Add "Change history" feature (PR#3551).
` * Add "Change history" feature, disabled by default (PR#3551).`
I don't know if it's worth explaining why it is disabled. The explaination will probably be longer than a NEWS item should be.
@techee commented on this pull request.
On doc/images/main_window.png:
But I think the message window could be made a tiny bit smaller and the whole window could be taller to compensate for this (if Enrico has a big enough monitor).
@kugel- commented on this pull request.
- Add a confirmation dialog on search & replace for the whole session
+ (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Simplify project creation from existing directories with sources + (PR#3042). + * Add option to show symbols in symbol tree without category groups + (PR#3172). + * Add option to only show line endings if they differ from file default + (PR#3287). + * Make tab label length and window title length configurable + (Abdul Rafey, #3365). + * Make Go to Symbol commands show signature list (PR#3475). + + Editor + * Update Scintilla to 5.3.7 and Lexilla to 5.2.7 (PR#2867, PR#3551). + * Add "Change history" feature (PR#3551).
That's why I said "(without explaining why)" ;-)
@eht16 commented on this pull request.
On doc/images/main_window.png:
So far I tried to keep the width and height of the old screenshot. But I don't mind much.
@eht16 commented on this pull request.
- Add a confirmation dialog on search & replace for the whole session
+ (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Simplify project creation from existing directories with sources + (PR#3042). + * Add option to show symbols in symbol tree without category groups + (PR#3172). + * Add option to only show line endings if they differ from file default + (PR#3287). + * Make tab label length and window title length configurable + (Abdul Rafey, #3365). + * Make Go to Symbol commands show signature list (PR#3475). + + Editor + * Update Scintilla to 5.3.7 and Lexilla to 5.2.7 (PR#2867, PR#3551). + * Add "Change history" feature (PR#3551).
Oops, my tired brain read "with explaining why". Sorry.
@b4n commented on this pull request.
On doc/images/pref_dialog_various.png:
This is also theme-dependent, isn't it?
It is, unless we're explicitly asking for the theme to do something like that (there's an option I don't remember, but you're only supposed to use that if things would be hard to comprehend without, and otherwise let the theme decide).
@eht16 pushed 1 commit.
a6a36c276cea1d193081987310eec657986c9606 Update NEWS
@eht16 commented on this pull request.
- Add a confirmation dialog on search & replace for the whole session
+ (PR#3033). + * Filter entry for symbol tree (PR#3055). + * Simplify project creation from existing directories with sources + (PR#3042). + * Add option to show symbols in symbol tree without category groups + (PR#3172). + * Add option to only show line endings if they differ from file default + (PR#3287). + * Make tab label length and window title length configurable + (Abdul Rafey, #3365). + * Make Go to Symbol commands show signature list (PR#3475). + + Editor + * Update Scintilla to 5.3.7 and Lexilla to 5.2.7 (PR#2867, PR#3551). + * Add "Change history" feature (PR#3551).
Done.
@b4n commented on this pull request.
On doc/images/main_window.png:
Agreed it could be bit improved having more room for the editor, event with Adwaita. And having it a bit taller is probably no problem. Something like this (though beware! it's a Git build and you can see it) 
@elextr commented on this pull request.
+.. image:: ./images/edit_change_history.png
+ +The image shows the default visuals: + +* inserted characters appear with coloured underlines +* points where characters were deleted are shown with small triangles +* the margin shows a block indicating the overall state of the line, prioritizing the more consequential modified states +* the states are modified (orange), saved (green), saved then reverted to modified (green-yellow), and + saved then reverted to original (cyan). + +Show in markers margin + Changes are shown in the markers margin as vertical bars + +Show as underline indicators + Changes are shown as underlines in the text directly +
Maybe add "This feature is still being evaluated and is currently disabled by default."
At least anyone who RTFM will be prompted to look for a setting, not raise an issue "change history doesn't work"
Given our discussions on themes and screenshots, maybe in the "Geany Workspace" section note that the screenshots are dead tortoise ... erm sorry Adwaita theme ;-P
Perhaps after the first screenshot add "Screenshots in the document are the default GTK Adwaita theme, but Geany will adapt to the desktop GTK theme that is set."
The fact that Geany follows the desktop setting actually isn't documented anywhere else AFAICT.
Otherwise LGTM
@eht16 pushed 2 commits.
86754ddaf839503681e6f3939424883ed3e1d97d Update main window screenshot 50f76291b2e9b3ff55fe655109d532ed221f46a1 Add note about screenshots GTK theme
Perhaps after the first screenshot add "Screenshots in the document are the default GTK Adwaita theme, but Geany will adapt to the desktop GTK theme that is set."
Done.
@eht16 commented on this pull request.
On doc/images/main_window.png:
Ok, so it's just getting bigger again. I pushed a variant with similar dimensions as @b4n's demo.
@eht16 commented on this pull request.
+.. image:: ./images/edit_change_history.png
+ +The image shows the default visuals: + +* inserted characters appear with coloured underlines +* points where characters were deleted are shown with small triangles +* the margin shows a block indicating the overall state of the line, prioritizing the more consequential modified states +* the states are modified (orange), saved (green), saved then reverted to modified (green-yellow), and + saved then reverted to original (cyan). + +Show in markers margin + Changes are shown in the markers margin as vertical bars + +Show as underline indicators + Changes are shown as underlines in the text directly +
Saying that "is still being evaluated" could lead to issues asking how the status of the evaluation is. IMO this creates expectations that there is someone actively working on this. This might happen but looking back the last two years, it is not that unlikely that it won't happen. Declaring it as "it is there, disabled and being evaluated" might cause more confusion than it tries to solve.
I think it is better to leave it as is.
@b4n commented on this pull request.
- Screenshots in the document are the default GTK Adwaita theme,
+ but Geany will adapt to the desktop GTK theme that is set.
```suggestion Screenshots in this document are taken with the default GTK Adwaita theme, but Geany will adapt to the desktop GTK theme that is set. ```
@b4n commented on this pull request.
On doc/images/main_window.png:
@eht16 yeah… is it a problem in the generated file?
@eht16 pushed 1 commit.
143f8e399684624dbf3b5f0147209ce9f1bd628d Update screenshots
@eht16 pushed 1 commit.
8ac78832fb7e758784ed65dc50eb7ad766ba9eaf Update doc/geany.txt
You guys like to have me updating screenshots I guess... The screenshot for the prefs dialog with the changed default for the tab label length is updated for 1000 chars, pixels, apples, Euros :smile:.
You guys like to have me updating screenshots I guess...
Nah, it could have totally stayed the way it was.
The screenshot for the prefs dialog with the changed default for the tab label length is updated for 1000 chars, pixels, apples, Euros 😄.
We are aiming for 1000 screenshot updates in this PR :-).
You can add #3611 now ;)
@eht16 looks like there has been a rebase mishap, and you grabbed some unrelated things in there :confused:
@eht16 pushed 4 commits.
b73b29b90cc1e1526ea77096d59953610777d2d6 Add NEWS for Geany 2.0 6a61051feccacb0698308d256d29f787bff4705c Add documentation for new Scintilla feature "Change history" f90c81347d9542c85bc6aeddbabc6becc7b4311c Update documentation screenshots e35069844226d60456eb397e6095116b099eb74a Add #3611 to NEWS
@eht16 commented on this pull request.
On doc/images/main_window.png:
No, it just that the user reading the documentation would need a resolution big enough to match the screenshot dimensions or the user needs to scroll. But probably no big deal nowadays.
@elextr commented on this pull request.
+.. image:: ./images/edit_change_history.png
+ +The image shows the default visuals: + +* inserted characters appear with coloured underlines +* points where characters were deleted are shown with small triangles +* the margin shows a block indicating the overall state of the line, prioritizing the more consequential modified states +* the states are modified (orange), saved (green), saved then reverted to modified (green-yellow), and + saved then reverted to original (cyan). + +Show in markers margin + Changes are shown in the markers margin as vertical bars + +Show as underline indicators + Changes are shown as underlines in the text directly +
Well at least say it is disabled so users know to enable it.
@eht16 looks like there has been a rebase mishap, and you grabbed some unrelated things in there 😕
Oops, thanks for notifying. Should be fixed. I started a first round of squashing the incremental changes and then came #3611 :).
You can add #3611 now ;)
Done.
@elextr @kugel- @b4n could you have a look on the yet open discussions and either resolve or comment on them? We are slightly running out of time.
@eht16 pushed 1 commit.
85febd1e301506e8a22cedcc4eb177dd919719c5 Document Change History is disabled by default
@eht16 commented on this pull request.
+.. image:: ./images/edit_change_history.png
+ +The image shows the default visuals: + +* inserted characters appear with coloured underlines +* points where characters were deleted are shown with small triangles +* the margin shows a block indicating the overall state of the line, prioritizing the more consequential modified states +* the states are modified (orange), saved (green), saved then reverted to modified (green-yellow), and + saved then reverted to original (cyan). + +Show in markers margin + Changes are shown in the markers margin as vertical bars + +Show as underline indicators + Changes are shown as underlines in the text directly +
Ok. Is 85febd1 fine?
@elextr commented on this pull request.
- Update Python filetype config (PR#3039).
+ * Add AutoIt filetype (Skif-off, PR#1752). + * Add GDScript filetype (David Yang, PR#3012). + * Remove Ferite filetype (PR#3075). + * Enable local variables and improve autocompletion for C/C++ and + some other languages (PR#3185, PR#3275). + + Windows + * Remove native file and color dialogs on Windows, GTK dialogs will + be used instead (#3219). + * Use "Prof-Gnome" GTK theme by default (same theme as used on macOS) + for a better experience, the "Adwaita" theme can still be activated + (PR#3129). + + Internationalization + * Updated translations:
Why the `:`, were you going to add a list of updated translations?
I just did a quick rescan, raised one question, not critical just ignore if stupid :-)
LGTM
@elextr commented on this pull request.
+.. image:: ./images/edit_change_history.png
+ +The image shows the default visuals: + +* inserted characters appear with coloured underlines +* points where characters were deleted are shown with small triangles +* the margin shows a block indicating the overall state of the line, prioritizing the more consequential modified states +* the states are modified (orange), saved (green), saved then reverted to modified (green-yellow), and + saved then reverted to original (cyan). + +Show in markers margin + Changes are shown in the markers margin as vertical bars + +Show as underline indicators + Changes are shown as underlines in the text directly +
Yes, thats why I marked resolved
@eht16 commented on this pull request.
- Update Python filetype config (PR#3039).
+ * Add AutoIt filetype (Skif-off, PR#1752). + * Add GDScript filetype (David Yang, PR#3012). + * Remove Ferite filetype (PR#3075). + * Enable local variables and improve autocompletion for C/C++ and + some other languages (PR#3185, PR#3275). + + Windows + * Remove native file and color dialogs on Windows, GTK dialogs will + be used instead (#3219). + * Use "Prof-Gnome" GTK theme by default (same theme as used on macOS) + for a better experience, the "Adwaita" theme can still be activated + (PR#3129). + + Internationalization + * Updated translations:
This was a stub to be filled later. @frlan pushed the updated list already in master in the meantime. I'd expect that GIT will detect a merge conflict here but it seems it does not. I will remove the two lines, so after a merge it should fit.
@eht16 pushed 6 commits.
641a09159a047d5df5adaf4b7675aa242e72a101 Add NEWS for Geany 2.0 dbf3c8e0141da0e14a619787c2d14a2aa47130c7 Add documentation for new Scintilla feature "Change history" 35a208aa24e78887109fa3d1993548492abc516d Update documentation screenshots c1be9eca9f12c38d12762c6472ad0e50c6db690f Add #3611 to NEWS 22cdf9cd61fa70b8d0c21d87024bd8cf04ada5da Document Change History is disabled by default d2186cccddf8a885eae0ccb7c894564f1ac669a0 Remove duplicate Internationalization item
@eht16 commented on this pull request.
- Update Python filetype config (PR#3039).
+ * Add AutoIt filetype (Skif-off, PR#1752). + * Add GDScript filetype (David Yang, PR#3012). + * Remove Ferite filetype (PR#3075). + * Enable local variables and improve autocompletion for C/C++ and + some other languages (PR#3185, PR#3275). + + Windows + * Remove native file and color dialogs on Windows, GTK dialogs will + be used instead (#3219). + * Use "Prof-Gnome" GTK theme by default (same theme as used on macOS) + for a better experience, the "Adwaita" theme can still be activated + (PR#3129). + + Internationalization + * Updated translations:
Done and rebased on master.
LGTM
@b4n requested changes on this pull request.
New image is missing from the build system. Otherwise I didn't check all PR and issue references, but looks good! :+1:
On doc/images/edit_change_history.png:
This is not installed! ```diff diff --git a/doc/Makefile.am b/doc/Makefile.am index ea0e0f697..45dbeecef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,7 @@ if INSTALL_HTML_DOCS htmldocimagesdir = $(docdir)/html/images dist_htmldocimages_DATA = \ images/build_menu_commands_dialog.png \ + images/edit_change_history.png \ images/find_dialog.png \ images/find_in_files_dialog.png \ images/main_window.png \ diff --git a/doc/meson.build b/doc/meson.build index a9a2c0257..2fa8cab6d 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -19,6 +19,7 @@ tarball = run_command('test', '-f', 'geany.html', check: false) if tarball.returncode() == 0 or rst2html.found() install_data( 'images/build_menu_commands_dialog.png', + 'images/edit_change_history.png', 'images/find_dialog.png', 'images/find_in_files_dialog.png', 'images/main_window.png', ```
@b4n pushed 1 commit.
37647e32ca6861f7d06000d8acf8f8f8e079a405 Distribute new documentation image
@b4n commented on this pull request.
On doc/images/edit_change_history.png:
@eht16 I took the liberty to push to this PR with the fix above.
@b4n approved this pull request.
@eht16 commented on this pull request.
On doc/images/edit_change_history.png:
Thanks and sorry.
Merged #3593 into master.
github-comments@lists.geany.org