diff src/layout.c @ 41:6281cc38e5ca

Wed Apr 27 15:17:57 2005 John Ellis <[e-mail]> * 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. #####

--- a/src/layout.c	Sat Apr 16 16:26:49 2005 +0000
+++ b/src/layout.c	Wed Apr 27 19:29:15 2005 +0000
@@ -31,10 +31,10 @@
 
 #include "icons/tools.xpm"
 
-#define MAINWINDOW_DEF_WIDTH 620
-#define MAINWINDOW_DEF_HEIGHT 400
+#define MAINWINDOW_DEF_WIDTH 700
+#define MAINWINDOW_DEF_HEIGHT 500
 
-#define MAIN_WINDOW_DIV_HPOS -1
+#define MAIN_WINDOW_DIV_HPOS 270
 #define MAIN_WINDOW_DIV_VPOS 200
 
 #define TOOLWINDOW_DEF_WIDTH 260
@@ -171,9 +171,6 @@
 	GtkWidget *box;
 	GtkWidget *menu_bar;
 	GtkWidget *tabcomp;
-#if 0
-	GtkWidget *popwin;
-#endif
 
 	box = gtk_vbox_new(FALSE, 0);
 
@@ -191,9 +188,6 @@
 	gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
 	gtk_widget_show(tabcomp);
 
-#if 0
-	popwin = gtk_widget_get_toplevel(GTK_COMBO(tabcomp)->list);
-#endif
 	g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed",
 			 G_CALLBACK(layout_path_entry_changed_cb), lw);
 
@@ -1089,7 +1083,7 @@
 
 		if (save_window_positions)
 			{
-			hints = GDK_HINT_USER_POS | GDK_HINT_USER_SIZE;
+			hints = GDK_HINT_USER_POS;
 			}
 		else
 			{
@@ -1401,10 +1395,6 @@
 	lw->info_details = NULL;
 	lw->info_zoom = NULL;
 
-#if 0
-	if (lw->menu_fact) g_object_unref(G_OBJECT(lw->menu_fact));
-	lw->menu_fact = NULL;
-#endif
 	if (lw->ui_manager) g_object_unref(lw->ui_manager);
 	lw->ui_manager = NULL;
 	lw->action_group = NULL;
@@ -1593,10 +1583,6 @@
 
 	layout_bars_close(lw);
 
-#if 0
-	if (lw->menu_fact) g_object_unref(G_OBJECT(lw->menu_fact));
-#endif
-	if (lw->tooltips) g_object_unref(G_OBJECT(lw->tooltips));
 	gtk_widget_destroy(lw->window);
 
 	g_free(lw->path);
@@ -1675,7 +1661,7 @@
 
 	if (save_window_positions)
 		{
-		hints = GDK_HINT_USER_POS | GDK_HINT_USER_SIZE;
+		hints = GDK_HINT_USER_POS;
 		}
 	else
 		{
@@ -1708,14 +1694,6 @@
 
 	layout_keyboard_init(lw, lw->window);
 
-#if 0
-	gtk_widget_realize(lw->window);
-#endif
-
-	lw->tooltips = gtk_tooltips_new();
-	g_object_ref(G_OBJECT(lw->tooltips));
-	gtk_object_sink(GTK_OBJECT(lw->tooltips));
-
 	lw->main_box = gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
 	gtk_widget_show(lw->main_box);