All pastes #606982 Raw Edit

Someone

public text v1 · immutable
·published 2007-07-07 08:33 UTC
rendered paste body
Index: src/awn-title.c
===================================================================
--- src/awn-title.c	(revision 214)
+++ src/awn-title.c	(working copy)
@@ -421,12 +421,9 @@
 	gtk_window_get_size(GTK_WINDOW(window), &ww, &wh);
 	
 	x = (int) ((settings->monitor.width - ww) / 2);
-
-	y = (int) (settings->monitor.height - ((settings->bar_height +2)*2));
+	y = (int) (settings->monitor.height - ((settings->bar_height +2)*2 + settings->icon_offset));
 	
 	gtk_window_move(GTK_WINDOW(window), x, y);
-	
-	
 }
 
 
Index: src/awn-bar.c
===================================================================
--- src/awn-bar.c	(revision 214)
+++ src/awn-bar.c	(working copy)
@@ -30,6 +30,8 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #include <gdk/gdkx.h>
+#include <math.h>

+#define PI 3.14159265
 
 G_DEFINE_TYPE (AwnBar, awn_bar, GTK_TYPE_WINDOW)
 
@@ -53,6 +55,7 @@
 static int separator			= 0;
 static int draw_separator		= 0;
 int bar_height = 0;
+int icon_offset = 0;
 static GtkWidgetClass *parent_class = NULL;
 
 static void _on_alpha_screen_changed (GtkWidget* pWidget, GdkScreen* pOldScreen, GtkWidget* pLabel);
@@ -133,7 +136,7 @@
 static void
 render_rect (cairo_t *cr, double x, double y, double width, double height, double offset  )
 {
-	if (settings->rounded_corners) {
+	if (settings->rounded_corners && settings->bar_angle == 0 ) {
 		/* modified from cairo snippets page */
 		double x0  = x ,  	
 		y0	   = y ,
@@ -154,9 +157,37 @@
 		cairo_line_to (cr, x0 , y1);
 	
         	cairo_close_path (cr);
+	} else {

+		double x0  = x,  	

+		y0	   = y,

+		x1	   = x+width,

+		y1	   = y+height;

+

+		cairo_move_to  (cr, x0 + apply_perspective_x(width, height/2, 0)    , y0 + apply_perspective_y( height )- icon_offset);

+		cairo_line_to  (cr, x0 + apply_perspective_x(width, height/2, width), y0 + apply_perspective_y( height )- icon_offset);

+		cairo_line_to  (cr, x1, y1 );

+		cairo_line_to  (cr, x0, y1 );

+

+	       	cairo_close_path (cr);

+	}
+}
 
-	} else 
-		cairo_rectangle(cr, x, y, width, height);
+float

+apply_perspective_x( double width, double height, double x )

+{

+	if( settings->bar_angle == 0 )

+		return x;

+	else

+		return (width/2-x)/(width/2*tan((90-settings->bar_angle)*PI/180))*height+x;

+}

+

+float

+apply_perspective_y( double height )

+{

+	if( settings->bar_angle == 0 )

+		return 0;

+	else

+		return height/2;

 }
 
 static void
@@ -212,6 +243,12 @@
 {
 	AwnBarPrivate *priv = AWN_BAR_GET_PRIVATE (bar);
         gint width = current_width;
+        
+        if( settings->bar_angle != 0 )

+		icon_offset = 0;

+	else

+		icon_offset = settings->icon_offset;
+        
 	cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.0f);
 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 	cairo_paint (cr);
@@ -242,7 +279,12 @@
 				   		settings->g_histep_2.green, 
 				   		settings->g_histep_2.blue,
 				   		settings->g_histep_2.alpha);
-	render_rect (cr, x+1, height/2, width-2, height/5, 0);
+
+	if( settings->bar_angle == 0 )

+		render_rect (cr, x+1, height/2, width-2, height/5, 0);

+	else

+		render_rect (cr, x+1+apply_perspective_x(width, bar_height/4, 0), height*7/10-2, width-2-2*apply_perspective_x(width, bar_height/4, 0), height/5, 0);
+	
 	cairo_set_source(cr, pat);
 	cairo_fill(cr);
 	cairo_pattern_destroy(pat);
@@ -273,7 +315,7 @@
 		
 		cairo_set_line_width (cr, 1.0);
 		
-		cairo_move_to (cr, real_x+separator-2.5, bar_height + 3);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, separator-2.5), bar_height- icon_offset+3 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+separator-2.5, (bar_height + 2) * 2);
 		cairo_set_source_rgba (cr, settings->hilight_color.red, 
 				   	   settings->hilight_color.green, 
@@ -282,7 +324,7 @@
 		
 		cairo_stroke(cr);
 		
-		cairo_move_to (cr, real_x+separator-1.5, bar_height + 2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, separator-1.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+separator-1.5, (bar_height + 2) * 2);
 		cairo_set_source_rgba (cr, settings->border_color.red, 
 				   	   settings->border_color.green, 
@@ -292,7 +334,7 @@
 		cairo_stroke(cr);
 		
 		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-		cairo_move_to (cr, real_x+separator-0.5, bar_height + 2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, separator-0.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+separator-0.5, (bar_height + 2) * 2);
 		cairo_set_source_rgba (cr, settings->sep_color.red, 
 				   	   settings->sep_color.green, 
@@ -302,7 +344,7 @@
 	
 
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-		cairo_move_to (cr, real_x+separator+0.5, bar_height + 2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, separator+0.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+separator+0.5, (bar_height + 2) * 2);
 		cairo_set_source_rgba (cr, settings->border_color.red, 
 				   	   settings->border_color.green, 
@@ -311,7 +353,7 @@
 		cairo_stroke(cr);
 
 		
-		cairo_move_to (cr, real_x+separator+1.5, bar_height + 3);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, separator+1.5), bar_height- icon_offset+3 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+separator+1.5, (bar_height + 2) * 2);
 		cairo_set_source_rgba (cr, settings->hilight_color.red, 
 				   	   settings->hilight_color.green, 
@@ -336,7 +378,7 @@
 		
 		cairo_set_line_width (cr, 1.0);
 		
-		cairo_move_to (cr, real_x+sep-2.5, settings->bar_height+3);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, sep-2.5), bar_height- icon_offset+3 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+sep-2.5, (settings->bar_height+2)*2);
 		cairo_set_source_rgba (cr, settings->hilight_color.red, 
 				   	   settings->hilight_color.green, 
@@ -345,7 +387,7 @@
 		
 		cairo_stroke(cr);
 		
-		cairo_move_to (cr, real_x+sep-1.5, settings->bar_height+2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, sep-1.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+sep-1.5, (settings->bar_height+2)*2);
 		cairo_set_source_rgba (cr, settings->border_color.red, 
 				   	   settings->border_color.green, 
@@ -355,7 +397,7 @@
 		cairo_stroke(cr);
 		
 		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-		cairo_move_to (cr, real_x+sep-0.5, settings->bar_height+2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, sep-0.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+sep-0.5, (settings->bar_height+2)*2);
 		cairo_set_source_rgba (cr, settings->sep_color.red, 
 				   	   settings->sep_color.green, 
@@ -365,7 +407,7 @@
 	
 
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-		cairo_move_to (cr, real_x+sep+0.5, settings->bar_height+2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, sep+0.5), bar_height- icon_offset+2 + apply_perspective_y(bar_height));
 		cairo_line_to (cr, real_x+sep+0.5, (settings->bar_height+2)*2);
 		cairo_set_source_rgba (cr, settings->border_color.red, 
 				   	   settings->border_color.green, 
@@ -374,8 +416,8 @@
 		cairo_stroke(cr);
 
 		
-		cairo_move_to (cr, real_x+sep+1.5, settings->bar_height+3);
-		cairo_line_to (cr, real_x+sep+1.5, settings->bar_height*2);
+		cairo_move_to (cr, real_x+apply_perspective_x(width, bar_height/2, sep+1.5), bar_height- icon_offset+3 + apply_perspective_y(bar_height));

+		cairo_line_to (cr, real_x+sep+1.5, (settings->bar_height+2)*2);
 		cairo_set_source_rgba (cr, settings->hilight_color.red, 
 				   	   settings->hilight_color.green, 
 				           settings->hilight_color.blue,
Index: src/awn-bar.h
===================================================================
--- src/awn-bar.h	(revision 214)
+++ src/awn-bar.h	(working copy)
@@ -66,6 +66,8 @@
 gboolean awn_bar_separator_expose_event  (GtkWidget      *widget,
                                  GdkEventExpose *event,
                                  GtkWidget 	*bar);
+float apply_perspective_x (double width, double height, double x);

+float apply_perspective_y (double height);
 
 void
 awn_bar_add_separator (AwnBar *bar, GtkWidget *widget);
Index: src/awn-gconf.c
===================================================================
--- src/awn-gconf.c	(revision 214)
+++ src/awn-gconf.c	(working copy)
@@ -44,6 +44,8 @@
 #define BAR_SHOW_SEPARATOR	BAR_PATH "/show_separator"	/*string*/
 #define BAR_SEP_COLOR		BAR_PATH "/sep_color"		/*string*/
 #define BAR_HEIGHT		BAR_PATH "/bar_height"		/*int*/
+#define BAR_ANGLE		BAR_PATH "/bar_angle"		/*int, between 0 and 90*/

+#define ICON_OFFSET		BAR_PATH "/icon_offset" 	/*float*/
 
 #define WINMAN_PATH		AWN_PATH "/window_manager"
 #define WINMAN_SHOW_ALL_WINS	WINMAN_PATH "/show_all_windows"	/*bool*/
@@ -113,6 +115,8 @@
 	gconf_client_add_dir(client, BAR_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
 
 	awn_load_int(client, BAR_HEIGHT, &s->bar_height,48);
+	awn_load_int(client, BAR_ANGLE, &s->bar_angle,0);

+	awn_load_int(client, ICON_OFFSET, &s->icon_offset,0);
 	awn_load_bool(client, BAR_ROUNDED_CORNERS, &s->rounded_corners, TRUE);
 	awn_load_float(client, BAR_CORNER_RADIUS, &s->corner_radius, 10.0);	
 	awn_load_bool(client, BAR_RENDER_PATTERN, &s->render_pattern, FALSE);	
Index: src/awn-applet-manager.c
===================================================================
--- src/awn-applet-manager.c	(revision 214)
+++ src/awn-applet-manager.c	(working copy)
@@ -233,7 +233,7 @@
 
                 
                 gtk_widget_set_size_request (applet, -1, 
-                                             priv->settings->bar_height *2);
+                                             (priv->settings->bar_height)*2 +priv->settings->icon_offset);
                 
                 gtk_box_pack_start (GTK_BOX (manager), applet, 
                                     FALSE, FALSE, 0);
Index: src/awn-utils.c
===================================================================
--- src/awn-utils.c	(revision 214)
+++ src/awn-utils.c	(working copy)
@@ -57,7 +57,7 @@
 	//hide_window (GTK_WINDOW (settings->bar));
 	//hide_window (GTK_WINDOW (settings->window));
 	
-	dest_y = settings->bar_height + 2;
+	dest_y = settings->bar_height + 4;
 	
 	if (!effect_lock) {
 		g_timeout_add (20, (GSourceFunc)_move_bar, (gpointer)settings);
Index: src/awn-gconf.h
===================================================================
--- src/awn-gconf.h	(revision 214)
+++ src/awn-gconf.h	(working copy)
@@ -59,6 +59,7 @@
 	gboolean hidden;
 	
 	int bar_height;
+	int bar_angle;
 
 	/* Bar appearance settings */
 	gboolean rounded_corners;
@@ -93,6 +94,8 @@
 	gboolean name_change_notify;
 	gboolean alpha_effect;
 	
+	int icon_offset;
+	
 	/* Title settings */
 	AwnColor text_color;
 	AwnColor shadow_color;
Index: src/main.c
===================================================================
--- src/main.c	(revision 214)
+++ src/main.c	(working copy)
@@ -442,7 +442,7 @@
 {
 	settings->bar_height = height;
 	awn_applet_manager_height_changed (AWN_APPLET_MANAGER (settings->appman));
-	gtk_widget_set_size_request (settings->window, -1, height*2);
+	gtk_widget_set_size_request (settings->window, -1, (height+2)*2);
 	_position_window (settings->window);
 	gtk_window_resize(GTK_WINDOW(settings->bar), 
 				  settings->monitor.width, 
Index: src/awn-task.c
===================================================================
--- src/awn-task.c	(revision 214)
+++ src/awn-task.c	(working copy)
@@ -870,20 +870,33 @@
 		cairo_rectangle(cr, 0 , settings->bar_height, 
 				width, settings->bar_height);
 		cairo_fill(cr);
+		
+		cairo_set_source_rgba(cr, 1, 1, 1, 0.2/3);

+		cairo_rectangle(cr, 0 , settings->bar_height*2, 

+				width, settings->icon_offset);

+		cairo_fill(cr);
 	}
 	/* content */
 	if (priv->icon) {
 		double x1, y1;
+		
+		GdkPixbuf *reflect;

+		reflect = gdk_pixbuf_flip(priv->icon, FALSE);
 
 		x1 = (width-priv->icon_width)/2;
-		y1 = ((settings->bar_height + 2 - priv->icon_height)/2) + settings->bar_height + 2 + (-1 * priv->y_offset);
-		
-		y1 = settings->bar_height + (-1 * priv->y_offset);
+		y1 = settings->bar_height - priv->y_offset;
 
 		gdk_cairo_set_source_pixbuf (cr, priv->icon, x1, y1);
 		cairo_paint_with_alpha(cr, priv->alpha);
 
-
+		if( priv->y_offset >= 0 )

+		{

+			y1 = settings->bar_height + priv->icon_height + priv->y_offset;

+			gdk_cairo_set_source_pixbuf (cr, reflect, x1, y1);

+			cairo_paint_with_alpha(cr, priv->alpha/3);

+		}

+		if (reflect)

+			g_object_unref (G_OBJECT (reflect));
 	}
 
 	/* arrows */
@@ -894,7 +907,7 @@
 				   settings->arrow_color.blue,
 				   settings->arrow_color.alpha);
 	cairo_move_to(cr, x1-5, (settings->bar_height * 2));
-	cairo_line_to(cr, x1, ((settings->bar_height *2)) - 5);
+	cairo_line_to(cr, x1, (settings->bar_height *2) - 5);
 	cairo_line_to(cr, x1+5, (settings->bar_height * 2));
 	cairo_close_path (cr);
 
@@ -1606,6 +1619,8 @@
 	gint x, y;
 	gint width, height;
 
+	g_print("awn_task_refresh_icon_geometry\n");
+
 	priv = AWN_TASK_GET_PRIVATE (task);
 	if (priv->window == NULL)
 		return;
Index: src/awn-window.c
===================================================================
--- src/awn-window.c	(revision 214)
+++ src/awn-window.c	(working copy)
@@ -320,7 +320,10 @@
 	if (settings->hidden)
 		y_pos = (int)settings->monitor.height;
 	else
-		y_pos = (int) (settings->monitor.height-wh);
+		//if(settings->bar_angle == 0)

+			y_pos = (int) (settings->monitor.height-wh);

+		//else

+			//y_pos = (int) (settings->monitor.height-wh*9/8+2);
 	
 	if (stop_position) {
 		current_pos = x_pos;
Index: avant-preferences/window.glade
===================================================================
--- avant-preferences/window.glade	(revision 214)
+++ avant-preferences/window.glade	(working copy)
@@ -928,7 +928,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label2">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Task Appearence</property>
+	      <property name="label" translatable="yes">Task Appearance</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1348,7 +1348,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label4">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Bar Appearence</property>
+	      <property name="label" translatable="yes">Bar Appearance</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
Index: applets/trash/trashapplet.c
===================================================================
--- applets/trash/trashapplet.c	(revision 214)
+++ applets/trash/trashapplet.c	(working copy)
@@ -290,6 +290,7 @@
 {
 	TrashApplet *applet = TRASH_APPLET (widget);
 	gint y = (applet->height + PADDING) - applet->y_offset;
+	GdkPixbuf *reflect;
 	
 	/* Clear the background to transparent */
 	cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.0f);
@@ -298,12 +299,33 @@
 	
 	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 	
+	/*
 	if (applet->is_empty)
 	        gdk_cairo_set_source_pixbuf (cr, applet->empty_icon, PADDING, y);
         else
 	        gdk_cairo_set_source_pixbuf (cr, applet->full_icon, PADDING, y);
 	cairo_paint (cr);
+	*/
 	
+	if (applet->is_empty) {
+		gdk_cairo_set_source_pixbuf (cr, applet->empty_icon, PADDING, y);
+		reflect = gdk_pixbuf_flip(applet->empty_icon, FALSE);
+	}
+	else
+	{
+		gdk_cairo_set_source_pixbuf (cr, applet->full_icon, PADDING, y);

+		reflect = gdk_pixbuf_flip(applet->full_icon, FALSE);
+	}
+	
+	cairo_paint (cr);
+	
+	if( applet->y_offset >= 0 )

+	{

+		y = (applet->height + PADDING) + applet->height - applet->y_offset;

+		gdk_cairo_set_source_pixbuf (cr, reflect, PADDING, y);

+		cairo_paint_with_alpha(cr, 0.33);

+		//cairo_paint (cr);

+	}
 
 	if (applet->progress != 0 && applet->progress != 1) {
 		
@@ -339,6 +361,9 @@
 		cairo_show_text (cr, text);
 	        
 	}
+	
+	if (reflect)

+		g_object_unref (G_OBJECT (reflect));
 
 }
 
Index: applets/Makefile.am
===================================================================
--- applets/Makefile.am	(revision 214)
+++ applets/Makefile.am	(working copy)
@@ -1,4 +1,4 @@
-SUBDIRS = switcher trash
+SUBDIRS = switcher trash separator notification-area
 
 desktopdir = $(libdir)/awn/applets
 
Index: applets/notification-area/applet.c
===================================================================
--- applets/notification-area/applet.c	(revision 214)
+++ applets/notification-area/applet.c	(working copy)
@@ -23,6 +23,7 @@
 
 #include <libawn/awn-applet.h>
 #include <libawn/awn-applet-gconf.h>
+#include <math.h>
 
 #include "eggtraymanager.h"
 
@@ -39,7 +40,9 @@
 
 static GQuark new_quark = 0;
 static GQuark del_quark = 0;
-static gint   n_rows = 2;
+static gint   n_rows   = 0;

+static int   height    = 0; 

+static int   icon_size = 24;
 
 static void
 tray_icon_added (EggTrayManager *manager, 
@@ -72,6 +75,15 @@
   GList *children; GList *c;
   gint col = 0, row = 0;
   
+  if( n_rows == 0 ) // auto-detect how much icons can on colomn

+    {

+	n_rows = ceil(height/icon_size);

+	if( floor(height/icon_size) < 1)

+		n_rows = 1;

+

+	icon_size = (height-n_rows)/n_rows;

+  }
+  
   /* First lets go through existing icons, adding or deleting as necessary*/
   children = gtk_container_get_children (GTK_CONTAINER (applet->table));
   for (c = children; c != NULL; c = c->next)
@@ -146,7 +158,7 @@
   g_object_set_qdata (G_OBJECT (icon), del_quark, GINT_TO_POINTER (0));
 
   applet->icons = g_list_append (applet->icons, icon);
-  gtk_widget_set_size_request (icon, 24, 24);
+  gtk_widget_set_size_request (icon, icon_size, icon_size);
   tray_applet_refresh (applet);
 }
 
@@ -221,7 +233,8 @@
   g_signal_connect (app->manager, "message_cancelled",
                     G_CALLBACK (tray_icon_message_cancelled), app);
 
-  gtk_widget_set_size_request (GTK_WIDGET (applet), -1, 100);
+  height = awn_applet_get_height (applet);

+  gtk_widget_set_size_request (GTK_WIDGET (applet), -1, height* 2 );
 
   table = gtk_table_new (1, 1, FALSE);
   app->table = table;
@@ -234,8 +247,8 @@
   
   align = gtk_alignment_new (0, 0.5, 1, 0);
   app->align = align;
-  gtk_alignment_set_padding (GTK_ALIGNMENT (align), 
-                             100-awn_applet_get_height (applet),
+  gtk_alignment_set_padding (GTK_ALIGNMENT (align),
+                             height,
                              0, 0, 0); 
   
   gtk_container_add (GTK_CONTAINER (applet), align);
Index: applets/notification-area/Makefile.am
===================================================================
--- applets/notification-area/Makefile.am	(revision 214)
+++ applets/notification-area/Makefile.am	(working copy)
@@ -22,7 +22,7 @@
         $(top_builddir)/libawn/libawn.la
         
 
-notification_arealibdir = $(libdir)/awn/applets/notification/
+notification_arealibdir = $(libdir)/awn/applets/notification-area/
 notification_arealib_LTLIBRARIES = notification-area.la
 notification_area_la_SOURCES = $(NAREA_SOURCES)
 notification_area_la_LIBADD = $(NAREA_LDADD)
Index: libawn/awn-defines.h
===================================================================
--- libawn/awn-defines.h	(revision 214)
+++ libawn/awn-defines.h	(working copy)
@@ -25,7 +25,7 @@
 #define AWN_APPLET_GCONF_PATH "/apps/avant-window-navigator/applets"
 
 #define AWN_MAX_HEIGHT 100
-#define AWN_MIN_HEIGHT 32
+#define AWN_MIN_HEIGHT 12
 
 typedef enum
 {
Index: po/cs.po
===================================================================
--- po/cs.po	(revision 214)
+++ po/cs.po	(working copy)
@@ -102,7 +102,7 @@
 
 #: ../avant-preferences/window.glade.h:15
 #, fuzzy
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Panel"
 
 #: ../avant-preferences/window.glade.h:16
@@ -192,7 +192,7 @@
 
 #: ../avant-preferences/window.glade.h:36
 #, fuzzy
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Panel"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po	(revision 214)
+++ po/pt_BR.po	(working copy)
@@ -103,7 +103,7 @@
 
 #: ../avant-preferences/window.glade.h:15
 #, fuzzy
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Aparência da Barra "
 
 #: ../avant-preferences/window.glade.h:16
@@ -193,7 +193,7 @@
 
 #: ../avant-preferences/window.glade.h:36
 #, fuzzy
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Aparência da Barra "
 
 #: ../avant-preferences/window.glade.h:37
Index: po/es.po
===================================================================
--- po/es.po	(revision 214)
+++ po/es.po	(working copy)
@@ -100,7 +100,7 @@
 msgstr "Color de fondo:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Apariencia de la barra"
 
 #: ../avant-preferences/window.glade.h:16
@@ -186,7 +186,7 @@
 msgstr "Mostrar ventanas de todas las pantallas virtuales"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Aparencia de las tareas"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/it_IT.po
===================================================================
--- po/it_IT.po	(revision 214)
+++ po/it_IT.po	(working copy)
@@ -100,7 +100,7 @@
 msgstr "Colore di sfondo:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Aspetto della barra"
 
 #: ../avant-preferences/window.glade.h:16
@@ -184,7 +184,7 @@
 msgstr "Mostra le finestre di tutte le aree di lavoro"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Aspetto dei Task"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/no_NO.po
===================================================================
--- po/no_NO.po	(revision 214)
+++ po/no_NO.po	(working copy)
@@ -96,7 +96,7 @@
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:16
@@ -180,7 +180,7 @@
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:37
Index: po/en_GB.po
===================================================================
--- po/en_GB.po	(revision 214)
+++ po/en_GB.po	(working copy)
@@ -96,7 +96,7 @@
 msgstr "Background colour:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:16
@@ -180,7 +180,7 @@
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr ""
 
 #: ../avant-preferences/window.glade.h:37
Index: po/fi_FI.po
===================================================================
--- po/fi_FI.po	(revision 214)
+++ po/fi_FI.po	(working copy)
@@ -97,7 +97,7 @@
 msgstr "Taustan väri:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Palkin ulkoasu"
 
 #: ../avant-preferences/window.glade.h:16
@@ -181,7 +181,7 @@
 msgstr "Näytä ikkunat kaikilta työpöydiltä"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Tehtävien ulkoasu"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/da.po
===================================================================
--- po/da.po	(revision 214)
+++ po/da.po	(working copy)
@@ -100,7 +100,7 @@
 
 #: ../avant-preferences/window.glade.h:15
 #, fuzzy
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Panel udseende"
 
 #: ../avant-preferences/window.glade.h:16
@@ -190,7 +190,7 @@
 
 #: ../avant-preferences/window.glade.h:36
 #, fuzzy
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Panel udseende"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/ru.po
===================================================================
--- po/ru.po	(revision 214)
+++ po/ru.po	(working copy)
@@ -103,7 +103,7 @@
 
 #: ../avant-preferences/window.glade.h:15
 #, fuzzy
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Внешний вид панели"
 
 #: ../avant-preferences/window.glade.h:16
@@ -193,7 +193,7 @@
 
 #: ../avant-preferences/window.glade.h:36
 #, fuzzy
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Внешний вид панели"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/el_GR.po
===================================================================
--- po/el_GR.po	(revision 214)
+++ po/el_GR.po	(working copy)
@@ -101,7 +101,7 @@
 msgstr "Χρώμα παρασκηνίου:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Εμφάνιση Μπάρας"
 
 #: ../avant-preferences/window.glade.h:16
@@ -185,7 +185,7 @@
 msgstr "Προβολή παραθύρων από όλους τους χώρους εργασιών"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Εμφάνιση Εργασιών"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/sv.po
===================================================================
--- po/sv.po	(revision 214)
+++ po/sv.po	(working copy)
@@ -98,7 +98,7 @@
 msgstr "Bakgrundsfärg:"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Radutseende"
 
 #: ../avant-preferences/window.glade.h:16
@@ -182,7 +182,7 @@
 msgstr "Visa fönster från alla arbetsytor"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Uppgiftsutseende"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/fr_FR.po
===================================================================
--- po/fr_FR.po	(revision 214)
+++ po/fr_FR.po	(working copy)
@@ -98,7 +98,7 @@
 msgstr "Couleur d'arrière-plan :"
 
 #: ../avant-preferences/window.glade.h:15
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Apparence de la barre"
 
 #: ../avant-preferences/window.glade.h:16
@@ -184,7 +184,7 @@
 msgstr "Montrer les fenêtres de tous les bureaux virtuels"
 
 #: ../avant-preferences/window.glade.h:36
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Apparence des tâches"
 
 #: ../avant-preferences/window.glade.h:37
Index: po/de_DE.po
===================================================================
--- po/de_DE.po	(revision 214)
+++ po/de_DE.po	(working copy)
@@ -100,7 +100,7 @@
 
 #: ../avant-preferences/window.glade.h:15
 #, fuzzy
-msgid "Bar Appearence"
+msgid "Bar Appearance"
 msgstr "Design der Leiste"
 
 #: ../avant-preferences/window.glade.h:16
@@ -190,7 +190,7 @@
 
 #: ../avant-preferences/window.glade.h:36
 #, fuzzy
-msgid "Task Appearence"
+msgid "Task Appearance"
 msgstr "Design der Leiste"
 
 #: ../avant-preferences/window.glade.h:37