merge with master and fixed merge conflicts

Authored by sgerlach on Jul 22 2019, 7:59 PM.

Description

merge with master and fixed merge conflicts

Details

Committed
sgerlachJul 22 2019, 7:59 PM
Parents
R262:92f379ce37eb: Fix minor typos
R262:e991d6029db9: unused code
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
92f379ce37ebyurchor
Fix minor typos 
Jul 22 2019
4c154a36c5basgerlach
code style and indentation fixes 
Jul 22 2019
79f0c7fee22esgerlach
avoid QOverload to support Qt versions prior 5.7 
Jul 22 2019
f3624ff71c74sgerlach
Merge branch 'master' of git://anongit.kde.org/labplot 
Jul 22 2019
b8d5fe37945cyurchor
Fix minor i18n issues 
Jul 22 2019
37060ebbaa37sgerlach
Merge branch 'master' of git://anongit.kde.org/labplot 
Jul 22 2019
9bee13cb7c83pino
fixuifiles 
Jul 22 2019
d770da6fb1d4sgerlach
GIT_SILENT fix already used widget name 
Jul 21 2019
f18a8b7adf91D21575Murmele/asemke
Initial implementation of the Cursor - a tool allowing to measure distances… 
Jul 21 2019
549f5b6346e7asemke
[fit] don't crash when adding a fit to a xy-curve in a plot having theme with… 
Jul 21 2019
27dc6efd18aaasemke
[fit] don't try to evaluate the previe of the fit to a curve on project load… 
Jul 21 2019
7634a4ea5a0dsgerlach
GIT_SILENT changelog 
Jul 21 2019
498766a7e4cesgerlach
[translation] typo 
Jul 21 2019
dd23cf5a63d3sgerlach
[translation] use gcp in macOS script 
Jul 21 2019
2967b655d6cesgerlach
[translation] add locale to macOS package 
Jul 21 2019
076b2eb64fadsgerlach
GIT_SILENT typo 
Jul 21 2019
b9fa09a337a4sgerlach
[translation] add locale to package build script 
Jul 21 2019
add9013f66f6ltoscano
Revert "[translation] add copy of po files for building packages" 
Jul 21 2019
2db4e2c9ceb5sgerlach
[translation] add copy of po files for building packages 
Jul 21 2019
bd01e3bb6767sgerlach
[translation] create and install locale if available 
Jul 21 2019
76ca5711ea7basemke
Added tooltip texts for the tool buttons in LabelWidget. 
Jul 21 2019
e68edb1c3b1casemke
[live import] 1. if the data is coming faster than we can plot it, don't start… 
Jul 20 2019
5b70825a5011asemke
For LiveDataSource: 1. allow to export and print via the context menu 2. don't… 
Jul 20 2019
f36a8c563516asemke
1. in LiveDataSource, don't try to read the file on project load if it is not… 
Jul 20 2019
6d71a09e9450asemke
Avoid crashes in XYCurve when new equation curve is added (no points available… 
Jul 20 2019
f1e52ff2541fasemke
Fixes for live-data sources: 1. don't allow to delete columns of the live-data… 
Jul 20 2019
6d3a979d00baasemke
Don't crash on project load if a double column doesn't have any format set. 
Jul 20 2019
c6e822317633asemke
[import] when importing a project, select the first top-level node in the… 
Jul 20 2019
44d16b544e15asemke
Don't react on resize event in WorksheetView if the project is being closed… 
Jul 20 2019
e99fe59524e9asemke
Removed one more usage of a deprecated function in SlidingPanel. 
Jul 20 2019
6346143a4fdaasemke
Removed some functions deprecated in Qt 5.13 but which are available in Qt < 5. 
Jul 20 2019
6ff7f8d3046esgerlach
[test] make tests run faster 
Jul 19 2019
11cf5eaa5a20asemke
Further small layout fixes in ImportFileWidget, also good looking now on Mac Os. 
Jul 19 2019
c8b09890623casemke
1. use LabPlot instead of labplot2 in the main menu 2. small layout fix in… 
Jul 19 2019
5296f4de4cf0l10n daemon script
GIT_SILENT made messages (after extraction) 
Jul 18 2019
f79764203c52Martin Mamsoler/asemke
Fixed drawing of the selection box in the plot. 
Jul 17 2019
fbe9aba0a9f4Martin Mamsoler/asemke
Save/load for the new setting for the asymmetric padding in the cartesian plot. 
Jul 17 2019
fd51b560d243D22478Martin Mamsoler/asemke
Allow asymmetric padding in CartesianPlot. 
Jul 16 2019
810687b62128Martin Mamsoler/asemke
React on column changes (delete, rename) also in FunctionValuesDialog. 
Jul 16 2019
e48f1773d30cl10n daemon script
GIT_SILENT made messages (after extraction) 
Jul 15 2019
c9d9d2451db8asemke
Deactivate "handle resize" logic, won't be finished for 2.7. 
Jul 14 2019
03c26d8855f1asemke
[spreadsheet] 1. properly set the numeric format when converting columns from… 
Jul 14 2019
fb8b36630d52asemke
Better size for the the themes widget. 
Jul 13 2019
a31bbf0605d1asemke
In XYCurveDock, correctly reset the highlighting in the data column comboboxes… 
Jul 13 2019
1f71c60a651dasemke
In PlotDataDialog, when creating one plot per curve don't plot the x-column… 
Jul 13 2019
053b65ac0558asemke
Don't try to recalculate the curve if the scene doesn't have any pixels. 
Jul 13 2019
1b1a342691e7asemke
GIT_SILETN Updated ChangeLog and removed some obsolete debug output. 
Jul 13 2019
75122bf656a1sgerlach
fix debugging 
Jul 12 2019
a3cf1a4b5898asemke
[fit] when switching on and of the auto range/eval option in the fit options… 
Jul 12 2019
7e183ebe9cfesgerlach
fix deprecation warning 
Jul 11 2019