SF.net SVN: geany: [1677] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Sat Jul 7 16:30:44 UTC 2007
Revision: 1677
http://svn.sourceforge.net/geany/?rev=1677&view=rev
Author: ntrel
Date: 2007-07-07 09:30:44 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
Move Context Action command to Tools tab, group with Print command.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/interface.c
trunk/src/prefs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-07 15:39:25 UTC (rev 1676)
+++ trunk/ChangeLog 2007-07-07 16:30:44 UTC (rev 1677)
@@ -19,6 +19,8 @@
Add filetypes.common setting: whitespace_chars.
* src/highlighting.c, data/filetypes.python:
Add decorator (and word2) styling for Python.
+ * src/interface.c, src/prefs.c, geany.glade:
+ Move Context Action command to Tools tab, group with Print command.
2007-07-06 Enrico Tröger <enrico.troeger at uvena.de>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2007-07-07 15:39:25 UTC (rev 1676)
+++ trunk/geany.glade 2007-07-07 16:30:44 UTC (rev 1677)
@@ -3333,110 +3333,6 @@
</child>
<child>
- <widget class="GtkFrame" id="frame24">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment27">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label189">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Context Action command:</property>
- <property name="use_underline">False</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="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">6</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_contextaction">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution.</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">●</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label188">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Context Action</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</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="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="type">label_item</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="GtkFrame" id="frame25">
<property name="visible">True</property>
<property name="label_xalign">0</property>
@@ -3461,8 +3357,8 @@
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">2</property>
+ <property name="column_spacing">5</property>
<child>
<widget class="GtkLabel" id="label191">
@@ -6390,68 +6286,40 @@
</child>
<child>
- <widget class="GtkFrame" id="frame20">
+ <widget class="GtkVBox" id="vbox23">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkAlignment" id="alignment23">
+ <widget class="GtkFrame" id="frame20">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkAlignment" id="alignment23">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="label" translatable="yes">Enter tool paths below. Tools you do not need can be left blank.</property>
- <property name="use_underline">False</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">6</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="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">7</property>
- <property name="column_spacing">5</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label" translatable="yes">Make:</property>
+ <property name="label" translatable="yes">Enter tool paths below. Tools you do not need can be left blank.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6460,259 +6328,412 @@
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="ypad">6</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="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label97">
+ <widget class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Terminal:</property>
- <property name="use_underline">False</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</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="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="n_rows">4</property>
+ <property name="n_columns">3</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">2</property>
+ <property name="column_spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label117">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Browser:</property>
- <property name="use_underline">False</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</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="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Make:</property>
+ <property name="use_underline">False</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkEntry" id="entry_com_make">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Path and options for the make tool</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_com_term">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- <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>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_browser">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Path (and possibly additional arguments) to your favorite browser</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- <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>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_make">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
<child>
- <widget class="GtkImage" id="image285">
+ <widget class="GtkLabel" id="label97">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
+ <property name="label" translatable="yes">Terminal:</property>
+ <property name="use_underline">False</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_term">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
<child>
- <widget class="GtkImage" id="image286">
+ <widget class="GtkLabel" id="label117">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
+ <property name="label" translatable="yes">Browser:</property>
+ <property name="use_underline">False</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_browser">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="GtkEntry" id="entry_com_make">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Path and options for the make tool</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
<child>
- <widget class="GtkImage" id="image287">
+ <widget class="GtkEntry" id="entry_com_term">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
+ <property name="tooltip" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry_browser">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Path (and possibly additional arguments) to your favorite browser</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_make">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image285">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_term">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image286">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_browser">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image287">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label171">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Grep:</property>
+ <property name="use_underline">False</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label154">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Print command:</property>
- <property name="use_underline">False</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</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>
+ <child>
+ <widget class="GtkEntry" id="entry_grep">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_grep">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image808">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label179">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tool paths</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="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="type">label_item</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="GtkFrame" id="frame26">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment29">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkTable" id="table12">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">2</property>
+ <property name="column_spacing">5</property>
+
<child>
<widget class="GtkEntry" id="entry_print">
<property name="visible">True</property>
@@ -6729,8 +6750,8 @@
<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>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
@@ -6757,17 +6778,17 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label171">
+ <widget class="GtkLabel" id="label154">
<property name="visible">True</property>
- <property name="label" translatable="yes">Grep:</property>
+ <property name="label" translatable="yes">Print:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6785,43 +6806,72 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_grep">
+ <widget class="GtkEntry" id="entry_contextaction">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution.</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">False</property>
</widget>
<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>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_grep">
+ <widget class="GtkLabel" id="label189">
<property name="visible">True</property>
+ <property name="label" translatable="yes">Context action:</property>
+ <property name="use_underline">False</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="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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button_contextaction">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<child>
- <widget class="GtkImage" id="image808">
+ <widget class="GtkImage" id="image1919">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">4</property>
@@ -6835,44 +6885,44 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
</child>
</widget>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label179">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Tool paths</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</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="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <child>
+ <widget class="GtkLabel" id="label193">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Commands</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="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="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2007-07-07 15:39:25 UTC (rev 1676)
+++ trunk/src/interface.c 2007-07-07 16:30:44 UTC (rev 1677)
@@ -2416,12 +2416,6 @@
GtkWidget *check_auto_focus;
GtkWidget *check_ask_suppress_search_dialogs;
GtkWidget *label178;
- GtkWidget *frame24;
- GtkWidget *alignment27;
- GtkWidget *hbox8;
- GtkWidget *label189;
- GtkWidget *entry_contextaction;
- GtkWidget *label188;
GtkWidget *frame25;
GtkWidget *alignment28;
GtkWidget *table11;
@@ -2588,6 +2582,7 @@
GtkWidget *spin_autocheight;
GtkWidget *label177;
GtkWidget *label95;
+ GtkWidget *vbox23;
GtkWidget *frame20;
GtkWidget *alignment23;
GtkWidget *vbox2;
@@ -2605,15 +2600,23 @@
GtkWidget *image286;
GtkWidget *button_browser;
GtkWidget *image287;
- GtkWidget *label154;
- GtkWidget *entry_print;
- GtkWidget *button_print;
- GtkWidget *image763;
GtkWidget *label171;
GtkWidget *entry_grep;
GtkWidget *button_grep;
GtkWidget *image808;
GtkWidget *label179;
+ GtkWidget *frame26;
+ GtkWidget *alignment29;
+ GtkWidget *table12;
+ GtkWidget *entry_print;
+ GtkWidget *button_print;
+ GtkWidget *image763;
+ GtkWidget *label154;
+ GtkWidget *entry_contextaction;
+ GtkWidget *label189;
+ GtkWidget *button_contextaction;
+ GtkWidget *image1919;
+ GtkWidget *label193;
GtkWidget *label96;
GtkWidget *frame21;
GtkWidget *alignment24;
@@ -2760,35 +2763,6 @@
gtk_frame_set_label_widget (GTK_FRAME (frame19), label178);
gtk_label_set_use_markup (GTK_LABEL (label178), TRUE);
- frame24 = gtk_frame_new (NULL);
- gtk_widget_show (frame24);
- gtk_box_pack_start (GTK_BOX (vbox20), frame24, FALSE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame24), GTK_SHADOW_NONE);
-
- alignment27 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment27);
- gtk_container_add (GTK_CONTAINER (frame24), alignment27);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment27), 0, 0, 12, 0);
-
- hbox8 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox8);
- gtk_container_add (GTK_CONTAINER (alignment27), hbox8);
-
- label189 = gtk_label_new (_("Context Action command:"));
- gtk_widget_show (label189);
- gtk_box_pack_start (GTK_BOX (hbox8), label189, FALSE, FALSE, 6);
-
- entry_contextaction = gtk_entry_new ();
- gtk_widget_show (entry_contextaction);
- gtk_box_pack_start (GTK_BOX (hbox8), entry_contextaction, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, entry_contextaction, _("Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution."), NULL);
- gtk_entry_set_invisible_char (GTK_ENTRY (entry_contextaction), 9679);
-
- label188 = gtk_label_new (_("<b>Context Action</b>"));
- gtk_widget_show (label188);
- gtk_frame_set_label_widget (GTK_FRAME (frame24), label188);
- gtk_label_set_use_markup (GTK_LABEL (label188), TRUE);
-
frame25 = gtk_frame_new (NULL);
gtk_widget_show (frame25);
gtk_box_pack_start (GTK_BOX (vbox20), frame25, TRUE, TRUE, 0);
@@ -2802,7 +2776,8 @@
table11 = gtk_table_new (2, 3, FALSE);
gtk_widget_show (table11);
gtk_container_add (GTK_CONTAINER (alignment28), table11);
- gtk_table_set_col_spacings (GTK_TABLE (table11), 6);
+ gtk_table_set_row_spacings (GTK_TABLE (table11), 2);
+ gtk_table_set_col_spacings (GTK_TABLE (table11), 5);
label191 = gtk_label_new (_("Startup path:"));
gtk_widget_show (label191);
@@ -3726,9 +3701,13 @@
gtk_widget_show (label95);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label95);
+ vbox23 = gtk_vbox_new (FALSE, 10);
+ gtk_widget_show (vbox23);
+ gtk_container_add (GTK_CONTAINER (notebook2), vbox23);
+
frame20 = gtk_frame_new (NULL);
gtk_widget_show (frame20);
- gtk_container_add (GTK_CONTAINER (notebook2), frame20);
+ gtk_box_pack_start (GTK_BOX (vbox23), frame20, FALSE, TRUE, 0);
gtk_frame_set_shadow_type (GTK_FRAME (frame20), GTK_SHADOW_NONE);
alignment23 = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -3746,10 +3725,10 @@
gtk_misc_set_alignment (GTK_MISC (label17), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (label17), 0, 6);
- table1 = gtk_table_new (5, 3, FALSE);
+ table1 = gtk_table_new (4, 3, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, TRUE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (table1), 7);
+ gtk_table_set_row_spacings (GTK_TABLE (table1), 2);
gtk_table_set_col_spacings (GTK_TABLE (table1), 5);
label11 = gtk_label_new (_("Make:"));
@@ -3824,23 +3803,60 @@
gtk_widget_show (image287);
gtk_container_add (GTK_CONTAINER (button_browser), image287);
- label154 = gtk_label_new (_("Print command:"));
- gtk_widget_show (label154);
- gtk_table_attach (GTK_TABLE (table1), label154, 0, 1, 3, 4,
+ label171 = gtk_label_new (_("Grep:"));
+ gtk_widget_show (label171);
+ gtk_table_attach (GTK_TABLE (table1), label171, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label154), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label171), 0, 0.5);
+ entry_grep = gtk_entry_new ();
+ gtk_widget_show (entry_grep);
+ gtk_table_attach (GTK_TABLE (table1), entry_grep, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ button_grep = gtk_button_new ();
+ gtk_widget_show (button_grep);
+ gtk_table_attach (GTK_TABLE (table1), button_grep, 2, 3, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ image808 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image808);
+ gtk_container_add (GTK_CONTAINER (button_grep), image808);
+
+ label179 = gtk_label_new (_("<b>Tool paths</b>"));
+ gtk_widget_show (label179);
+ gtk_frame_set_label_widget (GTK_FRAME (frame20), label179);
+ gtk_label_set_use_markup (GTK_LABEL (label179), TRUE);
+
+ frame26 = gtk_frame_new (NULL);
+ gtk_widget_show (frame26);
+ gtk_box_pack_start (GTK_BOX (vbox23), frame26, TRUE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame26), GTK_SHADOW_NONE);
+
+ alignment29 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment29);
+ gtk_container_add (GTK_CONTAINER (frame26), alignment29);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment29), 0, 0, 12, 0);
+
+ table12 = gtk_table_new (2, 3, FALSE);
+ gtk_widget_show (table12);
+ gtk_container_add (GTK_CONTAINER (alignment29), table12);
+ gtk_table_set_row_spacings (GTK_TABLE (table12), 2);
+ gtk_table_set_col_spacings (GTK_TABLE (table12), 5);
+
entry_print = gtk_entry_new ();
gtk_widget_show (entry_print);
- gtk_table_attach (GTK_TABLE (table1), entry_print, 1, 2, 3, 4,
+ gtk_table_attach (GTK_TABLE (table12), entry_print, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, entry_print, _("Path to the command for printing files (use %f for the filename)."), NULL);
button_print = gtk_button_new ();
gtk_widget_show (button_print);
- gtk_table_attach (GTK_TABLE (table1), button_print, 2, 3, 3, 4,
+ gtk_table_attach (GTK_TABLE (table12), button_print, 2, 3, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
@@ -3848,34 +3864,42 @@
gtk_widget_show (image763);
gtk_container_add (GTK_CONTAINER (button_print), image763);
- label171 = gtk_label_new (_("Grep:"));
- gtk_widget_show (label171);
- gtk_table_attach (GTK_TABLE (table1), label171, 0, 1, 4, 5,
+ label154 = gtk_label_new (_("Print:"));
+ gtk_widget_show (label154);
+ gtk_table_attach (GTK_TABLE (table12), label154, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label171), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label154), 0, 0.5);
- entry_grep = gtk_entry_new ();
- gtk_widget_show (entry_grep);
- gtk_table_attach (GTK_TABLE (table1), entry_grep, 1, 2, 4, 5,
+ entry_contextaction = gtk_entry_new ();
+ gtk_widget_show (entry_contextaction);
+ gtk_table_attach (GTK_TABLE (table12), entry_contextaction, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_tooltips_set_tip (tooltips, entry_contextaction, _("Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution."), NULL);
+ gtk_entry_set_invisible_char (GTK_ENTRY (entry_contextaction), 9679);
- button_grep = gtk_button_new ();
- gtk_widget_show (button_grep);
- gtk_table_attach (GTK_TABLE (table1), button_grep, 2, 3, 4, 5,
+ label189 = gtk_label_new (_("Context action:"));
+ gtk_widget_show (label189);
+ gtk_table_attach (GTK_TABLE (table12), label189, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- image808 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image808);
- gtk_container_add (GTK_CONTAINER (button_grep), image808);
+ button_contextaction = gtk_button_new ();
+ gtk_widget_show (button_contextaction);
+ gtk_table_attach (GTK_TABLE (table12), button_contextaction, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
- label179 = gtk_label_new (_("<b>Tool paths</b>"));
- gtk_widget_show (label179);
- gtk_frame_set_label_widget (GTK_FRAME (frame20), label179);
- gtk_label_set_use_markup (GTK_LABEL (label179), TRUE);
+ image1919 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image1919);
+ gtk_container_add (GTK_CONTAINER (button_contextaction), image1919);
+ label193 = gtk_label_new (_("<b>Commands</b>"));
+ gtk_widget_show (label193);
+ gtk_frame_set_label_widget (GTK_FRAME (frame26), label193);
+ gtk_label_set_use_markup (GTK_LABEL (label193), TRUE);
+
label96 = gtk_label_new (_("Tools"));
gtk_widget_show (label96);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label96);
@@ -4083,12 +4107,6 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_focus, "check_auto_focus");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_ask_suppress_search_dialogs, "check_ask_suppress_search_dialogs");
GLADE_HOOKUP_OBJECT (prefs_dialog, label178, "label178");
- GLADE_HOOKUP_OBJECT (prefs_dialog, frame24, "frame24");
- GLADE_HOOKUP_OBJECT (prefs_dialog, alignment27, "alignment27");
- GLADE_HOOKUP_OBJECT (prefs_dialog, hbox8, "hbox8");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label189, "label189");
- GLADE_HOOKUP_OBJECT (prefs_dialog, entry_contextaction, "entry_contextaction");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label188, "label188");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame25, "frame25");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment28, "alignment28");
GLADE_HOOKUP_OBJECT (prefs_dialog, table11, "table11");
@@ -4247,6 +4265,7 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocheight, "spin_autocheight");
GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177");
GLADE_HOOKUP_OBJECT (prefs_dialog, label95, "label95");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox23, "vbox23");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame20, "frame20");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment23, "alignment23");
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2");
@@ -4264,15 +4283,23 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, image286, "image286");
GLADE_HOOKUP_OBJECT (prefs_dialog, button_browser, "button_browser");
GLADE_HOOKUP_OBJECT (prefs_dialog, image287, "image287");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label154, "label154");
- GLADE_HOOKUP_OBJECT (prefs_dialog, entry_print, "entry_print");
- GLADE_HOOKUP_OBJECT (prefs_dialog, button_print, "button_print");
- GLADE_HOOKUP_OBJECT (prefs_dialog, image763, "image763");
GLADE_HOOKUP_OBJECT (prefs_dialog, label171, "label171");
GLADE_HOOKUP_OBJECT (prefs_dialog, entry_grep, "entry_grep");
GLADE_HOOKUP_OBJECT (prefs_dialog, button_grep, "button_grep");
GLADE_HOOKUP_OBJECT (prefs_dialog, image808, "image808");
GLADE_HOOKUP_OBJECT (prefs_dialog, label179, "label179");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, frame26, "frame26");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, alignment29, "alignment29");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, table12, "table12");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, entry_print, "entry_print");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, button_print, "button_print");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, image763, "image763");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label154, "label154");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, entry_contextaction, "entry_contextaction");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label189, "label189");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, button_contextaction, "button_contextaction");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, image1919, "image1919");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label193, "label193");
GLADE_HOOKUP_OBJECT (prefs_dialog, label96, "label96");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame21, "frame21");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment24, "alignment24");
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2007-07-07 15:39:25 UTC (rev 1676)
+++ trunk/src/prefs.c 2007-07-07 16:30:44 UTC (rev 1677)
@@ -1102,11 +1102,15 @@
"clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_term"));
g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_browser"),
"clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser"));
- g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"),
- "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print"));
g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_grep"),
"clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_grep"));
+ // tools commands
+ g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"),
+ "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print"));
+ g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_contextaction"),
+ "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_contextaction"));
+
g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "check_toolbar_show"),
"toggled", G_CALLBACK(on_toolbar_show_toggled), NULL);
g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "check_show_notebook_tabs"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list