From 1313eb0befd595e376a9bc1ae8549555ffe7a5e8 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 12 Nov 2014 16:58:46 +0000 Subject: [PATCH 1/5] Oops - fixed win32 typo in last commit. --- modules/juce_core/native/juce_win32_Files.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp index 260ed12b64..b918cabb3f 100644 --- a/modules/juce_core/native/juce_win32_Files.cpp +++ b/modules/juce_core/native/juce_win32_Files.cpp @@ -163,7 +163,7 @@ bool File::setFileReadOnlyInternal (const bool shouldBeReadOnly) const || SetFileAttributes (fullPath.toWideCharPointer(), newAtts) != FALSE; } -bool File::setFileExecutableInternal (bool shouldBeExecutable) +bool File::setFileExecutableInternal (bool /*shouldBeExecutable*/) const { // XXX is this possible? return false; From dac5fe9cd0fc5c31bf8b9eb035741a6697bd5b75 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 12 Nov 2014 18:18:36 +0000 Subject: [PATCH 2/5] Added missing dependency to juce_tracktion_marketplace module --- modules/juce_tracktion_marketplace/juce_module_info | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/juce_tracktion_marketplace/juce_module_info b/modules/juce_tracktion_marketplace/juce_module_info index fdc531cada..1930f0cc77 100644 --- a/modules/juce_tracktion_marketplace/juce_module_info +++ b/modules/juce_tracktion_marketplace/juce_module_info @@ -6,7 +6,8 @@ "website": "http://www.juce.com/juce", "license": "GPL/Commercial", - "dependencies": [ { "id": "juce_data_structures", "version": "matching" } ], + "dependencies": [ { "id": "juce_data_structures", "version": "matching" }, + { "id": "juce_cryptography", "version": "matching" } ], "include": "juce_tracktion_marketplace.h", From 4a00747683b482b53a5c35feb788f9552b6bd4c4 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 13 Nov 2014 13:04:46 +0000 Subject: [PATCH 3/5] Updated MidiKeyboardComponent to allow it to be non-opaque. --- .../juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp index fae07b732e..5998399dd3 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp @@ -92,12 +92,12 @@ MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, mouseOverNotes.insertMultiple (0, -1, 32); mouseDownNotes.insertMultiple (0, -1, 32); - setOpaque (true); + colourChanged(); setWantsKeyboardFocus (true); state.addListener (this); - startTimer (1000 / 20); + startTimerHz (20); } MidiKeyboardComponent::~MidiKeyboardComponent() @@ -169,6 +169,7 @@ void MidiKeyboardComponent::setScrollButtonsVisible (const bool newCanScroll) void MidiKeyboardComponent::colourChanged() { + setOpaque (findColour (whiteNoteColourId).isOpaque()); repaint(); } @@ -342,7 +343,7 @@ void MidiKeyboardComponent::repaintNote (const int noteNum) void MidiKeyboardComponent::paint (Graphics& g) { - g.fillAll (Colours::white.overlaidWith (findColour (whiteNoteColourId))); + g.fillAll (findColour (whiteNoteColourId)); const Colour lineColour (findColour (keySeparatorLineColourId)); const Colour textColour (findColour (textLabelColourId)); From d10d19e4bf462d907829057faba55e905a242bbf Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 13 Nov 2014 13:33:42 +0000 Subject: [PATCH 4/5] Allowed the MidiKeyboardComponent up/down buttons to be non-opaque. --- .../juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp index 5998399dd3..9efad13c17 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp @@ -26,11 +26,8 @@ class MidiKeyboardUpDownButton : public Button { public: MidiKeyboardUpDownButton (MidiKeyboardComponent& comp, const int d) - : Button (String::empty), - owner (comp), - delta (d) + : Button (String::empty), owner (comp), delta (d) { - setOpaque (true); } void clicked() override @@ -60,8 +57,7 @@ private: }; //============================================================================== -MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, - const Orientation o) +MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, Orientation o) : state (s), xOffset (0), blackNoteLength (1), From ea5083805732af5bc3681fff13c17d97df8c40d5 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 13 Nov 2014 14:15:30 +0000 Subject: [PATCH 5/5] Whitespace --- extras/Introjucer/Source/Application/jucer_MainWindow.cpp | 2 +- extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h | 2 +- extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp index 7c0ba9ac92..b716a2e114 100644 --- a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp +++ b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp @@ -292,7 +292,7 @@ void MainWindow::showNewProjectWizard() { jassert (currentProject == nullptr); setContentOwned (createNewProjectWizardComponent(), true); - centreWithSize(900, 630); + centreWithSize (900, 630); setVisible (true); addToDesktop(); getContentComponent()->grabKeyboardFocus(); diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h index afe1aaae06..5c455afd3c 100644 --- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h @@ -43,7 +43,7 @@ static ComboBox& createFileCreationOptionComboBox (Component& setupComp, itemsCreated.add (l); c->setBounds ("parent.width / 2 + 160, 30, parent.width - 30, top + 22"); - + return *c; } diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h index 719f2b92e2..5db645fadb 100644 --- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h +++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h @@ -40,8 +40,6 @@ struct GUIAppWizard : public NewProjectWizard createFileCreationOptionComboBox (setupComp, itemsCreated, StringArray (fileOptions, numElementsInArray (fileOptions))) .setSelectedId (2); - - } Result processResultsFromSetupItems (WizardComp& setupComp)