Fix <GTK 2.24 combo box usage.

[andy/viking.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index d6fb00ccc11d39796622c161bcb9dc383eb9f2cc..8b506710230240900ff30a94ed98a0bc9ea426fd 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -21,10 +21,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <string.h>
 #include <glib/gprintf.h>
 #include <string.h>
 #include <glib/gprintf.h>

+#include <glib/gi18n.h>

 #include <gtk/gtk.h>
 
 #include <gtk/gtk.h>
 

+#if GTK_CHECK_VERSION(2,10,0)
+

 #include "viking.h"
 #include "print.h"
 #include "print-preview.h"
 #include "viking.h"
 #include "print.h"
 #include "print-preview.h"


@@ -43,10 +50,10 @@ typedef struct {
 } PrintCenterName;
 
 static const PrintCenterName center_modes[] = {
 } PrintCenterName;
 
 static const PrintCenterName center_modes[] = {

-  {"None",          VIK_PRINT_CENTER_NONE},
-  {"Horizontally",  VIK_PRINT_CENTER_HORIZONTALLY},
-  {"Vertically",    VIK_PRINT_CENTER_VERTICALLY},
-  {"Both",          VIK_PRINT_CENTER_BOTH},
+  {N_("None"),          VIK_PRINT_CENTER_NONE},
+  {N_("Horizontally"),  VIK_PRINT_CENTER_HORIZONTALLY},
+  {N_("Vertically"),    VIK_PRINT_CENTER_VERTICALLY},
+  {N_("Both"),          VIK_PRINT_CENTER_BOTH},

   {NULL,            -1}
 };
 
   {NULL,            -1}
 };
 


@@ -110,7 +117,7 @@ void a_print(VikWindow *vw, VikViewport *vvp)
   g_signal_connect (print_oper, "end-print", G_CALLBACK (end_print), &data);
   g_signal_connect (print_oper, "create-custom-widget", G_CALLBACK (create_custom_widget_cb), &data);
 
   g_signal_connect (print_oper, "end-print", G_CALLBACK (end_print), &data);
   g_signal_connect (print_oper, "create-custom-widget", G_CALLBACK (create_custom_widget_cb), &data);
 

-  gtk_print_operation_set_custom_tab_label (print_oper, "Image Settings");
+  gtk_print_operation_set_custom_tab_label (print_oper, _("Image Settings"));

 
   res = gtk_print_operation_run (print_oper,
                                  GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
 
   res = gtk_print_operation_run (print_oper,
                                  GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,


@@ -192,8 +199,6 @@ static void draw_page_cairo(GtkPrintContext *context, PrintData *data)
   gint             stride;
   gint             pixbuf_stride;
   gint             pixbuf_n_channels;
   gint             stride;
   gint             pixbuf_stride;
   gint             pixbuf_n_channels;

-  gdouble          cr_width;
-  gdouble          cr_height;

   gdouble          cr_dpi_x;
   gdouble          cr_dpi_y;
   gdouble          scale_x;
   gdouble          cr_dpi_x;
   gdouble          cr_dpi_y;
   gdouble          scale_x;


@@ -207,8 +212,6 @@ static void draw_page_cairo(GtkPrintContext *context, PrintData *data)
   surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
                                        data->width, data->height);
   
   surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
                                        data->width, data->height);
   

-  cr_width  = gtk_print_context_get_width  (context);
-  cr_height = gtk_print_context_get_height (context);

   cr_dpi_x  = gtk_print_context_get_dpi_x  (context);
   cr_dpi_y  = gtk_print_context_get_dpi_y  (context);
 
   cr_dpi_x  = gtk_print_context_get_dpi_x  (context);
   cr_dpi_y  = gtk_print_context_get_dpi_y  (context);
 


@@ -540,7 +543,7 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   GtkPageSetup *setup;
 
   CustomWidgetInfo  *info = g_malloc0(sizeof(CustomWidgetInfo));
   GtkPageSetup *setup;
 
   CustomWidgetInfo  *info = g_malloc0(sizeof(CustomWidgetInfo));

-  g_signal_connect_swapped (data->operation, "done", G_CALLBACK (custom_widgets_cleanup), info);
+  g_signal_connect_swapped (data->operation, _("done"), G_CALLBACK (custom_widgets_cleanup), info);

 
 
   info->data = data;
 
 
   info->data = data;


@@ -569,8 +572,8 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   gtk_widget_show (vbox);
 
   /* Page Size */
   gtk_widget_show (vbox);
 
   /* Page Size */

-  button = gtk_button_new_with_mnemonic ("_Adjust Page Size "
-                                           "and Orientation");
+  button = gtk_button_new_with_mnemonic (_("_Adjust Page Size "
+                                           "and Orientation"));

   gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (page_setup_cb),
   gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (page_setup_cb),


@@ -585,14 +588,14 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 

-  label = gtk_label_new_with_mnemonic ("C_enter:");
+  label = gtk_label_new_with_mnemonic (_("C_enter:"));

   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
   combo = gtk_combo_box_new_text ();
   for (center = center_modes; center->name; center++) {
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
   combo = gtk_combo_box_new_text ();
   for (center = center_modes; center->name; center++) {

-    gtk_combo_box_append_text(GTK_COMBO_BOX(combo), center->name);
+    gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _(center->name));

   }
   gtk_combo_box_set_active(GTK_COMBO_BOX(combo), VIK_PRINT_CENTER_BOTH);
   gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
   }
   gtk_combo_box_set_active(GTK_COMBO_BOX(combo), VIK_PRINT_CENTER_BOTH);
   gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);


@@ -603,7 +606,7 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   info->center_combo = combo;
 
   /* ignore page margins */
   info->center_combo = combo;
 
   /* ignore page margins */

-  button = gtk_check_button_new_with_mnemonic ("Ignore Page _Margins");
+  button = gtk_check_button_new_with_mnemonic (_("Ignore Page _Margins"));

 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 data->use_full_page);
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                 data->use_full_page);


@@ -622,7 +625,7 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 

-  label = gtk_label_new_with_mnemonic ("Image S_ize:");
+  label = gtk_label_new_with_mnemonic (_("Image S_ize:"));

   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);


@@ -664,3 +667,5 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   
   return layout;
 }
   
   return layout;
 }

+
+#endif