[vidalia-svn] r2995: Remove some code that isn't used anymore now that we have a (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-08-18 22:12:31 -0400 (Mon, 18 Aug 2008)
New Revision: 2995

Removed:
   vidalia/trunk/src/vidalia/animatedpixmap.cpp
   vidalia/trunk/src/vidalia/animatedpixmap.h
Modified:
   vidalia/trunk/src/vidalia/CMakeLists.txt
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/vclicklabel.cpp
   vidalia/trunk/src/vidalia/vclicklabel.h
Log:
Remove some code that isn't used anymore now that we have a bootstrap progress
bar.


Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2008-08-19 01:16:55 UTC (rev 2994)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2008-08-19 02:12:31 UTC (rev 2995)
@@ -177,7 +177,6 @@
 set(vidalia_SRCS ${vidalia_SRCS}
   main.cpp
   vidalia.cpp
-  animatedpixmap.cpp
   languagesupport.cpp
   mainwindow.cpp
   vclicklabel.cpp
@@ -187,7 +186,6 @@
 )
 qt4_wrap_cpp(vidalia_SRCS
   vidalia.h
-  animatedpixmap.h
   mainwindow.h
   vclicklabel.h
   vidaliawindow.h

Deleted: vidalia/trunk/src/vidalia/animatedpixmap.cpp

Deleted: vidalia/trunk/src/vidalia/animatedpixmap.h

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-19 01:16:55 UTC (rev 2994)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-19 02:12:31 UTC (rev 2995)
@@ -50,8 +50,6 @@
 #define IMG_TOR_STARTING_48  ":/images/48x48/tor-starting.png"
 #define IMG_TOR_STOPPING_48  ":/images/48x48/tor-stopping.png"
 
-//#define //ANIM_PROCESS_WORKING  ":/images/32x32/process-working.png"
-
 /* Decide which of our four sets of tray icons to use. */
 #if defined(Q_WS_WIN)
 /* QSystemTrayIcon on Windows wants 16x16 .png files */

Modified: vidalia/trunk/src/vidalia/vclicklabel.cpp
===================================================================
--- vidalia/trunk/src/vidalia/vclicklabel.cpp	2008-08-19 01:16:55 UTC (rev 2994)
+++ vidalia/trunk/src/vidalia/vclicklabel.cpp	2008-08-19 02:12:31 UTC (rev 2995)
@@ -25,8 +25,6 @@
  : QWidget(parent)
 {
   setCursor(Qt::PointingHandCursor);
-  connect(&_anim, SIGNAL(frameChanged(int)), 
-             this, SLOT(animationFrameChanged(int)));
 }
 
 /** Returns the current size hint for this widget's current contents. */
@@ -70,23 +68,6 @@
   e->accept();
 }
 
-/** Sets the widget's image to the animated image file <b>animFile</b>. */
-void
-VClickLabel::setAnimation(const QPixmap &animPixmap)
-{
-  _anim.setPixmap(animPixmap);
-  _anim.start();
-}
-
-/** Responds to a frame change on the animation. */
-void
-VClickLabel::animationFrameChanged(int frameNumber)
-{
-  Q_UNUSED(frameNumber);
-  _pixmap = _anim.currentFrame();
-  update();
-}
-
 /** Overloaded mouse event to catch left mouse button clicks. */
 void
 VClickLabel::mouseReleaseEvent(QMouseEvent *e)
@@ -109,7 +90,6 @@
 void
 VClickLabel::setPixmap(const QPixmap &pixmap)
 {
-  _anim.stop();
   _pixmap = pixmap;
   update();
 }

Modified: vidalia/trunk/src/vidalia/vclicklabel.h
===================================================================
--- vidalia/trunk/src/vidalia/vclicklabel.h	2008-08-19 01:16:55 UTC (rev 2994)
+++ vidalia/trunk/src/vidalia/vclicklabel.h	2008-08-19 02:12:31 UTC (rev 2995)
@@ -22,9 +22,7 @@
 #include <QMouseEvent>
 #include <QSize>
 
-#include "animatedpixmap.h"
 
-
 class VClickLabel : public QWidget
 {
   Q_OBJECT
@@ -42,8 +40,6 @@
   void setText(const QString &text);
   /** Sets the widget's image to <b>img</b>. */
   void setPixmap(const QPixmap &img);
-  /** Sets the widget's image to the animated image file <b>animFile</b>. */
-  void setAnimation(const QPixmap &animPixmap);
 
 signals:
   /** Emitted when the widget is left-clicked. */
@@ -55,14 +51,9 @@
   /** Overloaded mouse event to catch left mouse button clicks. */
   virtual void mouseReleaseEvent(QMouseEvent *e);
 
-private slots:
-  /** Responds to a frame change on the animation. */
-  void animationFrameChanged(int frameNumber);
-
 private:
   QString _text;    /**< Text label to display in the widget. */
   QPixmap _pixmap;  /**< Image to display in the widget. */
-  AnimatedPixmap _anim; /**< Animated pixmap to display. */
 };
 
 #endif