author | ar <ar> | 2004-02-14 17:15:39 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-14 17:15:39 (UTC) |
commit | f8e43c3ba35bc784fc332e27db2898d4191269ac (patch) (side-by-side diff) | |
tree | 2783066d8dc6d902765d1f733e04618914b88f18 | |
parent | c6bca75c479533d064a782a5f27d3dfb3aa1c042 (diff) | |
download | opie-f8e43c3ba35bc784fc332e27db2898d4191269ac.zip opie-f8e43c3ba35bc784fc332e27db2898d4191269ac.tar.gz opie-f8e43c3ba35bc784fc332e27db2898d4191269ac.tar.bz2 |
improve support for BigScreen
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/tonleiter/editinst.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/tonleiter/editscale.cpp | 4 |
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 @@ -27,24 +27,26 @@ -- :-=` 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 }, @@ -136,25 +138,25 @@ void AudioWidget::setPosition( long 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 ); 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 @@ #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"); @@ -45,25 +47,25 @@ Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const c 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(); 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 @@ #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); @@ -27,20 +29,20 @@ Menu::ScaleEditDialog::ScaleEditDialog(TonleiterData* data,QWidget* parent,const 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() { } //**************************************************************************** //**************************************************************************** |