[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-infinite_canvas2-shrikrishna] /: Merge branch 'master' into krita-infinite_canvas2-s
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2012-12-31 16:48:26
Message-ID: 20121231164826.A7B5EA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 1aef3ef22ba77d7f985213267c38d3f263e39589 by Boudewijn Rempt.
Committed on 31/12/2012 at 17:48.
Pushed by rempt into branch 'krita-infinite_canvas2-shrikrishna'.

Merge branch 'master' into krita-infinite_canvas2-shrikrishna

Conflicts:
	krita/ui/kis_zoom_manager.cc

M  +116  -14   CMakeLists.txt
M  +32   -2    krita/image/kis_image.cc
M  +43   -0    krita/image/kis_image.h
M  +6    -9    krita/image/kis_paint_device.cc
M  +4    -0    krita/ui/canvas/kis_coordinates_converter.cpp
M  +6    -0    krita/ui/canvas/kis_coordinates_converter.h
M  +1    -1    krita/ui/canvas/kis_prescaled_projection.cpp
M  +4    -0    krita/ui/kis_doc2.cc
M  +18   -5    krita/ui/kis_view2.cpp
M  +8    -3    krita/ui/kis_zoom_manager.cc
M  +9    -9    krita/ui/kra/kis_kra_loader.cpp
M  +4    -4    krita/ui/kra/kis_kra_saver.cpp
M  +1    -1    krita/ui/tests/kis_kra_saver_test.cpp
M  +1    -1    krita/ui/widgets/kis_custom_image_widget.cc

http://commits.kde.org/calligra/1aef3ef22ba77d7f985213267c38d3f263e39589

diff --cc CMakeLists.txt
index cbeb6a3,18a2f75..1c4d071
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -39,8 -39,9 +39,9 @@@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DI
  option(GHNS "support Get Hot New Stuff" ON)
  option(NEPOMUK "support NEPOMUK Tagging" ON)
  option(TINY "compile a tiny Calligra" OFF)
 -option(CREATIVEONLY "compile only Karbon and Krita" OFF)
 +option(CREATIVEONLY "compile only Karbon and Krita" ON)
  option(QT3SUPPORT "Build the parts of Calligra that still depend on Qt3" ON)
+ option(PACKAGERS_BUILD "Build support of multiple CPU architectures in one binary. \
Should be used by packagers only." OFF)  
  IF (TINY)
      set(SHOULD_BUILD_WORDS TRUE)
diff --cc krita/image/kis_image.h
index 0d8a090,ed3e50d..0e3054d
--- a/krita/image/kis_image.h
+++ b/krita/image/kis_image.h
@@@ -616,10 -631,28 +641,28 @@@ public slots
      void refreshGraph(KisNodeSP root, const QRect& rc, const QRect &cropRect);
      void initialRefreshGraph();
  
+     /**
+      * This method is be called by the UI (*not* by the creator
+      * of the stroke) when it thinks current stroke should be
+      * cancelled. If the creator of the stroke supports cancelling
+      * of the stroke, it will be notified about the request and
+      * the stroke will be cancelled
+      */
+     void requestStrokeCancellation();
+ 
+     /**
+      * This method is called when image or some other part of Krita
+      * (*not* the creator of the stroke) decides that the stroke
+      * should be ended. If the creator of the stroke supports it, it
+      * will be notified and the stroke will be cancelled
+      */
+     void requestStrokeEnd();
+ 
  private:
+ 
      KisImage(const KisImage& rhs);
      KisImage& operator=(const KisImage& rhs);
 -    void init(KisUndoStore *undoStore, qint32 width, qint32 height, const \
KoColorSpace * colorSpace);  +    void init(KisUndoStore *undoStore, qint32 width, \
qint32 height, const KoColorSpace * colorSpace, bool infiniteCanvas = false);  void \
emitSizeChanged();  
      void resizeImageImpl(const QRect& newRect, bool cropLayers);
diff --cc krita/ui/kis_zoom_manager.cc
index b272b23,6e5a401..8a85cbc
--- a/krita/ui/kis_zoom_manager.cc
+++ b/krita/ui/kis_zoom_manager.cc
@@@ -93,11 -91,12 +93,16 @@@ KisZoomManager::~KisZoomManager(
  
  void KisZoomManager::setup(KActionCollection * actionCollection)
  {
 -    QSize imageSize = m_view->image()->size();
 -    qreal minDimension = qMin(imageSize.width(), imageSize.height());
 -    qreal minZoom = qMin(100.0 / minDimension, 0.1);
 -
 -    KoZoomMode::setMinimumZoom(minZoom);
 -    KoZoomMode::setMaximumZoom(90.0);
 +    if(m_view->image()->isCanvasInfinite())
 +        KoZoomMode::setMinimumZoom(0.005);
-     else
-         KoZoomMode::setMinimumZoom(0.125);
-     KoZoomMode::setMaximumZoom(64.0);
++    else {
++        QSize imageSize = m_view->image()->size();
++        qreal minDimension = qMin(imageSize.width(), imageSize.height());
++        qreal minZoom = qMin(100.0 / minDimension, 0.1);
++
++        KoZoomMode::setMinimumZoom(minZoom);
++        KoZoomMode::setMaximumZoom(90.0);
++    }
  
      KisCoordinatesConverter *converter =
          dynamic_cast<KisCoordinatesConverter*>(m_zoomHandler);
diff --cc krita/ui/tests/kis_kra_saver_test.cpp
index 57bda3f,2c90708..e249ddc
--- a/krita/ui/tests/kis_kra_saver_test.cpp
+++ b/krita/ui/tests/kis_kra_saver_test.cpp
@@@ -56,9 -56,8 +56,9 @@@ void KisKraSaverTest::testRoundTrip(
      QStringList list;
      KisCountVisitor cv1(list, KoProperties());
      doc->image()->rootLayer()->accept(cv1);
 +    bool infiCanvastest_1 = doc->isCanvasInfinite();
  
-     delete doc;
+     //delete doc;
  
      KisPart2 part;
      KisDoc2 doc2(&part);


[prev in list] [next in list] [prev in thread] [next in thread]