Commit 73d794aa authored by Pierre Wieser's avatar Pierre Wieser

NactClipboard class is renamed to FMAClipboard

+ cosmetic changes in the class headers
parent a466ea22
......@@ -79,8 +79,8 @@ fma_config_tool_SOURCES = \
fma-assistant-export.h \
fma-assistant-import.c \
fma-assistant-import.h \
nact-clipboard.c \
nact-clipboard.h \
fma-clipboard.c \
fma-clipboard.h \
nact-confirm-logout.c \
nact-confirm-logout.h \
nact-export-ask.c \
......
......@@ -33,7 +33,7 @@
/**
* SECTION: base_assistant
* @short_description: #BaseAssistant class definition.
* @include: nact/base-assistant.h
* @include: ui/base-assistant.h
*
* This class is derived from BaseWindow class, and serves as a base
* class for all FileManager-Actions assistants.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: base_builder
* @short_description: #BaseBuilder class definition.
* @include: nact/base-builder.h
* @include: ui/base-builder.h
*
* This class is derived from GtkBuilder class. It adds to it two
* features:
......
......@@ -34,7 +34,7 @@
* SECTION: base-dialog
* @title: BaseDialog
* @short_description: The BaseDialog dialog base class definition
* @include: base-dialog.h
* @include: ui/base-dialog.h
*
* This class is derived from BaseWindow class, and serves as a base
* class for all FileManager-Actions dialogs.
......
......@@ -34,7 +34,7 @@
* SECTION: base-gtk-utils
* @title: BaseGtkUtils
* @short_description: Gtk helper functions
* @include: base-gtk-utils.h
* @include: ui/base-gtk-utils.h
*/
#include "base-window.h"
......
......@@ -33,7 +33,7 @@
/**
* SECTION: base_isession
* @short_description: #BaseISession interface definition.
* @include: nact/base-isession.h
* @include: ui/base-isession.h
*
* This interface implements the features needed to monitor the end of the
* session, thus letting the application react if some modifications need
......
......@@ -31,13 +31,9 @@
#define __UI_BASE_KEYSYMS_H__
/**
* SECTION: base_window
* @short_description: #BaseWindow public function declaration.
* @include: nact/base-window.h
*
* This is a base class which encapsulates a Gtk+ windows.
* It works together with the BaseApplication class to run a Gtk+
* application.
* SECTION: base_keysyms
* @short_description: Keys declarations.
* @include: ui/base-keysyms.h
*/
#include <gtk/gtk.h>
......
......@@ -34,7 +34,7 @@
* SECTION: base-window
* @title: BaseWindow
* @short_description: the BaseWindow base window class definition
* @include: base-window.h
* @include: ui/base-window.h
*
* This is a base class which manages a Gtk+ toplevel.
*
......
......@@ -33,7 +33,7 @@
/**
* SECTION: fma_add_capability_dialog
* @short_description: #FMAAddCapabilityDialog class definition.
* @include: nact/fma-add-capability-dialog.h
* @include: ui/fma-add-capability-dialog.h
*
* The dialog let the user pick a capability from the default list
* when adding a new capability to a profile (resp. an action, a menu).
......
......@@ -33,7 +33,7 @@
/**
* SECTION: fma_add_scheme_dialog
* @short_description: #FMAAddSchemeDialog class definition.
* @include: nact/fma-add-scheme-dialog.h
* @include: ui/fma-add-scheme-dialog.h
*
* The dialog let the user pick a scheme from the default list
* when adding a new scheme to a profile (resp. an action, a menu).
......
......@@ -33,7 +33,7 @@
/**
* SECTION: fma_application
* @short_description: #FMAApplication class definition.
* @include: nact/fma-application.h
* @include: ui/fma-application.h
*
* This is the main class for filemanager-actions-config-tool program.
*
......
......@@ -82,9 +82,9 @@ struct _FMAAssistantExportPrivate {
typedef struct {
FMAObjectItem *item;
GSList *msg;
gchar *fname;
gchar *format;
GSList *msg;
gchar *fname;
gchar *format;
}
ExportStruct;
......@@ -94,29 +94,29 @@ static const gchar *st_wsp_name = IPREFS_EXPORT_ASSISTANT_WSP;
static BaseAssistantClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( FMAAssistantExportClass *klass );
static void ioptions_list_iface_init( FMAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_formats( const FMAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_formats( const FMAIOptionsList *instance, GtkWidget *container, GList *formats );
static GType register_type( void );
static void class_init( FMAAssistantExportClass *klass );
static void ioptions_list_iface_init( FMAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_formats( const FMAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_formats( const FMAIOptionsList *instance, GtkWidget *container, GList *formats );
static FMAIOption *ioptions_list_get_ask_option( const FMAIOptionsList *instance, GtkWidget *container );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_constructed( GObject *instance );
static void instance_dispose( GObject *instance );
static void instance_finalize( GObject *instance );
static void on_base_initialize_gtk_toplevel( FMAAssistantExport *window, GtkAssistant *toplevel, void *empty );
static void items_tree_view_initialize_gtk( FMAAssistantExport *window, GtkAssistant *toplevel );
static void folder_chooser_initialize_gtk( FMAAssistantExport *window );
static void format_tree_view_initialize_gtk( FMAAssistantExport *window );
static void on_base_initialize_base_window( FMAAssistantExport *window, void *empty );
static void on_base_all_widgets_showed( FMAAssistantExport *window, void *empty );
static void on_items_tree_view_selection_changed( FMAAssistantExport *window, GList *selected_items, gpointer user_data );
static void on_folder_chooser_selection_changed( GtkFileChooser *chooser, FMAAssistantExport *window );
static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
static void assist_prepare_confirm( FMAAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
static void assist_prepare_exportdone( FMAAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
static void free_results( GList *list );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_constructed( GObject *instance );
static void instance_dispose( GObject *instance );
static void instance_finalize( GObject *instance );
static void on_base_initialize_gtk_toplevel( FMAAssistantExport *window, GtkAssistant *toplevel, void *empty );
static void items_tree_view_initialize_gtk( FMAAssistantExport *window, GtkAssistant *toplevel );
static void folder_chooser_initialize_gtk( FMAAssistantExport *window );
static void format_tree_view_initialize_gtk( FMAAssistantExport *window );
static void on_base_initialize_base_window( FMAAssistantExport *window, void *empty );
static void on_base_all_widgets_showed( FMAAssistantExport *window, void *empty );
static void on_items_tree_view_selection_changed( FMAAssistantExport *window, GList *selected_items, gpointer user_data );
static void on_folder_chooser_selection_changed( GtkFileChooser *chooser, FMAAssistantExport *window );
static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
static void assist_prepare_confirm( FMAAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
static void assist_prepare_exportdone( FMAAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
static void free_results( GList *list );
GType
fma_assistant_export_get_type( void )
......
......@@ -33,7 +33,7 @@
/**
* SECTION: fma_assistant_export
* @short_description: #FMAAssistantExport class definition.
* @include: nact/fma-assistant-export.h
* @include: ui/fma-assistant-export.h
*
* Rationale:
*
......
......@@ -84,7 +84,7 @@ struct _FMAAssistantImportPrivate {
gboolean dispose_has_run;
GtkWidget *file_chooser;
GtkTreeView *duplicates_listview;
FMAIOption *mode;
FMAIOption *mode;
GList *results;
GList *overriden;
};
......@@ -95,35 +95,35 @@ static const gchar *st_wsp_name = IPREFS_IMPORT_ASSISTANT_WSP;
static BaseAssistantClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( FMAAssistantImportClass *klass );
static void ioptions_list_iface_init( FMAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_modes( const FMAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_modes( const FMAIOptionsList *instance, GtkWidget *container, GList *modes );
static GType register_type( void );
static void class_init( FMAAssistantImportClass *klass );
static void ioptions_list_iface_init( FMAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_modes( const FMAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_modes( const FMAIOptionsList *instance, GtkWidget *container, GList *modes );
static FMAIOption *ioptions_list_get_ask_option( const FMAIOptionsList *instance, GtkWidget *container );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *application );
static void instance_finalize( GObject *application );
static void on_base_initialize_gtk( FMAAssistantImport *dialog );
static void create_duplicates_treeview_model( FMAAssistantImport *dialog );
static void on_base_initialize_base_window( FMAAssistantImport *dialog );
static void runtime_init_intro( FMAAssistantImport *window, GtkAssistant *assistant );
static void runtime_init_file_selector( FMAAssistantImport *window, GtkAssistant *assistant );
static void on_file_selection_changed( GtkFileChooser *chooser, gpointer user_data );
static gboolean has_loadable_files( GSList *uris );
static void runtime_init_duplicates( FMAAssistantImport *window, GtkAssistant *assistant );
static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
static void prepare_confirm( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget *page );
static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *application );
static void instance_finalize( GObject *application );
static void on_base_initialize_gtk( FMAAssistantImport *dialog );
static void create_duplicates_treeview_model( FMAAssistantImport *dialog );
static void on_base_initialize_base_window( FMAAssistantImport *dialog );
static void runtime_init_intro( FMAAssistantImport *window, GtkAssistant *assistant );
static void runtime_init_file_selector( FMAAssistantImport *window, GtkAssistant *assistant );
static void on_file_selection_changed( GtkFileChooser *chooser, gpointer user_data );
static gboolean has_loadable_files( GSList *uris );
static void runtime_init_duplicates( FMAAssistantImport *window, GtkAssistant *assistant );
static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
static void prepare_confirm( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget *page );
static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
static FMAObjectItem *check_for_existence( const FMAObjectItem *, NactMainWindow *window );
static void prepare_importdone( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget *page );
static void free_results( GList *list );
static void prepare_importdone( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget *page );
static void free_results( GList *list );
static GtkWidget *find_widget_from_page( GtkWidget *page, const gchar *name );
static GtkTreeView *get_duplicates_treeview_from_assistant_import( FMAAssistantImport *window );
static GtkTreeView *get_duplicates_treeview_from_page( GtkWidget *page );
static GtkWidget *find_widget_from_page( GtkWidget *page, const gchar *name );
static GtkTreeView *get_duplicates_treeview_from_assistant_import( FMAAssistantImport *window );
static GtkTreeView *get_duplicates_treeview_from_page( GtkWidget *page );
GType
fma_assistant_import_get_type( void )
......
......@@ -33,7 +33,7 @@
/**
* SECTION: fma_assistant_import
* @short_description: #FMAAssistantImport class definition.
* @include: nact/fma-assistant-import.h
* @include: ui/fma-assistant-import.h
*/
#include "base-assistant.h"
......
......@@ -27,13 +27,13 @@
* ... and many others (see AUTHORS)
*/
#ifndef __UI_NACT_CLIPBOARD_H__
#define __UI_NACT_CLIPBOARD_H__
#ifndef __UI_FMA_CLIPBOARD_H__
#define __UI_FMA_CLIPBOARD_H__
/*
* SECTION: nact_clipboard.
* @short_description: #NactClipboard class definition.
* @include: nact/nact-clipboard.h
* SECTION: fma_clipboard.
* @short_description: #FMAClipboard class definition.
* @include: ui/fma-clipboard.h
*
* This is just a convenience class to extract clipboard functions
* from main window code. There is a unique object which manages all
......@@ -46,39 +46,39 @@
G_BEGIN_DECLS
#define NACT_TYPE_CLIPBOARD ( nact_clipboard_get_type())
#define NACT_CLIPBOARD( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_CLIPBOARD, NactClipboard ))
#define NACT_CLIPBOARD_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_CLIPBOARD, NactClipboardClass ))
#define NACT_IS_CLIPBOARD( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_CLIPBOARD ))
#define NACT_IS_CLIPBOARD_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_CLIPBOARD ))
#define NACT_CLIPBOARD_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_CLIPBOARD, NactClipboardClass ))
#define FMA_TYPE_CLIPBOARD ( fma_clipboard_get_type())
#define FMA_CLIPBOARD( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, FMA_TYPE_CLIPBOARD, FMAClipboard ))
#define FMA_CLIPBOARD_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_TYPE_CLIPBOARD, FMAClipboardClass ))
#define FMA_IS_CLIPBOARD( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_TYPE_CLIPBOARD ))
#define FMA_IS_CLIPBOARD_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_CLIPBOARD ))
#define FMA_CLIPBOARD_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_TYPE_CLIPBOARD, FMAClipboardClass ))
typedef struct _NactClipboardPrivate NactClipboardPrivate;
typedef struct _FMAClipboardPrivate FMAClipboardPrivate;
typedef struct {
/*< private >*/
GObject parent;
NactClipboardPrivate *private;
GObject parent;
FMAClipboardPrivate *private;
}
NactClipboard;
FMAClipboard;
typedef struct _NactClipboardClassPrivate NactClipboardClassPrivate;
typedef struct _FMAClipboardClassPrivate FMAClipboardClassPrivate;
typedef struct {
/*< private >*/
GObjectClass parent;
NactClipboardClassPrivate *private;
GObjectClass parent;
FMAClipboardClassPrivate *private;
}
NactClipboardClass;
FMAClipboardClass;
/* drag and drop formats
*/
enum {
NACT_XCHANGE_FORMAT_NACT = 0,
NACT_XCHANGE_FORMAT_XDS,
NACT_XCHANGE_FORMAT_APPLICATION_XML,
NACT_XCHANGE_FORMAT_TEXT_PLAIN,
NACT_XCHANGE_FORMAT_URI_LIST
FMA_XCHANGE_FORMAT_NACT = 0,
FMA_XCHANGE_FORMAT_XDS,
FMA_XCHANGE_FORMAT_APPLICATION_XML,
FMA_XCHANGE_FORMAT_TEXT_PLAIN,
FMA_XCHANGE_FORMAT_URI_LIST
};
/* mode indicator
......@@ -88,38 +88,38 @@ enum {
CLIPBOARD_MODE_COPY
};
GType nact_clipboard_get_type ( void );
GType fma_clipboard_get_type ( void );
NactClipboard *nact_clipboard_new ( NactMainWindow *window );
FMAClipboard *fma_clipboard_new ( NactMainWindow *window );
void nact_clipboard_dnd_set ( NactClipboard *clipboard,
void fma_clipboard_dnd_set ( FMAClipboard *clipboard,
guint target,
GList *rows,
const gchar *folder,
gboolean copy );
GList *nact_clipboard_dnd_get_data ( NactClipboard *clipboard, gboolean *copy );
GList *fma_clipboard_dnd_get_data ( FMAClipboard *clipboard, gboolean *copy );
gchar *nact_clipboard_dnd_get_text ( NactClipboard *clipboard, GList *rows );
gchar *fma_clipboard_dnd_get_text ( FMAClipboard *clipboard, GList *rows );
void nact_clipboard_dnd_drag_end ( NactClipboard *clipboard );
void fma_clipboard_dnd_drag_end ( FMAClipboard *clipboard );
void nact_clipboard_dnd_clear ( NactClipboard *clipboard );
void fma_clipboard_dnd_clear ( FMAClipboard *clipboard );
void nact_clipboard_primary_set ( NactClipboard *clipboard,
void fma_clipboard_primary_set ( FMAClipboard *clipboard,
GList *items,
gint mode );
GList *nact_clipboard_primary_get ( NactClipboard *clipboard,
GList *fma_clipboard_primary_get ( FMAClipboard *clipboard,
gboolean *relabel );
void nact_clipboard_primary_counts( NactClipboard *clipboard,
void fma_clipboard_primary_counts( FMAClipboard *clipboard,
guint *actions,
guint *profiles,
guint *menus );
void nact_clipboard_dump ( NactClipboard *clipboard );
void fma_clipboard_dump ( FMAClipboard *clipboard );
G_END_DECLS
#endif /* __UI_NACT_CLIPBOARD_H__ */
#endif /* __UI_FMA_CLIPBOARD_H__ */
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_preferences_editor
* @short_description: #NactConfirmLogout class definition.
* @include: nact/nact-preferences-editor.h
* @include: ui/nact-preferences-editor.h
*
* This class is derived from NactWindow.
* It encapsulates the "PreferencesDialog" widget dialog.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_export_ask
* @short_description: #NactExportAsk class definition.
* @include: nact/nact-export-ask.h
* @include: ui/nact-export-ask.h
*
* This class is derived from BaseDialog.
* It is ran each time an action is to be exported, and the user want
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_iaction_tab
* @short_description: #NactIActionTab interface definition.
* @include: nact/nact-iaction-tab.h
* @include: ui/nact-iaction-tab.h
*
* This interface implements the "Nautilus Menu Item" tab of the notebook.
*
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_ibasenames_tab
* @short_description: #NactIBasenamesTab interface declaration.
* @include: nact/nact-ibasenames-tab.h
* @include: ui/nact-ibasenames-tab.h
*
* This interface implements all the widgets which define the
* basenames-based conditions.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_icapabilities_tab
* @short_description: #NactICapabilitiesTab interface declaration.
* @include: nact/nact-icapabilities-tab.h
* @include: ui/nact-icapabilities-tab.h
*
* This interface implements all the widgets which define the
* conditions for the action.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_icommand_tab
* @short_description: #NactICommandTab interface declaration.
* @include: nact/nact-icommand-tab.h
* @include: ui/nact-icommand-tab.h
*
* This interface implements all the widgets which define the
* actual action to be executed (from FMAObjectProfile).
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_icon_chooser
* @short_description: NactIconChooser dialog box
* @include: nact/nact-icon-chooser.h
* @include: ui/nact-icon-chooser.h
*
* This class is derived from BaseDialog.
*/
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_ienvironment_tab
* @short_description: #NactIEnvironmentTab interface declaration.
* @include: nact/nact-ienvironment-tab.h
* @include: ui/nact-ienvironment-tab.h
*
* This interface implements all the widgets which define the
* actual action to be executed.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_iexecution_tab
* @short_description: #NactIExecutionTab interface declaration.
* @include: nact/nact-iexecution-tab.h
* @include: ui/nact-iexecution-tab.h
*
* This interface implements all the widgets which define the
* actual action to be executed.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_ifolders_tab
* @short_description: #NactIFoldersTab interface declaration.
* @include: nact/nact-ifolders-tab.h
* @include: ui/nact-ifolders-tab.h
*
* This interface implements all the widgets which are relevant for
* items which are applied to backgrounds.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_imimetypes_tab
* @short_description: #NactIMimetypesTab interface declaration.
* @include: nact/nact-imimetypes-tab.h
* @include: ui/nact-imimetypes-tab.h
*
* This interface implements all the widgets which define the
* mimetypes-based conditions.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_iproperties_tab
* @short_description: #NactIPropertiesTab interface definition.
* @include: nact/nact-iproperties-tab.h
* @include: ui/nact-iproperties-tab.h
*
* This interface implements the "Properties" tab of the notebook.
*
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_ischemes_tab
* @short_description: #NactISchemesTab interface declaration.
* @include: nact/nact-ischemes-tab.h
* @include: ui/nact-ischemes-tab.h
*
* This interface implements all the widgets which define the
* conditions for the action.
......
......@@ -37,7 +37,7 @@
/**
* SECTION: nact_main_tab
* @short_description: Signals and properties.
* @include: nact/nact-main-tab.h
* @include: ui/nact-main-tab.h
*
* Here as defined signals and properties common to all tabs.
*/
......
......@@ -65,7 +65,7 @@
* | |
* | +-> setup_main_ui()
* | setup_treeview()
* | nact_clipboard_new()
* | fma_clipboard_new()
* | nact_sort_buttons_new()
* |
* | nact_iaction_tab_init()
......
......@@ -114,7 +114,7 @@ struct _NactMainWindowPrivate {
*/
NactTreeView *items_view;
gboolean is_tree_modified;
NactClipboard *clipboard;
FMAClipboard *clipboard;
NactStatusbar *statusbar;
NactSortButtons *sort_buttons;
......@@ -665,7 +665,7 @@ nact_main_window_new( FMAApplication *application )
setup_treeview( window );
nact_menu_win( window );
window->private->clipboard = nact_clipboard_new( window );
window->private->clipboard = fma_clipboard_new( window );
window->private->sort_buttons = nact_sort_buttons_new( window );
/* initialize the notebook interfaces
......@@ -812,12 +812,12 @@ setup_monitor_pivot( NactMainWindow *main_window )
* nact_main_window_get_clipboard:
* @window: this #NactMainWindow instance.
*
* Returns: the #NactClipboard convenience object.
* Returns: the #FMAClipboard convenience object.
*/
NactClipboard *
FMAClipboard *
nact_main_window_get_clipboard( const NactMainWindow *window )
{
NactClipboard *clipboard;
FMAClipboard *clipboard;
g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), NULL );
......
......@@ -38,7 +38,7 @@
*/
#include "fma-application.h"
#include "nact-clipboard.h"
#include "fma-clipboard.h"
#include "nact-main-window-def.h"
#include "nact-sort-buttons.h"
#include "nact-statusbar.h"
......@@ -73,7 +73,7 @@ enum {
NactMainWindow *nact_main_window_new ( FMAApplication *application );
NactClipboard *nact_main_window_get_clipboard ( const NactMainWindow *window );
FMAClipboard *nact_main_window_get_clipboard ( const NactMainWindow *window );
NactSortButtons *nact_main_window_get_sort_buttons( const NactMainWindow *window );
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_match_list
* @short_description: Implementation of a list match/does not match.
* @include: nact/nact-match-list.h
* @include: ui/nact-match-list.h
*
* In an ideal world, this would be a base interface for NactISchemesTab,
* etc. interfaces.
......
......@@ -38,7 +38,7 @@
#include "core/fma-io-provider.h"
#include "fma-application.h"
#include "nact-clipboard.h"
#include "fma-clipboard.h"
#include "nact-main-tab.h"
#include "nact-main-window.h"
#include "nact-menu.h"
......@@ -204,7 +204,7 @@ nact_menu_edit_cut( NactMainWindow *main_window )
static const gchar *thisfn = "nact_menu_edit_cut";
sMenuData *sdata;
GList *items;
NactClipboard *clipboard;
FMAClipboard *clipboard;
GList *to_delete;
GSList *ndeletables;
NactTreeView *view;
......@@ -229,7 +229,7 @@ nact_menu_edit_cut( NactMainWindow *main_window )
if( to_delete ){
clipboard = nact_main_window_get_clipboard( NACT_MAIN_WINDOW( main_window ));
nact_clipboard_primary_set( clipboard, to_delete, CLIPBOARD_MODE_CUT );
fma_clipboard_primary_set( clipboard, to_delete, CLIPBOARD_MODE_CUT );
update_clipboard_counters( main_window, sdata );
view = nact_main_window_get_items_view( main_window );
nact_tree_ieditable_delete( NACT_TREE_IEDITABLE( view ), to_delete, TREE_OPE_DELETE );
......@@ -254,7 +254,7 @@ nact_menu_edit_copy( NactMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_copy";
sMenuData *sdata;
NactClipboard *clipboard;
FMAClipboard *clipboard;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
......@@ -262,7 +262,7 @@ nact_menu_edit_copy( NactMainWindow *main_window )
sdata = nact_menu_get_data( main_window );
clipboard = nact_main_window_get_clipboard( main_window );
nact_clipboard_primary_set( clipboard, sdata->selected_items, CLIPBOARD_MODE_COPY );
fma_clipboard_primary_set( clipboard, sdata->selected_items, CLIPBOARD_MODE_COPY );
update_clipboard_counters( main_window, sdata );
g_signal_emit_by_name( main_window, MAIN_SIGNAL_UPDATE_SENSITIVITIES );
......@@ -345,13 +345,13 @@ prepare_for_paste( NactMainWindow *window, sMenuData *sdata )
{
static const gchar *thisfn = "nact_menu_edit_prepare_for_paste";
GList *items, *it;
NactClipboard *clipboard;
FMAClipboard *clipboard;
FMAObjectAction *action;
gboolean relabel;
gboolean renumber;
clipboard = nact_main_window_get_clipboard( window );
items = nact_clipboard_primary_get( clipboard, &renumber );
items = fma_clipboard_primary_get( clipboard, &renumber );
action = NULL;
/* if pasted items are profiles, then setup the target action
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_preferences_editor
* @short_description: #NactPreferencesEditor class definition.
* @include: nact/nact-preferences-editor.h
* @include: ui/nact-preferences-editor.h
*
* This class is derived from NactWindow.
* It encapsulates the "PreferencesDialog" widget dialog.
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_schemes_list
* @short_description: Schemes list view management.
* @include: nact/nact-schemes-list.h
* @include: ui/nact-schemes-list.h
*
* This set of functions manages the schemes list view.
*
......
......@@ -33,7 +33,7 @@
/**
* SECTION: nact_statusbar
* @short_description: Statusbar class definition.
* @include: nact/nact-statusbar.h
* @include: ui/nact-statusbar.h
*
* The #NactStatusbar embeds both:
* - a message bar
......
......@@ -42,7 +42,7 @@
#include <core/fma-importer.h>
#include "fma-application.h"
#include "nact-clipboard.h"
#include "fma-clipboard.h"
#include "nact-statusbar.h"
#include "nact-main-window.h"
#include "nact-tree-model.h"
......@@ -61,24 +61,24 @@
* call once egg_tree_multi_dnd_stop_drag_check( treeview )
* call once nact_tree_model_dnd_imulti_drag_source_row_draggable: drag_source=0x92a0d70, path_list=0x9373c90
* call once nact_tree_model_dnd_on_drag_begin
* nact_clipboard_dnd_clear()
* call once nact_clipboard_on_drag_begin( treeview, context, main_window )
* fma_clipboard_dnd_clear()
* call once fma_clipboard_on_drag_begin( treeview, context, main_window )
*
* when we drop (e.g. in Nautilus)
* call once egg_tree_multi_dnd_on_drag_data_get( treeview, context, selection_data, info=0, time )
* call once nact_tree_model_dnd_imulti_drag_source_drag_data_get( drag_source, context, selection_data, path_list, atom=XdndDirectSave0 )
* nact_clipboard_dnd_set()
* fma_clipboard_dnd_set()
* call once nact_tree_model_dnd_on_drag_end
* nact_clipboard_dnd_drag_end
* nact_clipboard_get_from_dnd_clipboard_callback