From 4a7f24eedcc911d96f5969fa2fc90b7e53719c49 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Fri, 16 Jun 2017 11:44:41 +0200 Subject: [PATCH] add make install instructions --- README.md | 44 ++++++++++++++++++++++--- docs/dev/compilation.md | 38 --------------------- docs/futureFeatures.md | 2 -- flameshot.pro | 18 ++++++++-- translation/Internationalization_es.qm | Bin 0 -> 9155 bytes 5 files changed, 56 insertions(+), 46 deletions(-) delete mode 100644 docs/dev/compilation.md create mode 100644 translation/Internationalization_es.qm diff --git a/README.md b/README.md index 3efdedba..225057d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,18 @@ ![image](./img/flameshot.png) > Powerfull yet simple to use screenshot software. +## Index +- [Usage](#usage) +- [Considerations](#considerations) +- [Usage](#usage) +- [Compilation](#compilation) + - [Debian](#debian) + - [Fedora](#fedora) + - [Arch](#arch) + - [Instal](#install) +- [Screenshots](#screenshots) +- [License](#license) + ## Usage Example commands: - capture with GUI: @@ -27,7 +39,7 @@ Check out the information window to see all the available shortcuts in the graph ## Considerations -**Not working on Wayland** +- **Not working on Wayland** - If you are using Gnome you need to install the [TopIcons](https://extensions.gnome.org/extension/495/topicons/) extension in order to see the systemtray icon. @@ -35,11 +47,35 @@ Check out the information window to see all the available shortcuts in the graph - Press `Enter` or `Ctrl + C` when you are in a capture mode and you don't have an active selection and the whole desktop will be copied to your clipboard! -## Compilation and development +## Compilation +### Debian +Dependencies: +```` +apt install -y git g++ build-essential qt5-qmake qt5-default +```` -- Information about manual compilation can be found [here](./docs/dev/compilation.md) +Compilation: run `qmake && make` in the main directory. + +### Fedora +Dependencies: +```` +dnf install -y qt5-devel gcc-c++ git qt5-qtbase-devel +```` + +Compilation: run `qmake-qt5 && make` in the main directory. + +### Arch +Dependencies: +```` +pacman -S git qt5-base base-devel +```` + +Compilation: run `qmake && make` in the main directory. + +## Install + +Simply use `make install` with privileges. -- Check the [docs](./docs) folder for more information. ## Screenshots Dynamic button position based on your selection! diff --git a/docs/dev/compilation.md b/docs/dev/compilation.md deleted file mode 100644 index 98e157b9..00000000 --- a/docs/dev/compilation.md +++ /dev/null @@ -1,38 +0,0 @@ -## 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. - -### Fedora -Dependencies: -```` -dnf install -y qt5-devel gcc-c++ git qt5-qtbase-devel -```` - -Compilation: run `qmake-qt5 && make` in the main directory. - -### Arch -Dependencies: -```` -pacman -S git qt5-base base-devel -```` - -Compilation: run `qmake && make` in the main directory. - -## 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 binary to /usr/bin diff --git a/docs/futureFeatures.md b/docs/futureFeatures.md index 971e039c..3aad3ae4 100644 --- a/docs/futureFeatures.md +++ b/docs/futureFeatures.md @@ -6,6 +6,4 @@ These are just conceptual and they may not be implemented implemented in a short - Mouse Visibility Button: if you look at the source code you'll find a lot of references about this. In fact it is almost implemente but it is disabled because the most important part (the code that fetches the mouse icon) is plataform specific and it requieres some of my time to end the implementation. -- Video Recording Support: I don't know if this will happen but it could be interesting to have a unified tool and satisfy every need to capture your desktop. Requires a ton of investigation. - - Wayland support diff --git a/flameshot.pro b/flameshot.pro index df9b9b8c..386e7076 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -66,8 +66,22 @@ HEADERS += \ RESOURCES += \ graphics.qrc +# installs unix: { - qmfile.path = /usr/share/flameshot/translations + target.path = /usr/bin/ + + qmfile.path = /usr/share/flameshot/translations/ qmfile.files = translation/Internationalization_es.qm - INSTALLS += qmfile + + servicedbus.path = /usr/share/dbus-1/services/ + servicedbus.files = dbus/org.dharkael.Flameshot.service + + dbus.path = /usr/share/dbus-1/interfaces/ + dbus.files = dbus/org.dharkael.Flameshot.xml + + INSTALLS += target \ + qmfile \ + servicedbus \ + dbus } + diff --git a/translation/Internationalization_es.qm b/translation/Internationalization_es.qm new file mode 100644 index 0000000000000000000000000000000000000000..538269ada95bdb429069820d2484e8a1f10895db GIT binary patch literal 9155 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