Merge lp:~holizz/ubuntu/natty/gnome-terminal/cursor-blink-mode-ui into lp:ubuntu/natty/gnome-terminal

[Tom Adams]

Solves bug #762399.

Under the general tab in Profile Preferences there's a new select box which can change the cursor_blink_mode option.

I had previously proposed another commit, but this one puts the changes into debian/patches (oops).

[Michael Terry (mterry)]

Thank you so much for the patch, it looks good at what it does. However, we try not to diverge from the upstream UI unless there is a very strong reason. It would be better to get upstream to put this into gnome-terminal (though I understand they've dragged their feet).

I'm rejecting, not because I don't think it's a good idea, but just because we don't want to add another delta to Ubuntu.

review: Disapprove

Unmerged revisions

78. By Tom Adams on 2011-04-24

* debian/patches/22_cursor_blink_mode.patch
  - Fix LP: #762399 - Blinking cursor can be deactivated but only through
    gconf

=== added file 'debian/patches/22_cursor_blink_mode.patch'
--- debian/patches/22_cursor_blink_mode.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/22_cursor_blink_mode.patch	2011-04-24 14:20:51 +0000
@@ -0,0 +1,78 @@
+=== modified file 'src/profile-editor.c'
+--- old/src/profile-editor.c	2010-08-17 17:25:32 +0000
++++ new/src/profile-editor.c	2011-04-16 13:34:59 +0000
+@@ -884,6 +884,7 @@
+   CONNECT ("bold-color-same-as-fg-checkbox", TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG);
+   CONNECT ("bold-colorpicker", TERMINAL_PROFILE_BOLD_COLOR);
+   CONNECT ("cursor-shape-combobox", TERMINAL_PROFILE_CURSOR_SHAPE);
++  CONNECT ("cursor-blink-mode-combobox", TERMINAL_PROFILE_CURSOR_BLINK_MODE);
+   CONNECT ("custom-command-entry", TERMINAL_PROFILE_CUSTOM_COMMAND);
+   CONNECT ("darken-background-scale", TERMINAL_PROFILE_BACKGROUND_DARKNESS);
+   CONNECT ("default-size-columns-spinbutton", TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS);
+
+=== modified file 'src/profile-preferences.glade'
+--- old/src/profile-preferences.glade	2010-08-17 17:25:32 +0000
++++ new/src/profile-preferences.glade	2011-04-16 13:34:59 +0000
+@@ -346,6 +346,61 @@
+ 	      </child>
+ 
+ 	      <child>
++		<widget class="GtkHBox" id="hbox141">
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">12</property>
++
++		  <child>
++		    <widget class="GtkLabel" id="label482">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">_Cursor blink mode:</property>
++		      <property name="use_underline">True</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0.5</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="mnemonic_widget">cursor-blink-mode-combobox</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">False</property>
++		      <property name="fill">False</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkComboBox" id="cursor-blink-mode-combobox">
++		      <property name="visible">True</property>
++		      <property name="items" translatable="yes">System preference
++On
++Off</property>
++		      <property name="add_tearoffs">False</property>
++		      <property name="focus_on_click">True</property>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">False</property>
++		      <property name="fill">True</property>
++		    </packing>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++
++	      <child>
+ 		<widget class="GtkHBox" id="hbox136">
+ 		  <property name="visible">True</property>
+ 		  <property name="homogeneous">False</property>
+