diff --git a/README.md b/README.md index f0223e2f..78c1b323 100644 --- a/README.md +++ b/README.md @@ -20,15 +20,8 @@ Check the user manual [here](./docs/user-manual/userManual.md) In order to launch a new capture you need to execute `flameshot-cli`, the sources of the cli tool are in `./tools/flameshot-cli` (the tool is compiled independently). - Check the ./docs folder for more information. +Check the ./docs folder for more information. -## Dependencies -- QT (tested with QT5.8) -- QT X11 extras -- X11 devel (with xcb) - -## Compilation -Just download QT Creator and the dependencies (see the previous section) and import the project selecting the `flameshot.pro` file. Hit the "Build" button. ## Screenshots Dynamic button position based on your selection! @@ -42,12 +35,12 @@ Choose your buttons and edit your screenshots! - The main code is licensed under GPLv3 - The logo of Flameshot is licensed under Free Art License v1.3 - The button icons are licensed under Apache License 2.0. See: https://github.com/google/material-design-icons -- The code at capture/capturewidget.cpp is based on https://github.com/ckaiser/Lightscreen/blob/master/dialogs/areadialog.cpp -- The code at capture/capturewidget.h is based on https://github.com/ckaiser/Lightscreen/blob/master/dialogs/areadialog.h -- Qt-Color-Widgets taken and modified from https://github.com/mbasaglia/Qt-Color-Widgets (see their license and exceptions in the project) +- The code at capture/capturewidget.cpp is based on https://github.com/ckaiser/Lightscreen/blob/master/dialogs/areadialog.cpp (LGPL/GPL) +- The code at capture/capturewidget.h is based on https://github.com/ckaiser/Lightscreen/blob/master/dialogs/areadialog.h (LGPL/GPL) +- Qt-Color-Widgets taken and modified from https://github.com/mbasaglia/Qt-Color-Widgets (see their license and exceptions in the project) (LGPL/GPL) ## Acknowledgment I really appreciate those who have shown interest in the develpment process: - Cosmo. - ismatori. -- The members of the Sugus association. +- The members of the Sugus GNU/Linux association. diff --git a/docs/dev/compilation.md b/docs/dev/compilation.md new file mode 100644 index 00000000..5ff6dcb1 --- /dev/null +++ b/docs/dev/compilation.md @@ -0,0 +1,31 @@ +## Compilation +### GUI +Just download QT Creator and QT5 and import the project selecting the `flameshot.pro` file. Hit the "Build" button. + +### Debian +Dependencies: +```` +apt install -y git g++ build-essential qt5-qmake qt5-default +```` + +Compilation: run `qmake && make` in the main directory and in `tools/flameshot-cli` + +### Fedora +Dependencies: +```` +dnf install -y qt5-devel gcc-c++ git qt5-qtbase-devel +```` + +Compilation: run `qmake-qt5 && make` in the main directory and in `tools/flameshot-cli` + + +## Install + +After the compilation you only have to add the DBus related files to its respective directories + +```` +cp dbus/org.dharkael.Flameshot.xml /usr/share/dbus-1/interfaces/ && \ +cp dbus/org.dharkael.Flameshot.service /usr/share/dbus-1/services/ && \ +```` + +FInally add the compilled binaries to /usr/bin diff --git a/src/main.cpp b/src/main.cpp index 2575a9ad..213e5e76 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) { QTranslator translator; translator.load(QLocale::system().language(), - "Internationalization", "_"); + "Internationalization", "_", "/usr/share/flameshot/translations/"); SingleApplication app(argc, argv); app.installTranslator(&translator);