Commit 33b0d9dd authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt, controller: cleaning

parent 1d288ae6
......@@ -33,14 +33,12 @@
#include "components/controller_widget.hpp"
#include "components/interface_widgets.hpp"
#include "dialogs_provider.hpp" /* Opening Dialogs */
#include "input_manager.hpp"
#include "actions_manager.hpp"
#include "dialogs_provider.hpp" /* Opening Dialogs */
#include "actions_manager.hpp" /* *_ACTION */
#include "util/input_slider.hpp" /* SeekSlider */
#include "util/customwidgets.hpp" /* qEventToKey */
#include "util/input_slider.hpp" /* SeekSlider */
#include "util/customwidgets.hpp" /* qEventToKey */
#include <QSpacerItem>
#include <QToolButton>
#include <QHBoxLayout>
#include <QRegion>
......@@ -554,7 +552,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
/* advanced Controls handling */
b_advancedVisible = b_advControls;
#if DEBUG_LAYOUT
setStyleSheet( " background: red ");
setStyleSheet( "background: red ");
#endif
setAttribute( Qt::WA_MacBrushedMetal);
......@@ -580,9 +578,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
controlLayout->addLayout( controlLayout2 );
}
ControlsWidget::~ControlsWidget()
{}
void ControlsWidget::toggleAdvanced()
{
if( !advControls ) return;
......@@ -607,7 +602,7 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, QWidget *_parent ) :
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
#if DEBUG_LAYOUT
setStyleSheet( " background: orange ");
setStyleSheet( "background: orange ");
#endif
......@@ -623,7 +618,7 @@ InputControlsWidget::InputControlsWidget( intf_thread_t *_p_i, QWidget *_parent
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
#if DEBUG_LAYOUT
setStyleSheet( " background: green ");
setStyleSheet( "background: green ");
#endif
QString line = getSettings()->value( "InputToolbar", INPT_TB_DEFAULT ).toString();
......
......@@ -27,6 +27,7 @@
#include "dialogs/toolbar.hpp"
/* Widgets */
#include "util/input_slider.hpp"
#include "util/customwidgets.hpp"
#include "components/interface_widgets.hpp"
......@@ -37,6 +38,7 @@
#include <QComboBox>
#include <QListWidget>
#include <QSpinBox>
#include <QRubberBand>
#include <QDragEnterEvent>
#include <QDialogButtonBox>
......@@ -770,4 +772,3 @@ bool DroppingController::eventFilter( QObject *obj, QEvent *event )
return false;
}
}
......@@ -27,13 +27,12 @@
#include "util/qvlcframe.hpp"
#include "components/controller.hpp"
#include <QRubberBand>
#include <QListWidget>
#include <QCheckBox>
#define PROFILE_NAME_1 "Modern Style"
#define PROFILE_NAME_1 "VLC 1.1.x Style"
#define VALUE_1 "0|64;39;64;38;65;|0-2;64;3;1;4;64;7;9;64;10;20;19;64-4;37;65;35-4;|12;11;13;14;|5-1;33;6-1;|0-2;64;3;1;4;64;37;64;38;64;8;65;35-4;34;"
#define PROFILE_NAME_2 "Classic Style"
#define PROFILE_NAME_2 "VLC 0.8.x Style"
#define VALUE_2 "1|64;39-1;64;38;|2-1;32-4;0-5;1-5;32-5;3-5;5-5;6-5;4-5;32-5;10-1;64-1;35-1;65;|12-1;11-1;13-1;14-1;|33;37-4;|0-5;1-5;32-1;1-5;5-1;6-1;4-5;32-1;12-5;11-1;65;34-4;35-1;"
#define PROFILE_NAME_3 "Minimalist Style"
#define VALUE_3 "0|64;65;|0-7;64;3-1;1-5;4-1;64;12-5;64-5;37-5;38-5;64-4;10-1;65;36-4;|11-5;13-5;14-5;|5-1;33;6-1;|0-5;64;3-5;1-5;4-5;64;12-5;65;34-4;35-1;"
......@@ -46,6 +45,7 @@ class ToolbarEditDialog;
class DroppingController;
class QCheckBox;
class QComboBox;
class QRubberBand;
class WidgetListing : public QListWidget
{
......@@ -121,4 +121,3 @@ private:
};
#endif
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