Mercurial > octave-nkf

diff libgui/src/settings-dialog.cc @ 18179:b3838cedfe04 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
redesign of dock widgets title bar with configurable colors * octave-dock-widget.cc (constructor): connect settings_changed signal to new slot handle_settings; (handle_settings): common settings for all dock widgets: style sheet, this functions calls notice_settings for individual settings; (make_window,make_widget): change dock-/undock-icon * octave-dock-widget.h: new slot handle_settings * settings-dialog.cc (constructor): check box and color pickers for title bar; (write_changed_settings): store colors to settings file * settings-dialog.h: new color-pickers as class variables * settings-dialog.ui: check box and color pickers for title bar colors
author Torsten <ttl@justmail.de>
date Tue, 31 Dec 2013 13:31:45 +0100
parents 14acb08d75fa
children 545a77c3206e
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Sun Dec 29 13:08:16 2013 -0500
+++ b/libgui/src/settings-dialog.cc	Tue Dec 31 13:31:45 2013 +0100
@@ -90,6 +90,29 @@
   ui->general_icon_graphic-> setChecked (widget_icon_set == "GRAPHIC");
   ui->general_icon_letter-> setChecked (widget_icon_set == "LETTER");
 
+  // custom title bar of dock widget
+  QVariant default_var = QColor (255,255,255);
+  QColor bg_color = settings->value ("Dockwidgets/title_bg_color",
+                                      default_var).value<QColor> ();
+  _widget_title_bg_color = new color_picker (bg_color);
+  _widget_title_bg_color->setEnabled (false);
+  ui->layout_widget_bgtitle->addWidget (_widget_title_bg_color,0);
+  connect (ui->cb_widget_custom_style, SIGNAL (toggled (bool)),
+           _widget_title_bg_color, SLOT (setEnabled (bool)));
+
+  default_var = QColor (0,0,0);
+  QColor fg_color = settings->value ("Dockwidgets/title_fg_color",
+                                      default_var).value<QColor> ();
+  _widget_title_fg_color = new color_picker (fg_color);
+  _widget_title_fg_color->setEnabled (false);
+  ui->layout_widget_fgtitle->addWidget (_widget_title_fg_color,0);
+  connect (ui->cb_widget_custom_style, SIGNAL (toggled (bool)),
+           _widget_title_fg_color, SLOT (setEnabled (bool)));
+
+  ui->cb_widget_custom_style->setChecked (
+    settings->value ("DockWidgets/widget_title_custom_style",false).toBool ());
+
+  // editor
   ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor",
                                                         false).toBool ());
   ui->customFileEditor->setText (
@@ -97,7 +120,7 @@
   ui->editor_showLineNumbers->setChecked (
     settings->value ("editor/showLineNumbers",true).toBool () );
 
-  QVariant default_var = QColor (240, 240, 240);
+  default_var = QColor (240, 240, 240);
   QColor setting_color = settings->value ("editor/highlight_current_line_color",
                                           default_var).value<QColor> ();
   _editor_current_line_color = new color_picker (setting_color);
@@ -467,6 +490,14 @@
     language = "SYSTEM";
   settings->setValue ("language", language);
 
+  // dock widget title bar
+  settings->setValue ("DockWidgets/widget_title_custom_style",
+                      ui->cb_widget_custom_style->isChecked ());
+  settings->setValue ("Dockwidgets/title_bg_color",
+                      _widget_title_bg_color->color ());
+  settings->setValue ("Dockwidgets/title_fg_color",
+                      _widget_title_fg_color->color ());
+
   // other settings
   settings->setValue ("toolbar_icon_size", ui->toolbar_icon_size->value ());
   settings->setValue ("useCustomFileEditor",