[gTweakUI-cvs] gtweakui/src menus.c menus.glade

[Daniel J. <tw...@us...>]

Update of /cvsroot/gtweakui/gtweakui/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1214/src

Modified Files:
	menus.c menus.glade 
Log Message:
Updated translations


Index: menus.c
===================================================================
RCS file: /cvsroot/gtweakui/gtweakui/src/menus.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** menus.c	12 Aug 2004 00:50:05 -0000	1.10
--- menus.c	12 Aug 2004 01:37:09 -0000	1.11
***************
*** 92,96 ****
  	g_object_unref(bar);
  }
! 
  void toolbarStyle(const char *style) {
  	static const char *senum[] = {"both", "both-horiz", "icons", "text"};
--- 92,96 ----
  	g_object_unref(bar);
  }
! /*
  void toolbarStyle(const char *style) {
  	static const char *senum[] = {"both", "both-horiz", "icons", "text"};
***************
*** 103,107 ****
  		val = 0;
  
! 	gtk_toolbar_set_style(GTK_TOOLBAR(xmlg(ws, "tbar")), styles[val]);
  }
  
--- 103,107 ----
  		val = 0;
  
! //	gtk_toolbar_set_style(GTK_TOOLBAR(xmlg(ws, "tbar")), styles[val]);
  }
  
***************
*** 111,114 ****
--- 111,115 ----
  }
  
+ */
  static void toolbarCallback (GConfClient* client, guint cnxn_id, GConfEntry* entry, gpointer data) {
  	if ((gconf_entry_get_value (entry) != NULL) && gconf_entry_get_value (entry)->type == GCONF_VALUE_BOOL)
***************
*** 203,212 ****
  	if (!gconf_client_get_bool (gc, "/desktop/gnome/interface/toolbar_detachable", NULL))
  		showhandle('t', FALSE);
! 
  	gconf_client_notify_add(gc, "/desktop/gnome/interface/toolbar_style", toolbarStyleCallback, NULL, NULL, NULL);
  
- 	gtk_toolbar_insert(GTK_TOOLBAR(xmlg(ws, "tbar")), gtk_tool_button_new_from_stock(GTK_STOCK_NEW), -1);
- 	gtk_toolbar_insert(GTK_TOOLBAR(xmlg(ws, "tbar")), gtk_tool_button_new_from_stock(GTK_STOCK_OPEN), -1);
- 	gtk_toolbar_insert(GTK_TOOLBAR(xmlg(ws, "tbar")), gtk_tool_button_new_from_stock(GTK_STOCK_SAVE), -1);
  	
  	val = gconf_client_get_string (gc, "/desktop/gnome/interface/toolbar_style", NULL);
--- 204,210 ----
  	if (!gconf_client_get_bool (gc, "/desktop/gnome/interface/toolbar_detachable", NULL))
  		showhandle('t', FALSE);
! /*
  	gconf_client_notify_add(gc, "/desktop/gnome/interface/toolbar_style", toolbarStyleCallback, NULL, NULL, NULL);
  
  	
  	val = gconf_client_get_string (gc, "/desktop/gnome/interface/toolbar_style", NULL);
***************
*** 215,218 ****
--- 213,223 ----
  		g_free(val);
  	}
+ */
+ 	w = xmlg(ws, "tbar");
+ 	gtk_toolbar_insert(GTK_TOOLBAR(w), gtk_tool_button_new_from_stock(GTK_STOCK_NEW), -1);
+ 	gtk_toolbar_insert(GTK_TOOLBAR(w), gtk_tool_button_new_from_stock(GTK_STOCK_OPEN), -1);
+ 	gtk_toolbar_insert(GTK_TOOLBAR(w), gtk_tool_button_new_from_stock(GTK_STOCK_SAVE), -1);
+ 
+ 	gtk_toolbar_unset_style(GTK_TOOLBAR(xmlg(ws, "tbar")));
  
  	gtk_widget_show_all(xmlg(ws, "menus"));

Index: menus.glade
===================================================================
RCS file: /cvsroot/gtweakui/gtweakui/src/menus.glade,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** menus.glade	12 Aug 2004 00:50:05 -0000	1.9
--- menus.glade	12 Aug 2004 01:37:09 -0000	1.10
***************
*** 366,382 ****
  			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
  			      <property name="tooltips">True</property>
! 			      <property name="show_arrow">True</property>
! 
! 			      <child>
! 				<placeholder/>
! 			      </child>
! 
! 			      <child>
! 				<placeholder/>
! 			      </child>
! 
! 			      <child>
! 				<placeholder/>
! 			      </child>
  			    </widget>
  			  </child>
--- 366,370 ----
  			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
  			      <property name="tooltips">True</property>
! 			      <property name="show_arrow">False</property>
  			    </widget>
  			  </child>