diff --git a/mea.pri b/config.pri similarity index 72% rename from mea.pri rename to config.pri index 28520147..091ed17e 100644 --- a/mea.pri +++ b/config.pri @@ -5,6 +5,6 @@ QMAKE_CXXFLAGS += -Wall top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) -MEA_VERSION=$$cat(version.txt) -DEFINES+=MEA_VERSION=\\\"$${MEA_VERSION}\\\" +APP_VERSION=$$cat(version.txt) +DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ diff --git a/libmea-core/basicconfiguration.cpp b/libnymea-app-core/basicconfiguration.cpp similarity index 100% rename from libmea-core/basicconfiguration.cpp rename to libnymea-app-core/basicconfiguration.cpp diff --git a/libmea-core/basicconfiguration.h b/libnymea-app-core/basicconfiguration.h similarity index 100% rename from libmea-core/basicconfiguration.h rename to libnymea-app-core/basicconfiguration.h diff --git a/libmea-core/bluetoothinterface.cpp b/libnymea-app-core/bluetoothinterface.cpp similarity index 100% rename from libmea-core/bluetoothinterface.cpp rename to libnymea-app-core/bluetoothinterface.cpp diff --git a/libmea-core/bluetoothinterface.h b/libnymea-app-core/bluetoothinterface.h similarity index 100% rename from libmea-core/bluetoothinterface.h rename to libnymea-app-core/bluetoothinterface.h diff --git a/libmea-core/deviceclasses.cpp b/libnymea-app-core/deviceclasses.cpp similarity index 98% rename from libmea-core/deviceclasses.cpp rename to libnymea-app-core/deviceclasses.cpp index 39c35c55..5fe31e31 100644 --- a/libmea-core/deviceclasses.cpp +++ b/libnymea-app-core/deviceclasses.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclasses.h b/libnymea-app-core/deviceclasses.h similarity index 97% rename from libmea-core/deviceclasses.h rename to libnymea-app-core/deviceclasses.h index 8d65abf0..f3e9d6d0 100644 --- a/libmea-core/deviceclasses.h +++ b/libnymea-app-core/deviceclasses.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclassesproxy.cpp b/libnymea-app-core/deviceclassesproxy.cpp similarity index 97% rename from libmea-core/deviceclassesproxy.cpp rename to libnymea-app-core/deviceclassesproxy.cpp index 898def00..d5b35802 100644 --- a/libmea-core/deviceclassesproxy.cpp +++ b/libnymea-app-core/deviceclassesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/deviceclassesproxy.h b/libnymea-app-core/deviceclassesproxy.h similarity index 97% rename from libmea-core/deviceclassesproxy.h rename to libnymea-app-core/deviceclassesproxy.h index 1f02cecf..558b21fc 100644 --- a/libmea-core/deviceclassesproxy.h +++ b/libnymea-app-core/deviceclassesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicediscovery.cpp b/libnymea-app-core/devicediscovery.cpp similarity index 100% rename from libmea-core/devicediscovery.cpp rename to libnymea-app-core/devicediscovery.cpp diff --git a/libmea-core/devicediscovery.h b/libnymea-app-core/devicediscovery.h similarity index 100% rename from libmea-core/devicediscovery.h rename to libnymea-app-core/devicediscovery.h diff --git a/libmea-core/devicemanager.cpp b/libnymea-app-core/devicemanager.cpp similarity index 98% rename from libmea-core/devicemanager.cpp rename to libnymea-app-core/devicemanager.cpp index 1fd9f554..8e035da2 100644 --- a/libmea-core/devicemanager.cpp +++ b/libnymea-app-core/devicemanager.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/devicemanager.h b/libnymea-app-core/devicemanager.h similarity index 93% rename from libmea-core/devicemanager.h rename to libnymea-app-core/devicemanager.h index f2824177..10d96a7f 100644 --- a/libmea-core/devicemanager.h +++ b/libnymea-app-core/devicemanager.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/devices.cpp b/libnymea-app-core/devices.cpp similarity index 98% rename from libmea-core/devices.cpp rename to libnymea-app-core/devices.cpp index 9b556f98..365f0d4c 100644 --- a/libmea-core/devices.cpp +++ b/libnymea-app-core/devices.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devices.h b/libnymea-app-core/devices.h similarity index 97% rename from libmea-core/devices.h rename to libnymea-app-core/devices.h index 0f699667..9d11c49e 100644 --- a/libmea-core/devices.h +++ b/libnymea-app-core/devices.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicesproxy.cpp b/libnymea-app-core/devicesproxy.cpp similarity index 97% rename from libmea-core/devicesproxy.cpp rename to libnymea-app-core/devicesproxy.cpp index 05777c25..cf1bfe20 100644 --- a/libmea-core/devicesproxy.cpp +++ b/libnymea-app-core/devicesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/devicesproxy.h b/libnymea-app-core/devicesproxy.h similarity index 97% rename from libmea-core/devicesproxy.h rename to libnymea-app-core/devicesproxy.h index 4fe7dcfa..e4b9e1f3 100644 --- a/libmea-core/devicesproxy.h +++ b/libnymea-app-core/devicesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/discovery/discoverydevice.cpp b/libnymea-app-core/discovery/discoverydevice.cpp similarity index 93% rename from libmea-core/discovery/discoverydevice.cpp rename to libnymea-app-core/discovery/discoverydevice.cpp index 38f8e3be..27c011d9 100644 --- a/libmea-core/discovery/discoverydevice.cpp +++ b/libnymea-app-core/discovery/discoverydevice.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2018 Michael Zanetti * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverydevice.h b/libnymea-app-core/discovery/discoverydevice.h similarity index 92% rename from libmea-core/discovery/discoverydevice.h rename to libnymea-app-core/discovery/discoverydevice.h index de6ac57f..5cf98e29 100644 --- a/libmea-core/discovery/discoverydevice.h +++ b/libnymea-app-core/discovery/discoverydevice.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2018 Michael Zanetti * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverymodel.cpp b/libnymea-app-core/discovery/discoverymodel.cpp similarity index 91% rename from libmea-core/discovery/discoverymodel.cpp rename to libnymea-app-core/discovery/discoverymodel.cpp index 1a2534b1..0916052e 100644 --- a/libmea-core/discovery/discoverymodel.cpp +++ b/libnymea-app-core/discovery/discoverymodel.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/discoverymodel.h b/libnymea-app-core/discovery/discoverymodel.h similarity index 87% rename from libmea-core/discovery/discoverymodel.h rename to libnymea-app-core/discovery/discoverymodel.h index ce830765..3f284a79 100644 --- a/libmea-core/discovery/discoverymodel.h +++ b/libnymea-app-core/discovery/discoverymodel.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeadiscovery.cpp b/libnymea-app-core/discovery/nymeadiscovery.cpp similarity index 100% rename from libmea-core/discovery/nymeadiscovery.cpp rename to libnymea-app-core/discovery/nymeadiscovery.cpp diff --git a/libmea-core/discovery/nymeadiscovery.h b/libnymea-app-core/discovery/nymeadiscovery.h similarity index 100% rename from libmea-core/discovery/nymeadiscovery.h rename to libnymea-app-core/discovery/nymeadiscovery.h diff --git a/libmea-core/discovery/nymeahost.cpp b/libnymea-app-core/discovery/nymeahost.cpp similarity index 85% rename from libmea-core/discovery/nymeahost.cpp rename to libnymea-app-core/discovery/nymeahost.cpp index 1c3bacb4..f07614f0 100644 --- a/libmea-core/discovery/nymeahost.cpp +++ b/libnymea-app-core/discovery/nymeahost.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahost.h b/libnymea-app-core/discovery/nymeahost.h similarity index 85% rename from libmea-core/discovery/nymeahost.h rename to libnymea-app-core/discovery/nymeahost.h index 5aae431a..8c6efef9 100644 --- a/libmea-core/discovery/nymeahost.h +++ b/libnymea-app-core/discovery/nymeahost.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahosts.cpp b/libnymea-app-core/discovery/nymeahosts.cpp similarity index 94% rename from libmea-core/discovery/nymeahosts.cpp rename to libnymea-app-core/discovery/nymeahosts.cpp index 75fc8bd3..13dccf20 100644 --- a/libmea-core/discovery/nymeahosts.cpp +++ b/libnymea-app-core/discovery/nymeahosts.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/nymeahosts.h b/libnymea-app-core/discovery/nymeahosts.h similarity index 86% rename from libmea-core/discovery/nymeahosts.h rename to libnymea-app-core/discovery/nymeahosts.h index 79aef0a0..d705b417 100644 --- a/libmea-core/discovery/nymeahosts.h +++ b/libnymea-app-core/discovery/nymeahosts.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/upnpdiscovery.cpp b/libnymea-app-core/discovery/upnpdiscovery.cpp similarity index 97% rename from libmea-core/discovery/upnpdiscovery.cpp rename to libnymea-app-core/discovery/upnpdiscovery.cpp index 1b9e87fe..8499167b 100644 --- a/libmea-core/discovery/upnpdiscovery.cpp +++ b/libnymea-app-core/discovery/upnpdiscovery.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/upnpdiscovery.h b/libnymea-app-core/discovery/upnpdiscovery.h similarity index 87% rename from libmea-core/discovery/upnpdiscovery.h rename to libnymea-app-core/discovery/upnpdiscovery.h index 23e45019..b5cab329 100644 --- a/libmea-core/discovery/upnpdiscovery.h +++ b/libnymea-app-core/discovery/upnpdiscovery.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/discovery/zeroconfdiscovery.cpp b/libnymea-app-core/discovery/zeroconfdiscovery.cpp similarity index 100% rename from libmea-core/discovery/zeroconfdiscovery.cpp rename to libnymea-app-core/discovery/zeroconfdiscovery.cpp diff --git a/libmea-core/discovery/zeroconfdiscovery.h b/libnymea-app-core/discovery/zeroconfdiscovery.h similarity index 100% rename from libmea-core/discovery/zeroconfdiscovery.h rename to libnymea-app-core/discovery/zeroconfdiscovery.h diff --git a/libmea-core/engine.cpp b/libnymea-app-core/engine.cpp similarity index 91% rename from libmea-core/engine.cpp rename to libnymea-app-core/engine.cpp index ae04cad2..9ed4510d 100644 --- a/libmea-core/engine.cpp +++ b/libnymea-app-core/engine.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/engine.h b/libnymea-app-core/engine.h similarity index 90% rename from libmea-core/engine.h rename to libnymea-app-core/engine.h index ecbfdc1d..9162b0f5 100644 --- a/libmea-core/engine.h +++ b/libnymea-app-core/engine.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/interfacesmodel.cpp b/libnymea-app-core/interfacesmodel.cpp similarity index 100% rename from libmea-core/interfacesmodel.cpp rename to libnymea-app-core/interfacesmodel.cpp diff --git a/libmea-core/interfacesmodel.h b/libnymea-app-core/interfacesmodel.h similarity index 100% rename from libmea-core/interfacesmodel.h rename to libnymea-app-core/interfacesmodel.h diff --git a/libmea-core/jsonrpc/actionhandler.cpp b/libnymea-app-core/jsonrpc/actionhandler.cpp similarity index 100% rename from libmea-core/jsonrpc/actionhandler.cpp rename to libnymea-app-core/jsonrpc/actionhandler.cpp diff --git a/libmea-core/jsonrpc/jsonhandler.cpp b/libnymea-app-core/jsonrpc/jsonhandler.cpp similarity index 80% rename from libmea-core/jsonrpc/jsonhandler.cpp rename to libnymea-app-core/jsonrpc/jsonhandler.cpp index 2d7a384f..ccce1910 100644 --- a/libmea-core/jsonrpc/jsonhandler.cpp +++ b/libnymea-app-core/jsonrpc/jsonhandler.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsonhandler.h b/libnymea-app-core/jsonrpc/jsonhandler.h similarity index 82% rename from libmea-core/jsonrpc/jsonhandler.h rename to libnymea-app-core/jsonrpc/jsonhandler.h index d91b1ff6..15057a5e 100644 --- a/libmea-core/jsonrpc/jsonhandler.h +++ b/libnymea-app-core/jsonrpc/jsonhandler.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsonrpcclient.cpp b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp similarity index 97% rename from libmea-core/jsonrpc/jsonrpcclient.cpp rename to libnymea-app-core/jsonrpc/jsonrpcclient.cpp index 085e8404..dbc8ae79 100644 --- a/libmea-core/jsonrpc/jsonrpcclient.cpp +++ b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -275,7 +275,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data) QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(m_receiveBuffer.left(splitIndex), &error); if (error.error != QJsonParseError::NoError) { - // qWarning() << "Could not parse json data from mea" << data << error.errorString(); + // qWarning() << "Could not parse json data from nymea" << data << error.errorString(); return; } // qDebug() << "received response" << m_receiveBuffer.left(splitIndex); diff --git a/libmea-core/jsonrpc/jsonrpcclient.h b/libnymea-app-core/jsonrpc/jsonrpcclient.h similarity index 95% rename from libmea-core/jsonrpc/jsonrpcclient.h rename to libnymea-app-core/jsonrpc/jsonrpcclient.h index 8256dd19..fab1389a 100644 --- a/libmea-core/jsonrpc/jsonrpcclient.h +++ b/libnymea-app-core/jsonrpc/jsonrpcclient.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsontypes.cpp b/libnymea-app-core/jsonrpc/jsontypes.cpp similarity index 98% rename from libmea-core/jsonrpc/jsontypes.cpp rename to libnymea-app-core/jsonrpc/jsontypes.cpp index 1b1ecd92..e80a99a4 100644 --- a/libmea-core/jsonrpc/jsontypes.cpp +++ b/libnymea-app-core/jsonrpc/jsontypes.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/jsonrpc/jsontypes.h b/libnymea-app-core/jsonrpc/jsontypes.h similarity index 92% rename from libmea-core/jsonrpc/jsontypes.h rename to libnymea-app-core/jsonrpc/jsontypes.h index 3f94daf2..dfe18f7c 100644 --- a/libmea-core/jsonrpc/jsontypes.h +++ b/libnymea-app-core/jsonrpc/jsontypes.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/libmea-core.h b/libnymea-app-core/libnymea-app-core.h similarity index 98% rename from libmea-core/libmea-core.h rename to libnymea-app-core/libnymea-app-core.h index 1aa82ac6..e0eab502 100644 --- a/libmea-core/libmea-core.h +++ b/libnymea-app-core/libnymea-app-core.h @@ -1,5 +1,5 @@ -#ifndef LIBMEACORE_H -#define LIBMEACORE_H +#ifndef LIBNYMEAAPPCORE_H +#define LIBNYMEAAPPCORE_H #include "engine.h" #include "vendorsproxy.h" @@ -56,7 +56,7 @@ QObject* engine_provider(QQmlEngine *qmlEngine, QJSEngine *jsEngine) void registerQmlTypes() { - const char uri[] = "Mea"; + const char uri[] = "Nymea"; qmlRegisterSingletonType(uri, 1, 0, "Engine", engine_provider); @@ -150,4 +150,4 @@ void registerQmlTypes() { } -#endif // LIBMEACORE_H +#endif // LIBNYMEAAPPCORE_H diff --git a/libmea-core/libmea-core.pro b/libnymea-app-core/libnymea-app-core.pro similarity index 97% rename from libmea-core/libmea-core.pro rename to libnymea-app-core/libnymea-app-core.pro index 5c60c40c..50675ea6 100644 --- a/libmea-core/libmea-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -1,8 +1,8 @@ -TARGET = mea-core +TARGET = nymea-app-core TEMPLATE = lib CONFIG += staticlib -include(../mea.pri) +include(../config.pri) !win32: { # To enable this on Windows we'd need to install Bonjour # https://support.apple.com/kb/DL999 @@ -99,7 +99,7 @@ HEADERS += \ wifisetup/wirelessaccesspoints.h \ wifisetup/wirelesssetupmanager.h \ wifisetup/networkmanagercontroler.h \ - libmea-core.h \ + libnymea-app-core.h \ models/logsmodelng.h \ models/interfacesproxy.h diff --git a/libmea-core/logmanager.cpp b/libnymea-app-core/logmanager.cpp similarity index 100% rename from libmea-core/logmanager.cpp rename to libnymea-app-core/logmanager.cpp diff --git a/libmea-core/logmanager.h b/libnymea-app-core/logmanager.h similarity index 100% rename from libmea-core/logmanager.h rename to libnymea-app-core/logmanager.h diff --git a/libmea-core/models/eventdescriptorparamsfiltermodel.cpp b/libnymea-app-core/models/eventdescriptorparamsfiltermodel.cpp similarity index 100% rename from libmea-core/models/eventdescriptorparamsfiltermodel.cpp rename to libnymea-app-core/models/eventdescriptorparamsfiltermodel.cpp diff --git a/libmea-core/models/eventdescriptorparamsfiltermodel.h b/libnymea-app-core/models/eventdescriptorparamsfiltermodel.h similarity index 100% rename from libmea-core/models/eventdescriptorparamsfiltermodel.h rename to libnymea-app-core/models/eventdescriptorparamsfiltermodel.h diff --git a/libmea-core/models/interfacesproxy.cpp b/libnymea-app-core/models/interfacesproxy.cpp similarity index 100% rename from libmea-core/models/interfacesproxy.cpp rename to libnymea-app-core/models/interfacesproxy.cpp diff --git a/libmea-core/models/interfacesproxy.h b/libnymea-app-core/models/interfacesproxy.h similarity index 100% rename from libmea-core/models/interfacesproxy.h rename to libnymea-app-core/models/interfacesproxy.h diff --git a/libmea-core/models/logsmodel.cpp b/libnymea-app-core/models/logsmodel.cpp similarity index 100% rename from libmea-core/models/logsmodel.cpp rename to libnymea-app-core/models/logsmodel.cpp diff --git a/libmea-core/models/logsmodel.h b/libnymea-app-core/models/logsmodel.h similarity index 100% rename from libmea-core/models/logsmodel.h rename to libnymea-app-core/models/logsmodel.h diff --git a/libmea-core/models/logsmodelng.cpp b/libnymea-app-core/models/logsmodelng.cpp similarity index 100% rename from libmea-core/models/logsmodelng.cpp rename to libnymea-app-core/models/logsmodelng.cpp diff --git a/libmea-core/models/logsmodelng.h b/libnymea-app-core/models/logsmodelng.h similarity index 100% rename from libmea-core/models/logsmodelng.h rename to libnymea-app-core/models/logsmodelng.h diff --git a/libmea-core/models/rulesfiltermodel.cpp b/libnymea-app-core/models/rulesfiltermodel.cpp similarity index 100% rename from libmea-core/models/rulesfiltermodel.cpp rename to libnymea-app-core/models/rulesfiltermodel.cpp diff --git a/libmea-core/models/rulesfiltermodel.h b/libnymea-app-core/models/rulesfiltermodel.h similarity index 100% rename from libmea-core/models/rulesfiltermodel.h rename to libnymea-app-core/models/rulesfiltermodel.h diff --git a/libmea-core/models/valuelogsproxymodel.cpp b/libnymea-app-core/models/valuelogsproxymodel.cpp similarity index 100% rename from libmea-core/models/valuelogsproxymodel.cpp rename to libnymea-app-core/models/valuelogsproxymodel.cpp diff --git a/libmea-core/models/valuelogsproxymodel.h b/libnymea-app-core/models/valuelogsproxymodel.h similarity index 100% rename from libmea-core/models/valuelogsproxymodel.h rename to libnymea-app-core/models/valuelogsproxymodel.h diff --git a/libmea-core/nymeaconnection.cpp b/libnymea-app-core/nymeaconnection.cpp similarity index 100% rename from libmea-core/nymeaconnection.cpp rename to libnymea-app-core/nymeaconnection.cpp diff --git a/libmea-core/nymeaconnection.h b/libnymea-app-core/nymeaconnection.h similarity index 100% rename from libmea-core/nymeaconnection.h rename to libnymea-app-core/nymeaconnection.h diff --git a/libmea-core/nymeainterface.cpp b/libnymea-app-core/nymeainterface.cpp similarity index 81% rename from libmea-core/nymeainterface.cpp rename to libnymea-app-core/nymeainterface.cpp index f83dcbe5..5fd4de15 100644 --- a/libmea-core/nymeainterface.cpp +++ b/libnymea-app-core/nymeainterface.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/nymeainterface.h b/libnymea-app-core/nymeainterface.h similarity index 87% rename from libmea-core/nymeainterface.h rename to libnymea-app-core/nymeainterface.h index 1c4f3e94..f3d9ffa8 100644 --- a/libmea-core/nymeainterface.h +++ b/libnymea-app-core/nymeainterface.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/pluginsproxy.cpp b/libnymea-app-core/pluginsproxy.cpp similarity index 96% rename from libmea-core/pluginsproxy.cpp rename to libnymea-app-core/pluginsproxy.cpp index d5143910..d63a911c 100644 --- a/libmea-core/pluginsproxy.cpp +++ b/libnymea-app-core/pluginsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/pluginsproxy.h b/libnymea-app-core/pluginsproxy.h similarity index 96% rename from libmea-core/pluginsproxy.h rename to libnymea-app-core/pluginsproxy.h index 5b3bc4cd..ad0df47d 100644 --- a/libmea-core/pluginsproxy.h +++ b/libnymea-app-core/pluginsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/rulemanager.cpp b/libnymea-app-core/rulemanager.cpp similarity index 100% rename from libmea-core/rulemanager.cpp rename to libnymea-app-core/rulemanager.cpp diff --git a/libmea-core/rulemanager.h b/libnymea-app-core/rulemanager.h similarity index 100% rename from libmea-core/rulemanager.h rename to libnymea-app-core/rulemanager.h diff --git a/libmea-core/tcpsocketinterface.cpp b/libnymea-app-core/tcpsocketinterface.cpp similarity index 100% rename from libmea-core/tcpsocketinterface.cpp rename to libnymea-app-core/tcpsocketinterface.cpp diff --git a/libmea-core/tcpsocketinterface.h b/libnymea-app-core/tcpsocketinterface.h similarity index 100% rename from libmea-core/tcpsocketinterface.h rename to libnymea-app-core/tcpsocketinterface.h diff --git a/libmea-core/vendorsproxy.cpp b/libnymea-app-core/vendorsproxy.cpp similarity index 96% rename from libmea-core/vendorsproxy.cpp rename to libnymea-app-core/vendorsproxy.cpp index 71ec8969..c391c4e3 100644 --- a/libmea-core/vendorsproxy.cpp +++ b/libnymea-app-core/vendorsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/vendorsproxy.h b/libnymea-app-core/vendorsproxy.h similarity index 96% rename from libmea-core/vendorsproxy.h rename to libnymea-app-core/vendorsproxy.h index 84d05809..e2acc941 100644 --- a/libmea-core/vendorsproxy.h +++ b/libnymea-app-core/vendorsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/websocketinterface.cpp b/libnymea-app-core/websocketinterface.cpp similarity index 91% rename from libmea-core/websocketinterface.cpp rename to libnymea-app-core/websocketinterface.cpp index 9d91041d..3636932e 100644 --- a/libmea-core/websocketinterface.cpp +++ b/libnymea-app-core/websocketinterface.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/websocketinterface.h b/libnymea-app-core/websocketinterface.h similarity index 86% rename from libmea-core/websocketinterface.h rename to libnymea-app-core/websocketinterface.h index 8349a736..e5b6f386 100644 --- a/libmea-core/websocketinterface.h +++ b/libnymea-app-core/websocketinterface.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/libmea-core/wifisetup/bluetoothdevice.cpp b/libnymea-app-core/wifisetup/bluetoothdevice.cpp similarity index 98% rename from libmea-core/wifisetup/bluetoothdevice.cpp rename to libnymea-app-core/wifisetup/bluetoothdevice.cpp index 4ac7db94..c9cea6dc 100644 --- a/libmea-core/wifisetup/bluetoothdevice.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdevice.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdevice.h b/libnymea-app-core/wifisetup/bluetoothdevice.h similarity index 97% rename from libmea-core/wifisetup/bluetoothdevice.h rename to libnymea-app-core/wifisetup/bluetoothdevice.h index 97392cf3..b2047350 100644 --- a/libmea-core/wifisetup/bluetoothdevice.h +++ b/libnymea-app-core/wifisetup/bluetoothdevice.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfo.cpp b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfo.cpp rename to libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp index 80ca0caf..c9a04edd 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfo.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfo.h b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfo.h rename to libnymea-app-core/wifisetup/bluetoothdeviceinfo.h index 0d39dc8c..75460f2d 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfo.h +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfo.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfos.cpp b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp similarity index 97% rename from libmea-core/wifisetup/bluetoothdeviceinfos.cpp rename to libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp index e749b28d..e3b28452 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfos.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdeviceinfos.h b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdeviceinfos.h rename to libnymea-app-core/wifisetup/bluetoothdeviceinfos.h index 1520b8f6..8b87fdaa 100644 --- a/libmea-core/wifisetup/bluetoothdeviceinfos.h +++ b/libnymea-app-core/wifisetup/bluetoothdeviceinfos.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdiscovery.cpp b/libnymea-app-core/wifisetup/bluetoothdiscovery.cpp similarity index 97% rename from libmea-core/wifisetup/bluetoothdiscovery.cpp rename to libnymea-app-core/wifisetup/bluetoothdiscovery.cpp index 64f99165..322d96da 100644 --- a/libmea-core/wifisetup/bluetoothdiscovery.cpp +++ b/libnymea-app-core/wifisetup/bluetoothdiscovery.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/bluetoothdiscovery.h b/libnymea-app-core/wifisetup/bluetoothdiscovery.h similarity index 96% rename from libmea-core/wifisetup/bluetoothdiscovery.h rename to libnymea-app-core/wifisetup/bluetoothdiscovery.h index 1f7ea2e3..b376ee16 100644 --- a/libmea-core/wifisetup/bluetoothdiscovery.h +++ b/libnymea-app-core/wifisetup/bluetoothdiscovery.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/networkmanagercontroler.cpp b/libnymea-app-core/wifisetup/networkmanagercontroler.cpp similarity index 96% rename from libmea-core/wifisetup/networkmanagercontroler.cpp rename to libnymea-app-core/wifisetup/networkmanagercontroler.cpp index 68fa48b9..eb3b45b0 100644 --- a/libmea-core/wifisetup/networkmanagercontroler.cpp +++ b/libnymea-app-core/wifisetup/networkmanagercontroler.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/networkmanagercontroler.h b/libnymea-app-core/wifisetup/networkmanagercontroler.h similarity index 96% rename from libmea-core/wifisetup/networkmanagercontroler.h rename to libnymea-app-core/wifisetup/networkmanagercontroler.h index dc5a5f75..d8a0cfc6 100644 --- a/libmea-core/wifisetup/networkmanagercontroler.h +++ b/libnymea-app-core/wifisetup/networkmanagercontroler.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoint.cpp b/libnymea-app-core/wifisetup/wirelessaccesspoint.cpp similarity index 96% rename from libmea-core/wifisetup/wirelessaccesspoint.cpp rename to libnymea-app-core/wifisetup/wirelessaccesspoint.cpp index ded8e572..bf83773e 100644 --- a/libmea-core/wifisetup/wirelessaccesspoint.cpp +++ b/libnymea-app-core/wifisetup/wirelessaccesspoint.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoint.h b/libnymea-app-core/wifisetup/wirelessaccesspoint.h similarity index 96% rename from libmea-core/wifisetup/wirelessaccesspoint.h rename to libnymea-app-core/wifisetup/wirelessaccesspoint.h index d9c12205..59833100 100644 --- a/libmea-core/wifisetup/wirelessaccesspoint.h +++ b/libnymea-app-core/wifisetup/wirelessaccesspoint.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoints.cpp b/libnymea-app-core/wifisetup/wirelessaccesspoints.cpp similarity index 98% rename from libmea-core/wifisetup/wirelessaccesspoints.cpp rename to libnymea-app-core/wifisetup/wirelessaccesspoints.cpp index b6a8ec9d..50e5e5ab 100644 --- a/libmea-core/wifisetup/wirelessaccesspoints.cpp +++ b/libnymea-app-core/wifisetup/wirelessaccesspoints.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelessaccesspoints.h b/libnymea-app-core/wifisetup/wirelessaccesspoints.h similarity index 97% rename from libmea-core/wifisetup/wirelessaccesspoints.h rename to libnymea-app-core/wifisetup/wirelessaccesspoints.h index 84b40276..f43c6ce3 100644 --- a/libmea-core/wifisetup/wirelessaccesspoints.h +++ b/libnymea-app-core/wifisetup/wirelessaccesspoints.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelesssetupmanager.cpp b/libnymea-app-core/wifisetup/wirelesssetupmanager.cpp similarity index 99% rename from libmea-core/wifisetup/wirelesssetupmanager.cpp rename to libnymea-app-core/wifisetup/wirelesssetupmanager.cpp index d7746641..74d50e42 100644 --- a/libmea-core/wifisetup/wirelesssetupmanager.cpp +++ b/libnymea-app-core/wifisetup/wirelesssetupmanager.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libmea-core/wifisetup/wirelesssetupmanager.h b/libnymea-app-core/wifisetup/wirelesssetupmanager.h similarity index 99% rename from libmea-core/wifisetup/wirelesssetupmanager.h rename to libnymea-app-core/wifisetup/wirelesssetupmanager.h index c9c9ec7f..2a82405b 100644 --- a/libmea-core/wifisetup/wirelesssetupmanager.h +++ b/libnymea-app-core/wifisetup/wirelesssetupmanager.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2018 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/libnymea-common.pro b/libnymea-common/libnymea-common.pro index 3adc7fff..5574cf14 100644 --- a/libnymea-common/libnymea-common.pro +++ b/libnymea-common/libnymea-common.pro @@ -1,4 +1,4 @@ -include(../mea.pri) +include(../config.pri) TARGET = nymea-common TEMPLATE = lib diff --git a/libnymea-common/types/actiontype.cpp b/libnymea-common/types/actiontype.cpp index e6d8ba95..f90518e8 100644 --- a/libnymea-common/types/actiontype.cpp +++ b/libnymea-common/types/actiontype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontype.h b/libnymea-common/types/actiontype.h index 0f06f1ed..9347e0ca 100644 --- a/libnymea-common/types/actiontype.h +++ b/libnymea-common/types/actiontype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontypes.cpp b/libnymea-common/types/actiontypes.cpp index 6ce63844..f2aa43a3 100644 --- a/libnymea-common/types/actiontypes.cpp +++ b/libnymea-common/types/actiontypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/actiontypes.h b/libnymea-common/types/actiontypes.h index 3eec6cb1..04aaffb2 100644 --- a/libnymea-common/types/actiontypes.h +++ b/libnymea-common/types/actiontypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/device.cpp b/libnymea-common/types/device.cpp index 00eb30ed..ec3ac241 100644 --- a/libnymea-common/types/device.cpp +++ b/libnymea-common/types/device.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/device.h b/libnymea-common/types/device.h index a1e96e06..c5a2594a 100644 --- a/libnymea-common/types/device.h +++ b/libnymea-common/types/device.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/deviceclass.cpp b/libnymea-common/types/deviceclass.cpp index 21a69c62..2b220052 100644 --- a/libnymea-common/types/deviceclass.cpp +++ b/libnymea-common/types/deviceclass.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/deviceclass.h b/libnymea-common/types/deviceclass.h index ef022cbc..82fef48d 100644 --- a/libnymea-common/types/deviceclass.h +++ b/libnymea-common/types/deviceclass.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtype.cpp b/libnymea-common/types/eventtype.cpp index b4a3b77c..834e1ec2 100644 --- a/libnymea-common/types/eventtype.cpp +++ b/libnymea-common/types/eventtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtype.h b/libnymea-common/types/eventtype.h index 9979b8cc..98e791c2 100644 --- a/libnymea-common/types/eventtype.h +++ b/libnymea-common/types/eventtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtypes.cpp b/libnymea-common/types/eventtypes.cpp index 7fbb8945..af31f39c 100644 --- a/libnymea-common/types/eventtypes.cpp +++ b/libnymea-common/types/eventtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/eventtypes.h b/libnymea-common/types/eventtypes.h index fb1d28cc..3e474912 100644 --- a/libnymea-common/types/eventtypes.h +++ b/libnymea-common/types/eventtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/param.cpp b/libnymea-common/types/param.cpp index e93b85b6..4fc2ecca 100644 --- a/libnymea-common/types/param.cpp +++ b/libnymea-common/types/param.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/param.h b/libnymea-common/types/param.h index 6b38edd0..e747e2af 100644 --- a/libnymea-common/types/param.h +++ b/libnymea-common/types/param.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/params.cpp b/libnymea-common/types/params.cpp index d1bb0d6b..5648ff29 100644 --- a/libnymea-common/types/params.cpp +++ b/libnymea-common/types/params.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/params.h b/libnymea-common/types/params.h index 9ff13989..bb514ef6 100644 --- a/libnymea-common/types/params.h +++ b/libnymea-common/types/params.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtype.cpp b/libnymea-common/types/paramtype.cpp index 025132ad..ea7c7e84 100644 --- a/libnymea-common/types/paramtype.cpp +++ b/libnymea-common/types/paramtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtype.h b/libnymea-common/types/paramtype.h index f3458556..7ecf1f6a 100644 --- a/libnymea-common/types/paramtype.h +++ b/libnymea-common/types/paramtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtypes.cpp b/libnymea-common/types/paramtypes.cpp index 42b33b95..ba99430d 100644 --- a/libnymea-common/types/paramtypes.cpp +++ b/libnymea-common/types/paramtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/paramtypes.h b/libnymea-common/types/paramtypes.h index 0803c08c..a28abeb1 100644 --- a/libnymea-common/types/paramtypes.h +++ b/libnymea-common/types/paramtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugin.cpp b/libnymea-common/types/plugin.cpp index 2dc20d27..76c097c5 100644 --- a/libnymea-common/types/plugin.cpp +++ b/libnymea-common/types/plugin.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugin.h b/libnymea-common/types/plugin.h index 4d9685fc..dc03774d 100644 --- a/libnymea-common/types/plugin.h +++ b/libnymea-common/types/plugin.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugins.cpp b/libnymea-common/types/plugins.cpp index 524bfc75..214dcb22 100644 --- a/libnymea-common/types/plugins.cpp +++ b/libnymea-common/types/plugins.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/plugins.h b/libnymea-common/types/plugins.h index 281205f8..007417e1 100644 --- a/libnymea-common/types/plugins.h +++ b/libnymea-common/types/plugins.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/state.cpp b/libnymea-common/types/state.cpp index 6fa681f3..2b437bb6 100644 --- a/libnymea-common/types/state.cpp +++ b/libnymea-common/types/state.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/state.h b/libnymea-common/types/state.h index ebe0f9ae..4fa66aba 100644 --- a/libnymea-common/types/state.h +++ b/libnymea-common/types/state.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/states.cpp b/libnymea-common/types/states.cpp index d347c591..4bc09872 100644 --- a/libnymea-common/types/states.cpp +++ b/libnymea-common/types/states.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/states.h b/libnymea-common/types/states.h index a5e53709..582f31af 100644 --- a/libnymea-common/types/states.h +++ b/libnymea-common/types/states.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statesproxy.cpp b/libnymea-common/types/statesproxy.cpp index 3a732179..c86bee24 100644 --- a/libnymea-common/types/statesproxy.cpp +++ b/libnymea-common/types/statesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statesproxy.h b/libnymea-common/types/statesproxy.h index 79d2b0ee..769b6a15 100644 --- a/libnymea-common/types/statesproxy.h +++ b/libnymea-common/types/statesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetype.cpp b/libnymea-common/types/statetype.cpp index 26b6dc8a..c4a546bd 100644 --- a/libnymea-common/types/statetype.cpp +++ b/libnymea-common/types/statetype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetype.h b/libnymea-common/types/statetype.h index 9fe2fe0e..8ab87380 100644 --- a/libnymea-common/types/statetype.h +++ b/libnymea-common/types/statetype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetypes.cpp b/libnymea-common/types/statetypes.cpp index 20b3c11e..745b2eec 100644 --- a/libnymea-common/types/statetypes.cpp +++ b/libnymea-common/types/statetypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/statetypes.h b/libnymea-common/types/statetypes.h index 979efa70..b890e046 100644 --- a/libnymea-common/types/statetypes.h +++ b/libnymea-common/types/statetypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/types.h b/libnymea-common/types/types.h index 611e84fa..3c651f57 100644 --- a/libnymea-common/types/types.h +++ b/libnymea-common/types/types.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendor.cpp b/libnymea-common/types/vendor.cpp index 5b9d25c5..3a6a86d5 100644 --- a/libnymea-common/types/vendor.cpp +++ b/libnymea-common/types/vendor.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendor.h b/libnymea-common/types/vendor.h index 0d3afd9c..f7c41fdb 100644 --- a/libnymea-common/types/vendor.h +++ b/libnymea-common/types/vendor.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendors.cpp b/libnymea-common/types/vendors.cpp index d8a79c27..48f3d0c3 100644 --- a/libnymea-common/types/vendors.cpp +++ b/libnymea-common/types/vendors.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libnymea-common/types/vendors.h b/libnymea-common/types/vendors.h index 12dfe8e0..87f99957 100644 --- a/libnymea-common/types/vendors.h +++ b/libnymea-common/types/vendors.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea * + * This file is part of nymea:app * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/mea.pro b/mea.pro deleted file mode 100644 index 0848c000..00000000 --- a/mea.pro +++ /dev/null @@ -1,66 +0,0 @@ -include(mea.pri) - -TEMPLATE=subdirs - -SUBDIRS = libnymea-common libmea-core mea -libmea-core.depends = libnymea-common -mea.depends = libmea-core - -withtests: { - SUBDIRS += tests - tests.depends = libmea-core -} - -# Building a Windows installer: -# Install Visual Studio, Qt and NSIS on Windows. Make sure NSIS is in your path. -# Use QtCreator to create a release build, make sure to *disable* shadow build. -# After building, run "make wininstaller" -wininstaller.depends = mea -equals(BRANDING, "") { - APP_NAME = mea - PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows - PACKAGE_NAME = mea-win-installer -} else { - APP_NAME = $${BRANDING} - PACKAGE_NAME = $${BRANDING}-win-installer - PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows_$${APP_NAME} -} -OLDSTRING=".*" -NEWSTRING="$${MEA_VERSION}" -wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\package.xml\" && -wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data & mkdir $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -wininstaller.commands += copy $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\logo.ico $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\logo.ico && -CONFIG(debug,debug|release):wininstaller.commands += copy mea\debug\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe && -CONFIG(release,debug|release):wininstaller.commands += copy mea\release\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe && -!equals(SSL_LIBS, "") { -message("Deploying SSL libs from $${SSL_LIBS} to package.") -wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data && -} -wininstaller.commands += windeployqt --compiler-runtime --qmldir \"$${top_srcdir}\"\mea\ui $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\ && -wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME} -message("cmd: $${wininstaller.commands}") -QMAKE_EXTRA_TARGETS += wininstaller - - -# OS X installer bundle -osxbundle.commands += cd mea && rm -f mea.dmg mea_writable.dmg mea-osx-bundle.dmg || true && -osxbundle.commands += hdiutil eject /Volumes/mea || true && -osxbundle.commands += macdeployqt mea.app -qmldir=$$top_srcdir/mea/ui -dmg && -osxbundle.commands += hdiutil convert mea.dmg -format UDRW -o mea_writable.dmg && -osxbundle.commands += hdiutil attach -readwrite -noverify mea_writable.dmg && sleep 2 && -osxbundle.commands += mkdir /Volumes/mea/.background/ && cp $$top_srcdir/packaging/osx/installer.tiff /Volumes/mea/.background/ && -osxbundle.commands += ln -s /Applications /Volumes/mea/Applications && -osxbundle.commands += osascript $$top_srcdir/packaging/osx/patchinstaller.sctp && -osxbundle.commands += hdiutil eject /Volumes/mea && -osxbundle.commands += hdiutil convert mea_writable.dmg -format UDRO -o mea-osx-bundle.dmg && -osxbundle.commands += rm mea.dmg mea_writable.dmg -QMAKE_EXTRA_TARGETS += osxbundle - - -# Translations support -TRANSLATIONS += $$files($$absolute_path(mea)/translations/*.ts, true) -lrelease.commands = lrelease $$TRANSLATIONS -lrelease-qmake_all.commands = lrelease $$TRANSLATIONS -QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets -mea.depends += lrelease diff --git a/nymea-app.pro b/nymea-app.pro new file mode 100644 index 00000000..4edfbaf8 --- /dev/null +++ b/nymea-app.pro @@ -0,0 +1,71 @@ +include(config.pri) + +TEMPLATE=subdirs + +SUBDIRS = libnymea-common libnymea-app-core nymea-app +libnymea-app-core.depends = libnymea-common +nymea-app.depends = libnymea-app-core + +withtests: { + SUBDIRS += tests + tests.depends = libnymea-app-core +} + +# Building a Windows installer: +# Qt MinGW including the Qt Install Framework and MinGW runtime from Qt Installer +# Add QT_INSTALL_DIR/bin, QT_IFW_INSTALL_DIR/bin and MINGW_INSTALL_DIR/bin to PATH +# run "make wininstaller" +wininstaller.depends = nymea-app +equals(BRANDING, "") { + APP_NAME = nymea-app + PACKAGE_URN = io.guh.nymeaapp + PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows + PACKAGE_NAME = nymea-app-win-installer +} else { + APP_NAME = $${BRANDING} + PACKAGE_URN = io.guh.$${APP_NAME} + PACKAGE_NAME = $${BRANDING}-win-installer + PACKAGE_DIR = $$shell_path($$PWD)\packaging\windows_$${APP_NAME} +} +OLDSTRING=".*" +NEWSTRING="$${APP_VERSION}" +wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml\" && +wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data & mkdir $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +wininstaller.commands += copy $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\logo.ico $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\logo.ico && +CONFIG(debug,debug|release):wininstaller.commands += copy nymea-app\debug\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe && +CONFIG(release,debug|release):wininstaller.commands += copy nymea-app\release\nymea-app.exe $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\\$${APP_NAME}.exe && +!equals(SSL_LIBS, "") { +message("Deploying SSL libs from $${SSL_LIBS} to package.") +wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data && +} +wininstaller.commands += windeployqt --compiler-runtime --qmldir \"$${top_srcdir}\"\nymea-app\ui $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\data\ && +wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME}-$${APP_VERSION} +QMAKE_EXTRA_TARGETS += wininstaller + + +# OS X installer bundle +# Install XCode and Qt clang64, add qmake directory to PATH +# run "make osxbundle" +osxbundle.depends = nymea-app +osxbundle.commands += cd nymea-app && rm -f nymea-app.dmg nymea-app_writable.dmg nymea-app-osx-bundle.dmg || true && +osxbundle.commands += hdiutil eject /Volumes/nymea-app || true && +osxbundle.commands += macdeployqt nymea-app.app -qmldir=$$top_srcdir/nymea-app/ui -dmg && +osxbundle.commands += hdiutil convert nymea-app.dmg -format UDRW -o nymea-app_writable.dmg && +osxbundle.commands += hdiutil attach -readwrite -noverify nymea-app_writable.dmg && sleep 2 && +osxbundle.commands += mkdir /Volumes/nymea-app/.background/ && cp $$top_srcdir/packaging/osx/installer.tiff /Volumes/nymea-app/.background/ && +osxbundle.commands += ln -s /Applications /Volumes/nymea-app/Applications && +osxbundle.commands += mv /Volumes/nymea-app/nymea-app.app /Volumes/nymea-app/nymea\:app.app && +osxbundle.commands += osascript $$top_srcdir/packaging/osx/patchinstaller.sctp && +osxbundle.commands += hdiutil eject /Volumes/nymea-app && +osxbundle.commands += hdiutil convert nymea-app_writable.dmg -format UDRO -o ../nymea-app-osx-bundle-$${APP_VERSION}.dmg && +osxbundle.commands += rm nymea-app.dmg nymea-app_writable.dmg +QMAKE_EXTRA_TARGETS += osxbundle + + +# Translations support +TRANSLATIONS += $$files($$absolute_path(nymea-app)/translations/*.ts, true) +lrelease.commands = lrelease $$TRANSLATIONS +lrelease-qmake_all.commands = lrelease $$TRANSLATIONS +QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets +nymea-app.depends += lrelease diff --git a/mea/main.cpp b/nymea-app/main.cpp similarity index 79% rename from mea/main.cpp rename to nymea-app/main.cpp index 6dd802fc..033701ed 100644 --- a/mea/main.cpp +++ b/nymea-app/main.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of mea. * + * This file is part of nymea:app. * * * - * mea is free software: you can redistribute it and/or modify * + * nymea:app is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * mea is distributed in the hope that it will be useful, * + * nymea:app is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with mea. If not, see . * + * along with nymea:app. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -29,7 +29,7 @@ #include #endif -#include "libmea-core.h" +#include "libnymea-app-core.h" #include "stylecontroller.h" @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); - application.setApplicationName("mea"); + application.setApplicationName("nymea-app"); application.setOrganizationName("nymea"); foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) { @@ -58,8 +58,8 @@ int main(int argc, char *argv[]) application.installTranslator(&qtTranslator); QTranslator meaTranslator; - qDebug() << "Loading translation file:" << ":/translations/mea-" + QLocale::system().name(); - meaTranslator.load(":/translations/mea-" + QLocale::system().name()); + qDebug() << "Loading translation file:" << ":/translations/nymea-app-" + QLocale::system().name(); + meaTranslator.load(":/translations/nymea-app-" + QLocale::system().name()); application.installTranslator(&meaTranslator); qDebug() << "Running on" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion(); @@ -74,13 +74,15 @@ int main(int argc, char *argv[]) #else engine->rootContext()->setContextProperty("appBranding", ""); #endif - engine->rootContext()->setContextProperty("appVersion", MEA_VERSION); + engine->rootContext()->setContextProperty("appVersion", APP_VERSION); engine->rootContext()->setContextProperty("qtVersion", QT_VERSION_STR); StyleController styleController; engine->rootContext()->setContextProperty("styleController", &styleController); - engine->load(QUrl(QLatin1String("qrc:/ui/Mea.qml"))); + application.setWindowIcon(QIcon(QString(":/styles/%1/logo.svg").arg(styleController.currentStyle()))); + + engine->load(QUrl(QLatin1String("qrc:/ui/Nymea.qml"))); #ifdef Q_OS_ANDROID QtAndroid::hideSplashScreen(250); diff --git a/mea/mea.pro b/nymea-app/nymea-app.pro similarity index 83% rename from mea/mea.pro rename to nymea-app/nymea-app.pro index 29678797..62b64be4 100644 --- a/mea/mea.pro +++ b/nymea-app/nymea-app.pro @@ -1,19 +1,19 @@ TEMPLATE=app -TARGET=mea -include(../mea.pri) +TARGET=nymea-app +include(../config.pri) QT += qml quick quickcontrols2 svg websockets bluetooth INCLUDEPATH += $$top_srcdir/libnymea-common \ - $$top_srcdir/libmea-core -LIBS += -L$$top_builddir/libmea-core/ -lmea-core \ + $$top_srcdir/libnymea-app-core +LIBS += -L$$top_builddir/libnymea-app-core/ -lnymea-app-core \ -L$$top_builddir/libnymea-common/ -lnymea-common -win32:Debug:LIBS += -L$$top_builddir/libmea-core/debug \ +win32:Debug:LIBS += -L$$top_builddir/libnymea-app-core/debug \ -L$$top_builddir/libnymea-common/debug -win32:Release:LIBS += -L$$top_builddir/libmea-core/release \ +win32:Release:LIBS += -L$$top_builddir/libnymea-app-core/release \ -L$$top_builddir/libnymea-common/release linux:!android:LIBS += -lavahi-client -lavahi-common -PRE_TARGETDEPS += ../libmea-core ../libnymea-common +PRE_TARGETDEPS += ../libnymea-app-core ../libnymea-common HEADERS += \ stylecontroller.h @@ -47,7 +47,7 @@ android { } macx: { - PRODUCT_NAME=mea + PRODUCT_NAME=$$TARGET plist.input = ../packaging/osx/Info.plist.in plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist @@ -59,7 +59,7 @@ macx: { ios: { message("iOS build") QMAKE_TARGET_BUNDLE_PREFIX = io.guh - QMAKE_BUNDLE = mea + QMAKE_BUNDLE = $$TARGET # Configure generated xcode project to have our bundle id xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} plist.input = ../packaging/ios/Info.plist.in @@ -71,8 +71,6 @@ ios: { ios_icon_files.files += $$files(../packaging/ios/AppIcon*.png) ios_launch_images.files += $$files(../packaging/ios/LaunchImage*.png) ../packaging/ios/LaunchScreen1.xib QMAKE_BUNDLE_DATA += ios_icon_files ios_launch_images - - message("ls: $${qmake_launch_screen}") } BR=$$BRANDING @@ -80,7 +78,7 @@ BR=$$BRANDING DEFINES += BRANDING=\\\"$${BR}\\\" win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico } else { - win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico + win32:RCC_ICONS += ../packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico } target.path = /usr/bin diff --git a/mea/qtquickcontrols2.conf b/nymea-app/qtquickcontrols2.conf similarity index 100% rename from mea/qtquickcontrols2.conf rename to nymea-app/qtquickcontrols2.conf diff --git a/mea/resources.qrc b/nymea-app/resources.qrc similarity index 97% rename from mea/resources.qrc rename to nymea-app/resources.qrc index b15b0998..7a4a337f 100644 --- a/mea/resources.qrc +++ b/nymea-app/resources.qrc @@ -1,8 +1,8 @@ + ui/Nymea.qml ui/ConnectPage.qml ui/DevicesPage.qml - ui/Mea.qml ui/NewDeviceWizard.qml ui/SettingsPage.qml ui/components/GuhHeader.qml @@ -135,7 +135,6 @@ ui/images/clock-app-symbolic.svg ui/devicepages/StateLogPage.qml ui/customviews/GenericTypeLogView.qml - guh-logo.svg qtquickcontrols2.conf styles/dark/ApplicationWindow.qml styles/light/ApplicationWindow.qml @@ -158,8 +157,8 @@ ui/images/nm-signal-100.svg ui/images/nm-signal-100-secure.svg ui/images/network-vpn.svg - translations/mea-de_DE.qm - translations/mea-en_US.qm + translations/nymea-app-de_DE.qm + translations/nymea-app-en_US.qm ui/AppSettingsPage.qml ui/images/stock_application.svg ui/delegates/ThingDelegate.qml @@ -209,5 +208,8 @@ ui/images/rpi-setup.svg ui/images/eye.svg ui/images/private-browsing.svg + styles/dark/logo.svg + styles/light/logo.svg + styles/maveo/logo.svg diff --git a/mea/stylecontroller.cpp b/nymea-app/stylecontroller.cpp similarity index 100% rename from mea/stylecontroller.cpp rename to nymea-app/stylecontroller.cpp diff --git a/mea/stylecontroller.h b/nymea-app/stylecontroller.h similarity index 100% rename from mea/stylecontroller.h rename to nymea-app/stylecontroller.h diff --git a/mea/styles/dark/ApplicationWindow.qml b/nymea-app/styles/dark/ApplicationWindow.qml similarity index 87% rename from mea/styles/dark/ApplicationWindow.qml rename to nymea-app/styles/dark/ApplicationWindow.qml index 183293fe..cea9b461 100644 --- a/mea/styles/dark/ApplicationWindow.qml +++ b/nymea-app/styles/dark/ApplicationWindow.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.2 ApplicationWindow { property color guhAccent: "#ff57baae" property string systemName: "nymea" - property string appName: "mea" + property string appName: "nymea:app" Material.theme: Material.Dark Material.accent: guhAccent diff --git a/mea/styles/dark/Page.qml b/nymea-app/styles/dark/Page.qml similarity index 100% rename from mea/styles/dark/Page.qml rename to nymea-app/styles/dark/Page.qml diff --git a/mea/guh-logo.svg b/nymea-app/styles/dark/logo.svg similarity index 97% rename from mea/guh-logo.svg rename to nymea-app/styles/dark/logo.svg index 2985cebe..9d1907c3 100644 --- a/mea/guh-logo.svg +++ b/nymea-app/styles/dark/logo.svg @@ -13,8 +13,8 @@ height="256" id="svg2" version="1.1" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" - sodipodi:docname="guh-logo.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="logo.svg" inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> @@ -251,12 +251,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.979899" - inkscape:cx="-128.90044" - inkscape:cy="115.43739" + inkscape:zoom="3.959798" + inkscape:cx="83.152338" + inkscape:cy="132.37098" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="2880" inkscape:window-height="1698" inkscape:window-x="0" @@ -265,7 +265,11 @@ fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0"> + + @@ -274,7 +278,7 @@ image/svg+xml - + @@ -284,7 +288,7 @@ id="layer1" transform="translate(-143.41788,-709.27353)"> diff --git a/mea/styles/light/ApplicationWindow.qml b/nymea-app/styles/light/ApplicationWindow.qml similarity index 87% rename from mea/styles/light/ApplicationWindow.qml rename to nymea-app/styles/light/ApplicationWindow.qml index bc7fba6a..eebfc30f 100644 --- a/mea/styles/light/ApplicationWindow.qml +++ b/nymea-app/styles/light/ApplicationWindow.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.2 ApplicationWindow { property color guhAccent: "#ff57baae" property string systemName: "nymea" - property string appName: "mea" + property string appName: "nymea:app" Material.theme: Material.Light Material.accent: guhAccent diff --git a/mea/styles/light/Page.qml b/nymea-app/styles/light/Page.qml similarity index 100% rename from mea/styles/light/Page.qml rename to nymea-app/styles/light/Page.qml diff --git a/nymea-app/styles/light/logo.svg b/nymea-app/styles/light/logo.svg new file mode 100644 index 00000000..9d1907c3 --- /dev/null +++ b/nymea-app/styles/light/logo.svg @@ -0,0 +1,603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mea/styles/maveo/ApplicationWindow.qml b/nymea-app/styles/maveo/ApplicationWindow.qml similarity index 100% rename from mea/styles/maveo/ApplicationWindow.qml rename to nymea-app/styles/maveo/ApplicationWindow.qml diff --git a/nymea-app/styles/maveo/logo.svg b/nymea-app/styles/maveo/logo.svg new file mode 100644 index 00000000..9fec2008 --- /dev/null +++ b/nymea-app/styles/maveo/logo.svg @@ -0,0 +1,353 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mea/translations/mea-de_DE.ts b/nymea-app/translations/nymea-app-de_DE.ts similarity index 100% rename from mea/translations/mea-de_DE.ts rename to nymea-app/translations/nymea-app-de_DE.ts diff --git a/mea/translations/mea-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts similarity index 100% rename from mea/translations/mea-en_US.ts rename to nymea-app/translations/nymea-app-en_US.ts diff --git a/mea/ui/AboutPage.qml b/nymea-app/ui/AboutPage.qml similarity index 98% rename from mea/ui/AboutPage.qml rename to nymea-app/ui/AboutPage.qml index 24981386..c35f13a7 100644 --- a/mea/ui/AboutPage.qml +++ b/nymea-app/ui/AboutPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { @@ -30,7 +30,7 @@ Page { Layout.preferredHeight: app.iconSize * 2 Layout.preferredWidth: height fillMode: Image.PreserveAspectFit - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) } GridLayout { @@ -118,7 +118,7 @@ Page { } } onClicked: { - Qt.openUrlExternally("https://github.com/guh/mea") + Qt.openUrlExternally("https://github.com/guh/nymea-app") } } diff --git a/mea/ui/AppSettingsPage.qml b/nymea-app/ui/AppSettingsPage.qml similarity index 99% rename from mea/ui/AppSettingsPage.qml rename to nymea-app/ui/AppSettingsPage.qml index e44057f3..93fc0259 100644 --- a/mea/ui/AppSettingsPage.qml +++ b/nymea-app/ui/AppSettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/BluetoothDiscoveryPage.qml b/nymea-app/ui/BluetoothDiscoveryPage.qml similarity index 99% rename from mea/ui/BluetoothDiscoveryPage.qml rename to nymea-app/ui/BluetoothDiscoveryPage.qml index e15bd2aa..4b596cca 100644 --- a/mea/ui/BluetoothDiscoveryPage.qml +++ b/nymea-app/ui/BluetoothDiscoveryPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { diff --git a/mea/ui/BluetoothLoadingPage.qml b/nymea-app/ui/BluetoothLoadingPage.qml similarity index 98% rename from mea/ui/BluetoothLoadingPage.qml rename to nymea-app/ui/BluetoothLoadingPage.qml index dad7d364..619f12e7 100644 --- a/mea/ui/BluetoothLoadingPage.qml +++ b/nymea-app/ui/BluetoothLoadingPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { diff --git a/mea/ui/ConnectPage.qml b/nymea-app/ui/ConnectPage.qml similarity index 99% rename from mea/ui/ConnectPage.qml rename to nymea-app/ui/ConnectPage.qml index 9b290155..bac1390f 100644 --- a/mea/ui/ConnectPage.qml +++ b/nymea-app/ui/ConnectPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/DevicesPage.qml b/nymea-app/ui/DevicesPage.qml similarity index 99% rename from mea/ui/DevicesPage.qml rename to nymea-app/ui/DevicesPage.qml index d5122487..10570646 100644 --- a/mea/ui/DevicesPage.qml +++ b/nymea-app/ui/DevicesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "components" Item { diff --git a/mea/ui/EditDevicesPage.qml b/nymea-app/ui/EditDevicesPage.qml similarity index 96% rename from mea/ui/EditDevicesPage.qml rename to nymea-app/ui/EditDevicesPage.qml index 7762f990..53c67f1f 100644 --- a/mea/ui/EditDevicesPage.qml +++ b/nymea-app/ui/EditDevicesPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" import "delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root @@ -55,7 +55,7 @@ Page { horizontalAlignment: Text.AlignHCenter } Image { - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) Layout.preferredWidth: app.iconSize * 5 Layout.preferredHeight: width Layout.alignment: Qt.AlignHCenter diff --git a/mea/ui/LoginPage.qml b/nymea-app/ui/LoginPage.qml similarity index 97% rename from mea/ui/LoginPage.qml rename to nymea-app/ui/LoginPage.qml index 82b8cbe2..9451a57d 100644 --- a/mea/ui/LoginPage.qml +++ b/nymea-app/ui/LoginPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { @@ -121,8 +121,8 @@ Page { print("create user") Engine.jsonRpcClient.createUser(usernameTextField.text, passwordTextField.text); } else { - print("authenticate", usernameTextField.text, passwordTextField.text, "mea") - Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "mea"); + print("authenticate", usernameTextField.text, passwordTextField.text, "nymea-app") + Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "nymea-app"); } } } diff --git a/mea/ui/MagicPage.qml b/nymea-app/ui/MagicPage.qml similarity index 99% rename from mea/ui/MagicPage.qml rename to nymea-app/ui/MagicPage.qml index 0993d06f..93530d41 100644 --- a/mea/ui/MagicPage.qml +++ b/nymea-app/ui/MagicPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/MainPage.qml b/nymea-app/ui/MainPage.qml similarity index 98% rename from mea/ui/MainPage.qml rename to nymea-app/ui/MainPage.qml index 557c064b..807c504c 100644 --- a/mea/ui/MainPage.qml +++ b/nymea-app/ui/MainPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "components" import "delegates" @@ -144,7 +144,7 @@ Page { horizontalAlignment: Text.AlignHCenter } Image { - source: "../guh-logo.svg" + source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) Layout.preferredWidth: app.iconSize * 5 Layout.preferredHeight: width Layout.alignment: Qt.AlignHCenter diff --git a/mea/ui/NewDeviceWizard.qml b/nymea-app/ui/NewDeviceWizard.qml similarity index 99% rename from mea/ui/NewDeviceWizard.qml rename to nymea-app/ui/NewDeviceWizard.qml index 86d483e2..31695ce9 100644 --- a/mea/ui/NewDeviceWizard.qml +++ b/nymea-app/ui/NewDeviceWizard.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "components" import "delegates" diff --git a/mea/ui/Mea.qml b/nymea-app/ui/Nymea.qml similarity index 99% rename from mea/ui/Mea.qml rename to nymea-app/ui/Nymea.qml index d7a7c25e..69d01f12 100644 --- a/mea/ui/Mea.qml +++ b/nymea-app/ui/Nymea.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 import Qt.labs.settings 1.0 -import Mea 1.0 +import Nymea 1.0 ApplicationWindow { id: app diff --git a/mea/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml similarity index 99% rename from mea/ui/PushButtonAuthPage.qml rename to nymea-app/ui/PushButtonAuthPage.qml index 6db9fa49..5fd673a1 100644 --- a/mea/ui/PushButtonAuthPage.qml +++ b/nymea-app/ui/PushButtonAuthPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml similarity index 99% rename from mea/ui/SettingsPage.qml rename to nymea-app/ui/SettingsPage.qml index 74462dac..13a29eef 100644 --- a/mea/ui/SettingsPage.qml +++ b/nymea-app/ui/SettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/WirelessControlerPage.qml b/nymea-app/ui/WirelessControlerPage.qml similarity index 99% rename from mea/ui/WirelessControlerPage.qml rename to nymea-app/ui/WirelessControlerPage.qml index 4d937e63..b2ad556d 100644 --- a/mea/ui/WirelessControlerPage.qml +++ b/nymea-app/ui/WirelessControlerPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "components" Page { diff --git a/mea/ui/components/ColorIcon.qml b/nymea-app/ui/components/ColorIcon.qml similarity index 100% rename from mea/ui/components/ColorIcon.qml rename to nymea-app/ui/components/ColorIcon.qml diff --git a/mea/ui/components/ColorPicker.qml b/nymea-app/ui/components/ColorPicker.qml similarity index 100% rename from mea/ui/components/ColorPicker.qml rename to nymea-app/ui/components/ColorPicker.qml diff --git a/mea/ui/components/ColorPickerCt.qml b/nymea-app/ui/components/ColorPickerCt.qml similarity index 100% rename from mea/ui/components/ColorPickerCt.qml rename to nymea-app/ui/components/ColorPickerCt.qml diff --git a/mea/ui/components/ErrorDialog.qml b/nymea-app/ui/components/ErrorDialog.qml similarity index 100% rename from mea/ui/components/ErrorDialog.qml rename to nymea-app/ui/components/ErrorDialog.qml diff --git a/mea/ui/components/Graph.qml b/nymea-app/ui/components/Graph.qml similarity index 99% rename from mea/ui/components/Graph.qml rename to nymea-app/ui/components/Graph.qml index ee04e630..974709c3 100644 --- a/mea/ui/components/Graph.qml +++ b/nymea-app/ui/components/Graph.qml @@ -1,6 +1,6 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import QtQuick.Controls.Material 2.2 Item { diff --git a/mea/ui/components/GuhHeader.qml b/nymea-app/ui/components/GuhHeader.qml similarity index 100% rename from mea/ui/components/GuhHeader.qml rename to nymea-app/ui/components/GuhHeader.qml diff --git a/mea/ui/components/HeaderButton.qml b/nymea-app/ui/components/HeaderButton.qml similarity index 100% rename from mea/ui/components/HeaderButton.qml rename to nymea-app/ui/components/HeaderButton.qml diff --git a/mea/ui/components/IconMenuItem.qml b/nymea-app/ui/components/IconMenuItem.qml similarity index 100% rename from mea/ui/components/IconMenuItem.qml rename to nymea-app/ui/components/IconMenuItem.qml diff --git a/mea/ui/components/InterfacesModels.qml b/nymea-app/ui/components/InterfacesModels.qml similarity index 100% rename from mea/ui/components/InterfacesModels.qml rename to nymea-app/ui/components/InterfacesModels.qml diff --git a/mea/ui/components/MeaDialog.qml b/nymea-app/ui/components/MeaDialog.qml similarity index 100% rename from mea/ui/components/MeaDialog.qml rename to nymea-app/ui/components/MeaDialog.qml diff --git a/mea/ui/components/MeaListItemDelegate.qml b/nymea-app/ui/components/MeaListItemDelegate.qml similarity index 100% rename from mea/ui/components/MeaListItemDelegate.qml rename to nymea-app/ui/components/MeaListItemDelegate.qml diff --git a/mea/ui/components/ShutterControls.qml b/nymea-app/ui/components/ShutterControls.qml similarity index 99% rename from mea/ui/components/ShutterControls.qml rename to nymea-app/ui/components/ShutterControls.qml index e818f4a2..3751a058 100644 --- a/mea/ui/components/ShutterControls.qml +++ b/nymea-app/ui/components/ShutterControls.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 RowLayout { id: root diff --git a/mea/ui/components/ThinDivider.qml b/nymea-app/ui/components/ThinDivider.qml similarity index 100% rename from mea/ui/components/ThinDivider.qml rename to nymea-app/ui/components/ThinDivider.qml diff --git a/mea/ui/components/ThrottledSlider.qml b/nymea-app/ui/components/ThrottledSlider.qml similarity index 100% rename from mea/ui/components/ThrottledSlider.qml rename to nymea-app/ui/components/ThrottledSlider.qml diff --git a/mea/ui/customviews/CustomViewBase.qml b/nymea-app/ui/customviews/CustomViewBase.qml similarity index 100% rename from mea/ui/customviews/CustomViewBase.qml rename to nymea-app/ui/customviews/CustomViewBase.qml diff --git a/mea/ui/customviews/ExtendedVolumeController.qml b/nymea-app/ui/customviews/ExtendedVolumeController.qml similarity index 99% rename from mea/ui/customviews/ExtendedVolumeController.qml rename to nymea-app/ui/customviews/ExtendedVolumeController.qml index 131cc605..671c4322 100644 --- a/mea/ui/customviews/ExtendedVolumeController.qml +++ b/nymea-app/ui/customviews/ExtendedVolumeController.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" CustomViewBase { diff --git a/mea/ui/customviews/GenericTypeLogView.qml b/nymea-app/ui/customviews/GenericTypeLogView.qml similarity index 99% rename from mea/ui/customviews/GenericTypeLogView.qml rename to nymea-app/ui/customviews/GenericTypeLogView.qml index 00d0e463..49ae9ebd 100644 --- a/mea/ui/customviews/GenericTypeLogView.qml +++ b/nymea-app/ui/customviews/GenericTypeLogView.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Item { diff --git a/mea/ui/customviews/MediaControllerView.qml b/nymea-app/ui/customviews/MediaControllerView.qml similarity index 99% rename from mea/ui/customviews/MediaControllerView.qml rename to nymea-app/ui/customviews/MediaControllerView.qml index 1c47e5f3..c93a6309 100644 --- a/mea/ui/customviews/MediaControllerView.qml +++ b/nymea-app/ui/customviews/MediaControllerView.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" CustomViewBase { diff --git a/mea/ui/customviews/NotificationsView.qml b/nymea-app/ui/customviews/NotificationsView.qml similarity index 98% rename from mea/ui/customviews/NotificationsView.qml rename to nymea-app/ui/customviews/NotificationsView.qml index 9f3c75e5..9b420d68 100644 --- a/mea/ui/customviews/NotificationsView.qml +++ b/nymea-app/ui/customviews/NotificationsView.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 CustomViewBase { id: root diff --git a/mea/ui/customviews/SensorView.qml b/nymea-app/ui/customviews/SensorView.qml similarity index 99% rename from mea/ui/customviews/SensorView.qml rename to nymea-app/ui/customviews/SensorView.qml index 262fe56e..8e0f63fe 100644 --- a/mea/ui/customviews/SensorView.qml +++ b/nymea-app/ui/customviews/SensorView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 CustomViewBase { id: root diff --git a/mea/ui/customviews/WeatherView.qml b/nymea-app/ui/customviews/WeatherView.qml similarity index 100% rename from mea/ui/customviews/WeatherView.qml rename to nymea-app/ui/customviews/WeatherView.qml diff --git a/mea/ui/delegates/ActionDelegate.qml b/nymea-app/ui/delegates/ActionDelegate.qml similarity index 99% rename from mea/ui/delegates/ActionDelegate.qml rename to nymea-app/ui/delegates/ActionDelegate.qml index 6f585bc5..de099023 100644 --- a/mea/ui/delegates/ActionDelegate.qml +++ b/nymea-app/ui/delegates/ActionDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/delegates/ParamDelegate.qml b/nymea-app/ui/delegates/ParamDelegate.qml similarity index 99% rename from mea/ui/delegates/ParamDelegate.qml rename to nymea-app/ui/delegates/ParamDelegate.qml index 54116a44..fb06ee7b 100644 --- a/mea/ui/delegates/ParamDelegate.qml +++ b/nymea-app/ui/delegates/ParamDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/delegates/ParamDescriptorDelegate.qml b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml similarity index 99% rename from mea/ui/delegates/ParamDescriptorDelegate.qml rename to nymea-app/ui/delegates/ParamDescriptorDelegate.qml index b90d938d..68a1286e 100644 --- a/mea/ui/delegates/ParamDescriptorDelegate.qml +++ b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 ItemDelegate { id: root diff --git a/mea/ui/delegates/ThingDelegate.qml b/nymea-app/ui/delegates/ThingDelegate.qml similarity index 100% rename from mea/ui/delegates/ThingDelegate.qml rename to nymea-app/ui/delegates/ThingDelegate.qml diff --git a/mea/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml similarity index 99% rename from mea/ui/devicelistpages/GenericDeviceListPage.qml rename to nymea-app/ui/devicelistpages/GenericDeviceListPage.qml index eb87d2e8..d3c6c9f3 100644 --- a/mea/ui/devicelistpages/GenericDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../delegates" diff --git a/mea/ui/devicelistpages/LightsDeviceListPage.qml b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml similarity index 99% rename from mea/ui/devicelistpages/LightsDeviceListPage.qml rename to nymea-app/ui/devicelistpages/LightsDeviceListPage.qml index 604bf73d..df18da14 100644 --- a/mea/ui/devicelistpages/LightsDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/ButtonDevicePage.qml b/nymea-app/ui/devicepages/ButtonDevicePage.qml similarity index 99% rename from mea/ui/devicepages/ButtonDevicePage.qml rename to nymea-app/ui/devicepages/ButtonDevicePage.qml index 988769b2..43f89875 100644 --- a/mea/ui/devicepages/ButtonDevicePage.qml +++ b/nymea-app/ui/devicepages/ButtonDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/ColorLightDevicePage.qml b/nymea-app/ui/devicepages/ColorLightDevicePage.qml similarity index 99% rename from mea/ui/devicepages/ColorLightDevicePage.qml rename to nymea-app/ui/devicepages/ColorLightDevicePage.qml index edf11220..eccb95c0 100644 --- a/mea/ui/devicepages/ColorLightDevicePage.qml +++ b/nymea-app/ui/devicepages/ColorLightDevicePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" DevicePageBase { diff --git a/mea/ui/devicepages/ConfigureThingPage.qml b/nymea-app/ui/devicepages/ConfigureThingPage.qml similarity index 99% rename from mea/ui/devicepages/ConfigureThingPage.qml rename to nymea-app/ui/devicepages/ConfigureThingPage.qml index 7e981fda..57dacc6b 100644 --- a/mea/ui/devicepages/ConfigureThingPage.qml +++ b/nymea-app/ui/devicepages/ConfigureThingPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../delegates" diff --git a/mea/ui/devicepages/DevicePageBase.qml b/nymea-app/ui/devicepages/DevicePageBase.qml similarity index 99% rename from mea/ui/devicepages/DevicePageBase.qml rename to nymea-app/ui/devicepages/DevicePageBase.qml index d3f7cdba..612c22c5 100644 --- a/mea/ui/devicepages/DevicePageBase.qml +++ b/nymea-app/ui/devicepages/DevicePageBase.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/GarageGateDevicePage.qml b/nymea-app/ui/devicepages/GarageGateDevicePage.qml similarity index 99% rename from mea/ui/devicepages/GarageGateDevicePage.qml rename to nymea-app/ui/devicepages/GarageGateDevicePage.qml index 5b62bd3e..2ae01c55 100644 --- a/mea/ui/devicepages/GarageGateDevicePage.qml +++ b/nymea-app/ui/devicepages/GarageGateDevicePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/GenericDevicePage.qml b/nymea-app/ui/devicepages/GenericDevicePage.qml similarity index 99% rename from mea/ui/devicepages/GenericDevicePage.qml rename to nymea-app/ui/devicepages/GenericDevicePage.qml index 874b2454..b18de5f2 100644 --- a/mea/ui/devicepages/GenericDevicePage.qml +++ b/nymea-app/ui/devicepages/GenericDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" DevicePageBase { diff --git a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml similarity index 99% rename from mea/ui/devicepages/GenericDeviceStateDetailsPage.qml rename to nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml index 94bca07a..426bc9c2 100644 --- a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml +++ b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/devicepages/InputTriggerDevicePage.qml b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml similarity index 98% rename from mea/ui/devicepages/InputTriggerDevicePage.qml rename to nymea-app/ui/devicepages/InputTriggerDevicePage.qml index d6e5feb0..2cc98680 100644 --- a/mea/ui/devicepages/InputTriggerDevicePage.qml +++ b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/MediaDevicePage.qml b/nymea-app/ui/devicepages/MediaDevicePage.qml similarity index 98% rename from mea/ui/devicepages/MediaDevicePage.qml rename to nymea-app/ui/devicepages/MediaDevicePage.qml index 6d1ed49e..682222b4 100644 --- a/mea/ui/devicepages/MediaDevicePage.qml +++ b/nymea-app/ui/devicepages/MediaDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/SensorDevicePage.qml b/nymea-app/ui/devicepages/SensorDevicePage.qml similarity index 98% rename from mea/ui/devicepages/SensorDevicePage.qml rename to nymea-app/ui/devicepages/SensorDevicePage.qml index a36bcce1..a4951a42 100644 --- a/mea/ui/devicepages/SensorDevicePage.qml +++ b/nymea-app/ui/devicepages/SensorDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/ShutterDevicePage.qml b/nymea-app/ui/devicepages/ShutterDevicePage.qml similarity index 95% rename from mea/ui/devicepages/ShutterDevicePage.qml rename to nymea-app/ui/devicepages/ShutterDevicePage.qml index 06a35201..e4bb5c7c 100644 --- a/mea/ui/devicepages/ShutterDevicePage.qml +++ b/nymea-app/ui/devicepages/ShutterDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml similarity index 99% rename from mea/ui/devicepages/StateLogPage.qml rename to nymea-app/ui/devicepages/StateLogPage.qml index a9251509..3ad421ea 100644 --- a/mea/ui/devicepages/StateLogPage.qml +++ b/nymea-app/ui/devicepages/StateLogPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/devicepages/WeatherDevicePage.qml b/nymea-app/ui/devicepages/WeatherDevicePage.qml similarity index 98% rename from mea/ui/devicepages/WeatherDevicePage.qml rename to nymea-app/ui/devicepages/WeatherDevicePage.qml index fd88c0a8..8354c579 100644 --- a/mea/ui/devicepages/WeatherDevicePage.qml +++ b/nymea-app/ui/devicepages/WeatherDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../customviews" diff --git a/mea/ui/fonts/Ubuntu-B.ttf b/nymea-app/ui/fonts/Ubuntu-B.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-B.ttf rename to nymea-app/ui/fonts/Ubuntu-B.ttf diff --git a/mea/ui/fonts/Ubuntu-BI.ttf b/nymea-app/ui/fonts/Ubuntu-BI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-BI.ttf rename to nymea-app/ui/fonts/Ubuntu-BI.ttf diff --git a/mea/ui/fonts/Ubuntu-C.ttf b/nymea-app/ui/fonts/Ubuntu-C.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-C.ttf rename to nymea-app/ui/fonts/Ubuntu-C.ttf diff --git a/mea/ui/fonts/Ubuntu-L.ttf b/nymea-app/ui/fonts/Ubuntu-L.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-L.ttf rename to nymea-app/ui/fonts/Ubuntu-L.ttf diff --git a/mea/ui/fonts/Ubuntu-LI.ttf b/nymea-app/ui/fonts/Ubuntu-LI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-LI.ttf rename to nymea-app/ui/fonts/Ubuntu-LI.ttf diff --git a/mea/ui/fonts/Ubuntu-M.ttf b/nymea-app/ui/fonts/Ubuntu-M.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-M.ttf rename to nymea-app/ui/fonts/Ubuntu-M.ttf diff --git a/mea/ui/fonts/Ubuntu-MI.ttf b/nymea-app/ui/fonts/Ubuntu-MI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-MI.ttf rename to nymea-app/ui/fonts/Ubuntu-MI.ttf diff --git a/mea/ui/fonts/Ubuntu-R.ttf b/nymea-app/ui/fonts/Ubuntu-R.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-R.ttf rename to nymea-app/ui/fonts/Ubuntu-R.ttf diff --git a/mea/ui/fonts/Ubuntu-RI.ttf b/nymea-app/ui/fonts/Ubuntu-RI.ttf similarity index 100% rename from mea/ui/fonts/Ubuntu-RI.ttf rename to nymea-app/ui/fonts/Ubuntu-RI.ttf diff --git a/mea/ui/images/Built_with_Qt_RGB_logo.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo.svg similarity index 100% rename from mea/ui/images/Built_with_Qt_RGB_logo.svg rename to nymea-app/ui/images/Built_with_Qt_RGB_logo.svg diff --git a/mea/ui/images/Built_with_Qt_RGB_logo_vertical.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg similarity index 100% rename from mea/ui/images/Built_with_Qt_RGB_logo_vertical.svg rename to nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg diff --git a/mea/ui/images/action-interface.svg b/nymea-app/ui/images/action-interface.svg similarity index 100% rename from mea/ui/images/action-interface.svg rename to nymea-app/ui/images/action-interface.svg diff --git a/mea/ui/images/action.svg b/nymea-app/ui/images/action.svg similarity index 100% rename from mea/ui/images/action.svg rename to nymea-app/ui/images/action.svg diff --git a/mea/ui/images/add.svg b/nymea-app/ui/images/add.svg similarity index 100% rename from mea/ui/images/add.svg rename to nymea-app/ui/images/add.svg diff --git a/mea/ui/images/alarm-clock.svg b/nymea-app/ui/images/alarm-clock.svg similarity index 100% rename from mea/ui/images/alarm-clock.svg rename to nymea-app/ui/images/alarm-clock.svg diff --git a/mea/ui/images/audio-speakers-muted-symbolic.svg b/nymea-app/ui/images/audio-speakers-muted-symbolic.svg similarity index 100% rename from mea/ui/images/audio-speakers-muted-symbolic.svg rename to nymea-app/ui/images/audio-speakers-muted-symbolic.svg diff --git a/mea/ui/images/audio-speakers-symbolic.svg b/nymea-app/ui/images/audio-speakers-symbolic.svg similarity index 100% rename from mea/ui/images/audio-speakers-symbolic.svg rename to nymea-app/ui/images/audio-speakers-symbolic.svg diff --git a/mea/ui/images/back.svg b/nymea-app/ui/images/back.svg similarity index 100% rename from mea/ui/images/back.svg rename to nymea-app/ui/images/back.svg diff --git a/mea/ui/images/battery/battery-000.svg b/nymea-app/ui/images/battery/battery-000.svg similarity index 100% rename from mea/ui/images/battery/battery-000.svg rename to nymea-app/ui/images/battery/battery-000.svg diff --git a/mea/ui/images/battery/battery-010.svg b/nymea-app/ui/images/battery/battery-010.svg similarity index 100% rename from mea/ui/images/battery/battery-010.svg rename to nymea-app/ui/images/battery/battery-010.svg diff --git a/mea/ui/images/battery/battery-020.svg b/nymea-app/ui/images/battery/battery-020.svg similarity index 100% rename from mea/ui/images/battery/battery-020.svg rename to nymea-app/ui/images/battery/battery-020.svg diff --git a/mea/ui/images/battery/battery-030.svg b/nymea-app/ui/images/battery/battery-030.svg similarity index 100% rename from mea/ui/images/battery/battery-030.svg rename to nymea-app/ui/images/battery/battery-030.svg diff --git a/mea/ui/images/battery/battery-040.svg b/nymea-app/ui/images/battery/battery-040.svg similarity index 100% rename from mea/ui/images/battery/battery-040.svg rename to nymea-app/ui/images/battery/battery-040.svg diff --git a/mea/ui/images/battery/battery-050.svg b/nymea-app/ui/images/battery/battery-050.svg similarity index 100% rename from mea/ui/images/battery/battery-050.svg rename to nymea-app/ui/images/battery/battery-050.svg diff --git a/mea/ui/images/battery/battery-060.svg b/nymea-app/ui/images/battery/battery-060.svg similarity index 100% rename from mea/ui/images/battery/battery-060.svg rename to nymea-app/ui/images/battery/battery-060.svg diff --git a/mea/ui/images/battery/battery-070.svg b/nymea-app/ui/images/battery/battery-070.svg similarity index 100% rename from mea/ui/images/battery/battery-070.svg rename to nymea-app/ui/images/battery/battery-070.svg diff --git a/mea/ui/images/battery/battery-080.svg b/nymea-app/ui/images/battery/battery-080.svg similarity index 100% rename from mea/ui/images/battery/battery-080.svg rename to nymea-app/ui/images/battery/battery-080.svg diff --git a/mea/ui/images/battery/battery-090.svg b/nymea-app/ui/images/battery/battery-090.svg similarity index 100% rename from mea/ui/images/battery/battery-090.svg rename to nymea-app/ui/images/battery/battery-090.svg diff --git a/mea/ui/images/battery/battery-100.svg b/nymea-app/ui/images/battery/battery-100.svg similarity index 100% rename from mea/ui/images/battery/battery-100.svg rename to nymea-app/ui/images/battery/battery-100.svg diff --git a/mea/ui/images/bluetooth.svg b/nymea-app/ui/images/bluetooth.svg similarity index 100% rename from mea/ui/images/bluetooth.svg rename to nymea-app/ui/images/bluetooth.svg diff --git a/mea/ui/images/clock-app-symbolic.svg b/nymea-app/ui/images/clock-app-symbolic.svg similarity index 100% rename from mea/ui/images/clock-app-symbolic.svg rename to nymea-app/ui/images/clock-app-symbolic.svg diff --git a/mea/ui/images/close.svg b/nymea-app/ui/images/close.svg similarity index 100% rename from mea/ui/images/close.svg rename to nymea-app/ui/images/close.svg diff --git a/mea/ui/images/delete.svg b/nymea-app/ui/images/delete.svg similarity index 100% rename from mea/ui/images/delete.svg rename to nymea-app/ui/images/delete.svg diff --git a/mea/ui/images/dialog-error-symbolic.svg b/nymea-app/ui/images/dialog-error-symbolic.svg similarity index 100% rename from mea/ui/images/dialog-error-symbolic.svg rename to nymea-app/ui/images/dialog-error-symbolic.svg diff --git a/mea/ui/images/dialog-warning-symbolic.svg b/nymea-app/ui/images/dialog-warning-symbolic.svg similarity index 100% rename from mea/ui/images/dialog-warning-symbolic.svg rename to nymea-app/ui/images/dialog-warning-symbolic.svg diff --git a/mea/ui/images/down.svg b/nymea-app/ui/images/down.svg similarity index 100% rename from mea/ui/images/down.svg rename to nymea-app/ui/images/down.svg diff --git a/mea/ui/images/edit.svg b/nymea-app/ui/images/edit.svg similarity index 100% rename from mea/ui/images/edit.svg rename to nymea-app/ui/images/edit.svg diff --git a/mea/ui/images/event-interface.svg b/nymea-app/ui/images/event-interface.svg similarity index 100% rename from mea/ui/images/event-interface.svg rename to nymea-app/ui/images/event-interface.svg diff --git a/mea/ui/images/event.svg b/nymea-app/ui/images/event.svg similarity index 100% rename from mea/ui/images/event.svg rename to nymea-app/ui/images/event.svg diff --git a/mea/ui/images/eye.svg b/nymea-app/ui/images/eye.svg similarity index 100% rename from mea/ui/images/eye.svg rename to nymea-app/ui/images/eye.svg diff --git a/mea/ui/images/go-down.svg b/nymea-app/ui/images/go-down.svg similarity index 100% rename from mea/ui/images/go-down.svg rename to nymea-app/ui/images/go-down.svg diff --git a/mea/ui/images/guh-logo.svg b/nymea-app/ui/images/guh-logo.svg similarity index 100% rename from mea/ui/images/guh-logo.svg rename to nymea-app/ui/images/guh-logo.svg diff --git a/mea/ui/images/info.svg b/nymea-app/ui/images/info.svg similarity index 100% rename from mea/ui/images/info.svg rename to nymea-app/ui/images/info.svg diff --git a/mea/ui/images/lock-broken.svg b/nymea-app/ui/images/lock-broken.svg similarity index 100% rename from mea/ui/images/lock-broken.svg rename to nymea-app/ui/images/lock-broken.svg diff --git a/mea/ui/images/logs.svg b/nymea-app/ui/images/logs.svg similarity index 100% rename from mea/ui/images/logs.svg rename to nymea-app/ui/images/logs.svg diff --git a/mea/ui/images/magic.svg b/nymea-app/ui/images/magic.svg similarity index 100% rename from mea/ui/images/magic.svg rename to nymea-app/ui/images/magic.svg diff --git a/mea/ui/images/magic.svg.2018_05_29_14_21_27.0.svg b/nymea-app/ui/images/magic.svg.2018_05_29_14_21_27.0.svg similarity index 100% rename from mea/ui/images/magic.svg.2018_05_29_14_21_27.0.svg rename to nymea-app/ui/images/magic.svg.2018_05_29_14_21_27.0.svg diff --git a/mea/ui/images/mail-mark-important.svg b/nymea-app/ui/images/mail-mark-important.svg similarity index 100% rename from mea/ui/images/mail-mark-important.svg rename to nymea-app/ui/images/mail-mark-important.svg diff --git a/mea/ui/images/media-playback-pause.svg b/nymea-app/ui/images/media-playback-pause.svg similarity index 100% rename from mea/ui/images/media-playback-pause.svg rename to nymea-app/ui/images/media-playback-pause.svg diff --git a/mea/ui/images/media-playback-start.svg b/nymea-app/ui/images/media-playback-start.svg similarity index 100% rename from mea/ui/images/media-playback-start.svg rename to nymea-app/ui/images/media-playback-start.svg diff --git a/mea/ui/images/media-playback-stop.svg b/nymea-app/ui/images/media-playback-stop.svg similarity index 100% rename from mea/ui/images/media-playback-stop.svg rename to nymea-app/ui/images/media-playback-stop.svg diff --git a/mea/ui/images/media-preview-start.svg b/nymea-app/ui/images/media-preview-start.svg similarity index 100% rename from mea/ui/images/media-preview-start.svg rename to nymea-app/ui/images/media-preview-start.svg diff --git a/mea/ui/images/media-seek-backward.svg b/nymea-app/ui/images/media-seek-backward.svg similarity index 100% rename from mea/ui/images/media-seek-backward.svg rename to nymea-app/ui/images/media-seek-backward.svg diff --git a/mea/ui/images/media-seek-forward.svg b/nymea-app/ui/images/media-seek-forward.svg similarity index 100% rename from mea/ui/images/media-seek-forward.svg rename to nymea-app/ui/images/media-seek-forward.svg diff --git a/mea/ui/images/media-skip-backward.svg b/nymea-app/ui/images/media-skip-backward.svg similarity index 100% rename from mea/ui/images/media-skip-backward.svg rename to nymea-app/ui/images/media-skip-backward.svg diff --git a/mea/ui/images/media-skip-forward.svg b/nymea-app/ui/images/media-skip-forward.svg similarity index 100% rename from mea/ui/images/media-skip-forward.svg rename to nymea-app/ui/images/media-skip-forward.svg diff --git a/mea/ui/images/mediaplayer-app-symbolic.svg b/nymea-app/ui/images/mediaplayer-app-symbolic.svg similarity index 100% rename from mea/ui/images/mediaplayer-app-symbolic.svg rename to nymea-app/ui/images/mediaplayer-app-symbolic.svg diff --git a/mea/ui/images/navigation-menu.svg b/nymea-app/ui/images/navigation-menu.svg similarity index 100% rename from mea/ui/images/navigation-menu.svg rename to nymea-app/ui/images/navigation-menu.svg diff --git a/mea/ui/images/network-secure.svg b/nymea-app/ui/images/network-secure.svg similarity index 100% rename from mea/ui/images/network-secure.svg rename to nymea-app/ui/images/network-secure.svg diff --git a/mea/ui/images/network-vpn.svg b/nymea-app/ui/images/network-vpn.svg similarity index 100% rename from mea/ui/images/network-vpn.svg rename to nymea-app/ui/images/network-vpn.svg diff --git a/mea/ui/images/network-wired-symbolic.svg b/nymea-app/ui/images/network-wired-symbolic.svg similarity index 100% rename from mea/ui/images/network-wired-symbolic.svg rename to nymea-app/ui/images/network-wired-symbolic.svg diff --git a/mea/ui/images/next.svg b/nymea-app/ui/images/next.svg similarity index 100% rename from mea/ui/images/next.svg rename to nymea-app/ui/images/next.svg diff --git a/mea/ui/images/nm-signal-00-secure.svg b/nymea-app/ui/images/nm-signal-00-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-00-secure.svg rename to nymea-app/ui/images/nm-signal-00-secure.svg diff --git a/mea/ui/images/nm-signal-00.svg b/nymea-app/ui/images/nm-signal-00.svg similarity index 100% rename from mea/ui/images/nm-signal-00.svg rename to nymea-app/ui/images/nm-signal-00.svg diff --git a/mea/ui/images/nm-signal-100-secure.svg b/nymea-app/ui/images/nm-signal-100-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-100-secure.svg rename to nymea-app/ui/images/nm-signal-100-secure.svg diff --git a/mea/ui/images/nm-signal-100.svg b/nymea-app/ui/images/nm-signal-100.svg similarity index 100% rename from mea/ui/images/nm-signal-100.svg rename to nymea-app/ui/images/nm-signal-100.svg diff --git a/mea/ui/images/nm-signal-25-secure.svg b/nymea-app/ui/images/nm-signal-25-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-25-secure.svg rename to nymea-app/ui/images/nm-signal-25-secure.svg diff --git a/mea/ui/images/nm-signal-25.svg b/nymea-app/ui/images/nm-signal-25.svg similarity index 100% rename from mea/ui/images/nm-signal-25.svg rename to nymea-app/ui/images/nm-signal-25.svg diff --git a/mea/ui/images/nm-signal-50-secure.svg b/nymea-app/ui/images/nm-signal-50-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-50-secure.svg rename to nymea-app/ui/images/nm-signal-50-secure.svg diff --git a/mea/ui/images/nm-signal-50.svg b/nymea-app/ui/images/nm-signal-50.svg similarity index 100% rename from mea/ui/images/nm-signal-50.svg rename to nymea-app/ui/images/nm-signal-50.svg diff --git a/mea/ui/images/nm-signal-75-secure.svg b/nymea-app/ui/images/nm-signal-75-secure.svg similarity index 100% rename from mea/ui/images/nm-signal-75-secure.svg rename to nymea-app/ui/images/nm-signal-75-secure.svg diff --git a/mea/ui/images/nm-signal-75.svg b/nymea-app/ui/images/nm-signal-75.svg similarity index 100% rename from mea/ui/images/nm-signal-75.svg rename to nymea-app/ui/images/nm-signal-75.svg diff --git a/mea/ui/images/notification.svg b/nymea-app/ui/images/notification.svg similarity index 100% rename from mea/ui/images/notification.svg rename to nymea-app/ui/images/notification.svg diff --git a/mea/ui/images/nymea-box-setup.svg b/nymea-app/ui/images/nymea-box-setup.svg similarity index 100% rename from mea/ui/images/nymea-box-setup.svg rename to nymea-app/ui/images/nymea-box-setup.svg diff --git a/mea/ui/images/plugin.svg b/nymea-app/ui/images/plugin.svg similarity index 100% rename from mea/ui/images/plugin.svg rename to nymea-app/ui/images/plugin.svg diff --git a/mea/ui/images/private-browsing.svg b/nymea-app/ui/images/private-browsing.svg similarity index 100% rename from mea/ui/images/private-browsing.svg rename to nymea-app/ui/images/private-browsing.svg diff --git a/mea/ui/images/refresh.svg b/nymea-app/ui/images/refresh.svg similarity index 100% rename from mea/ui/images/refresh.svg rename to nymea-app/ui/images/refresh.svg diff --git a/mea/ui/images/remove.svg b/nymea-app/ui/images/remove.svg similarity index 100% rename from mea/ui/images/remove.svg rename to nymea-app/ui/images/remove.svg diff --git a/mea/ui/images/rpi-setup.svg b/nymea-app/ui/images/rpi-setup.svg similarity index 100% rename from mea/ui/images/rpi-setup.svg rename to nymea-app/ui/images/rpi-setup.svg diff --git a/mea/ui/images/select-none.svg b/nymea-app/ui/images/select-none.svg similarity index 100% rename from mea/ui/images/select-none.svg rename to nymea-app/ui/images/select-none.svg diff --git a/mea/ui/images/send.svg b/nymea-app/ui/images/send.svg similarity index 100% rename from mea/ui/images/send.svg rename to nymea-app/ui/images/send.svg diff --git a/mea/ui/images/sensors.svg b/nymea-app/ui/images/sensors.svg similarity index 100% rename from mea/ui/images/sensors.svg rename to nymea-app/ui/images/sensors.svg diff --git a/mea/ui/images/settings.svg b/nymea-app/ui/images/settings.svg similarity index 100% rename from mea/ui/images/settings.svg rename to nymea-app/ui/images/settings.svg diff --git a/mea/ui/images/share.svg b/nymea-app/ui/images/share.svg similarity index 100% rename from mea/ui/images/share.svg rename to nymea-app/ui/images/share.svg diff --git a/mea/ui/images/shutter-0.svg b/nymea-app/ui/images/shutter-0.svg similarity index 100% rename from mea/ui/images/shutter-0.svg rename to nymea-app/ui/images/shutter-0.svg diff --git a/mea/ui/images/shutter-1.svg b/nymea-app/ui/images/shutter-1.svg similarity index 100% rename from mea/ui/images/shutter-1.svg rename to nymea-app/ui/images/shutter-1.svg diff --git a/mea/ui/images/shutter-10.svg b/nymea-app/ui/images/shutter-10.svg similarity index 100% rename from mea/ui/images/shutter-10.svg rename to nymea-app/ui/images/shutter-10.svg diff --git a/mea/ui/images/shutter-2.svg b/nymea-app/ui/images/shutter-2.svg similarity index 100% rename from mea/ui/images/shutter-2.svg rename to nymea-app/ui/images/shutter-2.svg diff --git a/mea/ui/images/shutter-3.svg b/nymea-app/ui/images/shutter-3.svg similarity index 100% rename from mea/ui/images/shutter-3.svg rename to nymea-app/ui/images/shutter-3.svg diff --git a/mea/ui/images/shutter-4.svg b/nymea-app/ui/images/shutter-4.svg similarity index 100% rename from mea/ui/images/shutter-4.svg rename to nymea-app/ui/images/shutter-4.svg diff --git a/mea/ui/images/shutter-5.svg b/nymea-app/ui/images/shutter-5.svg similarity index 100% rename from mea/ui/images/shutter-5.svg rename to nymea-app/ui/images/shutter-5.svg diff --git a/mea/ui/images/shutter-6.svg b/nymea-app/ui/images/shutter-6.svg similarity index 100% rename from mea/ui/images/shutter-6.svg rename to nymea-app/ui/images/shutter-6.svg diff --git a/mea/ui/images/shutter-7.svg b/nymea-app/ui/images/shutter-7.svg similarity index 100% rename from mea/ui/images/shutter-7.svg rename to nymea-app/ui/images/shutter-7.svg diff --git a/mea/ui/images/shutter-8.svg b/nymea-app/ui/images/shutter-8.svg similarity index 100% rename from mea/ui/images/shutter-8.svg rename to nymea-app/ui/images/shutter-8.svg diff --git a/mea/ui/images/shutter-9.svg b/nymea-app/ui/images/shutter-9.svg similarity index 100% rename from mea/ui/images/shutter-9.svg rename to nymea-app/ui/images/shutter-9.svg diff --git a/mea/ui/images/sort-listitem.svg b/nymea-app/ui/images/sort-listitem.svg similarity index 100% rename from mea/ui/images/sort-listitem.svg rename to nymea-app/ui/images/sort-listitem.svg diff --git a/mea/ui/images/state-interface.svg b/nymea-app/ui/images/state-interface.svg similarity index 100% rename from mea/ui/images/state-interface.svg rename to nymea-app/ui/images/state-interface.svg diff --git a/mea/ui/images/state.svg b/nymea-app/ui/images/state.svg similarity index 100% rename from mea/ui/images/state.svg rename to nymea-app/ui/images/state.svg diff --git a/mea/ui/images/stock_application.svg b/nymea-app/ui/images/stock_application.svg similarity index 100% rename from mea/ui/images/stock_application.svg rename to nymea-app/ui/images/stock_application.svg diff --git a/mea/ui/images/stock_link.svg b/nymea-app/ui/images/stock_link.svg similarity index 100% rename from mea/ui/images/stock_link.svg rename to nymea-app/ui/images/stock_link.svg diff --git a/mea/ui/images/system-shutdown.svg b/nymea-app/ui/images/system-shutdown.svg similarity index 100% rename from mea/ui/images/system-shutdown.svg rename to nymea-app/ui/images/system-shutdown.svg diff --git a/mea/ui/images/temperature.svg b/nymea-app/ui/images/temperature.svg similarity index 100% rename from mea/ui/images/temperature.svg rename to nymea-app/ui/images/temperature.svg diff --git a/mea/ui/images/tick.svg b/nymea-app/ui/images/tick.svg similarity index 100% rename from mea/ui/images/tick.svg rename to nymea-app/ui/images/tick.svg diff --git a/mea/ui/images/torch-off.svg b/nymea-app/ui/images/torch-off.svg similarity index 100% rename from mea/ui/images/torch-off.svg rename to nymea-app/ui/images/torch-off.svg diff --git a/mea/ui/images/torch-on.svg b/nymea-app/ui/images/torch-on.svg similarity index 100% rename from mea/ui/images/torch-on.svg rename to nymea-app/ui/images/torch-on.svg diff --git a/mea/ui/images/up.svg b/nymea-app/ui/images/up.svg similarity index 100% rename from mea/ui/images/up.svg rename to nymea-app/ui/images/up.svg diff --git a/mea/ui/images/view-collapse.svg b/nymea-app/ui/images/view-collapse.svg similarity index 100% rename from mea/ui/images/view-collapse.svg rename to nymea-app/ui/images/view-collapse.svg diff --git a/mea/ui/images/view-expand.svg b/nymea-app/ui/images/view-expand.svg similarity index 100% rename from mea/ui/images/view-expand.svg rename to nymea-app/ui/images/view-expand.svg diff --git a/mea/ui/images/weather-app-symbolic.svg b/nymea-app/ui/images/weather-app-symbolic.svg similarity index 100% rename from mea/ui/images/weather-app-symbolic.svg rename to nymea-app/ui/images/weather-app-symbolic.svg diff --git a/mea/ui/images/weathericons/humidity.svg b/nymea-app/ui/images/weathericons/humidity.svg similarity index 100% rename from mea/ui/images/weathericons/humidity.svg rename to nymea-app/ui/images/weathericons/humidity.svg diff --git a/mea/ui/images/weathericons/weather-clear-day.svg b/nymea-app/ui/images/weathericons/weather-clear-day.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clear-day.svg rename to nymea-app/ui/images/weathericons/weather-clear-day.svg diff --git a/mea/ui/images/weathericons/weather-clear-night.svg b/nymea-app/ui/images/weathericons/weather-clear-night.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clear-night.svg rename to nymea-app/ui/images/weathericons/weather-clear-night.svg diff --git a/mea/ui/images/weathericons/weather-clouds.svg b/nymea-app/ui/images/weathericons/weather-clouds.svg similarity index 100% rename from mea/ui/images/weathericons/weather-clouds.svg rename to nymea-app/ui/images/weathericons/weather-clouds.svg diff --git a/mea/ui/images/weathericons/weather-few-clouds-day.svg b/nymea-app/ui/images/weathericons/weather-few-clouds-day.svg similarity index 100% rename from mea/ui/images/weathericons/weather-few-clouds-day.svg rename to nymea-app/ui/images/weathericons/weather-few-clouds-day.svg diff --git a/mea/ui/images/weathericons/weather-few-clouds-night.svg b/nymea-app/ui/images/weathericons/weather-few-clouds-night.svg similarity index 100% rename from mea/ui/images/weathericons/weather-few-clouds-night.svg rename to nymea-app/ui/images/weathericons/weather-few-clouds-night.svg diff --git a/mea/ui/images/weathericons/weather-fog.svg b/nymea-app/ui/images/weathericons/weather-fog.svg similarity index 100% rename from mea/ui/images/weathericons/weather-fog.svg rename to nymea-app/ui/images/weathericons/weather-fog.svg diff --git a/mea/ui/images/weathericons/weather-light-rain.svg b/nymea-app/ui/images/weathericons/weather-light-rain.svg similarity index 100% rename from mea/ui/images/weathericons/weather-light-rain.svg rename to nymea-app/ui/images/weathericons/weather-light-rain.svg diff --git a/mea/ui/images/weathericons/weather-overcast.svg b/nymea-app/ui/images/weathericons/weather-overcast.svg similarity index 100% rename from mea/ui/images/weathericons/weather-overcast.svg rename to nymea-app/ui/images/weathericons/weather-overcast.svg diff --git a/mea/ui/images/weathericons/weather-shower-rain.svg b/nymea-app/ui/images/weathericons/weather-shower-rain.svg similarity index 100% rename from mea/ui/images/weathericons/weather-shower-rain.svg rename to nymea-app/ui/images/weathericons/weather-shower-rain.svg diff --git a/mea/ui/images/weathericons/weather-snow.svg b/nymea-app/ui/images/weathericons/weather-snow.svg similarity index 100% rename from mea/ui/images/weathericons/weather-snow.svg rename to nymea-app/ui/images/weathericons/weather-snow.svg diff --git a/mea/ui/images/weathericons/weather-thunderstorm.svg b/nymea-app/ui/images/weathericons/weather-thunderstorm.svg similarity index 100% rename from mea/ui/images/weathericons/weather-thunderstorm.svg rename to nymea-app/ui/images/weathericons/weather-thunderstorm.svg diff --git a/mea/ui/images/weathericons/wind.svg b/nymea-app/ui/images/weathericons/wind.svg similarity index 100% rename from mea/ui/images/weathericons/wind.svg rename to nymea-app/ui/images/weathericons/wind.svg diff --git a/mea/ui/magic/CalendarItemDelegate.qml b/nymea-app/ui/magic/CalendarItemDelegate.qml similarity index 99% rename from mea/ui/magic/CalendarItemDelegate.qml rename to nymea-app/ui/magic/CalendarItemDelegate.qml index 6de94570..079e0974 100644 --- a/mea/ui/magic/CalendarItemDelegate.qml +++ b/nymea-app/ui/magic/CalendarItemDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/ComposeEventDescriptorPage.qml b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml similarity index 97% rename from mea/ui/magic/ComposeEventDescriptorPage.qml rename to nymea-app/ui/magic/ComposeEventDescriptorPage.qml index 35baceea..866f46d2 100644 --- a/mea/ui/magic/ComposeEventDescriptorPage.qml +++ b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/DeviceRulesPage.qml b/nymea-app/ui/magic/DeviceRulesPage.qml similarity index 99% rename from mea/ui/magic/DeviceRulesPage.qml rename to nymea-app/ui/magic/DeviceRulesPage.qml index fb691334..6f80a65c 100644 --- a/mea/ui/magic/DeviceRulesPage.qml +++ b/nymea-app/ui/magic/DeviceRulesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditCalendarItemPage.qml b/nymea-app/ui/magic/EditCalendarItemPage.qml similarity index 99% rename from mea/ui/magic/EditCalendarItemPage.qml rename to nymea-app/ui/magic/EditCalendarItemPage.qml index 0e4ea449..f93a0021 100644 --- a/mea/ui/magic/EditCalendarItemPage.qml +++ b/nymea-app/ui/magic/EditCalendarItemPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import Qt.labs.calendar 1.0 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml similarity index 99% rename from mea/ui/magic/EditRulePage.qml rename to nymea-app/ui/magic/EditRulePage.qml index e2083fa0..5c5e8981 100644 --- a/mea/ui/magic/EditRulePage.qml +++ b/nymea-app/ui/magic/EditRulePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EditStateEvaluatorPage.qml b/nymea-app/ui/magic/EditStateEvaluatorPage.qml similarity index 95% rename from mea/ui/magic/EditStateEvaluatorPage.qml rename to nymea-app/ui/magic/EditStateEvaluatorPage.qml index e746e216..84b00059 100644 --- a/mea/ui/magic/EditStateEvaluatorPage.qml +++ b/nymea-app/ui/magic/EditStateEvaluatorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/magic/EditTimeEventItemPage.qml b/nymea-app/ui/magic/EditTimeEventItemPage.qml similarity index 99% rename from mea/ui/magic/EditTimeEventItemPage.qml rename to nymea-app/ui/magic/EditTimeEventItemPage.qml index 6f305546..93c1a77b 100644 --- a/mea/ui/magic/EditTimeEventItemPage.qml +++ b/nymea-app/ui/magic/EditTimeEventItemPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import Qt.labs.calendar 1.0 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/EventDescriptorDelegate.qml b/nymea-app/ui/magic/EventDescriptorDelegate.qml similarity index 99% rename from mea/ui/magic/EventDescriptorDelegate.qml rename to nymea-app/ui/magic/EventDescriptorDelegate.qml index ece75a97..140eae97 100644 --- a/mea/ui/magic/EventDescriptorDelegate.qml +++ b/nymea-app/ui/magic/EventDescriptorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/RuleActionDelegate.qml b/nymea-app/ui/magic/RuleActionDelegate.qml similarity index 98% rename from mea/ui/magic/RuleActionDelegate.qml rename to nymea-app/ui/magic/RuleActionDelegate.qml index 6e21c2c9..5658db80 100644 --- a/mea/ui/magic/RuleActionDelegate.qml +++ b/nymea-app/ui/magic/RuleActionDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate { diff --git a/mea/ui/magic/SelectActionPage.qml b/nymea-app/ui/magic/SelectActionPage.qml similarity index 99% rename from mea/ui/magic/SelectActionPage.qml rename to nymea-app/ui/magic/SelectActionPage.qml index 8a082028..6475218d 100644 --- a/mea/ui/magic/SelectActionPage.qml +++ b/nymea-app/ui/magic/SelectActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Mea 1.0 +import Nymea 1.0 import "../components" import "../paramdelegates" diff --git a/mea/ui/magic/SelectEventDescriptorPage.qml b/nymea-app/ui/magic/SelectEventDescriptorPage.qml similarity index 99% rename from mea/ui/magic/SelectEventDescriptorPage.qml rename to nymea-app/ui/magic/SelectEventDescriptorPage.qml index 34cfaf0f..583b8915 100644 --- a/mea/ui/magic/SelectEventDescriptorPage.qml +++ b/nymea-app/ui/magic/SelectEventDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectEventDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml similarity index 99% rename from mea/ui/magic/SelectEventDescriptorParamsPage.qml rename to nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml index 271000e4..d33fbd81 100644 --- a/mea/ui/magic/SelectEventDescriptorParamsPage.qml +++ b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectRuleActionPage.qml b/nymea-app/ui/magic/SelectRuleActionPage.qml similarity index 99% rename from mea/ui/magic/SelectRuleActionPage.qml rename to nymea-app/ui/magic/SelectRuleActionPage.qml index 54009821..bc499c78 100644 --- a/mea/ui/magic/SelectRuleActionPage.qml +++ b/nymea-app/ui/magic/SelectRuleActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectRuleActionParamsPage.qml b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml similarity index 99% rename from mea/ui/magic/SelectRuleActionParamsPage.qml rename to nymea-app/ui/magic/SelectRuleActionParamsPage.qml index b41b0844..e5556a47 100644 --- a/mea/ui/magic/SelectRuleActionParamsPage.qml +++ b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectStateDescriptorPage.qml b/nymea-app/ui/magic/SelectStateDescriptorPage.qml similarity index 99% rename from mea/ui/magic/SelectStateDescriptorPage.qml rename to nymea-app/ui/magic/SelectStateDescriptorPage.qml index 8a89c8b1..530db46b 100644 --- a/mea/ui/magic/SelectStateDescriptorPage.qml +++ b/nymea-app/ui/magic/SelectStateDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectStateDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml similarity index 98% rename from mea/ui/magic/SelectStateDescriptorParamsPage.qml rename to nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml index aef46289..fa2786dd 100644 --- a/mea/ui/magic/SelectStateDescriptorParamsPage.qml +++ b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SelectThingPage.qml b/nymea-app/ui/magic/SelectThingPage.qml similarity index 98% rename from mea/ui/magic/SelectThingPage.qml rename to nymea-app/ui/magic/SelectThingPage.qml index 5fd7ef48..29ead27b 100644 --- a/mea/ui/magic/SelectThingPage.qml +++ b/nymea-app/ui/magic/SelectThingPage.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/magic/SimpleStateEvaluatorDelegate.qml b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml similarity index 99% rename from mea/ui/magic/SimpleStateEvaluatorDelegate.qml rename to nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml index 6c641f20..d06d6c55 100644 --- a/mea/ui/magic/SimpleStateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" SwipeDelegate { diff --git a/mea/ui/magic/StateEvaluatorDelegate.qml b/nymea-app/ui/magic/StateEvaluatorDelegate.qml similarity index 99% rename from mea/ui/magic/StateEvaluatorDelegate.qml rename to nymea-app/ui/magic/StateEvaluatorDelegate.qml index 08cca33d..1264bfd2 100644 --- a/mea/ui/magic/StateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/StateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Mea 1.0 +import Nymea 1.0 import "../components" ItemDelegate { diff --git a/mea/ui/magic/TimeEventDelegate.qml b/nymea-app/ui/magic/TimeEventDelegate.qml similarity index 99% rename from mea/ui/magic/TimeEventDelegate.qml rename to nymea-app/ui/magic/TimeEventDelegate.qml index b7240c00..ea47bef8 100644 --- a/mea/ui/magic/TimeEventDelegate.qml +++ b/nymea-app/ui/magic/TimeEventDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" MeaListItemDelegate{ diff --git a/mea/ui/system/AboutNymeaPage.qml b/nymea-app/ui/system/AboutNymeaPage.qml similarity index 98% rename from mea/ui/system/AboutNymeaPage.qml rename to nymea-app/ui/system/AboutNymeaPage.qml index d819cf3e..90f7171a 100644 --- a/mea/ui/system/AboutNymeaPage.qml +++ b/nymea-app/ui/system/AboutNymeaPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/system/LogViewerPage.qml b/nymea-app/ui/system/LogViewerPage.qml similarity index 99% rename from mea/ui/system/LogViewerPage.qml rename to nymea-app/ui/system/LogViewerPage.qml index 15858f71..b0d577fb 100644 --- a/mea/ui/system/LogViewerPage.qml +++ b/nymea-app/ui/system/LogViewerPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Mea 1.0 +import Nymea 1.0 import "../components" Page { diff --git a/mea/ui/system/PluginParamsPage.qml b/nymea-app/ui/system/PluginParamsPage.qml similarity index 98% rename from mea/ui/system/PluginParamsPage.qml rename to nymea-app/ui/system/PluginParamsPage.qml index 970f256c..b50a1f57 100644 --- a/mea/ui/system/PluginParamsPage.qml +++ b/nymea-app/ui/system/PluginParamsPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" import "../delegates" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/mea/ui/system/PluginsPage.qml b/nymea-app/ui/system/PluginsPage.qml similarity index 97% rename from mea/ui/system/PluginsPage.qml rename to nymea-app/ui/system/PluginsPage.qml index 3dcaf7e4..ffd73ada 100644 --- a/mea/ui/system/PluginsPage.qml +++ b/nymea-app/ui/system/PluginsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Mea 1.0 +import Nymea 1.0 Page { id: root diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index 169e4f32..d72575a6 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/packaging/ios/AppIcon.svg b/packaging/ios/AppIcon.svg index c4cbfba6..ede49d69 100644 --- a/packaging/ios/AppIcon.svg +++ b/packaging/ios/AppIcon.svg @@ -249,10 +249,10 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="83.152338" + inkscape:cx="14.967042" inkscape:cy="132.37098" inkscape:document-units="px" inkscape:current-layer="layer1" diff --git a/packaging/ios/AppIcon1024x1024.png b/packaging/ios/AppIcon1024x1024.png new file mode 100644 index 00000000..62973d44 Binary files /dev/null and b/packaging/ios/AppIcon1024x1024.png differ diff --git a/packaging/ios/AppIcon20x20.png b/packaging/ios/AppIcon20x20.png index 69bab7fe..5ae237c6 100644 Binary files a/packaging/ios/AppIcon20x20.png and b/packaging/ios/AppIcon20x20.png differ diff --git a/packaging/ios/AppIcon20x20@2x.png b/packaging/ios/AppIcon20x20@2x.png index fba9593c..fce7979b 100644 Binary files a/packaging/ios/AppIcon20x20@2x.png and b/packaging/ios/AppIcon20x20@2x.png differ diff --git a/packaging/ios/AppIcon20x20@3x.png b/packaging/ios/AppIcon20x20@3x.png index 7825ce07..22c0bdae 100644 Binary files a/packaging/ios/AppIcon20x20@3x.png and b/packaging/ios/AppIcon20x20@3x.png differ diff --git a/packaging/ios/AppIcon29x29.png b/packaging/ios/AppIcon29x29.png index b4475cba..eefd2276 100644 Binary files a/packaging/ios/AppIcon29x29.png and b/packaging/ios/AppIcon29x29.png differ diff --git a/packaging/ios/AppIcon29x29@2x.png b/packaging/ios/AppIcon29x29@2x.png index 045c6f52..5b9bd73e 100644 Binary files a/packaging/ios/AppIcon29x29@2x.png and b/packaging/ios/AppIcon29x29@2x.png differ diff --git a/packaging/ios/AppIcon29x29@3x.png b/packaging/ios/AppIcon29x29@3x.png index 11517a61..0d9999c5 100644 Binary files a/packaging/ios/AppIcon29x29@3x.png and b/packaging/ios/AppIcon29x29@3x.png differ diff --git a/packaging/ios/AppIcon40x40.png b/packaging/ios/AppIcon40x40.png index fba9593c..fce7979b 100644 Binary files a/packaging/ios/AppIcon40x40.png and b/packaging/ios/AppIcon40x40.png differ diff --git a/packaging/ios/AppIcon40x40@2x.png b/packaging/ios/AppIcon40x40@2x.png index 2ee67a8e..230ad829 100644 Binary files a/packaging/ios/AppIcon40x40@2x.png and b/packaging/ios/AppIcon40x40@2x.png differ diff --git a/packaging/ios/AppIcon40x40@3x.png b/packaging/ios/AppIcon40x40@3x.png index 3ea46643..0502426a 100644 Binary files a/packaging/ios/AppIcon40x40@3x.png and b/packaging/ios/AppIcon40x40@3x.png differ diff --git a/packaging/ios/AppIcon60x60@2x.png b/packaging/ios/AppIcon60x60@2x.png index 3ea46643..0502426a 100644 Binary files a/packaging/ios/AppIcon60x60@2x.png and b/packaging/ios/AppIcon60x60@2x.png differ diff --git a/packaging/ios/AppIcon60x60@3x.png b/packaging/ios/AppIcon60x60@3x.png index a9aa8076..bb35cb52 100644 Binary files a/packaging/ios/AppIcon60x60@3x.png and b/packaging/ios/AppIcon60x60@3x.png differ diff --git a/packaging/ios/AppIcon76x76.png b/packaging/ios/AppIcon76x76.png index 9d4afa17..998c8d15 100644 Binary files a/packaging/ios/AppIcon76x76.png and b/packaging/ios/AppIcon76x76.png differ diff --git a/packaging/ios/AppIcon76x76@2x.png b/packaging/ios/AppIcon76x76@2x.png index 8c5ef05d..88641cde 100644 Binary files a/packaging/ios/AppIcon76x76@2x.png and b/packaging/ios/AppIcon76x76@2x.png differ diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 5e3c40cb..f021cceb 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -3,9 +3,9 @@ CFBundleDisplayName - mea + nymea:app CFBundleExecutable - mea + nymea-app CFBundleGetInfoString Created by Qt/QMake CFBundleIcons @@ -32,13 +32,13 @@ CFBundleIdentifier - io.guh.mea + io.guh.nymeaapp CFBundleName - mea + nymea-app CFBundlePackageType APPL CFBundleShortVersionString - $$MEA_VERSION + $$APP_VERSION CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion diff --git a/packaging/ios/exportappicons.sh b/packaging/ios/exportappicons.sh index 72c64146..28849524 100755 --- a/packaging/ios/exportappicons.sh +++ b/packaging/ios/exportappicons.sh @@ -27,7 +27,6 @@ SIZES=( "60:3" "76:1" "76:2" - "83.5:2" "1024:1" ) diff --git a/packaging/osx/Info.plist.in b/packaging/osx/Info.plist.in index b3f2e52a..ea104fc5 100644 --- a/packaging/osx/Info.plist.in +++ b/packaging/osx/Info.plist.in @@ -2,14 +2,18 @@ + CFBundleName + nymea:app + CFBundleDisplayName + nymea:app CFBundleExecutable - mea + nymea-app CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile icon.icns CFBundleIdentifier - io.guh.mea + io.guh.nymea-app CFBundlePackageType APPL CFBundleSignature diff --git a/packaging/osx/patchinstaller.sctp b/packaging/osx/patchinstaller.sctp index 4e85d1ec..ba4f6a66 100644 --- a/packaging/osx/patchinstaller.sctp +++ b/packaging/osx/patchinstaller.sctp @@ -1,5 +1,5 @@ tell app "Finder" - tell disk "mea" + tell disk "nymea-app" open set current view of container window to icon view set toolbar visible of container window to false @@ -9,7 +9,7 @@ tell app "Finder" set arrangement of viewOptions to not arranged set icon size of viewOptions to 128 set background picture of viewOptions to file ".background:installer.tiff" - set position of item "mea.app" of container window to {135, 224} + set position of every item of container window whose name ends with "app" to {135, 224} set position of item "Applications" of container window to {412, 224} close open diff --git a/packaging/windows/config/config.xml b/packaging/windows/config/config.xml index 73f3d0db..7f342879 100644 --- a/packaging/windows/config/config.xml +++ b/packaging/windows/config/config.xml @@ -1,9 +1,9 @@ - Mea + nymea:app 1.0.0 - Mea Windows Installer + nymea:app Windows Installer guh GmbH - Mea - @ApplicationsDir@/Mea + nymea + @ApplicationsDir@/nymea-app diff --git a/packaging/windows/packages/io.guh.mea/meta/installscript.qs b/packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs similarity index 76% rename from packaging/windows/packages/io.guh.mea/meta/installscript.qs rename to packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs index 1c31699d..cbbe14cd 100644 --- a/packaging/windows/packages/io.guh.mea/meta/installscript.qs +++ b/packaging/windows/packages/io.guh.nymeaapp/meta/installscript.qs @@ -15,8 +15,8 @@ Component.prototype.createOperations = function() component.createOperations(); if (systemInfo.productType === "windows") { - component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk", + component.addOperation("CreateShortcut", "@TargetDir@/nymea-app.exe", "@StartMenuDir@/nymea app.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico", - "description=mea - The nymea frontend"); + "description=nymea:app - The nymea frontend"); } } diff --git a/packaging/windows/packages/io.guh.mea/meta/license-gpl.txt b/packaging/windows/packages/io.guh.nymeaapp/meta/license-gpl.txt similarity index 100% rename from packaging/windows/packages/io.guh.mea/meta/license-gpl.txt rename to packaging/windows/packages/io.guh.nymeaapp/meta/license-gpl.txt diff --git a/packaging/windows/packages/io.guh.mea/meta/logo.ico b/packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico similarity index 100% rename from packaging/windows/packages/io.guh.mea/meta/logo.ico rename to packaging/windows/packages/io.guh.nymeaapp/meta/logo.ico diff --git a/packaging/windows/packages/io.guh.mea/meta/package.xml b/packaging/windows/packages/io.guh.nymeaapp/meta/package.xml similarity index 74% rename from packaging/windows/packages/io.guh.mea/meta/package.xml rename to packaging/windows/packages/io.guh.nymeaapp/meta/package.xml index 0599e920..a24d9d8d 100644 --- a/packaging/windows/packages/io.guh.mea/meta/package.xml +++ b/packaging/windows/packages/io.guh.nymeaapp/meta/package.xml @@ -1,7 +1,7 @@ - Mea application - Install the mea application. + nymea:app + Install the nymea:app. 0.1.0-1 2018-05-16 diff --git a/tests/testrunner/testrunner.pro b/tests/testrunner/testrunner.pro index 0d07b927..0a1fbf28 100644 --- a/tests/testrunner/testrunner.pro +++ b/tests/testrunner/testrunner.pro @@ -1,14 +1,14 @@ TEMPLATE = app TARGET = meatestrunner -include(../../mea.pri) +include(../../nymea-app.pri) QT += core gui testlib bluetooth websockets CONFIG += qmltestcase -INCLUDEPATH += ../../mea/ \ +INCLUDEPATH += ../../nymea-app/ \ ../../libnymea-common/ \ - ../../libmea-core/ + ../../libnymea-app-core/ LIBS += -L$$top_builddir/libmea-core/ -lmea-core \ -L$$top_builddir/libnymea-common/ -lnymea-common @@ -20,4 +20,4 @@ win32:Release:LIBS += -L$$top_builddir/libmea-core/release \ SOURCES += testrunner.cpp RESOURCES += \ - $$top_srcdir/mea/resources.qrc + $$top_srcdir/nymea-app/resources.qrc