author | llornkcor <llornkcor> | 2002-05-23 17:38:39 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-23 17:38:39 (UTC) |
commit | 6383d771c26498df45a89b353165d3ffcb1dd409 (patch) (unidiff) | |
tree | 9a5fa44b75fc5283aa0078cfa61612c336f2281a | |
parent | 486ad124967306e4a65a63f9d4bf60ea1ba38544 (diff) | |
download | opie-6383d771c26498df45a89b353165d3ffcb1dd409.zip opie-6383d771c26498df45a89b353165d3ffcb1dd409.tar.gz opie-6383d771c26498df45a89b353165d3ffcb1dd409.tar.bz2 |
whoops- removed stuff that I added after I removed
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 14 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 563b438..7c2123a 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -70,25 +70,25 @@ static const char* const image1_data[] = { | |||
70 | * Constructs a SoundSettingsBase which is a child of 'parent', with the | 70 | * Constructs a SoundSettingsBase which is a child of 'parent', with the |
71 | * name 'name' and widget flags set to 'f' | 71 | * name 'name' and widget flags set to 'f' |
72 | * | 72 | * |
73 | * The dialog will by default be modeless, unless you set 'modal' to | 73 | * The dialog will by default be modeless, unless you set 'modal' to |
74 | * TRUE to construct a modal dialog. | 74 | * TRUE to construct a modal dialog. |
75 | */ | 75 | */ |
76 | SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl ) | 76 | SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl ) |
77 | : QDialog( parent, name, modal, fl ) | 77 | : QDialog( parent, name, modal, fl ) |
78 | { | 78 | { |
79 | QPixmap image0( ( const char** ) image0_data ); | 79 | QPixmap image0( ( const char** ) image0_data ); |
80 | QPixmap image1( ( const char** ) image1_data ); | 80 | QPixmap image1( ( const char** ) image1_data ); |
81 | if ( !name ) | 81 | if ( !name ) |
82 | setName( "SoundSettingsBase" ); | 82 | setName( "SoundSettingsBase" ); |
83 | resize( 255, 301 ); | 83 | resize( 255, 301 ); |
84 | setCaption( tr( "Sound Settings" ) ); | 84 | setCaption( tr( "Sound Settings" ) ); |
85 | SoundSettingsBaseLayout = new QGridLayout( this ); | 85 | SoundSettingsBaseLayout = new QGridLayout( this ); |
86 | SoundSettingsBaseLayout->setSpacing( 6 ); | 86 | SoundSettingsBaseLayout->setSpacing( 6 ); |
87 | SoundSettingsBaseLayout->setMargin( 11 ); | 87 | SoundSettingsBaseLayout->setMargin( 11 ); |
88 | 88 | ||
89 | GroupBox3 = new QGroupBox( this, "GroupBox3" ); | 89 | GroupBox3 = new QGroupBox( this, "GroupBox3" ); |
90 | GroupBox3->setFrameShape( QGroupBox::Box ); | 90 | GroupBox3->setFrameShape( QGroupBox::Box ); |
91 | GroupBox3->setFrameShadow( QGroupBox::Sunken ); | 91 | GroupBox3->setFrameShadow( QGroupBox::Sunken ); |
92 | GroupBox3->setTitle( tr( "Levels" ) ); | 92 | GroupBox3->setTitle( tr( "Levels" ) ); |
93 | GroupBox3->setColumnLayout(0, Qt::Vertical ); | 93 | GroupBox3->setColumnLayout(0, Qt::Vertical ); |
94 | GroupBox3->layout()->setSpacing( 0 ); | 94 | GroupBox3->layout()->setSpacing( 0 ); |
@@ -218,31 +218,31 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
218 | AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" ); | 218 | AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" ); |
219 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); | 219 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); |
220 | Layout11->addWidget( AlertCheckBox ); | 220 | Layout11->addWidget( AlertCheckBox ); |
221 | 221 | ||
222 | TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" ); | 222 | TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" ); |
223 | TextLabel1->setText( tr( "Location" ) ); | 223 | TextLabel1->setText( tr( "Location" ) ); |
224 | Layout11->addWidget( TextLabel1 ); | 224 | Layout11->addWidget( TextLabel1 ); |
225 | 225 | ||
226 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); | 226 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); |
227 | Layout11->addWidget( LocationComboBox ); | 227 | Layout11->addWidget( LocationComboBox ); |
228 | Layout12_2->addWidget( GroupBox1 ); | 228 | Layout12_2->addWidget( GroupBox1 ); |
229 | 229 | ||
230 | touchsound = new QCheckBox( this, "touchsound" ); | 230 | // touchsound = new QCheckBox( this, "touchsound" ); |
231 | touchsound->setText( tr( "Screen sounds" ) ); | 231 | // touchsound->setText( tr( "Screen sounds" ) ); |
232 | Layout12_2->addWidget( touchsound ); | 232 | // Layout12_2->addWidget( touchsound ); |
233 | 233 | ||
234 | keysound = new QCheckBox( this, "keysound" ); | 234 | // keysound = new QCheckBox( this, "keysound" ); |
235 | keysound->setText( tr( "Keyboard sounds" ) ); | 235 | // keysound->setText( tr( "Keyboard sounds" ) ); |
236 | Layout12_2->addWidget( keysound ); | 236 | // Layout12_2->addWidget( keysound ); |
237 | QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 237 | QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); |
238 | Layout12_2->addItem( spacer_9 ); | 238 | Layout12_2->addItem( spacer_9 ); |
239 | 239 | ||
240 | SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); | 240 | SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); |
241 | } | 241 | } |
242 | 242 | ||
243 | /* | 243 | /* |
244 | * Destroys the object and frees any allocated resources | 244 | * Destroys the object and frees any allocated resources |
245 | */ | 245 | */ |
246 | SoundSettingsBase::~SoundSettingsBase() | 246 | SoundSettingsBase::~SoundSettingsBase() |
247 | { | 247 | { |
248 | // no need to delete child widgets, Qt does it all for us | 248 | // no need to delete child widgets, Qt does it all for us |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 66ba34a..e65c813 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -36,26 +36,26 @@ public: | |||
36 | QSlider* volume; | 36 | QSlider* volume; |
37 | QSlider* mic; | 37 | QSlider* mic; |
38 | QLabel* PixmapLabel2_2; | 38 | QLabel* PixmapLabel2_2; |
39 | QLabel* TextLabel2_2; | 39 | QLabel* TextLabel2_2; |
40 | QGroupBox* GroupBox1; | 40 | QGroupBox* GroupBox1; |
41 | QLabel* sampleRateLabel; | 41 | QLabel* sampleRateLabel; |
42 | QComboBox* sampleRate; | 42 | QComboBox* sampleRate; |
43 | QCheckBox* stereoCheckBox; | 43 | QCheckBox* stereoCheckBox; |
44 | QCheckBox* sixteenBitCheckBox; | 44 | QCheckBox* sixteenBitCheckBox; |
45 | QCheckBox* AlertCheckBox; | 45 | QCheckBox* AlertCheckBox; |
46 | QLabel* TextLabel1; | 46 | QLabel* TextLabel1; |
47 | QComboBox* LocationComboBox; | 47 | QComboBox* LocationComboBox; |
48 | QCheckBox* touchsound; | 48 | /* QCheckBox* touchsound; */ |
49 | QCheckBox* keysound; | 49 | /* QCheckBox* keysound; */ |
50 | 50 | ||
51 | protected: | 51 | protected: |
52 | QGridLayout* SoundSettingsBaseLayout; | 52 | QGridLayout* SoundSettingsBaseLayout; |
53 | QVBoxLayout* GroupBox3Layout; | 53 | QVBoxLayout* GroupBox3Layout; |
54 | QVBoxLayout* Layout10; | 54 | QVBoxLayout* Layout10; |
55 | QHBoxLayout* Layout16; | 55 | QHBoxLayout* Layout16; |
56 | QHBoxLayout* Layout13; | 56 | QHBoxLayout* Layout13; |
57 | QHBoxLayout* Layout12; | 57 | QHBoxLayout* Layout12; |
58 | QHBoxLayout* Layout17; | 58 | QHBoxLayout* Layout17; |
59 | QVBoxLayout* Layout12_2; | 59 | QVBoxLayout* Layout12_2; |
60 | QVBoxLayout* Layout11; | 60 | QVBoxLayout* Layout11; |
61 | }; | 61 | }; |