anjuta r3531 - in trunk: . libanjuta plugins/editor
- From: naba svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r3531 - in trunk: . libanjuta plugins/editor
- Date: Sun, 27 Jan 2008 13:29:36 +0000 (GMT)
Author: naba
Date: Sun Jan 27 13:29:36 2008
New Revision: 3531
URL: http://svn.gnome.org/viewvc/anjuta?rev=3531&view=rev
Log:
* TODO.tasks: Updated.
* libanjuta/anjuta-save-prompt.c: (anjuta_save_prompt_init): Added
scrollwindow shadow in.
* plugins/editor/anjuta-editor-scintilla.glade:
* plugins/editor/style-editor.c: (create_style_editor_gui):
Set style window transient and cetered for preferences window.
Fixed Bug #365490 - problems displaying Scintilla Colors & Fonts dialog
Modified:
trunk/ChangeLog
trunk/TODO.tasks
trunk/libanjuta/anjuta-save-prompt.c
trunk/plugins/editor/anjuta-editor-scintilla.glade
trunk/plugins/editor/style-editor.c
Modified: trunk/TODO.tasks
==============================================================================
--- trunk/TODO.tasks (original)
+++ trunk/TODO.tasks Sun Jan 27 13:29:36 2008
@@ -89,11 +89,6 @@
should be shown side-by-side in status bar.</comment>
</item>
<item>
- <attribute id="1098255692" priority="1" done="0" start_date="731874" enddate="99999999" notify="0" endtime="-60" last_edited="1159483377"/>
- <summary>Move encodings source files</summary>
- <comment>Move encodings source files (anjuta-encodings.h and anjuta-encodings.c) by CVS surgery into editor plugin.</comment>
- </item>
- <item>
<attribute id="1107255619" priority="1" done="0" start_date="731978" enddate="99999999" notify="0" endtime="-60" last_edited="1159483386"/>
<summary>Plugins reference counting</summary>
<comment>Implement plugins reference counting. Loading a plugin gets 1 ref and when ref count reaches 0, plugin is deactivated.</comment>
@@ -124,6 +119,11 @@
Then AnjutaPreferences class should be fixed not to preemptively create the dialog widgets on plugin activations, but rather do it at IAnjutaPreferences::merge() and IAnjutaPreferences::unmerge() implementations in plugins. The plugins would still need to setup notifications in IAnjutaPreferences::init() implementation. To accomplish all this, it might involve substantial changes in AnjutaPreferences class.</comment>
</item>
+ <item>
+ <attribute id="1098255692" priority="1" done="1" start_date="731874" completed_date="733068" notify="0" last_edited="1201438779"/>
+ <summary>Move encodings source files</summary>
+ <comment>Move encodings source files (anjuta-encodings.h and anjuta-encodings.c) by CVS surgery into editor plugin.</comment>
+ </item>
</category>
<category title="Plugin: Editor" place="5">
<item>
@@ -407,11 +407,6 @@
</category>
<category title="anjuta" place="1">
<item>
- <attribute id="1107253737" priority="1" done="0" start_date="731978" enddate="99999999" notify="0" endtime="-60" last_edited="1107253737"/>
- <summary>Save and load user sessions</summary>
- <comment>Save and load user sessions</comment>
- </item>
- <item>
<attribute id="1107253772" priority="1" done="1" start_date="731978" completed_date="732405" notify="0" last_edited="1144149839"/>
<summary>Show toolbars</summary>
<comment>Show toolbars that were shown in last session.</comment>
@@ -441,6 +436,11 @@
Implement missing features of CVS and subversion in their respective plugins. Basic features are already implemented, but we are missing many advanced yet powerful features of these version control systems.</comment>
</item>
+ <item>
+ <attribute id="1107253737" priority="1" done="1" start_date="731978" completed_date="733068" notify="0" last_edited="1201438867"/>
+ <summary>Save and load user sessions</summary>
+ <comment>Save and load user sessions</comment>
+ </item>
</category>
<category title="Plugin: Macros" place="13">
<item>
@@ -495,12 +495,6 @@
<comment>Complete debugger UI in gdb plugin. Complete porting of debugger.</comment>
</item>
<item>
- <attribute id="1159648703" priority="1" done="0" start_date="732584" enddate="99999999" notify="0" endtime="-60" last_edited="1159648703"/>
- <summary>Multi-thread support</summary>
- <comment>[Skill: medium, Work: 30h, Bounty: $150]
-Displaying all threads and selecting one should be rather easy. But this might have some impact on the display of local variables.</comment>
- </item>
- <item>
<attribute id="1159648774" priority="1" done="0" start_date="732584" enddate="99999999" notify="0" endtime="-60" last_edited="1159648774"/>
<summary>Remote debugging support</summary>
<comment>[Skill: medium, Work: 40h]
@@ -514,19 +508,25 @@
Currently, this dialog use the same debug tree widget used by the local variables and watch display. I think we should keep the same widget for all this but we need perhaps to add a few options (local variables cannot be removed by example).</comment>
</item>
<item>
- <attribute id="1159648879" priority="1" done="0" start_date="732584" enddate="99999999" notify="0" endtime="-60" last_edited="1159648975"/>
- <summary>Add a disassembly window</summary>
- <comment>[Skill: Medium, Work: 40hrs]
-
-The same widget that it already used for the memory view can possibly used for this view with a few improvements. It's a text widget allocating memory only for displayed text. This widget should be improved too, as currently it doesn't free any memory.</comment>
- </item>
- <item>
<attribute id="1159649070" priority="1" done="0" start_date="732584" enddate="99999999" notify="0" endtime="-60" last_edited="1159649070"/>
<summary>Cleaning the debugger plugin code</summary>
<comment>[Skill: Basic, Work: 10hrs, Bounty: $20]
There are some warning when compiling the gdb plugin code and some useless code that should be removed.
</comment>
</item>
+ <item>
+ <attribute id="1159648703" priority="1" done="1" start_date="732584" completed_date="733068" notify="0" last_edited="1201438882"/>
+ <summary>Multi-thread support</summary>
+ <comment>[Skill: medium, Work: 30h, Bounty: $150]
+Displaying all threads and selecting one should be rather easy. But this might have some impact on the display of local variables.</comment>
+ </item>
+ <item>
+ <attribute id="1159648879" priority="1" done="1" start_date="732584" completed_date="733068" notify="0" last_edited="1201438903"/>
+ <summary>Add a disassembly window</summary>
+ <comment>[Skill: Medium, Work: 40hrs]
+
+The same widget that it already used for the memory view can possibly used for this view with a few improvements. It's a text widget allocating memory only for displayed text. This widget should be improved too, as currently it doesn't free any memory.</comment>
+ </item>
</category>
<category title="Plugin: Terminal" place="16">
<item>
Modified: trunk/libanjuta/anjuta-save-prompt.c
==============================================================================
--- trunk/libanjuta/anjuta-save-prompt.c (original)
+++ trunk/libanjuta/anjuta-save-prompt.c Sun Jan 27 13:29:36 2008
@@ -176,6 +176,8 @@
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
+ GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 10);
gtk_widget_show (scrolledwindow);
Modified: trunk/plugins/editor/anjuta-editor-scintilla.glade
==============================================================================
--- trunk/plugins/editor/anjuta-editor-scintilla.glade (original)
+++ trunk/plugins/editor/anjuta-editor-scintilla.glade Sun Jan 27 13:29:36 2008
@@ -384,37 +384,41 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label114">
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Line numbers margin width in pixels</property>
+ <widget class="GtkSpinButton" id="preferences_spin:int:80:0:edge.column">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">80 0 500 1 10 10</property>
+ <property name="climb_rate">1</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:40:0:margin.linenumber.width">
+ <widget class="GtkSpinButton" id="preferences_spin:int:350:0:caret.period">
<property name="can_focus">True</property>
- <property name="adjustment">40 10 200 1 10 10</property>
- <property name="climb_rate">1</property>
+ <property name="adjustment">212 100 10000 10 10 10</property>
+ <property name="climb_rate">10</property>
<property name="numeric">True</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1294">
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Editor caret (cursor) width in pixels</property>
+ <widget class="GtkSpinButton" id="preferences_spin:int:2:0:caret.width">
+ <property name="can_focus">True</property>
+ <property name="adjustment">1 1 3 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</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="x_options">GTK_FILL</property>
@@ -422,42 +426,42 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1300">
+ <widget class="GtkLabel" id="label1301">
+ <property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Caret blink period in milli-seconds</property>
+ <property name="label" translatable="yes">Edge column</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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1301">
- <property name="visible">True</property>
+ <widget class="GtkLabel" id="label1300">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Edge column</property>
+ <property name="label" translatable="yes">Caret blink period in milli-seconds</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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:2:0:caret.width">
- <property name="can_focus">True</property>
- <property name="adjustment">1 1 3 1 10 10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
+ <widget class="GtkLabel" id="label1294">
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Editor caret (cursor) width in pixels</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="x_options">GTK_FILL</property>
@@ -465,29 +469,25 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:350:0:caret.period">
+ <widget class="GtkSpinButton" id="preferences_spin:int:40:0:margin.linenumber.width">
<property name="can_focus">True</property>
- <property name="adjustment">212 100 10000 10 10 10</property>
- <property name="climb_rate">10</property>
+ <property name="adjustment">40 10 200 1 10 10</property>
+ <property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:80:0:edge.column">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">80 0 500 1 10 10</property>
- <property name="climb_rate">1</property>
+ <widget class="GtkLabel" id="label114">
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Line numbers margin width in pixels</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -569,77 +569,93 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label122">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Tab size in spaces:</property>
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:indent.automatic">
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable automatic indentation</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label123">
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.maintain">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Indentation size in spaces:</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Maintain past Indentation</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:4:1:tabsize">
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:tab.indents">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 100 1 10 10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
+ <property name="label" translatable="yes">Pressing tab inserts indentation</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:4:1:indent.size">
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:backspace.unindents">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 100 1 10 10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
+ <property name="label" translatable="yes">Pressing backspace un-indents</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:use.tabs">
+ <widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.closing">
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use tabs for indentation</property>
+ <property name="label" translatable="yes">Indent closing braces</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -660,93 +676,77 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.closing">
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:use.tabs">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Indent closing braces</property>
+ <property name="label" translatable="yes">Use tabs for indentation</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:backspace.unindents">
+ <widget class="GtkSpinButton" id="preferences_spin:int:4:1:indent.size">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Pressing backspace un-indents</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="adjustment">4 1 100 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:tab.indents">
+ <widget class="GtkSpinButton" id="preferences_spin:int:4:1:tabsize">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Pressing tab inserts indentation</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="adjustment">4 1 100 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.maintain">
+ <widget class="GtkLabel" id="label123">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Maintain past Indentation</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Indentation size in spaces:</property>
</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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:indent.automatic">
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable automatic indentation</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <widget class="GtkLabel" id="label122">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Tab size in spaces:</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -815,129 +815,6 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label131">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Mode:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="preferences_toggle:bool:1:0:print.color">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Colour</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Monochrome</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">preferences_toggle:bool:1:0:print.color</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.header">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Add page header</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.linewrap">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable line wrap</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label132">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Add line number every:</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="preferences_spin:int:1:0:print.linenumber.count">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">1 0 1000 1 10 10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label133">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Lines</property>
- </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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox1127">
<child>
<widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.eol">
@@ -1065,6 +942,129 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label133">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Lines</property>
+ </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">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="preferences_spin:int:1:0:print.linenumber.count">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">1 0 1000 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</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="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label132">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Add line number every:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.linewrap">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable line wrap</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.header">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Add page header</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Monochrome</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">preferences_toggle:bool:1:0:print.color</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="preferences_toggle:bool:1:0:print.color">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Colour</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label131">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mode:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -1098,7 +1098,8 @@
</widget>
<widget class="GtkDialog" id="style_editor_dialog">
<property name="title" translatable="yes">Fonts and colors for editor</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -1121,69 +1122,14 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Font:</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Attributes:</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Fore color:</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Back color:</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="font_default">
+ <widget class="GtkFontButton" id="font">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use default</property>
- <property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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">GTK_FILL</property>
@@ -1191,57 +1137,73 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="attributes_default">
+ <widget class="GtkColorButton" id="back_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use default</property>
- <property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</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="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fore_default">
+ <widget class="GtkColorButton" id="fore_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use default</property>
- <property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="back_default">
+ <widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use default</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<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>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Select highlight style to edit:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCombo" id="combo">
+ <property name="visible">True</property>
+ <property name="enable_arrows_always">False</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1302,69 +1264,84 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <widget class="GtkCheckButton" id="back_default">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select highlight style to edit:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCombo" id="combo">
- <property name="visible">True</property>
- <property name="enable_arrows_always">False</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use default</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator1">
+ <widget class="GtkCheckButton" id="fore_default">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use default</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="fore_color">
+ <widget class="GtkCheckButton" id="attributes_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use default</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<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="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="back_color">
+ <widget class="GtkCheckButton" id="font_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use default</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
+ <property name="draw_indicator">True</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="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Back color:</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
@@ -1372,14 +1349,38 @@
</packing>
</child>
<child>
- <widget class="GtkFontButton" id="font">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Fore color:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Attributes:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Font:</property>
</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">GTK_FILL</property>
@@ -1417,23 +1418,14 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Selection foreground:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkColorButton" id="caret">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Selection background:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -1441,27 +1433,27 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkColorButton" id="calltip">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Calltip background:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkColorButton" id="selection_back">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Caret (cursor) color:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <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="x_options">GTK_FILL</property>
@@ -1482,14 +1474,14 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="selection_back">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Caret (cursor) color:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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">GTK_FILL</property>
@@ -1497,33 +1489,42 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="calltip">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Calltip background:</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="caret">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Selection background:</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Selection foreground:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
Modified: trunk/plugins/editor/style-editor.c
==============================================================================
--- trunk/plugins/editor/style-editor.c (original)
+++ trunk/plugins/editor/style-editor.c Sun Jan 27 13:29:36 2008
@@ -877,6 +877,7 @@
create_style_editor_gui (StyleEditor * se)
{
GladeXML *gxml;
+ GtkWidget *pref_dialog;
GList *list = NULL;
gint i;
@@ -911,8 +912,9 @@
gtk_combo_set_popdown_strings (GTK_COMBO (se->priv->hilite_item_combo), list);
g_list_free (list);
+ pref_dialog = anjuta_preferences_get_dialog (se->prefs);
gtk_window_set_transient_for (GTK_WINDOW (se->priv->dialog),
- GTK_WINDOW (se->prefs));
+ GTK_WINDOW (pref_dialog));
g_signal_connect (G_OBJECT (GTK_COMBO(se->priv->hilite_item_combo)->entry),
"changed", G_CALLBACK (on_hilite_style_entry_changed),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
