diff options
42 files changed, 75 insertions, 75 deletions
diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js index 25ccfc7400..450f546b34 100644 --- a/res/controllers/Denon-MC3000-scripts.js +++ b/res/controllers/Denon-MC3000-scripts.js @@ -3,7 +3,7 @@ * * Written by Bertrand Espern 2012 * - * 2012/05/11 V0.995 : first "good" version approuved and tested by me + * 2012/05/11 V0.995 : first "good" version approved and tested by me * * Special Thanks to the Programmers of Mixxx and all the contributors * diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js index f26d246d94..35467bc175 100644 --- a/res/controllers/Denon-MC7000-scripts.js +++ b/res/controllers/Denon-MC7000-scripts.js @@ -78,7 +78,7 @@ MC7000.jogParams = { /////////////////////////////////*/ -/* OTHER VARIABLES - DONT'T TOUCH EXCEPT YOU KNOW WHAT YOU DO */ +/* OTHER VARIABLES - DON'T TOUCH UNLESS YOU KNOW WHAT YOU'RE DOING */ // Resolution of the jog wheel, set so the spinny // Jog LED to match exactly the movement of the Jog Wheel @@ -642,7 +642,7 @@ MC7000.needleSearchStripPosition = function(channel, control, value, status, if (MC7000.needleSearchTouched[deckNumber]) { var fullValue = (MC7000.needleDropMSB << 7) + value; // move MSB 7 binary gigits to the left and add LSB - var position = (fullValue / 0x3FFF); // devide by all possible positions to + var position = (fullValue / 0x3FFF); // divide by all possible positions to // get relative between 0 - 1 engine.setParameter(group, "playposition", position); } diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 0aa79f6cd8..3df16760e3 100644 --- a/res/controllers/Denon-MC7000.midi.xml +++ b/res/controllers/Denon-MC7000.midi.xml @@ -2125,7 +2125,7 @@ </options> </control> <!-- EFFECTS --> - <!-- ASSIGN EFECT RACK TO DECK --> + <!-- ASSIGN EFFECT RACK TO DECK --> <control> <group>[EffectRack1_EffectUnit1]</group> <key>group_[Channel1]_enable</key> @@ -3768,7 +3768,7 @@ </output> <!-- PAD LEDs --> -<!-- ASSIGN EFECT RACK TO DECK --> +<!-- ASSIGN EFFECT RACK TO DECK --> <output> <group>[EffectRack1_EffectUnit1]</group> <key>group_[Channel1]_enable</key> diff --git a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml index d43df23ad9..840582ea61 100644 --- a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml +++ b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml @@ -1859,7 +1859,7 @@ <on>0x07</on> <off>0x05</off> </output> - <!-- LED Assitant button--> + <!-- LED Assistant button--> <output> <group>[AutoDJ]</group> <key>enabled</key> diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js index d9f10bffae..cb4588367e 100644 --- a/res/controllers/Novation-Launchpad-Mini-scripts.js +++ b/res/controllers/Novation-Launchpad-Mini-scripts.js @@ -405,7 +405,7 @@ NLM.init = function() //Init hw midi.sendShortMsg(0xb0, 0x0, 0x0); - //midi.sendShortMsg(0xb0, 0x0, 0x28); //Enable buffer cycling <-- Figure out whats wrong with this + //midi.sendShortMsg(0xb0, 0x0, 0x28); //Enable buffer cycling <-- Figure out what's wrong with this // select buffer 0 midi.sendShortMsg(0xb0, 0x68, 3); diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index c528dbff96..8778aecfe4 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -2419,7 +2419,7 @@ <control> <group>[EffectRack1_EffectUnit1]</group> <key>prev_chain</key> - <description>Preview Effekt 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 1 active)</description> + <description>Preview Effect 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 1 active)</description> <status>0x97</status> <midino>0x68</midino> <options> @@ -2429,7 +2429,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>prev_chain</key> - <description>Preview Effekt 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 2 active)</description> + <description>Preview Effect 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 2 active)</description> <status>0x98</status> <midino>0x68</midino> <options> @@ -2439,7 +2439,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>prev_chain</key> - <description>Preview Effekt 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 3 active)</description> + <description>Preview Effect 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 3 active)</description> <status>0x99</status> <midino>0x68</midino> <options> @@ -2449,7 +2449,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>prev_chain</key> - <description>Preview Effekt 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 4 active)</description> + <description>Preview Effect 1, Button: SHIFT & PAD1 (in CUE LOOP-Mode, Deck 4 active)</description> <status>0x9A</status> <midino>0x68</midino> <options> @@ -3059,7 +3059,7 @@ <control> <group>[EffectRack1_EffectUnit1]</group> <key>next_chain</key> - <description>Next Effekt 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 1 active)</description> + <description>Next Effect 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 1 active)</description> <status>0x97</status> <midino>0x69</midino> <options> @@ -3069,7 +3069,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>next_chain</key> - <description>Next Effekt 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 2 active)</description> + <description>Next Effect 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 2 active)</description> <status>0x98</status> <midino>0x69</midino> <options> @@ -3079,7 +3079,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>next_chain</key> - <description>Next Effekt 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 3 active)</description> + <description>Next Effect 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 3 active)</description> <status>0x99</status> <midino>0x69</midino> <options> @@ -3089,7 +3089,7 @@ <control> <group>[EffectRack1_EffectUnit2]</group> <key>next_chain</key> - <description>Next Effekt 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 4 active)</description> + <description>Next Effect 1, Button: SHIFT & PAD2 (in CUE LOOP-Mode, Deck 4 active)</description> <status>0x9A</status> <midino>0x69</midino> <options> diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index af8e6ae620..7de34d5d70 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -481,7 +481,7 @@ bpm.tapButton = function(deck) { bpm.tap = []; return; } - // reject occurences of accidental double or missed taps + // reject occurrences of accidental double or missed taps // a tap is considered missed when the delta of this press is 80% longer than the previous one // and a tap is considered double when the delta is shorter than 40% of the previous one. // these numbers are just guesses that produced good results in practice diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml index 631f0888ac..b393222fc7 100644 --- a/res/skins/LateNight/skin.xml +++ b/res/skins/LateNight/skin.xml @@ -105,7 +105,7 @@ style_scheme icons & backgrounds for library, splitters, spinnies, covers, vinyl control, toolbar bg_tile allows to experiment with the background tile of recessed - areas without having to creat a new style_scheme folder + areas without having to create a new style_scheme folder Note: button borders and icons are set in style_[SCHEME].qss, too so do a mass-find-and-replace there, as well. --> <SetVariable name="btn_scheme">classic</SetVariable> @@ -352,7 +352,7 @@ <Layout>vertical</Layout> <SizePolicy>me,me</SizePolicy> <Children> - <!-- regular/maximized libary + skin settings menu --> + <!-- regular/maximized library + skin settings menu --> <WidgetGroup> <Layout>horizontal</Layout> <SizePolicy>me,me</SizePolicy> @@ -426,7 +426,7 @@ <Template src="skin:skin_settings.xml"/> </Children> - </WidgetGroup><!-- regular/maximized libary + skin settings menu --> + </WidgetGroup><!-- regular/maximized library + skin settings menu --> <Template src="skin:toolbar.xml"/> <Template src="skin:screen_h-size_detection.xml"/> diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index db26390830..11638cc063 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -2192,7 +2192,7 @@ WCueMenuPopup QPushButton:focus { padding-right: 3px; border-right: 1px solid #000; /* gradient colors should match those of QHeaderView gradient, - with a litte transparency added to not cut off the header label */ + with a little transparency added to not cut off the header label */ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(34,34,34,190), stop:1 rgba(17,17,17,190)); diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index bcdab58c1a..a483ea390f 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -613,9 +613,9 @@ WEffectSelector QAbstractScrollArea QScrollBar:vertical, } #LibraryContainer QHeaderView { /* Note(ronso0) - This previously interferred with skin scaling: + This previously interfered with skin scaling: font-size: 13px/13px; - This doesnt't scale when usinf QT_SCALE_FACTOR manually: + This doesn't scale when using QT_SCALE_FACTOR manually: font-size: 10pt; */ font-size: 13px/13px; font-weight: bold; diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml index c6b306480c..1199afe420 100644 --- a/res/skins/Tango (64 Samplers)/skin.xml +++ b/res/skins/Tango (64 Samplers)/skin.xml @@ -362,10 +362,10 @@ </Children> </SingletonDefinition> -<!-- ################################################################ - SkinContainer ############################################### - skin incl. invisble size detector for deck Stars ############# - ############################################################## --> +<!-- ############################################################## + SkinContainer ############################################### + skin incl. invisible size detector for deck Stars ############ + ############################################################## --> <WidgetGroup> <ObjectName>SkinContainer</ObjectName> <Layout>vertical</Layout> @@ -568,6 +568,6 @@ </Children> </WidgetGroup> <!-- SkinContainer --> - <!-- /skin incl. invisble size detector for deck Stars --> + <!-- /skin incl. invisible size detector for deck Stars --> </Children> </skin> diff --git a/res/skins/Tango (64 Samplers)/skin_settings.xml b/res/skins/Tango (64 Samplers)/skin_settings.xml index 8d4a80e19e..d60a825bd7 100644 --- a/res/skins/Tango (64 Samplers)/skin_settings.xml +++ b/res/skins/Tango (64 Samplers)/skin_settings.xml @@ -95,7 +95,7 @@ Description: <!-- index 0 due to bug --> <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - <WidgetGroup><!-- translucent cover when Hot Cues are invisble --> + <WidgetGroup><!-- translucent cover when Hot Cues are invisible --> <ObjectName>SubmenuCover</ObjectName> <Layout>vertical</Layout> <Size>182f,13me</Size> @@ -704,7 +704,7 @@ Description: <!-- index 0 due to bug --> <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - <!-- translucent cover when Effects are invisble --> + <!-- translucent cover when Effects are invisible --> <WidgetGroup> <ObjectName>SubmenuCover</ObjectName> <Layout>vertical</Layout> diff --git a/res/skins/Tango/size_detector_deck_controls_toggle.xml b/res/skins/Tango/size_detector_deck_controls_toggle.xml index d4ccf65ef3..f6a8734b2c 100644 --- a/res/skins/Tango/size_detector_deck_controls_toggle.xml +++ b/res/skins/Tango/size_detector_deck_controls_toggle.xml @@ -2,7 +2,7 @@ Description: Size-aware container that hides the toggle for deck controls if it is not necessary (when all deck controls are permanently visible). - Overall width of all controls is XYpx, the SizeAwareStack fills remainig space. + Overall width of all controls is XYpx, the SizeAwareStack fills remaining space. If it can grow broader than 1px the toggle should be visible. --> diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml index 0e0a5d282f..ce1b3fece2 100644 --- a/res/skins/Tango/skin.xml +++ b/res/skins/Tango/skin.xml @@ -356,10 +356,10 @@ </Children> </SingletonDefinition> -<!-- ################################################################ - SkinContainer ############################################### - skin incl. invisble size detector for deck Stars ############# - ############################################################## --> +<!-- ############################################################## + SkinContainer ################################################ + skin incl. invisible size detector for deck Stars ############ + ############################################################## --> <WidgetGroup> <ObjectName>SkinContainer</ObjectName> <Layout>vertical</Layout> @@ -560,6 +560,6 @@ </Children> </WidgetGroup> <!-- SkinContainer --> - <!-- /skin incl. invisble size detector for deck Stars --> + <!-- /skin incl. invisible size detector for deck Stars --> </Children> </skin> diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml index 93f0b1237b..c43b4c97fd 100644 --- a/res/skins/Tango/skin_settings.xml +++ b/res/skins/Tango/skin_settings.xml @@ -95,7 +95,7 @@ Description: <!-- index 0 due to bug --> <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - <!-- translucent cover when Hot Cues are invisble --> + <!-- translucent cover when Hot Cues are invisible --> <WidgetGroup> <ObjectName>SubmenuCover</ObjectName> <Layout>vertical</Layout> @@ -705,7 +705,7 @@ Description: <!-- index 0 due to bug --> <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - <!-- translucent cover when Effects are invisble --> + <!-- translucent cover when Effects are invisible --> <WidgetGroup> <ObjectName>SubmenuCover</ObjectName> <Layout>vertical</Layout> diff --git a/scripts/qsscheck.py b/scripts/qsscheck.py index 32352d2120..779909b26d 100755 --- a/scripts/qsscheck.py +++ b/scripts/qsscheck.py @@ -392,7 +392,7 @@ def main(argv=None): parser.add_argument( "-p", "--extra-skins-path", - help="Additonal skin path, to check (.e.g. ~/.mixxx/skins)", + help="Additional skin path, to check (.e.g. ~/.mixxx/skins)", ) parser.add_argument("-s", "--skin", help="Only check skin with this name") parser.add_argument( diff --git a/src/controllers/colormapper.cpp b/src/controllers/colormapper.cpp index e308c7b1d8..109da3ef3f 100644 --- a/src/controllers/colormapper.cpp +++ b/src/controllers/colormapper.cpp @@ -15,7 +15,7 @@ double colorDistance(QRgb a, QRgb b) { // of colors into account. More accurate algorithms like the CIELAB2000 // Delta-E rely on sophisticated color space conversions and need a lot // of costly computations. In contrast, this is a low-cost - // approximation and should be sufficently accurate. + // approximation and should be sufficiently accurate. // More details: https://www.compuphase.com/cmetric.htm long mean_red = (static_cast<long>(qRed(a)) + static_cast<long>(qRed(b))) / 2; long delta_red = static_cast<long>(qRed(a)) - static_cast<long>(qRed(b)); diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h index bd1ab3da8e..17e0d2c834 100644 --- a/src/controllers/dlgprefcontroller.h +++ b/src/controllers/dlgprefcontroller.h @@ -80,7 +80,7 @@ class DlgPrefController : public DlgPreferencePage { /// Set dirty state (i.e. changes have been made). /// - /// When this preferences page is marked as "dirty", changes have occured + /// When this preferences page is marked as "dirty", changes have occurred /// that can be applied or discarded. /// /// @param bDirty The new dialog's dirty state. @@ -90,7 +90,7 @@ class DlgPrefController : public DlgPreferencePage { /// Set dirty state (i.e. changes have been made). /// - /// When this preferences page is marked as "dirty", changes have occured + /// When this preferences page is marked as "dirty", changes have occurred /// that can be applied or discarded. /// /// @param bDirty The new dialog's dirty state. diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp index 6054ea2451..df30d3ed96 100644 --- a/src/encoder/encoderwave.cpp +++ b/src/encoder/encoderwave.cpp @@ -14,7 +14,7 @@ #include "recording/defs_recording.h" -// The virtual file contex must return the length of the virtual file in bytes. +// The virtual file context must return the length of the virtual file in bytes. static sf_count_t sf_f_get_filelen (void *user_data) { EncoderCallback* pCallback = static_cast<EncoderCallback*>(user_data); diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index 370accb5b4..a2aab2004b 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -1361,7 +1361,7 @@ double EngineBuffer::getExactPlayPos() { return getVisualPlayPos() * getTrackSamples(); } else { // Track was just loaded and the first buffer was not processed yet. - // asume it is at 0:00 + // assume it is at 0:00 return 0.0; } } diff --git a/src/engine/sync/internalclock.cpp b/src/engine/sync/internalclock.cpp index 8d51851a7a..c2e7071424 100644 --- a/src/engine/sync/internalclock.cpp +++ b/src/engine/sync/internalclock.cpp @@ -75,7 +75,7 @@ void InternalClock::slotSyncMasterEnabledChangeRequest(double state) { return; } if (mode == SYNC_MASTER_SOFT) { - // user request: make master explicite + // user request: make master explicit m_mode = SYNC_MASTER_EXPLICIT; return; } diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp index 6b8335f844..dc9634b7d9 100644 --- a/src/engine/sync/synccontrol.cpp +++ b/src/engine/sync/synccontrol.cpp @@ -239,7 +239,7 @@ void SyncControl::setMasterParams( double beatDistance, double baseBpm, double bpm) { double masterBpmAdjustFactor = determineBpmMultiplier(fileBpm(), baseBpm); if (isMaster(getSyncMode())) { - // In Master mode we adjust the incomming Bpm for the inital sync. + // In Master mode we adjust the incoming Bpm for the initial sync. bpm *= masterBpmAdjustFactor; m_masterBpmAdjustFactor = kBpmUnity; } else { @@ -337,7 +337,7 @@ void SyncControl::trackBeatsUpdated(BeatsPointer pBeats) { } VERIFY_OR_DEBUG_ASSERT(m_pLocalBpm) { - // object not initalized + // object not initialized return; } @@ -400,7 +400,7 @@ void SyncControl::slotSyncMasterEnabledChangeRequest(double state) { return; } if (mode == SYNC_MASTER_SOFT) { - // user request: make master explicite + // user request: make master explicit m_pSyncMode->setAndConfirm(SYNC_MASTER_EXPLICIT); return; } @@ -452,7 +452,7 @@ void SyncControl::setLocalBpm(double local_bpm) { m_pEngineSync->requestBpmUpdate(this, bpm); } else { DEBUG_ASSERT(isMaster(syncMode)); - // We might have adopted an adjust factor when becomming master. + // We might have adopted an adjust factor when becoming master. // Keep it when reporting our bpm. m_pEngineSync->notifyBpmChanged(this, bpm / m_masterBpmAdjustFactor); } diff --git a/src/library/basecoverartdelegate.h b/src/library/basecoverartdelegate.h index cf7745705c..a200c83d44 100644 --- a/src/library/basecoverartdelegate.h +++ b/src/library/basecoverartdelegate.h @@ -36,7 +36,7 @@ class BaseCoverArtDelegate : public TableItemDelegate { // (background) color is painted. // // It is useful to handle cases when the user scroll down - // very fast or when they hold an arrow key. In thise case + // very fast or when they hold an arrow key. In this case // it is NOT desirable to start multiple expensive file // system operations in worker threads for loading and // scaling cover images that are not even displayed after diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index 0860877317..a72dcb6cfe 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -1296,7 +1296,7 @@ TrackPointer TrackDAO::getTrackById(TrackId trackId) const { // Listen to signals from Track objects and forward them to // receivers. TrackDAO works as a relay for selected track signals - // that allows receivers to use permament connections with + // that allows receivers to use permanent connections with // TrackDAO instead of connecting to individual Track objects. connect(pTrack.get(), &Track::dirty, diff --git a/src/library/externaltrackcollection.h b/src/library/externaltrackcollection.h index 7838d8cbf9..92b24ae6b0 100644 --- a/src/library/externaltrackcollection.h +++ b/src/library/externaltrackcollection.h @@ -58,7 +58,7 @@ Q_OBJECT Disconnected, }; - // Check if the connection to the extenal track collection + // Check if the connection to the external track collection // has been established, i.e. if the synchronization is active. virtual ConnectionState connectionState() const = 0; diff --git a/src/library/library.cpp b/src/library/library.cpp index 600033a147..a685199bb9 100644 --- a/src/library/library.cpp +++ b/src/library/library.cpp @@ -164,7 +164,7 @@ Library::Library( // TODO(XXX) Rekordbox feature added persistently as the only way to enable it to // dynamically appear/disappear when correctly prepared removable devices // are mounted/unmounted would be to have some form of timed thread to check - // periodically. Not ideal perfomance wise. + // periodically. Not ideal performance wise. if (m_pConfig->getValue(ConfigKey(kConfigGroup, "ShowRekordboxLibrary"), true)) { addFeature(new RekordboxFeature(this, m_pConfig)); } diff --git a/src/library/rekordbox/rekordboxfeature.cpp b/src/library/rekordbox/rekordboxfeature.cpp index 4ce2a204f9..048d2ee074 100644 --- a/src/library/rekordbox/rekordboxfeature.cpp +++ b/src/library/rekordbox/rekordboxfeature.cpp @@ -891,7 +891,7 @@ void readAnalyze(TrackPointer track, double sampleRate, int timingOffset, bool i memoryCues << memoryCue; } break; case rekordbox_anlz_t::CUE_ENTRY_TYPE_LOOP: { - // As Mixxx can only have 1 saved loop, use the first occurance of a memory loop relative to the start of the track + // As Mixxx can on |