diff options
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 63 |
1 files changed, 5 insertions, 58 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 0443d13..2d3adb5 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -24,61 +24,6 @@ * along with MIaV; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - -/* - * $Id$ - */ - -/* - * $Log$ - * Revision 1.21 2005/07/27 12:40:47 deva - * *** empty log message *** - * - * Revision 1.20 2005/07/25 14:27:14 deva - * *** empty log message *** - * - * Revision 1.19 2005/07/23 10:11:45 deva - * *** empty log message *** - * - * Revision 1.17 2005/07/22 19:20:28 deva - * *** empty log message *** - * - * Revision 1.16 2005/06/16 21:28:57 deva - * Rewrote thread object - * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to - * growing server queue) - * - * Revision 1.15 2005/06/02 20:45:01 deva - * - * Added clear button - * Optimized the frame handling a little (very little!). - * - * Revision 1.14 2005/05/23 19:30:36 deva - * Made some cleanup in the status bar. - * - * Revision 1.13 2005/05/16 16:00:57 deva - * - * Lots of stuff! - * - * Revision 1.12 2005/05/03 09:22:12 deva - * Implemented the gui part of the info object. - * - * Revision 1.11 2005/05/03 08:31:59 deva - * Removed the error object, and replaced it with a more generic info object. - * - * Revision 1.10 2005/05/02 20:34:38 deva - * - * Some hacked borky ugly scumm code to check for errors! :( - * - * Revision 1.9 2005/05/02 19:56:17 deva - * - * cpr_clicked is now blocked, if a recording session on. A messagebox explains - * how to stop before trying to change the cpr number again. - * - * Revision 1.8 2005/05/01 09:56:26 deva - * Added Id and Log tags to all files - */ - #include <config.h> #ifdef USE_GUI @@ -143,7 +88,7 @@ Optagelsen standses ved tryk på den røde cirkel med gul streg over." #define PIXMAP_SNAPSHOT PIXMAPS"/snapshot.png" #define PIXMAP_DUMMY PIXMAPS"/dummy.png" -#define PIXMAP_LOGO_SMALL PIXMAPS"/miav_small.png" +#define PIXMAP_LOGO_SMALL PIXMAPS"/miav-logo.png" class MainWindow : public QWidget { @@ -162,7 +107,7 @@ public slots: void freeze_clicked(); void redraw_edge(); void taskbar_update(); - void live_clicked(); + void about_clicked(); private: void clear(); @@ -175,7 +120,7 @@ private: Info *cam_info; // Image loading routines. - QImage *loadButtonIcon( char *name ); + QImage *loadButtonIcon( char *name, int height = BUTTON_HEIGHT ); QImage *loadImage( char *name ); QImage *img_unfreeze; @@ -211,6 +156,8 @@ private: QPushButton *btn_shoot; QPushButton *btn_freeze; + QPushButton *btn_about; + QStatusBar *status; VideoWidget *img_live; |