From 61621285351bcab5e21de1586f319b330cf69c40 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 29 Jul 2020 12:33:26 +0200 Subject: netspeed: move ui files to data folder --- netspeed/data/Makefile.am | 8 +- netspeed/data/netspeed-details.ui | 686 +++++++++++++++++++++++++ netspeed/data/netspeed-preferences.ui | 246 +++++++++ netspeed/data/netspeed-resources.gresource.xml | 7 + netspeed/src/Makefile.am | 18 +- netspeed/src/netspeed-details.ui | 686 ------------------------- netspeed/src/netspeed-preferences.ui | 246 --------- netspeed/src/netspeed-resources.gresource.xml | 7 - po/POTFILES.in | 4 +- 9 files changed, 952 insertions(+), 956 deletions(-) create mode 100644 netspeed/data/netspeed-details.ui create mode 100644 netspeed/data/netspeed-preferences.ui create mode 100644 netspeed/data/netspeed-resources.gresource.xml delete mode 100644 netspeed/src/netspeed-details.ui delete mode 100644 netspeed/src/netspeed-preferences.ui delete mode 100644 netspeed/src/netspeed-resources.gresource.xml diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index 7875af7d..54cd6597 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,3 +1,5 @@ +NULL = + APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet appletdir = $(datadir)/mate-panel/applets @@ -32,7 +34,11 @@ EXTRA_DIST = \ $(applet_in_files).in \ $(xmlui_DATA) \ $(service_in_files) \ - $(netspeed_gschema_in_files) + $(netspeed_gschema_in_files) \ + netspeed-details.ui \ + netspeed-preferences.ui \ + netspeed-resources.gresource.xml \ + $(NULL) CLEANFILES = \ $(gsettings_SCHEMAS) \ diff --git a/netspeed/data/netspeed-details.ui b/netspeed/data/netspeed-details.ui new file mode 100644 index 00000000..a537555f --- /dev/null +++ b/netspeed/data/netspeed-details.ui @@ -0,0 +1,686 @@ + + + + + + True + False + window-close + + + True + False + help-browser + + + False + 12 + dialog + + + + False + vertical + 12 + + + False + end + + + _Help + True + True + True + help_img + True + True + + + True + True + 0 + + + + + _Close + True + True + True + True + True + close_img + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + vertical + 10 + + + True + False + 0 + none + + + True + False + 0 + 0 + + + 180 + True + False + + + + + + + + False + Transfer Rate Graph + + + + + False + True + 0 + + + + + True + False + 6 + + + True + True + True + + + + False + True + 0 + + + + + True + False + _In graph color + True + incolor_sel + + + False + True + 1 + + + + + True + True + True + + + + False + True + 2 + + + + + True + False + _Out graph color + True + outcolor_sel + + + False + True + 3 + + + + + False + True + 1 + + + + + True + False + vertical + 6 + + + True + False + start + 12 + + + True + False + start + IPv4 Address: + 0 + + + False + True + 0 + + + + + True + False + start + True + 0 + + + False + True + 1 + + + + + True + False + start + Netmask: + 0 + + + False + True + 2 + + + + + True + False + start + True + 0 + + + False + True + 3 + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + start + Hardware Address: + 0 + + + False + True + 0 + + + + + True + False + start + True + 0 + + + False + True + 1 + + + + + True + False + start + P-t-P Address: + 0 + + + False + True + 2 + + + + + True + False + start + True + 0 + + + False + True + 3 + + + + + False + True + 1 + + + + + True + False + 12 + + + True + False + start + Bytes in: + 0 + + + False + True + 0 + + + + + True + False + start + 0 byte + 0 + + + False + True + 1 + + + + + True + False + start + Bytes out: + 0 + + + False + True + 2 + + + + + True + False + start + 0 byte + 0 + + + False + True + 3 + + + + + False + True + 2 + + + + + True + False + 12 + + + True + False + start + IPv6 Address: + 0 + + + False + True + 0 + + + + + True + False + start + True + 0 + + + False + True + 1 + + + + + False + True + 3 + + + + + True + False + vertical + 6 + + + True + False + 12 + + + True + False + start + ESSID: + 0 + + + False + True + 0 + + + + + True + False + start + True + 0 + + + False + True + 1 + + + + + True + False + start + Signal Strength: + 0 + + + False + True + 2 + + + + + True + False + start + True + + + False + True + 3 + + + + + False + True + 0 + + + + + True + False + vertical + 6 + + + True + False + 12 + + + True + False + Station: + 0 + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + True + False + Channel: + 0 + + + False + True + 2 + + + + + True + False + 0 + + + False + True + 3 + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + Connected Time: + 0 + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 4 + + + + + False + True + 2 + + + + + False + True + 1 + + + + + + button1 + button2 + + + + + + + True + + + + + + + + + + + + True + + + + + + + + + + True + + + + + + + + + + True + + + + + + + + + diff --git a/netspeed/data/netspeed-preferences.ui b/netspeed/data/netspeed-preferences.ui new file mode 100644 index 00000000..62b0e601 --- /dev/null +++ b/netspeed/data/netspeed-preferences.ui @@ -0,0 +1,246 @@ + + + + + + True + False + help-browser + + + True + False + window-close + + + False + 12 + MATE Netspeed Preferences + mate-netspeed-applet + dialog + + + + False + vertical + 2 + + + False + end + + + _Help + True + True + True + image1 + True + True + + + True + True + 0 + + + + + _Close + True + True + True + True + True + image2 + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 5 + vertical + 6 + + + True + False + 12 + + + True + False + start + Network _device: + True + network_device_combo + + + False + True + 0 + + + + + True + False + + + + False + True + 1 + + + + + False + True + 0 + + + + + Show _sum instead of in & out + True + True + False + start + True + True + + + + False + True + 1 + + + + + Show _bits instead of bytes + True + True + False + start + True + True + + + + False + True + 2 + + + + + _Change icon according to the selected device + True + True + False + start + True + True + + + + False + True + 3 + + + + + Show _icon + True + True + False + start + True + True + + + + False + True + 4 + + + + + Show signal _quality icon for wireless devices + True + True + False + start + True + True + + + + False + True + 5 + + + + + + + + + True + False + start + General Settings + + + + + + + + False + True + 1 + + + + + + button1 + button2 + + + + + + diff --git a/netspeed/data/netspeed-resources.gresource.xml b/netspeed/data/netspeed-resources.gresource.xml new file mode 100644 index 00000000..d083d9c7 --- /dev/null +++ b/netspeed/data/netspeed-resources.gresource.xml @@ -0,0 +1,7 @@ + + + + netspeed-details.ui + netspeed-preferences.ui + + diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am index 04e934f1..dae9df37 100644 --- a/netspeed/src/Makefile.am +++ b/netspeed/src/Makefile.am @@ -1,10 +1,5 @@ NULL = -builder_files = \ - netspeed-details.ui \ - netspeed-preferences.ui \ - $(NULL) - AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(includedir) \ @@ -46,19 +41,14 @@ if HAVE_NL mate_netspeed_applet_LDADD += $(NL_LIBS) endif -netspeed-resources.c: netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/netspeed-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name netspeed $< +netspeed-resources.c: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< -netspeed-resources.h: netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/netspeed-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name netspeed $< +netspeed-resources.h: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< CLEANFILES = \ $(BUILT_SOURCES) \ $(NULL) -EXTRA_DIST = \ - $(builder_files) \ - netspeed-resources.gresource.xml \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/netspeed/src/netspeed-details.ui b/netspeed/src/netspeed-details.ui deleted file mode 100644 index a537555f..00000000 --- a/netspeed/src/netspeed-details.ui +++ /dev/null @@ -1,686 +0,0 @@ - - - - - - True - False - window-close - - - True - False - help-browser - - - False - 12 - dialog - - - - False - vertical - 12 - - - False - end - - - _Help - True - True - True - help_img - True - True - - - True - True - 0 - - - - - _Close - True - True - True - True - True - close_img - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - vertical - 10 - - - True - False - 0 - none - - - True - False - 0 - 0 - - - 180 - True - False - - - - - - - - False - Transfer Rate Graph - - - - - False - True - 0 - - - - - True - False - 6 - - - True - True - True - - - - False - True - 0 - - - - - True - False - _In graph color - True - incolor_sel - - - False - True - 1 - - - - - True - True - True - - - - False - True - 2 - - - - - True - False - _Out graph color - True - outcolor_sel - - - False - True - 3 - - - - - False - True - 1 - - - - - True - False - vertical - 6 - - - True - False - start - 12 - - - True - False - start - IPv4 Address: - 0 - - - False - True - 0 - - - - - True - False - start - True - 0 - - - False - True - 1 - - - - - True - False - start - Netmask: - 0 - - - False - True - 2 - - - - - True - False - start - True - 0 - - - False - True - 3 - - - - - False - True - 0 - - - - - True - False - 12 - - - True - False - start - Hardware Address: - 0 - - - False - True - 0 - - - - - True - False - start - True - 0 - - - False - True - 1 - - - - - True - False - start - P-t-P Address: - 0 - - - False - True - 2 - - - - - True - False - start - True - 0 - - - False - True - 3 - - - - - False - True - 1 - - - - - True - False - 12 - - - True - False - start - Bytes in: - 0 - - - False - True - 0 - - - - - True - False - start - 0 byte - 0 - - - False - True - 1 - - - - - True - False - start - Bytes out: - 0 - - - False - True - 2 - - - - - True - False - start - 0 byte - 0 - - - False - True - 3 - - - - - False - True - 2 - - - - - True - False - 12 - - - True - False - start - IPv6 Address: - 0 - - - False - True - 0 - - - - - True - False - start - True - 0 - - - False - True - 1 - - - - - False - True - 3 - - - - - True - False - vertical - 6 - - - True - False - 12 - - - True - False - start - ESSID: - 0 - - - False - True - 0 - - - - - True - False - start - True - 0 - - - False - True - 1 - - - - - True - False - start - Signal Strength: - 0 - - - False - True - 2 - - - - - True - False - start - True - - - False - True - 3 - - - - - False - True - 0 - - - - - True - False - vertical - 6 - - - True - False - 12 - - - True - False - Station: - 0 - - - False - True - 0 - - - - - True - False - 0 - - - False - True - 1 - - - - - True - False - Channel: - 0 - - - False - True - 2 - - - - - True - False - 0 - - - False - True - 3 - - - - - False - True - 0 - - - - - True - False - 12 - - - True - False - Connected Time: - 0 - - - False - True - 0 - - - - - True - False - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - - False - True - 1 - - - - - False - True - 4 - - - - - False - True - 2 - - - - - False - True - 1 - - - - - - button1 - button2 - - - - - - - True - - - - - - - - - - - - True - - - - - - - - - - True - - - - - - - - - - True - - - - - - - - - diff --git a/netspeed/src/netspeed-preferences.ui b/netspeed/src/netspeed-preferences.ui deleted file mode 100644 index 62b0e601..00000000 --- a/netspeed/src/netspeed-preferences.ui +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - True - False - help-browser - - - True - False - window-close - - - False - 12 - MATE Netspeed Preferences - mate-netspeed-applet - dialog - - - - False - vertical - 2 - - - False - end - - - _Help - True - True - True - image1 - True - True - - - True - True - 0 - - - - - _Close - True - True - True - True - True - image2 - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - 5 - vertical - 6 - - - True - False - 12 - - - True - False - start - Network _device: - True - network_device_combo - - - False - True - 0 - - - - - True - False - - - - False - True - 1 - - - - - False - True - 0 - - - - - Show _sum instead of in & out - True - True - False - start - True - True - - - - False - True - 1 - - - - - Show _bits instead of bytes - True - True - False - start - True - True - - - - False - True - 2 - - - - - _Change icon according to the selected device - True - True - False - start - True - True - - - - False - True - 3 - - - - - Show _icon - True - True - False - start - True - True - - - - False - True - 4 - - - - - Show signal _quality icon for wireless devices - True - True - False - start - True - True - - - - False - True - 5 - - - - - - - - - True - False - start - General Settings - - - - - - - - False - True - 1 - - - - - - button1 - button2 - - - - - - diff --git a/netspeed/src/netspeed-resources.gresource.xml b/netspeed/src/netspeed-resources.gresource.xml deleted file mode 100644 index d083d9c7..00000000 --- a/netspeed/src/netspeed-resources.gresource.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - netspeed-details.ui - netspeed-preferences.ui - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 4c140cc9..ea0cb3e1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -50,12 +50,12 @@ multiload/netspeed.c multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in multiload/org.mate.panel.applet.multiload.gschema.xml.in multiload/properties.c +netspeed/data/netspeed-details.ui +netspeed/data/netspeed-preferences.ui netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in netspeed/src/backend.c netspeed/src/netspeed.c -netspeed/src/netspeed-details.ui -netspeed/src/netspeed-preferences.ui # NB. these are actually separate files stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in stickynotes/stickynotes.c -- cgit v1.2.1