Mercurial > geeqie

diff src/bar_sort.c @ 41:6281cc38e5ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wed Apr 27 15:17:57 2005 John Ellis <johne@verizon.net> * bar_info.c, bar_sort.c: Update for new pref_toolbar_button args. * fullscreen.c, layout.c: Remove use of GDK_HINT_USER_SIZE as we never actually set these dimensions. Increase default size of main window. * layout_util.c: Use GTkToolbar for the main window toolbar. * pixbuf_util.[ch]: Add inline pixbufs for thumb and float icons. * rcfile.c: Add note to config file that it is autogenerated. * typedefs.h: Remove no longer used tooltip in LayoutWindow. * ui_misc.[ch]: pref_toolbar additions. * icons/icon_float.png, icons/icon_thumb.png: Icons in png format. * icons/icon_float.xpm, icons/icon_thumb.xpm: Remove xpm versions. * icons/Makefile.am: Add above icons to inline pixbuf list. ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. #####
author gqview
date Wed, 27 Apr 2005 19:29:15 +0000
parents d907d608745f
children f63ecca6c087
line wrap: on
line diff
--- a/src/bar_sort.c	Sat Apr 16 16:26:49 2005 +0000
+++ b/src/bar_sort.c	Wed Apr 27 19:29:15 2005 +0000
@@ -545,7 +545,6 @@
 GtkWidget *bar_sort_new(LayoutWindow *lw)
 {
 	SortData *sd;
-	GtkWidget *button;
 	GtkWidget *buttongrp;
 	GtkWidget *label;
 	GtkWidget *tbar;
@@ -583,43 +582,24 @@
 
 	sd->folder_group = pref_box_new(sd->vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
 
-	buttongrp = gtk_radio_button_new_with_label(NULL, _("Copy"));
-	if (sd->action == BAR_SORT_COPY) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(buttongrp), TRUE);
-	g_signal_connect(G_OBJECT(buttongrp), "clicked",
-			 G_CALLBACK(bar_sort_set_copy_cb), sd);
-	gtk_box_pack_start(GTK_BOX(sd->folder_group), buttongrp, FALSE, FALSE, 0);
-	gtk_widget_show(buttongrp);
-
-	button = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(buttongrp)), _("Move"));
-	if (sd->action == BAR_SORT_MOVE) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(bar_sort_set_move_cb), sd);
-	gtk_box_pack_start(GTK_BOX(sd->folder_group), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
-	button = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(buttongrp)), _("Link"));
-
-	if (sd->action == BAR_SORT_LINK) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(bar_sort_set_link_cb), sd);
-	gtk_box_pack_start(GTK_BOX(sd->folder_group), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
+	buttongrp = pref_radiobutton_new(sd->folder_group, NULL,
+					 _("Copy"), (sd->action == BAR_SORT_COPY),
+					 G_CALLBACK(bar_sort_set_copy_cb), sd);
+	pref_radiobutton_new(sd->folder_group, buttongrp,
+			     _("Move"), (sd->action == BAR_SORT_MOVE),
+			     G_CALLBACK(bar_sort_set_move_cb), sd);
+	pref_radiobutton_new(sd->folder_group, buttongrp,
+			     _("Link"), (sd->action == BAR_SORT_LINK),
+			     G_CALLBACK(bar_sort_set_link_cb), sd);
 
 	sd->collection_group = pref_box_new(sd->vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
 
-	buttongrp = gtk_radio_button_new_with_label(NULL, _("Add image"));
-	if (sd->selection == BAR_SORT_SELECTION_IMAGE) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(buttongrp), TRUE);
-	g_signal_connect(G_OBJECT(buttongrp), "clicked",
-			 G_CALLBACK(bar_sort_set_selection_image_cb), sd);
-	gtk_box_pack_start(GTK_BOX(sd->collection_group), buttongrp, FALSE, FALSE, 0);
-	gtk_widget_show(buttongrp);
-
-	button = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(buttongrp)), _("Add selection"));
-	if (sd->selection == BAR_SORT_SELECTION_SELECTED) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(bar_sort_set_selection_selected_cb), sd);
-	gtk_box_pack_start(GTK_BOX(sd->collection_group), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
+	buttongrp = pref_radiobutton_new(sd->collection_group, NULL,
+					 _("Add image"), (sd->selection == BAR_SORT_SELECTION_IMAGE),
+					 G_CALLBACK(bar_sort_set_selection_image_cb), sd);
+	pref_radiobutton_new(sd->collection_group, buttongrp,
+			     _("Add selection"), (sd->selection == BAR_SORT_SELECTION_SELECTED),
+			     G_CALLBACK(bar_sort_set_selection_selected_cb), sd);
 
 	sd->bookmarks = bookmark_list_new(SORT_KEY_FOLDERS, bar_sort_bookmark_select, sd);
 	gtk_box_pack_start(GTK_BOX(sd->vbox), sd->bookmarks, TRUE, TRUE, 0);
@@ -627,10 +607,10 @@
 
 	tbar = pref_toolbar_new(sd->vbox, GTK_TOOLBAR_ICONS);
 
-	sd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL,
+	sd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE,
 					     _("Add Bookmark"),
 					     G_CALLBACK(bar_sort_add_cb), sd);
-	sd->undo_button = pref_toolbar_button(tbar, GTK_STOCK_UNDO, NULL,
+	sd->undo_button = pref_toolbar_button(tbar, GTK_STOCK_UNDO, NULL, FALSE,
 					      _("Undo last image"),
 					      G_CALLBACK(bar_sort_undo_cb), sd);