summaryrefslogtreecommitdiff
path: root/noncore/multimedia/tonleiter
Unidiff
Diffstat (limited to 'noncore/multimedia/tonleiter') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/tonleiter/editinst.cpp4
-rw-r--r--noncore/multimedia/tonleiter/editscale.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/noncore/multimedia/tonleiter/editinst.cpp b/noncore/multimedia/tonleiter/editinst.cpp
index f172ef8..5616569 100644
--- a/noncore/multimedia/tonleiter/editinst.cpp
+++ b/noncore/multimedia/tonleiter/editinst.cpp
@@ -1,17 +1,19 @@
1#include "editinst.h" 1#include "editinst.h"
2 2
3#include <qlabel.h> 3#include <qlabel.h>
4#include <qpushbutton.h> 4#include <qpushbutton.h>
5 5
6#include <qpe/qpeapplication.h>
7
6Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name) 8Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name)
7:QDialog(parent,name,true,0),data(data) 9:QDialog(parent,name,true,0),data(data)
8{ 10{
9 setCaption("Tonleiter::"+tr("Instrument")); 11 setCaption("Tonleiter::"+tr("Instrument"));
10 QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom); 12 QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom);
11 instid=data->getCurrentInstrumentID(); 13 instid=data->getCurrentInstrumentID();
12 stringlist.setAutoDelete(true); 14 stringlist.setAutoDelete(true);
13 15
14 QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight); 16 QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight);
15 17
16 //Name combo + Add + Delete 18 //Name combo + Add + Delete
17 boxInst=new QComboBox(this,"boxInst"); 19 boxInst=new QComboBox(this,"boxInst");
@@ -45,25 +47,25 @@ Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const c
45 stringwidget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)); 47 stringwidget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
46 stringwidget->setSpacing(10); 48 stringwidget->setSpacing(10);
47 scrollview->addChild(stringwidget); 49 scrollview->addChild(stringwidget);
48 scrollview->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum)); 50 scrollview->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum));
49 masterlayout->addWidget(scrollview); 51 masterlayout->addWidget(scrollview);
50 52
51 loadInstrument(); 53 loadInstrument();
52 54
53 QPushButton* addlowButton=new QPushButton(tr("Add Low String"),this,"addlowButton"); 55 QPushButton* addlowButton=new QPushButton(tr("Add Low String"),this,"addlowButton");
54 masterlayout->addWidget(addlowButton); 56 masterlayout->addWidget(addlowButton);
55 57
56 //make dialog fit the screen 58 //make dialog fit the screen
57 showMaximized(); 59 QPEApplication::showDialog( this );
58} 60}
59//**************************************************************************** 61//****************************************************************************
60Menu::InstEditDialog::~InstEditDialog() 62Menu::InstEditDialog::~InstEditDialog()
61{ 63{
62} 64}
63//**************************************************************************** 65//****************************************************************************
64void Menu::InstEditDialog::setCurrentInstrumetID(int id) 66void Menu::InstEditDialog::setCurrentInstrumetID(int id)
65{ 67{
66 saveInstrument(); 68 saveInstrument();
67 instid=id; 69 instid=id;
68 data->setCurrentInstrumetID(id); 70 data->setCurrentInstrumetID(id);
69 loadInstrument(); 71 loadInstrument();
diff --git a/noncore/multimedia/tonleiter/editscale.cpp b/noncore/multimedia/tonleiter/editscale.cpp
index 0be0058..28bd579 100644
--- a/noncore/multimedia/tonleiter/editscale.cpp
+++ b/noncore/multimedia/tonleiter/editscale.cpp
@@ -1,17 +1,19 @@
1#include "editscale.h" 1#include "editscale.h"
2 2
3#include <qlayout.h> 3#include <qlayout.h>
4#include <qpushbutton.h> 4#include <qpushbutton.h>
5 5
6#include <qpe/qpeapplication.h>
7
6Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const char* name) 8Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const char* name)
7:QDialog(parent,name,true,0),data(data) 9:QDialog(parent,name,true,0),data(data)
8{ 10{
9 setCaption("Tonleiter::"+tr("Scale")); 11 setCaption("Tonleiter::"+tr("Scale"));
10 QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom); 12 QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom);
11 13
12 QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight); 14 QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight);
13 15
14 boxScale=new QComboBox(this,"boxScale"); 16 boxScale=new QComboBox(this,"boxScale");
15 for(int s=0;s<data->noOfScales();s++) 17 for(int s=0;s<data->noOfScales();s++)
16 { 18 {
17 Scale scale=data->getScale(s); 19 Scale scale=data->getScale(s);
@@ -27,20 +29,20 @@ Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const
27 QPushButton* addButton=new QPushButton(tr("Add"),this,"addButton"); 29 QPushButton* addButton=new QPushButton(tr("Add"),this,"addButton");
28 connect(addButton,SIGNAL(pressed()),this,SLOT(addInstrument())); 30 connect(addButton,SIGNAL(pressed()),this,SLOT(addInstrument()));
29 toplayout->addWidget(addButton); 31 toplayout->addWidget(addButton);
30 32
31 QPushButton* delButton=new QPushButton(tr("Delete"),this,"delButton"); 33 QPushButton* delButton=new QPushButton(tr("Delete"),this,"delButton");
32 connect(delButton,SIGNAL(pressed()),this,SLOT(deleteInstrument())); 34 connect(delButton,SIGNAL(pressed()),this,SLOT(deleteInstrument()));
33 toplayout->addWidget(delButton); 35 toplayout->addWidget(delButton);
34 36
35 pianoscale=new PianoScale(this); 37 pianoscale=new PianoScale(this);
36 masterlayout->addWidget(pianoscale); 38 masterlayout->addWidget(pianoscale);
37 39
38 //make dialog fit the screen 40 //make dialog fit the screen
39 showMaximized(); 41 QPEApplication::showDialog( this );
40} 42}
41//**************************************************************************** 43//****************************************************************************
42Menu::ScaleEditDialog::~ScaleEditDialog() 44Menu::ScaleEditDialog::~ScaleEditDialog()
43{ 45{
44} 46}
45//**************************************************************************** 47//****************************************************************************
46//**************************************************************************** 48//****************************************************************************