Reorder XML .ui files to correct tab orders

lxqt / lxqt-config

Tools to configure LXQt and the underlying operating system

https://lxqt.github.io

GNU Lesser General Public License v2.1

79 stars 60 forks source link

Reorder XML .ui files to correct tab orders #950

Closed isf63 closed 7 months ago

isf63 commented 1 year ago

Reordered XML .ui files to correct tab orders throughout lxqt-config. Some files were stubborn and may require \<tabstops>.

Affected files:

lxqt-config-appearance/{gtkconfig.ui, fontsconfig.ui}
liblxqt-config-cursor/selectwnd.ui
lxqt-config-input/{keyboardconfig.ui, touchpadconfig.ui}
lxqt-config-monitor/{managesavedsettings.ui, monitorwidget.ui}

The following may need a further <tabstops> section:

lxqt-config-input/keyboardconfig.ui
lxqt-config-input/keyboardlayoutconfig.ui
lxqt-config-brightness/brightnesssettings.ui
lxqt-config-monitor/monitorpicture.ui

isf63 commented 7 months ago

Should be all good now!

tsujan commented 7 months ago

Should be all good now!

Yes, it is :) Please squash the commits before I merge it.

isf63 commented 7 months ago

Sorry, but I don't know how to squash commits and then push them apparently. I used git rebase -i HEAD~5 to put the non-consecutive commits together and squash the last one into the first, but pushing fails. I'm not very familiar with Git.

tsujan commented 7 months ago

No worries.

There are different ways and different opinions on the best way to squash commits. What follows is what I prefer.

Suppose that you want to squash your last 3 pushed commits (like with this PR). You could do it by switching to your branch and doing

git reset --soft HEAD~3
git commit
git push --force origin name_of_your_branch

The second command lets you have your comment on the squashed commit.

Please try it (or any other method you prefer) with you future contributions.