dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added '%P' which expands to the PDB id of the active drawable. Moved local 

2004-01-27  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-title.c
	(gimp_display_shell_format_title): added '%P' which expands to the
	PDB id of the active drawable. Moved local variables to local
	scopes where they are needed.

	* app/config/gimpconfig-dump.c: document it.
This commit is contained in:
Michael Natterer 2004-01-27 12:43:53 +00:00 committed by Michael Natterer
parent f406b73da6
commit c92a4e693d
3 changed files with 71 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-01-27 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-title.c
(gimp_display_shell_format_title): added '%P' which expands to the
PDB id of the active drawable. Moved local variables to local
scopes where they are needed.
* app/config/gimpconfig-dump.c: document it.
2004-01-27 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-dnd.c: some cleanup.

1
app/config/gimpconfig-dump.c
View File

@ -305,6 +305,7 @@ static const gchar * display_format_description =
"%L the number of layers (long form)\n"
"%m memory used by the image\n"
"%n the name of the active layer/channel\n"
"%P the PDB id of the active layer/channel\n"
"%w image width in pixels\n"
"%W image width in real-world units\n"
"%h image height in pixels\n"

101
app/display/gimpdisplayshell-title.c
View File

@ -37,6 +37,7 @@
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"
#include "core/gimpimage-unit.h"
#include "core/gimpitem.h"
#include "file/file-utils.h"
@ -147,35 +148,12 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
const gchar *format)
{
GimpImage *gimage;
gchar *image_type_str = NULL;
gboolean empty;
gint i;
gchar unit_format[8];
gint i = 0;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
gimage = shell->gdisp->gimage;
empty = gimp_image_is_empty (gimage);
switch (gimp_image_base_type (gimage))
{
case GIMP_RGB:
image_type_str = empty ? _("RGB-empty") : _("RGB");
break;
case GIMP_GRAY:
image_type_str = empty ? _("grayscale-empty") : _("grayscale");
break;
case GIMP_INDEXED:
image_type_str = empty ? _("indexed-empty") : _("indexed");
break;
default:
g_assert_not_reached ();
break;
}
i = 0;
while (i < title_len && *format)
{
switch (*format)
@ -194,9 +172,10 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
case 'f': /* pruned filename */
{
gchar *basename;
const gchar *uri = gimp_image_get_uri (gimage);
gchar *basename;
basename = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
basename = file_utils_uri_to_utf8_basename (uri);
i += print (title, title_len, i, "%s", basename);
@ -207,8 +186,9 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
case 'F': /* full filename */
{
gchar *filename;
const gchar *uri = gimp_image_get_uri (gimage);
filename = file_utils_uri_to_utf8_filename (gimp_image_get_uri (gimage));
filename = file_utils_uri_to_utf8_filename (uri);
i += print (title, title_len, i, "%s", filename);
@ -225,7 +205,28 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
break;
case 't': /* type */
i += print (title, title_len, i, "%s", image_type_str);
{
const gchar *image_type_str = NULL;
gboolean empty = gimp_image_is_empty (gimage);
switch (gimp_image_base_type (gimage))
{
case GIMP_RGB:
image_type_str = empty ? _("RGB-empty") : _("RGB");
break;
case GIMP_GRAY:
image_type_str = empty ? _("grayscale-empty") : _("grayscale");
break;
case GIMP_INDEXED:
image_type_str = empty ? _("indexed-empty") : _("indexed");
break;
default:
g_assert_not_reached ();
break;
}
i += print (title, title_len, i, "%s", image_type_str);
}
break;
case 's': /* user source zoom factor */
@ -305,17 +306,33 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
}
break;
case 'P': /* active drawable PDB id */
{
GimpDrawable *drawable = gimp_image_active_drawable (gimage);
if (drawable)
i += print (title, title_len, i, "%d",
gimp_item_get_ID (GIMP_ITEM (drawable)));
else
i += print (title, title_len, i, "%s", _("(none)"));
}
break;
case 'w': /* width in pixels */
i += print (title, title_len, i, "%d", gimage->width);
break;
case 'W': /* width in real-world units */
g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
gimp_image_unit_get_digits (gimage) + 1);
i += print (title, title_len, i, unit_format,
(gimage->width *
gimp_image_unit_get_factor (gimage) /
gimage->xresolution));
{
gchar unit_format[8];
g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
gimp_image_unit_get_digits (gimage) + 1);
i += print (title, title_len, i, unit_format,
(gimage->width *
gimp_image_unit_get_factor (gimage) /
gimage->xresolution));
}
break;
case 'h': /* height in pixels */
@ -323,12 +340,16 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
break;
case 'H': /* height in real-world units */
g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
gimp_image_unit_get_digits (gimage) + 1);
i += print (title, title_len, i, unit_format,
(gimage->height *
gimp_image_unit_get_factor (gimage) /
gimage->yresolution));
{
gchar unit_format[8];
g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
gimp_image_unit_get_digits (gimage) + 1);
i += print (title, title_len, i, unit_format,
(gimage->height *
gimp_image_unit_get_factor (gimage) /
gimage->yresolution));
}
break;
case 'u': /* unit symbol */