Merge pull request #53 from markbt/master

Add blink preference
master-1.22
Stefano Karapetsas 2014-01-25 14:32:03 -08:00
commit 0caad322e9
3 changed files with 80 additions and 0 deletions

View File

@ -38,6 +38,13 @@ N_("I-Beam")
/* Translators: Cursor shape: ... */
N_("Underline")
/* Translators: Cursor blink: ... */
N_("Use system settings")
/* Translators: Cursor blink: ... */
N_("Always blink")
/* Translators: Cursor blink: ... */
N_("Never blink")
/* Translators: When command exits: ... */
N_("Exit the terminal")
/* Translators: When command exits: ... */

View File

@ -913,6 +913,7 @@ terminal_profile_edit (TerminalProfile *profile,
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-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);

View File

@ -176,6 +176,22 @@
</row>
</data>
</object>
<object class="GtkListStore" id="model9">
<columns>
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Use system settings</col>
</row>
<row>
<col id="0" translatable="yes">Always blink</col>
</row>
<row>
<col id="0" translatable="yes">Never blink</col>
</row>
</data>
</object>
<object class="GtkDialog" id="profile-editor-dialog">
<property name="border_width">5</property>
<property name="visible">True</property>
@ -442,6 +458,62 @@
<property name="fill">False</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox147">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label482">
<property name="visible">True</property>
<property name="label" translatable="yes">Cursor blin_k:</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-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>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cursor-blink-combobox">
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<property name="model">model9</property>
<child>
<object class="GtkCellRendererText" id="renderer9"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox140">
<property name="visible">True</property>