From a9d3ea921a0763e672de932630d5ea419e995814 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Thu, 26 Jul 2018 10:35:45 +0200 Subject: [PATCH] prepare for alpha release --- ADLplug.jucer | 3 +- CMakeLists.txt | 12 +++- JUCE-targets.cmake | 4 +- cmake/LinkHelpers.cmake | 13 ++++- .../MacOSX/ADLplug.xcodeproj/project.pbxproj | 32 ++++++----- .../ADLplug_SharedCode.vcxproj | 1 + .../ADLplug_SharedCode.vcxproj.filters | 3 + sources/ui/about_component.cc | 57 +++++++++++++------ sources/ui/about_component.h | 1 + sources/version.h | 11 ++++ 10 files changed, 97 insertions(+), 40 deletions(-) create mode 100644 sources/version.h diff --git a/ADLplug.jucer b/ADLplug.jucer index e399969f..7e573889 100644 --- a/ADLplug.jucer +++ b/ADLplug.jucer @@ -8,7 +8,7 @@ pluginManufacturer="jpcima" pluginManufacturerCode="JPCm" pluginCode="ADLM" aaxIdentifier="jpcima.ADLplug" headerPath="../../../sources ../../../thirdparty/libADLMIDI/include ../../../thirdparty/wopl" defines="ADLMIDI_UNSTABLE_API ADLMIDI_DISABLE_CPP_EXTRAS ADLMIDI_DISABLE_MIDI_SEQUENCER ADLMIDI_DISABLE_MUS_SUPPORT ADLMIDI_DISABLE_XMI_SUPPORT" - id="ojbkOL"> + id="ojbkOL" version="1.0.0"> @@ -23,6 +23,7 @@ file="sources/plugin_processor.cc"/> + diff --git a/CMakeLists.txt b/CMakeLists.txt index 24bd39c3..67b8aae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -project(ADLplug VERSION 1.0.0 LANGUAGES CXX C) +project(ADLplug VERSION "1.0.0" LANGUAGES CXX C) set(ADLplug_URI "https://github.com/jpcima/ADLplug") include(SystemOption) @@ -127,21 +127,27 @@ endif() macro(add_plugin NAME) add_library("${NAME}" MODULE "sources/nothing.cc" ${ARGN}) set_property(TARGET "${NAME}" PROPERTY PREFIX "") - static_link_mingw_crt("${NAME}") if(ADLplug_RT_CHECKER) set_property(TARGET "${NAME}" APPEND_STRING PROPERTY LINK_FLAGS " ${ADLplug_RT_CHECKER_LINK_FLAGS}") endif() + if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_sources("${NAME}" PRIVATE "${PROJECT_SOURCE_DIR}/juce/Builds/VisualStudio2017/resources.rc") + endif() + static_link_mingw_crt("${NAME}") endmacro() macro(add_standalone NAME) add_executable("${NAME}" "sources/nothing.cc" ${ARGN}) set_property(TARGET "${NAME}" PROPERTY PREFIX "") - static_link_mingw_crt("${NAME}") if(ADLplug_RT_CHECKER) set_property(TARGET "${NAME}" APPEND_STRING PROPERTY LINK_FLAGS " ${ADLplug_RT_CHECKER_LINK_FLAGS}") endif() + if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_sources("${NAME}" PRIVATE "${PROJECT_SOURCE_DIR}/juce/Builds/VisualStudio2017/resources.rc") + endif() + static_link_mingw_crt("${NAME}") endmacro() if(ADLplug_VST2) diff --git a/JUCE-targets.cmake b/JUCE-targets.cmake index ed20d972..e14e6455 100644 --- a/JUCE-targets.cmake +++ b/JUCE-targets.cmake @@ -33,8 +33,8 @@ else() target_link_libraries(juce_gui_basics PUBLIC juce_gui_extra) endif() -find_package(Threads REQUIRED) -target_link_libraries(juce_core PRIVATE ${CMAKE_THREAD_LIBS_INIT}) +include(LinkHelpers) +target_link_static_threads(juce_core) add_library(vst3sdk INTERFACE) target_include_directories(vst3sdk INTERFACE "${PROJECT_SOURCE_DIR}/thirdparty/vst3sdk") diff --git a/cmake/LinkHelpers.cmake b/cmake/LinkHelpers.cmake index 56d399e2..a8885e06 100644 --- a/cmake/LinkHelpers.cmake +++ b/cmake/LinkHelpers.cmake @@ -19,8 +19,15 @@ macro(static_link_mingw_crt TARGET) # forces the static link of standard libraries set_property(TARGET "${TARGET}" APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") - # forces the static link of winpthread - set_property(TARGET "${TARGET}" APPEND_STRING - PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive") + endif() +endmacro() + +macro(target_link_static_threads TARGET) + if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND MINGW) + # use a statically link winpthread + target_link_libraries("${TARGET}" PRIVATE "-Wl,-Bstatic -lwinpthread -Wl,-Bdynamic") + else() + find_package(Threads REQUIRED) + target_link_libraries("${TARGET}" PRIVATE ${CMAKE_THREAD_LIBS_INIT}) endif() endmacro() diff --git a/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj b/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj index e5798d33..188a69e2 100644 --- a/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj +++ b/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj @@ -163,40 +163,40 @@ 5BB2AE5D1FB4F040330B6EC2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "parameter_block.h"; path = "../../../sources/parameter_block.h"; sourceTree = "SOURCE_ROOT"; }; 5C246166132206B9BF8CBDC4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "dc_filter.h"; path = "../../../sources/dsp/dc_filter.h"; sourceTree = "SOURCE_ROOT"; }; 5CABECC930802C9F125DF1D0 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; - 5D1B8950EBF39EF8C7332EAA = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "opl_chip_base.tcc"; path = "../../../sources/adl/measurer/chips/opl_chip_base.tcc"; sourceTree = "SOURCE_ROOT"; }; 5E70EFC1C920B93AC8513BD9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "simple_fifo.h"; path = "../../../sources/utility/simple_fifo.h"; sourceTree = "SOURCE_ROOT"; }; 60B1C1590C86BAFFDC923E8F = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 626FBBA05566ECAB81E995CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "knobman_skin.h"; path = "../../../sources/ui/utility/knobman_skin.h"; sourceTree = "SOURCE_ROOT"; }; + 64AA7EC2FFADFC46E27EF10B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "adlmidi_private.hpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_private.hpp"; sourceTree = "SOURCE_ROOT"; }; + 66AF8028933F44CC92A4D26D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nukedopl3.c; path = ../../../thirdparty/libADLMIDI/src/chips/nuked/nukedopl3.c; sourceTree = "SOURCE_ROOT"; }; 69359F629354765711B62B71 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_RTAS.r"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; 6A0CECF8DCB3F1D25C21DA14 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../thirdparty/JUCE/modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; + 6C79336553291299BAC6376F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fraction.hpp; path = ../../../thirdparty/libADLMIDI/src/fraction.hpp; sourceTree = "SOURCE_ROOT"; }; + 6CA2BE713668319543E11354 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "vu_meter.h"; path = "../../../sources/ui/components/vu_meter.h"; sourceTree = "SOURCE_ROOT"; }; + 74EAF8FFD08C2DFA2CBD93F2 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Serif-BoldItalic.ttf.gz"; path = "../../../resources/ui/fonts/Serif-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 764182FD5E739A636D11084E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; }; - 769721BCA66B96F37BD78071 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../thirdparty/JUCE/modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; - 76EF6D9BF52D4DE01ADF22CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_RTAS_4.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS_4.cpp"; sourceTree = "SOURCE_ROOT"; }; + 76618899E5BC2F7A8EF60BA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = midi.cc; path = ../../../sources/utility/midi.cc; sourceTree = "SOURCE_ROOT"; }; 774A3345D14799F3764F9822 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "nuked_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/nuked_opl3.cpp"; sourceTree = "SOURCE_ROOT"; }; - 79699BFC75921B2BD8EFE5C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; - 7C91BAB6C5FCBBB33AA567D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_utils.mm"; path = "../../../JuceLibraryCode/include_juce_audio_utils.mm"; sourceTree = "SOURCE_ROOT"; }; - 80E226846A91539090948A50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AUv3.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AUv3.mm"; sourceTree = "SOURCE_ROOT"; }; - 832902B433C17B378D0E67A5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "dosbox_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/dosbox_opl3.cpp"; sourceTree = "SOURCE_ROOT"; }; + 785107ECD8F425460721EB14 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "wave_label.cc"; path = "../../../sources/ui/components/wave_label.cc"; sourceTree = "SOURCE_ROOT"; }; B6C1A70C161F8AE51AF25B08 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ADLplug.dpm; sourceTree = "BUILT_PRODUCTS_DIR"; }; 31B682F29335A0E0B2D5E7EA = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ADLplug.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 89662A4B682CED20B2AAD51F = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ADLplug.appex; sourceTree = "BUILT_PRODUCTS_DIR"; }; 598DE8B9608A18ED9D0879EB = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ADLplug.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; + 5D1B8950EBF39EF8C7332EAA = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "opl_chip_base.tcc"; path = "../../../sources/adl/measurer/chips/opl_chip_base.tcc"; sourceTree = "SOURCE_ROOT"; }; 5D9220D22C034C44560E6CA4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = definitions.h; path = ../../../sources/definitions.h; sourceTree = "SOURCE_ROOT"; }; 5E328B93B15866216B0BFD92 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libADLplug.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; + 626FBBA05566ECAB81E995CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "knobman_skin.h"; path = "../../../sources/ui/utility/knobman_skin.h"; sourceTree = "SOURCE_ROOT"; }; 645306E0190BF2B246376B16 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; - 64AA7EC2FFADFC46E27EF10B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "adlmidi_private.hpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_private.hpp"; sourceTree = "SOURCE_ROOT"; }; - 66AF8028933F44CC92A4D26D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nukedopl3.c; path = ../../../thirdparty/libADLMIDI/src/chips/nuked/nukedopl3.c; sourceTree = "SOURCE_ROOT"; }; - 6C79336553291299BAC6376F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fraction.hpp; path = ../../../thirdparty/libADLMIDI/src/fraction.hpp; sourceTree = "SOURCE_ROOT"; }; - 6CA2BE713668319543E11354 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "vu_meter.h"; path = "../../../sources/ui/components/vu_meter.h"; sourceTree = "SOURCE_ROOT"; }; 6CEF9F4091C10C66DC5C24D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = worker.cc; path = ../../../sources/worker.cc; sourceTree = "SOURCE_ROOT"; }; 73B5ECCC67A9A6EAA842576E = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Italic.ttf.gz"; path = "../../../resources/ui/fonts/Mono-Italic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; - 74EAF8FFD08C2DFA2CBD93F2 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Serif-BoldItalic.ttf.gz"; path = "../../../resources/ui/fonts/Serif-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; - 76618899E5BC2F7A8EF60BA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = midi.cc; path = ../../../sources/utility/midi.cc; sourceTree = "SOURCE_ROOT"; }; + 769721BCA66B96F37BD78071 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../thirdparty/JUCE/modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; + 76EF6D9BF52D4DE01ADF22CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_RTAS_4.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS_4.cpp"; sourceTree = "SOURCE_ROOT"; }; 78368434ED0EE139AE38B2F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "adlmidi_load.cpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_load.cpp"; sourceTree = "SOURCE_ROOT"; }; - 785107ECD8F425460721EB14 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "wave_label.cc"; path = "../../../sources/ui/components/wave_label.cc"; sourceTree = "SOURCE_ROOT"; }; + 79699BFC75921B2BD8EFE5C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; + 7C91BAB6C5FCBBB33AA567D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_utils.mm"; path = "../../../JuceLibraryCode/include_juce_audio_utils.mm"; sourceTree = "SOURCE_ROOT"; }; 7DF6FB906BFD6A709AEA3CAD = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = "SOURCE_ROOT"; }; 7EDA9FB1D2D65D1CDBE704CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "main_component.cc"; path = "../../../sources/ui/main_component.cc"; sourceTree = "SOURCE_ROOT"; }; + 80E226846A91539090948A50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AUv3.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AUv3.mm"; sourceTree = "SOURCE_ROOT"; }; 8281F591131DCE58CE9D13E5 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 832902B433C17B378D0E67A5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "dosbox_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/dosbox_opl3.cpp"; sourceTree = "SOURCE_ROOT"; }; 84FC28852A18BC11523E3626 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-Regular.ttf.gz"; path = "../../../resources/ui/fonts/Sans-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 853FA5EE3F9D20920C71D934 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AAX.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AAX.mm"; sourceTree = "SOURCE_ROOT"; }; 85ED2DFBD36E7206DA368CAC = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "counting_bitset.tcc"; path = "../../../sources/utility/counting_bitset.tcc"; sourceTree = "SOURCE_ROOT"; }; @@ -266,6 +266,7 @@ CBA61A9A193DFB7F4CD693C3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "midi_sequencer_impl.hpp"; path = "../../../thirdparty/libADLMIDI/src/midi_sequencer_impl.hpp"; sourceTree = "SOURCE_ROOT"; }; CCEBA28EF61511C5A3170AD7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = worker.h; path = ../../../sources/worker.h; sourceTree = "SOURCE_ROOT"; }; CD8DD4994376E5A96AE0B3EB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "cvt_xmi2mid.hpp"; path = "../../../thirdparty/libADLMIDI/src/cvt_xmi2mid.hpp"; sourceTree = "SOURCE_ROOT"; }; + D0EF3D715380CF0B3C0F5517 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../sources/version.h; sourceTree = "SOURCE_ROOT"; }; D1AB37DBAAE7C4341688B630 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "opl3_waves.h"; path = "../../../sources/ui/chips/opl3_waves.h"; sourceTree = "SOURCE_ROOT"; }; D259B3629D1EF1B3BD499FD2 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; D2897E988363DFCBED43E130 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; @@ -385,6 +386,7 @@ 98DD4844FED4BCD7E03543F2, A5BC03C97A3AF9EA35828D1D, 25E0015B78216CD8D06CB533, + D0EF3D715380CF0B3C0F5517, 6CEF9F4091C10C66DC5C24D8, CCEBA28EF61511C5A3170AD7, 0B35D66E96610B76C2679935, diff --git a/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj b/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj index 9f21efb3..b1856703 100644 --- a/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj +++ b/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj @@ -1942,6 +1942,7 @@ + diff --git a/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters b/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters index 9dc92522..6501c9b4 100644 --- a/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters +++ b/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters @@ -2523,6 +2523,9 @@ ADLplug\sources + + ADLplug\sources + ADLplug\sources diff --git a/sources/ui/about_component.cc b/sources/ui/about_component.cc index 1a55948d..6edf7d4c 100644 --- a/sources/ui/about_component.cc +++ b/sources/ui/about_component.cc @@ -18,6 +18,7 @@ */ //[Headers] You can add your own extra header files here... +#include "../version.h" //[/Headers] #include "about_component.h" @@ -38,7 +39,7 @@ About_Component::About_Component () hyperlinkButton->setTooltip (TRANS("https://github.com/jpcima/ADLplug")); hyperlinkButton->setButtonText (TRANS("Home page")); - hyperlinkButton->setBounds (8, 40, 88, 24); + hyperlinkButton->setBounds (8, 56, 88, 24); label.reset (new Label ("new label", CharPointer_UTF8 ("This program is free software developed by Jean Pierre Cimalando. \xc2\xa9 2018\n" @@ -47,24 +48,26 @@ About_Component::About_Component () label->setFont (Font (15.0f, Font::plain).withTypefaceStyle ("Regular")); label->setJustificationType (Justification::centredLeft); label->setEditable (false, false, false); + label->setColour (Label::textColourId, Colours::aliceblue); label->setColour (TextEditor::textColourId, Colours::black); label->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); - label->setBounds (8, 72, 488, 40); + label->setBounds (8, 88, 488, 40); label2.reset (new Label ("new label", TRANS("Vitaly Novichkov for the ADLMIDI library\n" "Joel Yliluoma for the original ADLMIDI software\n" "Alexey Khokholov for Nuked OPL3\n" - "The Dosbox Team for Dosbox OPL"))); + "The DOSBox Team for DOSBox OPL"))); addAndMakeVisible (label2.get()); label2->setFont (Font (15.0f, Font::plain).withTypefaceStyle ("Regular")); label2->setJustificationType (Justification::centredLeft); label2->setEditable (false, false, false); + label2->setColour (Label::textColourId, Colours::aliceblue); label2->setColour (TextEditor::textColourId, Colours::black); label2->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); - label2->setBounds (8, 120, 488, 56); + label2->setBounds (8, 136, 488, 56); lbl_prog_version.reset (new Label ("new label", TRANS("Foobar 1.0"))); @@ -72,20 +75,34 @@ About_Component::About_Component () lbl_prog_version->setFont (Font (15.0f, Font::plain).withTypefaceStyle ("Bold")); lbl_prog_version->setJustificationType (Justification::centredLeft); lbl_prog_version->setEditable (false, false, false); + lbl_prog_version->setColour (Label::textColourId, Colours::aliceblue); lbl_prog_version->setColour (TextEditor::textColourId, Colours::black); lbl_prog_version->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); - lbl_prog_version->setBounds (8, 8, 150, 24); + lbl_prog_version->setBounds (8, 8, 150, 20); + + lbl_prog_version_extra.reset (new Label ("new label", + TRANS("Final"))); + addAndMakeVisible (lbl_prog_version_extra.get()); + lbl_prog_version_extra->setFont (Font (15.0f, Font::plain).withTypefaceStyle ("Bold")); + lbl_prog_version_extra->setJustificationType (Justification::centredLeft); + lbl_prog_version_extra->setEditable (false, false, false); + lbl_prog_version_extra->setColour (Label::textColourId, Colours::yellow); + lbl_prog_version_extra->setColour (TextEditor::textColourId, Colours::black); + lbl_prog_version_extra->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); + + lbl_prog_version_extra->setBounds (8, 28, 150, 20); //[UserPreSize] //[/UserPreSize] - setSize (500, 190); + setSize (500, 210); //[Constructor] You can add your own custom stuff here.. - lbl_prog_version->setText(JucePlugin_Name " " JucePlugin_VersionString, dontSendNotification); + lbl_prog_version->setText(JucePlugin_Name " " ADLplug_Version, dontSendNotification); + lbl_prog_version_extra->setText(ADLplug_VersionExtra, dontSendNotification); //[/Constructor] } @@ -98,6 +115,7 @@ About_Component::~About_Component() label = nullptr; label2 = nullptr; lbl_prog_version = nullptr; + lbl_prog_version_extra = nullptr; //[Destructor]. You can add your own custom destruction code here.. @@ -143,29 +161,36 @@ BEGIN_JUCER_METADATA + fixedSize="0" initialWidth="500" initialHeight="210"> END_JUCER_METADATA diff --git a/sources/ui/about_component.h b/sources/ui/about_component.h index b37b01a7..84d7055e 100644 --- a/sources/ui/about_component.h +++ b/sources/ui/about_component.h @@ -58,6 +58,7 @@ class About_Component : public Component std::unique_ptr