Commit 73768c43 authored by Pierre Wieser's avatar Pierre Wieser

NactMainWindow class is renamed to FMAMainWindow

parent 43c557a9
......@@ -109,9 +109,9 @@ fma_config_tool_SOURCES = \
fma-ischemes-tab.h \
fma-main-tab.c \
fma-main-tab.h \
nact-main-window.c \
nact-main-window.h \
nact-main-window-def.h \
fma-main-window.c \
fma-main-window.h \
fma-main-window-def.h \
nact-match-list.c \
nact-match-list.h \
nact-menu.c \
......@@ -161,7 +161,7 @@ ui_files = \
fma-export-ask.ui \
fma-icon-chooser.ui \
nact-legend.ui \
nact-main-window.ui \
fma-main-window.ui \
nact-preferences.ui \
nact-toolbar.ui \
$(NULL)
......
......@@ -336,7 +336,7 @@ base_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size )
/**
* base_gtk_utils_select_file:
* @window: the #NactMainWindow which will be the parent of the dialog box.
* @window: the #FMAMainWindow which will be the parent of the dialog box.
* @title: the title of the dialog box.
* @wsp_name: the name of the dialog box in Preferences to read/write
* its size and position.
......@@ -362,7 +362,7 @@ base_gtk_utils_select_file( GtkApplicationWindow *window,
/**
* base_gtk_utils_select_file_with_preview:
* @window: the #NactMainWindow which will be the parent of the dialog box.
* @window: the #FMAMainWindow which will be the parent of the dialog box.
* @title: the title of the dialog box.
* @wsp_name: the name of the dialog box in Preferences to read/write
* its size and position.
......@@ -437,7 +437,7 @@ base_gtk_utils_select_file_with_preview( GtkApplicationWindow *window,
/**
* base_gtk_utils_select_dir:
* @window: the #NactMainWindow which will be the parent of the dialog box.
* @window: the #FMAMainWindow which will be the parent of the dialog box.
* @title: the title of the dialog box.
* @wsp_name: the name of the dialog box in Preferences to read/write
* its size and position.
......
......@@ -280,7 +280,7 @@ instance_finalize( GObject *dialog )
/**
* fma_add_capability_dialog_run:
* @parent: the BaseWindow parent of this dialog
* (usually the NactMainWindow).
* (usually the FMAMainWindow).
* @capabilities: list of already used capabilities.
*
* Initializes and runs the dialog.
......@@ -289,7 +289,7 @@ instance_finalize( GObject *dialog )
* be g_free() by the caller, or NULL.
*/
gchar *
fma_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
fma_add_capability_dialog_run( FMAMainWindow *parent, GSList *capabilities )
{
static const gchar *thisfn = "fma_add_capability_dialog_run";
FMAAddCapabilityDialog *dialog;
......
......@@ -40,7 +40,7 @@
*/
#include "base-dialog.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -71,7 +71,7 @@ typedef struct {
GType fma_add_capability_dialog_get_type( void );
gchar *fma_add_capability_dialog_run ( NactMainWindow *parent,
gchar *fma_add_capability_dialog_run ( FMAMainWindow *parent,
GSList *capabilities );
G_END_DECLS
......
......@@ -39,7 +39,7 @@
#include "nact-schemes-list.h"
#include "fma-add-scheme-dialog.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
/* private instance data
*/
......@@ -245,7 +245,7 @@ instance_finalize( GObject *dialog )
/**
* fma_add_scheme_dialog_run:
* @parent: the BaseWindow parent of this dialog
* (usually the NactMainWindow).
* (usually the FMAMainWindow).
* @schemes: list of already used schemes.
*
* Initializes and runs the dialog.
......@@ -254,7 +254,7 @@ instance_finalize( GObject *dialog )
* be g_free() by the caller, or NULL.
*/
gchar *
fma_add_scheme_dialog_run( NactMainWindow *parent, GSList *schemes )
fma_add_scheme_dialog_run( FMAMainWindow *parent, GSList *schemes )
{
static const gchar *thisfn = "fma_add_scheme_dialog_run";
FMAAddSchemeDialog *dialog;
......
......@@ -40,7 +40,7 @@
*/
#include "base-dialog.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -68,7 +68,7 @@ typedef struct {
GType fma_add_scheme_dialog_get_type( void );
gchar *fma_add_scheme_dialog_run ( NactMainWindow *parent,
gchar *fma_add_scheme_dialog_run ( FMAMainWindow *parent,
GSList *schemes );
G_END_DECLS
......
......@@ -40,7 +40,7 @@
#include "base-isession.h"
#include "fma-application.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "nact-menu.h"
/* private instance data
......@@ -457,7 +457,7 @@ application_activate( GApplication *application )
{
static const gchar *thisfn = "fma_application_activate";
GList *windows_list;
NactMainWindow *main_window;
FMAMainWindow *main_window;
g_debug( "%s: application=%p", thisfn, ( void * ) application );
......@@ -468,18 +468,18 @@ application_activate( GApplication *application )
/* if the application is unique, have only one main window */
if( !st_non_unique_opt ){
if( !g_list_length( windows_list )){
main_window = nact_main_window_new( FMA_APPLICATION( application ));
main_window = fma_main_window_new( FMA_APPLICATION( application ));
g_debug( "%s: main window instanciated at %p", thisfn, main_window );
} else {
main_window = ( NactMainWindow * ) windows_list->data;
main_window = ( FMAMainWindow * ) windows_list->data;
}
/* have as many main windows we want */
} else {
main_window = nact_main_window_new( FMA_APPLICATION( application ));
main_window = fma_main_window_new( FMA_APPLICATION( application ));
}
g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
gtk_window_present( GTK_WINDOW( main_window ));
}
......
......@@ -43,7 +43,7 @@
#include "core/fma-ioptions-list.h"
#include "fma-application.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "fma-assistant-export.h"
#include "fma-export-ask.h"
#include "nact-tree-view.h"
......@@ -350,12 +350,12 @@ instance_finalize( GObject *window )
* Run the assistant.
*/
void
fma_assistant_export_run( NactMainWindow *main_window )
fma_assistant_export_run( FMAMainWindow *main_window )
{
FMAAssistantExport *assistant;
gboolean esc_quit, esc_confirm;
g_return_if_fail( NACT_IS_MAIN_WINDOW( main_window ));
g_return_if_fail( FMA_IS_MAIN_WINDOW( main_window ));
esc_quit = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
esc_confirm = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
......@@ -405,7 +405,7 @@ items_tree_view_initialize_gtk( FMAAssistantExport *window, GtkAssistant *assist
priv = window->private;
priv->items_view = nact_tree_view_new(
NACT_MAIN_WINDOW( base_window_get_main_window( BASE_WINDOW( window ))));
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 ));
......@@ -532,8 +532,8 @@ on_base_all_widgets_showed( FMAAssistantExport *window, void *empty )
/* fill up the items tree view
*/
main_window = base_window_get_main_window( BASE_WINDOW( window ));
g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
main_items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( main_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 );
......
......@@ -62,7 +62,7 @@
*/
#include "base-assistant.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -90,7 +90,7 @@ typedef struct {
GType fma_assistant_export_get_type( void );
void fma_assistant_export_run ( NactMainWindow *main_window );
void fma_assistant_export_run ( FMAMainWindow *main_window );
G_END_DECLS
......
......@@ -46,7 +46,7 @@
#include "fma-application.h"
#include "fma-assistant-import.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "nact-tree-ieditable.h"
/* Import Assistant
......@@ -117,7 +117,7 @@ static void runtime_init_duplicates( FMAAssistantImport *window, GtkAs
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 FMAObjectItem *check_for_existence( const FMAObjectItem *, FMAMainWindow *window );
static void prepare_importdone( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget *page );
static void free_results( GList *list );
......@@ -304,17 +304,17 @@ instance_finalize( GObject *window )
/**
* fma_assistant_import_run:
* @main: the #NactMainWindow parent window of this assistant.
* @main: the #FMAMainWindow parent window of this assistant.
*
* Run the assistant.
*/
void
fma_assistant_import_run( NactMainWindow *main_window )
fma_assistant_import_run( FMAMainWindow *main_window )
{
FMAAssistantImport *assistant;
gboolean esc_quit, esc_confirm;
g_return_if_fail( NACT_IS_MAIN_WINDOW( main_window ));
g_return_if_fail( FMA_IS_MAIN_WINDOW( main_window ));
esc_quit = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
esc_confirm = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
......@@ -697,7 +697,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
*/
if( insertable_items ){
insertable_items = g_list_reverse( insertable_items );
items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( main_window ));
items_view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( main_window ));
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( items_view ), insertable_items, NULL );
fma_object_free_items( insertable_items );
}
......@@ -706,14 +706,14 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
* items, so do not release it here
*/
if( overriden_items ){
items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( main_window ));
items_view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( main_window ));
nact_tree_ieditable_set_items( NACT_TREE_IEDITABLE( items_view ), overriden_items );
window->private->overriden = overriden_items;
}
}
static FMAObjectItem *
check_for_existence( const FMAObjectItem *item, NactMainWindow *window )
check_for_existence( const FMAObjectItem *item, FMAMainWindow *window )
{
static const gchar *thisfn = "fma_assistant_import_check_for_existence";
NactTreeView *items_view;
......@@ -724,7 +724,7 @@ check_for_existence( const FMAObjectItem *item, NactMainWindow *window )
g_debug( "%s: item=%p (%s), importing_id=%s",
thisfn, ( void * ) item, G_OBJECT_TYPE_NAME( item ), importing_id );
items_view = nact_main_window_get_items_view( window );
items_view = fma_main_window_get_items_view( window );
exists = nact_tree_view_get_item_by_id( items_view, importing_id );
g_free( importing_id );
......
......@@ -37,7 +37,7 @@
*/
#include "base-assistant.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -65,7 +65,7 @@ typedef struct {
GType fma_assistant_import_get_type( void );
void fma_assistant_import_run ( NactMainWindow *main_window );
void fma_assistant_import_run ( FMAMainWindow *main_window );
G_END_DECLS
......
......@@ -41,7 +41,7 @@
#include "fma-application.h"
#include "fma-export-ask.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "nact-tree-model.h"
#include "fma-clipboard.h"
......@@ -72,7 +72,7 @@ typedef struct {
struct _FMAClipboardPrivate {
gboolean dispose_has_run;
NactMainWindow *window;
FMAMainWindow *window;
GtkClipboard *dnd;
GtkClipboard *primary;
PrimaryData *primary_data;
......@@ -258,7 +258,7 @@ instance_finalize( GObject *instance )
* Returns: a new #FMAClipboard object.
*/
FMAClipboard *
fma_clipboard_new( NactMainWindow *window )
fma_clipboard_new( FMAMainWindow *window )
{
FMAClipboard *clipboard;
......
......@@ -42,7 +42,7 @@
#include <gtk/gtk.h>
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -90,7 +90,7 @@ enum {
GType fma_clipboard_get_type ( void );
FMAClipboard *fma_clipboard_new ( NactMainWindow *window );
FMAClipboard *fma_clipboard_new ( FMAMainWindow *window );
void fma_clipboard_dnd_set ( FMAClipboard *clipboard,
guint target,
......
......@@ -34,7 +34,7 @@
#include "core/fma-settings.h"
#include "fma-confirm-logout.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
#include "nact-menu-file.h"
/* private instance data
......@@ -206,19 +206,19 @@ instance_finalize( GObject *dialog )
/**
* fma_confirm_logout_run:
* @parent: the NactMainWindow parent of this dialog
* (usually the NactMainWindow).
* @parent: the FMAMainWindow parent of this dialog
* (usually the FMAMainWindow).
*
* Initializes and runs the dialog.
*/
gboolean
fma_confirm_logout_run( NactMainWindow *parent )
fma_confirm_logout_run( FMAMainWindow *parent )
{
static const gchar *thisfn = "fma_confirm_logout_run";
FMAConfirmLogout *dialog;
gboolean willing_to;
g_return_val_if_fail( NACT_IS_MAIN_WINDOW( parent ), TRUE );
g_return_val_if_fail( FMA_IS_MAIN_WINDOW( parent ), TRUE );
g_debug( "%s: parent=%p", thisfn, ( void * ) parent );
......@@ -293,11 +293,11 @@ static void
on_save_and_quit_clicked( GtkButton *button, FMAConfirmLogout *editor )
{
static const gchar *thisfn = "fma_confirm_logout_on_cancel_clicked";
NactMainWindow *main_window;
FMAMainWindow *main_window;
g_debug( "%s: button=%p, editor=%p", thisfn, ( void * ) button, ( void * ) editor );
main_window = NACT_MAIN_WINDOW( base_window_get_main_window( BASE_WINDOW( editor )));
main_window = FMA_MAIN_WINDOW( base_window_get_main_window( BASE_WINDOW( editor )));
nact_menu_file_save_items( main_window );
close_dialog( editor, TRUE );
......
......@@ -40,7 +40,7 @@
*/
#include "base-dialog.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -68,7 +68,7 @@ typedef struct {
GType fma_confirm_logout_get_type( void );
gboolean fma_confirm_logout_run ( NactMainWindow *parent );
gboolean fma_confirm_logout_run ( FMAMainWindow *parent );
G_END_DECLS
......
......@@ -43,7 +43,7 @@
#include "base-gtk-utils.h"
#include "fma-application.h"
#include "fma-export-ask.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
/* private instance data
*/
......
......@@ -44,7 +44,7 @@
#include "nact-statusbar.h"
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "fma-iaction-tab.h"
#include "fma-icon-chooser.h"
#include "nact-tree-view.h"
......@@ -181,7 +181,7 @@ fma_iaction_tab_init( FMAIActionTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_ACTION );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_ACTION );
initialize_gtk( instance );
initialize_window( instance );
......@@ -241,7 +241,7 @@ initialize_window( FMAIActionTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
......@@ -346,7 +346,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActio
GtkToggleButton *toggle;
IActionData *data;
g_return_if_fail( instance && NACT_IS_MAIN_WINDOW( instance ));
g_return_if_fail( instance && FMA_IS_MAIN_WINDOW( instance ));
g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
count_selected = g_list_length( selected_items );
......@@ -356,7 +356,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActio
instance, G_OBJECT_TYPE_NAME( instance ));
enable_tab = ( count_selected == 1 );
fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_ACTION, enable_tab );
fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_ACTION, enable_tab );
data = get_iaction_data( instance );
data->on_selection_change = TRUE;
......@@ -547,7 +547,7 @@ check_for_label( FMAIActionTab *instance, GtkEntry *entry, const gchar *label )
g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
g_return_if_fail( GTK_IS_ENTRY( entry ));
bar = nact_main_window_get_statusbar( NACT_MAIN_WINDOW( instance ));
bar = fma_main_window_get_statusbar( FMA_MAIN_WINDOW( instance ));
nact_statusbar_hide_status( bar, IACTION_TAB_CONTEXT );
set_label_label( instance, "black" );
......@@ -843,7 +843,7 @@ on_icon_browse( GtkButton *button, FMAIActionTab *instance )
if( item ){
icon_name = fma_object_get_icon( item );
new_icon_name = fma_icon_chooser_choose_icon( NACT_MAIN_WINDOW( instance ), icon_name );
new_icon_name = fma_icon_chooser_choose_icon( FMA_MAIN_WINDOW( instance ), icon_name );
if( g_utf8_collate( icon_name, new_icon_name ) != 0 ){
icon_entry = base_window_get_widget( BASE_WINDOW( instance ), "ActionIconEntry" );
......
......@@ -40,7 +40,7 @@
#include "base-gtk-utils.h"
#include "fma-ibasenames-tab.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
/* private interface data
......@@ -164,7 +164,7 @@ fma_ibasenames_tab_init( FMAIBasenamesTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_BASENAMES );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_BASENAMES );
initialize_gtk( instance );
initialize_window( instance );
......@@ -191,7 +191,7 @@ initialize_gtk( FMAIBasenamesTab *instance )
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
NACT_MAIN_WINDOW( instance ),
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_BASENAMES,
fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "BasenamesTreeView" ),
......@@ -224,7 +224,7 @@ initialize_window( FMAIBasenamesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
......@@ -249,7 +249,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIBasen
NULL );
enable_tab = ( context != NULL );
fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_BASENAMES, enable_tab );
fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_BASENAMES, enable_tab );
data = get_ibasenames_data( FMA_IBASENAMES_TAB( instance ));
data->on_selection_change = TRUE;
......
......@@ -39,7 +39,7 @@
#include "core/fma-gtk-utils.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-add-capability-dialog.h"
#include "fma-icapabilities-tab.h"
......@@ -152,7 +152,7 @@ fma_icapabilities_tab_init( FMAICapabilitiesTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_CAPABILITIES );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_CAPABILITIES );
initialize_gtk( instance );
initialize_window( instance );
......@@ -170,7 +170,7 @@ initialize_gtk( FMAICapabilitiesTab *instance )
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
nact_match_list_init_with_args(
NACT_MAIN_WINDOW( instance ),
FMA_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_CAPABILITIES,
fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CapabilitiesTreeView" ),
......@@ -196,7 +196,7 @@ initialize_window( FMAICapabilitiesTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
......@@ -215,7 +215,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICapab
NULL );
enable_tab = ( context != NULL );
fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_CAPABILITIES, enable_tab );
fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_CAPABILITIES, enable_tab );
}
static void
......@@ -228,11 +228,11 @@ on_add_clicked( GtkButton *button, FMAICapabilitiesTab *instance )
g_object_get( G_OBJECT( instance ), MAIN_PROP_CONTEXT, &context, NULL );
if( context ){
capabilities = nact_match_list_get_rows( NACT_MAIN_WINDOW( instance ), ITAB_NAME );
new_cap = fma_add_capability_dialog_run( NACT_MAIN_WINDOW( instance ), capabilities );
capabilities = nact_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
new_cap = fma_add_capability_dialog_run( FMA_MAIN_WINDOW( instance ), capabilities );
if( new_cap ){
nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, new_cap, FALSE, FALSE );
nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_cap, FALSE, FALSE );
g_free( new_cap );
}
......
......@@ -45,7 +45,7 @@
#include "nact-statusbar.h"
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "fma-icommand-tab.h"
#include "fma-ischemes-tab.h"
......@@ -190,7 +190,7 @@ fma_icommand_tab_init( FMAICommandTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_COMMAND );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_COMMAND );
data = get_icommand_data( instance );
data->on_selection_change = FALSE;
data->tokens = NULL;
......@@ -268,7 +268,7 @@ initialize_window( FMAICommandTab *instance )
GTK_CONTAINER( instance ), "CommandWorkingDirectoryButton",
"clicked", G_CALLBACK( on_wdir_browse ), instance );
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
......@@ -333,7 +333,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIComma
thisfn, ( void * ) profile, G_OBJECT_TYPE_NAME( profile ));
enable_tab = ( profile != NULL );
fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_COMMAND, enable_tab );
fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_COMMAND, enable_tab );
data = get_icommand_data( instance );
data->on_selection_change = TRUE;
......
......@@ -37,7 +37,7 @@
#include "fma-application.h"
#include "base-gtk-utils.h"
#include "fma-icon-chooser.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
/* private class data
*/
......@@ -307,7 +307,7 @@ instance_finalize( GObject *dialog )
* by the caller.
*/
gchar *
fma_icon_chooser_choose_icon( NactMainWindow *parent, const gchar *icon_name )
fma_icon_chooser_choose_icon( FMAMainWindow *parent, const gchar *icon_name )
{
static const gchar *thisfn = "fma_icon_chooser_choose_icon";
FMAIconChooser *editor;
......
......@@ -39,7 +39,7 @@
*/
#include "base-dialog.h"
#include "nact-main-window-def.h"
#include "fma-main-window-def.h"
G_BEGIN_DECLS
......@@ -70,7 +70,7 @@ typedef struct {
GType fma_icon_chooser_get_type ( void );
gchar *fma_icon_chooser_choose_icon( NactMainWindow *main_window, const gchar *icon_name );
gchar *fma_icon_chooser_choose_icon( FMAMainWindow *main_window, const gchar *icon_name );
G_END_DECLS
......
......@@ -45,7 +45,7 @@
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "fma-ienvironment-tab.h"
/* private interface data
......@@ -214,7 +214,7 @@ fma_ienvironment_tab_init( FMAIEnvironmentTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_ENVIRONMENT );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_ENVIRONMENT );
initialize_gtk( instance );
initialize_window( instance );
......@@ -269,7 +269,7 @@ initialize_window( FMAIEnvironmentTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
......@@ -375,7 +375,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIEnvir
NULL );
enable_tab = ( context != NULL );
fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_ENVIRONMENT, enable_tab );
fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_ENVIRONMENT, enable_tab );
data = get_ienviron_data( instance );
data->on_selection_change = TRUE;
......
......@@ -39,7 +39,7 @@
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
#include "nact-main-window.h"
#include "fma-main-window.h"
#include "fma-iexecution-tab.h"
/* private interface data
......@@ -163,7 +163,7 @@ fma_iexecution_tab_init( FMAIExecutionTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_EXECUTION );
fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_EXECUTION );
initialize_window( instance );
data = get_iexecution_data( instance );
......@@ -190,7 +190,7 @@ initialize_window( FMAIExecutionTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
tview = nact_main_window_get_items_view( NACT_MAIN_WINDOW( instance ));
tview = fma_main_window_get_items_view( FMA_MAIN_WINDOW( instance ));