diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 677c7297..3e938f19 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,8 +12,10 @@ assignees: '' **Affects versions :** - OS: [e.g. Linux (which distro), Mac, Windows] - (Linux only) Desktop environment: [e.g. Wayland, Gnome-Wayland, XWayland, X11] - - Which version of libgtk do you use: [e.g. output of `pkg-config --modversion gtk+-3.0`] + - Which version of libgtk do you use + - can be obtained by running `xournalpp --version` or in the **About** window - Version of Xournal++: [e.g. 1.0.16, specific commit, specific branch] + - can be obtained by running `xournalpp --version` or in the **About** window - Installation method: [e.g. PPA, Flatpak, official release, etc.] **Describe the bug** diff --git a/src/control/XournalMain.cpp b/src/control/XournalMain.cpp index be12bcbd..6f8fb8e1 100644 --- a/src/control/XournalMain.cpp +++ b/src/control/XournalMain.cpp @@ -337,6 +337,7 @@ auto XournalMain::run(int argc, char* argv[]) -> int { if (showVersion) { g_printf("%s %s \n", PROJECT_NAME, PROJECT_VERSION); + g_printf("└──%s: %d.%d.%d \n", "libgtk", gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); return 0; } diff --git a/src/gui/dialog/AboutDialog.cpp b/src/gui/dialog/AboutDialog.cpp index 8cec4e8b..ec28f03a 100644 --- a/src/gui/dialog/AboutDialog.cpp +++ b/src/gui/dialog/AboutDialog.cpp @@ -1,5 +1,7 @@ #include "AboutDialog.h" +#include + #include #include "StringUtils.h" @@ -9,6 +11,11 @@ AboutDialog::AboutDialog(GladeSearchpath* gladeSearchPath): GladeGui(gladeSearch gtk_label_set_markup(GTK_LABEL(get("lbVersion")), PROJECT_VERSION); gtk_label_set_markup(GTK_LABEL(get("lbRevId")), GIT_COMMIT_ID); + char gtkVersion[10]; + sprintf(gtkVersion, "%d.%d.%d", gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); + + gtk_label_set_markup(GTK_LABEL(get("lbGtkVersion")), gtkVersion); + GtkWidget* w = get("vbox1"); GtkWidget* linkButton = gtk_link_button_new("http://github.com/xournalpp/xournalpp"); gtk_widget_show(linkButton); diff --git a/ui/about.glade b/ui/about.glade index 8edd120b..81c4ff49 100644 --- a/ui/about.glade +++ b/ui/about.glade @@ -1,5 +1,5 @@ - + @@ -171,6 +171,31 @@ 1 + + + True + False + with libgtk + + + + + + 0 + 3 + + + + + True + False + X.X.X + + + 1 + 3 + + False