From: Mathias L. <lun...@us...> - 2004-07-31 18:11:25
|
Update of /cvsroot/lmuse/muse/muse/waveedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32277/waveedit Modified Files: waveedit.cpp waveedit.h Log Message: more updates editorconfig Index: waveedit.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** waveedit.h 27 Jul 2004 20:52:27 -0000 1.4 --- waveedit.h 31 Jul 2004 18:11:16 -0000 1.5 *************** *** 38,42 **** Q_OBJECT virtual void closeEvent(QCloseEvent*); ! virtual void resizeEvent(QResizeEvent* ev); private slots: --- 38,42 ---- Q_OBJECT virtual void closeEvent(QCloseEvent*); ! //virtual void resizeEvent(QResizeEvent* ev); private slots: *************** *** 48,51 **** --- 48,52 ---- protected: virtual const char* getToplevelId() { return "waveedit"; } + virtual EditorSettings* newDefaultSettings(); public slots: Index: waveedit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** waveedit.cpp 27 Jul 2004 20:52:27 -0000 1.6 --- waveedit.cpp 31 Jul 2004 18:11:16 -0000 1.7 *************** *** 19,22 **** --- 19,23 ---- #include "poslabel.h" #include "gconfig.h" + #include "esettings.h" #include <qtoolbar.h> *************** *** 61,66 **** //setQuant(1); //setRaster(1); - resize(_widthInit, _heightInit); editorType = 0x40000000; //ET_WAVEEDIT //---------Pulldown Menu---------------------------- QPopupMenu* menuFile = new QPopupMenu(this); --- 62,68 ---- //setQuant(1); //setRaster(1); editorType = 0x40000000; //ET_WAVEEDIT + settings = getSettings(); + //resize(settings->width(), settings->height()); //---------Pulldown Menu---------------------------- QPopupMenu* menuFile = new QPopupMenu(this); *************** *** 113,117 **** QSizeGrip* corner = new QSizeGrip(mainw); ymag = new QSlider(1, 256, 256, yscale, Vertical, mainw); ! time = new MTScale(&_raster, mainw, xscale, true); ymag->setFixedWidth(16); connect(ymag, SIGNAL(valueChanged(int)), view, SLOT(setYScale(int))); --- 115,120 ---- QSizeGrip* corner = new QSizeGrip(mainw); ymag = new QSlider(1, 256, 256, yscale, Vertical, mainw); ! //time = new MTScale(&_raster, mainw, xscale, true); ! time = new MTScale(settings->rasterPtr(), mainw, xscale, true); ymag->setFixedWidth(16); connect(ymag, SIGNAL(valueChanged(int)), view, SLOT(setYScale(int))); *************** *** 142,145 **** --- 145,150 ---- hscroll->setRange(s, e); configChanged(); + hscroll->setXmag(((ExtEditorSettings*)settings)->xmag()); //horizontal zoom + hscroll->setPos(((ExtEditorSettings*)settings)->pos()); } *************** *** 285,288 **** --- 290,294 ---- //--------------------------------------------------------- + /* void WaveEdit::resizeEvent(QResizeEvent* ev) { *************** *** 291,294 **** --- 297,301 ---- _heightInit = ev->size().height(); } + */ //--------------------------------------------------------- *************** *** 313,314 **** --- 320,329 ---- part->track()->setSolo(flag); } + + //--------------------------------------------------------- + // newDefaultSettings + //--------------------------------------------------------- + EditorSettings* WaveEdit::newDefaultSettings() + { + return new ExtEditorSettings(1, 600, 400, -1, -1, 500, 0, 0, 1); + } |