[gimp] app: document the new display title option
- From: Sven Neumann <neo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: document the new display title option
- Date: Thu, 30 Sep 2010 08:17:44 +0000 (UTC)
commit 2a67bfcb1013333d597782a080e7f4963638e122
Author: Sven Neumann <sven gimp org>
Date: Thu Sep 30 10:11:45 2010 +0200
app: document the new display title option
app/config/gimpconfig-dump.c | 1 +
app/display/gimpdisplayshell-title.c | 5 ++---
docs/gimprc.5.in | 4 ++++
etc/gimprc | 2 ++
4 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c
index 81429f6..06235ea 100644
--- a/app/config/gimpconfig-dump.c
+++ b/app/config/gimpconfig-dump.c
@@ -313,6 +313,7 @@ static const gchar display_format_description[] =
"%W image width in real-world units\n"
"%h image height in pixels\n"
"%H image height in real-world units\n"
+"%M the image size expressed in megapixels\n"
"%u unit symbol\n"
"%U unit abbreviation\n\n";
diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c
index 3b9ed45..0894d0f 100644
--- a/app/display/gimpdisplayshell-title.c
+++ b/app/display/gimpdisplayshell-title.c
@@ -324,9 +324,8 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
case 'M': /* image size in megapixels */
i += print (title, title_len, i, "%.1f",
- (double) gimp_image_get_width (image) *
- gimp_image_get_height (image) /
- 1000000.0);
+ (gdouble) gimp_image_get_width (image) *
+ (gdouble) gimp_image_get_height (image) / 1000000.0);
break;
case 'l': /* number of layers */
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index c391563..c248fb4 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -513,6 +513,8 @@ certain % character sequences are recognised and expanded as follows:
.br
%H image height in real-world units
.br
+%M the image size expressed in megapixels
+.br
%u unit symbol
.br
%U unit abbreviation
@@ -572,6 +574,8 @@ certain % character sequences are recognised and expanded as follows:
.br
%H image height in real-world units
.br
+%M the image size expressed in megapixels
+.br
%u unit symbol
.br
%U unit abbreviation
diff --git a/etc/gimprc b/etc/gimprc
index b1a7f2d..9a3daab 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -403,6 +403,7 @@
# %W image width in real-world units
# %h image height in pixels
# %H image height in real-world units
+# %M the image size expressed in megapixels
# %u unit symbol
# %U unit abbreviation
#
@@ -435,6 +436,7 @@
# %W image width in real-world units
# %h image height in pixels
# %H image height in real-world units
+# %M the image size expressed in megapixels
# %u unit symbol
# %U unit abbreviation
#
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]