Commit 3300d070 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: toolbars, change regroupments of unsplittable buttons as QFrame

I will need that to clarify the Toolbar editor.
parent e68df391
...@@ -417,10 +417,10 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -417,10 +417,10 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
return widget; return widget;
} }
QWidget *AbstractController::discFrame() QFrame *AbstractController::discFrame()
{ {
/** Disc and Menus handling */ /** Disc and Menus handling */
QWidget *discFrame = new QWidget( this ); QFrame *discFrame = new QFrame( this );
QHBoxLayout *discLayout = new QHBoxLayout( discFrame ); QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
discLayout->setSpacing( 0 ); discLayout->setMargin( 0 ); discLayout->setSpacing( 0 ); discLayout->setMargin( 0 );
...@@ -459,7 +459,7 @@ QWidget *AbstractController::discFrame() ...@@ -459,7 +459,7 @@ QWidget *AbstractController::discFrame()
return discFrame; return discFrame;
} }
QWidget *AbstractController::telexFrame() QFrame *AbstractController::telexFrame()
{ {
/** /**
* Telextext QFrame * Telextext QFrame
......
...@@ -161,8 +161,8 @@ protected: ...@@ -161,8 +161,8 @@ protected:
QWidget *createWidget( buttonType_e, int options = WIDGET_NORMAL ); QWidget *createWidget( buttonType_e, int options = WIDGET_NORMAL );
private: private:
static void setupButton( QAbstractButton * ); static void setupButton( QAbstractButton * );
QWidget *discFrame(); QFrame *discFrame();
QWidget *telexFrame(); QFrame *telexFrame();
protected slots: protected slots:
virtual void doAction( int ); virtual void doAction( int );
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "qt4.hpp" #include "qt4.hpp"
#include <QWidget> #include <QWidget>
#include <QFrame>
#include <QToolButton> #include <QToolButton>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media") #define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
...@@ -61,7 +62,7 @@ private slots: ...@@ -61,7 +62,7 @@ private slots:
void setIcons( bool, bool ); void setIcons( bool, bool );
}; };
class TeletextController : public QWidget class TeletextController : public QFrame
{ {
Q_OBJECT Q_OBJECT
friend class AbstractController; friend class AbstractController;
......
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