[gnumeric] GUI: Embed printer setup dialog's artwork.



commit 565e90455596866394e472d3540997435f66921e
Author: Morten Welinder <terra gnome org>
Date:   Tue Mar 19 20:14:57 2013 -0400

    GUI: Embed printer setup dialog's artwork.

 NEWS                                  |    1 +
 icons/Makefile.am                     |    2 --
 src/Makefile.am                       |    2 ++
 src/dialogs/dialog-printer-setup.c    |    4 ++--
 {icons => src/pixmaps}/down-right.png |  Bin 5922 -> 5922 bytes
 {icons => src/pixmaps}/right-down.png |  Bin 5723 -> 5723 bytes
 6 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index d12b94b..d873905 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.12.2
 Morten:
        * Improve ssconvert error handling.  [#695529]
        * New font selector for toolbar.  [#695031]
+       * Embed more artwork.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.1
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 63a8f3e..0ccf7ff 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -14,8 +14,6 @@ icons_DATA = \
        $(mimeicon_DATA)        \
        orient-horizontal.png   \
        orient-vertical.png     \
-       right-down.png          \
-       down-right.png          \
        gnumeric-about.png      \
        stf-druid.png
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e67de88..bdc5eb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -455,6 +455,7 @@ embedded_imgs =                                             \
        pixmaps/comment_edit_16.xpm                     \
        pixmaps/cursor_cross.xpm                        \
        pixmaps/diag_border.xpm                         \
+       pixmaps/down-right.png                          \
        pixmaps/equal-sign.xpm                          \
        pixmaps/expr_entry.png                          \
        pixmaps/font.xpm                                \
@@ -565,6 +566,7 @@ embedded_imgs =                                             \
        pixmaps/protection_yes_48.png                   \
        pixmaps/remove_decimals.png                     \
        pixmaps/rev_diag_border.xpm                     \
+       pixmaps/right-down.png                          \
        pixmaps/right_border.xpm                        \
        pixmaps/row_add_16.xpm                          \
        pixmaps/row_add_24.xpm                          \
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index bb7a0ac..410d45e 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -2313,8 +2313,8 @@ do_setup_page_info (PrinterSetupState *state)
                                                         (GTK_COMBO_BOX (state->comment_display.combo)));
        do_setup_comment_display (state);
 
-       state->icon_rd = gnumeric_load_image ("right-down.png");
-       state->icon_dr = gnumeric_load_image ("down-right.png");
+       state->icon_rd = gnumeric_load_image ("res:gnm:pixmaps/right-down.png");
+       state->icon_dr = gnumeric_load_image ("res:gnm:pixmaps/down-right.png");
 
        gtk_widget_hide (state->icon_dr);
        gtk_widget_hide (state->icon_rd);
diff --git a/icons/down-right.png b/src/pixmaps/down-right.png
similarity index 100%
rename from icons/down-right.png
rename to src/pixmaps/down-right.png
diff --git a/icons/right-down.png b/src/pixmaps/right-down.png
similarity index 100%
rename from icons/right-down.png
rename to src/pixmaps/right-down.png


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]