Merged with UserInterface changes supplied by Christos Sevastiadisi.

Merged with merge changes supplied by Christos Sevastiadisi.

Commit Merge in Mercurial added and Cancel renamed to Abort Merge Commit_Merge_addition

Start menu shortcut conflict changed and menu current editor activation added

MicroPythonWidget: made the cross compile actions enable only, if the mpy-cross utility is found or properly configured.

UserInterface: added some forgotten window activation actions and corresponding methods.

MicroPythonWidget: fixed an issue causing eric to crash at startup, if QtSerialPort is not available.

Updated German and English translations.

Prepared translation files for updates.

Regenerated source docu after merge with 'micropython' branch.

(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip

eric ide

mercurial