mirror of
https://gitlab.gnome.org/GNOME/eog
synced 2024-10-18 22:14:48 +00:00
This patch fixes bug #72069. The image viewer component should now
2002-02-24 Jens Finke <jens@triq.net> This patch fixes bug #72069. The image viewer component should now integrate smoothly into Nautilus. * shell/eog-shell-ui.xml: Made the placeholder compatible with nautilus. Added a 'View' submenu which is hidden by default and added new placeholders into it. * shell/eog-window.c (add_control_to_ui): Show 'View' menu. * viewer/eog-image-view-ctrl-ui.xml: * viewer/eog-image-view-ui.xml: Adaptions to changes in eog-shell-ui.xml, fixed indention.
This commit is contained in:
Jens Finke
Jens Finke
parent
c8ea609050
commit
fecdbd5a8f
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2002-02-24 Jens Finke <jens@triq.net>
|
||||
|
||||
This patch fixes bug #72069. The image viewer component should now
|
||||
integrate smoothly into Nautilus.
|
||||
|
||||
* shell/eog-shell-ui.xml: Made the placeholder compatible with
|
||||
nautilus. Added a 'View' submenu which is hidden by default and
|
||||
added new placeholders into it.
|
||||
|
||||
* shell/eog-window.c (add_control_to_ui): Show 'View' menu.
|
||||
|
||||
* viewer/eog-image-view-ctrl-ui.xml:
|
||||
* viewer/eog-image-view-ui.xml: Adaptions to changes in
|
||||
eog-shell-ui.xml, fixed indention.
|
||||
|
||||
2002-02-23 Jens Finke <jens@triq.net>
|
||||
|
||||
This fixes bug #72228. Due to the string freeze we can't add a
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
<menuitem name="FileNewWindow" verb=""/>
|
||||
|
||||
<placeholder name="FileOperations">
|
||||
<placeholder name="Open Placeholder" delimit="top">
|
||||
<menuitem name="FileOpen" verb=""/>
|
||||
</placeholder>
|
||||
|
||||
<placeholder name="PrintOperations" delimit="top"/>
|
||||
<placeholder name="File Items Placeholder" delimit="top"/>
|
||||
|
||||
<separator/>
|
||||
|
||||
|
|
@ -44,7 +44,10 @@
|
|||
|
||||
</submenu>
|
||||
|
||||
<placeholder name="ViewPlaceholder"/>
|
||||
<submenu name="View" _label="_View" hidden="1">
|
||||
<placeholder name="View Preferences Placeholder"/>
|
||||
<placeholder name="View Items Placeholder" delimit="top"/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="Settings" _label="_Settings">
|
||||
<menuitem name="Preferences" verb=""/>
|
||||
|
|
|
|||
|
|
@ -987,7 +987,15 @@ add_control_to_ui (EogWindow *window, Bonobo_Control control)
|
|||
"eog");
|
||||
bonobo_object_release_unref (prop_control, &ev);
|
||||
}
|
||||
|
||||
|
||||
/* enable view menu */
|
||||
/* FIXME: We should check if the component adds anything to
|
||||
* the menu, so that we don't view an empty menu.
|
||||
*/
|
||||
bonobo_ui_engine_xml_set_prop (bonobo_window_get_ui_engine (BONOBO_WINDOW (window)),
|
||||
"/menu/View",
|
||||
"hidden", "0",
|
||||
"eog");
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +1,33 @@
|
|||
<Root>
|
||||
|
||||
<commands>
|
||||
<cmd name="ZoomIn" _label="Zoom _In"/>
|
||||
<cmd name="ZoomOut" _label="Zoom _Out"/>
|
||||
<cmd name="ZoomToDefault" _label="Zoom to _Default"/>
|
||||
<cmd name="ZoomToFit" _label="Zoom to _Fit"/>
|
||||
<cmd name="ZoomIn" _label="Zoom _In"/>
|
||||
<cmd name="ZoomOut" _label="Zoom _Out"/>
|
||||
<cmd name="ZoomToDefault" _label="Zoom to _Default"/>
|
||||
<cmd name="ZoomToFit" _label="Zoom to _Fit"/>
|
||||
</commands>
|
||||
|
||||
<menu>
|
||||
<placeholder name="ViewPlaceholder">
|
||||
<submenu name="View">
|
||||
<placeholder name="ZoomOperations">
|
||||
<menuitem name="ZoomIn" verb=""/>
|
||||
<menuitem name="ZoomOut" verb=""/>
|
||||
<menuitem name="ZoomToDefault" verb=""/>
|
||||
<menuitem name="ZoomToFit" verb=""/>
|
||||
</placeholder>
|
||||
</submenu>
|
||||
</placeholder>
|
||||
<submenu name="View">
|
||||
<placeholder name="Zoom Items Placeholder">
|
||||
<menuitem name="ZoomIn" verb=""/>
|
||||
<menuitem name="ZoomOut" verb=""/>
|
||||
<menuitem name="ZoomToDefault" verb=""/>
|
||||
<menuitem name="ZoomToFit" verb=""/>
|
||||
</placeholder>
|
||||
</submenu>
|
||||
</menu>
|
||||
|
||||
<dockitem name="Toolbar">
|
||||
<separator/>
|
||||
<toolitem name="ZoomIn" _label="In" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-in.xpm"/>
|
||||
<toolitem name="ZoomOut" _label="Out" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-out.xpm"/>
|
||||
<toolitem name="ZoomToDefault" _label="1:1" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-1.xpm"/>
|
||||
<toolitem name="ZoomToFit" _label="Fit" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-fit.xpm"/>
|
||||
<separator/>
|
||||
<toolitem name="ZoomIn" _label="In" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-in.xpm"/>
|
||||
<toolitem name="ZoomOut" _label="Out" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-out.xpm"/>
|
||||
<toolitem name="ZoomToDefault" _label="1:1" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-1.xpm"/>
|
||||
<toolitem name="ZoomToFit" _label="Fit" verb="" pixtype="filename"
|
||||
pixname="eog/stock-zoom-fit.xpm"/>
|
||||
</dockitem>"
|
||||
|
||||
</Root>
|
||||
|
|
@ -1,108 +1,111 @@
|
|||
<Root>
|
||||
<commands>
|
||||
<cmd name="PrintSetup" _label="Print S_etup"
|
||||
_tip="Setup the page settings for your current printer"
|
||||
pixtype="stock" pixname="Print"/>
|
||||
<cmd name="PrintPreview" _label="Print Pre_view"
|
||||
_tip="Previews the image to be printed"
|
||||
pixtype="pixbuf"/>
|
||||
<cmd name="Print" _label="_Print"
|
||||
_tip="Print image to the printer"
|
||||
pixtype="stock" pixname="Print" accel="*Control*P"/>
|
||||
|
||||
<commands>
|
||||
<cmd name="PrintSetup" _label="Print S_etup"
|
||||
_tip="Setup the page settings for your current printer"
|
||||
pixtype="stock" pixname="Print"/>
|
||||
<cmd name="PrintPreview" _label="Print Pre_view"
|
||||
_tip="Previews the image to be printed"
|
||||
pixtype="pixbuf"/>
|
||||
<cmd name="Print" _label="_Print"
|
||||
_tip="Print image to the printer"
|
||||
pixtype="stock" pixname="Print" accel="*Control*P"/>
|
||||
|
||||
<cmd name="InterpolationNearest" _label="Nea_rest Neighbour Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationTiles" _label="_Tiles Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationBilinear" _label="_Bilinear Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationHyperbolic" _label="_Hyperbolic Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
|
||||
<cmd name="DitherNone" _label="_No dithering" type="radio" group="Dither"/>
|
||||
<cmd name="DitherNormal" _label="Normal (_pseudocolor) dithering"
|
||||
type="radio" group="Dither"/>
|
||||
<cmd name="DitherMaximum" _label="_Maximum (high color) dithering"
|
||||
type="radio" group="Dither"/>
|
||||
|
||||
<cmd name="CheckTypeDark" _label="Check type _dark"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeMidtone" _label="Check type _midtone"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeLight" _label="Check type _light"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeBlack" _label="Check type _black"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeGray" _label="Check type _gray"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeWhite" _label="Check type _white"
|
||||
type="radio" group="CheckType"/>
|
||||
|
||||
<cmd name="CheckSizeSmall" _label="Check size small"
|
||||
type="radio" group="CheckSize"/>
|
||||
<cmd name="CheckSizeMedium" _label="Check size medium"
|
||||
type="radio" group="CheckSize"/>
|
||||
<cmd name="CheckSizeLarge" _label="Check size large"
|
||||
type="radio" group="CheckSize"/>
|
||||
<cmd name="FullScreen" _label="Full Screen"/>
|
||||
</commands>
|
||||
|
||||
<cmd name="InterpolationNearest" _label="Nea_rest Neighbour Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationTiles" _label="_Tiles Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationBilinear" _label="_Bilinear Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
<cmd name="InterpolationHyperbolic" _label="_Hyperbolic Interpolation"
|
||||
type="radio" group="Interpolation"/>
|
||||
|
||||
<cmd name="DitherNone" _label="_No dithering" type="radio" group="Dither"/>
|
||||
<cmd name="DitherNormal" _label="Normal (_pseudocolor) dithering"
|
||||
type="radio" group="Dither"/>
|
||||
<cmd name="DitherMaximum" _label="_Maximum (high color) dithering"
|
||||
type="radio" group="Dither"/>
|
||||
|
||||
<cmd name="CheckTypeDark" _label="Check type _dark"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeMidtone" _label="Check type _midtone"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeLight" _label="Check type _light"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeBlack" _label="Check type _black"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeGray" _label="Check type _gray"
|
||||
type="radio" group="CheckType"/>
|
||||
<cmd name="CheckTypeWhite" _label="Check type _white"
|
||||
type="radio" group="CheckType"/>
|
||||
|
||||
<cmd name="CheckSizeSmall" _label="Check size small"
|
||||
type="radio" group="CheckSize"/>
|
||||
<cmd name="CheckSizeMedium" _label="Check size medium"
|
||||
type="radio" group="CheckSize"/>
|
||||
<cmd name="CheckSizeLarge" _label="Check size large"
|
||||
type="radio" group="CheckSize"/>
|
||||
|
||||
</commands>
|
||||
|
||||
<menu>
|
||||
<menu>
|
||||
|
||||
<submenu name="File">
|
||||
|
||||
<placeholder name="FileOperations">
|
||||
<menuitem name="SaveAs" _label="Save _As"
|
||||
pixtype="stock" pixname="Save As" verb=""/>
|
||||
</placeholder>
|
||||
<placeholder name="File Items Placeholder">
|
||||
<menuitem name="SaveAs" _label="Save _As"
|
||||
pixtype="stock" pixname="Save As" verb=""/>
|
||||
|
||||
<!-- placeholder name="PrintOperations">
|
||||
<menuitem name="PrintSetup" verb=""/>
|
||||
<menuitem name="PrintPreview" verb=""/>
|
||||
<menuitem name="Print" verb=""/>
|
||||
</placeholder -->
|
||||
<!-- FIXME: Enable this if printing operations has been
|
||||
ported to Gnome2.
|
||||
<separator/>
|
||||
<menuitem name="PrintSetup" verb=""/>
|
||||
<menuitem name="PrintPreview" verb=""/>
|
||||
<menuitem name="Print" verb=""/>
|
||||
-->
|
||||
|
||||
</placeholder>
|
||||
</submenu>
|
||||
|
||||
<placeholder name="ViewPlaceholder">
|
||||
<submenu name="View" _label="View">
|
||||
|
||||
<submenu name="Interpolation" _label="_Interpolation">
|
||||
<menuitem name="InterpolationNearest" verb=""/>
|
||||
<menuitem name="InterpolationTiles" verb=""/>
|
||||
<menuitem name="InterpolationBilinear" verb=""/>
|
||||
<menuitem name="InterpolationHyperbolic" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="Dither" _label="_Dither">
|
||||
<menuitem name="DitherNone" verb=""/>
|
||||
<menuitem name="DitherNormal" verb=""/>
|
||||
<menuitem name="DitherMaximum" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="CheckType" _label="Check _type">
|
||||
<menuitem name="CheckTypeDark" verb=""/>
|
||||
<menuitem name="CheckTypeMidtone" verb=""/>
|
||||
<menuitem name="CheckTypeLight" verb=""/>
|
||||
<menuitem name="CheckTypeBlack" verb=""/>
|
||||
<menuitem name="CheckTypeGray" verb=""/>
|
||||
<menuitem name="CheckTypeWhite" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="CheckSize" _label="Check _size">
|
||||
<menuitem name="CheckSizeSmall" verb=""/>
|
||||
<menuitem name="CheckSizeMedium" verb=""/>
|
||||
<menuitem name="CheckSizeLarge" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<placeholder name="ZoomMenu" delimit="top"/>
|
||||
|
||||
<separator/>
|
||||
|
||||
<menuitem name="FullScreen" _label="Full Screen" verb=""/>
|
||||
</submenu>
|
||||
<submenu name="View">
|
||||
|
||||
</placeholder>
|
||||
<placeholder name="View Preferences Placeholder">
|
||||
|
||||
<submenu name="Interpolation" _label="_Interpolation">
|
||||
<menuitem name="InterpolationNearest" verb=""/>
|
||||
<menuitem name="InterpolationTiles" verb=""/>
|
||||
<menuitem name="InterpolationBilinear" verb=""/>
|
||||
<menuitem name="InterpolationHyperbolic" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="Dither" _label="_Dither">
|
||||
<menuitem name="DitherNone" verb=""/>
|
||||
<menuitem name="DitherNormal" verb=""/>
|
||||
<menuitem name="DitherMaximum" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="CheckType" _label="Check _type">
|
||||
<menuitem name="CheckTypeDark" verb=""/>
|
||||
<menuitem name="CheckTypeMidtone" verb=""/>
|
||||
<menuitem name="CheckTypeLight" verb=""/>
|
||||
<menuitem name="CheckTypeBlack" verb=""/>
|
||||
<menuitem name="CheckTypeGray" verb=""/>
|
||||
<menuitem name="CheckTypeWhite" verb=""/>
|
||||
</submenu>
|
||||
|
||||
<submenu name="CheckSize" _label="Check _size">
|
||||
<menuitem name="CheckSizeSmall" verb=""/>
|
||||
<menuitem name="CheckSizeMedium" verb=""/>
|
||||
<menuitem name="CheckSizeLarge" verb=""/>
|
||||
</submenu>
|
||||
</placeholder>
|
||||
|
||||
<placeholder name="View Items Placeholder">
|
||||
<menuitem name="FullScreen" verb=""/>
|
||||
</placeholder>
|
||||
|
||||
<placeholder name="Zoom Items Placeholder" delimit="top"/>
|
||||
</submenu>
|
||||
|
||||
</menu>
|
||||
|
||||
</menu>
|
||||
</Root>
|
||||
|
|
|
|||
Loading…
Reference in a new issue