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

List:       kde-commits
Subject:    playground/office/flake
From:       Thomas Zander <zander () kde ! org>
Date:       2006-05-13 13:55:45
Message-ID: 1147528545.446279.28085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 540454 by zander:

Add snap-to-grid bool in our test app


 M  +1 -1      lib/KoShapeMoveStrategy.cpp  
 M  +12 -3     testapp/mainwindow.cpp  
 M  +2 -0      testapp/mainwindow.h  


--- trunk/playground/office/flake/lib/KoShapeMoveStrategy.cpp #540453:540454
@@ -53,7 +53,7 @@
 void KoShapeMoveStrategy::handleMouseMove( KoGfxEvent *event )
 {
     m_diff = event->point - m_start;
-    if(m_canvas->snapToGrid() || (event->modifiers() & Qt::ShiftModifier) == 0) {
+    if(m_canvas->snapToGrid() && (event->modifiers() & Qt::ShiftModifier) == 0) {
         QPointF newPos = m_initialTopLeft + m_diff;
         applyGrid(newPos);
         m_diff = newPos - m_initialTopLeft;
--- trunk/playground/office/flake/testapp/mainwindow.cpp #540453:540454
@@ -235,6 +235,10 @@
     setCursor( m_tool.cursor( ev.point ) );
 }
 
+void FlakeCanvas::enableGrid(bool snap) {
+    m_snapToGrid = snap;
+}
+
 void FlakeCanvas::keyReleaseEvent (QKeyEvent *e) {
     m_tool.keyReleaseEvent(e);
 }
@@ -290,8 +294,8 @@
 }
 
 void FlakeCanvas::gridSize(double *horizontal, double *vertical) const {
-    *horizontal = 28.346; // approx 1 cm grid size.
-    *vertical = 28.346;
+    *horizontal = 14.173; // approx 0.5 cm grid size.
+    *vertical = 14.173;
 }
 
 void FlakeCanvas::addCommand(KCommand *command, bool execute) {
@@ -368,6 +372,10 @@
     m_printAction = new QAction(tr("Print"), this);
     m_printAction->setStatusTip(tr("Print the current canvas to ./output.ps"));
     connect(m_printAction, SIGNAL(triggered()), m_canvas, SLOT(print()));
+
+    m_enableGrid = new QAction(tr("Enable Grid"), this);
+    m_enableGrid->setCheckable(true);
+    connect(m_enableGrid, SIGNAL(toggled(bool)), m_canvas, SLOT(enableGrid(bool)));
 }
 
 void MainWindow::createMenus()
@@ -381,7 +389,8 @@
     m_editMenu = menuBar()->addMenu(tr("&Edit"));
     m_editMenu->addAction(m_undo);
     m_editMenu->addAction(m_redo);
-    menuBar()->addSeparator();
+    m_editMenu->addSeparator();
+    m_editMenu->addAction(m_enableGrid);
 
     m_helpMenu = menuBar()->addMenu(tr("&Help"));
     m_helpMenu->addAction(m_aboutAct);
--- trunk/playground/office/flake/testapp/mainwindow.h #540453:540454
@@ -82,6 +82,7 @@
     void setLocked(int);
     void setVisible(int);
     void print();
+    void enableGrid(bool);
 
 signals:
     void selectionChanged(KoShape *object);
@@ -161,6 +162,7 @@
     QAction * m_printAction;
     QAction * m_undo;
     QAction * m_redo;
+    QAction * m_enableGrid;
 
     QSlider *m_scaleSliderH, *m_scaleSliderV, *m_rotateSlider, *m_scaleSliderZ;
     QSpinBox *m_zIndex;
[prev in list] [next in list] [prev in thread] [next in thread]