Mercurial > octave-nkf

changeset 16748:28a58b06e4ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make spacing similar for color option layouts * settings-dialog.cc (settings_dialog::read_terminal_colors): Add a column stretch for description and color picker columns of 10. Set the column stretch for last two (blank) columns to 10.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Tue, 11 Jun 2013 12:51:30 -0500
parents 9d0739413904
children c9007267cbf5
files libgui/src/settings-dialog.cc
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Tue Jun 11 15:09:13 2013 +0800
+++ b/libgui/src/settings-dialog.cc	Tue Jun 11 12:51:30 2013 -0500
@@ -333,10 +333,10 @@
       QColor setting_color = settings->value ("workspaceview/color_"+class_chars.mid (i,1),
                                               default_var).value<QColor> ();
       color[i] = new color_picker (setting_color);
-      color[i]->setObjectName ("color_"+class_chars.mid (i,1));
-      color[i]->setMinimumSize (30,10);
-      style_grid->addWidget (description[i], row,3*column);
-      style_grid->addWidget (color[i],       row,3*column+1);
+      color[i]->setObjectName ("color_"+class_chars.mid (i, 1));
+      color[i]->setMinimumSize (30, 10);
+      style_grid->addWidget (description[i], row, 3*column);
+      style_grid->addWidget (color[i],       row, 3*column+1);
       if (++column == 3)
         {
           row++;
@@ -371,12 +371,16 @@
       QColor setting_color = settings->value ("terminal/color_"+class_chars.mid (i,1),
                                               default_var).value<QColor> ();
       color[i] = new color_picker (setting_color);
-      color[i]->setObjectName ("terminal_color_"+class_chars.mid (i,1));
-      color[i]->setMinimumSize (30,10);
-      style_grid->addWidget (description[i], row,2*column);
-      style_grid->addWidget (color[i],       row,2*column+1);
+      color[i]->setObjectName ("terminal_color_"+class_chars.mid (i, 1));
+      color[i]->setMinimumSize (30, 10);
+      style_grid->addWidget (description[i], row, 2*column);
+      style_grid->addWidget (color[i],       row, 2*column+1);
+      style_grid->setColumnStretch (2*column, 10);
+      style_grid->setColumnStretch (2*column+1, 10);
       if (++column == 2)
         {
+          style_grid->setColumnStretch (3*column, 10);
+          style_grid->setColumnStretch (3*column+1, 10);
           row++;
           column = 0;
         }