Rik Mills

~rikmills/+git/labplot-upstream:work/inset-plots

  1. Git
  2. lp:~rikmills/+git/labplot-upstream
  3. work/inset-plots
Last commit made on 2024-08-30
Get this branch:
git clone -b work/inset-plots https://git.launchpad.net/~rikmills/+git/labplot-upstream

Branch merges

Branch information

Name:
work/inset-plots
Repository:
lp:~rikmills/+git/labplot-upstream

Recent commits

88e7e13... by Alexander Semke <email address hidden>

[worksheet] allow to paste a plot into another plot.

db00809... by Alexander Semke <email address hidden>

[worksheet] properly set the position of a plot when being a child of another plot.

922e971... by Alexander Semke <email address hidden>

[worksheet] removed actions in CartesianPlot.h that were wrongly added during the merge conflict resolution
and simplified the logic to set the rect of PlotArea for inset plots.

754c6ed... by Alexander Semke <email address hidden>

[worksheet] use Background::draw() in PlotArea to draw the background instead to duplicating the code.

f1f97ee... by Alexander Semke <email address hidden>

[worksheet] removed the drawing of the hover and selection box in CartesianPlot since it's already done in PlotArea
and added more handling for the calculated of the rect in the plot is a child of a plot and not of a worksheet.

5f23bbb... by Alexander Semke <email address hidden>

Merge branch 'master' into work/inset-plots

1307bac... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

e11ba49... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

78630d3... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

a9d14eb... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"