gedit r6765 - in trunk: . gedit

[icq svn gnome org]

Author: icq
Date: Tue Dec 30 13:43:43 2008
New Revision: 6765
URL: http://svn.gnome.org/viewvc/gedit?rev=6765&view=rev

Log:
2008-12-30  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-statusbar.c:
        Mark for translation "INS" instead of "  INS" to avoid
        work for translators.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-notebook.c
   trunk/gedit/gedit-statusbar.c

Modified: trunk/gedit/gedit-notebook.c
==============================================================================
--- trunk/gedit/gedit-notebook.c	(original)
+++ trunk/gedit/gedit-notebook.c	Tue Dec 30 13:43:43 2008
@@ -148,6 +148,17 @@
 			      GEDIT_TYPE_TAB);
 
 	g_type_class_add_private (object_class, sizeof(GeditNotebookPrivate));
+	
+	/* Set up a style for the close button with no focus padding. */
+	gtk_rc_parse_string (
+		"style \"gedit-close-button-style\"\n"
+		"{\n"
+		"  GtkWidget::focus-padding = 0\n"
+		"  GtkWidget::focus-line-width = 0\n"
+		"  xthickness = 0\n"
+		"  ythickness = 0\n"
+		"}\n"
+		"widget \"*.gedit-close-button\" style \"gedit-close-button-style\"");
 }
 
 static GeditNotebook *
@@ -793,18 +804,16 @@
 }
 
 static void
-tab_label_style_set_cb (GtkWidget *hbox,
+tab_label_style_set_cb (GtkWidget *button,
 			GtkStyle *previous_style,
 			gpointer user_data)
 {
-	GtkWidget *button;
 	gint h, w;
 
-	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (hbox),
+	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button),
 					   GTK_ICON_SIZE_MENU, &w, &h);
 
-	button = g_object_get_data (G_OBJECT (hbox), "close-button");
-	gtk_widget_set_size_request (button, w + 2, h + 2);
+	gtk_widget_set_size_request (button, w + 4, h + 4);
 }
 
 static GtkWidget *
@@ -814,7 +823,6 @@
 	GtkWidget *hbox, *label_hbox, *label_ebox;
 	GtkWidget *label, *dummy_label;
 	GtkWidget *close_button;
-	GtkRcStyle *rcstyle;
 	GtkWidget *image;
 	GtkWidget *spinner;
 	GtkWidget *icon;
@@ -836,10 +844,7 @@
 	gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
 
 	/* make it as small as possible */
-	rcstyle = gtk_rc_style_new ();
-	rcstyle->xthickness = rcstyle->ythickness = 0;
-	gtk_widget_modify_style (close_button, rcstyle);
-	gtk_rc_style_unref (rcstyle),
+	gtk_widget_set_name (close_button, "gedit-close-button");
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
 					  GTK_ICON_SIZE_MENU);
@@ -872,7 +877,7 @@
 	gtk_box_pack_start (GTK_BOX (label_hbox), dummy_label, TRUE, TRUE, 0);
 	
 	/* Set minimal size */
-	g_signal_connect (hbox, "style-set",
+	g_signal_connect (close_button, "style-set",
 			  G_CALLBACK (tab_label_style_set_cb), NULL);
 	
 	gtk_widget_show (hbox);

Modified: trunk/gedit/gedit-statusbar.c
==============================================================================
--- trunk/gedit/gedit-statusbar.c	(original)
+++ trunk/gedit/gedit-statusbar.c	Tue Dec 30 13:43:43 2008
@@ -245,9 +245,9 @@
 	gtk_statusbar_pop (GTK_STATUSBAR (statusbar->priv->overwrite_mode_statusbar), 0);
 
 	if (overwrite)
-		msg = g_strdup (_("  OVR"));
+		msg = g_strconcat ("  ", _("OVR"), NULL);
 	else
-		msg = g_strdup (_("  INS"));
+		msg = g_strconcat ("  ", _("INS"), NULL);
 
 	gtk_statusbar_push (GTK_STATUSBAR (statusbar->priv->overwrite_mode_statusbar), 0, msg);