dia r4318 - in trunk: . doc/en doc/en/graphics plug-ins/cairo
- From: hans svn gnome org
- To: svn-commits-list gnome org
- Subject: dia r4318 - in trunk: . doc/en doc/en/graphics plug-ins/cairo
- Date: Sun, 15 Mar 2009 11:57:26 +0000 (UTC)
Author: hans
Date: Sun Mar 15 11:57:26 2009
New Revision: 4318
URL: http://svn.gnome.org/viewvc/dia?rev=4318&view=rev
Log:
2009-03-15 Hans Breuer <hans breuer org>
* doc/en/usage-objects-basic.xml : removed old workaround for DEL, we
have put quite some work to make it behave as expected. Still it would
be nice to have described the new text edit mode in more detail ...
* doc/en/usage-customization.xml doc/en/graphics/file-preferences-*.png
doc/en/graphics/preferences-gridlines.png : updated to show the new
layout, also initial description of the Favorites pane.
Whitespace changes to have it more readable with tab width 8.
* doc/en/graphics/preferences-fig.png : unused -> deleted
* doc/en/Makefile.am : reflect above changes
* plug-ins/cairo/diacairo-renderer.c : some unused test-code attempting
to work around bug #573261 but no luck.
Added:
trunk/doc/en/graphics/file-preferences-favorites.png (contents, props changed)
Removed:
trunk/doc/en/graphics/preferences-fig.png
Modified:
trunk/ChangeLog
trunk/doc/en/Makefile.am
trunk/doc/en/graphics/file-preferences-diagram.png
trunk/doc/en/graphics/file-preferences-tree.png
trunk/doc/en/graphics/file-preferences-ui.png
trunk/doc/en/graphics/file-preferences-view.png
trunk/doc/en/graphics/preferences-gridlines.png
trunk/doc/en/usage-customization.xml
trunk/doc/en/usage-objects-basic.xml
trunk/plug-ins/cairo/diacairo-renderer.c
Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am (original)
+++ trunk/doc/en/Makefile.am Sun Mar 15 11:57:26 2009
@@ -89,7 +89,6 @@
graphics/before-vert-spread.png \
graphics/polyline-rightclick.png \
graphics/bezierline-rightclick.png \
- graphics/preferences-fig.png \
graphics/canvas-zoom.png \
graphics/preferences-gridlines.png \
graphics/cisco-computer-shapes.png \
@@ -133,6 +132,7 @@
graphics/edit-text.png \
graphics/toolbox.png \
graphics/file-preferences-diagram.png \
+ graphics/file-preferences-favorites.png \
graphics/uml-shapes.png \
graphics/file-preferences-tree.png \
graphics/view-menu.png \
Modified: trunk/doc/en/graphics/file-preferences-diagram.png
==============================================================================
Binary files. No diff available.
Added: trunk/doc/en/graphics/file-preferences-favorites.png
==============================================================================
Binary file. No diff available.
Modified: trunk/doc/en/graphics/file-preferences-tree.png
==============================================================================
Binary files. No diff available.
Modified: trunk/doc/en/graphics/file-preferences-ui.png
==============================================================================
Binary files. No diff available.
Modified: trunk/doc/en/graphics/file-preferences-view.png
==============================================================================
Binary files. No diff available.
Modified: trunk/doc/en/graphics/preferences-gridlines.png
==============================================================================
Binary files. No diff available.
Modified: trunk/doc/en/usage-customization.xml
==============================================================================
--- trunk/doc/en/usage-customization.xml (original)
+++ trunk/doc/en/usage-customization.xml Sun Mar 15 11:57:26 2009
@@ -1,80 +1,78 @@
- <chapter label="9" id="usage-customization">
+<chapter label="9" id="usage-customization">
<title>Customization</title>
- <sect1 id="prefs">
- <title>Preferences Dialog</title>
+ <sect1 id="prefs">
+ <title>Preferences Dialog</title>
- <para>
- <application>Dia</application> allows you to set a number of
- customization options that modify how the program works.
- These options are set by selecting the
- <menuchoice>
- <guimenu>File</guimenu> <guimenuitem>Preferences</guimenuitem>
- </menuchoice> from the <interface>Toolbox Menu Bar</interface>.
- This opens the <interface>Preferences</interface> dialog. This
- dialog has five tab panes: User Interface, Diagram Defaults,
- View Defaults, Grid Lines, and Diagram Tree.
- </para>
- <para>
+ <para>
+ <application>Dia</application> allows you to set a number of
+ customization options that modify how the program works.
+ These options are set by selecting the
+ <menuchoice>
+ <guimenu>File</guimenu> <guimenuitem>Preferences</guimenuitem>
+ </menuchoice> from the <interface>Toolbox Menu Bar</interface>.
+ This opens the <interface>Preferences</interface> dialog. This
+ dialog has tab panes grouping related preferences like: User Interface,
+ Diagram Defaults, View Defaults and Grid Lines.
+ </para>
+ <para>
After you have made all the changes you want, click on
<guibutton>OK</guibutton> to apply the changes and close the
<interface>Preferences</interface> dialog. To cancel the changes and return
to previous values, click the <guibutton>Close</guibutton> button. You may
preview the effect of your changes using the Apply
button.
- </para>
- <sect2 id="user-interface">
- <title>User Interface</title>
- <para>
- <figure>
+ </para>
+ <sect2 id="user-interface">
+ <title>User Interface</title>
+ <para>
+ <figure>
<title><interface>User Interface</interface></title>
<screenshot>
- <screeninfo><interface>User Interface</interface>
- dialog box</screeninfo>
- <graphic format="PNG" fileref="graphics/file-preferences-ui"
- srccredit="Mark Dexter" />
+ <screeninfo><interface>User Interface</interface> dialog box</screeninfo>
+ <graphic format="PNG" fileref="graphics/file-preferences-ui"
+ srccredit="Hans Breuer" />
</screenshot>
- </figure>
- </para>
- <para>
- The User Interface tab pane allows you to change the way
- <application>Dia</application> works.
- The configurable properties in the User Interface tab are explained below.
- </para>
- <itemizedlist>
- <listitem>
-
- <para>
- Reset tools after create causes the Modify tool to be selected
- automatically each time an object has been added to the diagram. This
- allows you to add an object and then use the Modify tool to select objects
- without having to go back to the Toolbox.
- </para>
- <para>
- If the Reset tools button is not checked,
- then the current object tool will "stick" until another tool is chosen. This
- is useful if you want to draw many shapes using the same tool repeatedly.
- However, in this case, you will need to manually select the Modify tool
- in order to select objects.
- </para>
- <tip>
- <para>
- As an alternative to unchecking this box,
- you can press the Space key after inserting an object to reselect
- the last object. See <link linkend="adding-objects">Adding Objects</link>
- for more information.
- </para>
- </tip>
- </listitem>
- <listitem>
- <para>
- Compress saved files provides the option to have Dia XML files
- compressed into much smaller files using gzip or to leave the Dia XML
- files as plain text so that they can be more easily edited using other
- software.
+ </figure>
</para>
- </listitem>
- <listitem>
<para>
+ The User Interface tab pane allows you to change the way
+ <application>Dia</application> works.
+ The configurable properties in the User Interface tab are explained below.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Reset tools after create causes the Modify tool to be selected
+ automatically each time an object has been added to the diagram. This
+ allows you to add an object and then use the Modify tool to select objects
+ without having to go back to the Toolbox.
+ </para>
+ <para>
+ If the Reset tools button is not checked,
+ then the current object tool will "stick" until another tool is chosen. This
+ is useful if you want to draw many shapes using the same tool repeatedly.
+ However, in this case, you will need to manually select the Modify tool
+ in order to select objects.
+ </para>
+ <tip>
+ <para>
+ As an alternative to unchecking this box,
+ you can press the Space key after inserting an object to reselect
+ the last object. See <link linkend="adding-objects">Adding Objects</link>
+ for more information.
+ </para>
+ </tip>
+ </listitem>
+ <listitem>
+ <para>
+ Compress saved files provides the option to have Dia XML files
+ compressed into much smaller files using gzip or to leave the Dia XML
+ files as plain text so that they can be more easily edited using other
+ software.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Number of undo levels customizes how many steps that the undo tool
remembers. The higher the number, the more steps you can undo to fix an
error. However, more undo levels requires more computer memory.
@@ -150,9 +148,8 @@
<screenshot>
<screeninfo>Diagram Defaults</screeninfo>
<graphic format="PNG" fileref="graphics/file-preferences-diagram"
- srccredit=
- "Mark Dexter" />
- </screenshot>
+ srccredit="Hans Breuer" />
+ </screenshot>
</figure>
<para>
The Diagram Defaults tab allows you to set default properties for all new
@@ -217,9 +214,8 @@
<screenshot>
<screeninfo>View Defaults</screeninfo>
<graphic format="PNG" fileref="graphics/file-preferences-view"
- srccredit=
- "Mark Dexter" />
- </screenshot>
+ srccredit="Hans Breuer" />
+ </screenshot>
</figure>
<para>
This tab allows you to set default properties for the Page break lines.
@@ -255,94 +251,97 @@
</sect2>
+ <sect2 id="preferences-favorites">
+ <title>File export favorites</title>
+ When exporting files there are often multiple filters capable to save to one format.
+ This preference allows to choose the one used, when not explicit selected in the file
+ export dialog, i.e. <menuchoice><guimenuitem>By extension</guimenuitem></menuchoice> gets used.
+ <figure>
+ <screenshot>
+ <screeninfo>File export favorites</screeninfo>
+ <graphic format="PNG" fileref="graphics/file-preferences-favorites"
+ srccredit="Hans Breuer" />
+ </screenshot>
+ </figure>
+ </sect2>
- <sect2 id="preferences-gridlines">
- <title>Grid Lines</title>
- <figure>
+ <sect2 id="preferences-gridlines">
<title>Grid Lines</title>
- <screenshot>
- <screeninfo>Grid Lines</screeninfo>
- <graphic format="PNG" fileref="graphics/preferences-gridlines"
- srccredit=
- "Mark Dexter" />
- </screenshot>
- </figure>
- <para>
-
- This tab allows you to set default properties for Grid Lines. These may
- be changed for an individual diagram by selecting the
- <menuchoice>
- <guimenu>
- Diagram
- </guimenu>
- <guimenuitem>
- Properties
- </guimenuitem></menuchoice> from the Diagram menu bar and then selecting
- the Grid tab. These options are explained below.
-
- </para>
-<itemizedlist>
- <listitem>
- <para>
- Visible determines whether, by default, grid lines will be visible on
- new diagrams.
- </para>
- </listitem>
- <listitem>
- <para>
- Snap to determines whether, by default, new diagrams will have snap-to-grid
- enabled. Snap-to-grid forces object edges to move to the nearest grid line
- intersection.
- This makes it easier to align objects, as separate objects
- snap to the same line. This feature can be toggled on or off using the
- snap-to-grid button on the bottom of the Toolbox.
- See <link linkend="gridlines">Canvas /
- Grid Lines</link> for more information. This can also be toggled using the
- <menuchoice>
- <guimenu>
- View
- </guimenu>
- <guimenuitem>
- Snap To Grid
- </guimenuitem></menuchoice> option on the Diagram menu bar.
+
+ <figure>
+ <title>Grid Lines</title>
+ <screenshot>
+ <screeninfo>Grid Lines</screeninfo>
+ <graphic format="PNG" fileref="graphics/preferences-gridlines"
+ srccredit="Hans Breuer" />
+ </screenshot>
+ </figure>
+ <para>
+ This tab allows you to set default properties for Grid Lines. These may
+ be changed for an individual diagram by selecting the
+ <menuchoice>
+ <guimenu>Diagram</guimenu>
+ <guimenuitem>Properties</guimenuitem>
+ </menuchoice> from the Diagram menu bar and then selecting
+ the Grid tab. These options are explained below.
</para>
- </listitem>
- <listitem>
- <para>
- Dynamic grid resizing determines whether the grid size changes as the
- diagram is zoomed in or out. If this box is checked, then the grid lines
- display as the same size no matter how the diagram zoom is changed.
- In this case, the X Size and Y Size values have no effect.
- </para>
- <para>
- If this
- box is unchecked, then the grid size is set in absolute terms according to
- the X Size and Y Size values (in centimeters). In this case, the appearance
- of the grid will change as the zoom changes, so the grid lines will
- move closer when you zoom out and will spread out as you zoom in.
- </para>
- </listitem>
- <listitem>
- <para>
- X Size determines the distance, in centimeters, between grid lines
- along the horizontal axis. This only
- takes effect if Dynamic grid resizing is unchecked.
- </para>
- </listitem>
-
- <listitem>
- <para>
- Y Size determines the distance, in centimeters, between grid lines
- along the vertical axis. This only
- takes effect if Dynamic grid resizing is unchecked.
- </para>
- </listitem>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Visible determines whether, by default, grid lines will be visible on new diagrams.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Snap to determines whether, by default, new diagrams will have snap-to-grid
+ enabled. Snap-to-grid forces object edges to move to the nearest grid line
+ intersection.
+ This makes it easier to align objects, as separate objects
+ snap to the same line. This feature can be toggled on or off using the
+ snap-to-grid button on the bottom of the Toolbox.
+ See <link linkend="gridlines">Canvas / Grid Lines</link> for more information.
+ This can also be toggled using the
+ <menuchoice>
+ <guimenu>View</guimenu>
+ <guimenuitem>Snap To Grid</guimenuitem>
+ </menuchoice> option on the Diagram menu bar.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Dynamic grid resizing determines whether the grid size changes as the
+ diagram is zoomed in or out. If this box is checked, then the grid lines
+ display as the same size no matter how the diagram zoom is changed.
+ In this case, the X Size and Y Size values have no effect.
+ </para>
+ <para>
+ If this box is unchecked, then the grid size is set in absolute terms according to
+ the X Size and Y Size values (in centimeters). In this case, the appearance
+ of the grid will change as the zoom changes, so the grid lines will
+ move closer when you zoom out and will spread out as you zoom in.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ X Size determines the distance, in centimeters, between grid lines
+ along the horizontal axis. This only
+ takes effect if Dynamic grid resizing is unchecked.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Y Size determines the distance, in centimeters, between grid lines
+ along the vertical axis. This only
+ takes effect if Dynamic grid resizing is unchecked.
+ </para>
+ </listitem>
- <listitem>
- <para>
- Color sets the display color of the grid lines.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Color sets the display color of the grid lines.
+ </para>
+ </listitem>
+
<listitem>
<para>
Lines per major line determines the spacing of major (i.e., solid)
Modified: trunk/doc/en/usage-objects-basic.xml
==============================================================================
--- trunk/doc/en/usage-objects-basic.xml (original)
+++ trunk/doc/en/usage-objects-basic.xml Sun Mar 15 11:57:26 2009
@@ -59,11 +59,14 @@
Backspace.
</para>
<note><para>
-The DEL key deletes the entire object, not the text
-to the right of the cursor. Use Shift+DEL to delete the text to the right of
-the cursor. (Use <menuchoice><guimenu>Edit</guimenu>
- <guimenuitem>Undo</guimenuitem></menuchoice>
- or Ctrl+Z if you delete an object by mistake.) To
+The DEL key used to delete the entire object, now it should work as expected:
+it either deletes the object or the text to the right of the cursor depending
+on the editing mode.
+If you delete something (text or object) by accident use
+<menuchoice>
+ <guimenu>Edit</guimenu>
+ <guimenuitem>Undo</guimenuitem>
+</menuchoice>or Ctrl+Z if you delete an object by mistake.) To
delete all of the text in an object, use the Cut (Ctrl+Shift+X).
</para></note>
</listitem>
Modified: trunk/plug-ins/cairo/diacairo-renderer.c
==============================================================================
--- trunk/plug-ins/cairo/diacairo-renderer.c (original)
+++ trunk/plug-ins/cairo/diacairo-renderer.c Sun Mar 15 11:57:26 2009
@@ -127,6 +127,19 @@
#endif
cairo_set_fill_rule (renderer->cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+#if 0 /* try to work around bug #341481 - no luck */
+ {
+ cairo_font_options_t *fo = cairo_font_options_create ();
+ cairo_get_font_options (renderer->cr, fo);
+ /* try to switch off kerning */
+ cairo_font_options_set_hint_style (fo, CAIRO_HINT_STYLE_NONE);
+ cairo_font_options_set_hint_metrics (fo, CAIRO_HINT_METRICS_OFF);
+
+ cairo_set_font_options (renderer->cr, fo);
+ cairo_font_options_destroy (fo);
+ }
+#endif
DIAG_STATE(renderer->cr)
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
