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

fix #57096 - lupdate does't like syntax error, even in commented code. Does't like C++11 style multiline literal either.

Browse source
This commit is contained in:
lasconic 2015-04-23 17:42:48 +02:00
parent 3227c6eb06
commit 7d70645725
2 changed files with 90 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/rest.cpp
View file

@ -453,7 +453,7 @@ int Rest::computeLineOffset()
}
}
#if 0
if (offsetVoices && staff()->mergeMatchingRests())
if (offsetVoices && staff()->mergeMatchingRests()) {
// automatically merge matching rests in voices 1 & 2 if nothing in any other voice
// this is not always the right thing to do do, but is useful in choral music
// and perhaps could be made enabled via a staff property

182
mscore/helpBrowser.cpp
View file

@ -20,100 +20,96 @@ namespace Ms {
// manual css style sheets:
static const char* css = R"XXXX(
body {
font-family: Arial, Helvetica, FreeSans, "DejaVu Sans", sans-serif;
font-size: 11pt;
margin: 15px;
}
h2, h3 {
font-size: 24px;
padding: 6px 0 6px 48px;
/*background: #dcdcdc left center no-repeat url('mscore.png');*/
background-size:32px 32px;
}
h4 {
margin: 10px 0 8px 16px;
}
table {
border-collapse:collapse;
}
td {
padding: 2px 12px 2px 0;
vertical-align: text-top;
}
.class-description {
margin: 0 0 16px 0;
}
.class-inherit {
margin: 0 0 16px 0;
font-size: 0.8em;
}
.method {
font-family: "Lucida Console", Monaco, "DejaVu Sans Mono", monospace;
font-size: 0.8em;
}
.prop-odd {
background: #dcdcdc;
}
.prop-name {
font-weight: bold;
}
.prop-type {
font-style: italic
}
.prop-desc {
}
.footer {
margin-top: 24px;
background: #dcdcdc;
padding: 16px;
text-align: center;
font-size: 0.8em;
}
)XXXX";
static const char* css = "body {"
" font-family: Arial, Helvetica, FreeSans, \"DejaVu Sans\", sans-serif;"
" font-size: 11pt;"
" margin: 15px;"
" }"
"h2, h3 {"
" font-size: 24px;"
" padding: 6px 0 6px 48px;"
" /*background: #dcdcdc left center no-repeat url('mscore.png');*/"
" background-size:32px 32px;"
" }"
"h4 {"
" margin: 10px 0 8px 16px;"
" }"
"table {"
" border-collapse:collapse;"
" }"
"td {"
" padding: 2px 12px 2px 0;"
" vertical-align: text-top;"
" }"
".class-description {"
" margin: 0 0 16px 0;"
" }"
".class-inherit {"
" margin: 0 0 16px 0;"
" font-size: 0.8em;"
" }"
".method {"
" font-family: \"Lucida Console\", Monaco, \"DejaVu Sans Mono\", monospace;"
" font-size: 0.8em;"
" }"
".prop-odd {"
" background: #dcdcdc;"
" }"
".prop-name {"
" font-weight: bold;"
" }"
".prop-type {"
" font-style: italic"
" }"
".prop-desc {"
" }"
".footer {"
" margin-top: 24px;"
" background: #dcdcdc;"
" padding: 16px;"
" text-align: center;"
" font-size: 0.8em;"
" }";
static const char* cssDark = R"XXXX(
body {
font-family: Arial, Helvetica, FreeSans, "DejaVu Sans", sans-serif;
font-size: 11pt;
margin-left: 15px;
}
h1, h2, h3 {
}
h4 {
margin-left: 0px;
}
table {
border-collapse:collapse;
}
td {
padding: 2px 12px 2px 0;
vertical-align: text-top;
}
.class-description {
margin-top: 16px;
}
.class-inherit {
margin-top: 16px;
font-size: 0.8em;
}
.method {
font-family: "Lucida Console", Monaco, "DejaVu Sans Mono", monospace;
font-size: 0.7em;
}
.prop-odd {
background: #989898;
}
.prop-name {
font-weight: bold;
}
.prop-type {
font-style: italic;
}
.prop-desc {
}
)XXXX";
static const char* cssDark = "body {"
" font-family: Arial, Helvetica, FreeSans, \"DejaVu Sans\", sans-serif;"
" font-size: 11pt;"
" margin-left: 15px;"
" }"
"h1, h2, h3 {"
" }"
"h4 {"
" margin-left: 0px;"
" }"
"table {"
" border-collapse:collapse;"
" }"
"td {"
" padding: 2px 12px 2px 0;"
" vertical-align: text-top;"
" }"
".class-description {"
" margin-top: 16px;"
" }"
".class-inherit {"
" margin-top: 16px;"
" font-size: 0.8em;"
" }"
".method {"
" font-family: \"Lucida Console\", Monaco, \"DejaVu Sans Mono\", monospace;"
" font-size: 0.7em;"
" }"
".prop-odd {"
" background: #989898;"
" }"
".prop-name {"
" font-weight: bold;"
" }"
".prop-type {"
" font-style: italic;"
" }"
".prop-desc {"
" }";
//---------------------------------------------------------