Fixing app icon
Change-Id: I8e4d6692686e5c023378f57879b0a0f40105e6d7
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/app.icns b/src/app.icns
deleted file mode 100644
index ececc16..0000000
--- a/src/app.icns
+++ /dev/null
Binary files differ
diff --git a/src/nfd-control-center.desktop.in b/src/nfd-control-center.desktop.in
deleted file mode 100644
index 742ae47..0000000
--- a/src/nfd-control-center.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=NDNx Control Center
-Keywords=Internet;NDN;NDNx
-Exec=@BINDIR@/@BINARY@
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=@DATAROOTDIR@/ndnx-control-center/ndnx-main.png
-Categories=GNOME;GTK;Network;
-StartupNotify=true
-Actions=NewWindow;NewPrivateWindow;
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/resources/GenericNetworkIcon_22_128x128x32.png b/src/resources/GenericNetworkIcon_22_128x128x32.png
deleted file mode 100644
index 35bc465..0000000
--- a/src/resources/GenericNetworkIcon_22_128x128x32.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/Keychain_22_128x128x32.png b/src/resources/Keychain_22_128x128x32.png
deleted file mode 100644
index fbb89eb..0000000
--- a/src/resources/Keychain_22_128x128x32.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/System Preferences_22_128x128x32.png b/src/resources/System Preferences_22_128x128x32.png
deleted file mode 100644
index 54bec62..0000000
--- a/src/resources/System Preferences_22_128x128x32.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/ToolbarAdvanced_22_128x128x32.png b/src/resources/ToolbarAdvanced_22_128x128x32.png
deleted file mode 100644
index 1ea369f..0000000
--- a/src/resources/ToolbarAdvanced_22_128x128x32.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/icon-connected-black.png b/src/resources/icon-connected-black.png
deleted file mode 100644
index 3ce424f..0000000
--- a/src/resources/icon-connected-black.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/icon-connected-white.png b/src/resources/icon-connected-white.png
deleted file mode 100644
index 55f0dc4..0000000
--- a/src/resources/icon-connected-white.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/icon-disconnected-black.png b/src/resources/icon-disconnected-black.png
deleted file mode 100644
index 0670f42..0000000
--- a/src/resources/icon-disconnected-black.png
+++ /dev/null
Binary files differ
diff --git a/src/resources/icon-disconnected-white.png b/src/resources/icon-disconnected-white.png
deleted file mode 100644
index 39997cd..0000000
--- a/src/resources/icon-disconnected-white.png
+++ /dev/null
Binary files differ
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
