Allow WidgetTab to use artwork tabs (@StCyr) #3569

Umcaruje · 2017-05-21T14:31:30Z

This is an effort to bring #2599 to a closure. The original PR went stale, and most of the work has been done, so it'd be a shame for it to never get implmeneted, as I think it's a nifty feature.

I rebased the original commits to stable-1.2 and will address the remaining issues. I couldn't push to @StCyr's branch cause I don't have access and github didn't have the feature to allow edits form mantainers at the time of that PR.

Here's how it looks now:

I'll be changing the colors shortly. @RebeccaLaVie input appreciated.

This version can only display & manage artwork tabs, which breaks the InstrumentSoundShapingView as it still uses text tabs. I'm planing to improve this implementation to let these artwork tabs fall back to text mode when no artwork is given. This would solve the problem of the InstrumentSoundShapingView.

This version will draw an artwork tab when the TabWidget::addTab function is given a pixmapName. Otherwise, when pixmapName is NULL, it will fall back drawing a text tab.

Atm, tooltips are simply tabs' name.

…e caption 'space.

…ey can now show more meaningfull information then simply the tab's name. 2) Fixed the compilation problem with QT5

…es gdb crash with SIGFPE.

…n has changed. (Request at https://github.com/LMMS/lmms/pull/2599/files/dccf9f411996c8c866ff1086b65f15020ef08cd9#r61165005) Cyrille

…flat design. Cyrille

The InstrumentTrackWindow's height has been increased by the same amount. Cyrille

…ened design. Cyrille

Cyrille

+ some code cleaning in TabWidgets

…hlighted

… standards.

This reverts commit 5b162c0. Conflicts: src/gui/widgets/TabWidget.cpp Reason: Artwork's color themeability had the side-effect that it removed the artworks' alpha channel, thus making them ugly.

Umcaruje · 2017-05-21T15:42:34Z

Adressed @tresf and @jasp00 's comments from the original PR. The name is used as a tooltip without a seperate variable. The names are as follows:

Plugin
Envelope, filter & LFO
Chord stacking & arpeggio
Effects
MIDI settings
Miscellaneous

Umcaruje · 2017-05-21T21:35:37Z

After a session with the community on discord, this is how the tabs look now:

There are some spacing issues that I'd like to address tomorrow.

Umcaruje · 2017-05-21T21:40:22Z

src/gui/widgets/TabWidget.cpp

+			( *it ).nwidth = tab_width;
+
+			// Get artwork
+      QPixmap artwork( embed::getIconPixmap( ( *it ).pixmap ) );


note to self: whitespace here

qnebra · 2017-05-27T22:28:22Z

Tested and works nicely, not causing errors on usage.

Umcaruje · 2017-05-30T15:02:35Z

@LMMS/developers anyone want to review the code on this? Would be appreciated

tresf · 2017-05-30T15:43:28Z

include/TabWidget.h

-		QString name;	// name for widget
-		int nwidth;	// width of name when painting
+		QWidget       * w;	   	// ptr to widget
+		const char    *pixmap; 	// artwork for the widget


Comment can be formatted like the others. :)

tresf · 2017-05-30T15:49:48Z

@Umcaruje this looks pretty good. I haven't reviewed it for any syntax errors, but the change appears to be quite minor and straightforward despite the number of files.

The major change I see is the draw code has moved from resize event to paint event which may have slight performance implications, but the draw routines are greatly simplified as well. Unfortunately I don't have the experience with updating paint routines to know where they should go from a design perspective.

Umcaruje · 2017-05-30T15:58:50Z

The major change I see is the draw code has moved from resize event to paint event which may have slight performance implications, but the draw routines are greatly simplified as well. Unfortunately I don't have the experience with updating paint routines to know where they should go from a design perspective.

Well those were @StCyr's changes, and it makes sense to me to draw in the paint event. Anyways I didn't notice any performance impacts and neither did @qnebra from what I've gathered.

This looks ready to merge then. Will fix the comment formatting.

Umcaruje · 2017-05-30T16:40:16Z

Here's the final look of the icons, realised I didn't post a screenshot before

Umcaruje · 2017-05-30T16:43:01Z

I'll leave this sitting for 24 hours, and merge after that.

tresf · 2017-05-30T16:47:56Z

it makes sense to me to draw in the paint event.

This is the part I'm a bit confused about as it was working before and only being triggered on construction or resize.

But the way he made it is more consistent with how we do it today in other classes, so it's only an observation.

To that point, calling update() on construction seems quite redundant, no? It made sense before when the constructor wasn't using paintEvent, but now that it is it should be called naturally as part of the widget constructor. It's not harmful update() can be called just about anywhere, but I think it's redundant. If you look at other classes (e.g. Fader, PixmapButton that override paintEvent(), they do not call update() in the constructor)

Umcaruje · 2017-05-30T16:55:04Z

It's not harmful update() can be called just about anywhere, but I think it's redundant.

I agree, will look into removing it.

Umcaruje · 2017-05-31T11:34:55Z

@tresf done.

* First version of artwork tabs for the InstrumentTrackWindow. This version can only display & manage artwork tabs, which breaks the InstrumentSoundShapingView as it still uses text tabs. I'm planing to improve this implementation to let these artwork tabs fall back to text mode when no artwork is given. This would solve the problem of the InstrumentSoundShapingView. * Second version of artwork tabs for the InstrumentTrackWindow. This version will draw an artwork tab when the TabWidget::addTab function is given a pixmapName. Otherwise, when pixmapName is NULL, it will fall back drawing a text tab. * Created artwork for the artwork tabs. * 1st PoC for autosizeable artwork tabs. * TabWidget is 20 pixels tall when it's going to display artwork tabs. * Added tooltip support for the TabWidget class. Atm, tooltips are simply tabs' name. * Imported artworks from RebeccaDeField * Reverted to 12px tall TabWidget * Fine tuning for the positioning of artwork tabs: Take into account the caption 'space. * New artwork for the ENV/LFO tab (has now an ADSR-based look) * 1) Tabs in TabWidget class have now a "tooltip" attribute. So that they can now show more meaningfull information then simply the tab's name. 2) Fixed the compilation problem with QT5 * Fine tuning the positioning of highlighted artwork tabs. * Fixed an issue in TabWidget's artwork tabs autosize function that makes gdb crash with SIGFPE. * TabWidget is 17 pixels tall when it's going to display artwork tabs. * Removed underscore prefix for function parameters as coding convention has changed. (Request at https://github.com/LMMS/lmms/pull/2599/files/dccf9f411996c8c866ff1086b65f15020ef08cd9#r61165005) Cyrille * Removed background gradient for TabWidget as LMMS is going to a more flat design. Cyrille * Increased the graphical TabWidget's height by 2 pixels for eye-candy. The InstrumentTrackWindow's height has been increased by the same amount. Cyrille * Removed gradient in GrouBox widgets as LMMS is going for a more flattened design. Cyrille * Made the background of TabWidget themeable Cyrille * The highlighting color for a TabWidget'selected tab is now themeable. * Made TabWidget's Title text and tab text themeable. * Added a darker background to the TabWidget's tab bar. * Further flatened the design of TabWidget * Flatened the design of the GroupBox widget * Fine tuning the placement of TabWidgets' highlighting background + some code cleaning in TabWidgets * Made the TabWidget's title background and borders themeable * TabWidget - Artwork tabs: Do not change the icon color when it is highlighted * TabWidget: Made the artworks' color themeable * Adapted format to follow LMMS coding conventions * Some more blank spaces to tabs translation to comply with LMMS coding standards. * Some more blank spaces to tabs translation to comply with LMMS coding standards. * Revert "TabWidget: Made the artworks' color themeable" This reverts commit 5b162c0. Conflicts: src/gui/widgets/TabWidget.cpp Reason: Artwork's color themeability had the side-effect that it removed the artworks' alpha channel, thus making them ugly. * Made GroupBox's background color themeable * Update background color, only use one set of images * Use name as tooltip, more descriptive names * Update icons and colors * more things * formatting fixes * Remove update() from constructor

Cyrille Bollu and others added 30 commits May 21, 2017 16:08

Second version of artwork tabs for the InstrumentTrackWindow.

91872f1

This version will draw an artwork tab when the TabWidget::addTab function is given a pixmapName. Otherwise, when pixmapName is NULL, it will fall back drawing a text tab.

Created artwork for the artwork tabs.

e2e8369

1st PoC for autosizeable artwork tabs.

5dcc169

TabWidget is 20 pixels tall when it's going to display artwork tabs.

46f1ef7

Added tooltip support for the TabWidget class.

f91c3a7

Atm, tooltips are simply tabs' name.

Imported artworks from RebeccaDeField

8790021

Reverted to 12px tall TabWidget

ccc1c55

Fine tuning for the positioning of artwork tabs: Take into account th…

a280816

…e caption 'space.

New artwork for the ENV/LFO tab (has now an ADSR-based look)

21a1dfd

1) Tabs in TabWidget class have now a "tooltip" attribute. So that th…

2b1923b

…ey can now show more meaningfull information then simply the tab's name. 2) Fixed the compilation problem with QT5

Fine tuning the positioning of highlighted artwork tabs.

9e1de4d

Fixed an issue in TabWidget's artwork tabs autosize function that mak…

71761f2

…es gdb crash with SIGFPE.

TabWidget is 17 pixels tall when it's going to display artwork tabs.

e309f22

Removed underscore prefix for function parameters as coding conventio…

a9de81d

…n has changed. (Request at https://github.com/LMMS/lmms/pull/2599/files/dccf9f411996c8c866ff1086b65f15020ef08cd9#r61165005) Cyrille

Removed background gradient for TabWidget as LMMS is going to a more …

81a3fe0

…flat design. Cyrille

Increased the graphical TabWidget's height by 2 pixels for eye-candy.

483f03f

The InstrumentTrackWindow's height has been increased by the same amount. Cyrille

Removed gradient in GrouBox widgets as LMMS is going for a more flatt…

b4e2a4b

…ened design. Cyrille

Made the background of TabWidget themeable

c52033c

Cyrille

The highlighting color for a TabWidget'selected tab is now themeable.

2651622

Made TabWidget's Title text and tab text themeable.

fd9e38b

Added a darker background to the TabWidget's tab bar.

eb97167

Further flatened the design of TabWidget

ad795d0

Flatened the design of the GroupBox widget

757d4c0

Fine tuning the placement of TabWidgets' highlighting background

ef392b2

+ some code cleaning in TabWidgets

Made the TabWidget's title background and borders themeable

70c8eda

TabWidget - Artwork tabs: Do not change the icon color when it is hig…

ab66556

…hlighted

TabWidget: Made the artworks' color themeable

9f4df3f

Adapted format to follow LMMS coding conventions

b16a087

Some more blank spaces to tabs translation to comply with LMMS coding…

b75c89d

… standards.

Cyrille Bollu added 2 commits May 21, 2017 16:11

Revert "TabWidget: Made the artworks' color themeable"

d280afa

This reverts commit 5b162c0. Conflicts: src/gui/widgets/TabWidget.cpp Reason: Artwork's color themeability had the side-effect that it removed the artworks' alpha channel, thus making them ugly.

Made GroupBox's background color themeable

9b34722

Umcaruje added this to the 1.2.0 milestone May 21, 2017

Umcaruje mentioned this pull request May 21, 2017

Allow WidgetTab to use artwork tabs #2599

Closed

Umcaruje added 2 commits May 21, 2017 17:05

Update background color, only use one set of images

f9f60d4

Use name as tooltip, more descriptive names

217a39b

Update icons and colors

cbf14df

Umcaruje commented May 21, 2017

View reviewed changes

more things

b3b2586

tresf reviewed May 30, 2017

View reviewed changes

formatting fixes

6aa15a4

Remove update() from constructor

8706d52

Umcaruje merged commit 53772c0 into LMMS:stable-1.2 May 31, 2017

Umcaruje mentioned this pull request May 31, 2017

instrument window's width is too small #2528

Closed

zonkmachine mentioned this pull request Jun 21, 2017

Text missing on the envelope tabs with Classic theme. #3652

Closed

zonkmachine mentioned this pull request Nov 29, 2020

Adds support for MIDI CC events inside LMMS #5581

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow WidgetTab to use artwork tabs (@StCyr) #3569

Allow WidgetTab to use artwork tabs (@StCyr) #3569

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

Umcaruje May 21, 2017

qnebra commented May 27, 2017

Umcaruje commented May 30, 2017

tresf May 30, 2017

tresf commented May 30, 2017

Umcaruje commented May 30, 2017

Umcaruje commented May 30, 2017

Umcaruje commented May 30, 2017

tresf commented May 30, 2017 •

edited

Loading

Umcaruje commented May 30, 2017

Umcaruje commented May 31, 2017

Allow WidgetTab to use artwork tabs (@StCyr) #3569

Allow WidgetTab to use artwork tabs (@StCyr) #3569

Conversation

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

Umcaruje May 21, 2017

Choose a reason for hiding this comment

qnebra commented May 27, 2017

Umcaruje commented May 30, 2017

tresf May 30, 2017

Choose a reason for hiding this comment

tresf commented May 30, 2017

Umcaruje commented May 30, 2017

Umcaruje commented May 30, 2017

Umcaruje commented May 30, 2017

tresf commented May 30, 2017 • edited Loading

Umcaruje commented May 30, 2017

Umcaruje commented May 31, 2017

tresf commented May 30, 2017 •

edited

Loading