Mercurial > hg > octave-nkf

diff libgui/qterminal/libqterminal/QTerminal.cc @ 16641:64f9a3e301d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't store default values in resource manager class * QTerminal.h, QTerminal.cc (QTerminal::default_colors, QTerminal::color_names): New functions. (QTerminal::notice_settings): Call default_colors. * workspace-model.h, workspace-model.cc (workspace_model::storage_class_default_colors, workspace_model::storage_class_names): New functions. * resource-manager.cc (resource_manager::storage_class_names, resource_manager::storage_class_default_colors): Get values from workspace_model. (resource_manager::terminal_color_names, resource_manager::terminal_default_colors): Get values from QTerminal.
author John W. Eaton <jwe@octave.org>
date Sun, 12 May 2013 16:17:48 -0400
parents 0ee7b4d1b940
children a28c3fb15ad8
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc
+++ b/libgui/qterminal/libqterminal/QTerminal.cc
@@ -38,6 +38,38 @@
 #endif
 }
 
+QList<QColor>
+QTerminal::default_colors (void)
+{
+  static QList<QColor> colors;
+
+  if (colors.isEmpty ())
+    {
+      colors << QColor(0,0,0)
+             << QColor(255,255,255)
+             << QColor(192,192,192)
+             << QColor(128,128,128);
+    }
+
+  return colors;
+}
+
+QStringList
+QTerminal::color_names (void)
+{
+  static QStringList names;
+
+  if (names.isEmpty ())
+    {
+      names << QObject::tr ("foreground")
+            << QObject::tr ("background")
+            << QObject::tr ("selection")
+            << QObject::tr ("cursor");
+    }
+
+  return names;
+}
+
 void
 QTerminal::notice_settings (const QSettings *settings)
 {
@@ -68,29 +100,22 @@
   bool cursorUseForegroundColor
     = settings->value ("terminal/cursorUseForegroundColor", true).toBool ();
 
-  // FIXME -- we shouldn't duplicate this information here and in the
-  // resource manager.
-  QList<QColor> default_colors;
-
-  default_colors << QColor(0,0,0)
-                 << QColor(255,255,255)
-                 << QColor(192,192,192)
-                 << QColor(128,128,128);
+  QList<QColor> colors = default_colors ();
 
   setForegroundColor
     (settings->value ("terminal/color_f",
-                      QVariant (default_colors.at (0))).value<QColor> ());
+                      QVariant (colors.at (0))).value<QColor> ());
 
   setBackgroundColor
     (settings->value ("terminal/color_b",
-                      QVariant (default_colors.at (1))).value<QColor> ());
+                      QVariant (colors.at (1))).value<QColor> ());
 
   setSelectionColor
     (settings->value ("terminal/color_s",
-                      QVariant (default_colors.at (2))).value<QColor> ());
+                      QVariant (colors.at (2))).value<QColor> ());
 
   setCursorColor
     (cursorUseForegroundColor,
      settings->value ("terminal/color_c",
-                      QVariant (default_colors.at (3))).value<QColor> ());
+                      QVariant (colors.at (3))).value<QColor> ());
 }