Commit 89d71a6d authored by Pierre Wieser's avatar Pierre Wieser

NactTreeView class is renamed to FMATreeView

parent 653e0c2c
......@@ -138,8 +138,8 @@ fma_config_tool_SOURCES = \
fma-tree-model.h \
fma-tree-model-priv.h \
fma-tree-model-dnd.c \
nact-tree-view.c \
nact-tree-view.h \
fma-tree-view.c \
fma-tree-view.h \
$(BUILT_SOURCES) \
$(NULL)
......
......@@ -46,7 +46,7 @@
#include "fma-main-window.h"
#include "fma-assistant-export.h"
#include "fma-export-ask.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
/* Export Assistant
*
......@@ -73,7 +73,7 @@ enum {
*/
struct _FMAAssistantExportPrivate {
gboolean dispose_has_run;
NactTreeView *items_view;
FMATreeView *items_view;
gboolean preferences_locked;
gchar *uri;
GList *selected_items;
......@@ -404,15 +404,15 @@ items_tree_view_initialize_gtk( FMAAssistantExport *window, GtkAssistant *assist
g_debug( "%s: window=%p, assistant=%p", thisfn, ( void * ) window, ( void * ) assistant );
priv = window->private;
priv->items_view = nact_tree_view_new(
priv->items_view = fma_tree_view_new(
FMA_MAIN_WINDOW( base_window_get_main_window( BASE_WINDOW( window ))));
parent = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( assistant ), "ActionsList" );
g_return_if_fail( parent && GTK_IS_CONTAINER( parent ));
gtk_container_add( GTK_CONTAINER( parent ), GTK_WIDGET( priv->items_view ));
nact_tree_view_set_mnemonic( priv->items_view, GTK_CONTAINER( assistant ), "ActionsListLabel" );
nact_tree_view_set_edition_mode( priv->items_view, TREE_MODE_SELECTION );
fma_tree_view_set_mnemonic( priv->items_view, GTK_CONTAINER( assistant ), "ActionsListLabel" );
fma_tree_view_set_edition_mode( priv->items_view, TREE_MODE_SELECTION );
}
static void
......@@ -518,7 +518,7 @@ on_base_all_widgets_showed( FMAAssistantExport *window, void *empty )
GtkAssistant *assistant;
GtkWidget *page;
GtkApplicationWindow *main_window;
NactTreeView *main_items_view;
FMATreeView *main_items_view;
GList *items;
GtkTreePath *path;
......@@ -534,10 +534,10 @@ on_base_all_widgets_showed( FMAAssistantExport *window, void *empty )
main_window = base_window_get_main_window( BASE_WINDOW( window ));
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
main_items_view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( main_window ));
items = nact_tree_view_get_items( main_items_view );
nact_tree_view_fill( window->private->items_view, items );
items = fma_tree_view_get_items( main_items_view );
fma_tree_view_fill( window->private->items_view, items );
/* connect to the 'selection-changed' signal emitted by NactTreeView
/* connect to the 'selection-changed' signal emitted by FMATreeView
*/
base_window_signal_connect(
BASE_WINDOW( window ),
......@@ -548,7 +548,7 @@ on_base_all_widgets_showed( FMAAssistantExport *window, void *empty )
/* select the first row
*/
path = gtk_tree_path_new_from_string( "0" );
nact_tree_view_select_row_at_path( window->private->items_view, path );
fma_tree_view_select_row_at_path( window->private->items_view, path );
gtk_tree_path_free( path );
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_ACTIONS_SELECTION );
......
......@@ -650,7 +650,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
FMAImporterResult *result;
FMAApplication *application;
FMAUpdater *updater;
NactTreeView *items_view;
FMATreeView *items_view;
g_return_if_fail( FMA_IS_ASSISTANT_IMPORT( wnd ));
......@@ -716,7 +716,7 @@ static FMAObjectItem *
check_for_existence( const FMAObjectItem *item, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_assistant_import_check_for_existence";
NactTreeView *items_view;
FMATreeView *items_view;
FMAObjectItem *exists;
gchar *importing_id;
......@@ -725,7 +725,7 @@ check_for_existence( const FMAObjectItem *item, FMAMainWindow *window )
thisfn, ( void * ) item, G_OBJECT_TYPE_NAME( item ), importing_id );
items_view = fma_main_window_get_items_view( window );
exists = nact_tree_view_get_item_by_id( items_view, importing_id );
exists = fma_tree_view_get_item_by_id( items_view, importing_id );
g_free( importing_id );
......
......@@ -346,7 +346,7 @@ fma_clipboard_dnd_get_data( FMAClipboard *clipboard, gboolean *copy_data )
if( selection ){
data = ( FMAClipboardDndData * ) gtk_selection_data_get_data( selection );
if( data->target == FMA_XCHANGE_FORMAT_NACT ){
if( data->target == FMA_XCHANGE_FORMAT_FMA ){
for( it = data->rows ; it ; it = it->next ){
rows = g_list_append( rows,
gtk_tree_row_reference_copy(( GtkTreeRowReference * ) it->data ));
......
......@@ -74,7 +74,7 @@ typedef struct {
/* drag and drop formats
*/
enum {
FMA_XCHANGE_FORMAT_NACT = 0,
FMA_XCHANGE_FORMAT_FMA = 0,
FMA_XCHANGE_FORMAT_XDS,
FMA_XCHANGE_FORMAT_APPLICATION_XML,
FMA_XCHANGE_FORMAT_TEXT_PLAIN,
......
......@@ -47,7 +47,7 @@
#include "fma-main-window.h"
#include "fma-iaction-tab.h"
#include "fma-icon-chooser.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
/* private interface data
*/
......@@ -76,7 +76,7 @@ static void interface_base_finalize( FMAIActionTabInterface *klass );
static void initialize_gtk( FMAIActionTab *instance );
static void initialize_window( FMAIActionTab *instance );
static void on_main_item_updated( FMAIActionTab *instance, FMAIContext *context, guint data, void *empty );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActionTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIActionTab *instance );
static void on_target_selection_toggled( GtkToggleButton *button, FMAIActionTab *instance );
static void on_target_location_toggled( GtkToggleButton *button, FMAIActionTab *instance );
static void check_for_label( FMAIActionTab *instance, GtkEntry *entry, const gchar *label );
......@@ -234,7 +234,7 @@ static void
initialize_window( FMAIActionTab *instance )
{
static const gchar *thisfn = "fma_iaction_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
......@@ -330,7 +330,7 @@ on_main_item_updated( FMAIActionTab *instance, FMAIContext *context, guint data,
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActionTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIActionTab *instance )
{
static const gchar *thisfn = "fma_iaction_tab_on_tree_selection_changed";
guint count_selected;
......
......@@ -69,7 +69,7 @@ static void interface_base_init( FMAIBasenamesTabInterface *klass );
static void interface_base_finalize( FMAIBasenamesTabInterface *klass );
static void initialize_gtk( FMAIBasenamesTab *instance );
static void initialize_window( FMAIBasenamesTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIBasenamesTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIBasenamesTab *instance );
static void on_matchcase_toggled( GtkToggleButton *button, FMAIBasenamesTab *instance );
static GSList *get_basenames( void *context );
static void set_basenames( void *context, GSList *filters );
......@@ -217,7 +217,7 @@ static void
initialize_window( FMAIBasenamesTab *instance )
{
static const gchar *thisfn = "fma_ibasenames_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( instance && FMA_IS_IBASENAMES_TAB( instance ));
......@@ -235,7 +235,7 @@ initialize_window( FMAIBasenamesTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIBasenamesTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIBasenamesTab *instance )
{
FMAIContext *context;
gboolean editable;
......
......@@ -59,7 +59,7 @@ static void interface_base_init( FMAICapabilitiesTabInterface *klass );
static void interface_base_finalize( FMAICapabilitiesTabInterface *klass );
static void initialize_gtk( FMAICapabilitiesTab *instance );
static void initialize_window( FMAICapabilitiesTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICapabilitiesTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAICapabilitiesTab *instance );
static void on_add_clicked( GtkButton *button, FMAICapabilitiesTab *instance );
static GSList *get_capabilities( FMAIContext *context );
static void set_capabilities( FMAIContext *context, GSList *list );
......@@ -189,7 +189,7 @@ static void
initialize_window( FMAICapabilitiesTab *instance )
{
static const gchar *thisfn = "fma_icapabilities_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_ICAPABILITIES_TAB( instance ));
......@@ -204,7 +204,7 @@ initialize_window( FMAICapabilitiesTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICapabilitiesTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAICapabilitiesTab *instance )
{
FMAIContext *context;
gboolean editable;
......
......@@ -78,7 +78,7 @@ static void interface_base_finalize( FMAICommandTabInterface *klass );
static void initialize_gtk( FMAICommandTab *instance );
static void initialize_window( FMAICommandTab *instance );
static void on_main_item_updated( FMAICommandTab *instance, FMAIContext *context, guint data, void *empty );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICommandTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAICommandTab *instance );
static GtkWidget *get_label_entry( FMAICommandTab *instance );
static GtkButton *get_legend_button( FMAICommandTab *instance );
static GtkWindow *get_legend_dialog( FMAICommandTab *instance );
......@@ -221,7 +221,7 @@ initialize_window( FMAICommandTab *instance )
GtkWidget *label_entry, *path_entry, *parameters_entry;
GtkButton *legend_button, *path_button;
ICommandData *data;
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_ICOMMAND_TAB( instance ));
......@@ -305,7 +305,7 @@ on_main_item_updated( FMAICommandTab *instance, FMAIContext *context, guint data
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICommandTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAICommandTab *instance )
{
static const gchar *thisfn = "fma_icommand_tab_on_tree_selection_changed";
FMAObjectProfile *profile;
......
......@@ -101,7 +101,7 @@ static void interface_base_init( FMAIEnvironmentTabInterface *klass );
static void interface_base_finalize( FMAIEnvironmentTabInterface *klass );
static void initialize_gtk( FMAIEnvironmentTab *instance );
static void initialize_window( FMAIEnvironmentTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIEnvironmentTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIEnvironmentTab *instance );
static void on_selcount_ope_changed( GtkComboBox *combo, FMAIEnvironmentTab *instance );
static void on_selcount_int_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
static void on_selection_count_changed( FMAIEnvironmentTab *instance );
......@@ -262,7 +262,7 @@ initialize_window( FMAIEnvironmentTab *instance )
GList *renderers;
guint i;
const FMADesktopEnv *desktops;
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
......@@ -346,7 +346,7 @@ initialize_window( FMAIEnvironmentTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIEnvironmentTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIEnvironmentTab *instance )
{
static const gchar *thisfn = "fma_ienvironment_tab_on_tree_selection_changed";
FMAIContext *context;
......
......@@ -63,7 +63,7 @@ static GType register_type( void );
static void interface_base_init( FMAIExecutionTabInterface *klass );
static void interface_base_finalize( FMAIExecutionTabInterface *klass );
static void initialize_window( FMAIExecutionTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIExecutionTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIExecutionTab *instance );
static void on_normal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
static void on_terminal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
static void on_embedded_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
......@@ -183,7 +183,7 @@ static void
initialize_window( FMAIExecutionTab *instance )
{
static const gchar *thisfn = "fma_iexecution_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IEXECUTION_TAB( instance ));
......@@ -226,7 +226,7 @@ initialize_window( FMAIExecutionTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIExecutionTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIExecutionTab *instance )
{
static const gchar *thisfn = "fma_iexecution_tab_on_tree_selection_changed";
FMAObjectProfile *profile;
......
......@@ -63,7 +63,7 @@ static void interface_base_init( FMAIFoldersTabInterface *klass );
static void interface_base_finalize( FMAIFoldersTabInterface *klass );
static void initialize_gtk( FMAIFoldersTab *instance );
static void initialize_window( FMAIFoldersTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIFoldersTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIFoldersTab *instance );
static void on_browse_folder_clicked( GtkButton *button, FMAIFoldersTab *instance );
static GSList *get_folders( void *context );
static void set_folders( void *context, GSList *filters );
......@@ -193,7 +193,7 @@ static void
initialize_window( FMAIFoldersTab *instance )
{
static const gchar *thisfn = "fma_ifolders_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IFOLDERS_TAB( instance ));
......@@ -212,7 +212,7 @@ initialize_window( FMAIFoldersTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIFoldersTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIFoldersTab *instance )
{
FMAIContext *context;
gboolean editable;
......
......@@ -59,7 +59,7 @@ static void interface_base_init( FMAIMimetypesTabInterface *klass );
static void interface_base_finalize( FMAIMimetypesTabInterface *klass );
static void initialize_gtk( FMAIMimetypesTab *instance );
static void initialize_window( FMAIMimetypesTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIMimetypesTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIMimetypesTab *instance );
static GSList *get_mimetypes( void *context );
static void set_mimetypes( void *context, GSList *filters );
static void on_instance_finalized( gpointer user_data, FMAIMimetypesTab *instance );
......@@ -201,7 +201,7 @@ static void
initialize_window( FMAIMimetypesTab *instance )
{
static const gchar *thisfn = "fma_imimetypes_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IMIMETYPES_TAB( instance ));
......@@ -216,7 +216,7 @@ initialize_window( FMAIMimetypesTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIMimetypesTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIMimetypesTab *instance )
{
FMAIContext *context;
gboolean editable;
......
......@@ -69,7 +69,7 @@ static GType register_type( void );
static void interface_base_init( FMAIPropertiesTabInterface *klass );
static void interface_base_finalize( FMAIPropertiesTabInterface *klass );
static void initialize_window( FMAIPropertiesTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIPropertiesTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIPropertiesTab *instance );
static void on_main_item_updated( FMAIPropertiesTab *instance, FMAIContext *context, guint data, void *empty );
static GtkButton *get_enabled_button( FMAIPropertiesTab *instance );
static void on_enabled_toggled( GtkToggleButton *button, FMAIPropertiesTab *instance );
......@@ -184,7 +184,7 @@ initialize_window( FMAIPropertiesTab *instance )
GtkButton *enabled_button;
GtkWidget *label_widget;
GtkTextBuffer *buffer;
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_IPROPERTIES_TAB( instance ));
......@@ -220,7 +220,7 @@ initialize_window( FMAIPropertiesTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIPropertiesTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAIPropertiesTab *instance )
{
static const gchar *thisfn = "fma_iproperties_tab_on_tree_selection_changed";
guint count_selected;
......
......@@ -62,7 +62,7 @@ static void interface_base_init( FMAISchemesTabInterface *klass );
static void interface_base_finalize( FMAISchemesTabInterface *klass );
static void initialize_gtk( FMAISchemesTab *instance );
static void initialize_window( FMAISchemesTab *instance );
static void on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAISchemesTab *instance );
static void on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAISchemesTab *instance );
static void on_add_from_defaults( GtkButton *button, FMAISchemesTab *instance );
static GSList *get_schemes( void *context );
static void set_schemes( void *context, GSList *filters );
......@@ -192,7 +192,7 @@ static void
initialize_window( FMAISchemesTab *instance )
{
static const gchar *thisfn = "fma_ischemes_tab_initialize_window";
NactTreeView *tview;
FMATreeView *tview;
g_return_if_fail( FMA_IS_ISCHEMES_TAB( instance ));
......@@ -211,7 +211,7 @@ initialize_window( FMAISchemesTab *instance )
}
static void
on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAISchemesTab *instance )
on_tree_selection_changed( FMATreeView *tview, GList *selected_items, FMAISchemesTab *instance )
{
FMAIContext *context;
gboolean editable;
......
......@@ -56,7 +56,7 @@
#include "fma-main-window.h"
#include "fma-menu.h"
#include "fma-status-bar.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
#include "fma-confirm-logout.h"
#include "fma-sort-buttons.h"
......@@ -112,7 +112,7 @@ struct _FMAMainWindowPrivate {
/**
* Some convenience objects and data.
*/
NactTreeView *items_view;
FMATreeView *items_view;
gboolean is_tree_modified;
FMAClipboard *clipboard;
FMAStatusBar *statusbar;
......@@ -174,8 +174,8 @@ static void setup_main_ui( FMAMainWindow *main_window );
static void setup_treeview( FMAMainWindow *main_window );
static void setup_monitor_pivot( FMAMainWindow *main_window );
static void on_block_items_changed_timeout( FMAMainWindow *window );
static void on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window );
static void on_tree_view_selection_changed( NactTreeView *treeview, GList *selected_items, FMAMainWindow *window );
static void on_tree_view_modified_status_changed( FMATreeView *treeview, gboolean is_modified, FMAMainWindow *window );
static void on_tree_view_selection_changed( FMATreeView *treeview, GList *selected_items, FMAMainWindow *window );
static void on_tab_item_updated( FMAMainWindow *window, FMAIContext *context, guint data, void *empty );
static void raz_selection_properties( FMAMainWindow *window );
static void setup_current_selection( FMAMainWindow *window, FMAObjectId *selected_row );
......@@ -767,14 +767,14 @@ setup_treeview( FMAMainWindow *main_window )
GtkWidget *top_widget;
priv = main_window->private;
priv->items_view = nact_tree_view_new( main_window );
priv->items_view = fma_tree_view_new( main_window );
top_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "ActionsList" );
g_return_if_fail( top_widget && GTK_IS_CONTAINER( top_widget ));
gtk_container_add( GTK_CONTAINER( top_widget ), GTK_WIDGET( priv->items_view ));
nact_tree_view_set_mnemonic( priv->items_view, GTK_CONTAINER( main_window ), "ActionsListLabel" );
nact_tree_view_set_edition_mode( priv->items_view, TREE_MODE_EDITION );
fma_tree_view_set_mnemonic( priv->items_view, GTK_CONTAINER( main_window ), "ActionsListLabel" );
fma_tree_view_set_edition_mode( priv->items_view, TREE_MODE_EDITION );
g_signal_connect(
priv->items_view,
......@@ -881,12 +881,12 @@ fma_main_window_get_statusbar( const FMAMainWindow *window )
* fma_main_window_get_items_view:
* @window: this #FMAMainWindow instance.
*
* Returns: The #NactTreeView convenience object.
* Returns: The #FMATreeView convenience object.
*/
NactTreeView *
FMATreeView *
fma_main_window_get_items_view( const FMAMainWindow *window )
{
NactTreeView *view;
FMATreeView *view;
g_return_val_if_fail( FMA_IS_MAIN_WINDOW( window ), NULL );
......@@ -961,7 +961,7 @@ on_block_items_changed_timeout( FMAMainWindow *window )
* the modification status of the items view has changed
*/
static void
on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window )
on_tree_view_modified_status_changed( FMATreeView *treeview, gboolean is_modified, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_main_window_on_tree_view_modified_status_changed";
......@@ -979,7 +979,7 @@ on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modifi
* tree view selection has changed
*/
static void
on_tree_view_selection_changed( NactTreeView *treeview, GList *selected_items, FMAMainWindow *window )
on_tree_view_selection_changed( FMATreeView *treeview, GList *selected_items, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_main_window_on_tree_view_selection_changed";
guint count;
......@@ -1209,7 +1209,7 @@ load_or_reload_items( FMAMainWindow *window )
raz_selection_properties( window );
tree = fma_updater_load_items( window->private->updater );
nact_tree_view_fill( window->private->items_view, tree );
fma_tree_view_fill( window->private->items_view, tree );
g_debug( "%s: end of tree view filling", thisfn );
}
......
......@@ -42,7 +42,7 @@
#include "fma-main-window-def.h"
#include "fma-sort-buttons.h"
#include "fma-status-bar.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
G_BEGIN_DECLS
......@@ -79,7 +79,7 @@ FMASortButtons *fma_main_window_get_sort_buttons( const FMAMainWindow *window );
FMAStatusBar *fma_main_window_get_statusbar ( const FMAMainWindow *window );
NactTreeView *fma_main_window_get_items_view ( const FMAMainWindow *window );
FMATreeView *fma_main_window_get_items_view ( const FMAMainWindow *window );
void fma_main_window_reload ( FMAMainWindow *window );
......
......@@ -93,7 +93,7 @@ static ColumnHeaderStruct st_match_headers[] = {
static void create_tree_model( MatchListData *data );
static void initialize_window( MatchListData *data );
static void on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchListData *data );
static void on_tree_selection_changed( FMATreeView *treeview, GList *selected_items, MatchListData *data );
static void on_add_filter_clicked( GtkButton *button, MatchListData *data );
static void on_filter_clicked( GtkTreeViewColumn *treeviewcolumn, MatchListData *data );
......@@ -258,7 +258,7 @@ initialize_window( MatchListData *data )
GtkTreeViewColumn *column;
GList *renderers;
GtkTreeModel *model;
NactTreeView *treeview;
FMATreeView *treeview;
g_return_if_fail( data != NULL );
......@@ -324,7 +324,7 @@ initialize_window( MatchListData *data )
* - update the object with a summary of the listbox contents
*/
static void
on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchListData *data )
on_tree_selection_changed( FMATreeView *treeview, GList *selected_items, MatchListData *data )
{
static const gchar *thisfn = "fma_match_list_on_tree_selection_changed";
FMAIContext *context;
......@@ -335,7 +335,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
GtkTreeViewColumn *column;
GtkTreePath *path;
g_return_if_fail( treeview && NACT_IS_TREE_VIEW( treeview ));
g_return_if_fail( treeview && FMA_IS_TREE_VIEW( treeview ));
g_return_if_fail( data != NULL );
g_object_get( G_OBJECT( data->window ),
......
......@@ -44,7 +44,7 @@
#include "fma-menu.h"
#include "fma-menu-edit.h"
#include "fma-tree-ieditable.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
static GList *prepare_for_paste( FMAMainWindow *window, sMenuData *sdata );
static GList *get_deletables( FMAUpdater *updater, GList *tree, GSList **not_deletable );
......@@ -207,7 +207,7 @@ fma_menu_edit_cut( FMAMainWindow *main_window )
FMAClipboard *clipboard;
GList *to_delete;
GSList *ndeletables;
NactTreeView *view;
FMATreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
......@@ -289,7 +289,7 @@ fma_menu_edit_paste( FMAMainWindow *main_window )
static const gchar *thisfn = "fma_menu_edit_paste";
sMenuData *sdata;
GList *items;
NactTreeView *view;
FMATreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
......@@ -325,7 +325,7 @@ fma_menu_edit_paste_into( FMAMainWindow *main_window )
static const gchar *thisfn = "fma_menu_edit_paste_into";
sMenuData *sdata;
GList *items;
NactTreeView *view;
FMATreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
......@@ -397,7 +397,7 @@ fma_menu_edit_duplicate( FMAMainWindow *main_window )
GList *dup;
FMAObject *obj;
gboolean relabel;
NactTreeView *view;
FMATreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
......@@ -453,7 +453,7 @@ fma_menu_edit_delete( FMAMainWindow *main_window )
GList *items;
GList *to_delete;
GSList *ndeletables;
NactTreeView *view;
FMATreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
......
......@@ -126,7 +126,7 @@ fma_menu_file_new_menu( FMAMainWindow *main_window )
{
sMenuData *sdata;
FMAObjectMenu *menu;
NactTreeView *items_view;
FMATreeView *items_view;
GList *items;
sdata = fma_menu_get_data( main_window );
......@@ -150,7 +150,7 @@ fma_menu_file_new_action( FMAMainWindow *main_window )
{
sMenuData *sdata;
FMAObjectAction *action;
NactTreeView *items_view;
FMATreeView *items_view;
GList *items;
sdata = fma_menu_get_data( main_window );
......@@ -174,7 +174,7 @@ fma_menu_file_new_profile( FMAMainWindow *main_window )
{
FMAObjectAction *action;
FMAObjectProfile *profile;
NactTreeView *items_view;
FMATreeView *items_view;
GList *items;
g_object_get(
......@@ -230,7 +230,7 @@ fma_menu_file_save_items( FMAMainWindow *window )
{
static const gchar *thisfn = "fma_menu_file_save_items";
sMenuData *sdata;
NactTreeView *items_view;
FMATreeView *items_view;
GList *items, *it;
GList *new_pivot;
FMAObjectItem *duplicate;
......@@ -245,7 +245,7 @@ fma_menu_file_save_items( FMAMainWindow *window )
* and reset the corresponding modification flag
*/
items_view = fma_main_window_get_items_view( window );
items = nact_tree_view_get_items( items_view );
items = fma_tree_view_get_items( items_view );
fma_object_dump_tree( items );
messages = NULL;
......@@ -283,7 +283,7 @@ fma_menu_file_save_items( FMAMainWindow *window )
} else {
fma_object_free_items( items );
items = nact_tree_view_get_items( items_view );
items = fma_tree_view_get_items( items_view );
}
/* recursively save the modified items
......
......@@ -46,7 +46,7 @@
#include "fma-menu-tools.h"
*/
#include "fma-preferences-editor.h"
#include "nact-tree-view.h"
#include "fma-tree-view.h"
static const gchar *st_uixml_actions = PKGUIDIR "/fma-ui.actions";
static const gchar *st_ui_app_menu = "app-menu";
......@@ -180,13 +180,13 @@ static sActionEntry st_menubar_entries[] = {
};
static void free_menu_data( sMenuData *sdata );
static void on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, FMAMainWindow *window );
static void on_open_context_menu( FMATreeView *treeview, GdkEventButton *event, FMAMainWindow *window );
static void on_popup_selection_done( GtkMenuShell *menushell, FMAMainWindow *window );
static void on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus, gint actions, gint profiles, FMAMainWindow *window );
static void on_tree_view_focus_in( NactTreeView *treeview, FMAMainWindow *window );
static void on_tree_view_focus_out( NactTreeView *treeview, FMAMainWindow *window );
static void on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window );
static void on_tree_view_selection_changed( NactTreeView *treeview, GList *selected, FMAMainWindow *window );
static void on_tree_view_count_changed( FMATreeView *treeview, gboolean reset, gint menus, gint actions, gint profiles, FMAMainWindow *window );
static void on_tree_view_focus_in( FMATreeView *treeview, FMAMainWindow *window );
static void on_tree_view_focus_out( FMATreeView *treeview, FMAMainWindow *window );
static void on_tree_view_modified_status_changed( FMATreeView *treeview, gboolean is_modified, FMAMainWindow *window );
static void on_tree_view_selection_changed( FMATreeView *treeview, GList *selected, FMAMainWindow *window );
static void on_update_sensitivities( FMAMainWindow *window, void *empty );
/**
......@@ -308,7 +308,7 @@ fma_menu_win( FMAMainWindow *main_window )
static const gchar *thisfn = "fma_menu_win";
gint i;
GtkApplication *application;
NactTreeView *treeview;
FMATreeView *treeview;
sMenuData *sdata;
sdata = fma_menu_get_data( main_window );
......@@ -402,7 +402,7 @@ free_menu_data( sMenuData *sdata )
* Opens a popup menu.
*/
static void
on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, FMAMainWindow *window )
on_open_context_menu( FMATreeView *treeview, GdkEventButton *event, FMAMainWindow *window )
{
sMenuData *sdata;
......@@ -438,7 +438,7 @@ on_popup_selection_done( GtkMenuShell *menushell, FMAMainWindow *window )
* that we are knowing if we have some exportables
*/
static void
on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus, gint actions, gint profiles, FMAMainWindow *window )
on_tree_view_count_changed( FMATreeView *treeview, gboolean reset, gint menus, gint actions, gint profiles, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_menu_on_tree_view_count_changed";
sMenuData *sdata;
......@@ -477,7 +477,7 @@ on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus,
}
static void
on_tree_view_focus_in( NactTreeView *treeview, FMAMainWindow *window )
on_tree_view_focus_in( FMATreeView *treeview, FMAMainWindow *window )
{
sMenuData *sdata;
......@@ -488,7 +488,7 @@ on_tree_view_focus_in( NactTreeView *treeview, FMAMainWindow *window )
}
static void
on_tree_view_focus_out( NactTreeView *treeview, FMAMainWindow *window )
on_tree_view_focus_out( FMATreeView *treeview, FMAMainWindow *window )
{
sMenuData *sdata;
......@@ -502,7 +502,7 @@ on_tree_view_focus_out( NactTreeView *treeview, FMAMainWindow *window )
* the count of modified FMAObjectItem has changed
*/
static void
on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window )
on_tree_view_modified_status_changed( FMATreeView *treeview, gboolean is_modified, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_menu_on_tree_view_modified_status_changed";