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

Remove "What's This?" leftovers #5173

Merged
merged 4 commits into from
Sep 9, 2019
Merged

Remove "What's This?" leftovers #5173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7c4a8a
Remove "What's This?" leftovers
husamalhomsi Sep 6, 2019
bb729d3
Fix
husamalhomsi Sep 6, 2019
077dda5
Remove leftover icons
husamalhomsi Sep 7, 2019
7a4f092
Revert "Remove leftover icons"
husamalhomsi Sep 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions data/themes/classic/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,4 @@ LmmsPalette {
qproperty-brightText: #4afd85;
qproperty-highlight: #202020;
qproperty-highlightedText: #ffffff;
/* the next two are used for whatsthis dialogs */
qproperty-toolTipText: #000;
qproperty-toolTipBase: #c9c9c9;
}
3 changes: 0 additions & 3 deletions data/themes/default/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,4 @@ LmmsPalette {
qproperty-brightText: #d1d8e4;
qproperty-highlight: #262b30;
qproperty-highlightedText: #d1d8e4;
/* the next two are used for whatsthis dialogs */
qproperty-toolTipText: #d1d8e4;
qproperty-toolTipBase: #101213;
}
6 changes: 0 additions & 6 deletions include/LmmsPalette.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ class LMMS_EXPORT LmmsPalette : public QWidget
Q_PROPERTY( QColor brightText READ brightText WRITE setBrightText )
Q_PROPERTY( QColor highlight READ highlight WRITE setHighlight )
Q_PROPERTY( QColor highlightedText READ highlightedText WRITE setHighlightedText )
Q_PROPERTY( QColor toolTipText READ toolTipText WRITE setToolTipText )
Q_PROPERTY( QColor toolTipBase READ toolTipBase WRITE setToolTipBase )

public:
LmmsPalette( QWidget * parent, QStyle * stylearg );
Expand All @@ -65,8 +63,6 @@ class LMMS_EXPORT LmmsPalette : public QWidget
ACCESSMET( brightText, setBrightText )
ACCESSMET( highlight, setHighlight )
ACCESSMET( highlightedText, setHighlightedText )
ACCESSMET( toolTipText, setToolTipText )
ACCESSMET( toolTipBase, setToolTipBase )

#undef ACCESSMET

Expand All @@ -83,8 +79,6 @@ class LMMS_EXPORT LmmsPalette : public QWidget
QColor m_brightText;
QColor m_highlight;
QColor m_highlightedText;
QColor m_toolTipText;
QColor m_toolTipBase;
};


Expand Down
8 changes: 1 addition & 7 deletions src/gui/LmmsPalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) :
m_buttonText( 0,0,0 ),
m_brightText( 74, 253, 133 ),
m_highlight( 100, 100, 100 ),
m_highlightedText( 255, 255, 255 ),
m_toolTipText( 0, 0, 0 ),
m_toolTipBase( 128, 128, 128 )
m_highlightedText( 255, 255, 255 )
{
setStyle( stylearg );
stylearg->polish( this );
Expand Down Expand Up @@ -72,8 +70,6 @@ LmmsPalette::~LmmsPalette()
ACCESSMET( brightText, setBrightText )
ACCESSMET( highlight, setHighlight )
ACCESSMET( highlightedText, setHighlightedText )
ACCESSMET( toolTipText, setToolTipText )
ACCESSMET( toolTipBase, setToolTipBase )


QPalette LmmsPalette::palette() const
Expand All @@ -90,8 +86,6 @@ QPalette LmmsPalette::palette() const
pal.setColor( QPalette::Shadow, shadow() );
pal.setColor( QPalette::Highlight, highlight() );
pal.setColor( QPalette::HighlightedText, highlightedText() );
pal.setBrush( QPalette::ToolTipText, QBrush( toolTipText() ) );
pal.setBrush( QPalette::ToolTipBase, QBrush( toolTipBase() ) );
return pal;
}

Expand Down