diff options
Diffstat (limited to 'mateweather/data')
4 files changed, 50 insertions, 24 deletions
diff --git a/mateweather/data/Makefile.am b/mateweather/data/Makefile.am index 4dfe4884..d200608b 100644 --- a/mateweather/data/Makefile.am +++ b/mateweather/data/Makefile.am @@ -1,29 +1,40 @@ -appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmateweather-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mateweather-applet +endif !ENABLE_IN_PROCESS + +appletdir = $(datadir)/mate-panel/applets applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) -org.mate.panel.applet.MateWeatherAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) + $(service_DATA) \ + $(NULL) EXTRA_DIST = \ mateweather-applet-menu.xml \ diff --git a/mateweather/data/mateweather-dialog.ui b/mateweather/data/mateweather-dialog.ui index e370ac7e..5beedb05 100644 --- a/mateweather/data/mateweather-dialog.ui +++ b/mateweather/data/mateweather-dialog.ui @@ -86,6 +86,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">City:</property> + <property name="mnemonic-widget">cond_location</property> </object> <packing> <property name="left_attach">0</property> @@ -98,6 +99,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Last update:</property> + <property name="mnemonic-widget">cond_update</property> </object> <packing> <property name="left_attach">0</property> @@ -110,6 +112,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Conditions:</property> + <property name="mnemonic-widget">cond_cond</property> </object> <packing> <property name="left_attach">0</property> @@ -122,6 +125,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Sky:</property> + <property name="mnemonic-widget">cond_sky</property> </object> <packing> <property name="left_attach">0</property> @@ -134,6 +138,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Temperature:</property> + <property name="mnemonic-widget">cond_temp</property> </object> <packing> <property name="left_attach">0</property> @@ -146,6 +151,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Feels like:</property> + <property name="mnemonic-widget">cond_apparent</property> </object> <packing> <property name="left_attach">0</property> @@ -158,6 +164,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Dew point:</property> + <property name="mnemonic-widget">cond_dew</property> </object> <packing> <property name="left_attach">0</property> @@ -170,6 +177,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Relative humidity:</property> + <property name="mnemonic-widget">cond_humidity</property> </object> <packing> <property name="left_attach">0</property> @@ -182,6 +190,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Wind:</property> + <property name="mnemonic-widget">cond_wind</property> </object> <packing> <property name="left_attach">0</property> @@ -194,6 +203,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Pressure:</property> + <property name="mnemonic-widget">cond_pressure</property> </object> <packing> <property name="left_attach">0</property> @@ -206,6 +216,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Visibility:</property> + <property name="mnemonic-widget">cond_vis</property> </object> <packing> <property name="left_attach">0</property> @@ -218,6 +229,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Sunrise:</property> + <property name="mnemonic-widget">cond_sunrise</property> </object> <packing> <property name="left_attach">0</property> @@ -230,6 +242,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Sunset:</property> + <property name="mnemonic-widget">cond_sunset</property> </object> <packing> <property name="left_attach">0</property> @@ -238,8 +251,8 @@ </child> <child> <object class="GtkLabel" id="cond_location"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -249,8 +262,8 @@ </child> <child> <object class="GtkLabel" id="cond_update"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -260,8 +273,8 @@ </child> <child> <object class="GtkLabel" id="cond_cond"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -271,8 +284,8 @@ </child> <child> <object class="GtkLabel" id="cond_sky"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -282,8 +295,8 @@ </child> <child> <object class="GtkLabel" id="cond_temp"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -293,8 +306,8 @@ </child> <child> <object class="GtkLabel" id="cond_apparent"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -304,8 +317,8 @@ </child> <child> <object class="GtkLabel" id="cond_dew"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -315,8 +328,8 @@ </child> <child> <object class="GtkLabel" id="cond_humidity"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -326,8 +339,8 @@ </child> <child> <object class="GtkLabel" id="cond_wind"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -337,8 +350,8 @@ </child> <child> <object class="GtkLabel" id="cond_pressure"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -348,8 +361,8 @@ </child> <child> <object class="GtkLabel" id="cond_vis"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -359,8 +372,8 @@ </child> <child> <object class="GtkLabel" id="cond_sunrise"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> @@ -370,8 +383,8 @@ </child> <child> <object class="GtkLabel" id="cond_sunset"> + <property name="selectable">True</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">start</property> </object> <packing> diff --git a/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in index 03d2b621..959d019a 100644 --- a/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in +++ b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=MateWeatherAppletFactory -Location=@LIBEXECDIR@/mateweather-applet +InProcess=@APPLET_IN_PROCESS@ +Location=@APPLET_LOCATION@ Name=Mateweather Applet Factory Description=Factory for creating the weather applet. @@ -10,6 +11,7 @@ Description=Monitor the current weather conditions, and forecasts # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=weather-storm MateComponentId=OAFIID:MATE_MateWeatherApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=mateweather diff --git a/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in index e1d0174a..493a544c 100644 --- a/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in +++ b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.MateWeatherAppletFactory -Exec=@LIBEXECDIR@/mateweather-applet +Exec=@APPLET_LOCATION@ |