From a7c4a8a53cacdab6a9e9c38211cf14b4226908a3 Mon Sep 17 00:00:00 2001 From: Hussam al-Homsi Date: Thu, 5 Sep 2019 22:19:34 -0400 Subject: [PATCH 1/4] Remove "What's This?" leftovers --- data/themes/classic/style.css | 3 --- data/themes/default/style.css | 3 --- include/LmmsPalette.h | 6 ------ src/gui/LmmsPalette.cpp | 6 ------ 4 files changed, 18 deletions(-) diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index 12d90981d56..97d68f6e348 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -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; } diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 5d889295cae..ff6d032c2b6 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -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; } diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h index 49b831346db..a8ee5d1c8ab 100644 --- a/include/LmmsPalette.h +++ b/include/LmmsPalette.h @@ -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 ); @@ -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 @@ -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; }; diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp index e58e72cea88..4ab6fb3ecd9 100644 --- a/src/gui/LmmsPalette.cpp +++ b/src/gui/LmmsPalette.cpp @@ -43,8 +43,6 @@ LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) : 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 ) { setStyle( stylearg ); stylearg->polish( this ); @@ -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 @@ -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; } From bb729d3678fb2f7ed4b6615a44ed197c3afa5347 Mon Sep 17 00:00:00 2001 From: Hussam al-Homsi Date: Thu, 5 Sep 2019 22:54:29 -0400 Subject: [PATCH 2/4] Fix --- src/gui/LmmsPalette.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp index 4ab6fb3ecd9..e0b356d7a25 100644 --- a/src/gui/LmmsPalette.cpp +++ b/src/gui/LmmsPalette.cpp @@ -42,7 +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_highlightedText( 255, 255, 255 ) { setStyle( stylearg ); stylearg->polish( this ); From 077dda566ace7edfbe33aeb275d9dc67cf4bc5fa Mon Sep 17 00:00:00 2001 From: Hussam al-Homsi Date: Fri, 6 Sep 2019 20:33:20 -0400 Subject: [PATCH 3/4] Remove leftover icons --- data/themes/classic/whatsthis.png | Bin 1321 -> 0 bytes data/themes/default/whatsthis.png | Bin 410 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/themes/classic/whatsthis.png delete mode 100644 data/themes/default/whatsthis.png diff --git a/data/themes/classic/whatsthis.png b/data/themes/classic/whatsthis.png deleted file mode 100644 index cad033f4dfdbd075c4deeddabee6d466062eeb2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1321 zcmV+^1=jkBP); zK~y-)b(L#qTvZUqf9Kr0cQ?D6-EK^>F-mHq2C67Xv_);Hiq;p1sQ5yqzVJgqDpt@B zDn5#+RjO3P`ub39tyUXF6ttoi-;dTu)e_@I({8%iJT|-8?B09NIrsRXrqtKKz`!sw z|C#wSBlsV29oJiM&IMV2ynK>OBzgcM-ycbIbnYr_f2V4+4*x4o%o%M9j+IlxzeYgp zgiEeIBazA8p6={Aw>95ItR;oD5vtK(rd*<4F1_zpt7~@;Z2kxcb3MJXGE#^RCOjlr ze(}w>K9uR|zCL?o4}pnHtx}1C*%^_{>z}xR;sz`!;_0{Q5hA(Ol00 zSs59Q#35+&r>(r>wcPyPrA|CXx>{PHpS!>z1zP^{%=7HfATvwq7ow z1BDJ1DhO!S>nOiTgru!8&3!jsi|ctjz4=vUBM5vS9fpL>Cb3M8$PX8}BIdPUa`u@F zjqDZAZXLh^v1Ix$l3Jwak(?^=%Ht1{ZcVdk+grS_<4a^q3bgubuNLXXkg?c&iM0Y? z^@?lcS&RFrjqby*&!AO^jv`cPl$Rd72QLw4^T1oI*|H7m#Si$ELaPuJhC+oQ#^{7J zVK5FLrR0gb?%?>|1@>RadA|O3Co9)KN6Wk%s@X(`;XyS@*`Qv- z_dXwGQusl@va430q#(3{zUkyyo9fyk+ zE?hY4d7j_j-@kmrh7ETwzw#QfbEtsZn$=P|1S%9>EQXCDE2I=cI*zW_2r82w%ntps z8u%{W(ItZMk`=&G;4_5CVC~XUsr1O+Vv+MNzuFDl*wOKhJkpI}Em)(`jXJtk-K}S8 zPx@oUH-O1RXSeXnqjnCV3(T!<$*NVWPFc5Z-EY98o6gi^EOsJ}+l#dxMinAscA0v; fU~N?UuNUwqKlXhX1yZE>00000NkvXXu0mjf=3I&f diff --git a/data/themes/default/whatsthis.png b/data/themes/default/whatsthis.png deleted file mode 100644 index 5761d22ed55f3068f9ed325d2e5bb84546ff0507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR^eP*AeOHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nlPPZ!4! zi{7fBMbyW`UComt@ZtxWOo$kbR%Q{r43I(d9p%8(imUjlC^$V6|v(ATxjA ztoe04Zk}#aQap?%d3mOveV$X?^SNc-Z^4RrE3!_^o&LFKZ9tG=*i7^8jb7avCmn(` zUgqY+8Mkce6Y%`qc|i3|v*hZXExsqd%k5V5D}G#Gp1YXy;Wdw6439QysLxY;)705; zl;z9XEn>&Fww5~FpPXID(~zZ_$s3~PWmJA>&*ksWras(O_-E5C@dtK(pC{Mfn)3g} zgiDowa*G+}y}AFaXrm>&`G#MN)yi8g*~c@+YtNe+Gr!~4L0~vCc)I$ztaD0e0syOQ Brq=)f From 7a4f092d5f0aba9a506136a7397dd4918754421c Mon Sep 17 00:00:00 2001 From: Hussam al-Homsi Date: Fri, 6 Sep 2019 20:52:08 -0400 Subject: [PATCH 4/4] Revert "Remove leftover icons" This reverts commit 077dda566ace7edfbe33aeb275d9dc67cf4bc5fa. --- data/themes/classic/whatsthis.png | Bin 0 -> 1321 bytes data/themes/default/whatsthis.png | Bin 0 -> 410 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/themes/classic/whatsthis.png create mode 100644 data/themes/default/whatsthis.png diff --git a/data/themes/classic/whatsthis.png b/data/themes/classic/whatsthis.png new file mode 100644 index 0000000000000000000000000000000000000000..cad033f4dfdbd075c4deeddabee6d466062eeb2c GIT binary patch literal 1321 zcmV+^1=jkBP); zK~y-)b(L#qTvZUqf9Kr0cQ?D6-EK^>F-mHq2C67Xv_);Hiq;p1sQ5yqzVJgqDpt@B zDn5#+RjO3P`ub39tyUXF6ttoi-;dTu)e_@I({8%iJT|-8?B09NIrsRXrqtKKz`!sw z|C#wSBlsV29oJiM&IMV2ynK>OBzgcM-ycbIbnYr_f2V4+4*x4o%o%M9j+IlxzeYgp zgiEeIBazA8p6={Aw>95ItR;oD5vtK(rd*<4F1_zpt7~@;Z2kxcb3MJXGE#^RCOjlr ze(}w>K9uR|zCL?o4}pnHtx}1C*%^_{>z}xR;sz`!;_0{Q5hA(Ol00 zSs59Q#35+&r>(r>wcPyPrA|CXx>{PHpS!>z1zP^{%=7HfATvwq7ow z1BDJ1DhO!S>nOiTgru!8&3!jsi|ctjz4=vUBM5vS9fpL>Cb3M8$PX8}BIdPUa`u@F zjqDZAZXLh^v1Ix$l3Jwak(?^=%Ht1{ZcVdk+grS_<4a^q3bgubuNLXXkg?c&iM0Y? z^@?lcS&RFrjqby*&!AO^jv`cPl$Rd72QLw4^T1oI*|H7m#Si$ELaPuJhC+oQ#^{7J zVK5FLrR0gb?%?>|1@>RadA|O3Co9)KN6Wk%s@X(`;XyS@*`Qv- z_dXwGQusl@va430q#(3{zUkyyo9fyk+ zE?hY4d7j_j-@kmrh7ETwzw#QfbEtsZn$=P|1S%9>EQXCDE2I=cI*zW_2r82w%ntps z8u%{W(ItZMk`=&G;4_5CVC~XUsr1O+Vv+MNzuFDl*wOKhJkpI}Em)(`jXJtk-K}S8 zPx@oUH-O1RXSeXnqjnCV3(T!<$*NVWPFc5Z-EY98o6gi^EOsJ}+l#dxMinAscA0v; fU~N?UuNUwqKlXhX1yZE>00000NkvXXu0mjf=3I&f literal 0 HcmV?d00001 diff --git a/data/themes/default/whatsthis.png b/data/themes/default/whatsthis.png new file mode 100644 index 0000000000000000000000000000000000000000..5761d22ed55f3068f9ed325d2e5bb84546ff0507 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR^eP*AeOHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nlPPZ!4! zi{7fBMbyW`UComt@ZtxWOo$kbR%Q{r43I(d9p%8(imUjlC^$V6|v(ATxjA ztoe04Zk}#aQap?%d3mOveV$X?^SNc-Z^4RrE3!_^o&LFKZ9tG=*i7^8jb7avCmn(` zUgqY+8Mkce6Y%`qc|i3|v*hZXExsqd%k5V5D}G#Gp1YXy;Wdw6439QysLxY;)705; zl;z9XEn>&Fww5~FpPXID(~zZ_$s3~PWmJA>&*ksWras(O_-E5C@dtK(pC{Mfn)3g} zgiDowa*G+}y}AFaXrm>&`G#MN)yi8g*~c@+YtNe+Gr!~4L0~vCc)I$ztaD0e0syOQ Brq=)f literal 0 HcmV?d00001