Changeset 2995 for vidalia/trunk

Show
Ignore:
Timestamp:
08/18/08 22:12:31 (3 months ago)
Author:
edmanm
Message:

Remove some code that isn't used anymore now that we have a bootstrap progress
bar.

Location:
vidalia/trunk/src/vidalia
Files:
2 removed
4 modified

Legend:

Unmodified
Added
Removed

  • vidalia/trunk/src/vidalia/CMakeLists.txt

    r2986 r2995  
    178178  main.cpp 
    179179  vidalia.cpp 
    180   animatedpixmap.cpp 
    181180  languagesupport.cpp 
    182181  mainwindow.cpp 
    … …  
    188187qt4_wrap_cpp(vidalia_SRCS 
    189188  vidalia.h 
    190   animatedpixmap.h 
    191189  mainwindow.h 
    192190  vclicklabel.h 

  • vidalia/trunk/src/vidalia/mainwindow.cpp

    r2983 r2995  
    5050#define IMG_TOR_STARTING_48  ":/images/48x48/tor-starting.png" 
    5151#define IMG_TOR_STOPPING_48  ":/images/48x48/tor-stopping.png" 
    52  
    53 //#define //ANIM_PROCESS_WORKING  ":/images/32x32/process-working.png" 
    5452 
    5553/* Decide which of our four sets of tray icons to use. */ 

  • vidalia/trunk/src/vidalia/vclicklabel.cpp

    r2362 r2995  
    2626{ 
    2727  setCursor(Qt::PointingHandCursor); 
    28   connect(&_anim, SIGNAL(frameChanged(int)),  
    29              this, SLOT(animationFrameChanged(int))); 
    3028} 
    3129 
    … …  
    7169} 
    7270 
    73 /** Sets the widget's image to the animated image file <b>animFile</b>. */ 
    74 void 
    75 VClickLabel::setAnimation(const QPixmap &animPixmap) 
    76 { 
    77   _anim.setPixmap(animPixmap); 
    78   _anim.start(); 
    79 } 
    80  
    81 /** Responds to a frame change on the animation. */ 
    82 void 
    83 VClickLabel::animationFrameChanged(int frameNumber) 
    84 { 
    85   Q_UNUSED(frameNumber); 
    86   _pixmap = _anim.currentFrame(); 
    87   update(); 
    88 } 
    89  
    9071/** Overloaded mouse event to catch left mouse button clicks. */ 
    9172void 
    … …  
    11091VClickLabel::setPixmap(const QPixmap &pixmap) 
    11192{ 
    112   _anim.stop(); 
    11393  _pixmap = pixmap; 
    11494  update(); 

  • vidalia/trunk/src/vidalia/vclicklabel.h

    r2362 r2995  
    2323#include <QSize> 
    2424 
    25 #include "animatedpixmap.h" 
    26  
    2725 
    2826class VClickLabel : public QWidget 
    … …  
    4341  /** Sets the widget's image to <b>img</b>. */ 
    4442  void setPixmap(const QPixmap &img); 
    45   /** Sets the widget's image to the animated image file <b>animFile</b>. */ 
    46   void setAnimation(const QPixmap &animPixmap); 
    4743 
    4844signals: 
    … …  
    5652  virtual void mouseReleaseEvent(QMouseEvent *e); 
    5753 
    58 private slots: 
    59   /** Responds to a frame change on the animation. */ 
    60   void animationFrameChanged(int frameNumber); 
    61  
    6254private: 
    6355  QString _text;    /**< Text label to display in the widget. */ 
    6456  QPixmap _pixmap;  /**< Image to display in the widget. */ 
    65   AnimatedPixmap _anim; /**< Animated pixmap to display. */ 
    6657}; 
    6758