summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp4
-rw-r--r--noncore/multimedia/tonleiter/editinst.cpp4
-rw-r--r--noncore/multimedia/tonleiter/editscale.cpp4
3 files changed, 9 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 2c54ae6..4242aa6 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -33,12 +33,14 @@
33 33
34 34
35#include "audiowidget.h" 35#include "audiowidget.h"
36#include "mediaplayerstate.h" 36#include "mediaplayerstate.h"
37#include "playlistwidget.h" 37#include "playlistwidget.h"
38 38
39#include <qpe/qpeapplication.h>
40
39namespace 41namespace
40{ 42{
41 43
42const int xo = -2; // movable x offset 44const int xo = -2; // movable x offset
43const int yo = 22; // movable y offset 45const int yo = 22; // movable y offset
44 46
@@ -142,13 +144,13 @@ void AudioWidget::setLength( long max ) {
142} 144}
143 145
144 146
145void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { 147void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
146 if ( mediaType == MediaPlayerState::Audio ) { 148 if ( mediaType == MediaPlayerState::Audio ) {
147 // startTimer( 150 ); 149 // startTimer( 150 );
148 showMaximized(); 150 QPEApplication::showDialog( this );
149 return; 151 return;
150 } 152 }
151 153
152 killTimers(); 154 killTimers();
153 hide(); 155 hide();
154} 156}
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,11 +1,13 @@
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();
@@ -51,13 +53,13 @@ Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const c
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//****************************************************************************
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,11 +1,13 @@
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
@@ -33,13 +35,13 @@ Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const
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//****************************************************************************