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
@@ -23,32 +23,34 @@
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
+#include <qpe/qpeapplication.h>
+
 namespace
 {
 
 const int xo = -2; // movable x offset
 const int yo = 22; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "next", MediaWidget::NormalButton },
     { MediaWidget::Previous, "prev", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::Loop, "loop", MediaWidget::ToggleButton },
     { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton },
@@ -132,33 +134,33 @@ void AudioWidget::sliderReleased() {
 }
 
 void AudioWidget::setPosition( long i ) {
     //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
     updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState.position(), max );
 }
 
 
 void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
     if ( mediaType == MediaPlayerState::Audio ) {
         // startTimer( 150 );
-        showMaximized();
+        QPEApplication::showDialog( this );
         return;
     }
 
     killTimers();
     hide();
 }
 
 void AudioWidget::loadSkin()
 {
     loadDefaultSkin( guiInfo() );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
 //    changeTextColor( &songInfo );
 //    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
 //    songInfo.setFrameStyle( QFrame::NoFrame);
     songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
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,21 +1,23 @@
 #include "editinst.h"
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 
+#include <qpe/qpeapplication.h>
+
 Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name)
 :QDialog(parent,name,true,0),data(data)
 {
     setCaption("Tonleiter::"+tr("Instrument"));
     QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom);
     instid=data->getCurrentInstrumentID();
     stringlist.setAutoDelete(true);
 
     QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight);
 
     //Name combo + Add + Delete
     boxInst=new QComboBox(this,"boxInst");
     boxInst->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum));
     connect(boxInst,SIGNAL(activated(int)),this,SLOT(setCurrentInstrumetID(int)));
     for(int i=0;i<data->noOfInstruments();i++)
     {
@@ -41,33 +43,33 @@ Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const c
     scrollview=new QScrollView(this);
     scrollview->setVScrollBarMode(QScrollView::AlwaysOn);
     scrollview->setHScrollBarMode(QScrollView::AlwaysOff);
     stringwidget=new QVBox(scrollview->viewport());
     stringwidget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
     stringwidget->setSpacing(10);
     scrollview->addChild(stringwidget);
     scrollview->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum));
     masterlayout->addWidget(scrollview);
 
     loadInstrument();
 
     QPushButton* addlowButton=new QPushButton(tr("Add Low String"),this,"addlowButton");
     masterlayout->addWidget(addlowButton);
 
     //make dialog fit the screen
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 //****************************************************************************
 Menu::InstEditDialog::~InstEditDialog()
 {
 }
 //****************************************************************************
 void Menu::InstEditDialog::setCurrentInstrumetID(int id)
 {
     saveInstrument();
     instid=id;
     data->setCurrentInstrumetID(id);
     loadInstrument();
 }
 //****************************************************************************
 void Menu::InstEditDialog::addInstrument()
 {
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,21 +1,23 @@
 #include "editscale.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 
+#include <qpe/qpeapplication.h>
+
 Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const char* name)
 :QDialog(parent,name,true,0),data(data)
 {
     setCaption("Tonleiter::"+tr("Scale"));
     QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom);
 
     QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight);
 
     boxScale=new QComboBox(this,"boxScale");
     for(int s=0;s<data->noOfScales();s++)
     {
         Scale scale=data->getScale(s);
         QString name=scale.scaleName();
         if(name.isNull()) continue;
         //boxScale->insertItem(name,s);
     }
@@ -23,24 +25,24 @@ Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const
     boxScale->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum));
     connect(boxScale,SIGNAL(activated(int)),data,SLOT(setCurrentScaleID(int)));
     toplayout->addWidget(boxScale);
 
     QPushButton* addButton=new QPushButton(tr("Add"),this,"addButton");
     connect(addButton,SIGNAL(pressed()),this,SLOT(addInstrument()));
     toplayout->addWidget(addButton);
 
     QPushButton* delButton=new QPushButton(tr("Delete"),this,"delButton");
     connect(delButton,SIGNAL(pressed()),this,SLOT(deleteInstrument()));
     toplayout->addWidget(delButton);
 
     pianoscale=new PianoScale(this);
     masterlayout->addWidget(pianoscale);
     
     //make dialog fit the screen
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 //****************************************************************************
 Menu::ScaleEditDialog::~ScaleEditDialog()
 {
 }
 //****************************************************************************
 //****************************************************************************