gnome-terminal r3171 - trunk/src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-terminal r3171 - trunk/src
- Date: Mon, 13 Oct 2008 19:54:22 +0000 (UTC)
Author: chpe
Date: Mon Oct 13 19:54:21 2008
New Revision: 3171
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3171&view=rev
Log:
Restore the gconf schema descriptions, and add the tabs switch actions
back to the keybindings editor. Bug #548600.
Modified:
trunk/src/gnome-terminal.schemas.in
trunk/src/terminal-accels.c
Modified: trunk/src/gnome-terminal.schemas.in
==============================================================================
--- trunk/src/gnome-terminal.schemas.in (original)
+++ trunk/src/gnome-terminal.schemas.in Mon Oct 13 19:54:21 2008
@@ -921,6 +921,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>1</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 1</short>
+ <long>
+ Keyboard shortcut key for switch to tab 1. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -929,6 +938,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>2</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 2</short>
+ <long>
+ Keyboard shortcut key for switch to tab 2. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -937,6 +955,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>3</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 3</short>
+ <long>
+ Keyboard shortcut key for switch to tab 3. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -945,6 +972,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>4</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 4</short>
+ <long>
+ Keyboard shortcut key for switch to tab 4. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -953,6 +989,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>5</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 5</short>
+ <long>
+ Keyboard shortcut key for switch to tab 5. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -961,6 +1006,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>6</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 6</short>
+ <long>
+ Keyboard shortcut key for switch to tab 6. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -969,6 +1023,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>7</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 7</short>
+ <long>
+ Keyboard shortcut key for switch to tab 7. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -977,6 +1040,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>8</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 8</short>
+ <long>
+ Keyboard shortcut key for switch to tab 8. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -985,6 +1057,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<default><Alt>9</default>
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 9</short>
+ <long>
+ Keyboard shortcut key for switch to tab 9. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -993,6 +1074,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<!-- no default -->
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 10</short>
+ <long>
+ Keyboard shortcut key for switch to tab 10. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -1001,6 +1091,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<!-- no default -->
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 11</short>
+ <long>
+ Keyboard shortcut key for switch to tab 11. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
@@ -1009,6 +1108,15 @@
<owner>gnome-terminal</owner>
<type>string</type>
<!-- no default -->
+ <locale name="C">
+ <short>Keyboard shortcut to switch to tab 12</short>
+ <long>
+ Keyboard shortcut key for switch to tab 12. Expressed as a string
+ in the same format used for GTK+ resource files.
+ If you set the option to the special string "disabled", then there
+ will be no keyboard shortcut for this action.
+ </long>
+ </locale>
</schema>
<schema>
Modified: trunk/src/terminal-accels.c
==============================================================================
--- trunk/src/terminal-accels.c (original)
+++ trunk/src/terminal-accels.c Mon Oct 13 19:54:21 2008
@@ -178,45 +178,40 @@
KEY_MOVE_TAB_RIGHT, ACCEL_PATH_MOVE_TAB_RIGHT, 0, 0, NULL, FALSE, TRUE },
{ N_("Detach Tab"),
KEY_DETACH_TAB, ACCEL_PATH_DETACH_TAB, 0, 0, NULL, FALSE, TRUE },
-};
-
-#define UN_(x) (x)
-
-static KeyEntry jump_tab_entries[] = {
- { UN_("Switch to Tab 1"),
+ { N_("Switch to Tab 1"),
KEY_SWITCH_TAB_PREFIX "1",
ACCEL_PATH_SWITCH_TAB_PREFIX "1", GDK_1, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 2"),
+ { N_("Switch to Tab 2"),
KEY_SWITCH_TAB_PREFIX "2",
ACCEL_PATH_SWITCH_TAB_PREFIX "2", GDK_2, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 3"),
+ { N_("Switch to Tab 3"),
KEY_SWITCH_TAB_PREFIX "3",
ACCEL_PATH_SWITCH_TAB_PREFIX "3", GDK_3, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 4"),
+ { N_("Switch to Tab 4"),
KEY_SWITCH_TAB_PREFIX "4",
ACCEL_PATH_SWITCH_TAB_PREFIX "4", GDK_4, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 5"),
+ { N_("Switch to Tab 5"),
KEY_SWITCH_TAB_PREFIX "5",
ACCEL_PATH_SWITCH_TAB_PREFIX "5", GDK_5, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 6"),
+ { N_("Switch to Tab 6"),
KEY_SWITCH_TAB_PREFIX "6",
ACCEL_PATH_SWITCH_TAB_PREFIX "6", GDK_6, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 7"),
+ { N_("Switch to Tab 7"),
KEY_SWITCH_TAB_PREFIX "7",
ACCEL_PATH_SWITCH_TAB_PREFIX "7", GDK_7, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 8"),
+ { N_("Switch to Tab 8"),
KEY_SWITCH_TAB_PREFIX "8",
ACCEL_PATH_SWITCH_TAB_PREFIX "8", GDK_8, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 9"),
+ { N_("Switch to Tab 9"),
KEY_SWITCH_TAB_PREFIX "9",
ACCEL_PATH_SWITCH_TAB_PREFIX "9", GDK_9, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 10"),
+ { N_("Switch to Tab 10"),
KEY_SWITCH_TAB_PREFIX "10",
- ACCEL_PATH_SWITCH_TAB_PREFIX "10", GDK_0, GDK_MOD1_MASK, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 11"),
+ ACCEL_PATH_SWITCH_TAB_PREFIX "10", 0, 0, NULL, FALSE, TRUE },
+ { N_("Switch to Tab 11"),
KEY_SWITCH_TAB_PREFIX "11",
ACCEL_PATH_SWITCH_TAB_PREFIX "11", 0, 0, NULL, FALSE, TRUE },
- { UN_("Switch to Tab 12"),
+ { N_("Switch to Tab 12"),
KEY_SWITCH_TAB_PREFIX "12",
ACCEL_PATH_SWITCH_TAB_PREFIX "12", 0, 0, NULL, FALSE, TRUE }
};
@@ -233,7 +228,6 @@
{ terminal_entries, G_N_ELEMENTS (terminal_entries), N_("Terminal") },
{ tabs_entries, G_N_ELEMENTS (tabs_entries), N_("Tabs") },
{ help_entries, G_N_ELEMENTS (help_entries), N_("Help") },
- { jump_tab_entries, G_N_ELEMENTS (jump_tab_entries), NULL }
};
enum
@@ -923,8 +917,7 @@
g_signal_connect (tree, "row-changed", G_CALLBACK (row_changed), NULL);
#endif
- /* -1 because we can't add the Tabs entries on gnome-2-24 b/c of string freeze */
- for (i = 0; i < G_N_ELEMENTS (all_entries) - 1; ++i)
+ for (i = 0; i < G_N_ELEMENTS (all_entries); ++i)
{
GtkTreeIter parent_iter;
int j;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
