From 2db8367c7df71dad3e57d1e766ff7c4acbcb99bd Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 10 Apr 2003 11:05:17 +0000 Subject: [PATCH] themes/Default/images/Makefile.am 2003-04-10 Sven Neumann * themes/Default/images/Makefile.am * themes/Default/images/stock-portrait-16.png * themes/Default/images/stock-landscape-16.png: new icons by Jimmac. * libgimpwidgets/gimpstock.[ch]: register the new icons. * app/widgets/widgets-enums.[ch]: added new enum GimpAspectType. --- ChangeLog | 10 +++ app/widgets/widgets-enums.c | 58 ++++++++++++------ app/widgets/widgets-enums.h | 34 ++++++---- devel-docs/ChangeLog | 5 ++ .../libgimpwidgets-sections.txt | 2 + devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 14 +++++ libgimpwidgets/gimpstock.c | 6 ++ libgimpwidgets/gimpstock.h | 3 + themes/Default/images/Makefile.am | 2 + themes/Default/images/stock-landscape-16.png | Bin 0 -> 431 bytes themes/Default/images/stock-portrait-16.png | Bin 0 -> 351 bytes 11 files changed, 104 insertions(+), 30 deletions(-) create mode 100644 themes/Default/images/stock-landscape-16.png create mode 100644 themes/Default/images/stock-portrait-16.png diff --git a/ChangeLog b/ChangeLog index ef283641a1..350fba8131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-04-10 Sven Neumann + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-portrait-16.png + * themes/Default/images/stock-landscape-16.png: new icons by Jimmac. + + * libgimpwidgets/gimpstock.[ch]: register the new icons. + + * app/widgets/widgets-enums.[ch]: added new enum GimpAspectType. + 2003-04-10 Michael Natterer * app/core/gimpcontext.[ch]: added gimp_context_type_to_prop_name(). diff --git a/app/widgets/widgets-enums.c b/app/widgets/widgets-enums.c index 82254f6e46..a3ba8da21b 100644 --- a/app/widgets/widgets-enums.c +++ b/app/widgets/widgets-enums.c @@ -8,6 +8,26 @@ /* enumerations from "./widgets-enums.h" */ +static const GEnumValue gimp_aspect_type_enum_values[] = +{ + { GIMP_ASPECT_SQUARE, "GIMP_ASPECT_SQUARE", "square" }, + { GIMP_ASPECT_PORTRAIT, N_("Portrait"), "portrait" }, + { GIMP_ASPECT_LANDSCAPE, N_("Landscape"), "landscape" }, + { 0, NULL, NULL } +}; + +GType +gimp_aspect_type_get_type (void) +{ + static GType enum_type = 0; + + if (!enum_type) + enum_type = g_enum_register_static ("GimpAspectType", gimp_aspect_type_enum_values); + + return enum_type; +} + + static const GEnumValue gimp_help_browser_type_enum_values[] = { { GIMP_HELP_BROWSER_GIMP, N_("Internal"), "gimp" }, @@ -27,25 +47,6 @@ gimp_help_browser_type_get_type (void) } -static const GEnumValue gimp_zoom_type_enum_values[] = -{ - { GIMP_ZOOM_IN, N_("Zoom in"), "in" }, - { GIMP_ZOOM_OUT, N_("Zoom out"), "out" }, - { 0, NULL, NULL } -}; - -GType -gimp_zoom_type_get_type (void) -{ - static GType enum_type = 0; - - if (!enum_type) - enum_type = g_enum_register_static ("GimpZoomType", gimp_zoom_type_enum_values); - - return enum_type; -} - - static const GEnumValue gimp_histogram_scale_enum_values[] = { { GIMP_HISTOGRAM_SCALE_LINEAR, N_("Linear"), "linear" }, @@ -84,5 +85,24 @@ gimp_view_type_get_type (void) } +static const GEnumValue gimp_zoom_type_enum_values[] = +{ + { GIMP_ZOOM_IN, N_("Zoom in"), "in" }, + { GIMP_ZOOM_OUT, N_("Zoom out"), "out" }, + { 0, NULL, NULL } +}; + +GType +gimp_zoom_type_get_type (void) +{ + static GType enum_type = 0; + + if (!enum_type) + enum_type = g_enum_register_static ("GimpZoomType", gimp_zoom_type_enum_values); + + return enum_type; +} + + /* Generated data ends here */ diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h index 17aba0ecf7..115e52823a 100644 --- a/app/widgets/widgets-enums.h +++ b/app/widgets/widgets-enums.h @@ -26,6 +26,18 @@ * these enums that are registered with the type system */ +#define GIMP_TYPE_ASPECT_TYPE (gimp_aspect_type_get_type ()) + +GType gimp_aspect_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_ASPECT_SQUARE, + GIMP_ASPECT_PORTRAIT, /*< desc="Portrait" >*/ + GIMP_ASPECT_LANDSCAPE /*< desc="Landscape" >*/ +} GimpAspectType; + + #define GIMP_TYPE_HELP_BROWSER_TYPE (gimp_help_browser_type_get_type ()) GType gimp_help_browser_type_get_type (void) G_GNUC_CONST; @@ -37,17 +49,6 @@ typedef enum } GimpHelpBrowserType; -#define GIMP_TYPE_ZOOM_TYPE (gimp_zoom_type_get_type ()) - -GType gimp_zoom_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ZOOM_IN, /*< desc="Zoom in" >*/ - GIMP_ZOOM_OUT /*< desc="Zoom out" >*/ -} GimpZoomType; - - #define GIMP_TYPE_HISTOGRAM_SCALE (gimp_histogram_scale_get_type ()) GType gimp_histogram_scale_get_type (void) G_GNUC_CONST; @@ -70,6 +71,17 @@ typedef enum } GimpViewType; +#define GIMP_TYPE_ZOOM_TYPE (gimp_zoom_type_get_type ()) + +GType gimp_zoom_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_ZOOM_IN, /*< desc="Zoom in" >*/ + GIMP_ZOOM_OUT /*< desc="Zoom out" >*/ +} GimpZoomType; + + /* * non-registered enums; register them if needed */ diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 88d7aebcc2..50d1b0cc9f 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,8 @@ +2003-04-04 Sven Neumann + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpstock.sgml: landscape and portrait icons. + 2003-04-04 Sven Neumann * libgimpwidgets/libgimpwidgets-sections.txt diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 9dd580d937..0dece007f9 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -291,6 +291,8 @@ GIMP_STOCK_LINKED GIMP_STOCK_VISIBLE GIMP_STOCK_LIST GIMP_STOCK_GRID +GIMP_STOCK_PORTRAIT +GIMP_STOCK_LANDSCAPE GIMP_STOCK_SELECTION_ALL GIMP_STOCK_SELECTION_NONE GIMP_STOCK_SELECTION_GROW diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index a29b4700cd..3e9bfd0564 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -194,6 +194,20 @@ size). + + + + + + + + + + + + + + diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 972dd40652..e174055c61 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -201,6 +201,9 @@ static GtkStockItem gimp_stock_items[] = { GIMP_STOCK_LIST, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRID, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_PORTRAIT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LANDSCAPE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_ERROR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_INFO, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_QUESTION, NULL, 0, 0, LIBGIMP_DOMAIN }, @@ -415,6 +418,9 @@ gimp_stock_menu_pixbufs[] = { GIMP_STOCK_LIST, stock_list_16 }, { GIMP_STOCK_GRID, stock_grid_16 }, + { GIMP_STOCK_PORTRAIT, stock_portrait_16 }, + { GIMP_STOCK_LANDSCAPE, stock_landscape_16 }, + { GIMP_STOCK_DEFAULT_COLORS, stock_default_colors_12 }, { GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index 982336cd90..07a426bcf4 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -180,6 +180,9 @@ G_BEGIN_DECLS #define GIMP_STOCK_LIST "gimp-list" #define GIMP_STOCK_GRID "gimp-grid" +#define GIMP_STOCK_PORTRAIT "gimp-portrait" +#define GIMP_STOCK_LANDSCAPE "gimp-landscape" + /* in dialog size: */ #define GIMP_STOCK_ERROR "gimp-error" diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index c56a294509..561f7ec1b4 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -52,6 +52,7 @@ STOCK_MENU_IMAGES = \ stock-images-16.png \ stock-info-16.png \ stock-invert-16.png \ + stock-landscape-16.png \ stock-layer-16.png \ stock-layer-to-imagesize-16.png \ stock-layers-16.png \ @@ -60,6 +61,7 @@ STOCK_MENU_IMAGES = \ stock-navigation-16.png \ stock-paths-16.png \ stock-plugin-16.png \ + stock-portrait-16.png \ stock-qmask-off-16.png \ stock-qmask-on-16.png \ stock-reshow-filter-16.png \ diff --git a/themes/Default/images/stock-landscape-16.png b/themes/Default/images/stock-landscape-16.png new file mode 100644 index 0000000000000000000000000000000000000000..725a269ff24ab9cbfba4688caddc815eaabfcd8a GIT binary patch literal 431 zcmV;g0Z{&lP)~=d!r4qefkFb-MN0q~lj4_A^#uxyW z%OxU0KA)%C?E*+Ng75nPY&IKmxf}pN5TKOea5$ip;&?pL@Auhmx1>@jhQr})RBNqh ztz|x+OQBGZ*=#1B=gH}GlIe6Rj^l{qI5HlOWxZa@Xf%>$vnh!V7K;V7S}hW<)oPK+ zWT@Bc2{AjJ4%uuL*L5kE%eO5UV<;AjPt}j#MTB;{4M3$*xfk&}a)?Hw5&5s7Gnq^x zwL_w{HgPJY2!a3+!F62{YmAehRsI?ib+B5kxL&V!3F6h`X02tv-$${|FaCl6AHX~R Zj!)1-5OYHorab@v002ovPDHLkV1jQdw+a9N literal 0 HcmV?d00001 diff --git a/themes/Default/images/stock-portrait-16.png b/themes/Default/images/stock-portrait-16.png new file mode 100644 index 0000000000000000000000000000000000000000..17d2d23b3366fdd6a0b4ed60b135d9ad39424a1a GIT binary patch literal 351 zcmV-l0igbgP)?kWu zGnU6Qqc!k9p8z-kUkD7XwO$xwcsiYUI2@eFcTnJVyLnL*1@HGex7)1~`2m1vAb_sx zy!Ljx9jdCr<#NIKe8zsi2Y_gX2}2UA)e4Kn0$N{D*EL2Xv~A0>EV*1RpD4?cT5D>p zsg!at@aDi;3jmN(_IN2JNWxkRl23jUK$d0C zOC*u!IjpsB5oW%Z(lmt-qQ?s%pp@!42|7rU#M?m}$Kxdq3-WP82lKJALQC~pVsDj? x$764mozPIQX&P)cn_mDQul#!AcXn69}55g002ovPDHLkV1mm_jv)X5 literal 0 HcmV?d00001