Use an unique factory for both interfaces.

2003-11-14  Marco Pesenti Gritti  <marco@gnome.org>

        * data/GNOME_Epiphany_Automation.server.in:
        * data/GNOME_Epiphany_NautilusView.server.in:

        Use an unique factory for both interfaces.

        * data/ui/Makefile.am:

        Do not try to merge translations in nautilus xml.

        * src/ephy-nautilus-view.c: (disconnected_idle),
        (control_disconnected_cb), (ephy_nautilus_view_instance_init),
        (ephy_nautilus_view_finalize):

        Unref the view on control disconnected, not on finalize.

        * src/ephy-main.c: (main):

        Add a server mode argument, used internally by bonobo interface.
        Free popt context only when no more necessary.

        * src/ephy-automation.c:
        * src/ephy-automation.h:
        * src/ephy-shell.c: (ephy_nautilus_view_new),
        (ephy_automation_factory_cb), (ephy_automation_factory_new),
        (ephy_shell_init), (path_from_command_line_arg), (open_urls),
        (server_timeout), (ephy_shell_startup), (ephy_shell_finalize),
        (ephy_shell_new_tab):
        * src/ephy-shell.h:

        When running in server mode unref (and so exit) on a timeout.

        Expand args passed to the command line.

1 files changed, 128 insertions, 0 deletions

diff --git a/data/ui/nautilus-epiphany-view.xml b/data/ui/nautilus-epiphany-view.xml
new file mode 100644
index 000000000..4858abd3f
--- /dev/null
+++ b/data/ui/nautilus-epiphany-view.xml
@@ -0,0 +1,128 @@
+<Root>
+<commands>
+
+        <cmd name="FilePrint" _label="Print"
+	_tip="Print the Current File" pixtype="stock" pixname="gtk-print"
+	accel="*Control*P"/>
+	
+        <cmd name="EditCut" _label="Cut" _tip="Cut the Selection"
+        pixtype="stock" pixname="gtk-cut"/>
+	
+        <cmd name="EditCopy" _label="Copy"
+	_tip="Copy the Selection" pixtype="stock" pixname="gtk-copy"/>
+	
+        <cmd name="EditPaste" _label="Paste"
+	_tip="Paste the Clipboard" pixtype="stock" pixname="gtk-paste"/>
+	
+	<cmd name="EditSelectAll" _label="Select All" _tip="Select the Entire Document"
+	accel="*Control*A"/>     
+
+	<cmd name="EditFind" _label="Find" _tip="Search for a String"
+        pixtype="stock" pixname="gtk-find" accel="*Control*F"/>
+
+
+	<cmd name="EPOpenInNewWindow" _label="Open in New Window"
+	pixtype="stock" pixname="gtk-new"/>
+	
+	<cmd name="EPCopyLinkLocation" _label="Copy Link Address"
+	pixtype="stock" pixname="gtk-copy"/>
+
+	<cmd name="EPDownloadLink" _label="Download Link"/>
+
+	<cmd name="EPOpenImage" _label="Open Image"
+	pixtype="stock" pixname="gtk-open"/>
+
+	<cmd name="EPOpenImageInNewWindow" _label="Open Image in New Window"/>
+	
+	<cmd name="EPSaveImageAs" _label="Save Image As..."
+	pixtype="stock" pixname="gtk-save"/>
+	
+	<cmd name="EPSetImageAsBackground" _label="Use Image As Background"/>
+	
+	<cmd name="EPCopyImageLocation" _label="Copy Image Address"
+	pixtype="stock" pixname="gtk-copy"/>
+
+	<cmd name="DPCopyLocation" _label="Copy Page Address"
+	pixtype="stock" pixname="gtk-copy"/>
+
+	<cmd name="DPOpenFrame" _label="Open Frame"
+	pixtype="stock" pixname="gtk-open"/>
+	
+	<cmd name="DPOpenFrameInNewWindow" _label="Open Frame in New Window"/>
+	
+	<cmd name="DPAddFrameBookmark" _label="Add Bookmark for Frame"
+	pixtype="stock" pixname="gtk-add"/>
+
+	<cmd name="DPSavePageAs" _label="Save Page As..."
+	pixtype="stock" pixname="gtk-save"/>
+	
+	<cmd name="DPSaveBackgroundAs" _label="Save Background As..."/>
+	
+	<cmd name="PPVGotoFirst" _label="First"/>
+	
+	<cmd name="PPVGotoLast" _label="Last"/>
+
+	<cmd name="PPVGoBack" _label="Previous"/>
+
+	<cmd name="PPVGoForward" _label="Next"/>
+
+	<cmd name="EPCopyEmail" _label="Copy Email Address"/>
+        
+</commands>
+
+<menu>
+	<submenu name="File" _label="_File">
+		<menuitem name="FilePrint" verb="" _label="_Print..."/>
+	</submenu>	
+	<submenu name="Edit" _label="_Edit">
+		<menuitem name="EditFind" verb="" _label="_Find..."/>
+	</submenu>
+	<submenu name="View">
+		<menuitem name="ViewEncoding" verb="" _label="Text _Encoding..."/>
+	</submenu>
+</menu>
+
+<popups>
+
+	<popup name="EphyEmbedInputPopup">
+		<menuitem name="EditCut" verb=""/>
+		<menuitem name="EditCopy" verb=""/>
+		<menuitem name="EditPaste" verb=""/>
+	</popup>
+
+        <popup name="EphyEmbedDocumentPopup">
+		<menuitem name="DPSavePageAs" verb=""/>
+		<menuitem name="DPSaveBackgroundAs" verb=""/>
+        	<menuitem name="DPCopyLocation" verb=""/>
+		<placeholder name="FrameItems">
+			<separator/>
+			<menuitem name="DPOpenFrame" verb=""/>
+			<menuitem name="DPOpenFrameInNewWindow" verb=""/>
+		</placeholder>
+	</popup>
+	
+	<popup name="EphyEmbedElementPopup">
+		<placeholder name="LinkItems">
+        		<menuitem name="EPOpenInNewWindow" verb=""/>
+			<menuitem name="EPCopyLinkLocation" verb=""/>
+			<menuitem name="EPDownloadLink" verb=""/>
+		</placeholder>
+		<placeholder name="EmailLinkItems">
+                        <menuitem name="EPCopyEmail" 
+                         pixtype="stock" pixname="gtk-copy"     
+                         verb=""/>
+                </placeholder>
+		<placeholder name="BetweenElements1">
+			<separator/>
+		</placeholder>
+		<placeholder name="ImageItems">
+			<menuitem name="EPOpenImage" verb=""/>
+			<menuitem name="EPOpenImageInNewWindow" verb=""/>
+			<menuitem name="EPSaveImageAs" verb=""/>
+			<menuitem name="EPSetImageAsBackground" verb=""/>
+			<menuitem name="EPCopyImageLocation" verb=""/>
+      		</placeholder>
+	</popup>
+</popups>
+
+</Root>