diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index f4fe18704..890a77ecb 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory("datetime") #add_subdirectory("disk-mount") -add_subdirectory("new-network") +add_subdirectory("network") add_subdirectory("shutdown") add_subdirectory("sound") add_subdirectory("system-tray") diff --git a/plugins/new-network/CMakeLists.txt b/plugins/network/CMakeLists.txt similarity index 97% rename from plugins/new-network/CMakeLists.txt rename to plugins/network/CMakeLists.txt index 4bd5ad874..84bec3f00 100644 --- a/plugins/new-network/CMakeLists.txt +++ b/plugins/network/CMakeLists.txt @@ -1,5 +1,5 @@ -set(PLUGIN_NAME "new-network") +set(PLUGIN_NAME "network") project(${PLUGIN_NAME}) diff --git a/plugins/new-network/item/applet/accesspoint.cpp b/plugins/network/item/applet/accesspoint.cpp similarity index 100% rename from plugins/new-network/item/applet/accesspoint.cpp rename to plugins/network/item/applet/accesspoint.cpp diff --git a/plugins/new-network/item/applet/accesspoint.h b/plugins/network/item/applet/accesspoint.h similarity index 100% rename from plugins/new-network/item/applet/accesspoint.h rename to plugins/network/item/applet/accesspoint.h diff --git a/plugins/new-network/item/applet/accesspointwidget.cpp b/plugins/network/item/applet/accesspointwidget.cpp similarity index 100% rename from plugins/new-network/item/applet/accesspointwidget.cpp rename to plugins/network/item/applet/accesspointwidget.cpp diff --git a/plugins/new-network/item/applet/accesspointwidget.h b/plugins/network/item/applet/accesspointwidget.h similarity index 100% rename from plugins/new-network/item/applet/accesspointwidget.h rename to plugins/network/item/applet/accesspointwidget.h diff --git a/plugins/new-network/item/applet/devicecontrolwidget.cpp b/plugins/network/item/applet/devicecontrolwidget.cpp similarity index 100% rename from plugins/new-network/item/applet/devicecontrolwidget.cpp rename to plugins/network/item/applet/devicecontrolwidget.cpp diff --git a/plugins/new-network/item/applet/devicecontrolwidget.h b/plugins/network/item/applet/devicecontrolwidget.h similarity index 100% rename from plugins/new-network/item/applet/devicecontrolwidget.h rename to plugins/network/item/applet/devicecontrolwidget.h diff --git a/plugins/new-network/item/applet/horizontalseperator.cpp b/plugins/network/item/applet/horizontalseperator.cpp similarity index 100% rename from plugins/new-network/item/applet/horizontalseperator.cpp rename to plugins/network/item/applet/horizontalseperator.cpp diff --git a/plugins/new-network/item/applet/horizontalseperator.h b/plugins/network/item/applet/horizontalseperator.h similarity index 100% rename from plugins/new-network/item/applet/horizontalseperator.h rename to plugins/network/item/applet/horizontalseperator.h diff --git a/plugins/new-network/item/applet/wirelesslist.cpp b/plugins/network/item/applet/wirelesslist.cpp similarity index 100% rename from plugins/new-network/item/applet/wirelesslist.cpp rename to plugins/network/item/applet/wirelesslist.cpp diff --git a/plugins/new-network/item/applet/wirelesslist.h b/plugins/network/item/applet/wirelesslist.h similarity index 100% rename from plugins/new-network/item/applet/wirelesslist.h rename to plugins/network/item/applet/wirelesslist.h diff --git a/plugins/new-network/item/deviceitem.cpp b/plugins/network/item/deviceitem.cpp similarity index 100% rename from plugins/new-network/item/deviceitem.cpp rename to plugins/network/item/deviceitem.cpp diff --git a/plugins/new-network/item/deviceitem.h b/plugins/network/item/deviceitem.h similarity index 100% rename from plugins/new-network/item/deviceitem.h rename to plugins/network/item/deviceitem.h diff --git a/plugins/new-network/item/wireditem.cpp b/plugins/network/item/wireditem.cpp similarity index 100% rename from plugins/new-network/item/wireditem.cpp rename to plugins/network/item/wireditem.cpp diff --git a/plugins/new-network/item/wireditem.h b/plugins/network/item/wireditem.h similarity index 100% rename from plugins/new-network/item/wireditem.h rename to plugins/network/item/wireditem.h diff --git a/plugins/new-network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp similarity index 100% rename from plugins/new-network/item/wirelessitem.cpp rename to plugins/network/item/wirelessitem.cpp diff --git a/plugins/new-network/item/wirelessitem.h b/plugins/network/item/wirelessitem.h similarity index 100% rename from plugins/new-network/item/wirelessitem.h rename to plugins/network/item/wirelessitem.h diff --git a/plugins/new-network/network.json b/plugins/network/network.json similarity index 100% rename from plugins/new-network/network.json rename to plugins/network/network.json diff --git a/plugins/new-network/networkplugin.cpp b/plugins/network/networkplugin.cpp similarity index 100% rename from plugins/new-network/networkplugin.cpp rename to plugins/network/networkplugin.cpp diff --git a/plugins/new-network/networkplugin.h b/plugins/network/networkplugin.h similarity index 100% rename from plugins/new-network/networkplugin.h rename to plugins/network/networkplugin.h diff --git a/plugins/new-network/resources.qrc b/plugins/network/resources.qrc similarity index 100% rename from plugins/new-network/resources.qrc rename to plugins/network/resources.qrc diff --git a/plugins/new-network/resources/wired/network-wired-symbolic-connecting1.svg b/plugins/network/resources/wired/network-wired-symbolic-connecting1.svg similarity index 100% rename from plugins/new-network/resources/wired/network-wired-symbolic-connecting1.svg rename to plugins/network/resources/wired/network-wired-symbolic-connecting1.svg diff --git a/plugins/new-network/resources/wired/network-wired-symbolic-connecting2.svg b/plugins/network/resources/wired/network-wired-symbolic-connecting2.svg similarity index 100% rename from plugins/new-network/resources/wired/network-wired-symbolic-connecting2.svg rename to plugins/network/resources/wired/network-wired-symbolic-connecting2.svg diff --git a/plugins/new-network/resources/wired/network-wired-symbolic-connecting3.svg b/plugins/network/resources/wired/network-wired-symbolic-connecting3.svg similarity index 100% rename from plugins/new-network/resources/wired/network-wired-symbolic-connecting3.svg rename to plugins/network/resources/wired/network-wired-symbolic-connecting3.svg diff --git a/plugins/new-network/resources/wired/network-wired-symbolic-connecting4.svg b/plugins/network/resources/wired/network-wired-symbolic-connecting4.svg similarity index 100% rename from plugins/new-network/resources/wired/network-wired-symbolic-connecting4.svg rename to plugins/network/resources/wired/network-wired-symbolic-connecting4.svg diff --git a/plugins/new-network/resources/wired/network-wired-symbolic-connecting5.svg b/plugins/network/resources/wired/network-wired-symbolic-connecting5.svg similarity index 100% rename from plugins/new-network/resources/wired/network-wired-symbolic-connecting5.svg rename to plugins/network/resources/wired/network-wired-symbolic-connecting5.svg diff --git a/plugins/new-network/resources/wireless/disconnect.svg b/plugins/network/resources/wireless/disconnect.svg similarity index 100% rename from plugins/new-network/resources/wireless/disconnect.svg rename to plugins/network/resources/wireless/disconnect.svg diff --git a/plugins/new-network/resources/wireless/disconnect_hover.svg b/plugins/network/resources/wireless/disconnect_hover.svg similarity index 100% rename from plugins/new-network/resources/wireless/disconnect_hover.svg rename to plugins/network/resources/wireless/disconnect_hover.svg diff --git a/plugins/new-network/resources/wireless/disconnect_press.svg b/plugins/network/resources/wireless/disconnect_press.svg similarity index 100% rename from plugins/new-network/resources/wireless/disconnect_press.svg rename to plugins/network/resources/wireless/disconnect_press.svg diff --git a/plugins/new-network/resources/wireless/refresh_hover.svg b/plugins/network/resources/wireless/refresh_hover.svg similarity index 100% rename from plugins/new-network/resources/wireless/refresh_hover.svg rename to plugins/network/resources/wireless/refresh_hover.svg diff --git a/plugins/new-network/resources/wireless/refresh_normal.svg b/plugins/network/resources/wireless/refresh_normal.svg similarity index 100% rename from plugins/new-network/resources/wireless/refresh_normal.svg rename to plugins/network/resources/wireless/refresh_normal.svg diff --git a/plugins/new-network/resources/wireless/refresh_press.svg b/plugins/network/resources/wireless/refresh_press.svg similarity index 100% rename from plugins/new-network/resources/wireless/refresh_press.svg rename to plugins/network/resources/wireless/refresh_press.svg diff --git a/plugins/new-network/resources/wireless/security.svg b/plugins/network/resources/wireless/security.svg similarity index 100% rename from plugins/new-network/resources/wireless/security.svg rename to plugins/network/resources/wireless/security.svg diff --git a/plugins/new-network/resources/wireless/select.svg b/plugins/network/resources/wireless/select.svg similarity index 100% rename from plugins/new-network/resources/wireless/select.svg rename to plugins/network/resources/wireless/select.svg diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner01.png b/plugins/network/resources/wireless/spinner14/Spinner01.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner01.png rename to plugins/network/resources/wireless/spinner14/Spinner01.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner02.png b/plugins/network/resources/wireless/spinner14/Spinner02.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner02.png rename to plugins/network/resources/wireless/spinner14/Spinner02.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner03.png b/plugins/network/resources/wireless/spinner14/Spinner03.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner03.png rename to plugins/network/resources/wireless/spinner14/Spinner03.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner04.png b/plugins/network/resources/wireless/spinner14/Spinner04.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner04.png rename to plugins/network/resources/wireless/spinner14/Spinner04.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner05.png b/plugins/network/resources/wireless/spinner14/Spinner05.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner05.png rename to plugins/network/resources/wireless/spinner14/Spinner05.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner06.png b/plugins/network/resources/wireless/spinner14/Spinner06.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner06.png rename to plugins/network/resources/wireless/spinner14/Spinner06.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner07.png b/plugins/network/resources/wireless/spinner14/Spinner07.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner07.png rename to plugins/network/resources/wireless/spinner14/Spinner07.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner08.png b/plugins/network/resources/wireless/spinner14/Spinner08.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner08.png rename to plugins/network/resources/wireless/spinner14/Spinner08.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner09.png b/plugins/network/resources/wireless/spinner14/Spinner09.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner09.png rename to plugins/network/resources/wireless/spinner14/Spinner09.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner10.png b/plugins/network/resources/wireless/spinner14/Spinner10.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner10.png rename to plugins/network/resources/wireless/spinner14/Spinner10.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner11.png b/plugins/network/resources/wireless/spinner14/Spinner11.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner11.png rename to plugins/network/resources/wireless/spinner14/Spinner11.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner12.png b/plugins/network/resources/wireless/spinner14/Spinner12.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner12.png rename to plugins/network/resources/wireless/spinner14/Spinner12.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner13.png b/plugins/network/resources/wireless/spinner14/Spinner13.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner13.png rename to plugins/network/resources/wireless/spinner14/Spinner13.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner14.png b/plugins/network/resources/wireless/spinner14/Spinner14.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner14.png rename to plugins/network/resources/wireless/spinner14/Spinner14.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner15.png b/plugins/network/resources/wireless/spinner14/Spinner15.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner15.png rename to plugins/network/resources/wireless/spinner14/Spinner15.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner16.png b/plugins/network/resources/wireless/spinner14/Spinner16.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner16.png rename to plugins/network/resources/wireless/spinner14/Spinner16.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner17.png b/plugins/network/resources/wireless/spinner14/Spinner17.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner17.png rename to plugins/network/resources/wireless/spinner14/Spinner17.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner18.png b/plugins/network/resources/wireless/spinner14/Spinner18.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner18.png rename to plugins/network/resources/wireless/spinner14/Spinner18.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner19.png b/plugins/network/resources/wireless/spinner14/Spinner19.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner19.png rename to plugins/network/resources/wireless/spinner14/Spinner19.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner20.png b/plugins/network/resources/wireless/spinner14/Spinner20.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner20.png rename to plugins/network/resources/wireless/spinner14/Spinner20.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner21.png b/plugins/network/resources/wireless/spinner14/Spinner21.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner21.png rename to plugins/network/resources/wireless/spinner14/Spinner21.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner22.png b/plugins/network/resources/wireless/spinner14/Spinner22.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner22.png rename to plugins/network/resources/wireless/spinner14/Spinner22.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner23.png b/plugins/network/resources/wireless/spinner14/Spinner23.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner23.png rename to plugins/network/resources/wireless/spinner14/Spinner23.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner24.png b/plugins/network/resources/wireless/spinner14/Spinner24.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner24.png rename to plugins/network/resources/wireless/spinner14/Spinner24.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner25.png b/plugins/network/resources/wireless/spinner14/Spinner25.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner25.png rename to plugins/network/resources/wireless/spinner14/Spinner25.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner26.png b/plugins/network/resources/wireless/spinner14/Spinner26.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner26.png rename to plugins/network/resources/wireless/spinner14/Spinner26.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner27.png b/plugins/network/resources/wireless/spinner14/Spinner27.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner27.png rename to plugins/network/resources/wireless/spinner14/Spinner27.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner28.png b/plugins/network/resources/wireless/spinner14/Spinner28.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner28.png rename to plugins/network/resources/wireless/spinner14/Spinner28.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner29.png b/plugins/network/resources/wireless/spinner14/Spinner29.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner29.png rename to plugins/network/resources/wireless/spinner14/Spinner29.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner30.png b/plugins/network/resources/wireless/spinner14/Spinner30.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner30.png rename to plugins/network/resources/wireless/spinner14/Spinner30.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner31.png b/plugins/network/resources/wireless/spinner14/Spinner31.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner31.png rename to plugins/network/resources/wireless/spinner14/Spinner31.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner32.png b/plugins/network/resources/wireless/spinner14/Spinner32.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner32.png rename to plugins/network/resources/wireless/spinner14/Spinner32.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner33.png b/plugins/network/resources/wireless/spinner14/Spinner33.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner33.png rename to plugins/network/resources/wireless/spinner14/Spinner33.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner34.png b/plugins/network/resources/wireless/spinner14/Spinner34.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner34.png rename to plugins/network/resources/wireless/spinner14/Spinner34.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner35.png b/plugins/network/resources/wireless/spinner14/Spinner35.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner35.png rename to plugins/network/resources/wireless/spinner14/Spinner35.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner36.png b/plugins/network/resources/wireless/spinner14/Spinner36.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner36.png rename to plugins/network/resources/wireless/spinner14/Spinner36.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner37.png b/plugins/network/resources/wireless/spinner14/Spinner37.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner37.png rename to plugins/network/resources/wireless/spinner14/Spinner37.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner38.png b/plugins/network/resources/wireless/spinner14/Spinner38.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner38.png rename to plugins/network/resources/wireless/spinner14/Spinner38.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner39.png b/plugins/network/resources/wireless/spinner14/Spinner39.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner39.png rename to plugins/network/resources/wireless/spinner14/Spinner39.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner40.png b/plugins/network/resources/wireless/spinner14/Spinner40.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner40.png rename to plugins/network/resources/wireless/spinner14/Spinner40.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner41.png b/plugins/network/resources/wireless/spinner14/Spinner41.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner41.png rename to plugins/network/resources/wireless/spinner14/Spinner41.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner42.png b/plugins/network/resources/wireless/spinner14/Spinner42.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner42.png rename to plugins/network/resources/wireless/spinner14/Spinner42.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner43.png b/plugins/network/resources/wireless/spinner14/Spinner43.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner43.png rename to plugins/network/resources/wireless/spinner14/Spinner43.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner44.png b/plugins/network/resources/wireless/spinner14/Spinner44.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner44.png rename to plugins/network/resources/wireless/spinner14/Spinner44.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner45.png b/plugins/network/resources/wireless/spinner14/Spinner45.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner45.png rename to plugins/network/resources/wireless/spinner14/Spinner45.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner46.png b/plugins/network/resources/wireless/spinner14/Spinner46.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner46.png rename to plugins/network/resources/wireless/spinner14/Spinner46.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner47.png b/plugins/network/resources/wireless/spinner14/Spinner47.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner47.png rename to plugins/network/resources/wireless/spinner14/Spinner47.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner48.png b/plugins/network/resources/wireless/spinner14/Spinner48.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner48.png rename to plugins/network/resources/wireless/spinner14/Spinner48.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner49.png b/plugins/network/resources/wireless/spinner14/Spinner49.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner49.png rename to plugins/network/resources/wireless/spinner14/Spinner49.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner50.png b/plugins/network/resources/wireless/spinner14/Spinner50.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner50.png rename to plugins/network/resources/wireless/spinner14/Spinner50.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner51.png b/plugins/network/resources/wireless/spinner14/Spinner51.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner51.png rename to plugins/network/resources/wireless/spinner14/Spinner51.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner52.png b/plugins/network/resources/wireless/spinner14/Spinner52.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner52.png rename to plugins/network/resources/wireless/spinner14/Spinner52.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner53.png b/plugins/network/resources/wireless/spinner14/Spinner53.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner53.png rename to plugins/network/resources/wireless/spinner14/Spinner53.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner54.png b/plugins/network/resources/wireless/spinner14/Spinner54.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner54.png rename to plugins/network/resources/wireless/spinner14/Spinner54.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner55.png b/plugins/network/resources/wireless/spinner14/Spinner55.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner55.png rename to plugins/network/resources/wireless/spinner14/Spinner55.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner56.png b/plugins/network/resources/wireless/spinner14/Spinner56.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner56.png rename to plugins/network/resources/wireless/spinner14/Spinner56.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner57.png b/plugins/network/resources/wireless/spinner14/Spinner57.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner57.png rename to plugins/network/resources/wireless/spinner14/Spinner57.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner58.png b/plugins/network/resources/wireless/spinner14/Spinner58.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner58.png rename to plugins/network/resources/wireless/spinner14/Spinner58.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner59.png b/plugins/network/resources/wireless/spinner14/Spinner59.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner59.png rename to plugins/network/resources/wireless/spinner14/Spinner59.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner60.png b/plugins/network/resources/wireless/spinner14/Spinner60.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner60.png rename to plugins/network/resources/wireless/spinner14/Spinner60.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner61.png b/plugins/network/resources/wireless/spinner14/Spinner61.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner61.png rename to plugins/network/resources/wireless/spinner14/Spinner61.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner62.png b/plugins/network/resources/wireless/spinner14/Spinner62.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner62.png rename to plugins/network/resources/wireless/spinner14/Spinner62.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner63.png b/plugins/network/resources/wireless/spinner14/Spinner63.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner63.png rename to plugins/network/resources/wireless/spinner14/Spinner63.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner64.png b/plugins/network/resources/wireless/spinner14/Spinner64.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner64.png rename to plugins/network/resources/wireless/spinner14/Spinner64.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner65.png b/plugins/network/resources/wireless/spinner14/Spinner65.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner65.png rename to plugins/network/resources/wireless/spinner14/Spinner65.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner66.png b/plugins/network/resources/wireless/spinner14/Spinner66.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner66.png rename to plugins/network/resources/wireless/spinner14/Spinner66.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner67.png b/plugins/network/resources/wireless/spinner14/Spinner67.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner67.png rename to plugins/network/resources/wireless/spinner14/Spinner67.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner68.png b/plugins/network/resources/wireless/spinner14/Spinner68.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner68.png rename to plugins/network/resources/wireless/spinner14/Spinner68.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner69.png b/plugins/network/resources/wireless/spinner14/Spinner69.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner69.png rename to plugins/network/resources/wireless/spinner14/Spinner69.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner70.png b/plugins/network/resources/wireless/spinner14/Spinner70.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner70.png rename to plugins/network/resources/wireless/spinner14/Spinner70.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner71.png b/plugins/network/resources/wireless/spinner14/Spinner71.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner71.png rename to plugins/network/resources/wireless/spinner14/Spinner71.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner72.png b/plugins/network/resources/wireless/spinner14/Spinner72.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner72.png rename to plugins/network/resources/wireless/spinner14/Spinner72.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner73.png b/plugins/network/resources/wireless/spinner14/Spinner73.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner73.png rename to plugins/network/resources/wireless/spinner14/Spinner73.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner74.png b/plugins/network/resources/wireless/spinner14/Spinner74.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner74.png rename to plugins/network/resources/wireless/spinner14/Spinner74.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner75.png b/plugins/network/resources/wireless/spinner14/Spinner75.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner75.png rename to plugins/network/resources/wireless/spinner14/Spinner75.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner76.png b/plugins/network/resources/wireless/spinner14/Spinner76.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner76.png rename to plugins/network/resources/wireless/spinner14/Spinner76.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner77.png b/plugins/network/resources/wireless/spinner14/Spinner77.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner77.png rename to plugins/network/resources/wireless/spinner14/Spinner77.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner78.png b/plugins/network/resources/wireless/spinner14/Spinner78.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner78.png rename to plugins/network/resources/wireless/spinner14/Spinner78.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner79.png b/plugins/network/resources/wireless/spinner14/Spinner79.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner79.png rename to plugins/network/resources/wireless/spinner14/Spinner79.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner80.png b/plugins/network/resources/wireless/spinner14/Spinner80.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner80.png rename to plugins/network/resources/wireless/spinner14/Spinner80.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner81.png b/plugins/network/resources/wireless/spinner14/Spinner81.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner81.png rename to plugins/network/resources/wireless/spinner14/Spinner81.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner82.png b/plugins/network/resources/wireless/spinner14/Spinner82.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner82.png rename to plugins/network/resources/wireless/spinner14/Spinner82.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner83.png b/plugins/network/resources/wireless/spinner14/Spinner83.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner83.png rename to plugins/network/resources/wireless/spinner14/Spinner83.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner84.png b/plugins/network/resources/wireless/spinner14/Spinner84.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner84.png rename to plugins/network/resources/wireless/spinner14/Spinner84.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner85.png b/plugins/network/resources/wireless/spinner14/Spinner85.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner85.png rename to plugins/network/resources/wireless/spinner14/Spinner85.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner86.png b/plugins/network/resources/wireless/spinner14/Spinner86.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner86.png rename to plugins/network/resources/wireless/spinner14/Spinner86.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner87.png b/plugins/network/resources/wireless/spinner14/Spinner87.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner87.png rename to plugins/network/resources/wireless/spinner14/Spinner87.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner88.png b/plugins/network/resources/wireless/spinner14/Spinner88.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner88.png rename to plugins/network/resources/wireless/spinner14/Spinner88.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner89.png b/plugins/network/resources/wireless/spinner14/Spinner89.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner89.png rename to plugins/network/resources/wireless/spinner14/Spinner89.png diff --git a/plugins/new-network/resources/wireless/spinner14/Spinner90.png b/plugins/network/resources/wireless/spinner14/Spinner90.png similarity index 100% rename from plugins/new-network/resources/wireless/spinner14/Spinner90.png rename to plugins/network/resources/wireless/spinner14/Spinner90.png diff --git a/plugins/new-network/resources/wireless/wireless-0-symbolic.svg b/plugins/network/resources/wireless/wireless-0-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-0-symbolic.svg rename to plugins/network/resources/wireless/wireless-0-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-0.svg b/plugins/network/resources/wireless/wireless-0.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-0.svg rename to plugins/network/resources/wireless/wireless-0.svg diff --git a/plugins/new-network/resources/wireless/wireless-20-symbolic.svg b/plugins/network/resources/wireless/wireless-20-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-20-symbolic.svg rename to plugins/network/resources/wireless/wireless-20-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-20.svg b/plugins/network/resources/wireless/wireless-20.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-20.svg rename to plugins/network/resources/wireless/wireless-20.svg diff --git a/plugins/new-network/resources/wireless/wireless-40-symbolic.svg b/plugins/network/resources/wireless/wireless-40-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-40-symbolic.svg rename to plugins/network/resources/wireless/wireless-40-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-40.svg b/plugins/network/resources/wireless/wireless-40.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-40.svg rename to plugins/network/resources/wireless/wireless-40.svg diff --git a/plugins/new-network/resources/wireless/wireless-60-symbolic.svg b/plugins/network/resources/wireless/wireless-60-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-60-symbolic.svg rename to plugins/network/resources/wireless/wireless-60-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-60.svg b/plugins/network/resources/wireless/wireless-60.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-60.svg rename to plugins/network/resources/wireless/wireless-60.svg diff --git a/plugins/new-network/resources/wireless/wireless-80-symbolic.svg b/plugins/network/resources/wireless/wireless-80-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-80-symbolic.svg rename to plugins/network/resources/wireless/wireless-80-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-80.svg b/plugins/network/resources/wireless/wireless-80.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-80.svg rename to plugins/network/resources/wireless/wireless-80.svg diff --git a/plugins/new-network/resources/wireless/wireless-background.svg b/plugins/network/resources/wireless/wireless-background.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-background.svg rename to plugins/network/resources/wireless/wireless-background.svg diff --git a/plugins/new-network/resources/wireless/wireless-disconnect-symbolic.svg b/plugins/network/resources/wireless/wireless-disconnect-symbolic.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-disconnect-symbolic.svg rename to plugins/network/resources/wireless/wireless-disconnect-symbolic.svg diff --git a/plugins/new-network/resources/wireless/wireless-disconnect.svg b/plugins/network/resources/wireless/wireless-disconnect.svg similarity index 100% rename from plugins/new-network/resources/wireless/wireless-disconnect.svg rename to plugins/network/resources/wireless/wireless-disconnect.svg diff --git a/plugins/new-network/util/imageutil.cpp b/plugins/network/util/imageutil.cpp similarity index 100% rename from plugins/new-network/util/imageutil.cpp rename to plugins/network/util/imageutil.cpp diff --git a/plugins/new-network/util/imageutil.h b/plugins/network/util/imageutil.h similarity index 100% rename from plugins/new-network/util/imageutil.h rename to plugins/network/util/imageutil.h