Commit 98c06d9e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: integrate the new volume to the customize dialog.

parent 24481664
...@@ -184,6 +184,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -184,6 +184,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
bool b_flat = options & WIDGET_FLAT; bool b_flat = options & WIDGET_FLAT;
bool b_big = options & WIDGET_BIG; bool b_big = options & WIDGET_BIG;
bool b_shiny = options & WIDGET_SHINY; bool b_shiny = options & WIDGET_SHINY;
bool b_special = false;
QWidget *widget = NULL; QWidget *widget = NULL;
switch( button ) switch( button )
...@@ -344,9 +345,11 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -344,9 +345,11 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
widget = telexFrame(); widget = telexFrame();
widget->hide(); widget->hide();
break; break;
case VOLUME_SPECIAL:
b_special = true;
case VOLUME: case VOLUME:
{ {
SoundWidget *snd = new SoundWidget( this, p_intf, b_shiny ); SoundWidget *snd = new SoundWidget( this, p_intf, b_shiny, b_special );
widget = snd; widget = snd;
} }
break; break;
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
#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")
#define MAIN_TB1_DEFAULT "64;38;64;37-4;65" #define MAIN_TB1_DEFAULT "64;39;64;38;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;36-4;65;35-4" #define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;37;65;35-4"
#define ADV_TB_DEFAULT "12;11;13;14" #define ADV_TB_DEFAULT "12;11;13;14"
#define INPT_TB_DEFAULT "5-1;33;6-1" #define INPT_TB_DEFAULT "5-1;33;6-1"
#define FSC_TB_DEFAULT "0-2;64;3;1;4;64;36;64;37;64;8;65;35-4;34" #define FSC_TB_DEFAULT "0-2;64;3;1;4;64;37;64;38;64;8;65;35-4;34"
class QPixmap; class QPixmap;
...@@ -86,6 +86,7 @@ typedef enum buttonType_e ...@@ -86,6 +86,7 @@ typedef enum buttonType_e
INPUT_SLIDER, INPUT_SLIDER,
TIME_LABEL, TIME_LABEL,
VOLUME, VOLUME,
VOLUME_SPECIAL,
MENU_BUTTONS, MENU_BUTTONS,
TELETEXT_BUTTONS, TELETEXT_BUTTONS,
ADVANCED_CONTROLLER, ADVANCED_CONTROLLER,
......
...@@ -248,6 +248,15 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent ) ...@@ -248,6 +248,15 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
} }
widgetItem->setText( qtr("Volume") ); widgetItem->setText( qtr("Volume") );
break; break;
case VOLUME_SPECIAL:
{
QListWidgetItem *widgetItem = new QListWidgetItem( this );
widgetItem->setText( "Small Volume" );
widgetItem->setIcon( QIcon( ":/volume-medium" ) );
widgetItem->setData( Qt::UserRole, QVariant( i ) );
addItem( widgetItem );
}
continue;
case TIME_LABEL: case TIME_LABEL:
{ {
QLabel *timeLabel = new QLabel( "12:42/2:12:42", this ); QLabel *timeLabel = new QLabel( "12:42/2:12:42", this );
......
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