Mercurial > geeqie

comparison src/main.c @ 338:41c3cb73120f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename window options (moved to layout) and re-order rc file.
author zas_
date Sat, 12 Apr 2008 19:33:59 +0000
parents df868b947aa0
children 77103f3f2cb1
comparison
equal deleted inserted replaced
337:0565ee45b8ac 338:41c3cb73120f
960 } 960 }
961 #endif 961 #endif
962 else if (strcmp(cmd_line, "+t") == 0 || 962 else if (strcmp(cmd_line, "+t") == 0 ||
963 strcmp(cmd_line, "--with-tools") == 0) 963 strcmp(cmd_line, "--with-tools") == 0)
964 { 964 {
965 options->tools_float = FALSE; 965 options->layout.tools_float = FALSE;
966 options->tools_hidden = FALSE; 966 options->layout.tools_hidden = FALSE;
967 967
968 remote_list = g_list_append(remote_list, "+t"); 968 remote_list = g_list_append(remote_list, "+t");
969 } 969 }
970 else if (strcmp(cmd_line, "-t") == 0 || 970 else if (strcmp(cmd_line, "-t") == 0 ||
971 strcmp(cmd_line, "--without-tools") == 0) 971 strcmp(cmd_line, "--without-tools") == 0)
972 { 972 {
973 options->tools_hidden = TRUE; 973 options->layout.tools_hidden = TRUE;
974 974
975 remote_list = g_list_append(remote_list, "-t"); 975 remote_list = g_list_append(remote_list, "-t");
976 } 976 }
977 else if (strcmp(cmd_line, "-f") == 0 || 977 else if (strcmp(cmd_line, "-f") == 0 ||
978 strcmp(cmd_line, "--fullscreen") == 0) 978 strcmp(cmd_line, "--fullscreen") == 0)
1196 1196
1197 collect_manager_flush(); 1197 collect_manager_flush();
1198 1198
1199 if (layout_valid(&lw)) 1199 if (layout_valid(&lw))
1200 { 1200 {
1201 options->main_window_maximized = window_maximized(lw->window); 1201 options->layout.main_window.maximized = window_maximized(lw->window);
1202 if (!options->main_window_maximized) 1202 if (!options->layout.main_window.maximized)
1203 { 1203 {
1204 layout_geometry_get(NULL, &options->main_window_x, &options->main_window_y, 1204 layout_geometry_get(NULL, &options->layout.main_window.x, &options->layout.main_window.y,
1205 &options->main_window_w, &options->main_window_h); 1205 &options->layout.main_window.w, &options->layout.main_window.h);
1206 } 1206 }
1207 options->fullscreen.show_info = image_osd_get(lw->image, NULL, NULL); 1207 options->fullscreen.show_info = image_osd_get(lw->image, NULL, NULL);
1208 } 1208 }
1209 1209
1210 layout_geometry_get_dividers(NULL, &options->window_hdivider_pos, &options->window_vdivider_pos); 1210 layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos);
1211 1211
1212 layout_views_get(NULL, &options->layout.view_as_tree, &options->layout.view_as_icons); 1212 layout_views_get(NULL, &options->layout.view_as_tree, &options->layout.view_as_icons);
1213 1213
1214 options->thumbnails.enabled = layout_thumb_get(NULL); 1214 options->thumbnails.enabled = layout_thumb_get(NULL);
1215 layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending); 1215 layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending);
1216 1216
1217 layout_geometry_get_tools(NULL, &options->float_window_x, &options->float_window_y, 1217 layout_geometry_get_tools(NULL, &options->layout.float_window.x, &options->layout.float_window.y,
1218 &options->float_window_w, &options->float_window_h, &options->float_window_divider); 1218 &options->layout.float_window.w, &options->layout.float_window.h, &options->layout.float_window.vdivider_pos);
1219 layout_tools_float_get(NULL, &options->tools_float, &options->tools_hidden); 1219 layout_tools_float_get(NULL, &options->layout.tools_float, &options->layout.tools_hidden);
1220 options->toolbar_hidden = layout_toolbar_hidden(NULL); 1220 options->layout.toolbar_hidden = layout_toolbar_hidden(NULL);
1221 1221
1222 options->color_profile.enabled = layout_image_color_profile_get_use(NULL); 1222 options->color_profile.enabled = layout_image_color_profile_get_use(NULL);
1223 layout_image_color_profile_get(NULL, 1223 layout_image_color_profile_get(NULL,
1224 &options->color_profile.input_type, 1224 &options->color_profile.input_type,
1225 &options->color_profile.screen_type, 1225 &options->color_profile.screen_type,
1391 else 1391 else
1392 { 1392 {
1393 path = get_current_dir(); 1393 path = get_current_dir();
1394 } 1394 }
1395 1395
1396 lw = layout_new_with_geometry(NULL, options->tools_float, options->tools_hidden, geometry); 1396 lw = layout_new_with_geometry(NULL, options->layout.tools_float, options->layout.tools_hidden, geometry);
1397 layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending); 1397 layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending);
1398 1398
1399 if (collection_list && !startup_command_line_collection) 1399 if (collection_list && !startup_command_line_collection)
1400 { 1400 {
1401 GList *work; 1401 GList *work;