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

List:       kde-commits
Subject:    kdebase
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2003-12-12 0:03:58
[Download RAW message or body]

CVS commit by aseigo: 

Control button == zoom


  M +6 -0      konqueror/iconview/konq_iconview.cc   1.453
  M +19 -0     libkonq/konq_iconviewwidget.cc   1.268
  M +4 -0      libkonq/konq_iconviewwidget.h   1.103


--- kdebase/libkonq/konq_iconviewwidget.h  #1.102:1.103
@@ -236,4 +236,7 @@ signals:
     void imagePreviewFinished();
 
+    void incIconSize();
+    void decIconSize();
+
 protected slots:
     virtual void slotDropped( QDropEvent *e, const QValueList<QIconDragItem> & );
@@ -277,4 +280,5 @@ protected:
     virtual void contentsMouseMoveEvent( QMouseEvent *e );
     virtual void backgroundPixmapChange( const QPixmap & );
+    virtual void wheelEvent( QWheelEvent* );
     void readAnimatedIconsConfig();
     void mousePressChangeValue();

--- kdebase/libkonq/konq_iconviewwidget.cc  #1.267:1.268
@@ -1392,4 +1392,23 @@ void KonqIconViewWidget::doubleClickTime
 }
 
+void KonqIconViewWidget::wheelEvent(QWheelEvent* e)
+{
+    if (e->state() == ControlButton)
+    {
+        if (e->delta() >= 0)
+        {
+            emit incIconSize();
+        }
+        else
+        {
+            emit decIconSize();
+        }
+        e->accept();
+        return;
+    }
+
+    KIconView::wheelEvent(e);
+}
+
 void KonqIconViewWidget::mousePressChangeValue()
 {

--- kdebase/konqueror/iconview/konq_iconview.cc  #1.452:1.453
@@ -176,4 +176,10 @@ KonqKfmIconView::KonqKfmIconView( QWidge
              this, SLOT(slotRenderingFinished()));
 
+    // connect up the icon inc/dec signals
+    connect( m_pIconView,  SIGNAL(incIconSize()),
+             this, SLOT(slotIncIconSize()));
+    connect( m_pIconView,  SIGNAL(decIconSize()),
+             this, SLOT(slotDecIconSize()));
+
     // pass signals to the extension
     connect( m_pIconView, SIGNAL( enableAction( const char *, bool ) ),


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