Fixing app icon
Change-Id: I8e4d6692686e5c023378f57879b0a0f40105e6d7
diff --git a/src/nfd-control-center.desktop.in b/nfd-control-center.desktop.in
similarity index 64%
rename from src/nfd-control-center.desktop.in
rename to nfd-control-center.desktop.in
index 742ae47..ddf2f64 100644
--- a/src/nfd-control-center.desktop.in
+++ b/nfd-control-center.desktop.in
@@ -1,12 +1,12 @@
[Desktop Entry]
Version=1.0
-Name=NDNx Control Center
-Keywords=Internet;NDN;NDNx
+Name=NFD Control Center
+Keywords=Internet;NDN
Exec=@BINDIR@/@BINARY@
Terminal=false
X-MultipleArgs=false
Type=Application
-Icon=@DATAROOTDIR@/ndnx-control-center/ndnx-main.png
+Icon=@DATAROOTDIR@/nfd-control-center/ndn_app.png
Categories=GNOME;GTK;Network;
StartupNotify=true
Actions=NewWindow;NewPrivateWindow;
diff --git a/osx/Resources/IconDisconnected.png b/osx/Resources/IconDisconnected.png
new file mode 100644
index 0000000..eb96e9c
--- /dev/null
+++ b/osx/Resources/IconDisconnected.png
Binary files differ
diff --git a/src/app.icns b/osx/Resources/nfd-main.icns
similarity index 100%
rename from src/app.icns
rename to osx/Resources/nfd-main.icns
Binary files differ
diff --git a/osx/Resources/nfd-tray.icns b/osx/Resources/nfd-tray.icns
new file mode 100644
index 0000000..f347dd7
--- /dev/null
+++ b/osx/Resources/nfd-tray.icns
Binary files differ
diff --git a/osx/Resources/status-to-fib.xslt b/osx/Resources/status-to-fib.xslt
new file mode 100644
index 0000000..58f2fc7
--- /dev/null
+++ b/osx/Resources/status-to-fib.xslt
@@ -0,0 +1,29 @@
+<xsl:stylesheet version = '1.0'
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
+
+<xsl:template match="/ndnd">
+<fibs>
+<xsl:apply-templates select="forwarding/fentry/dest" />
+</fibs>
+</xsl:template>
+
+<xsl:template match="dest">
+<fib>
+<xsl:apply-templates select="faceid" />
+<prefix><xsl:value-of select="../prefix"/></prefix>
+</fib>
+</xsl:template>
+
+<xsl:template match="faceid">
+<xsl:variable name="id"><xsl:value-of select="." /></xsl:variable>
+<faceID><xsl:copy-of select="$id" /></faceID>
+<ip>
+<xsl:choose>
+ <xsl:when test="count(//face/ip[../faceid=$id]) > 0"><xsl:value-of select="//face/ip[../faceid=$id]" />
+ </xsl:when>
+ <xsl:otherwise>app</xsl:otherwise>
+</xsl:choose>
+</ip>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/osx/Resources/status.xslt b/osx/Resources/status.xslt
new file mode 100644
index 0000000..d64ea59
--- /dev/null
+++ b/osx/Resources/status.xslt
@@ -0,0 +1,20 @@
+<xsl:stylesheet version = '1.0'
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
+
+<xsl:template match="/">
+<stats>
+ <data>
+ <in><xsl:value-of select="sum(/ndnd/faces/face/meters/datain/total)" /></in>
+ <out><xsl:value-of select="sum(/ndnd/faces/face/meters/dataout/total)" /></out>
+ <!-- <in><xsl:value-of select="sum(/ndnd/faces/face/meters/datain/persec)" /></in> -->
+ <!-- <out><xsl:value-of select="sum(/ndnd/faces/face/meters/dataout/persec)" /></out> -->
+ </data>
+ <interests>
+ <in><xsl:value-of select="sum(/ndnd/faces/face/meters/intrin/total)" /></in>
+ <out><xsl:value-of select="sum(/ndnd/faces/face/meters/introut/total)" /></out>
+ <!-- <in><xsl:value-of select="sum(/ndnd/faces/face/meters/intrin/persec)" /></in> -->
+ <!-- <out><xsl:value-of select="sum(/ndnd/faces/face/meters/introut/persec)" /></out> -->
+ </interests>
+</stats>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/src/resources/GenericNetworkIcon_22_128x128x32.png b/res/GenericNetworkIcon_22_128x128x32.png
similarity index 100%
rename from src/resources/GenericNetworkIcon_22_128x128x32.png
rename to res/GenericNetworkIcon_22_128x128x32.png
Binary files differ
diff --git a/src/resources/Keychain_22_128x128x32.png b/res/Keychain_22_128x128x32.png
similarity index 100%
rename from src/resources/Keychain_22_128x128x32.png
rename to res/Keychain_22_128x128x32.png
Binary files differ
diff --git a/src/resources/System Preferences_22_128x128x32.png b/res/System Preferences_22_128x128x32.png
similarity index 100%
rename from src/resources/System Preferences_22_128x128x32.png
rename to res/System Preferences_22_128x128x32.png
Binary files differ
diff --git a/src/resources/ToolbarAdvanced_22_128x128x32.png b/res/ToolbarAdvanced_22_128x128x32.png
similarity index 100%
rename from src/resources/ToolbarAdvanced_22_128x128x32.png
rename to res/ToolbarAdvanced_22_128x128x32.png
Binary files differ
diff --git a/src/resources/icon-connected-black.png b/res/icon-connected-black.png
similarity index 100%
rename from src/resources/icon-connected-black.png
rename to res/icon-connected-black.png
Binary files differ
diff --git a/src/resources/icon-connected-white.png b/res/icon-connected-white.png
similarity index 100%
rename from src/resources/icon-connected-white.png
rename to res/icon-connected-white.png
Binary files differ
diff --git a/src/resources/icon-disconnected-black.png b/res/icon-disconnected-black.png
similarity index 100%
rename from src/resources/icon-disconnected-black.png
rename to res/icon-disconnected-black.png
Binary files differ
diff --git a/src/resources/icon-disconnected-white.png b/res/icon-disconnected-white.png
similarity index 100%
rename from src/resources/icon-disconnected-white.png
rename to res/icon-disconnected-white.png
Binary files differ
diff --git a/res/ndn_app.ai b/res/ndn_app.ai
new file mode 100644
index 0000000..e205d94
--- /dev/null
+++ b/res/ndn_app.ai
Binary files differ
diff --git a/res/ndn_app.icns b/res/ndn_app.icns
new file mode 100644
index 0000000..95affee
--- /dev/null
+++ b/res/ndn_app.icns
Binary files differ
diff --git a/res/ndn_app.png b/res/ndn_app.png
new file mode 100644
index 0000000..a6a2db7
--- /dev/null
+++ b/res/ndn_app.png
Binary files differ
diff --git a/src/Info.plist b/src/Info.plist
index b101b6a..472780d 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>NFD Control Center</string>
<key>CFBundleIconFile</key>
- <string>nfd-main.icns</string>
+ <string>ndn_app.icns</string>
<key>CFBundleIdentifier</key>
<string>net.named-data.control-center</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/src/qml.qrc b/src/qml.qrc
index 19a180f..d3586da 100644
--- a/src/qml.qrc
+++ b/src/qml.qrc
@@ -1,13 +1,13 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>resources/icon-connected-white.png</file>
- <file>resources/icon-disconnected-white.png</file>
- <file>resources/GenericNetworkIcon_22_128x128x32.png</file>
- <file>resources/Keychain_22_128x128x32.png</file>
- <file>resources/System Preferences_22_128x128x32.png</file>
- <file>resources/ToolbarAdvanced_22_128x128x32.png</file>
- <file>resources/icon-connected-black.png</file>
- <file>resources/icon-disconnected-black.png</file>
+ <file>../res/icon-connected-white.png</file>
+ <file>../res/icon-disconnected-white.png</file>
+ <file>../res/GenericNetworkIcon_22_128x128x32.png</file>
+ <file>../res/Keychain_22_128x128x32.png</file>
+ <file>../res/System Preferences_22_128x128x32.png</file>
+ <file>../res/ToolbarAdvanced_22_128x128x32.png</file>
+ <file>../res/icon-connected-black.png</file>
+ <file>../res/icon-disconnected-black.png</file>
</qresource>
</RCC>
diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index 115cec1..fce2cb1 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -25,11 +25,11 @@
#ifdef OSX_BUILD
-#define CONNECT_ICON ":/resources/icon-connected-black.png"
-#define DISCONNECT_ICON ":/resources/icon-disconnected-black.png"
+#define CONNECT_ICON ":/res/icon-connected-black.png"
+#define DISCONNECT_ICON ":/res/icon-disconnected-black.png"
#else
-#define CONNECT_ICON ":/resources/icon-connected-white.png"
-#define DISCONNECT_ICON ":/resources/icon-disconnected-white.png"
+#define CONNECT_ICON ":/res/icon-connected-white.png"
+#define DISCONNECT_ICON ":/res/icon-disconnected-white.png"
#endif
#ifdef WAF
diff --git a/wscript b/wscript
index 459d7b4..4c3a543 100644
--- a/wscript
+++ b/wscript
@@ -18,7 +18,7 @@
conf.check_boost(lib="system thread")
- # conf.define('RESOURCES_DIR', Utils.subst_vars("${DATAROOTDIR}/nfd-control-center", conf.env))
+ conf.define('RESOURCES_DIR', Utils.subst_vars("${DATAROOTDIR}/nfd-control-center", conf.env))
if Utils.unversioned_sys_platform() == "darwin":
conf.define('OSX_BUILD', 1)
@@ -40,17 +40,16 @@
app.target = "nfd-control-center"
bld(features = "subst",
- source = 'src/nfd-control-center.desktop.in',
- target = 'src/nfd-control-center.desktop',
+ source = 'nfd-control-center.desktop.in',
+ target = 'nfd-control-center.desktop',
BINARY = "nfd-control-center",
install_path = "${DATAROOTDIR}/nfd-control-center"
)
bld.install_files("${DATAROOTDIR}/nfd-control-center",
- bld.path.ant_glob(['Resources/*']))
+ bld.path.ant_glob(['res/*']))
else:
app.target = "NFD Control Center"
app.mac_app = True
app.mac_plist = 'src/Info.plist'
- # app.mac_resources = [i.path_from(bld.path)
- # for i in bld.path.parent.ant_glob('src/Resources/*')]
+ app.mac_resources = [i.path_from(bld.path) for i in bld.path.ant_glob('res/**/*', excl='**/*.ai')]
