problem between GTK2 and QT5 ?

39 posts / 0 new
Last post
JE8VZK
problem between GTK2 and QT5 ?

Last month I installed Cqrlog 2.5.1 on Ubuntu 20.4.2LTS Minimum install with
git clone https://github.com/ok2cqr/cqrlog.git

My problem is the spacing in some comboboxes.
I do not use CAT, so I input with Offline.
The Combobox shows left remaining space, but right none,
while https://www.cqrlog.com/sites/default/files/cqrlog_full.png shows only a bit space.

https://www.dropbox.com/home/Public?preview=Screenshot+from+2021-02-07+1...

Is this a problem between GTK2 and QT5 ?
If so, what must I do to work on QT5 ?

73 de JE8VZK Waka

oh1kh
problem between GTK2 and QT5 ?

Hi Waka!

Your Dropbox link does not lead to anywhere. So I'm not sure what combobox you refer.
Added an image from my main view with GTK2 and QT5

File: 

--
Saku
OH1KH

JE8VZK
problem between GTK2 and QT5 ?

Hi Saku, sorry, this is my screenshot.

Surely I knew it from GTK2 and QT5.
How can I run CQRlog on QT5 ?

File: 

ok2cqr
ok2cqr's picture
Re: problem between GTK2 and QT5 ?

Hi,

you have to compile CQRLOG with QT5 using

make qrlog_qt5_debug
or
make cqrlog_qt5

73 Petr, OK2CQR

JE8VZK
Compiling occurs error

I tried the compile.
~/cqrlog$ make cqrlog_qt5

(9022) Compiling resource /home/NAME/cqrlog/src/cqrlog.or
(9015) Linking /home/NAME/cqrlog/src/cqrlog
/usr/bin/ld.bfd: Warning: /home/NAME/cqrlog/src/link.res inclises output section. Do you remember -T option ?
/usr/bin/ld.bfd: Not found -lQt5Pas
/home/NAME/cqrlog/src/cqrlog.lpr(94,1) Error: (9013) Error while linking
/home/NAME/cqrlog/src/cqrlog.lpr(94,1) Fatal: (10026) There were 1 errors compiling module, stopping
Fatal: (1018) Compilation aborted
Error: /usr/bin/ppcx64 returned an error exitcode
Error: (lazarus) compile target is the project:cqrlog: stopped with exit code 1
Error: (lazbuild) failed compiling of project /home/NAME/cqrlog/src/cqrlog.lpi
make: *** [Makefile:77: cqrlog_qt5] Error 2

How about this error ?

LB2EG
you must install libqt5pas1

you must install libqt5pas1 and libqt5pas-dev in order to compile cqrlog with QT. ...

Looks like these are missing on your system (?)

73 de LB2EG Richard

JE8VZK
succeeded but new problem

Hi Richard,
Månge takk. I succeeded to run CQRlog with QT5, but new problem...
This CQRlog ignores my selected font, Monaco.
I use slash zero font.
How do I solve this ?
73 de JE8VZK Waka

LB2EG
I have just installed the

I have just installed the Monaco font (http://www.gringod.com/wp-upload/software/Fonts/Monaco_Linux.ttf) on my Ubuntu 20.4 with cqrlog compiled from github master source. It shows up when choosen in cqrlog, but shows no slashed 0.

It is a bit peculiar, as the font image when installing the font on Ubunt shows the 0 slashed only.

I do not have the system or programming knowledge to tell the reason. I am only a humble little pistol DXer using the program:)

73 de LB2EG Richard

LB2EG
But strangely, the slashed 0

But strangely, the slashed 0 shows up in the DXcluster window when Monaco font is choosen there.

73 de LB2EG Richard

File: 

oh1kh
succeeded but new problem

Hi Waka !

Have you seen this https://www.cqrlog.com/node/1932

--
Saku
OH1KH

oh1kh
succeeded but new problem

Sorry the link of message does not work any more. How ever the font is here:

https://github.com/AlbertoDorado/droid-sans-mono-zeromod

--
Saku
OH1KH

JE8VZK
succeeded but new problem

Hi Saku, kiitoksia.

The size is reflected, but the font itself is not reflected at all.
Not only combobox, also in QSO lists, statics, even if I apply Impact, script fonts or Dingbats.
My ubuntu is a minimal install, so is there anything else Qt is missing ?

oh1kh
succeeded but new problem

Only libqt5pas1 and libqt5pas-dev is needed for cqrlog to compile with QT5 widgets. QT5 for Lazarus/Freepascal is not complete replacement for GTK2. So you might expect some differences and some things that do not work at all.

The QT5 itself has several tuning points (that I do even not know about) that may affect to layout. Same is with X settings (scaling, etc.)

Would like to help but my Fedora32 with old LCD monitor 1440x900 has always worked without any tuning and so I am not familiar with those settings that could perhaps help you.

--
Saku
OH1KH

JE8VZK
QSocketNotifier on Fedora33

Hi Saku, I understand.
I have installed Fedora33 into another M2.SSD. using M2 Case.
I have just become an instant beginner of Fedora33.

I installed libqt5pas1 and Qt5pas-devel.
I will run cqrlog, but an error occirred.

$ cqrlog
QSocketNotifier: Can only be used with threads started with QThread
[FORMS.PP] ExceptionOccurred
Sender=EAccessViolation
Exception=Access violation
Stack trace:
$00000000006DFFF3
$00000000006BEE49
$00000000008324FD
$0000000000831EDD
$000000000082E013
$000000000074CE01
$000000000074CD1B
$000000000044CFDA
$000000000044BE50
[FORMS.PP] ExceptionOccurred

What does this mean ?
Now I'm on Ubuntu.

oh1kh
QSocketNotifier on Fedora33

I have got notifier error only when trying to connect to RBN from Grayline map. That does not work with QT5. It is known problem.
If you have preferences/RBN support/autoconnect RBN Grayline checked it can be the reason.

Otherwise you have found new bug of QT5 and cqrlog.

What version of Lazarus/FreePascal do you use for compile? I use Laz 2.0.8/fpc 3.0.4 and it is last combination that is known to work. With latest Laz/FPC there are errors with GTK2 ( https://github.com/ok2cqr/cqrlog/issues/323 ) and QT5 is completely untested.

--
Saku
OH1KH

JE8VZK
QSocketNotifier on Fedora33

>If you have preferences/RBN support/.... checked

No, I have never used RBN support. Even No splash image of CQRlog displayed at first screen.

My install of LCL was 2.0.11 latest as you imagine.
I downgraded, but on "make cqrlog_qt5" it occurs some errors.
Error: (lazarus) unable to create package output directory "/usr/lib64/lazarus/components/sqldb/lib/x86_64-linux/qt5" of package "SQLDBLaz 1.0.2"
(3104) Compiling lcl.pas
Fatal: (10022) Can't find unit system used by LCL

Later I 'll try again.
BTW, on Ubuntu 20.04.2 LCL is 2.0.6, so on Ubuntu 20.10 maybe LCL 2.0.8.
73 de JE8VZK Waka

ok2cqr
ok2cqr's picture
Re: QSocketNotifier on Fedora33

Please check if you have lcl-qt5 package installed. I'm not sure if Fedora has all packges for QT5 version of Lazarus.

73 Petr, OK2CQR

oh1kh
QSocketNotifier on Fedora33

HI Waka!

In my F32 server I have new test setup:

lazarus-2.0.10-2.fc32.x86_64
fpc-src-3.2.0-1.fc32.noarch
fpc-srpm-macros-1.3-1.fc32.noarch
fpc-3.2.0-1.fc32.x86_64
qt5pas-2.6-2001002.fc32.x86_64
qt5pas-devel-2.6-2001002.fc32.x86_64

When installing just "dnf install lazarus" it will install all those with all other needed dependencies.

Try to open lazarus-ide. Either from startup menu/icon or command line as "lazarus-ide".
Then close default opening new project from project/close project.
Next select open project, navigate to cqrlog/src folder ancd select cqrlog.lpi
go Project/Project options and from that window Additions and Overrides.
There you see Set "LCLWidgetType" select: value "qt5"
Now you should see Targets:* with checkboxes. Be sure to have only Ide Macro LCLWidgetType:=qt5 checked
close window from OK
Then select Run/Cean up and build
If compile passes your new cqrlog binary is at src/cqrlog file that you can copy to /usr/bin. that is all needed.

If you do not have qt5pas you will find it when working with ide

I did a test compile today from latest source with this laz 2.0.10/fpc 3.20 and placed result to daily use to see if all regexp and UTF-8 errors are solved now.
Normally I use laz 2.0.8/fpc 3.04 because I can be sure it results a working binary.

--
Saku
OH1KH

JE8VZK
lazarus-ide

Hi kiitoksia, Saku.
I use 3 monitors, main 2540x1440, left, 1080x1920 portrait and right 1920x1080 landscape.

I tried your message.
I understood to "go Project/Project options",
but I do not understand "from that window Additions and Overrides."

In Prohect Options window, array of items is same as european languages, I suppose.

What should I do in Prohect Options window ?

File: 

oh1kh
lazarus-ide

HI!
Take first Tools/Options (3rd from top left is Tools, first in dropdown list is options, or CTRL+Shift+O)
From left side panel click 3rd line "Common". There, at top right side is language. Select English. Close and start again Lazarus to make it work.

I think after that the project options look better. It is same with Finnish translation: sometimes the text is not even near English versions meaning.
Additions and overrides is at left list second one from bottom. You will see it better with English texts.

BTW I have made tests with Laz2.0.10/fpc3.2.0 and there are problems with special UTF-8 characters. I have one workaround but it is not very clever and needs modifications for 891 lines.

--
Saku
OH1KH

JE8VZK
lazarus-ide

Hi Saku,
I tried, but on "Run/Cleanup and Build", it occured also errors, also "skip errors" cannot bring me to success.
I will retry from Fedora new install again finding time. Kiitoksia paljon.
73 de JE8VZK Waka

File: 

oh1kh
lazarus-ide

HI Waka!

That error is normal. You can not change things in /usr/lib with your user account.
Just press "skip errors" at that point and compile continues normally.

Forget to mention this. It happens also for me every time I do "clean and rebuild".

--
Saku
OH1KH

JE8VZK
lazarus-ide

"Skip Errors", then I got .
File/Save is gray-outed, when I "File/Exit", the dialog appears "Save the changes ?", I saved it.
Is it correct ?
And in the next step, what must I do ?
SRI for a beginner of beginner of lazarus...
JE8VZK Waka

File: 

oh1kh
lazarus-ide

Hi Waka!

Green stripe with "success" looks good.
When you close lazarus-ide it might ask to save changes. If you close right after compile/success it should not ask because it saves everything before compile. How ever normally say yes to save question.
When you have got green-success for compile you find new cqrlog binary from folder "src". It is the same folder from where you opened project "cqrlog.lpi" with lazarus-ide.

You can copy that file "cqrlog" to /user/bin to get new version running.

But you can test it without closing lazarus-ide. It happens this way:

I assume you have cloned cqrlog from Petr's GitHub to your home directory and I assume your usrname is waka. you can change them if needed.

1) you have to install cqrlog from package to that computer you have lazarus-ide.
2) clone cqrlog from GitHub to your home directory:
cd /home/waka
git clone https://github.com/ok2cqr/cqrlog.git
3) go to cqrlog directory
cd /home/waka/cqrlog
4) make there symlink named share that points to /usr/share that is needed for testing cqrlog with lazarus-ide
ln -s /usr/share/ share
5) open lazarus-ide, Open project cqrlog.lpi (from src directory), make comple "run/compile" (or "run/clean and build" for first time. Skip errors if occurs)
6) When compiled with "green stripe/success" start test run from green arrow icon that is on top, second line, 4th icon from left.(see picture)
7) if cqrlog runs ok you can copy the binary to /usr/bin to replace the package installed version
sudo cp /home/waka/cqrlog/src/cqrlog /usr/bin

File: 

--
Saku
OH1KH

JE8VZK
My fedora doesn't succeed

I tried newly re-installed F33.
I found fpc-srpm-macros missing mrntioned at #18, so I installed it.

At first I tried "make cqrlog_qt5", it occurs no errors.After "sudo make install", Cqrlog did not run.
Next tried with lazarus-ide. "Cleanup and build" finished with no errors, however, green-colored run button brought me error.

Why does Qt5 in Fedora make me happy?
Because of AMD cpu ? I use Radeon video card, but not yet installed amdgpu.

Should I here give up ?
My fedora doesn't succeed even though you wrote it in an easy-to-understand manner.

File: 

oh1kh
My fedora doesn't succeed

Hi Waka!

Do not give up!
You said "Cqrlog did not run". Any error visible? If you start cqrlog by typing "cqrlog" in console you should see something.
At least if you type "cqrlog --debug=1"

Test run in lazarus-ide can also have "--debug=1" It comes from "Run / Run parameters". There is 0 as default, change it to 1.
Then open "View / Debug windows / Console IN/Output" you see same things as with console run using --debug=1

Then you can define how far it starts before you get error.

Do you have localized (Japan) Linux?
Can you test with English version of Fedora (maybe set up a virtual machine)?

I had once an error with fldigi and we had long chats with Dave. Tried many debugs and did not find reason why I could not set up Hamlib connection but for Dave it worked always. I installed English version of Fedora as virtual machine and started to compare and finally we found the reason. It was not in fldigi, but one of the c.o. programs where localisation changed the way of handling decimal numbers.

This could be something similar because it should not be so difficult.

If you reinstall Fedora then first install cqrlog from package and start it to make sure it runs ok.
After that get the source using "git clone" and make "share" symlink to cloned "cqrlog" folder for testing with lazarus-ide

Daily before starting to compile go to cqrlog directory that was created by "git clone" and issue command "git pull" to get the latest source changes.

I wish I could give better help.
Next I would try with English version of Fedora

--
Saku
OH1KH

JE8VZK
new English BTRfs F33

[ja_JP]
I found, on GNOME Classic and GNOME on Xorg both run compiled with "male cqrlog_qwt5", but normal GNOME (maybe Wayland( does not. This is same also in Ubuntu X11.

I installed English Fedora two times. First in EXT4 format. Lazarus-ide rendered me errors.
English installation makes me mayowaseru, especially to input marks.
I succeeded to install JA keybord, but not handle Japanese language.
Second, I installed Btrfs format F33. (maybe not concerned).

I installed:
package cqrlog (checked running)
qt5pas-2.6
qt5pas-devel
lazarus
git
fpc-srpm-macros

I did:
git clone https://github.com/ok2cqr/cqrlog.git
cd cqrlog
ln -s /usr/share/ share
lazarus-ide
(lazarus) select /src/cqrlog.lpi
(project option) checked qt5, unchecked gtk2
run parameter change --DEBUG=0 to --DEBUG=1
(lazarus) cleanup and build
skip errors
green belted succes message
green arrow to run,
I suppose, this is same as "./src/cqrlog --debug=1".
But error says:

QSocketNotifier: Can only be used with threads started with QThread
[FORMS.PP] ExceptionOccurred
Sender=EAccessViolation
Exception=Access violation
Stack trace:
$00000000006E1013 GETSYSCOLOR, line 485 of include/winapi.inc
$00000000006BFE69 COLORTORGB, line 2531 of graphics.pp
$000000000083351D CREATEOBJECTS, line 2363 of qt5/qtobjects.pas
$0000000000832EFD CREATE, line 2271 of qt5/qtobjects.pas
$000000000082F033 QTDEFAULTCONTEXT, line 919 of qt5/qtobjects.pas
$000000000074DE21 DESTROY, line 93 of qt5/qtobject.inc
$000000000074DD3B CREATE, line 70 of qt5/qtobject.inc
$000000000044CFDA CREATEWIDGETSET, line 2223 of forms.pp
$000000000044BE50 INTERFACES_$$_init$, line 36 of qt5/interfaces.pp
[FORMS.PP] ExceptionOccurred
An unhandled exception occurred at $000000000043C707:
EAccessViolation:
An unhandled exception occurred at $000000000043C707:
EAccessViolation:
$000000000043C707
$00000000004343C3
$00000000004479CA
$0000000000437331
$0000000000437331
$000000000044CFDA
$000000000044BE50

When File/Exit, I did not asked whether saving.
But this ./src/cqrlog weghs up to 70 MB as if Moai statue in Easter Island.
What is wrong by me ?

Lazarus errors are always same, blue-colored "mov".
Anything missing ?

You wrote setup a virtual machine, I have never used it and suppose the stand alone is better than virtual machine.
I use Ubuntu in M2.SSD case, and F33 in ANOTHER M2.SSD case.
So I can work with connected F33 case cable, and Ubuntu cable disconnected.

oh1kh
new English BTRfs F33

HI!

Starting from easy part:
You src/cqrlog has error trace compiled in. That is why it is so big in size. See project options/error tracing/Generate info for the debugger.
The best side of this is that you can put break point in source code line with F5. Then when program runs (green arrow) it stops to F5 line and you can step it forward line by line with F8 and when seen what happens you can continue normal run with green arrow. And what is even better you can take away breakpoint with F5 and put it to other line with F5 while program is running and it will again stop when it comes to that line you set.
That makes the file so big.

There is "Oracle VM virtual box" that you can install. If you have room in HD and multi core CPU virtual machine runs quite happy using as default one of the CPU cores.
In my Lenovo X201 there is 4 core CPU and 250Gb SSD. While running several "normal programs" I can start a virtual machine, I have Mint20 only installed now and everything runs smoothly. Mint machine uses 20Gb of SSD and one CPU core. Starting and stopping virtual machines do not need any reboots for the host linux system. And when virtual mahine does not run it is very easy to backup and move, it is just a file.

Then the hard part:
Filesystem formats should not effect in any way as long as system is error free. I use ext4 in all my systems.

Your receipt is just the same I use.
QSocketNotifier: error looks same as in https://wiki.lazarus.freepascal.org/Qt5_Interface#libqt5pas. I assume you have read that already.
They talk about wayland there.
My setup is LXDE https://spins.fedoraproject.org/fi/lxde/
But as said in beginning Grayline map RBN connection makes similar QSocketNotifier error, so it is not guaranteed to be caused by wayland.

I am quite out of ideas.
How ever I think you can compile using (project options) gtk2 but then you are back with those red arrow pointed problems.

How about trying to set a bit smaller font size with gtk2?
Preferences/Fonts unselect "use default settings" and then set all 4 fonts again. I have there "Sans 9" in all.
Is 9 too small for you with your zero slashed font?

Now when you have learned to use lazarus-ide nothing stops you to adjust column sizes in NewQSO window.
from Project/Forms (Shift+F12) you get a list. Write NewQSO and you see frmNewQSO. Select that and press OK.

You get graphical designer for NewQSO form.
Click callsign column with mouse left. You get black dots around it.
Point middle dot on right edge and press mouse left down and start to stretch column to right.
Same way you can do with all columns and with even whole NewQSO form.

When you are happy make test run to see what it looks like when cqrlog is running.

Then you have your own custom designed cqrlog. That is best in OpenSource programming.

--
Saku
OH1KH

JE8VZK
Tried to FormDesigner

Hi Saku,
"to adjust column sizes in NewQSO window,"
that's very good idea !! Kiitoksia paljon !

I watch cqrlog window with distance of about 80cm, so font size 9 or 10, it seems for me as gray not black.
I use 11 or 12. When my eyes get tired, 11 is still small.
I input sometimes 2-byte characters, when QSO with JA/BV/BY/HL.

Using Lazarus-ide, I tried to delete combobox PWR with label, it brought me error and could not run.
I also cut clock icon to enlarge box of date, start and end, this gave me no errors.

On lazarus-ide, green arrow brought me the error TMySQL57..., but clicked OK, then I could proceed next.

Saku, is there a way to "delete PWR box with label and no errors about it" ? I do not use PWR box.
When OQRS in QSL_S, Q in QSL_R both are cut out right end.
73 de JE8VZK Waka

File: 

oh1kh
Tried to FormDesigner

HI Waka!
You cant remove columns without removing source code too.

Do it this way:
When in lazarus-ide select View/Object inspector (F11)
At NeWQSO form designer click "Contest group box" see that "gbContest" is highlighted in Object inspector.
At Object inspector click "Anchors" line three dots "..." button. "Anchors of gbContest" opens
Uncheck checkbox "Enabled" at "Left Anchoring" groub box (see attached image)
After that you can stretch whole NewQSO form horizontaly and "Contest" groupbox does not get wider giving you plenty of space.

File: 

--
Saku
OH1KH

JE8VZK
SRI I posted ib romanized

SRI I posted ib romanized japanese.
"mayowaseru", I mean be bewildered.
de JE8VZK Waka

JE8VZK
mComment move in Designer, but green arrow NOT

Hi Saku, kiitoksia paljon !

I tried gbContest and well done. Namely Callsign raw and Name raw.
These well done.
But ITU raw and Date raw made me unhappy, DXCC raw has no problem.
I tried left anchors and tabstop (checked/unchecked and true/false).

Any other points about mComment: TMemo ?

Offline checkbox becomes unchecked after saving QSO.
Former deb and ppa keep checked after saving QSO, I remember ...

And caret position, I have problem.
RST box I made "-dB" in preference.
I will insert 10 (namely -10dB), and click between "-" and "d", but caret is inserted between "d" and "B".
Does this occur Only me ?
I remember this also on former deb and ppa was normally done.
On this caret problem, is it better in new thread ?
73 de JE8VZK Waka

File: 

oh1kh
mComment move in Designer, but green arrow NOT

Originally (in source 2021-02-19) ."mComment" anchors are to text "Comment to callsign" and that text has vertical anchor to "County" that then effects to whole chain.

If you open "anchor view" in any item you can then click items in NewQSO form and see always where selected item has anchors.
If you break anchor chain by unchecking it may affect to several items when run.
You can also change items where anchoring is made in "anchor view" and so build completely new anchor chains.

Good point in chains is that if you move master item all other items follow and distances stay same.
If you anchor to item that is not always visible while running that anchor then changes depending is item visible or not.
You just have to learn yourself to fix the anchors proper way. Only way is unfortunately learn only by testing, change, testing again, change ....

"Offline checkbox becomes unchecked after saving QSO."
Yes, might be true.
I have added Offline checked when qso is taken from log to edit. Otherwise editing old qso did change date and time to edit time.
And then, when qso is saved it resets offline checkbox.
I must check this. It did not even come to my mind that someone is using cqrlog without rig cat connection.

---

"Note, that if you move the cursor from the 'Call' field to the 'RST sent' field, the S in the RST is highlighted, making it possible to simply overwrite the corresponding number (S). The same applies to the 'RST rcvd' field."

This was diricet copy from cqrlog help file Operation/NewQSO(online logging),
Have you tested to make "- dB" (1 space) as default? Do not touch anything with mouse when enter to RST column (using TAB key after previous column is filled) , just start writing "10". In my test it produced "-10dB"

--
Saku
OH1KH

oh1kh
Offline checkbox becomes unchecked after saving QSO.

Thanks Waka San!

I made new bug when fixing date change in old qso edit. It caused Offline to to turn always off.
Now fixes and will make pull request soon.

--
Saku
OH1KH

JE8VZK
space of gbContest - lazarus-ide

Will the space of gbContest keep, if any Box size or position is changed ?

The default width of editable part is 530px, I suppose.
My former window width of New QSO was 801.

I edited each raw to put in 530px, but test run shows in 1110px. Former screenshot was also in 801px.
Now I edited with plus 40px (whole 570px).

How must I ignore this blank space ?

Can I save only Object inspector of New QSO and import for next "git pull" ?

File: 

oh1kh
space of gbContest - lazarus-ide

HI !
Contest box size, when you have released left side anchor keeps steady. If left side anchor is set box will stretch vertically if New QSO window is stretched. But remember that it is hidden box and does not show normally.

You can get rid of the blank space when runnig. Do not maximize window, make it smaller and stretch to size you want. Cqrlog will remember window position and size if closed normally.

You changes are in fNewQSO.lfm

Following is not perhaps the proper way but I would do it that way:

1) copy fNewQSO.lfm to somewhere . Your home directory or usb stick.
2) when in cqrlog root folder ( If you made git clone in your home dir it is ~/cqrlog ) give command: git checkout . (note: one dot included in command) It will erase all changes you made and return to original source.
3) give command: git pull (there are new commits from yesterday)
4) give command: git checkout -b mynewqso (you are now in branch "mynewqso")
5) copy saved fNewQSO.lfm to src folder replacing the original.
4) give command: git commit -am" my first modification"

Now you can do more modifications. If they are not good give comamnd : git checkout . (not the dot at end) and you are at starting point,
If you think modification is good give command: git commit -am"my second modification" and it will become your branch "root"

Every time you plan to pull from web first give: git checkout master
It does not change master if you have changes that are not committed. Then first give: git commit -am"some name for commit"

You can always check situation with command: git status
When you get to master then give command: git pull

After that command: git checkout mynewqso and when passed there command: git merge master
If no errors give command:git commit

That way you can always pull to master branch and keep it even with web and make local merge from that to your other branch(es).

Very often you will see that merge does not succeed and you have to do manual fixing to get it through. I use program "diffuse" for that.
diffuse src/fNewQSO.lfm (if that failed on merge) and you will see the original and new one and do changes manual then save changes.
After that you need to do: git status to see what waits for addition, then git add . (note dot) and git commit to finish merge.

I know this is very short guide.

I had lot of difficulties to understand how git works at beginning. (and still I'm not good with it) fortunately I got good instructions from DL7OAP.
Without them I probably would have given up with git.
Now when used it more I have noticed it is very handy tool, but sometimes I still have problems and need Google for help,

--
Saku
OH1KH

JE8VZK
editIOTA a bit wider

Hi SAku,
At first I must say kiitoksia paljon for your fixing Offline checkbox.

I knew the blank space will be kept unless every box is well chained.
My problem is to make IOTA box a bit wider. But editCounty and mComment both are linked to cmbIOTA. So my chain will be broken.
In the days of 2.4 version, I suppose editCounty was chained to editState.
In my font size, the last digit will not be seen.
Have you any idea ?
73 de JE8VZK Waka

oh1kh
editIOTA a bit wider

You can always change any anchoring as "floating". Keep the checkbox checked but choose (nil) from sibling. Then there is anchor to nil and you can freely move object with mouse. You must also free anchoring(s) from other objects that are tied to floating object if you want just move that one floating object.

But be aware that in complex window you have lot of work if you change position of one item. You maybe have to move several others too if they are not anchored together.
Even a small few pixel difference may show out ugly at runtime.

Fortunately there are blue lines when you move floating items slowly with mouse. When item is hitting another item horizontally or vertically a blue line will appear to show that they are equal positioned.

edtState and edtDok are positioned to same coordinates. Depending on callsign either one becomes hidden/visible (DL -> dok, others ->state)
Hiding can also be switched by clicking the lblState/lblDok. So if you move one you must move the other same amount.

--
Saku
OH1KH

JE8VZK
[Solved] Scales from my eyes

Anchoring to nil, I do come up with such an idea.
So I have solved at once. Kiitoksia paljon.
73 de JE8VZK Waka