Mercurial > octave

changeset 25386:dd77a0628cce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 16 May 2018 22:03:10 -0700
parents 9b67c2294129 (current diff) 2b0680bdb1ed (diff)
children f241f62c9fc5
files
diffstat 1 files changed, 0 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/__init_qt__.cc	Wed May 16 21:14:09 2018 +0200
+++ b/libgui/graphics/__init_qt__.cc	Wed May 16 22:03:10 2018 -0700
@@ -66,38 +66,6 @@
 
             octave::interpreter::add_atexit_function ("__shutdown_qt__");
 
-            // Change some default settings to use Qt default colors
-            QPalette p;
-            graphics_object root = gh_manager::get_object (0);
-
-            /*
-            root.set ("defaultfigurecolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Window))));
-            */
-            root.set ("defaultuicontrolbackgroundcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Window))));
-            root.set ("defaultuicontrolforegroundcolor",
-                      octave_value (Utils::toRgb
-                                    (p.color (QPalette::WindowText))));
-            root.set ("defaultuipanelbackgroundcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Window))));
-            root.set ("defaultuipanelforegroundcolor",
-                      octave_value (Utils::toRgb
-                                    (p.color (QPalette::WindowText))));
-            root.set ("defaultuipanelhighlightcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Light))));
-            root.set ("defaultuipanelshadowcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Dark))));
-            root.set ("defaultuibuttongroupbackgroundcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Window))));
-            root.set ("defaultuibuttongroupforegroundcolor",
-                      octave_value (Utils::toRgb
-                                    (p.color (QPalette::WindowText))));
-            root.set ("defaultuibuttongrouphighlightcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Light))));
-            root.set ("defaultuibuttongroupshadowcolor",
-                      octave_value (Utils::toRgb (p.color (QPalette::Dark))));
-
             qtHandlesInitialized = true;
 
             return true;