Mercurial > geeqie.yaz

comparison src/layout.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 17acca639a86
children 0ef72a64930b
comparison
equal deleted inserted replaced
40:dcc04a6a58bf 41:6281cc38e5ca
29 #include "ui_misc.h" 29 #include "ui_misc.h"
30 #include "ui_tabcomp.h" 30 #include "ui_tabcomp.h"
31 31
32 #include "icons/tools.xpm" 32 #include "icons/tools.xpm"
33 33
34 #define MAINWINDOW_DEF_WIDTH 620 34 #define MAINWINDOW_DEF_WIDTH 700
35 #define MAINWINDOW_DEF_HEIGHT 400 35 #define MAINWINDOW_DEF_HEIGHT 500
36 36
37 #define MAIN_WINDOW_DIV_HPOS -1 37 #define MAIN_WINDOW_DIV_HPOS 270
38 #define MAIN_WINDOW_DIV_VPOS 200 38 #define MAIN_WINDOW_DIV_VPOS 200
39 39
40 #define TOOLWINDOW_DEF_WIDTH 260 40 #define TOOLWINDOW_DEF_WIDTH 260
41 #define TOOLWINDOW_DEF_HEIGHT 450 41 #define TOOLWINDOW_DEF_HEIGHT 450
42 #define PROGRESS_WIDTH 150 42 #define PROGRESS_WIDTH 150
169 static GtkWidget *layout_tool_setup(LayoutWindow *lw) 169 static GtkWidget *layout_tool_setup(LayoutWindow *lw)
170 { 170 {
171 GtkWidget *box; 171 GtkWidget *box;
172 GtkWidget *menu_bar; 172 GtkWidget *menu_bar;
173 GtkWidget *tabcomp; 173 GtkWidget *tabcomp;
174 #if 0
175 GtkWidget *popwin;
176 #endif
177 174
178 box = gtk_vbox_new(FALSE, 0); 175 box = gtk_vbox_new(FALSE, 0);
179 176
180 menu_bar = layout_actions_menu_bar(lw); 177 menu_bar = layout_actions_menu_bar(lw);
181 gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0); 178 gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0);
189 layout_path_entry_cb, lw); 186 layout_path_entry_cb, lw);
190 tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw); 187 tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw);
191 gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0); 188 gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
192 gtk_widget_show(tabcomp); 189 gtk_widget_show(tabcomp);
193 190
194 #if 0
195 popwin = gtk_widget_get_toplevel(GTK_COMBO(tabcomp)->list);
196 #endif
197 g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed", 191 g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed",
198 G_CALLBACK(layout_path_entry_changed_cb), lw); 192 G_CALLBACK(layout_path_entry_changed_cb), lw);
199 193
200 if (lw->tree_view) 194 if (lw->tree_view)
201 { 195 {
1087 G_CALLBACK(layout_tools_delete_cb), lw); 1081 G_CALLBACK(layout_tools_delete_cb), lw);
1088 layout_keyboard_init(lw, lw->tools); 1082 layout_keyboard_init(lw, lw->tools);
1089 1083
1090 if (save_window_positions) 1084 if (save_window_positions)
1091 { 1085 {
1092 hints = GDK_HINT_USER_POS | GDK_HINT_USER_SIZE; 1086 hints = GDK_HINT_USER_POS;
1093 } 1087 }
1094 else 1088 else
1095 { 1089 {
1096 hints = 0; 1090 hints = 0;
1097 } 1091 }
1399 lw->info_sort = NULL; 1393 lw->info_sort = NULL;
1400 lw->info_status = NULL; 1394 lw->info_status = NULL;
1401 lw->info_details = NULL; 1395 lw->info_details = NULL;
1402 lw->info_zoom = NULL; 1396 lw->info_zoom = NULL;
1403 1397
1404 #if 0
1405 if (lw->menu_fact) g_object_unref(G_OBJECT(lw->menu_fact));
1406 lw->menu_fact = NULL;
1407 #endif
1408 if (lw->ui_manager) g_object_unref(lw->ui_manager); 1398 if (lw->ui_manager) g_object_unref(lw->ui_manager);
1409 lw->ui_manager = NULL; 1399 lw->ui_manager = NULL;
1410 lw->action_group = NULL; 1400 lw->action_group = NULL;
1411 1401
1412 gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box); 1402 gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box);
1591 g_source_remove(lw->last_time_id); 1581 g_source_remove(lw->last_time_id);
1592 } 1582 }
1593 1583
1594 layout_bars_close(lw); 1584 layout_bars_close(lw);
1595 1585
1596 #if 0
1597 if (lw->menu_fact) g_object_unref(G_OBJECT(lw->menu_fact));
1598 #endif
1599 if (lw->tooltips) g_object_unref(G_OBJECT(lw->tooltips));
1600 gtk_widget_destroy(lw->window); 1586 gtk_widget_destroy(lw->window);
1601 1587
1602 g_free(lw->path); 1588 g_free(lw->path);
1603 1589
1604 g_free(lw); 1590 g_free(lw);
1673 1659
1674 window_set_icon(lw->window, NULL, NULL); 1660 window_set_icon(lw->window, NULL, NULL);
1675 1661
1676 if (save_window_positions) 1662 if (save_window_positions)
1677 { 1663 {
1678 hints = GDK_HINT_USER_POS | GDK_HINT_USER_SIZE; 1664 hints = GDK_HINT_USER_POS;
1679 } 1665 }
1680 else 1666 else
1681 { 1667 {
1682 hints = 0; 1668 hints = 0;
1683 } 1669 }
1706 g_signal_connect(G_OBJECT(lw->window), "delete_event", 1692 g_signal_connect(G_OBJECT(lw->window), "delete_event",
1707 G_CALLBACK(layout_delete_cb), lw); 1693 G_CALLBACK(layout_delete_cb), lw);
1708 1694
1709 layout_keyboard_init(lw, lw->window); 1695 layout_keyboard_init(lw, lw->window);
1710 1696
1711 #if 0
1712 gtk_widget_realize(lw->window);
1713 #endif
1714
1715 lw->tooltips = gtk_tooltips_new();
1716 g_object_ref(G_OBJECT(lw->tooltips));
1717 gtk_object_sink(GTK_OBJECT(lw->tooltips));
1718
1719 lw->main_box = gtk_vbox_new(FALSE, 0); 1697 lw->main_box = gtk_vbox_new(FALSE, 0);
1720 gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box); 1698 gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
1721 gtk_widget_show(lw->main_box); 1699 gtk_widget_show(lw->main_box);
1722 1700
1723 layout_grid_setup(lw); 1701 layout_grid_setup(lw);