Merge lp://qastaging/~noskcaj/ubuntu/utopic/nootka/1.0.1 into lp://qastaging/ubuntu/utopic/nootka
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/nootka/1.0.1 |
Merge into: | lp://qastaging/ubuntu/utopic/nootka |
Diff against target: |
73786 lines (+38505/-20344) 317 files modified
.hg/cache/branchheads (+2/-2) .pc/qmaxfix.patch/src/charts/tmainchart.cpp (+4/-4) CMakeLists.txt (+39/-28) README (+34/-16) TODO (+21/-48) changes (+97/-13) copyright (+1/-1) debian/changelog (+7/-0) debian/watch (+2/-0) lang/lang-update.sh (+2/-2) lang/nootka_cs.ts (+2191/-1213) lang/nootka_de.ts (+2972/-0) lang/nootka_fr.ts (+2210/-1228) lang/nootka_pl.ts (+2224/-1246) lang/nootka_ru.ts (+3680/-0) lang/nootka_xx.ts (+2291/-1315) mime/CMakeLists.txt (+0/-37) mime/nel-noo.sh (+7/-2) mime/nootka.desktop (+7/-3) packaging/CMakeLists.txt (+76/-39) packaging/CMakeLists.txt-mscooore (+0/-358) packaging/bin/README (+0/-6) packaging/bin/nootka (+0/-14) packaging/debian/changelog (+0/-12) packaging/mac/install.sh (+9/-0) packaging/make-chlog.sh (+1/-1) packaging/make-noinstall.sh (+34/-0) packaging/nootka-desc (+11/-7) packaging/nsis/NSIS.template.in (+0/-949) packaging/nsis/nootka-1250.nsi (+0/-306) packaging/nsis/nootka-1250.nsi-ok (+0/-296) packaging/nsis/nootka-utf8.nsi (+352/-0) packaging/rpm/CMakeLists-Suse.txt (+0/-76) packaging/rpm/CMakeLists-fedora.txt (+0/-98) packaging/rpm/nootka.spec.in (+83/-59) packaging/src/make-src.sh (+7/-2) src/CMakeLists.txt (+111/-52) src/animations/tabstractanim.cpp (+78/-0) src/animations/tabstractanim.h (+109/-0) src/animations/tanimedtextitem.cpp (+47/-0) src/animations/tanimedtextitem.h (+43/-0) src/animations/tblinkingitem.cpp (+45/-0) src/animations/tblinkingitem.h (+49/-0) src/animations/tcoloredanim.cpp (+105/-0) src/animations/tcoloredanim.h (+57/-0) src/animations/tcombinedanim.cpp (+103/-0) src/animations/tcombinedanim.h (+76/-0) src/animations/tcrossfadetextanim.cpp (+76/-0) src/animations/tcrossfadetextanim.h (+61/-0) src/animations/tfadeinanim.cpp (+43/-0) src/animations/tfadeinanim.h (+44/-0) src/animations/tmorphedanim.cpp (+56/-0) src/animations/tmorphedanim.h (+51/-0) src/animations/tmovedanim.cpp (+80/-0) src/animations/tmovedanim.h (+54/-0) src/animations/tscaledanim.cpp (+59/-0) src/animations/tscaledanim.h (+45/-0) src/animations/tstrikedoutitem.cpp (+132/-0) src/animations/tstrikedoutitem.h (+70/-0) src/charts/sorting.cpp (+15/-12) src/charts/sorting.h (+13/-13) src/charts/tabstractaxis.cpp (+1/-1) src/charts/tabstractaxis.h (+7/-4) src/charts/tanalysdialog.cpp (+108/-35) src/charts/tanalysdialog.h (+28/-18) src/charts/tbar.cpp (+3/-2) src/charts/tchart.cpp (+6/-10) src/charts/tchart.h (+1/-3) src/charts/tgraphicsline.cpp (+5/-8) src/charts/tgraphicstexttip.h (+1/-1) src/charts/tlinearchart.cpp (+73/-43) src/charts/tlinearchart.h (+5/-2) src/charts/tmainchart.cpp (+4/-4) src/charts/tmainchart.h (+1/-1) src/charts/tnotepixmap.cpp (+111/-147) src/charts/tnotepixmap.h (+10/-9) src/charts/tquestionpoint.cpp (+3/-2) src/charts/tstafflinechart.cpp (+10/-1) src/charts/tstafflinechart.h (+2/-1) src/charts/tstatisticstip.cpp (+3/-2) src/charts/tstatisticstip.h (+1/-1) src/charts/ttipchart.cpp (+26/-11) src/charts/ttipchart.h (+13/-6) src/charts/txaxis.cpp (+20/-10) src/charts/txaxis.h (+5/-5) src/charts/tyaxis.cpp (+17/-9) src/charts/tyaxis.h (+4/-2) src/exam/tanimedtextitem.cpp (+0/-47) src/exam/tanimedtextitem.h (+0/-43) src/exam/tcanvas.cpp (+341/-263) src/exam/tcanvas.h (+74/-44) src/exam/texam.cpp (+84/-29) src/exam/texam.h (+72/-39) src/exam/texamexecutor.cpp (+819/-382) src/exam/texamexecutor.h (+100/-50) src/exam/texamparams.h (+28/-8) src/exam/texamsummary.cpp (+69/-36) src/exam/texamsummary.h (+17/-5) src/exam/texamview.cpp (+29/-21) src/exam/texamview.h (+29/-15) src/exam/texecutorsupply.cpp (+188/-88) src/exam/texecutorsupply.h (+99/-42) src/exam/texercises.cpp (+162/-0) src/exam/texercises.h (+89/-0) src/exam/tfinishtip.cpp (+0/-41) src/exam/tfinishtip.h (+0/-43) src/exam/tglobalexamstore.cpp (+104/-0) src/exam/tglobalexamstore.h (+73/-0) src/exam/tgroupedqaunit.h (+19/-10) src/exam/tnootkacertificate.cpp (+276/-0) src/exam/tnootkacertificate.h (+80/-0) src/exam/tprogresswidget.cpp (+7/-5) src/exam/tqaunit.cpp (+7/-5) src/exam/tqaunit.h (+11/-11) src/exam/tquestiontip.cpp (+89/-86) src/exam/tquestiontip.h (+20/-11) src/exam/tstartexamdlg.cpp (+268/-147) src/exam/tstartexamdlg.h (+50/-38) src/guitar/tfingerboard.cpp (+1014/-0) src/guitar/tfingerboard.h (+167/-0) src/guitar/tfingerpos.cpp (+44/-0) src/guitar/tfingerpos.h (+69/-0) src/info/select7note.cpp (+9/-7) src/info/select7note.h (+3/-3) src/info/taboutnootka.cpp (+135/-63) src/info/taboutnootka.h (+18/-11) src/info/texamhelp.cpp (+66/-67) src/info/texamhelp.h (+24/-18) src/info/texpertanswerhelp.cpp (+23/-52) src/info/texpertanswerhelp.h (+10/-14) src/info/tfirstrunwizzard.cpp (+198/-105) src/info/tfirstrunwizzard.h (+59/-24) src/info/thelpdialogbase.cpp (+105/-0) src/info/thelpdialogbase.h (+90/-0) src/info/tmainhelp.cpp (+90/-0) src/info/tmainhelp.h (+53/-0) src/info/tnootkalabel.cpp (+1/-1) src/info/tnootkalabel.h (+5/-2) src/info/translationHeader.h (+12/-0) src/info/tsupportnootka.cpp (+19/-17) src/level/accidsettings.cpp (+22/-14) src/level/accidsettings.h (+8/-6) src/level/levelsettings.cpp (+3/-3) src/level/levelsettings.h (+1/-1) src/level/questionssettings.cpp (+112/-92) src/level/questionssettings.h (+23/-43) src/level/rangesettings.cpp (+145/-74) src/level/rangesettings.h (+18/-12) src/level/texamlevel.cpp (+0/-165) src/level/texamlevel.h (+0/-74) src/level/tlevel.cpp (+413/-0) src/level/tlevel.h (+144/-0) src/level/tlevelcreatordlg.cpp (+104/-64) src/level/tlevelcreatordlg.h (+4/-4) src/level/tlevelheaderwdg.cpp (+6/-7) src/level/tlevelpreview.cpp (+131/-40) src/level/tlevelpreview.h (+40/-10) src/level/tlevelselector.cpp (+289/-106) src/level/tlevelselector.h (+77/-31) src/level/tquestionaswdg.cpp (+15/-10) src/level/tquestionaswdg.h (+6/-6) src/main.cpp (+50/-29) src/mainwindow.cpp (+413/-243) src/mainwindow.h (+48/-21) src/music/tclef.cpp (+73/-0) src/music/tclef.h (+65/-0) src/music/tinstrument.cpp (+50/-0) src/music/tinstrument.h (+42/-0) src/music/tkeysignature.cpp (+164/-0) src/music/tkeysignature.h (+95/-0) src/music/tnote.cpp (+399/-0) src/music/tnote.h (+155/-0) src/music/ttune.cpp (+111/-0) src/music/ttune.h (+96/-0) src/notename/tnamestylefilter.cpp (+58/-0) src/notename/tnamestylefilter.h (+62/-0) src/notename/tnotename.cpp (+558/-0) src/notename/tnotename.h (+132/-0) src/notename/tnotenamelabel.cpp (+274/-0) src/notename/tnotenamelabel.h (+119/-0) src/score/tclefview.cpp (+0/-63) src/score/tclefview.h (+0/-56) src/score/tkeysignature.cpp (+0/-165) src/score/tkeysignature.h (+0/-95) src/score/tkeysignatureview.cpp (+0/-183) src/score/tkeysignatureview.h (+0/-105) src/score/tmainscore.cpp (+583/-0) src/score/tmainscore.h (+138/-0) src/score/tnoteview.cpp (+0/-346) src/score/tnoteview.h (+0/-118) src/score/tpushbutton.cpp (+1/-1) src/score/tpushbutton.h (+0/-1) src/score/tscordatureview.cpp (+0/-99) src/score/tscordatureview.h (+0/-58) src/score/tscoreclef.cpp (+191/-0) src/score/tscoreclef.h (+83/-0) src/score/tscorecontrol.cpp (+144/-0) src/score/tscorecontrol.h (+60/-0) src/score/tscoreitem.cpp (+76/-0) src/score/tscoreitem.h (+79/-0) src/score/tscorekeysignature.cpp (+216/-0) src/score/tscorekeysignature.h (+97/-0) src/score/tscorenote.cpp (+514/-0) src/score/tscorenote.h (+169/-0) src/score/tscoreottava.cpp (+42/-0) src/score/tscoreottava.h (+42/-0) src/score/tscorepianostaff.cpp (+195/-0) src/score/tscorepianostaff.h (+63/-0) src/score/tscorescene.cpp (+45/-0) src/score/tscorescene.h (+63/-0) src/score/tscorescordature.cpp (+114/-0) src/score/tscorescordature.h (+58/-0) src/score/tscorestaff.cpp (+397/-0) src/score/tscorestaff.h (+195/-0) src/score/tscoreview.cpp (+25/-0) src/score/tscoreview.h (+37/-0) src/score/tscorewidget.cpp (+0/-273) src/score/tscorewidget.h (+0/-96) src/score/tscorewidgetsimple.cpp (+0/-298) src/score/tscorewidgetsimple.h (+0/-127) src/score/tsimplescore.cpp (+454/-0) src/score/tsimplescore.h (+147/-0) src/settings/examsettings.cpp (+0/-108) src/settings/examsettings.h (+0/-60) src/settings/namesettings.cpp (+0/-66) src/settings/namesettings.h (+0/-49) src/settings/scoresettings.cpp (+0/-163) src/settings/scoresettings.h (+0/-67) src/settings/settingsdialog.cpp (+0/-373) src/settings/settingsdialog.h (+0/-111) src/settings/tcolor.h (+75/-0) src/settings/tcolorbutton.cpp (+0/-60) src/settings/tcolorbutton.h (+0/-48) src/settings/texamsettings.cpp (+279/-0) src/settings/texamsettings.h (+75/-0) src/settings/tglobalsettings.cpp (+159/-0) src/settings/tglobalsettings.h (+62/-0) src/settings/tguitarsettings.cpp (+493/-0) src/settings/tguitarsettings.h (+114/-0) src/settings/tnotationradiogroup.cpp (+194/-66) src/settings/tnotationradiogroup.h (+21/-14) src/settings/tnotenamesettings.cpp (+102/-0) src/settings/tnotenamesettings.h (+54/-0) src/settings/tscalepreviewlabel.cpp (+60/-0) src/settings/tscalepreviewlabel.h (+45/-0) src/settings/tscoresettings.cpp (+232/-0) src/settings/tscoresettings.h (+73/-0) src/settings/tselectclef.cpp (+276/-0) src/settings/tselectclef.h (+139/-0) src/settings/tsettingsdialog.cpp (+265/-0) src/settings/tsettingsdialog.h (+68/-0) src/settings/tsettingsdialogbase.cpp (+66/-57) src/settings/tsettingsdialogbase.h (+31/-20) src/sound/audioinsettings.cpp (+440/-216) src/sound/audioinsettings.h (+50/-19) src/sound/audiooutsettings.cpp (+112/-67) src/sound/audiooutsettings.h (+10/-5) src/sound/rt/CMakeLists.txt (+1/-45) src/sound/rt/RtAudio.cpp (+361/-187) src/sound/rt/RtAudio.h (+80/-34) src/sound/rt/asio.cpp (+0/-257) src/sound/rt/asio.h (+0/-1054) src/sound/rt/asiodrivers.cpp (+0/-186) src/sound/rt/asiodrivers.h (+0/-41) src/sound/rt/asiodrvr.h (+0/-76) src/sound/rt/asiolist.cpp (+0/-268) src/sound/rt/asiolist.h (+0/-46) src/sound/rt/asiosys.h (+0/-82) src/sound/rt/ginclude.h (+0/-38) src/sound/rt/iasiodrv.h (+0/-37) src/sound/rt/iasiothiscallresolver.cpp (+0/-572) src/sound/rt/iasiothiscallresolver.h (+0/-202) src/sound/tabstractsoundview.cpp (+11/-20) src/sound/tabstractsoundview.h (+3/-1) src/sound/taudioparams.h (+25/-7) src/sound/tintonationview.cpp (+150/-47) src/sound/tintonationview.h (+62/-6) src/sound/tmidiout.cpp (+15/-59) src/sound/tmidiout.h (+2/-2) src/sound/toggscale.cpp (+78/-41) src/sound/toggscale.h (+30/-12) src/sound/tpitchfinder.cpp (+42/-24) src/sound/tpitchfinder.h (+23/-14) src/sound/tpitchview.cpp (+125/-57) src/sound/tpitchview.h (+35/-24) src/sound/trtaudioabstract.cpp (+47/-23) src/sound/trtaudioabstract.h (+22/-10) src/sound/trtaudioin.cpp (+112/-61) src/sound/trtaudioin.h (+26/-12) src/sound/trtaudioout.cpp (+100/-51) src/sound/trtaudioout.h (+5/-1) src/sound/tsound.cpp (+40/-21) src/sound/tsound.h (+20/-19) src/sound/tvolumeview.cpp (+51/-11) src/sound/tvolumeview.h (+8/-0) src/tfingerboard.cpp (+0/-671) src/tfingerboard.h (+0/-124) src/tfingerpos.cpp (+0/-44) src/tfingerpos.h (+0/-69) src/tglobals.cpp (+100/-51) src/tglobals.h (+47/-49) src/tnote.cpp (+0/-403) src/tnote.h (+0/-166) src/tnotename.cpp (+0/-479) src/tnotename.h (+0/-96) src/ttune.cpp (+0/-75) src/ttune.h (+0/-72) src/widgets/tanimedchbox.cpp (+51/-0) src/widgets/tanimedchbox.h (+49/-0) src/widgets/tcolorbutton.cpp (+63/-0) src/widgets/tcolorbutton.h (+48/-0) src/widgets/tfixleveldialog.cpp (+109/-0) src/widgets/tfixleveldialog.h (+68/-0) src/widgets/troundedlabel.cpp (+84/-0) src/widgets/troundedlabel.h (+53/-0) src/widgets/tselectinstrument.cpp (+138/-0) src/widgets/tselectinstrument.h (+101/-0) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/nootka/1.0.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Description of the change
New upstream release
To post a comment you must log in.
Unmerged revisions
- 9. By Jackson Doak
-
New upstream release.
- 8. By Jackson Doak
-
Add a debian/watch file
Thanks. Uploaded.