LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
ws 2013-05-08 15:27:43 +02:00
parent fc72dc1e2a
commit 4200f4a931
6 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -36,7 +36,7 @@ include (GetCompilerVersion)
include (CreatePrecompiledHeader)
# for debugging the make system uncomment next line:
# set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(MSCORE_UNSTABLE TRUE) # mark as unstable

7
mscore/CMakeLists.txt
View file

@ -1,7 +1,6 @@
#=============================================================================
# MuseScore
# Linux Music Score Editor
# $Id:$
#
# Copyright (C) 2002-2013 by Werner Schweer and others
#
@ -72,7 +71,7 @@ if (OMR)
endif (OMR)
QT4_WRAP_CPP (mocs
QT5_WRAP_CPP (mocs
scoreview.h editinstrument.h editstyle.h edittempo.h instrdialog.h debugger.h
musescore.h navigator.h pagesettings.h palette.h mixer.h playpanel.h
measureproperties.h seq.h textpalette.h textstyle.h
@ -105,7 +104,7 @@ QT4_WRAP_CPP (mocs
if (APPLE)
QT4_ADD_RESOURCES (qrc_files musescore-apple.qrc)
else (APPLE)
QT4_ADD_RESOURCES (qrc_files musescore.qrc)
QT5_ADD_RESOURCES (qrc_files musescore.qrc)
endif (APPLE)
@ -159,6 +158,8 @@ else (APPLE)
endif (APPLE)
add_executable ( ${ExecutableName}
mops.cpp # HACK! first file disappears during linking as CMake generates
# something like: gcc ... -L mops.o ...
${qrc_files}
${ui_headers}
${mocs}

9
mscore/mops.cpp Normal file
View file

@ -0,0 +1,9 @@
//---------------------------------------------------------
// mops
//---------------------------------------------------------
void mops()
{
}

17
mscore/musescore.cpp
View file

@ -2231,16 +2231,25 @@ int main(int argc, char* av[])
QCoreApplication::setOrganizationName("MuseScore");
QCoreApplication::setOrganizationDomain("musescore.org");
QCoreApplication::setApplicationName("MuseScoreDevelopment");
Q_INIT_RESOURCE(zita);
Q_INIT_RESOURCE(noeffect);
Q_INIT_RESOURCE(freeverb);
// Q_INIT_RESOURCE(musescore);
// Q_INIT_RESOURCE(musescore); // not in a static lib
/* QDir dd(":/");
/*
// dump resource list
QDir dd(":");
QStringList ddl = dd.entryList();
foreach(const QString& s, ddl)
foreach(const QString& s, ddl) {
printf(" --<%s>\n", qPrintable(s));
*/
QDir ddd(":/" + s);
QStringList ddll = ddd.entryList();
foreach(const QString& s, ddll) {
printf(" --<%s>\n", qPrintable(s));
}
}
*/
#ifndef Q_WS_MAC
// Save the preferences in QSettings::NativeFormat

7
mscore/musescore.qrc
View file

@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
<file>data/shortcuts.xml</file>
<file>data/paper1.png</file>
<file>data/paper2.png</file>
@ -12,7 +13,7 @@
<file>data/home.png</file>
<file>data/help.png</file>
<file>data/table.svg</file>
<file alias="fonts/mscore20.xml">../fonts/mscore20.xml</file>
<file alias="/fonts/mscore20.xml">../fonts/mscore20.xml</file>
<file alias="fonts/gonville.xml">../fonts/gonville.xml</file>
<file alias="fonts/gonville-20.otf">../fonts/gonville-20.otf</file>
<file alias="fonts/mscore-20.otf">../fonts/mscore-20.otf</file>

1
mscore/scoreview.cpp
View file

@ -1829,7 +1829,6 @@ void ScoreView::zoom(int step, const QPoint& pos)
void ScoreView::zoom(qreal _mag, const QPointF& pos)
{
QPointF p1 = imatrix.map(pos);
if (_mag > 16.0)