Allow WidgetTab to use artwork tabs #2599

StCyr · 2016-02-22T13:57:23Z

This PR relates to #2528

Br,

Cyrille

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.

tresf · 2016-02-22T14:04:46Z

PR looks great. We'll merge this once discussion over at #2528 is done.

StCyr · 2016-02-22T14:23:03Z

Damned, thought I had fixed this problem

StCyr · 2016-02-22T14:33:01Z

'Compiles without hicups here; Your build env is most probably more strict than mine.

There's most probably a problem there, bu I can't see it: The error is related with pointers and it's been a long time that I didn't write in C

tresf · 2016-02-22T14:54:36Z

The only Travis check failing is QT5 with the following error... Qt4 on all other platforms is succeeding.

[ 99%] Building CXX object src/CMakeFiles/lmmsobjs.dir/gui/widgets/TextFloat.cpp.o
/home/travis/build/LMMS/lmms/src/gui/widgets/TabWidget.cpp: In member function ‘virtual void TabWidget::mousePressEvent(QMouseEvent*)’:
/home/travis/build/LMMS/lmms/src/gui/widgets/TabWidget.cpp:177:37: error: taking address of temporary [-fpermissive]
make[2]: *** [src/CMakeFiles/lmmsobjs.dir/gui/widgets/TabWidget.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [src/CMakeFiles/lmmsobjs.dir/all] Error 2
make: *** [all] Error 2

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

…o, I've reverted the changes I made in commit 64efd68 (issue 2519).

…es gdb crash with SIGFPE.

Umcaruje · 2016-04-26T21:10:36Z

src/gui/widgets/TabWidget.cpp

@@ -61,21 +66,31 @@ TabWidget::~TabWidget()



-void TabWidget::addTab( QWidget * _w, const QString & _name, int _idx )
+void TabWidget::addTab( QWidget * _w, const QString & _name, const QString & _tooltip, const char *activePixmap, const char *inactivePixmap, int _idx )


Function parameters are not prefixed with an underscore anymore, that's an old coding convention, so please change _tooltip to tooltip etc.

fixed in commit 37d9d36

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

…flat design. Cyrille

StCyr · 2016-04-27T14:33:29Z

Here's a mockup with a first attempt to flatten the TabWidget:

Umcaruje · 2016-04-27T17:53:07Z

This looks good.

Two remarks: the Filter background should be flattened too, so its all consistent now.

Could you please increase the Icon TabWidget height by 2 pixels? So the icons have 2 pixels of top and bottom padding. I think that would make it more pleasing for the eyes.

RebeccaDeField · 2016-05-20T17:09:41Z

Thanks for all of the hard work @StCyr! I do agree that removing the transparency does not give the icons enough blending to look right.

Does the background change when you hover? That might be enough interaction for the user.

tresf · 2016-07-05T15:47:24Z

src/gui/widgets/TabWidget.cpp


+	setAutoFillBackground( true );
+        QColor bg_color = QApplication::palette().color( QPalette::Active,


Some formatting here that should be fixed (tabs versus spaces).

tresf · 2016-07-05T15:53:14Z

@StCyr if you have time to fix this up we can get it into the RC2 release. There are some considerations in both code and implementation in the comments. Once they're addressed, we'll merge.

StCyr · 2016-07-15T09:59:42Z

Hi @tresf

I've adapted my code to respect you coding conventions; I believe it is ok now.

Do you see something else to do?

Please note that I'll be away for 2 weeks in Augustus.

tresf · 2016-07-19T20:43:58Z

data/locale/fr.ts

    </message>
    <message>
        <source>FX</source>
-        <translatorcomment>&quot;EFFETS&quot; (previous translation) is too long for the limited available width. &quot;FX&quot; should be understable by all</translatorcomment>
-        <translation>FX</translation>
+        <translation>EFFETS</translation>
    </message>
    <message>
        <source>MIDI</source>


@liushuyu will this commit cause problems with the translation service you're managing?

… standards.

Umcaruje · 2016-07-29T17:37:22Z

src/gui/widgets/TabWidget.cpp

 		p.drawText( 5, 11, m_caption );
 	}

-	// Calculate the tabs' x (tabs are painted next to the caption)
-	int tab_x_offset = m_caption.isEmpty() ? 4 : 14 + fontMetrics().width( m_caption );
+        // Calculate the tabs' x (tabs are painted next to the caption)


Tabs vs spaces issue here

… standards.

Umcaruje · 2016-08-18T23:25:29Z

src/gui/widgets/GroupBox.cpp

@@ -99,35 +99,18 @@ void GroupBox::updatePixmap()
 	QColor bg_color = QApplication::palette().color( QPalette::Active,


Could you please make this background color themeable too? p.background(); should do the trick again.

Then, I guess I'll also have to make the outer rectangle's color themeable also?

Or, would "p.background().color().darker( 150 )" sufficient?

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.

liushuyu · 2016-11-29T21:04:17Z

Sorry for late to the party

should we be translating twice? @liushuyu does this put unnecessary duplicates in our translation files or will this be consolidated?

No, since it is in the same context, I don't think it will be translated twice. Even this is the case, our translation hosting platform, Transifex, will handle that as well.

What I suggest here is to add translation comments or hints about the strings/context to inform the translators who are less familiar with coding. The comments (hints) can be added either using special code comments like //: (standard C++ style comments follow by a colon) or editing the translation template (in our case, that's our en.ts language file).

Umcaruje · 2016-12-03T20:42:32Z

@StCyr are you still available to work on this issue?

StCyr · 2016-12-04T14:46:07Z

Hi @Umcaruje

Yes, I can still spend a few hours on this issue... But, I must say I'm completly lost in regard with what's still expected from me :-(

Umcaruje · 2016-12-16T19:19:15Z

@StCyr well, what I would first highly suggest is to actually rebase this pull request, as we have a new theme now. Plus we should work together to pick a look that fits on the new theme. @RebeccaDeField could probably help us on this regard.

Also you should adress this: https://github.com/LMMS/lmms/pull/2599/files#r75424006

And also, from what I saw, only one set of icons is used atm, so that could get cleaned up.

P.S. Sorry for the late responce, I've started college, so I've been kept pretty busy :)

Umcaruje · 2017-03-26T17:45:22Z

Well, this PR has officially gone stale

Umcaruje · 2017-04-29T22:55:16Z

If I have time, I might revive this Pull Request

Umcaruje · 2017-05-21T14:19:46Z

Ok so I can't push to this branch, guess I'll need to make a new Pull request.

Umcaruje · 2017-05-21T15:00:43Z

Superseded by #3569

Cyrille Bollu and others added 9 commits February 12, 2016 15:58

Second version of artwork tabs for the InstrumentTrackWindow.

7153709

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.

d996400

1st PoC for autosizeable artwork tabs.

f071393

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

312764b

Added tooltip support for the TabWidget class.

7ad9e32

Atm, tooltips are simply tabs' name.

Imported artworks from RebeccaDeField

3f72119

Reverted to 12px tall TabWidget

466bb90

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

921c55e

…e caption 'space.

tresf mentioned this pull request Feb 24, 2016

instrument window's width is too small #2528

Closed

Cyrille Bollu and others added 6 commits February 25, 2016 15:34

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

857b6ed

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

3f09440

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

With artwork tabs, the length of tab's name is not limited anymore. S…

fc15755

…o, I've reverted the changes I made in commit 64efd68 (issue 2519).

Fine tuning the positioning of highlighted artwork tabs.

7aad86e

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

d9edef3

…es gdb crash with SIGFPE.

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

dccf9f4

Umcaruje reviewed Apr 26, 2016
View reviewed changes

Cyrille Bollu added 2 commits April 27, 2016 16:11

Removed underscore prefix for function parameters as coding conventio…

37d9d36

…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 …

1f0d846

…flat design. Cyrille

tresf reviewed Jul 5, 2016
View reviewed changes

Adapted format to follow LMMS coding conventions

4217da7

tresf reviewed Jul 19, 2016
View reviewed changes

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

0fed0b5

… standards.

Umcaruje reviewed Jul 29, 2016
View reviewed changes

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

097124f

… standards.

Umcaruje reviewed Aug 18, 2016
View reviewed changes

tresf mentioned this pull request Aug 29, 2016

Redesign Flanger #3007

Merged

Cyrille Bollu added 2 commits September 5, 2016 15:06

Revert "TabWidget: Made the artworks' color themeable"

355698a

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

08e9744

Umcaruje changed the base branch from master to stable-1.2 April 29, 2017 22:54

Umcaruje mentioned this pull request May 21, 2017

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

Merged

Umcaruje closed this May 21, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow WidgetTab to use artwork tabs #2599

Allow WidgetTab to use artwork tabs #2599

StCyr commented Feb 22, 2016

tresf commented Feb 22, 2016

StCyr commented Feb 22, 2016

StCyr commented Feb 22, 2016

tresf commented Feb 22, 2016

Umcaruje Apr 26, 2016

StCyr Apr 27, 2016 •

edited

Loading

StCyr commented Apr 27, 2016

Umcaruje commented Apr 27, 2016

RebeccaDeField commented May 20, 2016

tresf Jul 5, 2016

tresf commented Jul 5, 2016

StCyr commented Jul 15, 2016

tresf Jul 19, 2016

Umcaruje Jul 29, 2016

Umcaruje Aug 18, 2016

StCyr Sep 5, 2016

liushuyu commented Nov 29, 2016

Umcaruje commented Dec 3, 2016

StCyr commented Dec 4, 2016

Umcaruje commented Dec 16, 2016 •

edited

Loading

Umcaruje commented Mar 26, 2017

Umcaruje commented Apr 29, 2017

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

		@@ -61,21 +66,31 @@ TabWidget::~TabWidget()



		void TabWidget::addTab( QWidget * _w, const QString & _name, int _idx )
		void TabWidget::addTab( QWidget * _w, const QString & _name, const QString & _tooltip, const char activePixmap, const char inactivePixmap, int _idx )


		setAutoFillBackground( true );
		QColor bg_color = QApplication::palette().color( QPalette::Active,

		@@ -99,35 +99,18 @@ void GroupBox::updatePixmap()
		QColor bg_color = QApplication::palette().color( QPalette::Active,

Allow WidgetTab to use artwork tabs #2599

Allow WidgetTab to use artwork tabs #2599

Conversation

StCyr commented Feb 22, 2016

tresf commented Feb 22, 2016

StCyr commented Feb 22, 2016

StCyr commented Feb 22, 2016

tresf commented Feb 22, 2016

Umcaruje Apr 26, 2016

Choose a reason for hiding this comment

StCyr Apr 27, 2016 • edited Loading

Choose a reason for hiding this comment

StCyr commented Apr 27, 2016

Umcaruje commented Apr 27, 2016

RebeccaDeField commented May 20, 2016

tresf Jul 5, 2016

Choose a reason for hiding this comment

tresf commented Jul 5, 2016

StCyr commented Jul 15, 2016

tresf Jul 19, 2016

Choose a reason for hiding this comment

Umcaruje Jul 29, 2016

Choose a reason for hiding this comment

Umcaruje Aug 18, 2016

Choose a reason for hiding this comment

StCyr Sep 5, 2016

Choose a reason for hiding this comment

liushuyu commented Nov 29, 2016

Umcaruje commented Dec 3, 2016

StCyr commented Dec 4, 2016

Umcaruje commented Dec 16, 2016 • edited Loading

Umcaruje commented Mar 26, 2017

Umcaruje commented Apr 29, 2017

Umcaruje commented May 21, 2017

Umcaruje commented May 21, 2017

StCyr Apr 27, 2016 •

edited

Loading

Umcaruje commented Dec 16, 2016 •

edited

Loading