summaryrefslogtreecommitdiff
path: root/mate-dictionary/data
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-01-27 01:09:48 -0800
committerStefano Karapetsas <[email protected]>2013-01-27 01:09:48 -0800
commit3afeef7b4632cbd00c7b8218f545496eb81efaef (patch)
tree001c28d5558c10b5e35101e60f3061eed11b276f /mate-dictionary/data
parentbbf4c3447a09a5e4be8307e3df3b3405781bead2 (diff)
parente5695421503bcaf9f12fe389ad8395ba8945d664 (diff)
downloadmate-utils-3afeef7b4632cbd00c7b8218f545496eb81efaef.tar.bz2
mate-utils-3afeef7b4632cbd00c7b8218f545496eb81efaef.tar.xz
Merge pull request #19 from bhull2010/master
Port mate-dictionary-applet to libmatepanelapplet-4.0
Diffstat (limited to 'mate-dictionary/data')
-rw-r--r--mate-dictionary/data/MATE_DictionaryApplet.server.in.in55
-rw-r--r--mate-dictionary/data/MATE_DictionaryApplet.xml15
-rw-r--r--mate-dictionary/data/Makefile.am40
-rw-r--r--mate-dictionary/data/dictionary-applet-menu.xml9
-rw-r--r--mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in11
-rw-r--r--mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in3
6 files changed, 47 insertions, 86 deletions
diff --git a/mate-dictionary/data/MATE_DictionaryApplet.server.in.in b/mate-dictionary/data/MATE_DictionaryApplet.server.in.in
deleted file mode 100644
index 3c69076e..00000000
--- a/mate-dictionary/data/MATE_DictionaryApplet.server.in.in
+++ /dev/null
@@ -1,55 +0,0 @@
-<oaf_info>
-
- <oaf_server iid="OAFIID:MATE_DictionaryApplet_Factory"
- type="exe"
- location="@LIBEXECDIR@/mate-dictionary-applet">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MateComponent/GenericFactory:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="GDict Applet Factory"/>
- <oaf_attribute name="description" type="string" value="GDict Applet Factory"/>
-
- </oaf_server>
-
- <oaf_server iid="OAFIID:MATE_DictionaryApplet"
- type="factory"
- location="OAFIID:MATE_DictionaryApplet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
- <item value="IDL:MateComponent/Control:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Dictionary Look up"/>
- <oaf_attribute name="description" type="string" _value="Look up words in a dictionary"/>
- <oaf_attribute name="panel:category" type="string" value="Accessories"/>
- <oaf_attribute name="panel:icon" type="string" value="accessories-dictionary.png"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/>
- <oaf_attribute name="bugzilla:product" type="string" value="mate-utils"/>
- <oaf_attribute name="bugzilla:component" type="string" value="gdict-applet"/>
- <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
- <oaf_attribute name="bugzilla:other_binaries" type="string" value="mate-dictionary-applet"/>
-
- </oaf_server>
-
- <oaf_server iid="OAFIID:MATE_GDictApplet"
- type="factory"
- location="OAFIID:MATE_DictionaryApplet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
- <item value="IDL:MateComponent/Control:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Dictionary Look up"/>
- <oaf_attribute name="description" type="string" _value="Look up words in a dictionary"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/>
- <oaf_attribute name="bugzilla:product" type="string" value="mate-utils"/>
- <oaf_attribute name="bugzilla:component" type="string" value="gdict-applet"/>
- <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
- <oaf_attribute name="bugzilla:other_binaries" type="string" value="mate-dictionary-applet"/>
- </oaf_server>
-
-</oaf_info>
diff --git a/mate-dictionary/data/MATE_DictionaryApplet.xml b/mate-dictionary/data/MATE_DictionaryApplet.xml
deleted file mode 100644
index 3e975cc1..00000000
--- a/mate-dictionary/data/MATE_DictionaryApplet.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
- <popups>
- <popup name="button3">
- <menuitem name="LookUpItem" verb="LookUp" _label="_Look Up Selected Text" pixtype="stock" pixname="gtk-find"/>
- <separator/>
- <menuitem name="ClearItem" verb="Clear" _label="Cl_ear" pixtype="stock" pixname="gtk-clear"/>
- <menuitem name="PrintItem" verb="Print" _label="_Print" pixtype="stock" pixname="gtk-print"/>
- <menuitem name="SaveItem" verb="Save" _label="_Save" pixtype="stock" pixname="gtk-save-as"/>
- <separator/>
- <menuitem name="PreferencesItem" verb="Preferences" _label="_Preferences" pixtype="stock" pixname="gtk-properties"/>
- <menuitem name="HelpItem" verb="Help" _label="_Help" pixtype="stock" pixname="gtk-help"/>
- <menuitem name="AboutItem" verb="About" _label="_About" pixtype="stock" pixname="gtk-about"/>
- </popup>
- </popups>
-</Root>
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am
index 55f553df..5500b65d 100644
--- a/mate-dictionary/data/Makefile.am
+++ b/mate-dictionary/data/Makefile.am
@@ -32,21 +32,28 @@ ui_DATA = mate-dictionary-ui.xml
if BUILD_GDICT_APPLET
-# applet menu definition
-appletuidir = $(datadir)/mate-2.0/ui
-appletui_DATA = MATE_DictionaryApplet.xml
+# applet file, dbus service, and menu definition
+appletdir = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.DictionaryApplet.mate-panel-applet.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
-serverdir = $(libdir)/matecomponent/servers
-server_in_files = MATE_DictionaryApplet.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+$(applet_in_files): $(applet_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ $< > $@
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
- $(AM_V_GEN)sed \
- -e "s|\@VERSION\@|@VERSION@|" \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
+%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-@INTLTOOL_SERVER_RULE@
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.DictionaryAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.DictionaryAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ $< > $@
+
+ui_DATA += dictionary-applet-menu.xml
endif # BUILD_GDICT_APPLET
@@ -59,20 +66,21 @@ convertdir = $(datadir)/MateConf/gsettings
convert_DATA = mate-dictionary.convert
EXTRA_DIST = \
- MATE_DictionaryApplet.server.in.in \
+ org.mate.DictionaryApplet.mate-panel-applet.in.in \
+ $(service_in_files) \
mate-dictionary.desktop.in.in \
$(dictsource_in_files) \
$(man_MANS) \
$(gsettingsschema_in_files) \
$(builder_DATA) \
$(ui_DATA) \
- $(appletui_DATA) \
$(NULL)
CLEANFILES = \
+ $(applet_DATA) \
+ $(applet_DATA).in \
+ $(service_DATA) \
$(dictsource_DATA) \
- $(server_in_files) \
- $(server_DATA) \
$(gdictapp_in_files) \
$(gdictapp_DATA) \
$(gsettings_SCHEMAS) \
diff --git a/mate-dictionary/data/dictionary-applet-menu.xml b/mate-dictionary/data/dictionary-applet-menu.xml
new file mode 100644
index 00000000..b1b49335
--- /dev/null
+++ b/mate-dictionary/data/dictionary-applet-menu.xml
@@ -0,0 +1,9 @@
+<menuitem name="Dictionary Lookup Item" action="DictionaryLookup" />
+<separator/>
+<menuitem name="Dictionary Clear Item" action="DictionaryClear" />
+<menuitem name="Dictionary Print Item" action="DictionaryPrint" />
+<menuitem name="Dictionary Save Item" action="DictionarySave" />
+<separator/>
+<menuitem name="Dictionary Preferences Item" action="DictionaryPreferences" />
+<menuitem name="Dictionary Help Item" action="DictionaryHelp" />
+<menuitem name="Dictionary About Item" action="DictionaryAbout" />
diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
new file mode 100644
index 00000000..ab8ecd82
--- /dev/null
+++ b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
@@ -0,0 +1,11 @@
+[Applet Factory]
+Id=DictionaryAppletFactory
+Location=@LIBEXECDIR@/mate-dictionary-applet
+_Name=Dictionary Applet Factory
+_Description=Factory for the dictionary applet
+
+[DictionaryApplet]
+_Name=Dictionary Look up
+_Description=Look up words in a dictionary
+Icon=accessories-dictionary
+MateComponentId=OAFIID:MATE_DictionaryApplet
diff --git a/mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in b/mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
new file mode 100644
index 00000000..c16b4127
--- /dev/null
+++ b/mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.DictionaryAppletFactory
+Exec=@LIBEXECDIR@/mate-dictionary-applet