diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rwxr-xr-x | data/usr/bin/lead | bin | 44840 -> 44936 bytes | |||
| -rw-r--r-- | makefile | 2 | ||||
| -rw-r--r-- | src/app.cpp (renamed from src/lead.cpp) | 42 | ||||
| -rw-r--r-- | src/app.h (renamed from src/lead.h) | 16 | ||||
| -rw-r--r-- | src/main.cpp | 8 | ||||
| -rw-r--r-- | src/sensor.cpp | 4 | ||||
| -rw-r--r-- | src/sensor.h | 4 |
8 files changed, 50 insertions, 27 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6138aa7..f31dfaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 01/26/2017 - removed prefix "mlde" from name to make the component independent from a project name. - default settings-path changed from `~/.config/mlde/lead.conf` to `~/.config/lead/lead.conf`. Please change your config-path. +- changed namespace from MLDE to Lead # 01/24/2017 - changed built-tool back to makefile diff --git a/data/usr/bin/lead b/data/usr/bin/lead Binary files differindex 2ae95ac..2fbb39f 100755 --- a/data/usr/bin/lead +++ b/data/usr/bin/lead @@ -12,7 +12,7 @@ MKDIR = mkdir -p $(dir $@) .SECONDARY: -data/usr/bin/lead: build/lead.o build/sensor.o build/main.o build/moc_lead.o build/moc_sensor.o +data/usr/bin/lead: build/main.o build/app.o build/sensor.o build/moc_app.o build/moc_sensor.o $(MKDIR) $(LINKER) diff --git a/src/lead.cpp b/src/app.cpp index fb6c3cb..1a34777 100644 --- a/src/lead.cpp +++ b/src/app.cpp @@ -1,4 +1,5 @@ /* + MIT License Copyright (c) 2017 Noah Andreas @@ -20,17 +21,21 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ -#include "lead.h" +#include "app.h" #include "sensor.h" #include <QDebug> #include <QScreen> #include <QFileSystemWatcher> -Lead::Lead(int &argc, char** argv) : +namespace Lead { + + +App::App(int &argc, char** argv) : QApplication(argc, argv), settings("lead", "lead"), watcher() @@ -40,14 +45,14 @@ Lead::Lead(int &argc, char** argv) : } -Lead::~Lead() +App::~App() { qDeleteAll(sensors); } void -Lead::watchSettings() +App::watchSettings() { watcher.addPath(settings.fileName()); @@ -56,9 +61,9 @@ Lead::watchSettings() void -Lead::fileChanged(QString fileName) +App::fileChanged(QString fileName) { - qDebug() << "Lead::fileChanged() fileName: " << fileName; + qDebug() << "App::fileChanged() fileName: " << fileName; // this reloads the settings from the file settings.sync(); @@ -73,14 +78,14 @@ Lead::fileChanged(QString fileName) void -Lead::screenAdded(QScreen* screen) +App::screenAdded(QScreen* screen) { loadScreen(screen); } void -Lead::screenRemoved(QScreen* screen) +App::screenRemoved(QScreen* screen) { // thats the easiest way reloadScreens(); @@ -88,7 +93,7 @@ Lead::screenRemoved(QScreen* screen) void -Lead::reloadScreens() +App::reloadScreens() { qDeleteAll(sensors); sensors.clear(); @@ -98,7 +103,7 @@ Lead::reloadScreens() void -Lead::loadScreens() +App::loadScreens() { foreach (QScreen* screen, screens()) { @@ -108,9 +113,9 @@ Lead::loadScreens() void -Lead::loadScreen(QScreen* screen) +App::loadScreen(QScreen* screen) { - qDebug() << "Lead::loadScreen() " << screen->name(); + qDebug() << "App::loadScreen() " << screen->name(); QRect rec = screen->geometry(); @@ -126,7 +131,7 @@ Lead::loadScreen(QScreen* screen) void -Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h) +App::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h) { QString key = screen->name() + "/" + name; @@ -134,7 +139,7 @@ Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h) if (!settings.contains(key) ) { - qDebug() << "Lead::loadSensor() key " << name << " not found"; + qDebug() << "App::loadSensor() key " << name << " not found"; // restore missing key settings.setValue(key, QString()); @@ -143,12 +148,15 @@ Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h) if (settings.value(key).toString().isEmpty()) { - qDebug() << "Lead::loadSensor() key " << name << " is empty"; + qDebug() << "App::loadSensor() key " << name << " is empty"; return; } // create sensor and save in list so we can delete all sensors on delete - sensors.append( new lead::Sensor(x, y, w, h, settings.value(key).toString()) ); -}
\ No newline at end of file + sensors.append( new Sensor(x, y, w, h, settings.value(key).toString()) ); +} + + +} // namespace
\ No newline at end of file @@ -1,4 +1,5 @@ /* + MIT License Copyright (c) 2017 Noah Andreas @@ -20,6 +21,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ @@ -34,18 +36,21 @@ SOFTWARE. #include <QFileSystemWatcher> -class Lead : public QApplication +namespace Lead { + + +class App : public QApplication { Q_OBJECT public: - explicit Lead(int &argc, char** argv); - ~Lead(); + explicit App(int &argc, char** argv); + ~App(); private: QSettings settings; QFileSystemWatcher watcher; - QList<lead::Sensor*> sensors; + QList<Sensor*> sensors; void screenAdded(QScreen* screen); void screenRemoved(QScreen* screen); @@ -59,3 +64,6 @@ public slots: void fileChanged(QString fileName); }; + + +} // namespace
\ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 96ee49e..324604e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ /* + MIT License Copyright (c) 2017 Noah Andreas @@ -20,17 +21,18 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ -#include "lead.h" +#include "app.h" int main(int argc, char *argv[]) { - Lead lead(argc, argv); + Lead::App app(argc, argv); - return lead.exec(); + return app.exec(); } diff --git a/src/sensor.cpp b/src/sensor.cpp index 841a4df..d84f0a2 100644 --- a/src/sensor.cpp +++ b/src/sensor.cpp @@ -1,4 +1,5 @@ /* + MIT License Copyright (c) 2017 Noah Andreas @@ -20,6 +21,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ @@ -29,7 +31,7 @@ SOFTWARE. #include <QProcess> -namespace lead { +namespace Lead { Sensor::Sensor(int x, int y, int w, int h, QString action): diff --git a/src/sensor.h b/src/sensor.h index 8efb7a3..0a400b6 100644 --- a/src/sensor.h +++ b/src/sensor.h @@ -1,4 +1,5 @@ /* + MIT License Copyright (c) 2017 Noah Andreas @@ -20,6 +21,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ @@ -30,7 +32,7 @@ SOFTWARE. #include <QScreen> -namespace lead { +namespace Lead { class Sensor : public QWidget |