[nautilus-actions/file-manager-actions] NactMainWindow class is renamed to FMAMainWindow
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NactMainWindow class is renamed to FMAMainWindow
- Date: Tue, 8 Sep 2015 19:00:32 +0000 (UTC)
commit 7c8aa62272c361bdf817f5a2f9f46506981bb915
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 20:11:04 2015 +0200
NactMainWindow class is renamed to FMAMainWindow
src/ui/Makefile.am | 8 +-
src/ui/base-gtk-utils.c | 6 +-
src/ui/fma-add-capability-dialog.c | 4 +-
src/ui/fma-add-capability-dialog.h | 4 +-
src/ui/fma-add-scheme-dialog.c | 6 +-
src/ui/fma-add-scheme-dialog.h | 4 +-
src/ui/fma-application.c | 12 +-
src/ui/fma-assistant-export.c | 12 +-
src/ui/fma-assistant-export.h | 4 +-
src/ui/fma-assistant-import.c | 18 +-
src/ui/fma-assistant-import.h | 4 +-
src/ui/fma-clipboard.c | 6 +-
src/ui/fma-clipboard.h | 4 +-
src/ui/fma-confirm-logout.c | 14 +-
src/ui/fma-confirm-logout.h | 4 +-
src/ui/fma-export-ask.c | 2 +-
src/ui/fma-iaction-tab.c | 14 +-
src/ui/fma-ibasenames-tab.c | 10 +-
src/ui/fma-icapabilities-tab.c | 16 +-
src/ui/fma-icommand-tab.c | 8 +-
src/ui/fma-icon-chooser.c | 4 +-
src/ui/fma-icon-chooser.h | 4 +-
src/ui/fma-ienvironment-tab.c | 8 +-
src/ui/fma-iexecution-tab.c | 8 +-
src/ui/fma-ifolders-tab.c | 12 +-
src/ui/fma-imimetypes-tab.c | 10 +-
src/ui/fma-iproperties-tab.c | 8 +-
src/ui/fma-ischemes-tab.c | 16 +-
src/ui/fma-main-tab.c | 16 +-
src/ui/fma-main-tab.h | 8 +-
src/ui/{nact-main-window.c => fma-main-window.c} | 294 ++++++++++----------
src/ui/{nact-main-window.h => fma-main-window.h} | 30 +-
src/ui/{nact-main-window.ui => fma-main-window.ui} | 0
src/ui/nact-main-window-def.h | 34 ++--
src/ui/nact-match-list.c | 22 +-
src/ui/nact-match-list.h | 12 +-
src/ui/nact-menu-edit.c | 66 +++---
src/ui/nact-menu-edit.h | 16 +-
src/ui/nact-menu-file.c | 62 ++--
src/ui/nact-menu-file.h | 14 +-
src/ui/nact-menu-view.c | 34 ++--
src/ui/nact-menu-view.h | 12 +-
src/ui/nact-menu.c | 140 +++++-----
src/ui/nact-menu.h | 8 +-
src/ui/nact-preferences-editor.c | 8 +-
src/ui/nact-preferences-editor.h | 4 +-
src/ui/nact-sort-buttons.c | 14 +-
src/ui/nact-sort-buttons.h | 4 +-
src/ui/nact-statusbar.h | 2 +-
src/ui/nact-tree-ieditable.c | 6 +-
src/ui/nact-tree-ieditable.h | 4 +-
src/ui/nact-tree-model-dnd.c | 56 ++--
src/ui/nact-tree-model-priv.h | 2 +-
src/ui/nact-tree-model.c | 8 +-
src/ui/nact-tree-model.h | 4 +-
src/ui/nact-tree-view.c | 8 +-
src/ui/nact-tree-view.h | 8 +-
57 files changed, 563 insertions(+), 563 deletions(-)
---
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 6289423..1241ff8 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -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)
diff --git a/src/ui/base-gtk-utils.c b/src/ui/base-gtk-utils.c
index 77abe73..44c4162 100644
--- a/src/ui/base-gtk-utils.c
+++ b/src/ui/base-gtk-utils.c
@@ -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.
diff --git a/src/ui/fma-add-capability-dialog.c b/src/ui/fma-add-capability-dialog.c
index fed1087..8ea0447 100644
--- a/src/ui/fma-add-capability-dialog.c
+++ b/src/ui/fma-add-capability-dialog.c
@@ -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;
diff --git a/src/ui/fma-add-capability-dialog.h b/src/ui/fma-add-capability-dialog.h
index db00e58..a0ce0f6 100644
--- a/src/ui/fma-add-capability-dialog.h
+++ b/src/ui/fma-add-capability-dialog.h
@@ -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
diff --git a/src/ui/fma-add-scheme-dialog.c b/src/ui/fma-add-scheme-dialog.c
index 5f7b3ab..a2da1a9 100644
--- a/src/ui/fma-add-scheme-dialog.c
+++ b/src/ui/fma-add-scheme-dialog.c
@@ -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;
diff --git a/src/ui/fma-add-scheme-dialog.h b/src/ui/fma-add-scheme-dialog.h
index ef51e7e..7c8ca01 100644
--- a/src/ui/fma-add-scheme-dialog.h
+++ b/src/ui/fma-add-scheme-dialog.h
@@ -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
diff --git a/src/ui/fma-application.c b/src/ui/fma-application.c
index 5e08dcc..9005a39 100644
--- a/src/ui/fma-application.c
+++ b/src/ui/fma-application.c
@@ -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 ));
}
diff --git a/src/ui/fma-assistant-export.c b/src/ui/fma-assistant-export.c
index a4a8f7a..a6bced1 100644
--- a/src/ui/fma-assistant-export.c
+++ b/src/ui/fma-assistant-export.c
@@ -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 );
diff --git a/src/ui/fma-assistant-export.h b/src/ui/fma-assistant-export.h
index 541521e..4704566 100644
--- a/src/ui/fma-assistant-export.h
+++ b/src/ui/fma-assistant-export.h
@@ -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
diff --git a/src/ui/fma-assistant-import.c b/src/ui/fma-assistant-import.c
index a7a4c22..c84d737 100644
--- a/src/ui/fma-assistant-import.c
+++ b/src/ui/fma-assistant-import.c
@@ -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 );
diff --git a/src/ui/fma-assistant-import.h b/src/ui/fma-assistant-import.h
index 51219cd..3bc94f3 100644
--- a/src/ui/fma-assistant-import.h
+++ b/src/ui/fma-assistant-import.h
@@ -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
diff --git a/src/ui/fma-clipboard.c b/src/ui/fma-clipboard.c
index 1dbc5fb..9a882bd 100644
--- a/src/ui/fma-clipboard.c
+++ b/src/ui/fma-clipboard.c
@@ -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;
diff --git a/src/ui/fma-clipboard.h b/src/ui/fma-clipboard.h
index 3019180..9809754 100644
--- a/src/ui/fma-clipboard.h
+++ b/src/ui/fma-clipboard.h
@@ -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,
diff --git a/src/ui/fma-confirm-logout.c b/src/ui/fma-confirm-logout.c
index dd1e7a2..29350ff 100644
--- a/src/ui/fma-confirm-logout.c
+++ b/src/ui/fma-confirm-logout.c
@@ -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 );
diff --git a/src/ui/fma-confirm-logout.h b/src/ui/fma-confirm-logout.h
index 567ad99..bc3f4a4 100644
--- a/src/ui/fma-confirm-logout.h
+++ b/src/ui/fma-confirm-logout.h
@@ -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
diff --git a/src/ui/fma-export-ask.c b/src/ui/fma-export-ask.c
index 487bdd5..e06cff6 100644
--- a/src/ui/fma-export-ask.c
+++ b/src/ui/fma-export-ask.c
@@ -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
*/
diff --git a/src/ui/fma-iaction-tab.c b/src/ui/fma-iaction-tab.c
index 2c14303..9d3fd7d 100644
--- a/src/ui/fma-iaction-tab.c
+++ b/src/ui/fma-iaction-tab.c
@@ -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" );
diff --git a/src/ui/fma-ibasenames-tab.c b/src/ui/fma-ibasenames-tab.c
index 45319e2..0ef5685 100644
--- a/src/ui/fma-ibasenames-tab.c
+++ b/src/ui/fma-ibasenames-tab.c
@@ -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;
diff --git a/src/ui/fma-icapabilities-tab.c b/src/ui/fma-icapabilities-tab.c
index 619da71..ad32f18 100644
--- a/src/ui/fma-icapabilities-tab.c
+++ b/src/ui/fma-icapabilities-tab.c
@@ -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 );
}
diff --git a/src/ui/fma-icommand-tab.c b/src/ui/fma-icommand-tab.c
index 4733ead..877a8cc 100644
--- a/src/ui/fma-icommand-tab.c
+++ b/src/ui/fma-icommand-tab.c
@@ -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;
diff --git a/src/ui/fma-icon-chooser.c b/src/ui/fma-icon-chooser.c
index 61fad72..d3c7b8d 100644
--- a/src/ui/fma-icon-chooser.c
+++ b/src/ui/fma-icon-chooser.c
@@ -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;
diff --git a/src/ui/fma-icon-chooser.h b/src/ui/fma-icon-chooser.h
index 4e7b449..94469f8 100644
--- a/src/ui/fma-icon-chooser.h
+++ b/src/ui/fma-icon-chooser.h
@@ -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
diff --git a/src/ui/fma-ienvironment-tab.c b/src/ui/fma-ienvironment-tab.c
index 0bfbe1c..8067b66 100644
--- a/src/ui/fma-ienvironment-tab.c
+++ b/src/ui/fma-ienvironment-tab.c
@@ -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;
diff --git a/src/ui/fma-iexecution-tab.c b/src/ui/fma-iexecution-tab.c
index b4d8fd5..17bf56c 100644
--- a/src/ui/fma-iexecution-tab.c
+++ b/src/ui/fma-iexecution-tab.c
@@ -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 ));
g_signal_connect(
tview, TREE_SIGNAL_SELECTION_CHANGED,
@@ -254,7 +254,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIExecu
NULL );
enable_tab = ( profile != NULL );
- fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_EXECUTION, enable_tab );
+ fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_EXECUTION, enable_tab );
data = get_iexecution_data( instance );
data->on_selection_change = TRUE;
diff --git a/src/ui/fma-ifolders-tab.c b/src/ui/fma-ifolders-tab.c
index 2bae7dc..a648346 100644
--- a/src/ui/fma-ifolders-tab.c
+++ b/src/ui/fma-ifolders-tab.c
@@ -42,7 +42,7 @@
#include "base-gtk-utils.h"
#include "fma-application.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-match-list.h"
#include "fma-ifolders-tab.h"
@@ -156,7 +156,7 @@ fma_ifolders_tab_init( FMAIFoldersTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_FOLDERS );
+ fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_FOLDERS );
initialize_gtk( instance );
initialize_window( instance );
@@ -174,7 +174,7 @@ initialize_gtk( FMAIFoldersTab *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_FOLDERS,
fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FoldersTreeView" ),
@@ -200,7 +200,7 @@ initialize_window( FMAIFoldersTab *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,
@@ -224,7 +224,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIFolde
NULL );
enable_tab = ( context != NULL );
- fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_FOLDERS, enable_tab );
+ fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_FOLDERS, enable_tab );
button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FolderBrowseButton" );
base_gtk_utils_set_editable( G_OBJECT( button ), editable );
@@ -260,7 +260,7 @@ on_browse_folder_clicked( GtkButton *button, FMAIFoldersTab *instance )
uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
fma_settings_set_string( IPREFS_FOLDER_CHOOSER_URI, uri );
path = g_filename_from_uri( uri, NULL, NULL );
- nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, path, FALSE, FALSE );
+ nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, path, FALSE, FALSE );
g_free( path );
g_free( uri );
}
diff --git a/src/ui/fma-imimetypes-tab.c b/src/ui/fma-imimetypes-tab.c
index 1f6ee75..ff15a36 100644
--- a/src/ui/fma-imimetypes-tab.c
+++ b/src/ui/fma-imimetypes-tab.c
@@ -38,7 +38,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-imimetypes-tab.h"
@@ -151,7 +151,7 @@ fma_imimetypes_tab_init( FMAIMimetypesTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_MIMETYPES );
+ fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_MIMETYPES );
initialize_gtk( instance );
initialize_window( instance );
@@ -175,7 +175,7 @@ initialize_gtk( FMAIMimetypesTab *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_MIMETYPES,
fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "MimetypesTreeView" ),
@@ -208,7 +208,7 @@ initialize_window( FMAIMimetypesTab *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,
@@ -227,7 +227,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIMimet
NULL );
enable_tab = ( context != NULL );
- fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_MIMETYPES, enable_tab );
+ fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_MIMETYPES, enable_tab );
}
static GSList *
diff --git a/src/ui/fma-iproperties-tab.c b/src/ui/fma-iproperties-tab.c
index ee8db02..6ce0e7a 100644
--- a/src/ui/fma-iproperties-tab.c
+++ b/src/ui/fma-iproperties-tab.c
@@ -43,7 +43,7 @@
#include "base-gtk-utils.h"
#include "fma-iproperties-tab.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
/* private interface data
*/
@@ -168,7 +168,7 @@ fma_iproperties_tab_init( FMAIPropertiesTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_PROPERTIES );
+ fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_PROPERTIES );
initialize_window( instance );
data = get_iproperties_data( instance );
@@ -191,7 +191,7 @@ initialize_window( FMAIPropertiesTab *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,
@@ -252,7 +252,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIPrope
g_return_if_fail( !item || FMA_IS_OBJECT_ITEM( item ));
enable_tab = ( count_selected == 1 );
- fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_PROPERTIES, enable_tab );
+ fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_PROPERTIES, enable_tab );
data = get_iproperties_data( instance );
data->on_selection_change = TRUE;
diff --git a/src/ui/fma-ischemes-tab.c b/src/ui/fma-ischemes-tab.c
index e94c2bc..619746b 100644
--- a/src/ui/fma-ischemes-tab.c
+++ b/src/ui/fma-ischemes-tab.c
@@ -40,7 +40,7 @@
#include "base-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-scheme-dialog.h"
#include "fma-ischemes-tab.h"
@@ -155,7 +155,7 @@ fma_ischemes_tab_init( FMAISchemesTab *instance )
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- fma_main_tab_init( NACT_MAIN_WINDOW( instance ), TAB_SCHEMES );
+ fma_main_tab_init( FMA_MAIN_WINDOW( instance ), TAB_SCHEMES );
initialize_gtk( instance );
initialize_window( instance );
@@ -173,7 +173,7 @@ initialize_gtk( FMAISchemesTab *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_SCHEMES,
fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SchemesTreeView" ),
@@ -199,7 +199,7 @@ initialize_window( FMAISchemesTab *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,
@@ -223,7 +223,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAISchem
NULL );
enable_tab = ( context != NULL );
- fma_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_SCHEMES, enable_tab );
+ fma_main_tab_enable_page( FMA_MAIN_WINDOW( instance ), TAB_SCHEMES, enable_tab );
button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddFromDefaultButton" );
base_gtk_utils_set_editable( G_OBJECT( button ), editable );
@@ -239,12 +239,12 @@ on_add_from_defaults( GtkButton *button, FMAISchemesTab *instance )
g_object_get( G_OBJECT( instance ), MAIN_PROP_CONTEXT, &context, NULL );
g_return_if_fail( context );
- schemes = nact_match_list_get_rows( NACT_MAIN_WINDOW( instance ), ITAB_NAME );
- new_scheme = fma_add_scheme_dialog_run( NACT_MAIN_WINDOW( instance ), schemes );
+ schemes = nact_match_list_get_rows( FMA_MAIN_WINDOW( instance ), ITAB_NAME );
+ new_scheme = fma_add_scheme_dialog_run( FMA_MAIN_WINDOW( instance ), schemes );
fma_core_utils_slist_free( schemes );
if( new_scheme ){
- nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, new_scheme, FALSE, FALSE
);
+ nact_match_list_insert_row( FMA_MAIN_WINDOW( instance ), ITAB_NAME, new_scheme, FALSE, FALSE
);
g_free( new_scheme );
}
}
diff --git a/src/ui/fma-main-tab.c b/src/ui/fma-main-tab.c
index 2da8945..49bae2a 100644
--- a/src/ui/fma-main-tab.c
+++ b/src/ui/fma-main-tab.c
@@ -36,24 +36,24 @@
#include "core/fma-gtk-utils.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
/**
* fma_main_tab_init:
- * @window: the #NactMainWindow.
+ * @window: the #FMAMainWindow.
* @num_page: the page number, starting from zero.
*
* Common initialization of each page of the notebook.
* (provided that the page has itself called fma_main_tab_init())
*/
void
-fma_main_tab_init( NactMainWindow *main_window, gint num_page )
+fma_main_tab_init( FMAMainWindow *main_window, gint num_page )
{
GtkWidget *notebook;
GtkWidget *page;
const gchar *text;
- /* popup menu is enabled in NactMainWindow::setup_main_ui()
+ /* popup menu is enabled in FMAMainWindow::setup_main_ui()
* but the displayed labels default to be those of the tab, i.e. embed
* an underscore as an accelerator - so get rid of this
*/
@@ -66,14 +66,14 @@ fma_main_tab_init( NactMainWindow *main_window, gint num_page )
/**
* fma_main_tab_enable_page:
- * @window: the #NactMainWindow.
+ * @window: the #FMAMainWindow.
* @num_page: the page number, starting from zero.
* @enabled: whether the tab should be set sensitive or not.
*
* Set the sensitivity of the tab.
*/
void
-fma_main_tab_enable_page( NactMainWindow *window, gint num_page, gboolean enabled )
+fma_main_tab_enable_page( FMAMainWindow *window, gint num_page, gboolean enabled )
{
GtkWidget *notebook;
GtkWidget *page, *label;
@@ -89,13 +89,13 @@ fma_main_tab_enable_page( NactMainWindow *window, gint num_page, gboolean enable
/**
* fma_main_tab_is_page_enabled:
- * @window: the #NactMainWindow.
+ * @window: the #FMAMainWindow.
* @num_page: the page number, starting from zero.
*
* Returns: %TRUE if the tab is sensitive, %FALSE else.
*/
gboolean
-fma_main_tab_is_page_enabled( NactMainWindow *window, gint num_page )
+fma_main_tab_is_page_enabled( FMAMainWindow *window, gint num_page )
{
gboolean is_sensitive;
GtkWidget *notebook, *page;
diff --git a/src/ui/fma-main-tab.h b/src/ui/fma-main-tab.h
index 7d48766..84efc9c 100644
--- a/src/ui/fma-main-tab.h
+++ b/src/ui/fma-main-tab.h
@@ -32,7 +32,7 @@
#include <api/fma-icontext.h>
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
/**
* SECTION: fma_main_tab
@@ -57,9 +57,9 @@ enum {
TAB_PROPERTIES
};
-void fma_main_tab_init ( NactMainWindow *window, gint page );
-void fma_main_tab_enable_page ( NactMainWindow *window, gint page, gboolean enabled );
-gboolean fma_main_tab_is_page_enabled( NactMainWindow *window, gint page );
+void fma_main_tab_init ( FMAMainWindow *window, gint page );
+void fma_main_tab_enable_page ( FMAMainWindow *window, gint page, gboolean enabled );
+gboolean fma_main_tab_is_page_enabled( FMAMainWindow *window, gint page );
G_END_DECLS
diff --git a/src/ui/nact-main-window.c b/src/ui/fma-main-window.c
similarity index 80%
rename from src/ui/nact-main-window.c
rename to src/ui/fma-main-window.c
index 885c4d2..1d6c26f 100644
--- a/src/ui/nact-main-window.c
+++ b/src/ui/fma-main-window.c
@@ -53,7 +53,7 @@
#include "fma-iexecution-tab.h"
#include "fma-iproperties-tab.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-menu.h"
#include "nact-statusbar.h"
#include "nact-tree-view.h"
@@ -62,10 +62,10 @@
/* private instance data
*/
-struct _NactMainWindowPrivate {
+struct _FMAMainWindowPrivate {
gboolean dispose_has_run;
- FMAUpdater *updater;
+ FMAUpdater *updater;
/**
* Current action or menu.
@@ -81,8 +81,8 @@ struct _NactMainWindowPrivate {
* This is the actual current writability status of the item at this time.
*/
FMAObjectItem *current_item;
- gboolean editable;
- guint reason;
+ gboolean editable;
+ guint reason;
/**
* Current profile.
@@ -112,13 +112,13 @@ struct _NactMainWindowPrivate {
/**
* Some convenience objects and data.
*/
- NactTreeView *items_view;
- gboolean is_tree_modified;
- FMAClipboard *clipboard;
- NactStatusbar *statusbar;
- NactSortButtons *sort_buttons;
+ NactTreeView *items_view;
+ gboolean is_tree_modified;
+ FMAClipboard *clipboard;
+ NactStatusbar *statusbar;
+ NactSortButtons *sort_buttons;
- gulong pivot_handler_id;
+ gulong pivot_handler_id;
FMATimeout pivot_timeout;
};
@@ -145,7 +145,7 @@ enum {
LAST_SIGNAL
};
-static const gchar *st_xmlui_filename = PKGUIDIR "/nact-main-window.ui";
+static const gchar *st_xmlui_filename = PKGUIDIR "/fma-main-window.ui";
static const gchar *st_toplevel_name = "MainWindow";
static const gchar *st_wsp_name = IPREFS_MAIN_WINDOW_WSP;
@@ -154,7 +154,7 @@ static BaseWindowClass *st_parent_class = NULL;
static guint st_signals[ LAST_SIGNAL ] = { 0 };
static GType register_type( void );
-static void class_init( NactMainWindowClass *klass );
+static void class_init( FMAMainWindowClass *klass );
static void iaction_tab_iface_init( FMAIActionTabInterface *iface, void *user_data );
static void icommand_tab_iface_init( FMAICommandTabInterface *iface, void *user_data );
static void ibasenames_tab_iface_init( FMAIBasenamesTabInterface *iface, void *user_data );
@@ -170,30 +170,30 @@ static void instance_get_property( GObject *object, guint property_id, GVa
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec
*spec );
static void instance_dispose( GObject *window );
static void instance_finalize( GObject *window );
-static void setup_main_ui( NactMainWindow *main_window );
-static void setup_treeview( NactMainWindow *main_window );
-static void setup_monitor_pivot( NactMainWindow *main_window );
-static void on_block_items_changed_timeout( NactMainWindow *window );
-static void on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified,
NactMainWindow *window );
-static void on_tree_view_selection_changed( NactTreeView *treeview, GList *selected_items,
NactMainWindow *window );
-static void on_tab_item_updated( NactMainWindow *window, FMAIContext *context, guint data, void *empty
);
-static void raz_selection_properties( NactMainWindow *window );
-static void setup_current_selection( NactMainWindow *window, FMAObjectId *selected_row );
-static void setup_dialog_title( NactMainWindow *window );
-static void setup_writability_status( NactMainWindow *window );
+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_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 );
+static void setup_dialog_title( FMAMainWindow *window );
+static void setup_writability_status( FMAMainWindow *window );
/* items have changed */
-static void on_pivot_items_changed( FMAUpdater *updater, NactMainWindow *window );
-static gboolean confirm_for_giveup_from_pivot( const NactMainWindow *window );
-static gboolean confirm_for_giveup_from_menu( const NactMainWindow *window );
-static void load_or_reload_items( NactMainWindow *window );
+static void on_pivot_items_changed( FMAUpdater *updater, FMAMainWindow *window );
+static gboolean confirm_for_giveup_from_pivot( const FMAMainWindow *window );
+static gboolean confirm_for_giveup_from_menu( const FMAMainWindow *window );
+static void load_or_reload_items( FMAMainWindow *window );
/* application termination */
static gboolean on_delete_event( GtkWidget *toplevel, GdkEvent *event, void *empty );
-static gboolean warn_modified( NactMainWindow *window );
+static gboolean warn_modified( FMAMainWindow *window );
GType
-nact_main_window_get_type( void )
+fma_main_window_get_type( void )
{
static GType window_type = 0;
@@ -207,17 +207,17 @@ nact_main_window_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "nact_main_window_register_type";
+ static const gchar *thisfn = "fma_main_window_register_type";
GType type;
static GTypeInfo info = {
- sizeof( NactMainWindowClass ),
+ sizeof( FMAMainWindowClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactMainWindow ),
+ sizeof( FMAMainWindow ),
0,
( GInstanceInitFunc ) instance_init
};
@@ -284,7 +284,7 @@ register_type( void )
g_debug( "%s", thisfn );
- type = g_type_register_static( GTK_TYPE_APPLICATION_WINDOW, "NactMainWindow", &info, 0 );
+ type = g_type_register_static( GTK_TYPE_APPLICATION_WINDOW, "FMAMainWindow", &info, 0 );
g_type_add_interface_static( type, FMA_TYPE_IACTION_TAB, &iaction_tab_iface_info );
@@ -310,9 +310,9 @@ register_type( void )
}
static void
-class_init( NactMainWindowClass *klass )
+class_init( FMAMainWindowClass *klass )
{
- static const gchar *thisfn = "nact_main_window_class_init";
+ static const gchar *thisfn = "fma_main_window_class_init";
GObjectClass *object_class;
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -363,7 +363,7 @@ class_init( NactMainWindowClass *klass )
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
/**
- * NactMainWindow::main-item-updated:
+ * FMAMainWindow::main-item-updated:
*
* This signal is emitted on the main window when an item is
* modified from the user interface
@@ -372,14 +372,14 @@ class_init( NactMainWindowClass *klass )
* - an OR-ed list of the modified data, or 0 if not relevant.
*
* Handler:
- * void handler( NactMainWindow *main_window,
+ * void handler( FMAMainWindow *main_window,
* FMAIContext *updated_context,
* guint updated_data,
* void *user_data );
*/
st_signals[ ITEM_UPDATED ] = g_signal_new(
MAIN_SIGNAL_ITEM_UPDATED,
- NACT_TYPE_MAIN_WINDOW,
+ FMA_TYPE_MAIN_WINDOW,
G_SIGNAL_RUN_LAST,
0, /* no default handler */
NULL,
@@ -391,19 +391,19 @@ class_init( NactMainWindowClass *klass )
G_TYPE_UINT );
/**
- * NactMainWindow::main-signal-update-sensitivities
+ * FMAMainWindow::main-signal-update-sensitivities
*
- * This signal is emitted on the NactMainWindow when any menu item
+ * This signal is emitted on the FMAMainWindow when any menu item
* sensitivity has to be refreshed.
*
* Signal arg.: None
*
* Handler prototype:
- * void handler( NactMainWindow *main_window, gpointer user_data );
+ * void handler( FMAMainWindow *main_window, gpointer user_data );
*/
st_signals[ UPDATE_SENSITIVITIES ] = g_signal_new(
MAIN_SIGNAL_UPDATE_SENSITIVITIES,
- NACT_TYPE_MAIN_WINDOW,
+ FMA_TYPE_MAIN_WINDOW,
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0, /* no default handler */
NULL,
@@ -416,7 +416,7 @@ class_init( NactMainWindowClass *klass )
static void
iaction_tab_iface_init( FMAIActionTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_iaction_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_iaction_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -424,7 +424,7 @@ iaction_tab_iface_init( FMAIActionTabInterface *iface, void *user_data )
static void
icommand_tab_iface_init( FMAICommandTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_icommand_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_icommand_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -432,7 +432,7 @@ icommand_tab_iface_init( FMAICommandTabInterface *iface, void *user_data )
static void
ibasenames_tab_iface_init( FMAIBasenamesTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_ibasenames_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_ibasenames_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -440,7 +440,7 @@ ibasenames_tab_iface_init( FMAIBasenamesTabInterface *iface, void *user_data )
static void
imimetypes_tab_iface_init( FMAIMimetypesTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_imimetypes_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_imimetypes_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -448,7 +448,7 @@ imimetypes_tab_iface_init( FMAIMimetypesTabInterface *iface, void *user_data )
static void
ifolders_tab_iface_init( FMAIFoldersTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_ifolders_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_ifolders_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -456,7 +456,7 @@ ifolders_tab_iface_init( FMAIFoldersTabInterface *iface, void *user_data )
static void
ischemes_tab_iface_init( FMAISchemesTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_ischemes_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_ischemes_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -464,7 +464,7 @@ ischemes_tab_iface_init( FMAISchemesTabInterface *iface, void *user_data )
static void
icapabilities_tab_iface_init( FMAICapabilitiesTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_icapabilities_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_icapabilities_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -472,7 +472,7 @@ icapabilities_tab_iface_init( FMAICapabilitiesTabInterface *iface, void *user_da
static void
ienvironment_tab_iface_init( FMAIEnvironmentTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_ienvironment_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_ienvironment_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -480,7 +480,7 @@ ienvironment_tab_iface_init( FMAIEnvironmentTabInterface *iface, void *user_data
static void
iexecution_tab_iface_init( FMAIExecutionTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_iexecution_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_iexecution_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -488,7 +488,7 @@ iexecution_tab_iface_init( FMAIExecutionTabInterface *iface, void *user_data )
static void
iproperties_tab_iface_init( FMAIPropertiesTabInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_iproperties_tab_iface_init";
+ static const gchar *thisfn = "fma_main_window_iproperties_tab_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -496,17 +496,17 @@ iproperties_tab_iface_init( FMAIPropertiesTabInterface *iface, void *user_data )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_main_window_instance_init";
- NactMainWindow *self;
- NactMainWindowPrivate *priv;
+ static const gchar *thisfn = "fma_main_window_instance_init";
+ FMAMainWindow *self;
+ FMAMainWindowPrivate *priv;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( instance ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
- self = NACT_MAIN_WINDOW( instance );
- self->private = g_new0( NactMainWindowPrivate, 1 );
+ self = FMA_MAIN_WINDOW( instance );
+ self->private = g_new0( FMAMainWindowPrivate, 1 );
priv = self->private;
priv->dispose_has_run = FALSE;
@@ -521,10 +521,10 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- NactMainWindow *self;
+ FMAMainWindow *self;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( object ));
- self = NACT_MAIN_WINDOW( object );
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( object ));
+ self = FMA_MAIN_WINDOW( object );
if( !self->private->dispose_has_run ){
@@ -559,10 +559,10 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
- NactMainWindow *self;
+ FMAMainWindow *self;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( object ));
- self = NACT_MAIN_WINDOW( object );
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( object ));
+ self = FMA_MAIN_WINDOW( object );
if( !self->private->dispose_has_run ){
@@ -597,15 +597,15 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
static void
instance_dispose( GObject *window )
{
- static const gchar *thisfn = "nact_main_window_instance_dispose";
- NactMainWindow *self;
+ static const gchar *thisfn = "fma_main_window_instance_dispose";
+ FMAMainWindow *self;
GtkWidget *pane;
gint pos;
GtkNotebook *notebook;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
- self = NACT_MAIN_WINDOW( window );
+ self = FMA_MAIN_WINDOW( window );
if( !self->private->dispose_has_run ){
g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
@@ -632,14 +632,14 @@ instance_dispose( GObject *window )
static void
instance_finalize( GObject *window )
{
- static const gchar *thisfn = "nact_main_window_instance_finalize";
- NactMainWindow *self;
+ static const gchar *thisfn = "fma_main_window_instance_finalize";
+ FMAMainWindow *self;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
- self = NACT_MAIN_WINDOW( window );
+ self = FMA_MAIN_WINDOW( window );
g_free( self->private );
@@ -648,16 +648,16 @@ instance_finalize( GObject *window )
}
/**
- * Returns a newly allocated NactMainWindow object.
+ * Returns a newly allocated FMAMainWindow object.
*/
-NactMainWindow *
-nact_main_window_new( FMAApplication *application )
+FMAMainWindow *
+fma_main_window_new( FMAApplication *application )
{
- NactMainWindow *window;
+ FMAMainWindow *window;
g_return_val_if_fail( FMA_IS_APPLICATION( application ), NULL );
- window = g_object_new( NACT_TYPE_MAIN_WINDOW,
+ window = g_object_new( FMA_TYPE_MAIN_WINDOW,
"application", application, /* GtkWindow property */
NULL );
@@ -698,7 +698,7 @@ nact_main_window_new( FMAApplication *application )
* Load and initialize the user interface
*/
static void
-setup_main_ui( NactMainWindow *main_window )
+setup_main_ui( FMAMainWindow *main_window )
{
GtkBuilder *builder;
GObject *top_window;
@@ -761,9 +761,9 @@ setup_main_ui( NactMainWindow *main_window )
* setup the ActionsList treeview, and connect to management signals
*/
static void
-setup_treeview( NactMainWindow *main_window )
+setup_treeview( FMAMainWindow *main_window )
{
- NactMainWindowPrivate *priv;
+ FMAMainWindowPrivate *priv;
GtkWidget *top_widget;
priv = main_window->private;
@@ -792,9 +792,9 @@ setup_treeview( NactMainWindow *main_window )
* from outside of this application
*/
static void
-setup_monitor_pivot( NactMainWindow *main_window )
+setup_monitor_pivot( FMAMainWindow *main_window )
{
- NactMainWindowPrivate *priv;
+ FMAMainWindowPrivate *priv;
GtkApplication *application;
priv = main_window->private;
@@ -809,17 +809,17 @@ setup_monitor_pivot( NactMainWindow *main_window )
}
/**
- * nact_main_window_get_clipboard:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_get_clipboard:
+ * @window: this #FMAMainWindow instance.
*
* Returns: the #FMAClipboard convenience object.
*/
FMAClipboard *
-nact_main_window_get_clipboard( const NactMainWindow *window )
+fma_main_window_get_clipboard( const FMAMainWindow *window )
{
FMAClipboard *clipboard;
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), NULL );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( window ), NULL );
clipboard = NULL;
@@ -832,17 +832,17 @@ nact_main_window_get_clipboard( const NactMainWindow *window )
}
/**
- * nact_main_window_get_sort_buttons:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_get_sort_buttons:
+ * @window: this #FMAMainWindow instance.
*
* Returns: the #NactSortButtons object.
*/
NactSortButtons *
-nact_main_window_get_sort_buttons( const NactMainWindow *window )
+fma_main_window_get_sort_buttons( const FMAMainWindow *window )
{
NactSortButtons *buttons;
- g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), NULL );
+ g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), NULL );
buttons = NULL;
@@ -855,17 +855,17 @@ nact_main_window_get_sort_buttons( const NactMainWindow *window )
}
/**
- * nact_main_window_get_statusbar:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_get_statusbar:
+ * @window: this #FMAMainWindow instance.
*
* Returns: the #NactStatusbar object.
*/
NactStatusbar *
-nact_main_window_get_statusbar( const NactMainWindow *window )
+fma_main_window_get_statusbar( const FMAMainWindow *window )
{
NactStatusbar *bar;
- g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), NULL );
+ g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), NULL );
bar = NULL;
@@ -878,17 +878,17 @@ nact_main_window_get_statusbar( const NactMainWindow *window )
}
/**
- * nact_main_window_get_items_view:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_get_items_view:
+ * @window: this #FMAMainWindow instance.
*
* Returns: The #NactTreeView convenience object.
*/
NactTreeView *
-nact_main_window_get_items_view( const NactMainWindow *window )
+fma_main_window_get_items_view( const FMAMainWindow *window )
{
NactTreeView *view;
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), NULL );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( window ), NULL );
view = NULL;
@@ -901,19 +901,19 @@ nact_main_window_get_items_view( const NactMainWindow *window )
}
/**
- * nact_main_window_reload:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_reload:
+ * @window: this #FMAMainWindow instance.
*
* Refresh the list of items.
* If there is some non-yet saved modifications, a confirmation is
* required before giving up with them.
*/
void
-nact_main_window_reload( NactMainWindow *window )
+fma_main_window_reload( FMAMainWindow *window )
{
gboolean reload_ok;
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
if( !window->private->dispose_has_run ){
@@ -926,17 +926,17 @@ nact_main_window_reload( NactMainWindow *window )
}
/**
- * nact_main_window_block_reload:
- * @window: this #NactMainWindow instance.
+ * fma_main_window_block_reload:
+ * @window: this #FMAMainWindow instance.
*
* Temporarily blocks the handling of pivot-items-changed signal.
*/
void
-nact_main_window_block_reload( NactMainWindow *window )
+fma_main_window_block_reload( FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_block_reload";
+ static const gchar *thisfn = "fma_main_window_block_reload";
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
if( !window->private->dispose_has_run ){
@@ -947,11 +947,11 @@ nact_main_window_block_reload( NactMainWindow *window )
}
static void
-on_block_items_changed_timeout( NactMainWindow *window )
+on_block_items_changed_timeout( FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_on_block_items_changed_timeout";
+ static const gchar *thisfn = "fma_main_window_on_block_items_changed_timeout";
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
g_debug( "%s: unblocking %s signal", thisfn, PIVOT_SIGNAL_ITEMS_CHANGED );
g_signal_handler_unblock( window->private->updater, window->private->pivot_handler_id );
@@ -961,9 +961,9 @@ on_block_items_changed_timeout( NactMainWindow *window )
* the modification status of the items view has changed
*/
static void
-on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, NactMainWindow *window )
+on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_on_tree_view_modified_status_changed";
+ static const gchar *thisfn = "fma_main_window_on_tree_view_modified_status_changed";
g_debug( "%s: treeview=%p, is_modified=%s, window=%p",
thisfn, ( void * ) treeview, is_modified ? "True":"False", ( void * ) window );
@@ -979,9 +979,9 @@ 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, NactMainWindow *window )
+on_tree_view_selection_changed( NactTreeView *treeview, GList *selected_items, FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_on_tree_view_selection_changed";
+ static const gchar *thisfn = "fma_main_window_on_tree_view_selection_changed";
guint count;
count = g_list_length( selected_items );
@@ -1004,11 +1004,11 @@ on_tree_view_selection_changed( NactTreeView *treeview, GList *selected_items, N
}
static void
-on_tab_item_updated( NactMainWindow *window, FMAIContext *context, guint data, void *empty )
+on_tab_item_updated( FMAMainWindow *window, FMAIContext *context, guint data, void *empty )
{
- static const gchar *thisfn = "nact_main_window_on_tab_item_updated";
+ static const gchar *thisfn = "fma_main_window_on_tab_item_updated";
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
if( !window->private->dispose_has_run ){
g_debug( "%s: window=%p, context=%p (%s), data=%u, empty=%p",
@@ -1022,7 +1022,7 @@ on_tab_item_updated( NactMainWindow *window, FMAIContext *context, guint data, v
}
static void
-raz_selection_properties( NactMainWindow *window )
+raz_selection_properties( FMAMainWindow *window )
{
window->private->current_item = NULL;
window->private->current_profile = NULL;
@@ -1038,7 +1038,7 @@ raz_selection_properties( NactMainWindow *window )
* only called when only one selected row
*/
static void
-setup_current_selection( NactMainWindow *window, FMAObjectId *selected_row )
+setup_current_selection( FMAMainWindow *window, FMAObjectId *selected_row )
{
guint nb_profiles;
GList *profiles;
@@ -1072,10 +1072,10 @@ setup_current_selection( NactMainWindow *window, FMAObjectId *selected_row )
* - an asterisk if anything has been modified
*/
static void
-setup_dialog_title( NactMainWindow *window )
+setup_dialog_title( FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_setup_dialog_title";
- NactMainWindowPrivate *priv;
+ static const gchar *thisfn = "fma_main_window_setup_dialog_title";
+ FMAMainWindowPrivate *priv;
GtkApplication *application;
gchar *title;
gchar *label;
@@ -1103,7 +1103,7 @@ setup_dialog_title( NactMainWindow *window )
}
static void
-setup_writability_status( NactMainWindow *window )
+setup_writability_status( FMAMainWindow *window )
{
g_return_if_fail( FMA_IS_OBJECT_ITEM( window->private->current_item ));
@@ -1116,13 +1116,13 @@ setup_writability_status( NactMainWindow *window )
* in the underlying storage subsystems
*/
static void
-on_pivot_items_changed( FMAUpdater *updater, NactMainWindow *window )
+on_pivot_items_changed( FMAUpdater *updater, FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_on_pivot_items_changed";
+ static const gchar *thisfn = "fma_main_window_on_pivot_items_changed";
gboolean reload_ok;
g_return_if_fail( FMA_IS_UPDATER( updater ));
- g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( FMA_IS_MAIN_WINDOW( window ));
if( !window->private->dispose_has_run ){
g_debug( "%s: updater=%p (%s), window=%p (%s)", thisfn,
@@ -1143,7 +1143,7 @@ on_pivot_items_changed( FMAUpdater *updater, NactMainWindow *window )
*
*/
static gboolean
-confirm_for_giveup_from_pivot( const NactMainWindow *window )
+confirm_for_giveup_from_pivot( const FMAMainWindow *window )
{
gboolean reload_ok;
gchar *first, *second;
@@ -1177,7 +1177,7 @@ confirm_for_giveup_from_pivot( const NactMainWindow *window )
* the actions via the Edit menu
*/
static gboolean
-confirm_for_giveup_from_menu( const NactMainWindow *window )
+confirm_for_giveup_from_menu( const FMAMainWindow *window )
{
gboolean reload_ok = TRUE;
gchar *first, *second;
@@ -1200,9 +1200,9 @@ confirm_for_giveup_from_menu( const NactMainWindow *window )
}
static void
-load_or_reload_items( NactMainWindow *window )
+load_or_reload_items( FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_load_or_reload_items";
+ static const gchar *thisfn = "fma_main_window_load_or_reload_items";
GList *tree;
g_debug( "%s: window=%p", thisfn, ( void * ) window );
@@ -1215,22 +1215,22 @@ load_or_reload_items( NactMainWindow *window )
}
/**
- * nact_main_window_dispose_has_run:
- * @window: the #NactMainWindow main window.
+ * fma_main_window_dispose_has_run:
+ * @window: the #FMAMainWindow main window.
*
* Returns: %TRUE if the main window is terminating.
*/
gboolean
-nact_main_window_dispose_has_run( const NactMainWindow *window )
+fma_main_window_dispose_has_run( const FMAMainWindow *window )
{
- g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), TRUE );
+ g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), TRUE );
return( window->private->dispose_has_run );
}
/**
- * nact_main_window_quit:
- * @window: the #NactMainWindow main window.
+ * fma_main_window_quit:
+ * @window: the #FMAMainWindow main window.
*
* Quit the window, thus terminating the application.
*
@@ -1238,12 +1238,12 @@ nact_main_window_dispose_has_run( const NactMainWindow *window )
* is no more valid; %FALSE if the application will continue to run.
*/
gboolean
-nact_main_window_quit( NactMainWindow *window )
+fma_main_window_quit( FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_quit";
+ static const gchar *thisfn = "fma_main_window_quit";
gboolean terminated;
- g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), FALSE );
+ g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), FALSE );
terminated = FALSE;
@@ -1266,12 +1266,12 @@ nact_main_window_quit( NactMainWindow *window )
* this will also stop the emission of the signal (i.e. the first FALSE wins)
*/
static gboolean
-on_base_quit_requested( FMAApplication *application, NactMainWindow *window )
+on_base_quit_requested( FMAApplication *application, FMAMainWindow *window )
{
- static const gchar *thisfn = "nact_main_window_on_base_quit_requested";
+ static const gchar *thisfn = "fma_main_window_on_base_quit_requested";
gboolean willing_to;
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), TRUE );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( window ), TRUE );
willing_to = TRUE;
@@ -1296,14 +1296,14 @@ on_base_quit_requested( FMAApplication *application, NactMainWindow *window )
static gboolean
on_delete_event( GtkWidget *toplevel, GdkEvent *event, void *empty )
{
- static const gchar *thisfn = "nact_main_window_on_delete_event";
+ static const gchar *thisfn = "fma_main_window_on_delete_event";
g_debug( "%s: toplevel=%p, event=%p, empty=%p",
thisfn, ( void * ) toplevel, ( void * ) event, ( void * ) empty );
- g_return_val_if_fail( toplevel && NACT_IS_MAIN_WINDOW( toplevel ), FALSE );
+ g_return_val_if_fail( toplevel && FMA_IS_MAIN_WINDOW( toplevel ), FALSE );
- nact_main_window_quit( NACT_MAIN_WINDOW( toplevel ));
+ fma_main_window_quit( FMA_MAIN_WINDOW( toplevel ));
return( TRUE );
}
@@ -1317,7 +1317,7 @@ on_delete_event( GtkWidget *toplevel, GdkEvent *event, void *empty )
* Returns: %TRUE if the user confirms he wants to quit.
*/
static gboolean
-warn_modified( NactMainWindow *window )
+warn_modified( FMAMainWindow *window )
{
gboolean confirm = FALSE;
gchar *first;
diff --git a/src/ui/nact-main-window.h b/src/ui/fma-main-window.h
similarity index 69%
rename from src/ui/nact-main-window.h
rename to src/ui/fma-main-window.h
index f39faf7..ed0419e 100644
--- a/src/ui/nact-main-window.h
+++ b/src/ui/fma-main-window.h
@@ -27,19 +27,19 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __UI_NACT_MAIN_WINDOW_H__
-#define __UI_NACT_MAIN_WINDOW_H__
+#ifndef __UI_FMA_MAIN_WINDOW_H__
+#define __UI_FMA_MAIN_WINDOW_H__
/**
* SECTION: main-window
- * @title: NactMainWindow
+ * @title: FMAMainWindow
* @short_description: The Main Window class definition
- * @include: nact-main-window.h
+ * @include: ui/fma-main-window.h
*/
#include "fma-application.h"
#include "fma-clipboard.h"
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
#include "nact-sort-buttons.h"
#include "nact-statusbar.h"
#include "nact-tree-view.h"
@@ -71,24 +71,24 @@ enum {
#define MAIN_PROP_EDITABLE "main-editable"
#define MAIN_PROP_REASON "main-reason"
-NactMainWindow *nact_main_window_new ( FMAApplication *application );
+FMAMainWindow *fma_main_window_new ( FMAApplication *application );
-FMAClipboard *nact_main_window_get_clipboard ( const NactMainWindow *window );
+FMAClipboard *fma_main_window_get_clipboard ( const FMAMainWindow *window );
-NactSortButtons *nact_main_window_get_sort_buttons( const NactMainWindow *window );
+NactSortButtons *fma_main_window_get_sort_buttons( const FMAMainWindow *window );
-NactStatusbar *nact_main_window_get_statusbar ( const NactMainWindow *window );
+NactStatusbar *fma_main_window_get_statusbar ( const FMAMainWindow *window );
-NactTreeView *nact_main_window_get_items_view ( const NactMainWindow *window );
+NactTreeView *fma_main_window_get_items_view ( const FMAMainWindow *window );
-void nact_main_window_reload ( NactMainWindow *window );
+void fma_main_window_reload ( FMAMainWindow *window );
-void nact_main_window_block_reload ( NactMainWindow *window );
+void fma_main_window_block_reload ( FMAMainWindow *window );
-gboolean nact_main_window_dispose_has_run ( const NactMainWindow *window );
+gboolean fma_main_window_dispose_has_run ( const FMAMainWindow *window );
-gboolean nact_main_window_quit ( NactMainWindow *window );
+gboolean fma_main_window_quit ( FMAMainWindow *window );
G_END_DECLS
-#endif /* __UI_NACT_MAIN_WINDOW_H__ */
+#endif /* __UI_FMA_MAIN_WINDOW_H__ */
diff --git a/src/ui/nact-main-window.ui b/src/ui/fma-main-window.ui
similarity index 100%
rename from src/ui/nact-main-window.ui
rename to src/ui/fma-main-window.ui
diff --git a/src/ui/nact-main-window-def.h b/src/ui/nact-main-window-def.h
index b7aa857..2bb27e8 100644
--- a/src/ui/nact-main-window-def.h
+++ b/src/ui/nact-main-window-def.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __UI_NACT_MAIN_WINDOW_DEF_H__
-#define __UI_NACT_MAIN_WINDOW_DEF_H__
+#ifndef __UI_FMA_MAIN_WINDOW_DEF_H__
+#define __UI_FMA_MAIN_WINDOW_DEF_H__
/**
* SECTION: main-window
- * @title: NactMainWindow
+ * @title: FMAMainWindow
* @short_description: The Main Window class definition
- * @include: nact-main-window.h
+ * @include: fma-main-window.h
*
* This class is derived from GtkApplicationWindow and manages the main
* window.
@@ -61,7 +61,7 @@
* |
* | on_activate()
* | |
- * | +-> nact_main_window_new()
+ * | +-> fma_main_window_new()
* | |
* | +-> setup_main_ui()
* | setup_treeview()
@@ -91,30 +91,30 @@
G_BEGIN_DECLS
-#define NACT_TYPE_MAIN_WINDOW ( nact_main_window_get_type())
-#define NACT_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_MAIN_WINDOW,
NactMainWindow ))
-#define NACT_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_MAIN_WINDOW,
NactMainWindowClass ))
-#define NACT_IS_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_MAIN_WINDOW ))
-#define NACT_IS_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_MAIN_WINDOW ))
-#define NACT_MAIN_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_MAIN_WINDOW,
NactMainWindowClass ))
+#define FMA_TYPE_MAIN_WINDOW ( fma_main_window_get_type())
+#define FMA_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, FMA_TYPE_MAIN_WINDOW,
FMAMainWindow ))
+#define FMA_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_TYPE_MAIN_WINDOW,
FMAMainWindowClass ))
+#define FMA_IS_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_TYPE_MAIN_WINDOW ))
+#define FMA_IS_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_MAIN_WINDOW ))
+#define FMA_MAIN_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_TYPE_MAIN_WINDOW,
FMAMainWindowClass ))
-typedef struct _NactMainWindowPrivate NactMainWindowPrivate;
+typedef struct _FMAMainWindowPrivate FMAMainWindowPrivate;
typedef struct {
/*< private >*/
GtkApplicationWindowClass parent;
}
- NactMainWindowClass;
+ FMAMainWindowClass;
typedef struct {
/*< private >*/
GtkApplicationWindow parent;
- NactMainWindowPrivate *private;
+ FMAMainWindowPrivate *private;
}
- NactMainWindow;
+ FMAMainWindow;
-GType nact_main_window_get_type( void );
+GType fma_main_window_get_type( void );
G_END_DECLS
-#endif /* __UI_NACT_MAIN_WINDOW_DEF_H__ */
+#endif /* __UI_FMA_MAIN_WINDOW_DEF_H__ */
diff --git a/src/ui/nact-match-list.c b/src/ui/nact-match-list.c
index 36949da..7033d3b 100644
--- a/src/ui/nact-match-list.c
+++ b/src/ui/nact-match-list.c
@@ -40,7 +40,7 @@
#include "base-keysyms.h"
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-match-list.h"
/* column ordering
@@ -62,7 +62,7 @@ typedef struct {
* addressed with the tab name
*/
typedef struct {
- NactMainWindow *window;
+ FMAMainWindow *window;
gchar *tab_name;
guint tab_id;
GtkTreeView *listview;
@@ -126,7 +126,7 @@ static void on_instance_finalized( MatchListData *data, BaseWindow *wind
/**
* nact_match_list_init_with_args:
- * @window: the #NactMainWindow window which contains the view.
+ * @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
* @tab_id: our id for this page.
* @listview: the #GtkTreeView widget.
@@ -145,7 +145,7 @@ static void on_instance_finalized( MatchListData *data, BaseWindow *wind
* here pointers to GtkTreeView and GtkButton widgets.
*/
void
-nact_match_list_init_with_args( NactMainWindow *window, const gchar *tab_name,
+nact_match_list_init_with_args( FMAMainWindow *window, const gchar *tab_name,
guint tab_id,
GtkWidget *listview,
GtkWidget *addbutton,
@@ -161,7 +161,7 @@ nact_match_list_init_with_args( NactMainWindow *window, const gchar *tab_name,
static const gchar *thisfn = "nact_match_list_init_with_args";
MatchListData *data;
- g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
g_debug( "%s: window=%p, tab_name=%s", thisfn, ( void * ) window, tab_name );
@@ -308,7 +308,7 @@ initialize_window( MatchListData *data )
column = gtk_tree_view_get_column( data->listview, ITEM_COLUMN );
sort_on_column( column, data, ITEM_COLUMN );
- treeview = nact_main_window_get_items_view( data->window );
+ treeview = fma_main_window_get_items_view( data->window );
g_signal_connect( treeview, TREE_SIGNAL_SELECTION_CHANGED, G_CALLBACK( on_tree_selection_changed ),
data );
}
@@ -379,7 +379,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
/**
* nact_match_list_insert_row:
- * @window: the #NactMainWindow window which contains the view.
+ * @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
* @filter: the item to add.
* @match: whether the 'must match' column is checked.
@@ -388,7 +388,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
* Add a new row to the list view.
*/
void
-nact_match_list_insert_row( NactMainWindow *window, const gchar *tab_name, const gchar *filter, gboolean
match, gboolean not_match )
+nact_match_list_insert_row( FMAMainWindow *window, const gchar *tab_name, const gchar *filter, gboolean
match, gboolean not_match )
{
MatchListData *data;
@@ -400,14 +400,14 @@ nact_match_list_insert_row( NactMainWindow *window, const gchar *tab_name, const
/**
* nact_match_list_get_rows:
- * @window: the #NactMainWindow window which contains the view.
+ * @window: the #FMAMainWindow window which contains the view.
* @tab_name: a string constant which identifies this page.
*
* Returns the list of rows as a newly allocated string list which should
* be fma_core_utils_slist_free() by the caller.
*/
GSList *
-nact_match_list_get_rows( NactMainWindow *window, const gchar *tab_name )
+nact_match_list_get_rows( FMAMainWindow *window, const gchar *tab_name )
{
GSList *filters;
MatchListData *data;
@@ -1007,7 +1007,7 @@ on_instance_finalized( MatchListData *data, BaseWindow *window )
g_object_set_data( G_OBJECT( window ), data->tab_name, NULL );
- /* This function is called when the NactMainWindow is about to be finalized.
+ /* This function is called when the FMAMainWindow is about to be finalized.
* At this time, the NactTreeModel has already been finalized.
* It is so too late to try to clear it...
*/
diff --git a/src/ui/nact-match-list.h b/src/ui/nact-match-list.h
index 982cf38..22b6179 100644
--- a/src/ui/nact-match-list.h
+++ b/src/ui/nact-match-list.h
@@ -39,8 +39,8 @@
* etc. interfaces.
* In GObject world however, one cannot derived an interface, nor an interface
* can implement another interface. The GObject solution would be for FMAISchemesTab
- * to requires NactIMatchList, and for NactMainWindow to implement this same
- * NactIMatchList interface. This is not very practical as NactMainWindow is
+ * to requires NactIMatchList, and for FMAMainWindow to implement this same
+ * NactIMatchList interface. This is not very practical as FMAMainWindow is
* already some big bunch of code...
* And, nonetheless, we need three/four instances of this interface, which
* is not possible while Schemes, etc. are already interfaces themselves.
@@ -48,7 +48,7 @@
* So we stay with just a piece of helper functions...
*/
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -62,7 +62,7 @@ enum {
MATCH_LIST_MUST_MATCH_ALL_OF,
};
-void nact_match_list_init_with_args( NactMainWindow *window,
+void nact_match_list_init_with_args( FMAMainWindow *window,
const gchar
*tab_name,
guint
tab_id,
GtkWidget
*listview,
@@ -76,13 +76,13 @@ void nact_match_list_init_with_args( NactMainWindow *window,
const gchar
*item_header,
gboolean
editable_filter );
-void nact_match_list_insert_row ( NactMainWindow *window,
+void nact_match_list_insert_row ( FMAMainWindow *window,
const gchar
*tab_name,
const gchar
*filter,
gboolean
match,
gboolean
not_match );
-GSList *nact_match_list_get_rows ( NactMainWindow *window,
+GSList *nact_match_list_get_rows ( FMAMainWindow *window,
const gchar
*tab_name );
G_END_DECLS
diff --git a/src/ui/nact-menu-edit.c b/src/ui/nact-menu-edit.c
index 89f3cfb..cc88c3f 100644
--- a/src/ui/nact-menu-edit.c
+++ b/src/ui/nact-menu-edit.c
@@ -40,21 +40,21 @@
#include "fma-application.h"
#include "fma-clipboard.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-menu.h"
#include "nact-menu-edit.h"
#include "nact-tree-ieditable.h"
#include "nact-tree-view.h"
-static GList *prepare_for_paste( NactMainWindow *window, sMenuData *sdata );
+static GList *prepare_for_paste( FMAMainWindow *window, sMenuData *sdata );
static GList *get_deletables( FMAUpdater *updater, GList *tree, GSList **not_deletable );
static GSList *get_deletables_rec( FMAUpdater *updater, GList *tree );
static gchar *add_ndeletable_msg( const FMAObjectItem *item, gint reason );
-static void update_clipboard_counters( NactMainWindow *window, sMenuData *sdata );
+static void update_clipboard_counters( FMAMainWindow *window, sMenuData *sdata );
/**
* nact_menu_edit_update_sensitivities:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Update sensitivity of items of the Edit menu.
*
@@ -64,7 +64,7 @@ static void update_clipboard_counters( NactMainWindow *window, sMenuData *sda
* Menubar rule).
*/
void
-nact_menu_edit_update_sensitivities( NactMainWindow *main_window )
+nact_menu_edit_update_sensitivities( FMAMainWindow *main_window )
{
sMenuData *sdata;
gboolean cut_enabled;
@@ -180,7 +180,7 @@ nact_menu_edit_update_sensitivities( NactMainWindow *main_window )
/**
* nact_menu_edit_cut:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Cut objects are installed both in the clipboard and in the deleted list.
* Parent pointer is reset to %NULL.
@@ -199,7 +199,7 @@ nact_menu_edit_update_sensitivities( NactMainWindow *main_window )
* - (tree) remove selected items, unreffing objects
*/
void
-nact_menu_edit_cut( NactMainWindow *main_window )
+nact_menu_edit_cut( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_cut";
sMenuData *sdata;
@@ -210,7 +210,7 @@ nact_menu_edit_cut( NactMainWindow *main_window )
NactTreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
items = fma_object_copyref_items( sdata->selected_items );
@@ -228,10 +228,10 @@ nact_menu_edit_cut( NactMainWindow *main_window )
}
if( to_delete ){
- clipboard = nact_main_window_get_clipboard( NACT_MAIN_WINDOW( main_window ));
+ clipboard = fma_main_window_get_clipboard( FMA_MAIN_WINDOW( main_window ));
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 );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_delete( NACT_TREE_IEDITABLE( view ), to_delete, TREE_OPE_DELETE );
}
@@ -240,7 +240,7 @@ nact_menu_edit_cut( NactMainWindow *main_window )
/**
* nact_menu_edit_copy:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* copies the visible selection
* - (tree) get new refs on selected items
@@ -250,18 +250,18 @@ nact_menu_edit_cut( NactMainWindow *main_window )
* - (menu) refresh actions sensitivy (as selection doesn't change)
*/
void
-nact_menu_edit_copy( NactMainWindow *main_window )
+nact_menu_edit_copy( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_copy";
sMenuData *sdata;
FMAClipboard *clipboard;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
- clipboard = nact_main_window_get_clipboard( main_window );
+ clipboard = fma_main_window_get_clipboard( main_window );
fma_clipboard_primary_set( clipboard, sdata->selected_items, CLIPBOARD_MODE_COPY );
update_clipboard_counters( main_window, sdata );
@@ -270,7 +270,7 @@ nact_menu_edit_copy( NactMainWindow *main_window )
/**
* nact_menu_edit_paste:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* pastes the current content of the clipboard at the current position
* (same path, same level)
@@ -284,7 +284,7 @@ nact_menu_edit_copy( NactMainWindow *main_window )
* - (menu) unreffing the copy got from clipboard
*/
void
-nact_menu_edit_paste( NactMainWindow *main_window )
+nact_menu_edit_paste( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_paste";
sMenuData *sdata;
@@ -292,13 +292,13 @@ nact_menu_edit_paste( NactMainWindow *main_window )
NactTreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
items = prepare_for_paste( main_window, sdata );
if( items ){
- view = nact_main_window_get_items_view( main_window );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( view ), items, NULL );
fma_object_free_items( items );
}
@@ -306,7 +306,7 @@ nact_menu_edit_paste( NactMainWindow *main_window )
/**
* nact_menu_edit_paste_into:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* pastes the current content of the clipboard as the first child of
* currently selected item
@@ -320,7 +320,7 @@ nact_menu_edit_paste( NactMainWindow *main_window )
* - (menu) unreffing the copy got from clipboard
*/
void
-nact_menu_edit_paste_into( NactMainWindow *main_window )
+nact_menu_edit_paste_into( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_paste_into";
sMenuData *sdata;
@@ -328,20 +328,20 @@ nact_menu_edit_paste_into( NactMainWindow *main_window )
NactTreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
items = prepare_for_paste( main_window, sdata );
if( items ){
- view = nact_main_window_get_items_view( main_window );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_into( NACT_TREE_IEDITABLE( view ), items );
fma_object_free_items( items );
}
}
static GList *
-prepare_for_paste( NactMainWindow *window, sMenuData *sdata )
+prepare_for_paste( FMAMainWindow *window, sMenuData *sdata )
{
static const gchar *thisfn = "nact_menu_edit_prepare_for_paste";
GList *items, *it;
@@ -350,7 +350,7 @@ prepare_for_paste( NactMainWindow *window, sMenuData *sdata )
gboolean relabel;
gboolean renumber;
- clipboard = nact_main_window_get_clipboard( window );
+ clipboard = fma_main_window_get_clipboard( window );
items = fma_clipboard_primary_get( clipboard, &renumber );
action = NULL;
@@ -378,7 +378,7 @@ prepare_for_paste( NactMainWindow *window, sMenuData *sdata )
/**
* nact_menu_edit_duplicate:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* duplicate is just as paste, with the difference that content comes
* from the current selection, instead of coming from the clipboard
@@ -388,7 +388,7 @@ prepare_for_paste( NactMainWindow *window, sMenuData *sdata )
* items just besides the original ones...
*/
void
-nact_menu_edit_duplicate( NactMainWindow *main_window )
+nact_menu_edit_duplicate( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_duplicate";
sMenuData *sdata;
@@ -400,7 +400,7 @@ nact_menu_edit_duplicate( NactMainWindow *main_window )
NactTreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
items = fma_object_copyref_items( sdata->selected_items );
@@ -421,7 +421,7 @@ nact_menu_edit_duplicate( NactMainWindow *main_window )
fma_object_set_origin( obj, NULL );
fma_object_check_status( obj );
dup = g_list_prepend( NULL, obj );
- view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( main_window ));
+ view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( main_window ));
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( view ), dup, it->data );
fma_object_free_items( dup );
}
@@ -431,7 +431,7 @@ nact_menu_edit_duplicate( NactMainWindow *main_window )
/**
* nact_menu_edit_delete:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* deletes the visible selection
* - (tree) get new refs on selected items
@@ -446,7 +446,7 @@ nact_menu_edit_duplicate( NactMainWindow *main_window )
* this branch itself be deleted
*/
void
-nact_menu_edit_delete( NactMainWindow *main_window )
+nact_menu_edit_delete( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_edit_delete";
sMenuData *sdata;
@@ -456,7 +456,7 @@ nact_menu_edit_delete( NactMainWindow *main_window )
NactTreeView *view;
g_debug( "%s: main_window=%p", thisfn, ( void * ) main_window );
- g_return_if_fail( main_window && NACT_IS_MAIN_WINDOW( main_window ));
+ g_return_if_fail( main_window && FMA_IS_MAIN_WINDOW( main_window ));
sdata = nact_menu_get_data( main_window );
items = fma_object_copyref_items( sdata->selected_items );
@@ -474,7 +474,7 @@ nact_menu_edit_delete( NactMainWindow *main_window )
}
if( to_delete ){
- view = nact_main_window_get_items_view( main_window );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_delete( NACT_TREE_IEDITABLE( view ), to_delete, TREE_OPE_DELETE );
}
@@ -571,7 +571,7 @@ add_ndeletable_msg( const FMAObjectItem *item, gint reason )
* counters to clipboard ones
*/
static void
-update_clipboard_counters( NactMainWindow *main_window, sMenuData *sdata )
+update_clipboard_counters( FMAMainWindow *main_window, sMenuData *sdata )
{
sdata->clipboard_menus = sdata->selected_menus;
sdata->clipboard_actions = sdata->selected_actions;
diff --git a/src/ui/nact-menu-edit.h b/src/ui/nact-menu-edit.h
index fc58601..244a69e 100644
--- a/src/ui/nact-menu-edit.h
+++ b/src/ui/nact-menu-edit.h
@@ -30,23 +30,23 @@
#ifndef __UI_NACT_MENU_EDIT_H__
#define __UI_NACT_MENU_EDIT_H__
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
-void nact_menu_edit_update_sensitivities( NactMainWindow *main_window );
+void nact_menu_edit_update_sensitivities( FMAMainWindow *main_window );
-void nact_menu_edit_cut ( NactMainWindow *main_window );
+void nact_menu_edit_cut ( FMAMainWindow *main_window );
-void nact_menu_edit_copy ( NactMainWindow *main_window );
+void nact_menu_edit_copy ( FMAMainWindow *main_window );
-void nact_menu_edit_paste ( NactMainWindow *main_window );
+void nact_menu_edit_paste ( FMAMainWindow *main_window );
-void nact_menu_edit_paste_into ( NactMainWindow *main_window );
+void nact_menu_edit_paste_into ( FMAMainWindow *main_window );
-void nact_menu_edit_duplicate ( NactMainWindow *main_window );
+void nact_menu_edit_duplicate ( FMAMainWindow *main_window );
-void nact_menu_edit_delete ( NactMainWindow *main_window );
+void nact_menu_edit_delete ( FMAMainWindow *main_window );
G_END_DECLS
diff --git a/src/ui/nact-menu-file.c b/src/ui/nact-menu-file.c
index ac270fb..4d97f1e 100644
--- a/src/ui/nact-menu-file.c
+++ b/src/ui/nact-menu-file.c
@@ -43,7 +43,7 @@
#include "fma-application.h"
#include "nact-statusbar.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-menu.h"
#include "nact-menu-file.h"
#include "nact-tree-ieditable.h"
@@ -56,31 +56,31 @@ static gchar *st_save_warning = N_( "Some items may not have been saved" );
static gchar *st_level_zero_write = N_( "Unable to rewrite the level-zero items list" );
static gchar *st_delete_error = N_( "Some items have not been deleted" );
-static gboolean save_item( NactMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSList
**messages );
-static void install_autosave( NactMainWindow *main_window );
+static gboolean save_item( FMAMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSList
**messages );
+static void install_autosave( FMAMainWindow *main_window );
static void on_autosave_prefs_changed( const gchar *group, const gchar *key, gconstpointer new_value,
gpointer user_data );
-static void on_autosave_prefs_timeout( NactMainWindow *main_window );
-static gboolean autosave_callback( NactMainWindow *main_window );
-static void autosave_destroyed( NactMainWindow *main_window );
+static void on_autosave_prefs_timeout( FMAMainWindow *main_window );
+static gboolean autosave_callback( FMAMainWindow *main_window );
+static void autosave_destroyed( FMAMainWindow *main_window );
/*
* nact_menu_file_init:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*/
void
-nact_menu_file_init( NactMainWindow *main_window )
+nact_menu_file_init( FMAMainWindow *main_window )
{
install_autosave( main_window );
}
/**
* nact_menu_file_update_sensitivities:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Update sensitivity of items of the File menu.
*/
void
-nact_menu_file_update_sensitivities( NactMainWindow *main_window )
+nact_menu_file_update_sensitivities( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_file_update_sensitivities";
sMenuData *sdata;
@@ -117,12 +117,12 @@ nact_menu_file_update_sensitivities( NactMainWindow *main_window )
/**
* nact_menu_file_new_menu:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Triggers File / New menu item.
*/
void
-nact_menu_file_new_menu( NactMainWindow *main_window )
+nact_menu_file_new_menu( FMAMainWindow *main_window )
{
sMenuData *sdata;
FMAObjectMenu *menu;
@@ -134,19 +134,19 @@ nact_menu_file_new_menu( NactMainWindow *main_window )
fma_object_check_status( menu );
fma_updater_check_item_writability_status( sdata->updater, FMA_OBJECT_ITEM( menu ));
items = g_list_prepend( NULL, menu );
- items_view = nact_main_window_get_items_view( main_window );
+ items_view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( items_view ), items, NULL );
fma_object_free_items( items );
}
/**
* nact_menu_file_new_action:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Triggers File / New action item.
*/
void
-nact_menu_file_new_action( NactMainWindow *main_window )
+nact_menu_file_new_action( FMAMainWindow *main_window )
{
sMenuData *sdata;
FMAObjectAction *action;
@@ -158,19 +158,19 @@ nact_menu_file_new_action( NactMainWindow *main_window )
fma_object_check_status( action );
fma_updater_check_item_writability_status( sdata->updater, FMA_OBJECT_ITEM( action ));
items = g_list_prepend( NULL, action );
- items_view = nact_main_window_get_items_view( main_window );
+ items_view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( items_view ), items, NULL );
fma_object_free_items( items );
}
/**
* nact_menu_file_new_profile:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*
* Triggers File / New profile item.
*/
void
-nact_menu_file_new_profile( NactMainWindow *main_window )
+nact_menu_file_new_profile( FMAMainWindow *main_window )
{
FMAObjectAction *action;
FMAObjectProfile *profile;
@@ -191,14 +191,14 @@ nact_menu_file_new_profile( NactMainWindow *main_window )
fma_object_check_status( profile );
items = g_list_prepend( NULL, profile );
- items_view = nact_main_window_get_items_view( main_window );
+ items_view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_items( NACT_TREE_IEDITABLE( items_view ), items, NULL );
fma_object_free_items( items );
}
/**
* nact_menu_file_save_items:
- * @window: the #NactMainWindow main window.
+ * @window: the #FMAMainWindow main window.
*
* Save items.
* This is the same function that nact_menu_file_save(), just
@@ -226,7 +226,7 @@ nact_menu_file_new_profile( NactMainWindow *main_window )
* - idem if some items cannot be actually rewritten...
*/
void
-nact_menu_file_save_items( NactMainWindow *window )
+nact_menu_file_save_items( FMAMainWindow *window )
{
static const gchar *thisfn = "nact_menu_file_save_items";
sMenuData *sdata;
@@ -244,7 +244,7 @@ nact_menu_file_save_items( NactMainWindow *window )
/* always write the level zero list of items as the first save phase
* and reset the corresponding modification flag
*/
- items_view = nact_main_window_get_items_view( window );
+ items_view = fma_main_window_get_items_view( window );
items = nact_tree_view_get_items( items_view );
fma_object_dump_tree( items );
messages = NULL;
@@ -311,7 +311,7 @@ nact_menu_file_save_items( NactMainWindow *window )
fma_pivot_set_new_items( FMA_PIVOT( sdata->updater ), g_list_reverse( new_pivot ));
fma_object_free_items( items );
- nact_main_window_block_reload( window );
+ fma_main_window_block_reload( window );
g_signal_emit_by_name( items_view, TREE_SIGNAL_MODIFIED_STATUS_CHANGED, FALSE );
}
@@ -319,7 +319,7 @@ nact_menu_file_save_items( NactMainWindow *window )
* iterates here on each and every FMAObjectItem row stored in the tree
*/
static gboolean
-save_item( NactMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSList **messages )
+save_item( FMAMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSList **messages )
{
static const gchar *thisfn = "nact_menu_file_save_item";
gboolean ret;
@@ -329,7 +329,7 @@ save_item( NactMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSL
gchar *label;
guint save_ret;
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), FALSE );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( window ), FALSE );
g_return_val_if_fail( FMA_IS_UPDATER( updater ), FALSE );
g_return_val_if_fail( FMA_IS_OBJECT_ITEM( item ), FALSE );
@@ -372,12 +372,12 @@ save_item( NactMainWindow *window, FMAUpdater *updater, FMAObjectItem *item, GSL
/*
* nact_menu_file_install_autosave:
- * @main_window: this #NactMainWindow main window.
+ * @main_window: this #FMAMainWindow main window.
*
* Setup the autosave feature and initialize its monitoring.
*/
static void
-install_autosave( NactMainWindow *main_window )
+install_autosave( FMAMainWindow *main_window )
{
st_autosave_prefs_timeout.timeout = 100;
st_autosave_prefs_timeout.handler = ( FMATimeoutFunc ) on_autosave_prefs_timeout;
@@ -396,7 +396,7 @@ on_autosave_prefs_changed( const gchar *group, const gchar *key, gconstpointer n
}
static void
-on_autosave_prefs_timeout( NactMainWindow *main_window )
+on_autosave_prefs_timeout( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_file_autosave_prefs_timeout";
gboolean autosave_on;
@@ -423,13 +423,13 @@ on_autosave_prefs_timeout( NactMainWindow *main_window )
}
static gboolean
-autosave_callback( NactMainWindow *main_window )
+autosave_callback( FMAMainWindow *main_window )
{
NactStatusbar *bar;
const gchar *context = "autosave-context";
g_debug( "nact_menu_file_autosave_callback" );
- bar = nact_main_window_get_statusbar( main_window );
+ bar = fma_main_window_get_statusbar( main_window );
nact_statusbar_display_status( bar, context, _( "Automatically saving pending modifications..." ));
nact_menu_file_save_items( main_window );
nact_statusbar_hide_status( bar, context );
@@ -438,7 +438,7 @@ autosave_callback( NactMainWindow *main_window )
}
static void
-autosave_destroyed( NactMainWindow *main_window )
+autosave_destroyed( FMAMainWindow *main_window )
{
g_debug( "nact_menu_file_autosave_destroyed" );
}
diff --git a/src/ui/nact-menu-file.h b/src/ui/nact-menu-file.h
index c31c336..4cc459a 100644
--- a/src/ui/nact-menu-file.h
+++ b/src/ui/nact-menu-file.h
@@ -30,21 +30,21 @@
#ifndef __UI_NACT_MENU_FILE_H__
#define __UI_NACT_MENU_FILE_H__
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
-void nact_menu_file_init ( NactMainWindow *main_window );
+void nact_menu_file_init ( FMAMainWindow *main_window );
-void nact_menu_file_update_sensitivities( NactMainWindow *main_window );
+void nact_menu_file_update_sensitivities( FMAMainWindow *main_window );
-void nact_menu_file_new_menu ( NactMainWindow *main_window );
+void nact_menu_file_new_menu ( FMAMainWindow *main_window );
-void nact_menu_file_new_action ( NactMainWindow *main_window );
+void nact_menu_file_new_action ( FMAMainWindow *main_window );
-void nact_menu_file_new_profile ( NactMainWindow *main_window );
+void nact_menu_file_new_profile ( FMAMainWindow *main_window );
-void nact_menu_file_save_items ( NactMainWindow *main_window );
+void nact_menu_file_save_items ( FMAMainWindow *main_window );
G_END_DECLS
diff --git a/src/ui/nact-menu-view.c b/src/ui/nact-menu-view.c
index 73e4547..25ec44d 100644
--- a/src/ui/nact-menu-view.c
+++ b/src/ui/nact-menu-view.c
@@ -34,7 +34,7 @@
#include "core/fma-gtk-utils.h"
#include "core/fma-iprefs.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-menu.h"
#include "nact-menu-view.h"
@@ -74,26 +74,26 @@ static sNotebookTabsProps st_notebook_tabs_props[] = {
{ "left", GTK_POS_LEFT },
};
-static void setup_toolbars_submenu( NactMainWindow *window );
-static void setup_toolbar( NactMainWindow *window, GtkBuilder *builder, guint toolbar_id );
+static void setup_toolbars_submenu( FMAMainWindow *window );
+static void setup_toolbar( FMAMainWindow *window, GtkBuilder *builder, guint toolbar_id );
static sToolbarProps *get_toolbar_properties_by_id( guint toolbar_id );
static sToolbarProps *get_toolbar_properties_by_name( const gchar *action_name );
#if 0
static void reorder_toolbars( GtkWidget *hbox, sToolbarProps *props );
#endif
-static void setup_notebook_tab_position_submenu( NactMainWindow *window );
+static void setup_notebook_tab_position_submenu( FMAMainWindow *window );
static sNotebookTabsProps *get_notebook_tabs_properties_by_target( const gchar *target );
static sNotebookTabsProps *get_notebook_tabs_properties_by_pos( guint pos );
-void set_notebook_tabs_position( NactMainWindow *main_window, guint pos );
+void set_notebook_tabs_position( FMAMainWindow *main_window, guint pos );
/**
* nact_menu_view_init:
- * @window: the #NactMainWindow main window.
+ * @window: the #FMAMainWindow main window.
*
* Setup the toolbars menu at creation time.
*/
void
-nact_menu_view_init( NactMainWindow *window )
+nact_menu_view_init( FMAMainWindow *window )
{
setup_toolbars_submenu( window );
setup_notebook_tab_position_submenu( window );
@@ -101,12 +101,12 @@ nact_menu_view_init( NactMainWindow *window )
/**
* nact_menu_view_update_sensitivities:
- * @window: the #NactMainWindow main window.
+ * @window: the #FMAMainWindow main window.
*
* Update sensitivity of items of the View menu.
*/
void
-nact_menu_view_update_sensitivities( NactMainWindow *window )
+nact_menu_view_update_sensitivities( FMAMainWindow *window )
{
sMenuData *sdata;
guint count_list;
@@ -128,7 +128,7 @@ nact_menu_view_update_sensitivities( NactMainWindow *window )
* toolbar.
*/
void
-setup_toolbars_submenu( NactMainWindow *window )
+setup_toolbars_submenu( FMAMainWindow *window )
{
GtkBuilder *builder;
@@ -143,7 +143,7 @@ setup_toolbars_submenu( NactMainWindow *window )
}
static void
-setup_toolbar( NactMainWindow *window, GtkBuilder *builder, guint toolbar_id )
+setup_toolbar( FMAMainWindow *window, GtkBuilder *builder, guint toolbar_id )
{
sToolbarProps *props;
gboolean is_active;
@@ -182,12 +182,12 @@ get_toolbar_properties_by_id( guint toolbar_id )
/**
* nact_menu_view_toolbar_display:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
* @action_name: the action name.
* @visible: whether the toolbar must be displayed or hidden.
*/
void
-nact_menu_view_toolbar_display( NactMainWindow *main_window, const gchar *action_name, gboolean visible )
+nact_menu_view_toolbar_display( FMAMainWindow *main_window, const gchar *action_name, gboolean visible )
{
sToolbarProps *props;
GtkWidget *parent;
@@ -277,7 +277,7 @@ reorder_toolbars( GtkWidget *hbox, sToolbarProps *props )
* ***
*/
void
-setup_notebook_tab_position_submenu( NactMainWindow *window )
+setup_notebook_tab_position_submenu( FMAMainWindow *window )
{
guint pos;
sNotebookTabsProps *props;
@@ -316,12 +316,12 @@ nact_menu_view_on_tabs_pos_changed( GtkRadioAction *action, GtkRadioAction *curr
/**
* nact_menu_view_notebook_tab_display:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
* @action_name: the action name.
* @target: the targeted position.
*/
void
-nact_menu_view_notebook_tab_display( NactMainWindow *main_window, const gchar *action_name, const gchar
*target )
+nact_menu_view_notebook_tab_display( FMAMainWindow *main_window, const gchar *action_name, const gchar
*target )
{
sNotebookTabsProps *props;
@@ -373,7 +373,7 @@ get_notebook_tabs_properties_by_pos( guint pos )
* Set the position of the main notebook tabs
*/
void
-set_notebook_tabs_position( NactMainWindow *main_window, guint pos )
+set_notebook_tabs_position( FMAMainWindow *main_window, guint pos )
{
GtkNotebook *notebook;
diff --git a/src/ui/nact-menu-view.h b/src/ui/nact-menu-view.h
index bb8b652..7cb6059 100644
--- a/src/ui/nact-menu-view.h
+++ b/src/ui/nact-menu-view.h
@@ -30,7 +30,7 @@
#ifndef __UI_NACT_MENU_VIEW_H__
#define __UI_NACT_MENU_VIEW_H__
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -41,19 +41,19 @@ enum {
MAIN_TOOLBAR_HELP_ID,
};
-void nact_menu_view_init ( NactMainWindow *main_window );
+void nact_menu_view_init ( FMAMainWindow *main_window );
-void nact_menu_view_update_sensitivities( NactMainWindow *main_window );
+void nact_menu_view_update_sensitivities( FMAMainWindow *main_window );
-void nact_menu_view_toolbar_display ( NactMainWindow *main_window,
+void nact_menu_view_toolbar_display ( FMAMainWindow *main_window,
const gchar
*action_name,
gboolean
visible );
-void nact_menu_view_notebook_tab_display( NactMainWindow *main_window,
+void nact_menu_view_notebook_tab_display( FMAMainWindow *main_window,
const gchar
*action_name,
const gchar
*target );
-void nact_menu_view_set_notebook_label ( NactMainWindow *main_window );
+void nact_menu_view_set_notebook_label ( FMAMainWindow *main_window );
G_END_DECLS
diff --git a/src/ui/nact-menu.c b/src/ui/nact-menu.c
index 999dd11..cf5a48e 100644
--- a/src/ui/nact-menu.c
+++ b/src/ui/nact-menu.c
@@ -36,7 +36,7 @@
#include "core/fma-about.h"
#include "core/fma-io-provider.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-menu.h"
#include "nact-menu-edit.h"
#include "nact-menu-file.h"
@@ -180,14 +180,14 @@ static sActionEntry st_menubar_entries[] = {
};
static void free_menu_data( sMenuData *sdata );
-static void on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, NactMainWindow
*window );
-static void on_popup_selection_done( GtkMenuShell *menushell, NactMainWindow *window );
-static void on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus, gint
actions, gint profiles, NactMainWindow *window );
-static void on_tree_view_focus_in( NactTreeView *treeview, NactMainWindow *window );
-static void on_tree_view_focus_out( NactTreeView *treeview, NactMainWindow *window );
-static void on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified,
NactMainWindow *window );
-static void on_tree_view_selection_changed( NactTreeView *treeview, GList *selected, NactMainWindow
*window );
-static void on_update_sensitivities( NactMainWindow *window, void *empty );
+static void on_open_context_menu( NactTreeView *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_update_sensitivities( FMAMainWindow *window, void *empty );
/**
* nact_menu_app:
@@ -249,7 +249,7 @@ on_app_about( GSimpleAction *action, GVariant *parameter, gpointer user_data )
g_return_if_fail( user_data && FMA_IS_APPLICATION( user_data ));
window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
- g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
fma_about_display( window );
}
@@ -278,9 +278,9 @@ on_app_preferences( GSimpleAction *action, GVariant *parameter, gpointer user_da
g_return_if_fail( user_data && FMA_IS_APPLICATION( user_data ));
window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
- g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
- nact_preferences_editor_run( NACT_MAIN_WINDOW( window ));
+ nact_preferences_editor_run( FMA_MAIN_WINDOW( window ));
}
static void
@@ -291,19 +291,19 @@ on_app_quit( GSimpleAction *action, GVariant *parameter, gpointer user_data )
g_return_if_fail( user_data && FMA_IS_APPLICATION( user_data ));
window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
- g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
- nact_main_window_quit( NACT_MAIN_WINDOW( window ));
+ fma_main_window_quit( FMA_MAIN_WINDOW( window ));
}
/**
* nact_menu_win:
- * @main_window: the #NactMainWindow.
+ * @main_window: the #FMAMainWindow.
*
* Define the window menubar and attach it to the main window.
*/
void
-nact_menu_win( NactMainWindow *main_window )
+nact_menu_win( FMAMainWindow *main_window )
{
static const gchar *thisfn = "nact_menu_win";
gint i;
@@ -336,7 +336,7 @@ nact_menu_win( NactMainWindow *main_window )
/* connect to all signal which may have an influence on the menu
* items sensitivity
*/
- treeview = nact_main_window_get_items_view( main_window );
+ treeview = fma_main_window_get_items_view( main_window );
g_signal_connect(
treeview, TREE_SIGNAL_CONTEXT_MENU,
G_CALLBACK( on_open_context_menu ), main_window );
@@ -376,10 +376,10 @@ nact_menu_win( NactMainWindow *main_window )
/**
* nact_menu_get_data:
- * @main_window: the #NactMainWindow main window.
+ * @main_window: the #FMAMainWindow main window.
*/
sMenuData *
-nact_menu_get_data( NactMainWindow *main_window )
+nact_menu_get_data( FMAMainWindow *main_window )
{
sMenuData *sdata;
@@ -402,7 +402,7 @@ free_menu_data( sMenuData *sdata )
* Opens a popup menu.
*/
static void
-on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, NactMainWindow *window )
+on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, FMAMainWindow *window )
{
sMenuData *sdata;
@@ -421,7 +421,7 @@ on_open_context_menu( NactTreeView *treeview, GdkEventButton *event, NactMainWin
}
static void
-on_popup_selection_done( GtkMenuShell *menushell, NactMainWindow *window )
+on_popup_selection_done( GtkMenuShell *menushell, FMAMainWindow *window )
{
static const gchar *thisfn = "nact_menu_on_popup_selection_done";
sMenuData *sdata;
@@ -438,7 +438,7 @@ on_popup_selection_done( GtkMenuShell *menushell, NactMainWindow *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,
NactMainWindow *window )
+on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus, gint actions, gint profiles,
FMAMainWindow *window )
{
static const gchar *thisfn = "nact_menu_on_tree_view_count_changed";
sMenuData *sdata;
@@ -469,7 +469,7 @@ on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus,
_( " %d menu(s), %d action(s), %d profile(s) are currently loaded" ),
sdata->count_menus, sdata->count_actions, sdata->count_profiles );
- bar = nact_main_window_get_statusbar( window );
+ bar = fma_main_window_get_statusbar( window );
nact_statusbar_display_status( bar, "menu-status-context", status );
g_free( status );
@@ -477,7 +477,7 @@ on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus,
}
static void
-on_tree_view_focus_in( NactTreeView *treeview, NactMainWindow *window )
+on_tree_view_focus_in( NactTreeView *treeview, FMAMainWindow *window )
{
sMenuData *sdata;
@@ -488,7 +488,7 @@ on_tree_view_focus_in( NactTreeView *treeview, NactMainWindow *window )
}
static void
-on_tree_view_focus_out( NactTreeView *treeview, NactMainWindow *window )
+on_tree_view_focus_out( NactTreeView *treeview, FMAMainWindow *window )
{
sMenuData *sdata;
@@ -502,7 +502,7 @@ on_tree_view_focus_out( NactTreeView *treeview, NactMainWindow *window )
* the count of modified FMAObjectItem has changed
*/
static void
-on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, NactMainWindow *window )
+on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modified, FMAMainWindow *window )
{
static const gchar *thisfn = "nact_menu_on_tree_view_modified_status_changed";
sMenuData *sdata;
@@ -529,7 +529,7 @@ on_tree_view_modified_status_changed( NactTreeView *treeview, gboolean is_modifi
* of applying to valid candidates, and rejecting the others.
*/
static void
-on_tree_view_selection_changed( NactTreeView *treeview, GList *selected, NactMainWindow *window )
+on_tree_view_selection_changed( NactTreeView *treeview, GList *selected, FMAMainWindow *window )
{
static const gchar *thisfn = "nact_menu_on_tree_view_selection_changed";
sMenuData *sdata;
@@ -651,13 +651,13 @@ on_tree_view_selection_changed( NactTreeView *treeview, GList *selected, NactMai
}
static void
-on_update_sensitivities( NactMainWindow *window, void *empty )
+on_update_sensitivities( FMAMainWindow *window, void *empty )
{
static const gchar *thisfn = "nact_menu_on_update_sensitivities";
g_debug( "%s: window=%p, empty=%p", thisfn, ( void * ) window, empty );
- if( !nact_main_window_dispose_has_run( window )){
+ if( !fma_main_window_dispose_has_run( window )){
nact_menu_file_update_sensitivities( window );
nact_menu_edit_update_sensitivities( window );
@@ -671,7 +671,7 @@ on_update_sensitivities( NactMainWindow *window, void *empty )
static void
on_win_brief_tree_store_dump( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
@@ -679,50 +679,50 @@ on_win_collapse_all( GSimpleAction *action, GVariant *parameter, gpointer user_d
{
NactTreeView *items_view;
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
- items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( user_data ));
+ items_view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( user_data ));
nact_tree_view_collapse_all( items_view );
}
static void
on_win_copy( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_copy( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_copy( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_cut( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_cut( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_cut( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_delete( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_delete( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_delete( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_dump_clipboard( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
on_win_dump_selection( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
on_win_duplicate( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_duplicate( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_duplicate( FMA_MAIN_WINDOW( user_data ));
}
static void
@@ -730,83 +730,83 @@ on_win_expand_all( GSimpleAction *action, GVariant *parameter, gpointer user_dat
{
NactTreeView *items_view;
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
- items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( user_data ));
+ items_view = fma_main_window_get_items_view( FMA_MAIN_WINDOW( user_data ));
nact_tree_view_expand_all( items_view );
}
static void
on_win_export( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
on_win_import( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
on_win_list_modified_items( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
static void
on_win_new_action( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_file_new_action( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_file_new_action( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_new_menu( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_file_new_menu( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_file_new_menu( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_new_profile( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_file_new_profile( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_file_new_profile( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_paste( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_paste( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_paste( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_paste_into( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_edit_paste_into( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_edit_paste_into( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_reload( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_main_window_reload( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ fma_main_window_reload( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_save( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
- nact_menu_file_save_items( NACT_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
+ nact_menu_file_save_items( FMA_MAIN_WINDOW( user_data ));
}
static void
on_win_test_function( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
}
/*
@@ -818,7 +818,7 @@ on_win_toolbar_activate( GSimpleAction *action, GVariant *parameter, gpointer us
{
GVariant *state;
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
state = g_action_get_state( G_ACTION( action ));
g_action_change_state( G_ACTION( action ),
@@ -833,10 +833,10 @@ on_win_toolbar_activate( GSimpleAction *action, GVariant *parameter, gpointer us
static void
on_win_toolbar_changed_state( GSimpleAction *action, GVariant *state, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
nact_menu_view_toolbar_display(
- NACT_MAIN_WINDOW( user_data ),
+ FMA_MAIN_WINDOW( user_data ),
g_action_get_name( G_ACTION( action )),
g_variant_get_boolean( state ));
@@ -850,7 +850,7 @@ on_win_toolbar_changed_state( GSimpleAction *action, GVariant *state, gpointer u
static void
on_win_notebook_tab_position_activate( GSimpleAction *action, GVariant *parameter, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
g_action_change_state( G_ACTION( action ),
g_variant_new_string( g_variant_get_string( parameter, NULL )));
@@ -863,10 +863,10 @@ on_win_notebook_tab_position_activate( GSimpleAction *action, GVariant *paramete
static void
on_win_notebook_tab_position_changed_state( GSimpleAction *action, GVariant *state, gpointer user_data )
{
- g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+ g_return_if_fail( user_data && FMA_IS_MAIN_WINDOW( user_data ));
nact_menu_view_notebook_tab_display(
- NACT_MAIN_WINDOW( user_data ),
+ FMA_MAIN_WINDOW( user_data ),
g_action_get_name( G_ACTION( action )),
g_variant_get_string( state, NULL ));
@@ -875,14 +875,14 @@ on_win_notebook_tab_position_changed_state( GSimpleAction *action, GVariant *sta
/**
* nact_menu_enable_item:
- * @main_window: this #NactMainWindow main window.
+ * @main_window: this #FMAMainWindow main window.
* @name: the name of the item in a menu.
* @enabled: whether this item should be enabled or not.
*
* Enable/disable an item in an menu.
*/
void
-nact_menu_enable_item( NactMainWindow *main_window, const gchar *name, gboolean enabled )
+nact_menu_enable_item( FMAMainWindow *main_window, const gchar *name, gboolean enabled )
{
GAction *action;
diff --git a/src/ui/nact-menu.h b/src/ui/nact-menu.h
index 80ba35e..3764f44 100644
--- a/src/ui/nact-menu.h
+++ b/src/ui/nact-menu.h
@@ -40,7 +40,7 @@
#include "core/fma-updater.h"
#include "fma-application.h"
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -108,13 +108,13 @@ enum {
void nact_menu_app ( FMAApplication *application );
-void nact_menu_win ( NactMainWindow *main_window );
+void nact_menu_win ( FMAMainWindow *main_window );
-void nact_menu_enable_item( NactMainWindow *main_window,
+void nact_menu_enable_item( FMAMainWindow *main_window,
const gchar *action_name,
gboolean enable );
-sMenuData *nact_menu_get_data ( NactMainWindow *main_window );
+sMenuData *nact_menu_get_data ( FMAMainWindow *main_window );
G_END_DECLS
diff --git a/src/ui/nact-preferences-editor.c b/src/ui/nact-preferences-editor.c
index 6b91117..8288a1d 100644
--- a/src/ui/nact-preferences-editor.c
+++ b/src/ui/nact-preferences-editor.c
@@ -48,7 +48,7 @@
#include "fma-application.h"
#include "base-gtk-utils.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-schemes-list.h"
#include "nact-providers-list.h"
#include "nact-preferences-editor.h"
@@ -430,19 +430,19 @@ instance_finalize( GObject *dialog )
/**
* nact_preferences_editor_run:
- * @parent: the NactMainWindow main window
+ * @parent: the FMAMainWindow main window
*
* Initializes and runs the dialog.
*/
void
-nact_preferences_editor_run( NactMainWindow *parent )
+nact_preferences_editor_run( FMAMainWindow *parent )
{
static const gchar *thisfn = "nact_preferences_editor_run";
NactPreferencesEditor *editor;
gboolean are_locked, mandatory;
GtkNotebook *notebook;
- g_return_if_fail( parent && NACT_IS_MAIN_WINDOW( parent ));
+ g_return_if_fail( parent && FMA_IS_MAIN_WINDOW( parent ));
g_debug( "%s: parent=%p (%s)", thisfn, ( void * ) parent, G_OBJECT_TYPE_NAME( parent ));
diff --git a/src/ui/nact-preferences-editor.h b/src/ui/nact-preferences-editor.h
index 739aa3c..e339126 100644
--- a/src/ui/nact-preferences-editor.h
+++ b/src/ui/nact-preferences-editor.h
@@ -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 nact_preferences_editor_get_type( void );
-void nact_preferences_editor_run ( NactMainWindow *main_window );
+void nact_preferences_editor_run ( FMAMainWindow *main_window );
G_END_DECLS
diff --git a/src/ui/nact-sort-buttons.c b/src/ui/nact-sort-buttons.c
index 6f303da..f4d3c13 100644
--- a/src/ui/nact-sort-buttons.c
+++ b/src/ui/nact-sort-buttons.c
@@ -36,7 +36,7 @@
#include "core/fma-updater.h"
#include "fma-application.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-sort-buttons.h"
#include "nact-tree-view.h"
@@ -69,7 +69,7 @@ static void class_init( NactSortButtonsClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *application );
static void instance_finalize( GObject *application );
-static void initialize_buttons( NactSortButtons *buttons, NactMainWindow *window );
+static void initialize_buttons( NactSortButtons *buttons, FMAMainWindow *window );
static void on_toggle_button_toggled( GtkToggleButton *button, NactSortButtons *buttons );
static void on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value,
gboolean mandatory, NactSortButtons *sort_buttons );
static void on_tree_view_count_changed( NactTreeView *treeview, gboolean reset, gint menus_count, gint
actions_count, gint profiles_count, NactSortButtons *sort_buttons );
@@ -199,12 +199,12 @@ instance_finalize( GObject *instance )
* Returns: a new #NactSortButtons object.
*/
NactSortButtons *
-nact_sort_buttons_new( NactMainWindow *window )
+nact_sort_buttons_new( FMAMainWindow *window )
{
NactSortButtons *obj;
GtkApplication *application;
- g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), NULL );
+ g_return_val_if_fail( window && FMA_IS_MAIN_WINDOW( window ), NULL );
application = gtk_window_get_application( GTK_WINDOW( window ));
g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), NULL );
@@ -218,7 +218,7 @@ nact_sort_buttons_new( NactMainWindow *window )
/*
* initialize_buttons:
- * @window: the #NactMainWindow.
+ * @window: the #FMAMainWindow.
*
* Initialization of the UI each time it is displayed.
*
@@ -228,12 +228,12 @@ nact_sort_buttons_new( NactMainWindow *window )
* - enabled (sensitive) if sort order mode is modifiable.
*/
static void
-initialize_buttons( NactSortButtons *buttons, NactMainWindow *window )
+initialize_buttons( NactSortButtons *buttons, FMAMainWindow *window )
{
NactTreeView *treeview;
gint i;
- treeview = nact_main_window_get_items_view( window );
+ treeview = fma_main_window_get_items_view( window );
g_signal_connect(
treeview, TREE_SIGNAL_COUNT_CHANGED,
G_CALLBACK( on_tree_view_count_changed ), buttons );
diff --git a/src/ui/nact-sort-buttons.h b/src/ui/nact-sort-buttons.h
index 192973b..3081d02 100644
--- a/src/ui/nact-sort-buttons.h
+++ b/src/ui/nact-sort-buttons.h
@@ -48,7 +48,7 @@
* - sort order mode is not a mandatory preference.
*/
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -76,7 +76,7 @@ typedef struct {
GType nact_sort_buttons_get_type( void );
-NactSortButtons *nact_sort_buttons_new ( NactMainWindow *window );
+NactSortButtons *nact_sort_buttons_new ( FMAMainWindow *window );
G_END_DECLS
diff --git a/src/ui/nact-statusbar.h b/src/ui/nact-statusbar.h
index b70efea..58832be 100644
--- a/src/ui/nact-statusbar.h
+++ b/src/ui/nact-statusbar.h
@@ -40,7 +40,7 @@
* - a read-only indicator.
*/
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
diff --git a/src/ui/nact-tree-ieditable.c b/src/ui/nact-tree-ieditable.c
index e48628c..aab56b6 100644
--- a/src/ui/nact-tree-ieditable.c
+++ b/src/ui/nact-tree-ieditable.c
@@ -39,7 +39,7 @@
#include "base-keysyms.h"
#include "fma-application.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-tree-ieditable.h"
#include "nact-tree-model.h"
#include "nact-tree-view.h"
@@ -54,7 +54,7 @@ struct _NactTreeIEditableInterfacePrivate {
*/
typedef struct {
FMAUpdater *updater;
- NactMainWindow *main_window;
+ FMAMainWindow *main_window;
GtkTreeView *treeview;
NactTreeModel *model;
gulong modified_handler_id;
@@ -170,7 +170,7 @@ interface_base_finalize( NactTreeIEditableInterface *klass )
* Initialize the interface, mainly connecting to signals of interest.
*/
void
-nact_tree_ieditable_initialize( NactTreeIEditable *instance, GtkTreeView *treeview, NactMainWindow
*main_window )
+nact_tree_ieditable_initialize( NactTreeIEditable *instance, GtkTreeView *treeview, FMAMainWindow
*main_window )
{
static const gchar *thisfn = "nact_tree_ieditable_initialize";
IEditableData *ied;
diff --git a/src/ui/nact-tree-ieditable.h b/src/ui/nact-tree-ieditable.h
index 51c24cb..49039c8 100644
--- a/src/ui/nact-tree-ieditable.h
+++ b/src/ui/nact-tree-ieditable.h
@@ -48,7 +48,7 @@
#include "api/fma-object.h"
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -80,7 +80,7 @@ GType nact_tree_ieditable_get_type ( void );
void nact_tree_ieditable_initialize ( NactTreeIEditable *instance,
GtkTreeView *treeview,
-
NactMainWindow *main_window );
+
FMAMainWindow *main_window );
void nact_tree_ieditable_terminate ( NactTreeIEditable *instance );
diff --git a/src/ui/nact-tree-model-dnd.c b/src/ui/nact-tree-model-dnd.c
index 68e8332..6289f1f 100644
--- a/src/ui/nact-tree-model-dnd.c
+++ b/src/ui/nact-tree-model-dnd.c
@@ -44,7 +44,7 @@
#include "fma-application.h"
#include "fma-clipboard.h"
#include "nact-statusbar.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-tree-model.h"
#include "nact-tree-model-priv.h"
#include "nact-tree-ieditable.h"
@@ -124,13 +124,13 @@ static const gchar *st_level_zero_not_writable = N_( "Unable to drop here as lev
static gboolean drop_inside( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selection_data
);
static gboolean is_drop_possible( NactTreeModel *model, GtkTreePath *dest, FMAObjectItem **parent );
-static gboolean is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, NactMainWindow
*window, FMAObjectItem **parent );
-static gboolean is_drop_possible_into_dest( NactTreeModel *model, GtkTreePath *dest, NactMainWindow
*window, FMAObjectItem **parent );
+static gboolean is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, FMAMainWindow
*window, FMAObjectItem **parent );
+static gboolean is_drop_possible_into_dest( NactTreeModel *model, GtkTreePath *dest, FMAMainWindow
*window, FMAObjectItem **parent );
static void drop_inside_move_dest( NactTreeModel *model, GList *rows, GtkTreePath **dest );
static gboolean drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData
*selection_data );
-static FMAObjectItem *is_dropped_already_exists( const FMAObjectItem *importing, const NactMainWindow
*window );
+static FMAObjectItem *is_dropped_already_exists( const FMAObjectItem *importing, const FMAMainWindow *window
);
static char *get_xds_atom_value( GdkDragContext *context );
-static gboolean is_parent_accept_new_children( FMAApplication *application, NactMainWindow *window,
FMAObjectItem *parent );
+static gboolean is_parent_accept_new_children( FMAApplication *application, FMAMainWindow *window,
FMAObjectItem *parent );
static guint target_atom_to_id( GdkAtom atom );
/**
@@ -471,7 +471,7 @@ nact_tree_model_dnd_imulti_drag_source_row_draggable( EggTreeMultiDragSource *dr
* nact_tree_model_dnd_on_drag_begin:
* @widget: the GtkTreeView from which item is to be dragged.
* @context:
- * @window: the parent #NactMainWindow instance.
+ * @window: the parent #FMAMainWindow instance.
*
* This function is called once, at the beginning of the drag operation,
* when we are dragging from the IActionsList treeview.
@@ -565,7 +565,7 @@ drop_inside( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selecti
static const gchar *thisfn = "nact_tree_model_dnd_inside_drag_and_drop";
FMAApplication *application;
FMAUpdater *updater;
- NactMainWindow *main_window;
+ FMAMainWindow *main_window;
FMAObjectItem *parent;
gboolean copy_data;
GList *rows;
@@ -582,9 +582,9 @@ drop_inside( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selecti
application = FMA_APPLICATION( gtk_window_get_application( GTK_WINDOW( model->private->window )));
updater = fma_application_get_updater( application );
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( model->private->window ), FALSE );
- main_window = NACT_MAIN_WINDOW( model->private->window );
- items_view = nact_main_window_get_items_view( main_window );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( model->private->window ), FALSE );
+ main_window = FMA_MAIN_WINDOW( model->private->window );
+ items_view = fma_main_window_get_items_view( main_window );
/*
* NACT format (may embed profiles, or not)
@@ -665,7 +665,7 @@ is_drop_possible( NactTreeModel *model, GtkTreePath *dest, FMAObjectItem **paren
NactTreeModelPrivate *priv;
gboolean drop_ok;
GtkApplication *application;
- NactMainWindow *main_window;
+ FMAMainWindow *main_window;
GtkTreeIter iter;
FMAObjectItem *parent_dest;
NactStatusbar *bar;
@@ -676,8 +676,8 @@ is_drop_possible( NactTreeModel *model, GtkTreePath *dest, FMAObjectItem **paren
application = gtk_window_get_application( GTK_WINDOW( priv->window ));
g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), FALSE );
- g_return_val_if_fail( priv->window && NACT_IS_MAIN_WINDOW( priv->window ), FALSE );
- main_window = NACT_MAIN_WINDOW( priv->window );
+ g_return_val_if_fail( priv->window && FMA_IS_MAIN_WINDOW( priv->window ), FALSE );
+ main_window = FMA_MAIN_WINDOW( priv->window );
/* if we can have an iter on given dest, then the dest already exists
* so dropped items should be of the same type that already existing
@@ -691,7 +691,7 @@ is_drop_possible( NactTreeModel *model, GtkTreePath *dest, FMAObjectItem **paren
} else if( gtk_tree_path_get_depth( dest ) == 1 ){
if( priv->drag_has_profiles ){
- bar = nact_main_window_get_statusbar( main_window );
+ bar = fma_main_window_get_statusbar( main_window );
nact_statusbar_display_with_timeout(
bar, TREE_MODEL_STATUSBAR_CONTEXT, gettext(
st_refuse_drop_profile ));
@@ -720,7 +720,7 @@ is_drop_possible( NactTreeModel *model, GtkTreePath *dest, FMAObjectItem **paren
}
static gboolean
-is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, NactMainWindow *window, FMAObjectItem
**parent )
+is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, FMAMainWindow *window, FMAObjectItem
**parent )
{
static const gchar *thisfn = "nact_tree_model_dnd_is_drop_possible_before_iter";
gboolean drop_ok;
@@ -729,7 +729,7 @@ is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, NactMainW
drop_ok = FALSE;
*parent = NULL;
- bar = nact_main_window_get_statusbar( window );
+ bar = fma_main_window_get_statusbar( window );
gtk_tree_model_get( GTK_TREE_MODEL( model ), iter, TREE_COLUMN_NAOBJECT, &object, -1 );
g_object_unref( object );
@@ -761,7 +761,7 @@ is_drop_possible_before_iter( NactTreeModel *model, GtkTreeIter *iter, NactMainW
}
static gboolean
-is_drop_possible_into_dest( NactTreeModel *model, GtkTreePath *dest, NactMainWindow *window, FMAObjectItem
**parent )
+is_drop_possible_into_dest( NactTreeModel *model, GtkTreePath *dest, FMAMainWindow *window, FMAObjectItem
**parent )
{
static const gchar *thisfn = "nact_tree_model_dnd_is_drop_possible_into_dest";
gboolean drop_ok;
@@ -772,7 +772,7 @@ is_drop_possible_into_dest( NactTreeModel *model, GtkTreePath *dest, NactMainWin
drop_ok = FALSE;
*parent = NULL;
- bar = nact_main_window_get_statusbar( window );
+ bar = fma_main_window_get_statusbar( window );
path = gtk_tree_path_copy( dest );
@@ -866,7 +866,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
gboolean drop_done;
GtkApplication *application;
FMAUpdater *updater;
- NactMainWindow *main_window;
+ FMAMainWindow *main_window;
FMAImporterParms parms;
GList *import_results, *it;
guint count;
@@ -896,8 +896,8 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), FALSE );
updater = fma_application_get_updater( FMA_APPLICATION( application ));
- g_return_val_if_fail( NACT_IS_MAIN_WINDOW( priv->window ), FALSE );
- main_window = NACT_MAIN_WINDOW( priv->window );
+ g_return_val_if_fail( FMA_IS_MAIN_WINDOW( priv->window ), FALSE );
+ main_window = FMA_MAIN_WINDOW( priv->window );
selection_data_data = ( const gchar * ) gtk_selection_data_get_data( selection_data );
g_debug( "%s", selection_data_data );
@@ -941,7 +941,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
count = g_slist_length( messages );
g_debug( "%s: count=%d", thisfn, count );
if( count == 1 ){
- bar = nact_main_window_get_statusbar( main_window );
+ bar = fma_main_window_get_statusbar( main_window );
nact_statusbar_display_with_timeout(
bar, TREE_MODEL_STATUSBAR_CONTEXT, messages->data );
}
@@ -963,7 +963,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
*/
if( imported ){
fma_object_dump_tree( imported );
- view = nact_main_window_get_items_view( main_window );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_insert_at_path( NACT_TREE_IEDITABLE( view ), imported, dest );
}
@@ -972,7 +972,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
*/
if( overriden ){
fma_object_dump_tree( overriden );
- view = nact_main_window_get_items_view( main_window );
+ view = fma_main_window_get_items_view( main_window );
nact_tree_ieditable_set_items( NACT_TREE_IEDITABLE( view ), overriden );
fma_object_free_items( overriden );
}
@@ -991,12 +991,12 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
}
static FMAObjectItem *
-is_dropped_already_exists( const FMAObjectItem *importing, const NactMainWindow *window )
+is_dropped_already_exists( const FMAObjectItem *importing, const FMAMainWindow *window )
{
NactTreeView *items_view;
gchar *id = fma_object_get_id( importing );
- items_view = nact_main_window_get_items_view( window );
+ items_view = fma_main_window_get_items_view( window );
FMAObjectItem *exists = nact_tree_view_get_item_by_id( items_view, id );
g_free( id );
@@ -1150,7 +1150,7 @@ get_xds_atom_value( GdkDragContext *context )
* to register the new child
*/
static gboolean
-is_parent_accept_new_children( FMAApplication *application, NactMainWindow *window, FMAObjectItem *parent )
+is_parent_accept_new_children( FMAApplication *application, FMAMainWindow *window, FMAObjectItem *parent )
{
gboolean accept_ok;
FMAUpdater *updater;
@@ -1158,7 +1158,7 @@ is_parent_accept_new_children( FMAApplication *application, NactMainWindow *wind
accept_ok = FALSE;
updater = fma_application_get_updater( application );
- bar = nact_main_window_get_statusbar( window );
+ bar = fma_main_window_get_statusbar( window );
/* inserting as a level zero item
* ensure that level zero is writable
diff --git a/src/ui/nact-tree-model-priv.h b/src/ui/nact-tree-model-priv.h
index 1a5f264..d9a5ec1 100644
--- a/src/ui/nact-tree-model-priv.h
+++ b/src/ui/nact-tree-model-priv.h
@@ -54,7 +54,7 @@ struct _NactTreeModelPrivate {
/* must be initialized right after the instanciation
*/
- NactMainWindow *window;
+ FMAMainWindow *window;
FMAClipboard *clipboard;
guint mode;
diff --git a/src/ui/nact-tree-model.c b/src/ui/nact-tree-model.c
index e2bfcbf..5e4d995 100644
--- a/src/ui/nact-tree-model.c
+++ b/src/ui/nact-tree-model.c
@@ -42,7 +42,7 @@
#include "fma-clipboard.h"
#include "base-gtk-utils.h"
#include "fma-main-tab.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-tree-model.h"
#include "nact-tree-model-priv.h"
@@ -405,20 +405,20 @@ nact_tree_model_new( GtkTreeView *treeview )
/**
* nact_tree_model_set_main_window:
* @tmodel: this #NactTreeModel instance
- * @main_window: the #NactMainWindow.
+ * @main_window: the #FMAMainWindow.
*
* Attach the main window to the tree model, which is required to get
* a clipboard object, which is required to have a functional drag and
* drop.
*/
void
-nact_tree_model_set_main_window( NactTreeModel *tmodel, NactMainWindow *window )
+nact_tree_model_set_main_window( NactTreeModel *tmodel, FMAMainWindow *window )
{
static const gchar *thisfn = "nact_tree_model_set_main_window";
NactTreeModelPrivate *priv;
g_return_if_fail( tmodel && NACT_IS_TREE_MODEL( tmodel ));
- g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+ g_return_if_fail( window && FMA_IS_MAIN_WINDOW( window ));
g_debug( "%s: tmodel=%p, window=%p", thisfn, ( void * ) tmodel, ( void * ) window );
diff --git a/src/ui/nact-tree-model.h b/src/ui/nact-tree-model.h
index 541e93d..9b5a162 100644
--- a/src/ui/nact-tree-model.h
+++ b/src/ui/nact-tree-model.h
@@ -46,7 +46,7 @@
#include "api/fma-object.h"
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -87,7 +87,7 @@ GType nact_tree_model_get_type ( void );
NactTreeModel *nact_tree_model_new ( GtkTreeView *treeview );
void nact_tree_model_set_main_window ( NactTreeModel *tmodel,
-
NactMainWindow *main_window );
+
FMAMainWindow *main_window );
void nact_tree_model_set_edition_mode( NactTreeModel *tmodel,
guint mode );
diff --git a/src/ui/nact-tree-view.c b/src/ui/nact-tree-view.c
index 30a4755..a89730f 100644
--- a/src/ui/nact-tree-view.c
+++ b/src/ui/nact-tree-view.c
@@ -39,7 +39,7 @@
#include "base-keysyms.h"
#include "fma-application.h"
-#include "nact-main-window.h"
+#include "fma-main-window.h"
#include "nact-tree-view.h"
#include "nact-tree-model.h"
#include "nact-tree-ieditable.h"
@@ -51,7 +51,7 @@ struct _NactTreeViewPrivate {
/* properties set at instanciation time
*/
- NactMainWindow *window;
+ FMAMainWindow *window;
/* initialization
*/
@@ -377,7 +377,7 @@ class_init( NactTreeViewClass *klass )
static void
tree_ieditable_iface_init( NactTreeIEditableInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_main_window_tree_ieditable_iface_init";
+ static const gchar *thisfn = "fma_main_window_tree_ieditable_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
@@ -454,7 +454,7 @@ instance_finalize( GObject *instance )
* destroyed at @window finalization.
*/
NactTreeView *
-nact_tree_view_new( NactMainWindow *main_window )
+nact_tree_view_new( FMAMainWindow *main_window )
{
NactTreeView *view;
diff --git a/src/ui/nact-tree-view.h b/src/ui/nact-tree-view.h
index 7980e76..6b630c1 100644
--- a/src/ui/nact-tree-view.h
+++ b/src/ui/nact-tree-view.h
@@ -41,16 +41,16 @@
* The NactTreeView encapsulates the GtkTreeView which displays the items
* list on the left of the main pane.
*
- * It is instanciated from NactMainWindow::on_initialize_gtk().
+ * It is instanciated from FMAMainWindow::on_initialize_gtk().
*
- * A pointer to this NactTreeView is attached to the NactMainWindow at
+ * A pointer to this NactTreeView is attached to the FMAMainWindow at
* construction time.
*/
#include "api/fma-object-item.h"
#include "base-window.h"
-#include "nact-main-window-def.h"
+#include "fma-main-window-def.h"
G_BEGIN_DECLS
@@ -107,7 +107,7 @@ enum {
GType nact_tree_view_get_type( void );
-NactTreeView *nact_tree_view_new ( NactMainWindow *main_window );
+NactTreeView *nact_tree_view_new ( FMAMainWindow *main_window );
void nact_tree_view_set_mnemonic ( NactTreeView *view,
GtkContainer *parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
