Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DMG rebranding #5013

Merged
merged 3 commits into from Jun 8, 2019
Merged

DMG rebranding #5013

merged 3 commits into from Jun 8, 2019

Conversation

@tresf
Copy link
Member

@tresf tresf commented Jun 6, 2019

Artwork courtesy @RebeccaDeField
Closes #4289

macOS 10.14 (Dark Mode, Retina Display)
image

macOS 10.8
Screen Shot 2019-06-08 at 12 53 54 AM

Note, macOS has gone dark-mode for many users so if we are to embrace that you may want to mock-up with white text as well.

This statement from #4289 is incorrect. The DMG uses black text automatically so this will not be an issue.

@tresf tresf changed the title Initial DMG rebranding DMG rebranding Jun 6, 2019
@tresf tresf mentioned this pull request Jun 6, 2019
@RebeccaDeField
Copy link
Contributor

@RebeccaDeField RebeccaDeField commented Jun 7, 2019

Here to help with spacing/placement of icons. A look at the .json file seems to imply that the same size is set for both icons. Can we set a different size for each icon without much fuss? If not I think that the LMMS icon lining up with the grid is the most important from an aesthetic standpoint. I'll get you some numbers to use for spacing once I know what my options are.

@PhysSong
Copy link
Member

@PhysSong PhysSong commented Jun 7, 2019

@RebeccaDeField Basically, DMG is a disk image format. It seems like .DS_Store stores the icon size for items in a directory, not the icon size of individual items. I also searched for other tools, and none of them provide the functionality than you may need.

The only way I can think of is adding some spacing into icon.icns, but it will affect the appearance of LMMS icon in other places as well.

@tresf
Copy link
Member Author

@tresf tresf commented Jun 7, 2019

Can we set a different size for each icon without much fuss? If not I think that the LMMS icon lining up with the grid is the most important from an aesthetic standpoint.

No, we cannot.

I'll get you some numbers to use for spacing once I know what my options are.

Spacing is X, Y from top left. Also, folder icons are provided by Apple, the dimensions are always subject to change.

There's a chance that a particular icon size brings equidistant spacing between lines/icon edges, but that trial and error is quite manual due to the points made by @PhysSong and because of this, such spacing is an investment of time that we would need another project volunteer for (or grant you temporary access to a Mac).

@tresf
Copy link
Member Author

@tresf tresf commented Jun 7, 2019

@RebeccaDeField also note, we can roll a retina bg automagically (avoid blurriness at 4K) using this technique: https://github.com/LinusU/node-appdmg#retina-background

Basically, we just need a 2x background named cmake/apple/dmg_branding@2x.png

@RebeccaDeField
Copy link
Contributor

@RebeccaDeField RebeccaDeField commented Jun 7, 2019

Thank you both for the information.

Basically, we just need a 2x background named cmake/apple/dmg_branding@2x.png

Done. Do I have access to add the file to this PR? Otherwise, I can provide another file link.

If not I think that the LMMS icon lining up with the grid is the most important from an aesthetic standpoint.

What I meant by this was that if changing the folder was not an option, having only the LMMS icon lining up as seen in your preview for the PR works well enough. In fact, it is a perfectionistic detail to match it to the pattern to begin with, I don't believe the website even does.

I can provide some adjustments to the spacing in X&Y.

@tresf I think I'm somehow missing something here because I thought you were using the already existing 128px mimetype/pixel perfect size yet the screenshot in your preview does not seem to be displaying the icon in that size.

@tresf
Copy link
Member Author

@tresf tresf commented Jun 7, 2019

Do I have access to add the file to this PR?

Yes.

@tresf I think I'm somehow missing something here because I thought you were using the already existing 128px mimetype/pixel perfect size yet the screenshot in your preview does not seem to be displaying the icon in that size.

It's a retina display, everything is 2x. Sorry for the confusion. It's my first time doing a retina DMG, but AFAIK, you just divide all dimensions from my mockup in half (or shrink 50%, then measure).

@tresf
Copy link
Member Author

@tresf tresf commented Jun 7, 2019

I thought you were using the already existing 128px mimetype/pixel perfect size

It's a multi-resource .icns file which should contain both 128 and 256 sizes. When macOS is running on a 4K monitor, I believe it just uses the 256 icon when 128 is requested. If it's still off, it may be a DPI difference with the OS that I'm not aware of. The .json file definitely says 128.

@tresf
Copy link
Member Author

@tresf tresf commented Jun 8, 2019

@RebeccaDeField pushed 1 commit. c7f1271 add retina bg file

Screenshot updated.

@RebeccaDeField
Copy link
Contributor

@RebeccaDeField RebeccaDeField commented Jun 8, 2019

I may have figured out part of the sizing discrepancy. Didn't realize that there was 8px padding around the 128 icon .svg using the bounding box whereas the icon in my svg was 128 edge-to-edge. Importing the .svg at 112px as it probably is in the mimetype seems to reflect your screenshot.

By measuring the distances from the screenshot and halving it, I was able to position the icon in inkscape exactly as it is in your preview. These numbers are different than what I see in this PR but consistent across measuring in gimp and inkscape.

Inkscape is telling me that the spacing for the LMMS icon as it is with the PR now without any changes should be x:140 y:144 not x:196 y:200.

I just want to change the x position over so that the icons have the same space from the arrows as to the edge of the window. Inkscape tells me this should be x:83 for the LMMS icon and somewhere around (don't have the exact size of the other because the shadow) x:507 for applications.

Example of how this looks in my document with red to just highlight why I think it should be spaced that way:
example

I'm not sure if my numbers will translate correctly on your end or why :\

@tresf
Copy link
Member Author

@tresf tresf commented Jun 8, 2019

Nudged via 731a9fa, screenshot updated.

@RebeccaDeField
Copy link
Contributor

@RebeccaDeField RebeccaDeField commented Jun 8, 2019

Looks great from a design standpoint. If/once this is tested sufficiently then I think it's good to merge.

@tresf tresf added this to the 1.2.0 milestone Jun 8, 2019
@tresf tresf merged commit ca06b88 into stable-1.2 Jun 8, 2019
1 of 3 checks passed
@tresf tresf deleted the dmg branch Jun 8, 2019
Spekular added a commit to Spekular/lmms that referenced this issue Jul 13, 2019
* Allow sub plugins for instruments aswell

* Move m_key member of Effect into Plugin
* Pass key to Instrument ctors and instantiaters
* Add pluginKeys to all plugin selector widgets, and let them pass the keys
  when instantiating the instruments; or, if the keys must be passed over
  threads, pass the keys to the Engine using `Engine::setDndPluginKey()`
* As instrument plugin libraries now also need to get their key passed, their
  second argument, which was always the same as the first, is now used to pass
  the sub plugin keys. This affects *all* instrument plugins.
* Plugin.h: Add more virtuals to `SubPluginFeatures` in order to draw logos
  and images into instrument selector widgets
* LadspaSubPluginFeatures: Implement the `displayName` virtual because the
  new behaviour to resolve displayNames is to first look at the
  SubPluginFeatures, which, without override, returns the superior plugin's
  name (Plugin.cpp)

Additional:

* PluginFactory.h: Allow setting up search paths without discovering plugins
  yet
* Plugin.h: Add full documentation (should be checked)

* Fix Engine.cpp not compiling on some compilers

* Fix or remove wrong or useless debug printfs

* Fix missing IntrumentTrack header

* Use QString for SubPluginFeatures' virtuals

The former virtuals returned `const char*`, which lead to invalid reads when
`LadspaSubPluginFeatures` returned pointers to temporary `QByteArray::data`.

* Test deployment preparation in regular builds  (LMMS#4847)

Tests whether contributions break packaging inadvertently

* Add needed macOS shortcuts (LMMS#4851)

Fix insert bars, delete bars, delete notes on Apple keyboard

* Move apt_mingw_cache out of build directory (LMMS#4842)

* Add missing include

Compilation fails with debug build. Fixes regression from
dd99f3a

* Fix DrumSynth sscanf (LMMS#4869)

* Fix failing build due to missing include

Fix the build of MixHelpers.cpp which fails due to a missing include of
cstdio (printf is not defined).

* Add /sbin to AppImage search path
Closes LMMS#4846

* Fix AudioFileProcessor tooltip (LMMS#4868)

* Disable soundio on macOS

Temporarily disable soundio on macOS to address stability issues with PortAudio
Closes LMMS#4864

* Blacklist $HOME as VST directory
Closes LMMS#4854

* Sync Debian version (LMMS#4840)

* Sync Debian version

* Drop temporary logging

* Install 32-bit RemoteVstPlugin to a separate directory (LMMS#4797)

* Fix loading 32bit VSTs on Linux

Fix a regression in LMMS#4797

* Fix loading 32bit VSTs when loading LMMS in the build directory

Fix another regression in LMMS#4797

* Fix MidiJack crash on exit

* Fix uninitialized m_jackClient being used in MidiJack destructor
* Fix destruction order in Mixer.cpp so that MidiJack doesn't access the
  deleted AudioJack instance

Fixes LMMS#4688

* Fix LMMS#3926: QCursor in AFP

Fix a crash that occurred on the following steps:
1. Add an AFP track.
2. Open it, and move the waveform display to overlap the track label
button.
3. Close the AFP window and open it again by clicking the track label.
4. Move the mouse pointer.

The problem occurs because the code makes the implicit assumption that
AudioFileProcessorWaveView::enterEvent (and hence
QApplication::setOverrideCursor) is called before
AudioFileProcessorWaveView::mouseMoveEvent. This is not the case when
the waveform display is on top of the track label. In this case the AFP
windows is opened with the mouse being immediately positioned over the
wave form display. There is no enter event and move events are issues
directly. This then leads to a crash in
AudioFileProcessorWaveView::mouseMoveEvent when trying to determine the
value for is_size_cursor because the override cursor is still null but
is dereferenced directly without checking.

Only adding a check would not solve the problem because in that case the
cursor would not change to the hand cursor when being moved inside the
waveform display.

The solution is to remove all calls to the global methods
setOverrideCursor and restoreOverrideCursor and to only set the cursor
locally.

This fix is based on a patch by gi0e5b06 which is committed under 8a10c52
in his repository but for which he never created a pull request.

* Fix CONTRIBUTORS override

* Debian integration: update build dependencies

It was wrongly done in 231a840.

* Debian: don't bundle CALF LADSPA library separately anymore

It's LMMS specific now

* Better Wine detection and support

* Support more Wine packagings

* Allow building 64-bit RemoteVstPlugin using 32-bit Wine tools if possible

* Provide suitable library paths for creating AppImages

* Check if winegcc works before building RemoteVstPlugin

* Modify VST build systems to make debian integration work correctly

* Allow creating AppImages on systems newer than linuxdeployqt officially supports

Note that the additional -unsupported-allow-new-glibc switch
may result in an AppImage which is unusable on old systems.

* Support FX Mixer for sample tracks and add controls to sample track window (LMMS#3866)

This work is based on LMMS#3632 by @grejppi.

* Fix zyn pitch on project load/export
Closes LMMS#3451

* Add info about LadspaControls::m_noLink

* Fix compilation on Qt4

* Avoid shallow clones in all Debian sid builds (LMMS#4888)

hallow clone may break version detection. This is fatal in Debian builds, so use full clone.

Note: This is safe for stable-1.2 but needs review after merging to master due to submodules.  See LMMS#4888 for more information.

* Add VST always-on-top config option

* Ensure VST windows show properly in taskbar

* Don't show error when loading empty VeSTige instance

* Fix layout of VstSyncData struct

Ensure member of type double is 8-byte aligned for consistent layout between 32- and 64-bit Linux builds.

* Rework after code reading

* Fix possible segfault in `SubPluginFeatures::displayName`
* Minor fixes

* Allow TabWidget to be variable sized

* Allow instrument views to grow with contents

Make InstrumentTrackWindow as large as the InstrumentView requires

* Make instrument window's piano optional

* Make Model class visitable

* Forbid copying the Knob class

* Always instantiate at least a dummy plugin

* Fix too small instrument tabs

Previously, they had been resized by the fixed size parent tab widget. We need
to do this manually now.

* Fix Blackman-Harris window formula (LMMS#4895)

Adds missing parentheses

* Automation Editor: Don't accept drag events when there's no pattern

Fixes LMMS#4857

* TCO drag: Fix Ctrl+Drag crash

Fix some assumptions that source and target of a drag actions are the same
track container. Instead of looking up necessary information (track name,
type and container id) by track index, add it to the metadata.
Refactor canPasteSelection to take QDropEvent instead of the drop event's
QMimeData. Coincidentally, this fixes the method to be consistent with its
documentation.

Fixes LMMS#4844

* Bump zyn submodule
Per LMMS#4642

* Allow new Zyn bank creation on Linux (LMMS#4905)

Allow new Zyn bank creation on Linux
Closes LMMS#4642

* Fix empty editors after closing them and creating a new project (LMMS#4891)

* Remove useless include

* Fix invalid display names

* Travis: use carla instead of carla-git

Due to some breaking changes in the development branch of Carla,
we can't use the package right now.
Fortunately, the carla package now points to 2.0 series. So we will use it.

See also: https://kx.studio/News/?action=view&url=changes-in-kxstudio-repos-regarding-carla-and-jack2

* Travis: fix shellcheck warnings for the Debian sid script

* Remove some Qt4 compatibility code

* SetupDialog: fix file dialog not opening for theme directory 

It was caused by a typo affecting a signal-slot connection.

* Fix instrument window tab sizes

- Fix the instrument window tabs minimum width and height formulae
- Also set minimum height and width for instrument tab

* PluginBrowser: Tree layout and search bar

* [Equalizer] Bright analyzer colors, opacity increased (LMMS#4772)

* [Equalizer] Bright analyzer colors, opacity incr

Brightened spectrum analyzer colors and increased opacity a tad to make more visible

* Fixed RGB Value

* Update EqControlsDialog.cpp

* Fixed color change

* Changed colors again

* Fixed colors, now brighter and bluer

* Ok, its actually bright now lol

* Replace Monstro icons

* Shrink ComboBox arrow section slightly

This is being done for two reasons:

1. The new Monstro icons (and the icons for Microwave when it's finished) are too large.
2. All ComboBoxes (subjectively) look much nicer this way.

* Don't try to connect to nonexistent controllers (LMMS#4939)

Fixes crash on loading presets with controllers.

* Allow sample track TCOs to resize smaller than one bar (LMMS#4933)

Other changes:
* Update TCO position more exact when a drag leaves a TCO and enters `TrackContentWidget` (required to detect that the cursor has really moved when leaving a TCO with length < 1 to the right)
* Use exact length when samples are loaded, don't round it up
* Reset size when reloading same file

* Use local cursor for TrackContentObjectView (LMMS#4918)

Fixes crash on cloning patterns on Qt >= 5.12.

* Add PluginIssue class (LMMS#4901)

* Move macro definition out of class

* Fix -1 offset in plugin tab

In the instrument plugin tab, there was an orange stripe for
TripleOscillator. This was because internally, TabWidget moves up the
widget by 1 (TabWidget.cpp, line 89).

The size of the whole window is:

```
widget->height() + m_tabbarHeight - 1
```

So this code adds an offset of "-1" to the necessary computations.

* Fix bad identation in old code

* Coding conventions

* FileBrowser: Backup expanded directories and restore that state when the tree is reloaded.

* Allow build for Wayland w/o X11Extras, if VST off

@lukas-w reminds in 134dae8 comments that X11Extras help Linux users of
VST effects LMMS#3786. Now LMMS builds and runs on Weston without X11
dependencies, though only if WANT_VST is off.

* Document Effect::checkGate

* Document graph widget

* Update wiki submodule

* Fix wiki submodule

* Fix notes getting stuck under high CPU conditions (LMMS#4908)

* Record chords (LMMS#4938)

* Added check for chord to notes recorded from keyboard

* Make more connections direct for automation (LMMS#4942)

* Improve dcast

* document `dcast`
* make `dcast` not only cast exact, but also upwards
* add `dcast` test
* rename `dcast` -> `dynamicCast`

* AutomatableModelTest: Improve tests

Check whether returned pointers from the cast are equal to the original
pointers, rather than just checking wether they are not `nullptr`.

* Fix CI on windows

* Code style + Extend for TempoSyncKnob

* Travis: fix a debootstrap error from missing keyrings

Uses 18.04's debian-archive-keyring to fix the missing keyrings.

* Don't draw note detuning info over the volume/panning area (LMMS#4965)

* Show/Focus BBEditor on TrackLabelButton click LMMS#4946 (LMMS#4959)

It will be shown even if the parent is hidden.

* Use extracted linuxdeployqt directly

As of probonopd/linuxdeployqt#370,
the AppRun of linuxdeployqt unsets LD_LIBRARY_PATH.
This behavior isn't suitable for our cases, so we use
the extracted binary directly as a workaround.

* Fix invisible note editing handles when a note has detuning info

Fixes a regression in 32df2d7,
the clipping area was restored in a wrong place.
Also, a wrong value was used while restoring.

* Fix the wrong merge

* fix hanging mouse in piano roll (LMMS#4822) (LMMS#4960)

* fix hanging mouse in piano roll (LMMS#4822)

* fix hanging mouse in automation & pianoroll (LMMS#4822);

* fix hanging mouse in automation & pianoroll (LMMS#4822)

removed TODO comment that I forgot in the code

* Fix race conditions in NotePlayHandleManager (LMMS#4966)

NotePlayHandleManager::acquire uses a read lock unless the pool is empty.
If two threads try to acquire NotePlayHandle simultaneously
when the value of s_availableIndex is 1, one thread will try to read s_available[-1].
If the acquire action and the release action are done at the same time,
NotePlayHandleManager::acquire may try to read data
before NotePlayHandleManager::release actually writes.

This commit prevents them by always using the write lock when acquiring a NotePlayHandle.

* Nescaline and Freeboy - Better default sound (LMMS#4968)

* Fix controller loading error on loading projects

Fixes a regression in 91f9f1a,
which added the range check into the wrong if statement.

* Extend ProjectJournal docs, thx to @DomClark

* Fixes LMMS#4781: Don't disconnect LADSPA automation on export

* playing/recording pianoRoll's chord notes (LMMS#4963)

* SampleTrack: call requestChangesInModel before unref SampleBuffer (LMMS#4982)

To avoid a race condition between the gui thread which destroys the
samplebuffer and the mixer thread which increases the buffer's ref-
count, we'll make sure to touch the ref-count only when wh're synced
with the mixer.

* Making clearer the hierarchy. (LMMS#4967)

Add `override` keyword

* i18n: update translations from Transifex

* Bugfix - SampleTrack -> Load & Save: Fix recorded sample track not being
played correctly after saving and loading a project due to sample rate
not getting saved in the project file.

* Bugfix - SampleTrack -> Play: Fix sample track not being played in the
right place when it not played from the begining.

That has created a difference between the ticks and the metronome and
the sample track.

The cause of the problem was that the calculation of the frame to play
was wrong: we had calculated `framesPerTick` according to the current
engine's sample rate instead of the SampleBuffer's sample rate.

* SampleBuffer -> Use processingSampleRate.

SampleBuffer was using baseSampleRate as the default samplerate instead of the actual processingSampleRate.

* i18n: update template strings

* Travis: fix macOS build due to the old default version of Node.js

appdmg recently dropped support for Node.js < 8.5

* MP3 export: initialize ID3 tag with id3tag_init

Fixes wrongly set 'Blues' genre(ID 0) in exported mp3 files.

* updated splash (LMMS#5002)

* Fixes LMMS#4996: Fix metadata when exporting multiple tracks (LMMS#5005)

Co-Authored-By: Hyunjin Song <tteu.ingog@gmail.com>

* Fix German translation

* Fix "Export Tracks"
* Add "Export MIDI"

[ci skip]

* DMG rebranding (LMMS#5013)

Rebrand macOS DMG background
- Design and artwork courtesy @RebeccaDeField
- Closes LMMS#4289

* fix color profile error (LMMS#5019)

* Bump version to 1.2.0

* Add a save option to discard MIDI connections (LMMS#5021)

* Song: add isSavingProject.
* VersionedSaveDialog: Add support for a custom option dialog.
* AutomatableModel: Support the discardMIDIConnections save option.
* InstrumentTrack: Support the discardMIDIConnections save option.
* SaveOptions: Show the save option dialog on "save as".

* Enable dark title bar on macOS
Closes LMMS#5031

* Travis: drop unneeded prefix setting for npm

* Fix macOS builds

* Increase Mixer fader falloff speed

This also fixes a display bug that is present with large fader falloff speeds.

*  Replace tLimit() with qBound() and remove templates.h (LMMS#5040)

* Replace tLimit() with qBound()

* Remove templates.h

* Add .editorconfig

This file tells the github online editor to use tabs of width 4 instead
of 8. Open
[this](https://github.com/JohannesLorenz/github_test/blob/master/test.cpp)
test file in your browser to see how it works (the width is 5 in the
example).

Actually, it also tells many other editors...

* FadeButtons now remain partially lit as a note plays out (LMMS#4969)

* MDI Subwindow Decoration for VeSTige instruments closes LMMS#2824 (LMMS#2826)

* MDI Subwindow Decoration for VeSTige instruments closes LMMS#2824

* revert changes

* change QMdiSubWindow to our SubWindow in Vestige

* Drop sample on sampletracks (LMMS#5043)

* implements drag and drop samples to sampletracks

* clean up / take care of timeLineWidget heigth in songeditor

* unused memeber removed

* clean up

* Update include/TrackContainerView.h

Co-Authored-By: Spekular <Spekular@users.noreply.github.com>

* Update src/gui/TrackContainerView.cpp

Co-Authored-By: Spekular <Spekular@users.noreply.github.com>

* Update src/gui/TrackContainerView.cpp

Co-Authored-By: Spekular <Spekular@users.noreply.github.com>

* Update src/gui/editors/SongEditor.cpp

Co-Authored-By: Spekular <Spekular@users.noreply.github.com>

* load AFP if we don't drop on a sample track

* take care of timeLineWidget size changes

* clean up

* consolidate some code

* requested changes by code review

* move logic to SampleTrackView

* clean up

* clean up

* clean up

* Closes LMMS#5050: Add Mixer threading comments (LMMS#5069)

[ci skip]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants