summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/tonleiter/menuwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/tonleiter/menuwidget.cpp b/noncore/multimedia/tonleiter/menuwidget.cpp
index 9cc2c6b..3dfa09d 100644
--- a/noncore/multimedia/tonleiter/menuwidget.cpp
+++ b/noncore/multimedia/tonleiter/menuwidget.cpp
@@ -1,72 +1,72 @@
1#include "menuwidget.h" 1#include "menuwidget.h"
2 2
3#include <qlabel.h> 3#include <qlabel.h>
4#include <qlayout.h> 4#include <qlayout.h>
5 5
6MenuWidget::MenuWidget(TonleiterData* data,QWidget* parent,const char* name,WFlags f) 6MenuWidget::MenuWidget(TonleiterData* data,QWidget* parent,const char* name,WFlags f)
7:QWidget(parent,name,f),data(data) 7:QWidget(parent,name,f),data(data)
8{ 8{
9 QGridLayout* layout=new QGridLayout(this,3,3,10,-1,"menulayout"); 9 QGridLayout* layout=new QGridLayout(this,3,3,10,-1,"menulayout");
10 10
11 QLabel* instLabel=new QLabel(tr("Instrument"),this,"instLabel"); 11 QLabel* instLabel=new QLabel(tr("Instr."),this,"instLabel");
12 layout->addWidget(instLabel,0,0); 12 layout->addWidget(instLabel,0,0);
13 boxInst=new QComboBox(this,"boxInst"); 13 boxInst=new QComboBox(this,"boxInst");
14 connect(boxInst,SIGNAL(activated(int)),data,SLOT(setCurrentInstrumetID(int))); 14 connect(boxInst,SIGNAL(activated(int)),data,SLOT(setCurrentInstrumetID(int)));
15 layout->addWidget(boxInst,0,1); 15 layout->addWidget(boxInst,0,1);
16 editInst=new QPushButton(tr("Edit"),this,"editInst"); 16 editInst=new QPushButton(tr("Edit"),this,"editInst");
17 layout->addWidget(editInst,0,2); 17 layout->addWidget(editInst,0,2);
18 18
19 QLabel* noteLabel=new QLabel(tr("Note"),this,"noteLabel"); 19 QLabel* noteLabel=new QLabel(tr("Note"),this,"noteLabel");
20 layout->addWidget(noteLabel,1,0); 20 layout->addWidget(noteLabel,1,0);
21 boxNote=new QComboBox(this,"boxNote"); 21 boxNote=new QComboBox(this,"boxNote");
22 connect(boxNote,SIGNAL(activated(int)),data,SLOT(setCurrentNote(int))); 22 connect(boxNote,SIGNAL(activated(int)),data,SLOT(setCurrentNote(int)));
23 layout->addWidget(boxNote,1,1); 23 layout->addWidget(boxNote,1,1);
24 for(int a=0;a<12;a++) 24 for(int a=0;a<12;a++)
25 boxNote->insertItem(Note::notenames[a],a); 25 boxNote->insertItem(Note::notenames[a],a);
26 boxNote->setCurrentItem(data->getCurrentBaseNote()); 26 boxNote->setCurrentItem(data->getCurrentBaseNote());
27 noteCheck=new QCheckBox(tr("show notes"),this,"noteCheck"); 27 noteCheck=new QCheckBox(tr("show"),this,"noteCheck");
28 noteCheck->setChecked(data->isDrawNames()); 28 noteCheck->setChecked(data->isDrawNames());
29 connect(noteCheck,SIGNAL(toggled(bool)),data,SLOT(setDrawNames(bool))); 29 connect(noteCheck,SIGNAL(toggled(bool)),data,SLOT(setDrawNames(bool)));
30 layout->addWidget(noteCheck,1,2); 30 layout->addWidget(noteCheck,1,2);
31 31
32 QLabel* scaleLabel=new QLabel(tr("Scale"),this,"scaleLabel"); 32 QLabel* scaleLabel=new QLabel(tr("Scale"),this,"scaleLabel");
33 layout->addWidget(scaleLabel,2,0); 33 layout->addWidget(scaleLabel,2,0);
34 boxScale=new QComboBox(this,"boxScale"); 34 boxScale=new QComboBox(this,"boxScale");
35 connect(boxScale,SIGNAL(activated(int)),data,SLOT(setCurrentScaleID(int))); 35 connect(boxScale,SIGNAL(activated(int)),data,SLOT(setCurrentScaleID(int)));
36 layout->addWidget(boxScale,2,1); 36 layout->addWidget(boxScale,2,1);
37 editScale=new QPushButton(tr("Edit"),this,"editScale"); 37 editScale=new QPushButton(tr("Edit"),this,"editScale");
38 layout->addWidget(editScale,2,2); 38 layout->addWidget(editScale,2,2);
39 39
40 updateBoxes(); 40 updateBoxes();
41 41
42} 42}
43//**************************************************************************** 43//****************************************************************************
44MenuWidget::~MenuWidget() 44MenuWidget::~MenuWidget()
45{ 45{
46} 46}
47//**************************************************************************** 47//****************************************************************************
48void MenuWidget::updateBoxes() 48void MenuWidget::updateBoxes()
49{ 49{
50 boxInst->clear(); 50 boxInst->clear();
51 51
52 for(int i=0;i<data->noOfInstruments();i++) 52 for(int i=0;i<data->noOfInstruments();i++)
53 { 53 {
54 Instrument inst=data->getInstrument(i); 54 Instrument inst=data->getInstrument(i);
55 QString name=inst.instName(); 55 QString name=inst.instName();
56 if(name.isNull()) continue; 56 if(name.isNull()) continue;
57 boxInst->insertItem(name,i); 57 boxInst->insertItem(name,i);
58 } 58 }
59 boxInst->setCurrentItem(data->getCurrentInstrumentID()); 59 boxInst->setCurrentItem(data->getCurrentInstrumentID());
60 60
61 boxScale->clear(); 61 boxScale->clear();
62 for(int s=0;s<data->noOfScales();s++) 62 for(int s=0;s<data->noOfScales();s++)
63 { 63 {
64 Scale scale=data->getScale(s); 64 Scale scale=data->getScale(s);
65 QString name=scale.scaleName(); 65 QString name=scale.scaleName();
66 if(name.isNull()) continue; 66 if(name.isNull()) continue;
67 boxScale->insertItem(name,s); 67 boxScale->insertItem(name,s);
68 } 68 }
69 boxScale->setCurrentItem(data->getCurrentScaleID()); 69 boxScale->setCurrentItem(data->getCurrentScaleID());
70} 70}
71//**************************************************************************** 71//****************************************************************************
72//**************************************************************************** 72//****************************************************************************