Commit b20ff7a5 authored by Cosimo Cecchi's avatar Cosimo Cecchi

Move icon views outside of src/file-manager

Part of the final step towards removing src/file-manager completely;
only code shuffling around, not any real code change.
parent e1ca0591
......@@ -64,6 +64,7 @@ nautilus_SOURCES = \
nautilus-actions.h \
nautilus-application.c \
nautilus-application.h \
nautilus-audio-mime-types.h \
nautilus-bookmark-list.c \
nautilus-bookmark-list.h \
nautilus-bookmarks-window.c \
......@@ -73,10 +74,18 @@ nautilus_SOURCES = \
nautilus-connect-server-dialog-nonmain.c \
nautilus-connect-server-operation.c \
nautilus-connect-server-operation.h \
nautilus-desktop-icon-view.c \
nautilus-desktop-icon-view.h \
nautilus-desktop-window.c \
nautilus-desktop-window.h \
nautilus-error-reporting.c \
nautilus-error-reporting.h \
nautilus-file-management-properties.c \
nautilus-file-management-properties.h \
nautilus-icon-view.c \
nautilus-icon-view.h \
nautilus-icon-view-container.c \
nautilus-icon-view-container.h \
nautilus-image-properties-page.c \
nautilus-image-properties-page.h \
nautilus-location-bar.c \
......
......@@ -16,17 +16,8 @@ INCLUDES = \
$(NULL)
libnautilus_file_manager_la_SOURCES= \
fm-actions.h \
fm-desktop-icon-view.c \
fm-desktop-icon-view.h \
fm-ditem-page.c \
fm-ditem-page.h \
fm-error-reporting.c \
fm-error-reporting.h \
fm-icon-container.c \
fm-icon-container.h \
fm-icon-view.c \
fm-icon-view.h \
fm-list-model.c \
fm-list-model.h \
fm-list-view-private.h \
......@@ -34,7 +25,6 @@ libnautilus_file_manager_la_SOURCES= \
fm-list-view.h \
fm-properties-window.c \
fm-properties-window.h \
nautilus-audio-mime-types.h \
$(NULL)
EMPTY_VIEW_SOURCES = \
......
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-actions.h
*
* Copyright (C) 2004 Red Hat, Inc
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors: Alexander Larsson < alexl@redhat.com>
*/
#ifndef FM_ACTIONS_H
#define FM_ACTIONS_H
#define FM_ACTION_OPEN "Open"
#define FM_ACTION_OPEN_ALTERNATE "OpenAlternate"
#define FM_ACTION_OPEN_IN_NEW_TAB "OpenInNewTab"
#define FM_ACTION_OPEN_FOLDER_WINDOW "OpenFolderWindow"
#define FM_ACTION_LOCATION_OPEN_ALTERNATE "LocationOpenAlternate"
#define FM_ACTION_LOCATION_OPEN_IN_NEW_TAB "LocationOpenInNewTab"
#define FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW "LocationOpenFolderWindow"
#define FM_ACTION_OTHER_APPLICATION1 "OtherApplication1"
#define FM_ACTION_OTHER_APPLICATION2 "OtherApplication2"
#define FM_ACTION_NEW_FOLDER "New Folder"
#define FM_ACTION_PROPERTIES "Properties"
#define FM_ACTION_PROPERTIES_ACCEL "PropertiesAccel"
#define FM_ACTION_LOCATION_PROPERTIES "LocationProperties"
#define FM_ACTION_NO_TEMPLATES "No Templates"
#define FM_ACTION_EMPTY_TRASH "Empty Trash"
#define FM_ACTION_SAVE_SEARCH "Save Search"
#define FM_ACTION_SAVE_SEARCH_AS "Save Search As"
#define FM_ACTION_CUT "Cut"
#define FM_ACTION_LOCATION_CUT "LocationCut"
#define FM_ACTION_COPY "Copy"
#define FM_ACTION_LOCATION_COPY "LocationCopy"
#define FM_ACTION_PASTE "Paste"
#define FM_ACTION_PASTE_FILES_INTO "Paste Files Into"
#define FM_ACTION_COPY_TO_NEXT_PANE "Copy to next pane"
#define FM_ACTION_MOVE_TO_NEXT_PANE "Move to next pane"
#define FM_ACTION_COPY_TO_HOME "Copy to Home"
#define FM_ACTION_MOVE_TO_HOME "Move to Home"
#define FM_ACTION_COPY_TO_DESKTOP "Copy to Desktop"
#define FM_ACTION_MOVE_TO_DESKTOP "Move to Desktop"
#define FM_ACTION_LOCATION_PASTE_FILES_INTO "LocationPasteFilesInto"
#define FM_ACTION_NEW_LAUNCHER "New Launcher"
#define FM_ACTION_NEW_LAUNCHER_DESKTOP "New Launcher Desktop"
#define FM_ACTION_RENAME "Rename"
#define FM_ACTION_DUPLICATE "Duplicate"
#define FM_ACTION_CREATE_LINK "Create Link"
#define FM_ACTION_SELECT_ALL "Select All"
#define FM_ACTION_INVERT_SELECTION "Invert Selection"
#define FM_ACTION_SELECT_PATTERN "Select Pattern"
#define FM_ACTION_TRASH "Trash"
#define FM_ACTION_LOCATION_TRASH "LocationTrash"
#define FM_ACTION_DELETE "Delete"
#define FM_ACTION_LOCATION_DELETE "LocationDelete"
#define FM_ACTION_RESTORE_FROM_TRASH "Restore From Trash"
#define FM_ACTION_LOCATION_RESTORE_FROM_TRASH "LocationRestoreFromTrash"
#define FM_ACTION_SHOW_HIDDEN_FILES "Show Hidden Files"
#define FM_ACTION_CONNECT_TO_SERVER_LINK "Connect To Server Link"
#define FM_ACTION_MOUNT_VOLUME "Mount Volume"
#define FM_ACTION_UNMOUNT_VOLUME "Unmount Volume"
#define FM_ACTION_EJECT_VOLUME "Eject Volume"
#define FM_ACTION_START_VOLUME "Start Volume"
#define FM_ACTION_STOP_VOLUME "Stop Volume"
#define FM_ACTION_POLL "Poll"
#define FM_ACTION_SELF_MOUNT_VOLUME "Self Mount Volume"
#define FM_ACTION_SELF_UNMOUNT_VOLUME "Self Unmount Volume"
#define FM_ACTION_SELF_EJECT_VOLUME "Self Eject Volume"
#define FM_ACTION_SELF_START_VOLUME "Self Start Volume"
#define FM_ACTION_SELF_STOP_VOLUME "Self Stop Volume"
#define FM_ACTION_SELF_POLL "Self Poll"
#define FM_ACTION_LOCATION_MOUNT_VOLUME "Location Mount Volume"
#define FM_ACTION_LOCATION_UNMOUNT_VOLUME "Location Unmount Volume"
#define FM_ACTION_LOCATION_EJECT_VOLUME "Location Eject Volume"
#define FM_ACTION_LOCATION_START_VOLUME "Location Start Volume"
#define FM_ACTION_LOCATION_STOP_VOLUME "Location Stop Volume"
#define FM_ACTION_LOCATION_POLL "Location Poll"
#define FM_ACTION_SCRIPTS "Scripts"
#define FM_ACTION_NEW_DOCUMENTS "New Documents"
#define FM_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
#define FM_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
#define FM_ACTION_MANUAL_LAYOUT "Manual Layout"
#define FM_ACTION_TIGHTER_LAYOUT "Tighter Layout"
#define FM_ACTION_REVERSED_ORDER "Reversed Order"
#define FM_ACTION_CLEAN_UP "Clean Up"
#define FM_ACTION_KEEP_ALIGNED "Keep Aligned"
#define FM_ACTION_ARRANGE_ITEMS "Arrange Items"
#define FM_ACTION_STRETCH "Stretch"
#define FM_ACTION_UNSTRETCH "Unstretch"
#define FM_ACTION_ZOOM_ITEMS "Zoom Items"
#define FM_ACTION_SORT_TRASH_TIME "Sort by Trash Time"
#endif /* FM_ACTIONS_H */
......@@ -29,8 +29,8 @@
#include "fm-list-view.h"
#include <string.h>
#include "fm-error-reporting.h"
#include "fm-list-model.h"
#include "nautilus-error-reporting.h"
#include "nautilus-view-dnd.h"
#include "nautilus-view-factory.h"
......
......@@ -27,7 +27,7 @@
#include "fm-properties-window.h"
#include "fm-ditem-page.h"
#include "fm-error-reporting.h"
#include "nautilus-error-reporting.h"
#include "nautilus-mime-actions.h"
#include <gtk/gtk.h>
......
......@@ -53,4 +53,83 @@
#define NAUTILUS_ACTION_FOLDER_WINDOW "Folder Window"
#define NAUTILUS_ACTION_NEW_TAB "New Tab"
#define FM_ACTION_OPEN "Open"
#define FM_ACTION_OPEN_ALTERNATE "OpenAlternate"
#define FM_ACTION_OPEN_IN_NEW_TAB "OpenInNewTab"
#define FM_ACTION_OPEN_FOLDER_WINDOW "OpenFolderWindow"
#define FM_ACTION_LOCATION_OPEN_ALTERNATE "LocationOpenAlternate"
#define FM_ACTION_LOCATION_OPEN_IN_NEW_TAB "LocationOpenInNewTab"
#define FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW "LocationOpenFolderWindow"
#define FM_ACTION_OTHER_APPLICATION1 "OtherApplication1"
#define FM_ACTION_OTHER_APPLICATION2 "OtherApplication2"
#define FM_ACTION_NEW_FOLDER "New Folder"
#define FM_ACTION_PROPERTIES "Properties"
#define FM_ACTION_PROPERTIES_ACCEL "PropertiesAccel"
#define FM_ACTION_LOCATION_PROPERTIES "LocationProperties"
#define FM_ACTION_NO_TEMPLATES "No Templates"
#define FM_ACTION_EMPTY_TRASH "Empty Trash"
#define FM_ACTION_SAVE_SEARCH "Save Search"
#define FM_ACTION_SAVE_SEARCH_AS "Save Search As"
#define FM_ACTION_CUT "Cut"
#define FM_ACTION_LOCATION_CUT "LocationCut"
#define FM_ACTION_COPY "Copy"
#define FM_ACTION_LOCATION_COPY "LocationCopy"
#define FM_ACTION_PASTE "Paste"
#define FM_ACTION_PASTE_FILES_INTO "Paste Files Into"
#define FM_ACTION_COPY_TO_NEXT_PANE "Copy to next pane"
#define FM_ACTION_MOVE_TO_NEXT_PANE "Move to next pane"
#define FM_ACTION_COPY_TO_HOME "Copy to Home"
#define FM_ACTION_MOVE_TO_HOME "Move to Home"
#define FM_ACTION_COPY_TO_DESKTOP "Copy to Desktop"
#define FM_ACTION_MOVE_TO_DESKTOP "Move to Desktop"
#define FM_ACTION_LOCATION_PASTE_FILES_INTO "LocationPasteFilesInto"
#define FM_ACTION_NEW_LAUNCHER "New Launcher"
#define FM_ACTION_NEW_LAUNCHER_DESKTOP "New Launcher Desktop"
#define FM_ACTION_RENAME "Rename"
#define FM_ACTION_DUPLICATE "Duplicate"
#define FM_ACTION_CREATE_LINK "Create Link"
#define FM_ACTION_SELECT_ALL "Select All"
#define FM_ACTION_INVERT_SELECTION "Invert Selection"
#define FM_ACTION_SELECT_PATTERN "Select Pattern"
#define FM_ACTION_TRASH "Trash"
#define FM_ACTION_LOCATION_TRASH "LocationTrash"
#define FM_ACTION_DELETE "Delete"
#define FM_ACTION_LOCATION_DELETE "LocationDelete"
#define FM_ACTION_RESTORE_FROM_TRASH "Restore From Trash"
#define FM_ACTION_LOCATION_RESTORE_FROM_TRASH "LocationRestoreFromTrash"
#define FM_ACTION_SHOW_HIDDEN_FILES "Show Hidden Files"
#define FM_ACTION_CONNECT_TO_SERVER_LINK "Connect To Server Link"
#define FM_ACTION_MOUNT_VOLUME "Mount Volume"
#define FM_ACTION_UNMOUNT_VOLUME "Unmount Volume"
#define FM_ACTION_EJECT_VOLUME "Eject Volume"
#define FM_ACTION_START_VOLUME "Start Volume"
#define FM_ACTION_STOP_VOLUME "Stop Volume"
#define FM_ACTION_POLL "Poll"
#define FM_ACTION_SELF_MOUNT_VOLUME "Self Mount Volume"
#define FM_ACTION_SELF_UNMOUNT_VOLUME "Self Unmount Volume"
#define FM_ACTION_SELF_EJECT_VOLUME "Self Eject Volume"
#define FM_ACTION_SELF_START_VOLUME "Self Start Volume"
#define FM_ACTION_SELF_STOP_VOLUME "Self Stop Volume"
#define FM_ACTION_SELF_POLL "Self Poll"
#define FM_ACTION_LOCATION_MOUNT_VOLUME "Location Mount Volume"
#define FM_ACTION_LOCATION_UNMOUNT_VOLUME "Location Unmount Volume"
#define FM_ACTION_LOCATION_EJECT_VOLUME "Location Eject Volume"
#define FM_ACTION_LOCATION_START_VOLUME "Location Start Volume"
#define FM_ACTION_LOCATION_STOP_VOLUME "Location Stop Volume"
#define FM_ACTION_LOCATION_POLL "Location Poll"
#define FM_ACTION_SCRIPTS "Scripts"
#define FM_ACTION_NEW_DOCUMENTS "New Documents"
#define FM_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
#define FM_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
#define FM_ACTION_MANUAL_LAYOUT "Manual Layout"
#define FM_ACTION_TIGHTER_LAYOUT "Tighter Layout"
#define FM_ACTION_REVERSED_ORDER "Reversed Order"
#define FM_ACTION_CLEAN_UP "Clean Up"
#define FM_ACTION_KEEP_ALIGNED "Keep Aligned"
#define FM_ACTION_ARRANGE_ITEMS "Arrange Items"
#define FM_ACTION_STRETCH "Stretch"
#define FM_ACTION_UNSTRETCH "Unstretch"
#define FM_ACTION_ZOOM_ITEMS "Zoom Items"
#define FM_ACTION_SORT_TRASH_TIME "Sort by Trash Time"
#endif /* NAUTILUS_ACTIONS_H */
......@@ -30,14 +30,14 @@
#include "nautilus-application.h"
#include "file-manager/fm-desktop-icon-view.h"
#include "file-manager/fm-icon-view.h"
#include "file-manager/fm-list-view.h"
#if ENABLE_EMPTY_VIEW
#include "file-manager/fm-empty-view.h"
#endif /* ENABLE_EMPTY_VIEW */
#include "nautilus-desktop-icon-view.h"
#include "nautilus-desktop-window.h"
#include "nautilus-icon-view.h"
#include "nautilus-image-properties-page.h"
#include "nautilus-navigation-window.h"
#include "nautilus-navigation-window-slot.h"
......
......@@ -26,9 +26,10 @@
#include <config.h>
#include "fm-icon-container.h"
#include "fm-desktop-icon-view.h"
#include "fm-actions.h"
#include "nautilus-desktop-icon-view.h"
#include "nautilus-actions.h"
#include "nautilus-icon-view-container.h"
#include "nautilus-view-factory.h"
#include "nautilus-view.h"
......
......@@ -25,7 +25,7 @@
#ifndef FM_DESKTOP_ICON_VIEW_H
#define FM_DESKTOP_ICON_VIEW_H
#include "fm-icon-view.h"
#include "nautilus-icon-view.h"
#define FM_TYPE_DESKTOP_ICON_VIEW fm_desktop_icon_view_get_type()
#define FM_DESKTOP_ICON_VIEW(obj) \
......
......@@ -24,7 +24,8 @@
*/
#include <config.h>
#include "fm-error-reporting.h"
#include "nautilus-error-reporting.h"
#include <string.h>
#include <glib/gi18n.h>
......
......@@ -23,6 +23,8 @@
*/
#include <config.h>
#include "nautilus-icon-view-container.h"
#include <string.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
......@@ -32,8 +34,6 @@
#include <libnautilus-private/nautilus-thumbnails.h>
#include <libnautilus-private/nautilus-desktop-icon-file.h>
#include "fm-icon-container.h"
#define ICON_TEXT_ATTRIBUTES_NUM_ITEMS 3
#define ICON_TEXT_ATTRIBUTES_DEFAULT_TOKENS "size,date_modified,type"
......
......@@ -25,8 +25,9 @@
#ifndef FM_ICON_CONTAINER_H
#define FM_ICON_CONTAINER_H
#include "nautilus-icon-view.h"
#include <libnautilus-private/nautilus-icon-container.h>
#include "fm-icon-view.h"
typedef struct FMIconContainer FMIconContainer;
typedef struct FMIconContainerClass FMIconContainerClass;
......
......@@ -23,12 +23,13 @@
*/
#include <config.h>
#include "fm-icon-view.h"
#include "fm-actions.h"
#include "fm-icon-container.h"
#include "fm-desktop-icon-view.h"
#include "fm-error-reporting.h"
#include "nautilus-icon-view.h"
#include "nautilus-actions.h"
#include "nautilus-icon-view-container.h"
#include "nautilus-desktop-icon-view.h"
#include "nautilus-error-reporting.h"
#include "nautilus-view-dnd.h"
#include "nautilus-view-factory.h"
......
......@@ -30,9 +30,9 @@
#include <config.h>
#include "nautilus-view-dnd.h"
#include "nautilus-view.h"
#include "file-manager/fm-desktop-icon-view.h"
#include "nautilus-desktop-icon-view.h"
#include "nautilus-view.h"
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
......
......@@ -32,11 +32,11 @@
#include "nautilus-view.h"
#include "file-manager/fm-list-view.h"
#include "file-manager/fm-desktop-icon-view.h"
#include "file-manager/fm-actions.h"
#include "file-manager/fm-error-reporting.h"
#include "file-manager/fm-properties-window.h"
#include "nautilus-actions.h"
#include "nautilus-desktop-icon-view.h"
#include "nautilus-error-reporting.h"
#include "nautilus-mime-actions.h"
#include "nautilus-src-marshal.h"
......
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