diff --git a/CMakeLists.txt b/CMakeLists.txt index fe334666..129a52d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,8 +146,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_MACOSX_RPATH ON) configure_file("include/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Config.h") -# It is not trivial to make the resulting file executable :-( -# People will have to `bash runwrapper.sh ...` in the meantime. configure_file("runwrapper.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/runwrapper.sh") configure_file("scap-workbench-oscap.policy.in" "${CMAKE_CURRENT_BINARY_DIR}/scap-workbench-oscap.policy") if (WIN32) diff --git a/include/Config.h.in b/include/Config.h.in index a9bc718f..901b263a 100644 --- a/include/Config.h.in +++ b/include/Config.h.in @@ -27,7 +27,7 @@ #define SCAP_WORKBENCH_VERSION_PATCH @SCAP_WORKBENCH_VERSION_PATCH@ #define SCAP_WORKBENCH_VERSION "@SCAP_WORKBENCH_VERSION@" -#define SCAP_WORKBENCH_ICON "@CMAKE_INSTALL_FULL_DATADIR@/pixmaps/scap-workbench.png" +#define SCAP_WORKBENCH_ICON "@CMAKE_INSTALL_FULL_DATADIR@/pixmaps/scap-workbench.svg" #define SCAP_WORKBENCH_SHARE "@CMAKE_INSTALL_FULL_DATADIR@/scap-workbench" #define SCAP_WORKBENCH_DOC "@CMAKE_INSTALL_FULL_DOCDIR@" diff --git a/runwrapper.sh.in b/runwrapper.sh.in old mode 100644 new mode 100755 diff --git a/share/scap-workbench/benchmark.png b/share/scap-workbench/benchmark.png index f6a625ce..45318b62 100644 Binary files a/share/scap-workbench/benchmark.png and b/share/scap-workbench/benchmark.png differ diff --git a/share/scap-workbench/collapsed-arrow.png b/share/scap-workbench/collapsed-arrow.png index 9221923c..1957a6ab 100644 Binary files a/share/scap-workbench/collapsed-arrow.png and b/share/scap-workbench/collapsed-arrow.png differ diff --git a/share/scap-workbench/edit-redo.png b/share/scap-workbench/edit-redo.png index 3eb7b05c..c18c90a0 100644 Binary files a/share/scap-workbench/edit-redo.png and b/share/scap-workbench/edit-redo.png differ diff --git a/share/scap-workbench/edit-undo.png b/share/scap-workbench/edit-undo.png index 61b2ce9a..62a2ba38 100644 Binary files a/share/scap-workbench/edit-undo.png and b/share/scap-workbench/edit-undo.png differ diff --git a/share/scap-workbench/expanded-arrow.png b/share/scap-workbench/expanded-arrow.png index d6a841f0..d08ce42f 100644 Binary files a/share/scap-workbench/expanded-arrow.png and b/share/scap-workbench/expanded-arrow.png differ diff --git a/share/scap-workbench/group.png b/share/scap-workbench/group.png index 01f45b82..7fe76d66 100644 Binary files a/share/scap-workbench/group.png and b/share/scap-workbench/group.png differ diff --git a/share/scap-workbench/profile.png b/share/scap-workbench/profile.png index 35de95ff..c1e4990e 100644 Binary files a/share/scap-workbench/profile.png and b/share/scap-workbench/profile.png differ diff --git a/share/scap-workbench/rule.png b/share/scap-workbench/rule.png index d68a56c6..316b6fda 100644 Binary files a/share/scap-workbench/rule.png and b/share/scap-workbench/rule.png differ diff --git a/share/scap-workbench/value.png b/share/scap-workbench/value.png index cc91d659..6c59c70f 100644 Binary files a/share/scap-workbench/value.png and b/share/scap-workbench/value.png differ diff --git a/share/svg/benchmark.svg b/share/svg/benchmark.svg new file mode 100644 index 00000000..0f1b76e8 --- /dev/null +++ b/share/svg/benchmark.svg @@ -0,0 +1,471 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-10-10 + + + Andreas Nilsson + + + + + edit + paste + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/collapsed-arrow.svg b/share/svg/collapsed-arrow.svg new file mode 100644 index 00000000..72d1f415 --- /dev/null +++ b/share/svg/collapsed-arrow.svg @@ -0,0 +1,34 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/share/svg/edit-redo.svg b/share/svg/edit-redo.svg new file mode 100644 index 00000000..24fd06b1 --- /dev/null +++ b/share/svg/edit-redo.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + edit + redo + again + reapply + + + + + + + + + + + + + + + + + diff --git a/share/svg/edit-undo.svg b/share/svg/edit-undo.svg new file mode 100644 index 00000000..995a2c9a --- /dev/null +++ b/share/svg/edit-undo.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + edit + undo + revert + + + + + + + + + + + + + + + + + diff --git a/share/svg/expanded-arrow.svg b/share/svg/expanded-arrow.svg new file mode 100644 index 00000000..02b6aa0a --- /dev/null +++ b/share/svg/expanded-arrow.svg @@ -0,0 +1,34 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/share/svg/group.svg b/share/svg/group.svg new file mode 100644 index 00000000..bc860a22 --- /dev/null +++ b/share/svg/group.svg @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + folder + directory + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/profile.svg b/share/svg/profile.svg new file mode 100644 index 00000000..9aedf32f --- /dev/null +++ b/share/svg/profile.svg @@ -0,0 +1,503 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + spreadheet + document + office + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/rule.svg b/share/svg/rule.svg new file mode 100644 index 00000000..e55fda40 --- /dev/null +++ b/share/svg/rule.svg @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + preferences + settings + control panel + tweaks + system + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/value.svg b/share/svg/value.svg new file mode 100644 index 00000000..07f5b00c --- /dev/null +++ b/share/svg/value.svg @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + text + plaintext + regular + document + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Utils.cpp b/src/Utils.cpp index fbeb809c..64e3928c 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -62,7 +62,7 @@ inline QString _generateApplicationIconPath() dir.cd("Resources"); dir.cd("share"); dir.cd("pixmaps"); - return dir.absoluteFilePath("scap-workbench.png"); + return dir.absoluteFilePath("scap-workbench.svg"); } inline QString _generateSetSidPath() @@ -99,7 +99,7 @@ inline QString _generateApplicationIconPath() QDir dir(QCoreApplication::applicationDirPath()); dir.cd("share"); dir.cd("pixmaps"); - return dir.absoluteFilePath("scap-workbench.png"); + return dir.absoluteFilePath("scap-workbench.svg"); } #endif diff --git a/src/main.cpp b/src/main.cpp index 5f6480a8..cfbe5cd3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,7 @@ #include "Application.h" #include +#include #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN @@ -35,6 +36,8 @@ int main(int argc, char** argv) FreeConsole(); #endif + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + Application app(argc, argv); return app.exec(); }