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.

Sign up for GitHub

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

Jump to bottom

Deere skin: Add most missing tooltips in attempt to fix https://bugs.… #1500

Merged
merged 21 commits into from
Feb 25, 2018
Merged

Deere skin: Add most missing tooltips in attempt to fix https://bugs.… #1500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9d9a5bf
Deere skin: Add most missing tooltips in attempt to fix https://bugs.…
esbrandt Jan 27, 2018
f384f81
Merge remote-tracking branch 'upstream/2.1' into 2.1
esbrandt Feb 18, 2018
99510f4
Remove static images for Hotcues 1-4. They made sense when we had fix…
esbrandt Feb 18, 2018
30aa6bd
Deere: Replace controversial Hamburger icon with a gear icon (as alre…
esbrandt Feb 18, 2018
38c6462
Deere: Re-add option to load/save sampler banks to Skin settings > Sa…
esbrandt Feb 18, 2018
e9da243
Add tooltips for Sampler Bank controls. Use them in Tango and Deere
esbrandt Feb 20, 2018
d119889
Deere: Remove ``CUE`` button from samplers controls row. This was exc…
esbrandt Feb 20, 2018
cddabf1
Deere: Do not tread Hotcues 1-4 different than the rest. Previously, …
esbrandt Feb 20, 2018
b3c49b4
Deere: Remove infinite <MaximumSize> key in decks waveform overview …
esbrandt Feb 20, 2018
3ce7e68
Merge remote-tracking branch 'upstream/2.1' into 2.1
esbrandt Feb 20, 2018
cc7d8ae
Merge remote-tracking branch 'upstream/2.1' into 2.1
esbrandt Feb 21, 2018
9f10e47
Skins: Fix hard to read link color in CRATE and PLAYLIST pages of the…
esbrandt Feb 21, 2018
4e53e11
Revert "Skins: Fix hard to read link color in CRATE and PLAYLIST page…
esbrandt Feb 23, 2018
303fe94
Skins: Fix hard to read link color in CRATE and PLAYLIST pages of the…
esbrandt Feb 23, 2018
7f3b1d3
Removed waste text formatting using table cells in CRATE and PLAYLIST…
esbrandt Feb 23, 2018
cde2bdf
Removed waste text formatting using table cells in COMPUTER (BROWSE) …
esbrandt Feb 23, 2018
8073569
Tango: Add TooltipID for skin settings buttons in top bar, and skin s…
esbrandt Feb 23, 2018
9381ad9
Deere: Fix CUE point being invisible on main waveform, was accidental…
esbrandt Feb 23, 2018
3197e06
Add line break in 3rd paragraph of the long explanatory text in PLAYL…
esbrandt Feb 25, 2018
8f52fdf
Merge remote-tracking branch 'upstream/2.1' into 2.1
esbrandt Feb 25, 2018
2d06a30
Skins: Based on feedback, make hard to read link color in CRATE and P…
esbrandt Feb 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/library/crate/cratefeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ QString CrateFeature::formatRootViewHtml() const {
html.append("<img src=\"qrc:/images/library/crates_art.png\">");
html.append("</td></tr>");
html.append(QString("<tr><td><a href=\"create\">%1</a>")
//Colorize links in lighter blue, instead of QT default dark blue.
//Links are still different from regular text, but readable on dark/light backgrounds.
//https://bugs.launchpad.net/mixxx/+bug/1744816
html.append(QString("<a style=\"color:#0850D0;\" href=\"create\">%1</a>")
.arg(createCrateLink));
html.append("</td></tr></table>");
return html;
Expand Down
4 changes: 4 additions & 0 deletions src/library/playlistfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ QString PlaylistFeature::getRootViewHtml() const {
playlistsSummary4));
html.append("</td></tr>");
html.append(QString("<tr><td><a href=\"create\">%1</a>")
Copy link
Member

@ronso0 ronso0 Feb 22, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line is obsolete, isn't it? <tr><td> go to next line then
build fails due to missing ) and ;

//Colorize links in lighter blue, instead of QT default dark blue.
//Links are still different from regular text, but readable on dark/light backgrounds.
//https://bugs.launchpad.net/mixxx/+bug/1744816
html.append(QString("<a style=\"color:#0850D0;\" href=\"create\">%1</a>")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it works and looks like desired if the line is

html.append(QString("<tr><td><a style=\"color:#0850D0;\" href=\"create\">%1</a>")
                    .arg(createPlaylistLink));

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed with 83b515e

Copy link
Contributor Author

@esbrandt esbrandt Feb 22, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed with 83b515e

What is going on here, to which branch went this, and the other commits?
I can´t find them..

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry for being unclear. I made those commits to my fork of your 2.1 branch deere-crate-link-fix-fixed which you could just merge into yours. It contains:

  • create crate/playlist: fix html link
  • make skin settings icon a bit smaller
  • settings icon: remove SVG attributes 'width' and 'height' so it resized properly in the skin
  • use skin settings tooltip in Tango

.arg(createPlaylistLink));
html.append("</td></tr></table>");
return html;
Expand Down