← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily

« back to all changes in this revision

Viewing changes to scribus/rulermover.cpp

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-08-25 09:51:58 UTC
  • mfrom: (3.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20140825095158-dcmwh1sopc3ggooi
Tags: 1.4.4+dfsg1-1
http://bugs.debian.org/747814
http://bugs.debian.org/753277
http://bugs.debian.org/410079
http://bugs.debian.org/533081
* [54f1b99] Imported Upstream version 1.4.4+dfsg1. (Closes: #747814)
   + Now scribus compiles fine with clang (Closes: #753277).
   + Repacked to remove resources/dicts (Closes: #410079).
     - [41385a7] debian/{copyright,README.source}: update accordingly.
     - [a2a847a] debian/patches/remove_non-free_file.patch: update.
     - indirectly closes: #533081.
     - maybe they are really dfsg-compliant, but given that their licenses
       are unclear, and that we are not using them, let's remove them.
* [e2c4c28] update upstream information:
  + debian/copyright:
    - update years.
    - add Files-Excluded field.
  + debian/README.source:
    - rewrite and update it.
* debian/control:
  + [5a38dbf] remove build-dep on gcc, unversion the build-dep on libqt4-dev
    (4.6 is in oldstable now).
  + [8f58a88] suggest hyphen-hyphenation-patterns.
* debian/rules:
  + [7ec2bac] remove a now pointless configure switch.
  + [8279630] enable parallel building.
  + [898e7c2] enable LFS.
* [21cede5] debian/patches/* refresh entire patchset:
  + [63f3980] spelling-error-in-binary_*: add to fix homonymous lintian tag.
  + [4d8ab12] qreal_double.patch: update header.
* [ac8bb35] debian/control: suggest scribus-doc (non-free).
* [0618e96] debian/scribus.links: add to symlink
  usr/share/doc/scribus/{copyright → COPYING} (used in the scribus interface,
  in the about window).

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/rulermover.cpp
61
61
        if (m->button() == Qt::LeftButton)
62
62
        {
63
63
                Mpressed = true;
 
64
                qApp->setOverrideCursor(QCursor(Qt::CrossCursor));
64
65
                currView->startGesture(rulerGesture);
65
66
        }
66
67
        QWidget::mousePressEvent(m);
68
69
 
69
70
void RulerMover::mouseReleaseEvent(QMouseEvent *m)
70
71
{
71
 
        qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 
72
        qApp->restoreOverrideCursor();
72
73
        if (Mpressed)
73
74
        {
74
75
                rulerGesture->mouseReleaseEvent(m);
78
79
        {
79
80
                QMenu *pmen = new QMenu();
80
81
                QMenu *pmen2 = NULL;
81
 
                qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
82
82
                pmen->addAction( tr("Reset Rulers"), this, SLOT(resetRulers()));
83
83
                if (currView->Doc->guidesSettings.rulerMode)
84
84
                {