Use palette for qml code for theming

Can't do it for QtWidgets code. We need to fully transition, before we
can fully switch over probably.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/Logging.cpp b/src/Logging.cpp

index 5d64a630..2d821cce 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -29,7 +29,7 @@ qmlMessageHandler(QtMsgType type, const QMessageLogContext &context, const QStri
         if (msg.endsWith(
               "QML Binding: Not restoring previous value because restoreMode has not been set.This "
               "behavior is deprecated.In Qt < 6.0 the default is Binding.RestoreBinding.In Qt >= "
-              "6.0 the default is Binding.RestoreBindingOrValue."))
+              "6.0 the default is Binding.RestoreBindingOrValue.") || msg.endsWith("Both point size and pixel size set. Using pixel size."))
                 return;
 
         switch (type) {
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index eead46a2..634ff4d6 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -34,6 +34,7 @@ TimelineViewManager::updateColorPalette()
                 lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color());
                 lightActive.setColor(QPalette::ToolTipText, lightActive.text().color());
                 lightActive.setColor(QPalette::Link, QColor("#0077b5"));
+                lightActive.setColor(QPalette::ButtonText, QColor("gray"));
                 view->rootContext()->setContextProperty("currentActivePalette", lightActive);
                 view->rootContext()->setContextProperty("currentInactivePalette", lightActive);
         } else if (settings->theme() == "dark") {
@@ -43,13 +44,14 @@ TimelineViewManager::updateColorPalette()
                                     /*dark*/ QColor("#2d3139"),
                                     /*mid*/ QColor(),
                                     /*text*/ QColor("#caccd1"),
-                                    /*bright_text*/ QColor(),
+                                    /*bright_text*/ QColor(0xff, 0xff, 0xff),
                                     /*base*/ QColor("#2d3139"),
                                     /*window*/ QColor("#202228"));
                 darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9"));
                 darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());
                 darkActive.setColor(QPalette::ToolTipText, darkActive.text().color());
                 darkActive.setColor(QPalette::Link, QColor("#38a3d8"));
+                darkActive.setColor(QPalette::ButtonText, QColor("gray"));
                 view->rootContext()->setContextProperty("currentActivePalette", darkActive);
                 view->rootContext()->setContextProperty("currentInactivePalette", darkActive);
         } else {