added zaurus, and made has_wav_alarm the default as zaurus is special case, because it has a non standard alarm/speaker

1 files changed, 5 insertions, 1 deletions

diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index a000087..b047877 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -60,264 +60,268 @@ static const char * vol_xpm[] = {
 "        .           ",
 "        . . . .     ",
 "    . . . . . .     ",
 "    . . . . . . .   ",
 "    . . ..... . .   ",
 "  . ... ..... ...   ",
 "  ........... ....  ",
 "  ................. ",
 "++++++++++++++++++++",
 " .................. ",
 "  . ............. . ",
 "  . ..... .......   ",
 "    . ... ..... .   ",
 "    . ... ..... .   ",
 "    . ... .....     ",
 "    .  .  . . .     ",
 "       .  . .       ",
 "       .  . .       ",
 "                    "};
 /* XPM */
 static const char * mic_xpm[] = {
 "20 20 21 1",
 " 	c None",
 ".	c #000000",
 "+	c #EEEEEE",
 "@	c #B4B6B4",
 "#	c #8B8D8B",
 "$	c #D5D6D5",
 "%	c #E6E6E6",
 "&	c #9C9D9C",
 "*	c #6A696A",
 "=	c #E6E2E6",
 "-	c #F6F2F6",
 ";	c #CDC6CD",
 ">	c #737573",
 ",	c #4A484A",
 "'	c #DEDEDE",
 ")	c #F6EEF6",
 "!	c #414041",
 "~	c #202020",
 "{	c #ACAEAC",
 "]	c #838583",
 "^	c #6A656A",
 "                    ",
 "            ....    ",
 "           .+@+#.   ",
 "          ..$%&%*.  ",
 "         .=-.;=>=,. ",
 "         .'+).&+!+. ",
 "         .+;+;.~+~. ",
 "         ..%{%,.... ",
 "         ..&=>=~..  ",
 "        .+..]^,..   ",
 "       .+.......    ",
 "      .%...         ",
 "     .=...          ",
 "    .+...           ",
 "   .+...            ",
 "   ....             ",
 "  ....              ",
 "  ..                ",
 " .                  ",
 ".                   "};
 
 /* XPM */
 static const char * alarm_xpm[] = {
 "20 20 33 1",
 " 	c None",
 ".	c #080602",
 "+	c #AAA602",
 "@	c #252002",
 "#	c #434202",
 "$	c #795602",
 "%	c #C3C20D",
 "&	c #DADAC2",
 "*	c #826002",
 "=	c #740502",
 "-	c #D6D602",
 ";	c #322E02",
 ">	c #826A02",
 ",	c #F1F195",
 "'	c #959215",
 ")	c #423602",
 "!	c #4B0302",
 "~	c #844315",
 "{	c #AAAA2A",
 "]	c #E2DE42",
 "^	c #BA7E04",
 "/	c #7F7502",
 "(	c #828276",
 "_	c #FEFE4E",
 ":	c #7D1902",
 "<	c #989656",
 "[	c #260B02",
 "}	c #F7F7D8",
 "|	c #DCDA5A",
 "1	c #823102",
 "2	c #B1AC6B",
 "3	c #F7F710",
 "4	c #838204",
 "                    ",
 "                    ",
 "        4'4/        ",
 "        /-^=        ",
 "       42{4>4       ",
 "      '2|+*$44      ",
 "     +2&3+$1*44     ",
 "    (%_}_+/$:>/4    ",
 "    4%_}3+#;>:*4    ",
 "    4%_}&+#[1$/4    ",
 "    4%_,2')[~~>4    ",
 "    4%33'4#@~1>4    ",
 "    4%3344#[:>/4    ",
 "   42&_3'4#@>:*44   ",
 "  42|}}3'4#[;$)$44  ",
 "444{]]2^~~:!!#.@##/ ",
 "4444-%*:==!!=...../ ",
 "       /:[..        ",
 "        /@.         ",
 "                    "};
 
 VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name )
 		: QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup )
 {
 	m_icon = icon;
 	
 	bool has_wav_alarm = false;
 	
-	switch ( ODevice::inst ( )-> model ( )) {
+  switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually
 		case OMODEL_iPAQ_H31xx:
 		case OMODEL_iPAQ_H36xx:
 		case OMODEL_iPAQ_H37xx:
 		case OMODEL_iPAQ_H38xx: 
 			has_wav_alarm = true;
 			break;
+    case OMODEL_Zaurus_SL5000:
+        has_wav_alarm = false; //poor guys probably feeling left out...
+      break;
 		default:
+      has_wav_alarm = true; //lets just presume 
 			break;
 	}
 	
 
 	setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
 
 	QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 );
 	grid-> setSpacing ( 4 );
 	grid-> setMargin ( 6 );
 	
 	QVBoxLayout *vbox;
 	QLabel *l;
 	
 	vbox = new QVBoxLayout ( );
 	vbox-> setSpacing ( 4 );
 	grid-> addLayout ( vbox, 1, 0 );
 	
 	upButton = new QPushButton ( this );
 	upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
 	upButton-> setPixmap ( Resource::loadPixmap ( "up" ));
 	upButton-> setFocusPolicy ( QWidget::NoFocus );
 
 	vbox-> addWidget ( upButton );
 	
 	downButton = new QPushButton ( this );
 	downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
 	downButton-> setPixmap ( Resource::loadPixmap ( "down" ));
 	downButton-> setFocusPolicy ( QWidget::NoFocus );
 
 	vbox-> addWidget ( downButton );
 
 	volSlider = new QSlider ( this );
 	volSlider-> setRange ( 0, 100 );
 	volSlider-> setTickmarks ( QSlider::Both );
 	volSlider-> setTickInterval ( 20 );
 	volSlider-> setFocusPolicy ( QWidget::NoFocus );
 	
 	l = new QLabel ( this );
 	l-> setPixmap ( QPixmap ( vol_xpm ));
 	
 	grid-> addWidget ( l, 0, 1, AlignCenter );
 	grid-> addWidget ( volSlider, 1, 1, AlignCenter );
 
 	volLed = new OLedBox ( green, this );
 	volLed-> setFocusPolicy ( QWidget::NoFocus );
 	volLed-> setFixedSize ( 16, 16 );
 	
 	grid-> addWidget ( volLed, 2, 1, AlignCenter );
 
 	micSlider = new QSlider ( this );
 	micSlider-> setRange ( 0, 100 );
 	micSlider-> setTickmarks ( QSlider::Both );
 	micSlider-> setTickInterval ( 20 );
 	micSlider-> setFocusPolicy ( QWidget::NoFocus );
 	
 	l = new QLabel ( this );
 	l-> setPixmap ( QPixmap ( mic_xpm ));
 	
 	grid-> addWidget ( l, 0, 2, AlignCenter );
 	grid-> addWidget ( micSlider, 1, 2, AlignCenter );
 
 	micLed = new OLedBox ( red, this );
 	micLed-> setFocusPolicy ( QWidget::NoFocus );
 	micLed-> setFixedSize ( 16, 16 );
 	
 	grid-> addWidget ( micLed, 2, 2, AlignCenter );
 
 	alarmSlider = new QSlider ( this );
 	alarmSlider-> setRange ( 0, 100 );
 	alarmSlider-> setTickmarks ( QSlider::Both );
 	alarmSlider-> setTickInterval ( 20 );
 	alarmSlider-> setFocusPolicy ( QWidget::NoFocus );
 
 	QLabel *alarmLabel = new QLabel ( this );
 	alarmLabel-> setPixmap ( QPixmap ( alarm_xpm ));
 	
 	grid-> addWidget ( alarmLabel, 0, 3, AlignCenter );
 	grid-> addWidget ( alarmSlider, 1, 3, AlignCenter );
 
 	alarmLed = new OLedBox ( yellow, this );
 	alarmLed-> setFocusPolicy ( QWidget::NoFocus );
 	alarmLed-> setFixedSize ( 16, 16 );
 	
 	grid-> addWidget ( alarmLed, 2, 3, AlignCenter );
 
 	if ( !has_wav_alarm ) {
 		alarmSlider-> hide ( );
 		alarmLabel-> hide ( );
 		alarmLed-> hide ( );
 	}
 	
 	grid-> addWidget ( new QLabel ( tr( "Enable Sounds for:" ), this ), 0, 4, AlignVCenter | AlignLeft );
 
 	vbox = new QVBoxLayout ( );
 	vbox-> setSpacing ( 4 );
 	grid-> addMultiCellLayout ( vbox, 1, 2, 4, 4 );
 	
 	tapBox = new QCheckBox ( tr( "Screen Taps" ), this );
 	tapBox-> setFocusPolicy ( QWidget::NoFocus );
 		
 	vbox-> addWidget ( tapBox, AlignVCenter | AlignLeft );
 
 	keyBox = new QCheckBox ( tr( "Key Clicks" ), this );
 	keyBox-> setFocusPolicy ( QWidget::NoFocus );
 		
 	vbox-> addWidget ( keyBox, AlignVCenter | AlignLeft );
 
 	alarmBox = new QCheckBox ( tr( "Alarm Sound" ), this );
 	alarmBox-> setFocusPolicy ( QWidget::NoFocus );
 		
 	vbox-> addWidget ( alarmBox, AlignVCenter | AlignLeft );
 
 	if ( has_wav_alarm ) {
 		alarmBox-> hide ( );
 	}
 
 	vbox-> addStretch ( 100 );
 
 	setFixedSize ( sizeHint ( ));
 	setFocusPolicy ( QWidget::NoFocus );
 
 	rateTimer = new QTimer( this );
 	connect ( rateTimer, SIGNAL( timeout ( )), this, SLOT( rateTimerDone ( )));
 	
 	connect ( upButton,   SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
 	connect ( upButton,   SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
 	connect ( downButton, SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
 	connect ( downButton, SIGNAL( released ( )), this, SLOT( buttonChanged ( )));