[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-320-g168927b

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  168927b0ac31e24c2bfb000bc828a1e1c35709a3 (commit)
       via  8a7c624dbcbf3139ee6f6c34cc49a31bc96b8484 (commit)
       via  99cf84a7fc6ba1778e9ce505cbad5a1c7af0a1fc (commit)
      from  fcfbf55881b85c8dd564672f8209cd3e66e9d720 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=168927b0ac31e24c2bfb000bc828a1e1c35709a3


commit 168927b0ac31e24c2bfb000bc828a1e1c35709a3
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 09:46:56 2011 +0100

    Copyright typo.

diff --git a/gui/kde/Kde4Glue.cpp b/gui/kde/Kde4Glue.cpp
index b03a9bd..f0a1489 100644
--- a/gui/kde/Kde4Glue.cpp
+++ b/gui/kde/Kde4Glue.cpp
@@ -14,7 +14,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.                                
 
 //
-// Yoe should have received a copy of the GNU General Public License           
 
+// You should have received a copy of the GNU General Public License           
 
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //

http://git.savannah.gnu.org/cgit//commit/?id=8a7c624dbcbf3139ee6f6c34cc49a31bc96b8484


commit 8a7c624dbcbf3139ee6f6c34cc49a31bc96b8484
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 09:35:10 2011 +0100

    Implement mouse wheel handling for Qt4.

diff --git a/gui/kde/Kde4Glue.cpp b/gui/kde/Kde4Glue.cpp
index b8932e4..b03a9bd 100644
--- a/gui/kde/Kde4Glue.cpp
+++ b/gui/kde/Kde4Glue.cpp
@@ -28,12 +28,15 @@
 #include "Kde4Gui.h"
 #include <QWidget>
 #include <QPaintEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
 
 namespace gnash {
 
 /// DrawingWidget implementation
 DrawingWidget::DrawingWidget(Kde4Gui& gui)
-    : _gui(gui)
+    :
+    _gui(gui)
 {
 }
 
@@ -50,6 +53,12 @@ DrawingWidget::timerEvent(QTimerEvent*)
 }
 
 void
+DrawingWidget::wheelEvent(QWheelEvent* event)
+{
+    _gui.notifyMouseWheel(event->delta() > 0 ? 1 : -1);
+}
+
+void
 DrawingWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QPoint position = event->pos();
diff --git a/gui/kde/Kde4Glue.h b/gui/kde/Kde4Glue.h
index 65241b6..aabe74d 100644
--- a/gui/kde/Kde4Glue.h
+++ b/gui/kde/Kde4Glue.h
@@ -62,15 +62,17 @@ public slots:
     void quit();
 
 protected:
-    void paintEvent(QPaintEvent*);
-    void timerEvent(QTimerEvent*);
-    void resizeEvent(QResizeEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mousePressEvent(QMouseEvent *event); 
-    void mouseMoveEvent(QMouseEvent *event); 
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
-    void contextMenuEvent(QContextMenuEvent *event);
+    void paintEvent(QPaintEvent* event);
+    void timerEvent(QTimerEvent* event);
+    void resizeEvent(QResizeEvent* event);
+    void mouseReleaseEvent(QMouseEvent* event);
+    void mousePressEvent(QMouseEvent* event); 
+    void mouseMoveEvent(QMouseEvent* event); 
+    void wheelEvent(QWheelEvent* event); 
+
+    void keyPressEvent(QKeyEvent* event);
+    void keyReleaseEvent(QKeyEvent* event);
+    void contextMenuEvent(QContextMenuEvent* event);
     
 private:
     Kde4Gui& _gui;

http://git.savannah.gnu.org/cgit//commit/?id=99cf84a7fc6ba1778e9ce505cbad5a1c7af0a1fc


commit 99cf84a7fc6ba1778e9ce505cbad5a1c7af0a1fc
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 09:22:53 2011 +0100

    Fix mangled copyright notice.

diff --git a/gui/kde/Kde4Glue.cpp b/gui/kde/Kde4Glue.cpp
index 4c32f80..b8932e4 100644
--- a/gui/kde/Kde4Glue.cpp
+++ b/gui/kde/Kde4Glue.cpp
@@ -4,12 +4,18 @@
 //   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 //   Foundation, Inc                                       
 //                 
-// This program is free software; you can redistribute it and/or modify        
 // it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or           
 // (at your option) any later version.
-//                                                                             
 // This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of              
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.                                
 //
-// You should have received a copy of the GNU General Public License           
 // along with this program; if not, write to the Free Software
+// This program is free software; you can redistribute it and/or modify        
 
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.                                         
                                    
+//                                                                             
 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of              
 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.                                
 
+//
+// Yoe should have received a copy of the GNU General Public License           
 
+// along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
@@ -23,8 +29,7 @@
 #include <QWidget>
 #include <QPaintEvent>
 
-namespace gnash
-{
+namespace gnash {
 
 /// DrawingWidget implementation
 DrawingWidget::DrawingWidget(Kde4Gui& gui)
@@ -38,14 +43,12 @@ DrawingWidget::paintEvent(QPaintEvent *event)
     _gui.renderWidget(event->rect());
 }
 
-
 void
 DrawingWidget::timerEvent(QTimerEvent*)
 {
     Gui::advance_movie(&_gui);
 }
 
-
 void
 DrawingWidget::mouseMoveEvent(QMouseEvent *event)
 {
@@ -53,28 +56,24 @@ DrawingWidget::mouseMoveEvent(QMouseEvent *event)
     _gui.notifyMouseMove(position.x(), position.y());
 }
 
-
 void
 DrawingWidget::contextMenuEvent(QContextMenuEvent* event)
 {
     _gui.popupMenu(event->globalPos());
 }
 
-
 void
 DrawingWidget::mousePressEvent(QMouseEvent* /* event */)
 {
     _gui.notifyMouseClick(true);
 }
 
-
 void
 DrawingWidget::mouseReleaseEvent(QMouseEvent* /* event */)
 {
     _gui.notifyMouseClick(false);
 }
 
-
 void
 DrawingWidget::keyPressEvent(QKeyEvent *event)
 {
@@ -87,7 +86,6 @@ DrawingWidget::keyReleaseEvent(QKeyEvent *event)
     _gui.handleKeyEvent(event, false);
 }
 
-
 void
 DrawingWidget::resizeEvent(QResizeEvent *event)
 {
@@ -95,50 +93,42 @@ DrawingWidget::resizeEvent(QResizeEvent *event)
     update();
 }
 
-
 void
 DrawingWidget::properties()
 {
     _gui.showProperties();
 }
 
-
 void
 DrawingWidget::preferences()
 {
     _gui.showPreferences();
 }
 
-
 void
 DrawingWidget::play()
 {
     _gui.play();
 }
 
-
 void
 DrawingWidget::pause()
 {
     _gui.pause();
 }
 
-
 void
 DrawingWidget::restart()
 {
     _gui.restart();
 }
 
-
 void
 DrawingWidget::stop()
 {
     _gui.stop();
 }                                                             
 
-
-
 void
 DrawingWidget::refresh()
 {

-----------------------------------------------------------------------

Summary of changes:
 gui/kde/Kde4Glue.cpp |   45 ++++++++++++++++++++++-----------------------
 gui/kde/Kde4Glue.h   |   20 +++++++++++---------
 2 files changed, 33 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
Gnash