Commit f2851a7b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: Move code around and simplify the inclusion of headers.

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent d525a353
......@@ -31,23 +31,19 @@
#include <vlc_vout.h>
#include <vlc_keys.h>
#include "dialogs_provider.hpp"
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
#include "components/interface_widgets.hpp"
#include "main_interface.hpp"
#include "dialogs_provider.hpp"
#include "input_manager.hpp"
#include "menus.hpp"
#include "util/input_slider.hpp"
#include "util/customwidgets.hpp"
#include <QLabel>
#include "util/input_slider.hpp" /* InputSlider */
#include "util/customwidgets.hpp" /* qEventToKey */
#include <QSpacerItem>
#include <QCursor>
#include <QToolButton>
#include <QHBoxLayout>
#include <QMenu>
#include <QPalette>
#include <QResizeEvent>
#include <QDate>
#include <QSignalMapper>
#include <QTimer>
......@@ -689,6 +685,7 @@ void AbstractController::frame()
if( p_input )
var_SetVoid( p_input, "frame-next" );
}
#include <QHBoxLayout>
/*****************************
* DA Control Widget !
......
......@@ -30,33 +30,29 @@
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_interface.h>
#include "qt4.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include <QWidget>
#include <QFrame>
#include <QToolButton>
#include <QString>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
class QPixmap;
class QLabel;
class QGridLayout;
class QHBoxLayout;
class QBoxLayout;
class InputSlider;
class QAbstractSlider;
class QAbstractButton;
class InputSlider;
class VolumeClickHandler;
class QSignalMapper;
class WidgetListing;
class QSignalMapper;
class QTimer;
class WidgetListing;
typedef enum buttonType_e
{
......@@ -94,7 +90,6 @@ typedef enum buttonType_e
WIDGET_MAX,
} buttonType_e;
#include <QString>
static const QString nameL[BUTTON_MAX] = { "Play", "Stop", "Open",
"Previous", "Next", "Slower", "Faster", "Fullscreen", "De-Fullscreen",
......@@ -142,6 +137,7 @@ enum
WIDGET_SHINY = 0x4,
};
class AdvControlsWidget;
class AbstractController : public QFrame
{
friend class WidgetListing; /* For ToolBar Edition HACKS */
......
......@@ -4,10 +4,7 @@
* Copyright ( C ) 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Rafaël Carré <funman@videolanorg>
* Ilkka Ollakka <ileoo@videolan.org>
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
*
* 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
......@@ -28,31 +25,16 @@
# include "config.h"
#endif
//#include <vlc_vout.h>
//#include <vlc_keys.h>
#include "controller_widget.hpp"
#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include "menus.hpp"
#include "util/input_slider.hpp"
#include "util/customwidgets.hpp"
#include "input_manager.hpp" /* Get notification of Volume Change */
#include "util/input_slider.hpp" /* SoundSlider */
#include <vlc_aout.h> /* Volume functions */
#include <QLabel>
#include <QSpacerItem>
#include <QCursor>
#include <QToolButton>
#include <QHBoxLayout>
#include <QMenu>
#include <QPalette>
#include <QResizeEvent>
#include <QDate>
#include <QSignalMapper>
#include <QTimer>
#include <QSpinBox>
SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
bool b_shiny )
......@@ -175,3 +157,16 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
}
}
bool VolumeClickHandler::eventFilter( QObject *obj, QEvent *e )
{
if (e->type() == QEvent::MouseButtonPress )
{
aout_VolumeMute( p_intf, NULL );
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
// m->updateVolume( i_volume * VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
return true;
}
return false;
}
/*****************************************************************************
* interface_widgets.hpp : Custom widgets for the main interface
* Controller_widget.cpp : Controller Widget for the controllers
****************************************************************************
* Copyright (C) 2006 the VideoLAN team
* Copyright (C) 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Rafaël Carré <funman@videolanorg>
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
*
* 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
......@@ -30,34 +28,17 @@
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_interface.h>
#include "qt4.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include <QWidget>
#include <QFrame>
#include <QToolButton>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
class QPixmap;
class QLabel;
class QGridLayout;
class InputSlider;
class QSpinBox;
class QAbstractSlider;
class QAbstractButton;
class VolumeClickHandler;
class QSignalMapper;
class QTimer;
class WidgetListing;
/**
* SPECIAL Widgets that are a bit more than just a ToolButton
* and have an icon/behaviour that changes depending on the context:
......@@ -93,6 +74,9 @@ private slots:
void toggleTeletextTransparency( bool );
};
#define VOLUME_MAX 200
class VolumeClickHandler;
class SoundWidget : public QWidget
{
Q_OBJECT
......@@ -113,4 +97,16 @@ protected slots:
void updateVolume( void );
};
class VolumeClickHandler : public QObject
{
public:
VolumeClickHandler( intf_thread_t *_p_intf, SoundWidget *_m ) : QObject(_m)
{m = _m; p_intf = _p_intf; }
virtual ~VolumeClickHandler() {};
virtual bool eventFilter( QObject *obj, QEvent *e );
private:
SoundWidget *m;
intf_thread_t *p_intf;
};
#endif
......@@ -521,16 +521,4 @@ void TimeLabel::setStatus( int i_status )
setText( "Buffering" );
}
bool VolumeClickHandler::eventFilter( QObject *obj, QEvent *e )
{
if (e->type() == QEvent::MouseButtonPress )
{
aout_VolumeMute( p_intf, NULL );
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
// m->updateVolume( i_volume * VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
return true;
}
return false;
}
......@@ -32,10 +32,11 @@
#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_aout.h>
//#include <vlc_aout.h> Visualizer
#include "qt4.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
......@@ -124,19 +125,6 @@ private slots:
};
#endif
#define VOLUME_MAX 200
class VolumeClickHandler : public QObject
{
public:
VolumeClickHandler( intf_thread_t *_p_intf, SoundWidget *_m ) : QObject(_m)
{m = _m; p_intf = _p_intf; }
virtual ~VolumeClickHandler() {};
virtual bool eventFilter( QObject *obj, QEvent *e );
private:
SoundWidget *m;
intf_thread_t *p_intf;
};
class TimeLabel : public QLabel
{
Q_OBJECT
......
......@@ -29,9 +29,11 @@
#include <QRubberBand>
#include <QListWidget>
#include <QCheckBox>
class ToolbarEditDialog;
class DroppingController;
class QCheckBox;
class WidgetListing : public QListWidget
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment