Skip to content

GitLab

Files
Files
Commit 1d3d4a1e authored by Cosimo Cecchi's avatar Cosimo Cecchi
Browse files
Options

all: remove 'Tighter Layout' option 

It's just broken, and we already have icon view if we want something
tighter.
parent 822b99ee
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 261 deletions
libnautilus-private/nautilus-global-preferences.h
View file @ 1d3d4a1e
......@@ -111,7 +111,6 @@ enum
/* Icon View */
#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT "default-use-tighter-layout"
#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level"
#define NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS "labels-beside-icons"
......
libnautilus-private/nautilus-icon-canvas-item.c
View file @ 1d3d4a1e
......@@ -53,7 +53,6 @@
#define LABEL_LINE_SPACING 0
#define MAX_TEXT_WIDTH_STANDARD 135
#define MAX_TEXT_WIDTH_TIGHTER 80
#define MAX_TEXT_WIDTH_BESIDE 90
#define MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM 150
......@@ -2176,28 +2175,20 @@ nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item)
canvas_item = EEL_CANVAS_ITEM (item);
container = NAUTILUS_ICON_CONTAINER (canvas_item->canvas);
if (nautilus_icon_container_is_tighter_layout (container)) {
return MAX_TEXT_WIDTH_TIGHTER * canvas_item->canvas->pixels_per_unit;
} else {
if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
if (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L) {
if (container->details->all_columns_same_width) {
return MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM * canvas_item->canvas->pixels_per_unit;
} else {
return -1;
}
if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
if (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L) {
if (container->details->all_columns_same_width) {
return MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM * canvas_item->canvas->pixels_per_unit;
} else {
return MAX_TEXT_WIDTH_BESIDE * canvas_item->canvas->pixels_per_unit;
return -1;
}
} else {
return MAX_TEXT_WIDTH_STANDARD * canvas_item->canvas->pixels_per_unit;
}
} else {
return MAX_TEXT_WIDTH_BESIDE * canvas_item->canvas->pixels_per_unit;
}
} else {
return MAX_TEXT_WIDTH_STANDARD * canvas_item->canvas->pixels_per_unit;
}
}
void
......
libnautilus-private/nautilus-icon-container.c
View file @ 1d3d4a1e
......@@ -1273,7 +1273,6 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
double max_height_above, max_height_below;
double height_above, height_below;
double line_width;
gboolean gridded_layout;
double grid_width;
double max_text_width, max_icon_width;
int icon_width;
......@@ -1309,8 +1308,6 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
} else {
grid_width = STANDARD_ICON_GRID_WIDTH;
}
gridded_layout = !nautilus_icon_container_is_tighter_layout (container);
line_width = container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE ? ICON_PAD_LEFT : 0;
line_start = icons;
......@@ -1330,13 +1327,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
icon_bounds = nautilus_icon_canvas_item_get_icon_rectangle (icon->item);
text_bounds = nautilus_icon_canvas_item_get_text_rectangle (icon->item, TRUE);
if (gridded_layout) {
icon_width = ceil ((bounds.x1 - bounds.x0)/grid_width) * grid_width;
} else {
icon_width = (bounds.x1 - bounds.x0) + ICON_PAD_RIGHT + 8; /* 8 pixels extra for fancy selection box */
}
icon_width = ceil ((bounds.x1 - bounds.x0)/grid_width) * grid_width;
/* Calculate size above/below baseline */
height_above = icon_bounds.y1 - bounds.y0;
......@@ -1381,11 +1372,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
position->height = icon_bounds.y1 - icon_bounds.y0;
if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
if (gridded_layout) {
position->x_offset = max_icon_width + ICON_PAD_LEFT + ICON_PAD_RIGHT - (icon_bounds.x1 - icon_bounds.x0);
} else {
position->x_offset = icon_width - ((icon_bounds.x1 - icon_bounds.x0) + (text_bounds.x1 - text_bounds.x0));
}
position->x_offset = max_icon_width + ICON_PAD_LEFT + ICON_PAD_RIGHT - (icon_bounds.x1 - icon_bounds.x0);
position->y_offset = 0;
} else {
position->x_offset = (icon_width - (icon_bounds.x1 - icon_bounds.x0)) / 2;
......@@ -2033,7 +2020,7 @@ lay_down_icons_vertical_desktop (NautilusIconContainer *container, GList *icons)
int icon_height_for_bound_check;
gboolean should_snap;
should_snap = !(container->details->tighter_layout && !container->details->keep_aligned);
should_snap = container->details->keep_aligned;
y = DESKTOP_PAD_VERTICAL;
......@@ -7917,35 +7904,6 @@ nautilus_icon_container_set_auto_layout (NautilusIconContainer *container,
g_signal_emit (container, signals[LAYOUT_CHANGED], 0);
}
/* Toggle the tighter layout boolean. */
void
nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container,
gboolean tighter_layout)
{
g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
g_return_if_fail (tighter_layout == FALSE || tighter_layout == TRUE);
if (container->details->tighter_layout == tighter_layout) {
return;
}
container->details->tighter_layout = tighter_layout;
if (container->details->auto_layout) {
invalidate_label_sizes (container);
redo_layout (container);
g_signal_emit (container, signals[LAYOUT_CHANGED], 0);
} else {
/* in manual layout, label sizes still change, even though
* the icons don't move.
*/
invalidate_label_sizes (container);
nautilus_icon_container_request_update_all (container);
}
}
gboolean
nautilus_icon_container_is_keep_aligned (NautilusIconContainer *container)
{
......@@ -8083,14 +8041,6 @@ nautilus_icon_container_is_auto_layout (NautilusIconContainer *container)
return container->details->auto_layout;
}
gboolean
nautilus_icon_container_is_tighter_layout (NautilusIconContainer *container)
{
g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
return container->details->tighter_layout;
}
static void
pending_icon_to_rename_destroy_callback (NautilusIconCanvasItem *item, NautilusIconContainer *container)
{
......
libnautilus-private/nautilus-icon-container.h
View file @ 1d3d4a1e
......@@ -267,9 +267,6 @@ void nautilus_icon_container_end_loading (Nautilu
gboolean nautilus_icon_container_is_auto_layout (NautilusIconContainer *container);
void nautilus_icon_container_set_auto_layout (NautilusIconContainer *container,
gboolean auto_layout);
gboolean nautilus_icon_container_is_tighter_layout (NautilusIconContainer *container);
void nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container,
gboolean tighter_layout);
gboolean nautilus_icon_container_is_keep_aligned (NautilusIconContainer *container);
void nautilus_icon_container_set_keep_aligned (NautilusIconContainer *container,
......
libnautilus-private/nautilus-metadata.c
View file @ 1d3d4a1e
......@@ -30,7 +30,6 @@ static char *used_metadata_names[] = {
NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
NAUTILUS_METADATA_KEY_ICON_VIEW_ZOOM_LEVEL,
NAUTILUS_METADATA_KEY_ICON_VIEW_AUTO_LAYOUT,
NAUTILUS_METADATA_KEY_ICON_VIEW_TIGHTER_LAYOUT,
NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_BY,
NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_REVERSED,
NAUTILUS_METADATA_KEY_ICON_VIEW_KEEP_ALIGNED,
......
libnautilus-private/nautilus-metadata.h
View file @ 1d3d4a1e
......@@ -41,7 +41,6 @@
#define NAUTILUS_METADATA_KEY_ICON_VIEW_ZOOM_LEVEL "nautilus-icon-view-zoom-level"
#define NAUTILUS_METADATA_KEY_ICON_VIEW_AUTO_LAYOUT "nautilus-icon-view-auto-layout"
#define NAUTILUS_METADATA_KEY_ICON_VIEW_TIGHTER_LAYOUT "nautilus-icon-view-tighter-layout"
#define NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_BY "nautilus-icon-view-sort-by"
#define NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_REVERSED "nautilus-icon-view-sort-reversed"
#define NAUTILUS_METADATA_KEY_ICON_VIEW_KEEP_ALIGNED "nautilus-icon-view-keep-aligned"
......
libnautilus-private/nautilus.convert
View file @ 1d3d4a1e
......@@ -26,7 +26,6 @@ show-hidden-files = /desktop/gnome/file_views/show_hidden_files
[org.gnome.nautilus.icon-view]
captions = /apps/nautilus/icon_view/captions
default-use-tighter-layout = /apps/nautilus/icon_view/default_use_tighter_layout
labels-beside-icons = /apps/nautilus/icon_view/labels_beside_icons
default-zoom-level = /apps/nautilus/icon_view/default_zoom_level
thumbnail-size = /apps/nautilus/icon_view/thumbnail_size
......
libnautilus-private/org.gnome.nautilus.gschema.xml.in
View file @ 1d3d4a1e
......@@ -216,11 +216,6 @@
"size", "type", "date_modified", "date_changed", "date_accessed", "owner",
"group", "permissions", "octal_permissions" and "mime_type".</_description>
</key>
<key name="default-use-tighter-layout" type="b">
<default>false</default>
<_summary>Use tighter layout in new windows</_summary>
<_description>If true, icons will be laid out tighter by default in new windows.</_description>
</key>
<key name="labels-beside-icons" type="b">
<default>false</default>
<_summary>Put labels beside icons</_summary>
......
src/nautilus-actions.h
View file @ 1d3d4a1e
......@@ -122,7 +122,6 @@
#define NAUTILUS_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
#define NAUTILUS_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
#define NAUTILUS_ACTION_MANUAL_LAYOUT "Manual Layout"
#define NAUTILUS_ACTION_TIGHTER_LAYOUT "Tighter Layout"
#define NAUTILUS_ACTION_REVERSED_ORDER "Reversed Order"
#define NAUTILUS_ACTION_CLEAN_UP "Clean Up"
#define NAUTILUS_ACTION_KEEP_ALIGNED "Keep Aligned"
......
src/nautilus-convert-metadata.c
View file @ 1d3d4a1e
......@@ -94,7 +94,6 @@ static struct {
{"background_tile_image", "metadata::" NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_IMAGE},
{"icon_view_zoom_level", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_ZOOM_LEVEL},
{"icon_view_auto_layout", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_AUTO_LAYOUT},
{"icon_view_tighter_layout", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_TIGHTER_LAYOUT},
{"icon_view_sort_by", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_BY},
{"icon_view_sort_reversed", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_SORT_REVERSED},
{"icon_view_keep_aligned", "metadata::" NAUTILUS_METADATA_KEY_ICON_VIEW_KEEP_ALIGNED},
......
src/nautilus-file-management-properties.c
View file @ 1d3d4a1e
......@@ -54,7 +54,6 @@
/* bool preferences */
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET "sort_folders_first_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET "compact_layout_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH "all_columns_same_width_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
......@@ -748,9 +747,6 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
create_date_format_menu (builder);
/* setup preferences */
bind_builder_bool (builder, nautilus_icon_view_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET,
NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT);
bind_builder_bool (builder, nautilus_icon_view_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET,
NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS);
......
src/nautilus-file-management-properties.ui
View file @ 1d3d4a1e
......@@ -599,24 +599,6 @@
<property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="compact_layout_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Use compact layout</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="labels_beside_icons_checkbutton">
<property name="visible">True</property>
......
src/nautilus-icon-view-ui.xml
View file @ 1d3d4a1e
......@@ -18,7 +18,6 @@
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Tighter Layout" action="Tighter Layout"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
......@@ -40,7 +39,6 @@
<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
</placeholder>
<separator name="Layout separator"/>
<menuitem name="Tighter Layout" action="Tighter Layout"/>
<menuitem name="Reversed Order" action="Reversed Order"/>
</menu>
<menuitem name="Clean Up" action="Clean Up"/>
......
src/nautilus-icon-view.c
View file @ 1d3d4a1e
......@@ -183,9 +183,6 @@ static void nautilus_icon_view_set_zoom_level (Nau
NautilusZoomLevel new_level,
gboolean always_emit);
static void nautilus_icon_view_update_click_mode (NautilusIconView *icon_view);
static void nautilus_icon_view_set_directory_tighter_layout (NautilusIconView *icon_view,
NautilusFile *file,
gboolean tighter_layout);
static gboolean nautilus_icon_view_supports_scaling (NautilusIconView *icon_view);
static void nautilus_icon_view_reveal_selection (NautilusView *view);
static const SortCriterion *get_sort_criterion_by_sort_type (NautilusFileSortType sort_type);
......@@ -402,28 +399,6 @@ action_clean_up_callback (GtkAction *action, gpointer callback_data)
nautilus_icon_view_clean_up (NAUTILUS_ICON_VIEW (callback_data));
}
static void
set_tighter_layout (NautilusIconView *icon_view, gboolean new_value)
{
nautilus_icon_view_set_directory_tighter_layout (icon_view,
nautilus_view_get_directory_as_file
(NAUTILUS_VIEW (icon_view)),
new_value);
nautilus_icon_container_set_tighter_layout (get_icon_container (icon_view),
new_value);
}
static void
action_tighter_layout_callback (GtkAction *action,
gpointer user_data)
{
g_assert (NAUTILUS_IS_ICON_VIEW (user_data));
set_tighter_layout (NAUTILUS_ICON_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
}
static gboolean
nautilus_icon_view_using_auto_layout (NautilusIconView *icon_view)
{
......@@ -431,13 +406,6 @@ nautilus_icon_view_using_auto_layout (NautilusIconView *icon_view)
(get_icon_container (icon_view));
}
static gboolean
nautilus_icon_view_using_tighter_layout (NautilusIconView *icon_view)
{
return nautilus_icon_container_is_tighter_layout
(get_icon_container (icon_view));
}
static void
action_sort_radio_callback (GtkAction *action,
GtkRadioAction *current,
......@@ -647,12 +615,6 @@ nautilus_icon_view_supports_labels_beside_icons (NautilusIconView *view)
return view->details->supports_labels_beside_icons;
}
static gboolean
nautilus_icon_view_supports_tighter_layout (NautilusIconView *view)
{
return !nautilus_icon_view_is_compact (view);
}
static void
update_layout_menus (NautilusIconView *view)
{
......@@ -675,13 +637,6 @@ update_layout_menus (NautilusIconView *view)
action_name);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
action = gtk_action_group_get_action (view->details->icon_action_group,
NAUTILUS_ACTION_TIGHTER_LAYOUT);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
nautilus_icon_view_using_tighter_layout (view));
gtk_action_set_sensitive (action, nautilus_icon_view_supports_tighter_layout (view));
gtk_action_set_visible (action, nautilus_icon_view_supports_tighter_layout (view));
action = gtk_action_group_get_action (view->details->icon_action_group,
NAUTILUS_ACTION_REVERSED_ORDER);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
......@@ -944,61 +899,6 @@ nautilus_icon_view_real_set_directory_auto_layout (NautilusIconView *icon_view,
TRUE,
auto_layout);
}
/* maintainence of tighter layout boolean */
static gboolean
nautilus_icon_view_get_directory_tighter_layout (NautilusIconView *icon_view,
NautilusFile *file)
{
return EEL_CALL_METHOD_WITH_RETURN_VALUE
(NAUTILUS_ICON_VIEW_CLASS, icon_view,
get_directory_tighter_layout, (icon_view, file));
}
static gboolean
get_default_directory_tighter_layout (void)
{
return g_settings_get_boolean (nautilus_icon_view_preferences,
NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT);
}
static gboolean
nautilus_icon_view_real_get_directory_tighter_layout (NautilusIconView *icon_view,
NautilusFile *file)
{
if (!nautilus_icon_view_supports_tighter_layout (icon_view)) {
return FALSE;
}
return nautilus_file_get_boolean_metadata
(file,
NAUTILUS_METADATA_KEY_ICON_VIEW_TIGHTER_LAYOUT,
get_default_directory_tighter_layout ());
}
static void
nautilus_icon_view_set_directory_tighter_layout (NautilusIconView *icon_view,
NautilusFile *file,
gboolean tighter_layout)
{
EEL_CALL_METHOD (NAUTILUS_ICON_VIEW_CLASS, icon_view,
set_directory_tighter_layout, (icon_view, file, tighter_layout));
}
static void
nautilus_icon_view_real_set_directory_tighter_layout (NautilusIconView *icon_view,
NautilusFile *file,
gboolean tighter_layout)
{
if (!nautilus_icon_view_supports_tighter_layout (icon_view)) {
return;
}
nautilus_file_set_boolean_metadata
(file, NAUTILUS_METADATA_KEY_ICON_VIEW_TIGHTER_LAYOUT,
get_default_directory_tighter_layout (),
tighter_layout);
}
static gboolean
set_sort_reversed (NautilusIconView *icon_view,
......@@ -1156,9 +1056,6 @@ nautilus_icon_view_begin_loading (NautilusView *view)
nautilus_icon_container_set_keep_aligned
(get_icon_container (icon_view),
nautilus_icon_view_get_directory_keep_aligned (icon_view, file));
nautilus_icon_container_set_tighter_layout
(get_icon_container (icon_view),
nautilus_icon_view_get_directory_tighter_layout (icon_view, file));
set_labels_beside_icons (icon_view);
set_columns_same_width (icon_view);
......@@ -1454,10 +1351,6 @@ layout_changed_callback (NautilusIconContainer *container,
(icon_view,
file,
nautilus_icon_view_using_auto_layout (icon_view));
nautilus_icon_view_set_directory_tighter_layout
(icon_view,
file,
nautilus_icon_view_using_tighter_layout (icon_view));
}
update_layout_menus (icon_view);
......@@ -1503,11 +1396,6 @@ static const GtkActionEntry icon_view_entries[] = {
};
static const GtkToggleActionEntry icon_view_toggle_entries[] = {
/* name, stock id */ { "Tighter Layout", NULL,
/* label, accelerator */ N_("Compact _Layout"), NULL,
/* tooltip */ N_("Toggle using a tighter layout scheme"),
G_CALLBACK (action_tighter_layout_callback),
0 },
/* name, stock id */ { "Reversed Order", NULL,
/* label, accelerator */ N_("Re_versed Order"), NULL,
/* tooltip */ N_("Display icons in the opposite order"),
......@@ -1692,8 +1580,6 @@ nautilus_icon_view_reset_to_defaults (NautilusView *view)
clear_sort_criterion (icon_view);
nautilus_icon_container_set_keep_aligned
(icon_container, get_default_directory_keep_aligned ());
nautilus_icon_container_set_tighter_layout
(icon_container, get_default_directory_tighter_layout ());
nautilus_icon_container_sort (icon_container);
......@@ -2470,27 +2356,6 @@ default_sort_in_reverse_order_changed_callback (gpointer callback_data)
nautilus_icon_container_request_update_all (icon_container);
}
static void
default_use_tighter_layout_changed_callback (gpointer callback_data)
{
NautilusIconView *icon_view;
NautilusFile *file;
NautilusIconContainer *icon_container;
g_return_if_fail (NAUTILUS_IS_ICON_VIEW (callback_data));
icon_view = NAUTILUS_ICON_VIEW (callback_data);
file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (icon_view));
icon_container = get_icon_container (icon_view);
g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (icon_container));
nautilus_icon_container_set_tighter_layout (icon_container,
nautilus_icon_view_get_directory_tighter_layout (icon_view, file));
nautilus_icon_container_request_update_all (icon_container);
}
static void
default_zoom_level_changed_callback (gpointer callback_data)
{
......@@ -2890,9 +2755,6 @@ nautilus_icon_view_finalize (GObject *object)
image_display_policy_changed_callback,
icon_view);
g_signal_handlers_disconnect_by_func (nautilus_icon_view_preferences,
default_use_tighter_layout_changed_callback,
icon_view);
g_signal_handlers_disconnect_by_func (nautilus_icon_view_preferences,
default_zoom_level_changed_callback,
icon_view);
......@@ -2970,11 +2832,9 @@ nautilus_icon_view_class_init (NautilusIconViewClass *klass)
klass->get_directory_auto_layout = nautilus_icon_view_real_get_directory_auto_layout;
klass->get_directory_sort_by = nautilus_icon_view_real_get_directory_sort_by;
klass->get_directory_sort_reversed = nautilus_icon_view_real_get_directory_sort_reversed;
klass->get_directory_tighter_layout = nautilus_icon_view_real_get_directory_tighter_layout;
klass->set_directory_auto_layout = nautilus_icon_view_real_set_directory_auto_layout;
klass->set_directory_sort_by = nautilus_icon_view_real_set_directory_sort_by;
klass->set_directory_sort_reversed = nautilus_icon_view_real_set_directory_sort_reversed;
klass->set_directory_tighter_layout = nautilus_icon_view_real_set_directory_tighter_layout;
properties[PROP_COMPACT] =
g_param_spec_boolean ("compact",
......@@ -3047,10 +2907,6 @@ nautilus_icon_view_init (NautilusIconView *icon_view)
G_CALLBACK (image_display_policy_changed_callback),
icon_view);
g_signal_connect_swapped (nautilus_icon_view_preferences,
"changed::" NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT,
G_CALLBACK (default_use_tighter_layout_changed_callback),
icon_view);
g_signal_connect_swapped (nautilus_icon_view_preferences,
"changed::" NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
G_CALLBACK (default_zoom_level_changed_callback),
......
src/nautilus-icon-view.h
View file @ 1d3d4a1e
......@@ -79,12 +79,6 @@ struct NautilusIconViewClass {
NautilusFile *file,
gboolean auto_layout);
gboolean (* get_directory_tighter_layout) (NautilusIconView *icon_view,
NautilusFile *file);
void (* set_directory_tighter_layout) (NautilusIconView *icon_view,
NautilusFile *file,
gboolean tighter_layout);
/* Override "clean_up" if your subclass has its own notion of where icons should be positioned */
void (* clean_up) (NautilusIconView *icon_view);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment