From: werner s. <wsc...@us...> - 2006-01-23 17:41:32
|
Update of /cvsroot/lmuse/muse/muse/master In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3853/muse/master Modified Files: masteredit.cpp masteredit.h Log Message: updates Index: masteredit.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** masteredit.h 12 Dec 2005 22:03:44 -0000 1.17 --- masteredit.h 23 Jan 2006 17:41:21 -0000 1.18 *************** *** 9,13 **** #define __MASTER_EDIT_H__ ! #include "extmidieditor.h" #include "widgets/noteinfo.h" #include "cobject.h" --- 9,13 ---- #define __MASTER_EDIT_H__ ! #include "editor.h" #include "widgets/noteinfo.h" #include "cobject.h" *************** *** 30,34 **** //--------------------------------------------------------- ! class MasterEdit : public GraphMidiEditor { Q_OBJECT --- 30,34 ---- //--------------------------------------------------------- ! class MasterEdit : public Editor { Q_OBJECT *************** *** 50,54 **** protected: ! virtual EditorSettings* newDefaultSettings(); signals: --- 50,54 ---- protected: ! // virtual EditorSettings* newDefaultSettings(); signals: Index: masteredit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** masteredit.cpp 10 Dec 2005 10:48:56 -0000 1.28 --- masteredit.cpp 23 Jan 2006 17:41:21 -0000 1.29 *************** *** 35,44 **** MasterEdit::MasterEdit() ! : GraphMidiEditor(0) { - editorType = ET_MASTEREDIT; setWindowTitle(tr("MusE: Mastertrack")); setMinimumSize(400, 300); - settings = getSettings(); //---------ToolBar---------------------------------- --- 35,42 ---- MasterEdit::MasterEdit() ! : Editor() { setWindowTitle(tr("MusE: Mastertrack")); setMinimumSize(400, 300); //---------ToolBar---------------------------------- *************** *** 118,122 **** //Init settings, TODO: Move up in class hierarchy ! initSettings(); } --- 116,120 ---- //Init settings, TODO: Move up in class hierarchy ! // initSettings(); } *************** *** 131,143 **** //--------------------------------------------------------- - // newDefaultSettings - //--------------------------------------------------------- - - EditorSettings* MasterEdit::newDefaultSettings() - { - return new GraphEditorSettings(0, 600, 400, -1, -1, 0.01, 1.0, QPoint(0, 150)); - } - - //--------------------------------------------------------- // _setRaster //--------------------------------------------------------- --- 129,132 ---- *************** *** 148,153 **** 1, 0, 768, 384, 192, 96 }; ! settings->setRaster(rasterTable[index]); ! canvas->setRaster(raster()); } --- 137,142 ---- 1, 0, 768, 384, 192, 96 }; ! // setRaster(rasterTable[index]); ! // setRaster(raster()); } |