pool/lxterminal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- new upstream versio 0.1.8

Browse Source 
- removed lxterminal-0.1.7-fix-path.patch now into upstream code
- port lxterminal-0.1.6-disable-f10.patch to apply on new code,
  the patch is now lxterminal-0.1.8-disable-f10.patch

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=26
This commit is contained in:
andrea florio 2010-07-19 23:33:19 +00:00 committed by Git OBS Bridge
parent c1579f928a
commit fa3c0a0fbb
5 changed files with 748 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lxterminal-0.1.8-disable-f10.patch Normal file
View File

@ -0,0 +1,16 @@
diff -uNr old-lxterminal-0.1.8//data/lxterminal.conf lxterminal-0.1.8/data/lxterminal.conf
--- old-lxterminal-0.1.8//data/lxterminal.conf 2010-07-19 19:32:10.000000000 +0200
+++ lxterminal-0.1.8/data/lxterminal.conf 2010-07-20 00:41:51.096835608 +0200
@@ -2,3 +2,4 @@
fontname=Monospace 10
selchars=-A-Za-z0-9,./?%&#:_
scrollback=1000
+disablef10=true
diff -uNr old-lxterminal-0.1.8//data/lxterminal.conf.in lxterminal-0.1.8/data/lxterminal.conf.in
--- old-lxterminal-0.1.8//data/lxterminal.conf.in 2010-06-22 22:28:48.000000000 +0200
+++ lxterminal-0.1.8/data/lxterminal.conf.in 2010-07-20 00:41:42.824860472 +0200
@@ -2,3 +2,4 @@
fontname=Monospace 10
selchars=-A-Za-z0-9,./?%&#:_
scrollback=1000
+disablef10=true

711
lxterminal-0.1.8-fix-alt_n-sf3006779.patch Normal file
View File

@ -0,0 +1,711 @@
diff -uNr old-lxterminal-0.1.8//data/lxterminal-preferences.glade lxterminal-0.1.8/data/lxterminal-preferences.glade
--- old-lxterminal-0.1.8//data/lxterminal-preferences.glade 2010-07-20 01:13:53.532837321 +0200
+++ lxterminal-0.1.8/data/lxterminal-preferences.glade 1970-01-01 01:00:00.000000000 +0100
@@ -1,537 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Top</col>
- </row>
- <row>
- <col id="0" translatable="yes">Bottom</col>
- </row>
- <row>
- <col id="0" translatable="yes">Left</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right</col>
- </row>
- </data>
- </object>
- <object class="GtkDialog" id="lxterminal_preferences">
- <property name="border_width">5</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">8</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">3</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Terminal font</property>
- </object>
- </child>
- <child>
- <object class="GtkFontButton" id="terminal_font">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Background</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="background_color">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_alpha">True</property>
- <property name="color">#000000000000</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="foreground_color">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="color">#000000000000</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Foreground</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Allow bold font</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="allow_bold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Cursor blink</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="cursor_blink">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Cursor style</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="cursor_style_block">
- <property name="label" translatable="yes">Block</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="cursor_style_underline">
- <property name="label" translatable="yes">Underline</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">cursor_style_block</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Audible bell</property>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="audible_bell">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Style</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">3</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Tab panel position</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Scrollback lines</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Hide scroll bar</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Hide menu bar</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hide_menu_bar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="tab_position">
- <property name="visible">True</property>
- <property name="model">liststore1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="scrollback_lines">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">&#x2022;</property>
- <property name="adjustment">scrollback_lines_adjustment</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hide_scroll_bar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Hide Close buttons</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hide_close_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Display</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">3</property>
- <child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Select-by-word characters</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Disable menu shortcut key (F10 by default)</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_f10">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Disable using Alt-n to switch tabs</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_alt">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="select_by_word">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">&#x2022;</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Advanced</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="Cancel_button">
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="OK_button">
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">Cancel_button</action-widget>
- <action-widget response="-5">OK_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkAdjustment" id="scrollback_lines_adjustment">
- <property name="value">1000</property>
- <property name="upper">100000</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
-</interface>
diff -uNr old-lxterminal-0.1.8//src/lxterminal.c lxterminal-0.1.8/src/lxterminal.c
--- old-lxterminal-0.1.8//src/lxterminal.c 2010-07-20 01:13:53.516834944 +0200
+++ lxterminal-0.1.8/src/lxterminal.c 2010-07-20 01:14:24.972842488 +0200
@@ -68,6 +68,7 @@
/* Menu and accelerator event handlers. */
static void terminal_initialize_switch_tab_accelerator(Term * term);
+static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
static void terminal_switch_tab_accelerator(Term * term);
static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
@@ -300,7 +301,23 @@
/* Define the accelerator. */
term->closure = g_cclosure_new_swap(G_CALLBACK(terminal_switch_tab_accelerator), term, NULL);
- gtk_accel_group_connect(term->parent->accel_group, key, mods, GTK_ACCEL_LOCKED, term->closure);
+ if (gtk_accel_group_from_accel_closure(term->closure) == NULL)
+ gtk_accel_group_connect(term->parent->accel_group, key, mods, GTK_ACCEL_LOCKED, term->closure);
+ }
+}
+
+/* whether disable alt-n to switch tabs or not. */
+void terminal_set_disable_alt(Term * term, gboolean disable_alt)
+{
+ if (GTK_IS_ACCEL_GROUP(term->parent->accel_group))
+ {
+ if (disable_alt)
+ {
+ if (term->closure != NULL)
+ gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
+ }
+ else
+ terminal_initialize_switch_tab_accelerator(term);
}
}
@@ -378,7 +395,9 @@
terminal_window_set_fixed_size(terminal);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(term->parent->notebook), TRUE);
}
- terminal_initialize_switch_tab_accelerator(term);
+
+ /* Disable Alt-n switch tabs or not. */
+ terminal_set_disable_alt(term, terminal->setting->disable_alt);
}
/* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
@@ -936,7 +955,8 @@
/* Deallocate a Term structure. */
static void terminal_free(Term * term)
{
- gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
+ if ((GTK_IS_ACCEL_GROUP(term->parent->accel_group)) && (term->closure != NULL))
+ gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
g_free(term);
}
@@ -945,11 +965,11 @@
{
/* Initialize UI manager. */
GtkUIManager * manager = gtk_ui_manager_new();
- GtkActionGroup * action_group = gtk_action_group_new("MenuBar");
- gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
- gtk_action_group_add_actions(action_group, menus, MENUBAR_MENU_COUNT, terminal);
- gtk_action_group_add_actions(action_group, menu_items, MENUBAR_MENUITEM_COUNT, terminal);
- gtk_ui_manager_insert_action_group(manager, action_group, 0);
+ terminal->action_group = gtk_action_group_new("MenuBar");
+ gtk_action_group_set_translation_domain(terminal->action_group, GETTEXT_PACKAGE);
+ gtk_action_group_add_actions(terminal->action_group, menus, MENUBAR_MENU_COUNT, terminal);
+ gtk_action_group_add_actions(terminal->action_group, menu_items, MENUBAR_MENUITEM_COUNT, terminal);
+ gtk_ui_manager_insert_action_group(manager, terminal->action_group, 0);
guint merge_id = gtk_ui_manager_new_merge_id(manager);
gtk_ui_manager_add_ui(manager, merge_id, "/", "MenuBar", NULL, GTK_UI_MANAGER_MENUBAR, FALSE);
@@ -1223,7 +1243,6 @@
/* Initialize accelerators. */
terminal_accelerator_initialize(terminal);
- terminal_initialize_switch_tab_accelerator(term);
/* Update terminal settings. */
terminal_settings_apply(terminal);
@@ -1248,7 +1267,10 @@
/* Apply settings to all windows. */
int i;
for (i = 0; i < terminal->terms->len; i += 1)
+ {
terminal_settings_apply_to_term(terminal, g_ptr_array_index(terminal->terms, i));
+ terminal_set_disable_alt(g_ptr_array_index(terminal->terms, i), terminal->setting->disable_alt);
+ }
/* Update tab position. */
terminal->tab_position = terminal_tab_get_position_id(terminal->setting->tab_position);
diff -uNr old-lxterminal-0.1.8//src/lxterminal.h lxterminal-0.1.8/src/lxterminal.h
--- old-lxterminal-0.1.8//src/lxterminal.h 2010-07-20 01:13:53.524842419 +0200
+++ lxterminal-0.1.8/src/lxterminal.h 2010-07-20 01:14:24.976839137 +0200
@@ -52,6 +52,7 @@
GtkWidget * window; /* Toplevel window */
GtkWidget * box; /* Vertical box, child of toplevel window */
GtkWidget * menu; /* Menu bar, child of vertical box */
+ GtkActionGroup *action_group; /* Action group on this window */
GtkAccelGroup * accel_group; /* Accelerator group for accelerators on this window */
GtkWidget * notebook; /* Notebook, child of vertical box */
GPtrArray * terms; /* Array of pointers to Term structures */
diff -uNr old-lxterminal-0.1.8//src/preferences.c lxterminal-0.1.8/src/preferences.c
--- old-lxterminal-0.1.8//src/preferences.c 2010-07-20 01:13:53.508834315 +0200
+++ lxterminal-0.1.8/src/preferences.c 2010-07-20 01:14:24.980837810 +0200
@@ -41,6 +41,7 @@
static void preferences_dialog_hide_close_button_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
static gboolean preferences_dialog_selection_focus_out_event(GtkWidget * widget, GdkEventFocus * event, LXTerminal * terminal);
static void preferences_dialog_disable_f10_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
+static void preferences_dialog_disable_alt_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
/* Handler for "response" signal on preferences dialog. */
static void preferences_dialog_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal)
@@ -170,6 +171,13 @@
terminal_settings_apply_to_all(terminal);
}
+/* Handler for "toggled" signal on Disable Alt toggle button. */
+static void preferences_dialog_disable_alt_toggled_event(GtkToggleButton * widget, LXTerminal * terminal)
+{
+ terminal->setting->disable_alt = gtk_toggle_button_get_active(widget);
+ terminal_settings_apply_to_all(terminal);
+}
+
/* Convert the user preference on tab position, expressed as a string, to the internal representation.
* These have to match the order in the .glade file. */
gint terminal_tab_get_position_id(gchar * position)
@@ -261,6 +269,10 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), setting->disable_f10);
g_signal_connect(G_OBJECT(w), "toggled", G_CALLBACK(preferences_dialog_disable_f10_toggled_event), terminal);
+ w = GTK_WIDGET(gtk_builder_get_object(builder, "disable_alt"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), setting->disable_alt);
+ g_signal_connect(G_OBJECT(w), "toggled", G_CALLBACK(preferences_dialog_disable_alt_toggled_event), terminal);
+
gtk_widget_show_all(dialog);
g_object_unref(builder);
}
diff -uNr old-lxterminal-0.1.8//src/setting.c lxterminal-0.1.8/src/setting.c
--- old-lxterminal-0.1.8//src/setting.c 2010-07-20 01:13:53.520868259 +0200
+++ lxterminal-0.1.8/src/setting.c 2010-07-20 01:14:24.984836622 +0200
@@ -55,6 +55,7 @@
g_key_file_set_boolean(setting->keyfile, "general", "hideclosebutton", setting->hide_close_button);
g_key_file_set_string(setting->keyfile, "general", "selchars", setting->word_selection_characters);
g_key_file_set_boolean(setting->keyfile, "general", "disablef10", setting->disable_f10);
+ g_key_file_set_boolean(setting->keyfile, "general", "disablealt", setting->disable_alt);
/* Convert GKeyFile to text and build path to configuration file. */
gchar * file_data = g_key_file_to_data(setting->keyfile, NULL, NULL);
@@ -113,6 +114,7 @@
setting->hide_close_button = g_key_file_get_boolean(setting->keyfile, "general", "hideclosebutton", NULL);
setting->word_selection_characters = g_key_file_get_string(setting->keyfile, "general", "selchars", NULL);
setting->disable_f10 = g_key_file_get_boolean(setting->keyfile, "general", "disablef10", NULL);
+ setting->disable_alt = g_key_file_get_boolean(setting->keyfile, "general", "disablealt", NULL);
}
/* Default configuration strings. */
diff -uNr old-lxterminal-0.1.8//src/setting.h lxterminal-0.1.8/src/setting.h
--- old-lxterminal-0.1.8//src/setting.h 2010-07-20 01:13:53.508834315 +0200
+++ lxterminal-0.1.8/src/setting.h 2010-07-20 01:14:24.984836622 +0200
@@ -42,6 +42,7 @@
gboolean hide_close_button; /* True if close buttons are NOT visible */
char * word_selection_characters; /* Characters that act as word breaks during selection by word */
gboolean disable_f10; /* True if F10 will be passed to program; false if it brings up File menu */
+ gboolean disable_alt; /* True if Alt-n is passed to shell; false if it is used to switch between tabs */
gboolean geometry_change; /* True if there is a geometry change, until it has been acted on */

3
lxterminal-0.1.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901
size 226335

8
lxterminal.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 19 22:28:03 UTC 2010 - andrea@opensuse.org
- new upstream versio 0.1.8
- removed lxterminal-0.1.7-fix-path.patch now into upstream code
- port lxterminal-0.1.6-disable-f10.patch to apply on new code,
the patch is now lxterminal-0.1.8-disable-f10.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org

15
lxterminal.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package lxterminal (Version 0.1.7) # spec file for package lxterminal (Version 0.1.8)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,15 +19,19 @@
Name: lxterminal Name: lxterminal
Version: 0.1.7 Version: 0.1.8
Release: 4 Release: 4
Summary: Lightweight LXDE Terminal Summary: Lightweight LXDE Terminal
Group: System/GUI/LXDE Group: System/GUI/LXDE
License: GPL License: GPL
Url: http://www.lxde.org/ Url: http://www.lxde.org/
Source0: %name-%version.tar.bz2 Source0: %name-%version.tar.bz2
Patch0: %name-0.1.6-disable-f10.patch # PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
Patch1: %name-0.1.7-fix-path.patch # disable f10 shortcut because yast use it
Patch0: %name-0.1.8-disable-f10.patch
# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix-alt_n-sf3006779.patch andrea@opensuse.org
# upstream patch to fix sf#3006779 (customize fn)
#Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel
@ -40,7 +44,7 @@ of the LXDE project
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 #%patch1 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
@ -66,6 +70,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%_datadir/applications/lxterminal.desktop %_datadir/applications/lxterminal.desktop
%dir %_datadir/lxterminal %dir %_datadir/lxterminal
%_datadir/lxterminal/lxterminal.conf %_datadir/lxterminal/lxterminal.conf
%_datadir/lxterminal/lxterminal-preferences.ui
%_mandir/man1/lxterminal.1.gz %_mandir/man1/lxterminal.1.gz
%_datadir/pixmaps/lxterminal.png %_datadir/pixmaps/lxterminal.png