diff options
Diffstat (limited to 'netspeed/data')
4 files changed, 41 insertions, 13 deletions
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index 350217f2..b6cb4875 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,36 +1,44 @@ NULL = +applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.NetspeedAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-netspeed-applet.so +else !ENABLE_IN_PROCESS APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in 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|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(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.NetspeedAppletFactory.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.NetspeedAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ +endif !ENABLE_IN_PROCESS -netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in -gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applet_in_files).in \ $(service_in_files) \ - $(netspeed_gschema_in_files) \ + $(gschema_in_files) \ netspeed-details.ui \ netspeed-menu.xml \ netspeed-preferences.ui \ diff --git a/netspeed/data/netspeed-details.ui b/netspeed/data/netspeed-details.ui index af1cc376..06b6562a 100644 --- a/netspeed/data/netspeed-details.ui +++ b/netspeed/data/netspeed-details.ui @@ -99,6 +99,7 @@ <object class="GtkLabel"> <property name="can-focus">False</property> <property name="label" translatable="yes">Transfer Rate Graph</property> + <property name="mnemonic-widget">drawingarea</property> </object> </child> </object> @@ -192,6 +193,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">IPv4 Address:</property> + <property name="mnemonic-widget">ip_text</property> <property name="xalign">0</property> </object> <packing> @@ -220,6 +222,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Netmask:</property> + <property name="mnemonic-widget">netmask_text</property> <property name="xalign">0</property> </object> <packing> @@ -260,6 +263,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">IPv6 Address:</property> + <property name="mnemonic-widget">ipv6_text</property> <property name="xalign">0</property> <property name="yalign">0</property> </object> @@ -302,6 +306,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Hardware Address:</property> + <property name="mnemonic-widget">hwaddr_text</property> <property name="xalign">0</property> </object> <packing> @@ -330,6 +335,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">P-t-P Address:</property> + <property name="mnemonic-widget">ptpip_text</property> <property name="xalign">0</property> </object> <packing> @@ -370,6 +376,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Bytes in:</property> + <property name="mnemonic-widget">inbytes_text</property> <property name="xalign">0</property> </object> <packing> @@ -384,6 +391,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">0 byte</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -398,6 +406,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Bytes out:</property> + <property name="mnemonic-widget">outbytes_text</property> <property name="xalign">0</property> </object> <packing> @@ -412,6 +421,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">0 byte</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -444,6 +454,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">ESSID:</property> + <property name="mnemonic-widget">essid_text</property> <property name="xalign">0</property> </object> <packing> @@ -472,6 +483,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Signal Strength:</property> + <property name="mnemonic-widget">signalbar</property> <property name="xalign">0</property> </object> <packing> @@ -483,7 +495,7 @@ <child> <object class="GtkProgressBar" id="signalbar"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> <property name="hexpand">True</property> </object> @@ -516,6 +528,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Station:</property> + <property name="mnemonic-widget">station_text</property> <property name="xalign">0</property> </object> <packing> @@ -528,6 +541,7 @@ <object class="GtkLabel" id="station_text"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -541,6 +555,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Channel:</property> + <property name="mnemonic-widget">channel_label</property> <property name="xalign">0</property> </object> <packing> @@ -553,6 +568,7 @@ <object class="GtkLabel" id="channel_text"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -578,6 +594,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Connected Time:</property> + <property name="mnemonic-widget">connected_time_text</property> <property name="xalign">0</property> </object> <packing> @@ -590,6 +607,7 @@ <object class="GtkLabel" id="connected_time_text"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in index fdc64666..2d156785 100644 --- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in +++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=NetspeedAppletFactory -Location=@LOCATION@ +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=Netspeed Applet Factory Description=Netspeed Applet @@ -10,6 +11,7 @@ Description=Netspeed Applet # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-netspeed-applet MateComponentId=OAFIID:MATE_NetspeedApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-netspeed X-MATE-Bugzilla-Component=netspeed diff --git a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in index 2868eec8..49f7ff15 100644 --- a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in +++ b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.NetspeedAppletFactory -Exec=@LOCATION@ +Exec=@APPLET_LOCATION@ |