Commit ca5c4aed authored by Simon Steinbeiss's avatar Simon Steinbeiss

Add support for versioned docs

All dialogs of xfce4-settings now point to the versioned docs hosted on
docs.xfce.org. As the version (major.minor) string is generated, it will
auto-increment for future releases.
parent 3ce9f3de
......@@ -17,6 +17,13 @@ m4_define([xfce4_settings_version_build], [@REVISION@])
m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
dnl define a short version string for xfce4-settings
m4_append([xfce4_settings_version_short], ["])
m4_append([xfce4_settings_version_short], [xfce4_settings_version_major])
m4_append([xfce4_settings_version_short], [.])
m4_append([xfce4_settings_version_short], [xfce4_settings_version_minor])
m4_append([xfce4_settings_version_short], ["])
dnl *******************************************
dnl *** Debugging support for GIT snapshots ***
dnl *******************************************
......@@ -72,6 +79,11 @@ dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Version string for the docs ***
dnl ***********************************
AC_DEFINE([XFCE4_SETTINGS_VERSION_SHORT], [xfce4_settings_version_short], [Short version string of xfce4-settings])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
......
......@@ -164,7 +164,8 @@ accessibility_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "accessibility", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "accessibility",
NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
......
......@@ -1456,7 +1456,8 @@ appearance_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "appearance", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "appearance",
NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
......
......@@ -1236,7 +1236,8 @@ display_settings_dialog_response (GtkDialog *dialog,
GtkBuilder *builder)
{
if (response_id == GTK_RESPONSE_HELP)
xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "display", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "display",
NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
......
......@@ -48,7 +48,8 @@ keyboard_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "keyboard", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "keyboard",
NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
......
......@@ -1834,7 +1834,8 @@ mouse_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "mouse", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "mouse",
NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
......
......@@ -371,9 +371,10 @@ xfce_settings_editor_dialog_response (GtkDialog *widget,
if (response_id == GTK_RESPONSE_HELP)
{
xfce_dialog_show_help (GTK_WINDOW (widget),
"xfce4-settings",
"settings-editor", NULL);
xfce_dialog_show_help_with_version (GTK_WINDOW (widget),
"xfce4-settings",
"settings-editor", NULL,
XFCE4_SETTINGS_VERSION_SHORT);
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment