summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-09-25 00:57:41 (UTC)
committer llornkcor <llornkcor>2002-09-25 00:57:41 (UTC)
commitaec4470eeec00493e92680f36a0f58964abdbe8a (patch) (unidiff)
treeaff353d875cfb1e30eccd01330617309618f5575
parentb4c23347000668cc111418cce4ec2822977e5c9d (diff)
downloadopie-aec4470eeec00493e92680f36a0f58964abdbe8a.zip
opie-aec4470eeec00493e92680f36a0f58964abdbe8a.tar.gz
opie-aec4470eeec00493e92680f36a0f58964abdbe8a.tar.bz2
change to reflect familiar's record/memo button sending Key_24 now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp2
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 226f058..d6128a6 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -581,49 +581,49 @@ bool VMemo::record() {
581 581
582 ::close(dsp); 582 ::close(dsp);
583 583
584 qDebug("done recording "+fileName); 584 qDebug("done recording "+fileName);
585 585
586 Config cfg("qpe"); 586 Config cfg("qpe");
587 cfg.setGroup("Volume"); 587 cfg.setGroup("Volume");
588 QString foo = cfg.readEntry("Mute","TRUE"); 588 QString foo = cfg.readEntry("Mute","TRUE");
589 if(foo.find("TRUE",0,TRUE) != -1) 589 if(foo.find("TRUE",0,TRUE) != -1)
590 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute 590 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
591return TRUE; 591return TRUE;
592} 592}
593 593
594int VMemo::setToggleButton(int tog) { 594int VMemo::setToggleButton(int tog) {
595 595
596 for( int i=0; i < 10;i++) { 596 for( int i=0; i < 10;i++) {
597 switch (tog) { 597 switch (tog) {
598 case 0: 598 case 0:
599 return -1; 599 return -1;
600 break; 600 break;
601 case 1: 601 case 1:
602 return 0; 602 return 0;
603 break; 603 break;
604 case 2: 604 case 2:
605 return Key_Escape; 605 return Key_F24; //was Escape
606 break; 606 break;
607 case 3: 607 case 3:
608 return Key_Space; 608 return Key_Space;
609 break; 609 break;
610 case 4: 610 case 4:
611 return Key_F12; 611 return Key_F12;
612 break; 612 break;
613 case 5: 613 case 5:
614 return Key_F9; 614 return Key_F9;
615 break; 615 break;
616 case 6: 616 case 6:
617 return Key_F10; 617 return Key_F10;
618 break; 618 break;
619 case 7: 619 case 7:
620 return Key_F11; 620 return Key_F11;
621 break; 621 break;
622 case 8: 622 case 8:
623 return Key_F13; 623 return Key_F13;
624 break; 624 break;
625 }; 625 };
626 } 626 }
627 return -1; 627 return -1;
628} 628}
629 629
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index 1a60109..5421bb4 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -117,49 +117,49 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
117 117
118 sampleRate->insertItem( tr( "8000" ) ); 118 sampleRate->insertItem( tr( "8000" ) );
119 sampleRate->insertItem( tr( "11025" ) ); 119 sampleRate->insertItem( tr( "11025" ) );
120 sampleRate->insertItem( tr( "22050" ) ); 120 sampleRate->insertItem( tr( "22050" ) );
121 sampleRate->insertItem( tr( "33075" ) ); 121 sampleRate->insertItem( tr( "33075" ) );
122 sampleRate->insertItem( tr( "44100" ) ); 122 sampleRate->insertItem( tr( "44100" ) );
123 SoundSettingsBaseLayout->addMultiCellWidget( sampleRate, 2, 2, 0, 0, 1 ); 123 SoundSettingsBaseLayout->addMultiCellWidget( sampleRate, 2, 2, 0, 0, 1 );
124 124
125 TextLabel1 = new QLabel( this, "TextLabel1" ); 125 TextLabel1 = new QLabel( this, "TextLabel1" );
126 TextLabel1->setText( tr( "Recording Directory:" ) ); 126 TextLabel1->setText( tr( "Recording Directory:" ) );
127 SoundSettingsBaseLayout->addMultiCellWidget( TextLabel1, 3, 3, 0, 0, 1); 127 SoundSettingsBaseLayout->addMultiCellWidget( TextLabel1, 3, 3, 0, 0, 1);
128 128
129 129
130 LocationComboBox = new QComboBox( FALSE, this, "LocationComboBox" ); 130 LocationComboBox = new QComboBox( FALSE, this, "LocationComboBox" );
131 SoundSettingsBaseLayout->addMultiCellWidget( LocationComboBox, 4, 4, 0, 8, 1); 131 SoundSettingsBaseLayout->addMultiCellWidget( LocationComboBox, 4, 4, 0, 8, 1);
132 132
133 QLabel *TextLabelKey; 133 QLabel *TextLabelKey;
134 TextLabelKey = new QLabel( this, "TextLabelKey" ); 134 TextLabelKey = new QLabel( this, "TextLabelKey" );
135 TextLabelKey->setText( tr( "Recording Key:" ) ); 135 TextLabelKey->setText( tr( "Recording Key:" ) );
136 SoundSettingsBaseLayout->addMultiCellWidget(TextLabelKey , 5, 5, 0, 0, 1); 136 SoundSettingsBaseLayout->addMultiCellWidget(TextLabelKey , 5, 5, 0, 0, 1);
137 137
138 keyComboBox = new QComboBox( FALSE, this, "keyComboBox" ); 138 keyComboBox = new QComboBox( FALSE, this, "keyComboBox" );
139 keyComboBox->insertItem( tr( "" ) ); 139 keyComboBox->insertItem( tr( "" ) );
140 keyComboBox->insertItem( tr( "Taskbar Icon" ) ); 140 keyComboBox->insertItem( tr( "Taskbar Icon" ) );
141 keyComboBox->insertItem( tr( "Key_Escape" ) ); 141 keyComboBox->insertItem( tr( "Key_Record" ) );
142 keyComboBox->insertItem( tr( "Key_Space" ) ); 142 keyComboBox->insertItem( tr( "Key_Space" ) );
143 keyComboBox->insertItem( tr( "Key_Home" ) ); 143 keyComboBox->insertItem( tr( "Key_Home" ) );
144 keyComboBox->insertItem( tr( "Key_Calender" ) ); 144 keyComboBox->insertItem( tr( "Key_Calender" ) );
145 keyComboBox->insertItem( tr( "Key_Contacts" ) ); 145 keyComboBox->insertItem( tr( "Key_Contacts" ) );
146 keyComboBox->insertItem( tr( "Key_Menu" ) ); 146 keyComboBox->insertItem( tr( "Key_Menu" ) );
147 keyComboBox->insertItem( tr( "Key_Mail" ) ); 147 keyComboBox->insertItem( tr( "Key_Mail" ) );
148 SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 0 ,1); 148 SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 0 ,1);
149 149
150 keyLabel= new QLabel( this, "keyLabel" ); 150 keyLabel= new QLabel( this, "keyLabel" );
151 SoundSettingsBaseLayout->addMultiCellWidget( keyLabel , 6, 6, 0, 2, 3); 151 SoundSettingsBaseLayout->addMultiCellWidget( keyLabel , 6, 6, 0, 2, 3);
152 152
153 QLabel *timeLimitLabel; 153 QLabel *timeLimitLabel;
154 timeLimitLabel= new QLabel( this, "timeLimitLabel" ); 154 timeLimitLabel= new QLabel( this, "timeLimitLabel" );
155 timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) ); 155 timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) );
156 SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0, 1); 156 SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0, 1);
157 157
158 timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" ); 158 timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" );
159 timeLimitComboBox->insertItem( tr( "30" ) ); 159 timeLimitComboBox->insertItem( tr( "30" ) );
160 timeLimitComboBox->insertItem( tr( "20" ) ); 160 timeLimitComboBox->insertItem( tr( "20" ) );
161 timeLimitComboBox->insertItem( tr( "15" ) ); 161 timeLimitComboBox->insertItem( tr( "15" ) );
162 timeLimitComboBox->insertItem( tr( "10" ) ); 162 timeLimitComboBox->insertItem( tr( "10" ) );
163 timeLimitComboBox->insertItem( tr( "5" ) ); 163 timeLimitComboBox->insertItem( tr( "5" ) );
164 timeLimitComboBox->insertItem( tr( "Unlimited" ) ); 164 timeLimitComboBox->insertItem( tr( "Unlimited" ) );
165 165