Implements #3354 You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3355
-- Commit Summary --
* add preference for backspace unindenting
-- File Changes --
M data/geany.glade (16) M src/editor.c (2) M src/editor.h (1) M src/keyfile.c (2)
-- Patch Links --
https://github.com/geany/geany/pull/3355.patch https://github.com/geany/geany/pull/3355.diff
@coalsont pushed 1 commit.
ada2bf1f64ada95b50ecbf8ff6bff84531a6c382 fix change of variable
@coalsont pushed 1 commit.
d6ee25f35948c8f049caff65c4a56df0787365c3 improve tooltip for backspace unindent
@b4n requested changes on this pull request.
Looks pretty great, good job! :+1: There's just the comment + squashing the commits and it'd look good to go from me. Bonus points if you'd update the documentation though :wink:
@@ -3293,6 +3293,22 @@
<property name="position">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="check_backspace_unindent"> + <property name="label" translatable="yes">_Backspace key unindents</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">With the cursor in the indentation, pressing backspace unindents instead of deleting one character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property>
This should be 2 (3rd child of that container), not 1 like the previous one. As is, you can even see the second child in this files appears above the first one.
@coalsont pushed 1 commit.
e65cdc0d91fc7799051d59f6af00e39878082c6c fix preference UI position, add doc
The doc images appear to be generated separately, with a theme I don't use, and would have to guess at. Squash can be handled when telling github to merge, or did you want me to do it manually?
IIUC only @eht16 has that theme? So to avoid replacing all the images I guess should ping him ... oh I just did :smiling_imp:
Pong :). Nice try, @elextr but the theme used in the current docs is some Gnome Ubuntu default theme or something, long time ago the screenshots were made with my personal theme but @b4n and me agreed to use something more common and unmodified.
@coalsont if you want to update the screenshots, use a common default theme and update all screenshots to have them in a consistent style. But for me, it would be ok if you leave the screenshots unmodified and just update the text in the documentation. We will update the screenshots then shortly before the release.
We have a bit if a disconnect in the project about what and when to squash and no clear policy.
IM(NS)HO all commits should be squashed unless they make a working Geany, which means most merges can simply squash all commits with github and maybe clean up the message (remove the "fix up foo" type commit messages).
In others opinions commits should be merged to make a buildable Geany.
And others have the erroneous idea that they should be squashed to make logical change sets which may leave Geany broken, or even unbuildable. Sadly there has been too much of this over the Geany history and now Git bisect is pretty much useless over much of the history, but that should not be an excuse to continue to break it by not squashing commits that do not at least make a valid build. [end rant]
In your case my quick glance says the four commits are a basic one and three fixups, IMO so the whole lot could be squashed and merged by github's big green button.
But for people like @b4n who (IIUC) still insist on doing their Git from the command line, the squash and merge is of course more work, which is probably why he asked you to do it. IMO old fashioned approaches like that just add extra barriers to contribution which we don't need.
Merged #3355 into master.
I agree with @elextr: here it was just one commit, so I just used the big green button and pressed it!
Thanks @coalsont!
github-comments@lists.geany.org