GNOME.org
 

[nautilus-actions] Get rid of 'NACT' mentions

commit 146b5c7682a8304f3c7c94e1651a64dab880174e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 15 12:57:57 2017 +0100

    Get rid of 'NACT' mentions

 src/core/fma-object-action-factory.c  |    2 +-
 src/core/fma-object-profile-factory.c |    4 +-
 src/core/fma-object-profile.c         |    7 +-
 src/core/fma-pivot.h                  |    2 +-
 src/core/fma-settings.c               |   98 ++++++++++++++++----------------
 src/io-desktop/fma-desktop-writer.c   |    4 +-
 src/io-gconf/fma-gconf-reader.c       |    4 +-
 src/ui/base-assistant.c               |    2 +-
 src/ui/base-keysyms.h                 |   20 +++---
 src/ui/fma-clipboard.c                |    8 +-
 src/ui/fma-icon-chooser.c             |    2 +-
 src/ui/fma-match-list.c               |    6 +-
 src/ui/fma-preferences.ui             |    8 +-
 src/ui/fma-schemes-list.c             |    6 +-
 src/ui/fma-tree-ieditable.c           |    2 +-
 src/ui/fma-tree-ieditable.h           |    6 +-
 src/ui/fma-tree-model-dnd.c           |    4 +-
 src/ui/fma-tree-view.c                |    6 +-
 18 files changed, 95 insertions(+), 96 deletions(-)
---
diff --git a/src/core/fma-object-action-factory.c b/src/core/fma-object-action-factory.c
index 992f0ac..8a3ad8e 100644
--- a/src/core/fma-object-action-factory.c
+++ b/src/core/fma-object-action-factory.c
@@ -176,7 +176,7 @@ static FMADataDef data_def_action [] = {
 
        /* this data has been introduced in 2.29.1 and has been left up to 2.29.4
         * it has been removed starting with 2.29.5
-        * it is now only used in the NACT user interface
+        * it is now only used in the fma-config-tool user interface
         * it is so left readable, but no more writable (obsolete)
         */
        { FMAFO_DATA_TOOLBAR_SAME_LABEL,
diff --git a/src/core/fma-object-profile-factory.c b/src/core/fma-object-profile-factory.c
index 165a9df..8f354e0 100644
--- a/src/core/fma-object-profile-factory.c
+++ b/src/core/fma-object-profile-factory.c
@@ -90,8 +90,8 @@ static FMADataDef data_def_profile [] = {
                                NULL },
 
        /* Path and Parameters are two separate data both in GConf, in GConf-derived
-        * export files and in NACT. Only in desktop files, they are merged as only
-        * one 'Exec' data which is splitted at read time.
+        * export files and in fma-config-tool user interface. Only in desktop files,
+        * they are merged as only one 'Exec' data which is splitted at read time.
         */
        { FMAFO_DATA_PATH,
                                TRUE,
diff --git a/src/core/fma-object-profile.c b/src/core/fma-object-profile.c
index 5f450cc..9a62859 100644
--- a/src/core/fma-object-profile.c
+++ b/src/core/fma-object-profile.c
@@ -651,9 +651,10 @@ read_done_ending( FMAObjectProfile *profile )
 }
 
 /*
- * GConf used to store command path and parameters as two separated fields
- * Desktop store them as one field
- * NACT displays and edits them as two fields (this let us have Browse and Legend buttons)
+ * GConf used to store command path and parameters as two separated fields;
+ * Desktop store them as one field;
+ * fma-config-tool user interface displays and edits them as two fields
+ * (this let us have Browse and Legend buttons)
  * => so we definitively keep them as separated boxed in our internal objects
  */
 static void
diff --git a/src/core/fma-pivot.h b/src/core/fma-pivot.h
index 36dcacb..268c8fc 100644
--- a/src/core/fma-pivot.h
+++ b/src/core/fma-pivot.h
@@ -123,7 +123,7 @@ GType    fma_pivot_get_type( void );
 #define PIVOT_SIGNAL_ITEMS_CHANGED                             "pivot-items-changed"
 
 /* Loadable population
- * NACT management user interface defaults to PIVOT_LOAD_ALL
+ * fma-config-tool user interface defaults to PIVOT_LOAD_ALL
  * FMA plugin set the loadable population to !PIVOT_LOAD_DISABLED & !PIVOT_LOAD_INVALID
  */
 typedef enum {
diff --git a/src/core/fma-settings.c b/src/core/fma-settings.c
index 7d48b08..4915b65 100644
--- a/src/core/fma-settings.c
+++ b/src/core/fma-settings.c
@@ -117,7 +117,7 @@ struct _FMASettingsPrivate {
        FMATimeout timeout;
 };
 
-#define GROUP_NACT                                             "fma-config-tool"
+#define GROUP_FMA                                              "fma-config-tool"
 #define GROUP_RUNTIME                                  "runtime"
 
 typedef struct {
@@ -129,61 +129,61 @@ typedef struct {
        KeyDef;
 
 static const KeyDef st_def_keys[] = {
-       { IPREFS_ADMIN_PREFERENCES_LOCKED,         GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_ADMIN_PREFERENCES_LOCKED,         GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
        { IPREFS_ADMIN_IO_PROVIDERS_LOCKED,        GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_ASSISTANT_ESC_CONFIRM,            GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
-       { IPREFS_ASSISTANT_ESC_QUIT,               GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
-       { IPREFS_CAPABILITY_ADD_CAPABILITY_WSP,    GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_COMMAND_CHOOSER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_COMMAND_CHOOSER_URI,              GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" },
-       { IPREFS_COMMAND_LEGEND_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_CONFIRM_LOGOUT_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_ASSISTANT_ESC_CONFIRM,            GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { IPREFS_ASSISTANT_ESC_QUIT,               GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { IPREFS_CAPABILITY_ADD_CAPABILITY_WSP,    GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_COMMAND_CHOOSER_WSP,              GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_COMMAND_CHOOSER_URI,              GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///bin" },
+       { IPREFS_COMMAND_LEGEND_WSP,               GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_CONFIRM_LOGOUT_WSP,               GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
        { IPREFS_DESKTOP_ENVIRONMENT,              GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      "" },
-       { IPREFS_WORKING_DIR_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_WORKING_DIR_URI,                  GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
-       { IPREFS_SHOW_IF_RUNNING_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_SHOW_IF_RUNNING_URI,              GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" },
-       { IPREFS_TRY_EXEC_WSP,                     GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_TRY_EXEC_URI,                     GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" },
-       { IPREFS_EXPORT_ASK_USER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_EXPORT_ASK_USER_LAST_FORMAT,      GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Desktop1" },
-       { IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_EXPORT_ASSISTANT_WSP,             GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_EXPORT_ASSISTANT_URI,             GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///tmp" },
-       { IPREFS_EXPORT_ASSISTANT_PANED,           GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
-       { IPREFS_EXPORT_PREFERRED_FORMAT,          GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Ask" },
-       { IPREFS_FOLDER_CHOOSER_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_FOLDER_CHOOSER_URI,               GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
-       { IPREFS_IMPORT_ASK_USER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_IMPORT_ASK_USER_LAST_MODE,        GROUP_NACT,    FMA_DATA_TYPE_STRING,      "NoImport" },
-       { IPREFS_IMPORT_ASSISTANT_WSP,             GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_IMPORT_ASSISTANT_URI,             GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///tmp" },
-       { IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_IMPORT_PREFERRED_MODE,            GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Ask" },
-       { IPREFS_IO_PROVIDERS_WRITE_ORDER,         GROUP_NACT,    FMA_DATA_TYPE_STRING_LIST, "" },
-       { IPREFS_ICON_CHOOSER_URI,                 GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
-       { IPREFS_ICON_CHOOSER_PANED,               GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
-       { IPREFS_ICON_CHOOSER_WSP,                 GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_WORKING_DIR_WSP,                  GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_WORKING_DIR_URI,                  GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { IPREFS_SHOW_IF_RUNNING_WSP,              GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_SHOW_IF_RUNNING_URI,              GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///bin" },
+       { IPREFS_TRY_EXEC_WSP,                     GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_TRY_EXEC_URI,                     GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///bin" },
+       { IPREFS_EXPORT_ASK_USER_WSP,              GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_EXPORT_ASK_USER_LAST_FORMAT,      GROUP_FMA,    FMA_DATA_TYPE_STRING,      "Desktop1" },
+       { IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_EXPORT_ASSISTANT_WSP,             GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_EXPORT_ASSISTANT_URI,             GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///tmp" },
+       { IPREFS_EXPORT_ASSISTANT_PANED,           GROUP_FMA,    FMA_DATA_TYPE_UINT,        "200" },
+       { IPREFS_EXPORT_PREFERRED_FORMAT,          GROUP_FMA,    FMA_DATA_TYPE_STRING,      "Ask" },
+       { IPREFS_FOLDER_CHOOSER_WSP,               GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_FOLDER_CHOOSER_URI,               GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { IPREFS_IMPORT_ASK_USER_WSP,              GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_IMPORT_ASK_USER_LAST_MODE,        GROUP_FMA,    FMA_DATA_TYPE_STRING,      "NoImport" },
+       { IPREFS_IMPORT_ASSISTANT_WSP,             GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_IMPORT_ASSISTANT_URI,             GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///tmp" },
+       { IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_IMPORT_PREFERRED_MODE,            GROUP_FMA,    FMA_DATA_TYPE_STRING,      "Ask" },
+       { IPREFS_IO_PROVIDERS_WRITE_ORDER,         GROUP_FMA,    FMA_DATA_TYPE_STRING_LIST, "" },
+       { IPREFS_ICON_CHOOSER_URI,                 GROUP_FMA,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { IPREFS_ICON_CHOOSER_PANED,               GROUP_FMA,    FMA_DATA_TYPE_UINT,        "200" },
+       { IPREFS_ICON_CHOOSER_WSP,                 GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
        { IPREFS_ITEMS_ADD_ABOUT_ITEM,             GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "true" },
        { IPREFS_ITEMS_CREATE_ROOT_MENU,           GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "true" },
        { IPREFS_ITEMS_LEVEL_ZERO_ORDER,           GROUP_RUNTIME, FMA_DATA_TYPE_STRING_LIST, "" },
        { IPREFS_ITEMS_LIST_ORDER_MODE,            GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      "AscendingOrder" 
},
-       { IPREFS_MAIN_PANED,                       GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
-       { IPREFS_MAIN_SAVE_AUTO,                   GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_MAIN_SAVE_PERIOD,                 GROUP_NACT,    FMA_DATA_TYPE_UINT,        "5" },
-       { IPREFS_MAIN_TABS_POS,                    GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Top" },
-       { IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
-       { IPREFS_MAIN_TOOLBAR_FILE_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
-       { IPREFS_MAIN_TOOLBAR_HELP_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
-       { IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY,       GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_MAIN_WINDOW_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_PREFERENCES_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_MAIN_PANED,                       GROUP_FMA,    FMA_DATA_TYPE_UINT,        "200" },
+       { IPREFS_MAIN_SAVE_AUTO,                   GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_MAIN_SAVE_PERIOD,                 GROUP_FMA,    FMA_DATA_TYPE_UINT,        "5" },
+       { IPREFS_MAIN_TABS_POS,                    GROUP_FMA,    FMA_DATA_TYPE_STRING,      "Top" },
+       { IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY,        GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { IPREFS_MAIN_TOOLBAR_FILE_DISPLAY,        GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { IPREFS_MAIN_TOOLBAR_HELP_DISPLAY,        GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY,       GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_MAIN_WINDOW_WSP,                  GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_PREFERENCES_WSP,                  GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
        { IPREFS_PLUGIN_MENU_LOG,                  GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_RELABEL_DUPLICATE_ACTION,         GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_RELABEL_DUPLICATE_MENU,           GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_RELABEL_DUPLICATE_PROFILE,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
-       { IPREFS_SCHEME_ADD_SCHEME_WSP,            GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
-       { IPREFS_SCHEME_DEFAULT_LIST,              GROUP_NACT,    FMA_DATA_TYPE_STRING_LIST, "" },
+       { IPREFS_RELABEL_DUPLICATE_ACTION,         GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_RELABEL_DUPLICATE_MENU,           GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_RELABEL_DUPLICATE_PROFILE,        GROUP_FMA,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { IPREFS_SCHEME_ADD_SCHEME_WSP,            GROUP_FMA,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { IPREFS_SCHEME_DEFAULT_LIST,              GROUP_FMA,    FMA_DATA_TYPE_STRING_LIST, "" },
        { IPREFS_TERMINAL_PATTERN,                 GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      "" },
        { IPREFS_IO_PROVIDER_READABLE,             IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, "true" },
        { IPREFS_IO_PROVIDER_WRITABLE,             IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, "true" },
diff --git a/src/io-desktop/fma-desktop-writer.c b/src/io-desktop/fma-desktop-writer.c
index 7ecfefa..62fd188 100644
--- a/src/io-desktop/fma-desktop-writer.c
+++ b/src/io-desktop/fma-desktop-writer.c
@@ -305,8 +305,8 @@ desktop_weak_notify( FMADesktopFile *ndf, GObject *item )
 
 /*
  * Implementation of FMAIIOProvider::duplicate_data
- * Add a ref on FMADesktopFile data, so that unreffing origin object in NACT
- * does not invalid duplicated pointer
+ * Add a ref on FMADesktopFile data, so that unreffing origin object in
+ * fma-config-tool user interface does not invalid duplicated pointer.
  */
 guint
 fma_desktop_writer_iio_provider_duplicate_data( const FMAIIOProvider *provider, FMAObjectItem *dest, const 
FMAObjectItem *source, GSList **messages )
diff --git a/src/io-gconf/fma-gconf-reader.c b/src/io-gconf/fma-gconf-reader.c
index 07b52dc..ce09400 100644
--- a/src/io-gconf/fma-gconf-reader.c
+++ b/src/io-gconf/fma-gconf-reader.c
@@ -292,8 +292,8 @@ read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAc
        list_profiles = fma_gconf_utils_get_subdirs( FMA_GCONF_PROVIDER( provider )->private->gconf, 
data->path );
 
        /* read profiles in the specified order
-        * as a protection against bugs in NACT, we check that profile has not
-        * already been loaded
+        * as a protection against bugs in fma-config-tool, we check that
+        * profile has not already been loaded
         */
        for( ip = order ; ip ; ip = ip->next ){
                profile_id = ( gchar * ) ip->data;
diff --git a/src/ui/base-assistant.c b/src/ui/base-assistant.c
index 6c753d9..5e0d954 100644
--- a/src/ui/base-assistant.c
+++ b/src/ui/base-assistant.c
@@ -396,7 +396,7 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, BaseAssistant *assi
 
        if( !assistant->private->dispose_has_run ){
 
-               if( event->keyval == NACT_KEY_Escape && assistant->private->quit_on_escape ){
+               if( event->keyval == FMA_KEY_Escape && assistant->private->quit_on_escape ){
 
                                assistant->private->escape_key_pressed = TRUE;
                                toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( assistant ));
diff --git a/src/ui/base-keysyms.h b/src/ui/base-keysyms.h
index 08839c2..c0549e7 100644
--- a/src/ui/base-keysyms.h
+++ b/src/ui/base-keysyms.h
@@ -41,16 +41,16 @@
 
 G_BEGIN_DECLS
 
-#define NACT_KEY_Escape    (GDK_KEY_Escape)
-#define NACT_KEY_Insert    (GDK_KEY_Insert)
-#define NACT_KEY_Delete    (GDK_KEY_Delete)
-#define NACT_KEY_Return    (GDK_KEY_Return)
-#define NACT_KEY_KP_Delete (GDK_KEY_KP_Delete)
-#define NACT_KEY_KP_Enter  (GDK_KEY_KP_Enter)
-#define NACT_KEY_KP_Insert (GDK_KEY_KP_Insert)
-#define NACT_KEY_Left      (GDK_KEY_Left)
-#define NACT_KEY_Right     (GDK_KEY_Right)
-#define NACT_KEY_F2        (GDK_KEY_F2)
+#define FMA_KEY_Escape    (GDK_KEY_Escape)
+#define FMA_KEY_Insert    (GDK_KEY_Insert)
+#define FMA_KEY_Delete    (GDK_KEY_Delete)
+#define FMA_KEY_Return    (GDK_KEY_Return)
+#define FMA_KEY_KP_Delete (GDK_KEY_KP_Delete)
+#define FMA_KEY_KP_Enter  (GDK_KEY_KP_Enter)
+#define FMA_KEY_KP_Insert (GDK_KEY_KP_Insert)
+#define FMA_KEY_Left      (GDK_KEY_Left)
+#define FMA_KEY_Right     (GDK_KEY_Right)
+#define FMA_KEY_F2        (GDK_KEY_F2)
 
 G_END_DECLS
 
diff --git a/src/ui/fma-clipboard.c b/src/ui/fma-clipboard.c
index 8024ee7..2568f09 100644
--- a/src/ui/fma-clipboard.c
+++ b/src/ui/fma-clipboard.c
@@ -80,7 +80,7 @@ struct _FMAClipboardPrivate {
 };
 
 #define FMA_CLIPBOARD_ATOM                     gdk_atom_intern( "_FMA_CLIPBOARD", FALSE )
-#define FMA_CLIPBOARD_NACT_ATOM                gdk_atom_intern( "ClipboardFileManagerActions", FALSE )
+#define FMA_CLIPBOARD_FMA_ATOM         gdk_atom_intern( "ClipboardFileManagerActions", FALSE )
 
 enum {
        FMA_CLIPBOARD_FORMAT_FMA = 0,
@@ -342,7 +342,7 @@ fma_clipboard_dnd_get_data( FMAClipboard *clipboard, gboolean *copy_data )
 
        if( !clipboard->private->dispose_has_run ){
 
-               selection = gtk_clipboard_wait_for_contents( clipboard->private->dnd, FMA_CLIPBOARD_NACT_ATOM 
);
+               selection = gtk_clipboard_wait_for_contents( clipboard->private->dnd, FMA_CLIPBOARD_FMA_ATOM 
);
                if( selection ){
                        data = ( FMAClipboardDndData * ) gtk_selection_data_get_data( selection );
 
@@ -416,7 +416,7 @@ fma_clipboard_dnd_drag_end( FMAClipboard *clipboard )
 
        if( !clipboard->private->dispose_has_run ){
 
-               selection = gtk_clipboard_wait_for_contents( clipboard->private->dnd, FMA_CLIPBOARD_NACT_ATOM 
);
+               selection = gtk_clipboard_wait_for_contents( clipboard->private->dnd, FMA_CLIPBOARD_FMA_ATOM 
);
                g_debug( "%s: selection=%p", thisfn, ( void * ) selection );
 
                if( selection ){
@@ -740,7 +740,7 @@ fma_clipboard_primary_get( FMAClipboard *clipboard, gboolean *relabel )
 
        if( !clipboard->private->dispose_has_run ){
 
-               selection = gtk_clipboard_wait_for_contents( clipboard->private->primary, 
FMA_CLIPBOARD_NACT_ATOM );
+               selection = gtk_clipboard_wait_for_contents( clipboard->private->primary, 
FMA_CLIPBOARD_FMA_ATOM );
 
                if( selection ){
                        user_data = ( PrimaryData * ) gtk_selection_data_get_data( selection );
diff --git a/src/ui/fma-icon-chooser.c b/src/ui/fma-icon-chooser.c
index d62a90f..d5f4349 100644
--- a/src/ui/fma-icon-chooser.c
+++ b/src/ui/fma-icon-chooser.c
@@ -717,7 +717,7 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, FMAIconChooser *edi
        if( !editor->private->dispose_has_run ){
 
                /* inhibit Escape key */
-               if( event->keyval == NACT_KEY_Escape ){
+               if( event->keyval == FMA_KEY_Escape ){
                        stop = TRUE;
                }
        }
diff --git a/src/ui/fma-match-list.c b/src/ui/fma-match-list.c
index 857c144..f8de0b8 100644
--- a/src/ui/fma-match-list.c
+++ b/src/ui/fma-match-list.c
@@ -523,21 +523,21 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, MatchListData *data
 
        stop = FALSE;
 
-       if( event->keyval == NACT_KEY_F2 ){
+       if( event->keyval == FMA_KEY_F2 ){
                if( data->editable_filter ){
                        edit_inline( data );
                        stop = TRUE;
                }
        }
 
-       if( event->keyval == NACT_KEY_Insert || event->keyval == NACT_KEY_KP_Insert ){
+       if( event->keyval == FMA_KEY_Insert || event->keyval == FMA_KEY_KP_Insert ){
                if( data->editable_item ){
                        insert_new_row( data );
                        stop = TRUE;
                }
        }
 
-       if( event->keyval == NACT_KEY_Delete || event->keyval == NACT_KEY_KP_Delete ){
+       if( event->keyval == FMA_KEY_Delete || event->keyval == FMA_KEY_KP_Delete ){
                if( data->editable_item ){
                        delete_current_row( data );
                        stop = TRUE;
diff --git a/src/ui/fma-preferences.ui b/src/ui/fma-preferences.ui
index 25de433..3acf669 100644
--- a/src/ui/fma-preferences.ui
+++ b/src/ui/fma-preferences.ui
@@ -88,7 +88,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the ascending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
+                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the ascending alphabetical order of their label, both in the Nautilus context menu and in the 
fma-config-tool user interface.</property>
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -104,7 +104,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the descending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
+                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the descending alphabetical order of their label, both in the Nautilus context menu and in the 
fma-config-tool user interface.</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">OrderAlphaAscButton</property>
@@ -120,7 +120,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Display order of menus and 
actions, both in the Nautilus context menu and in the NACT user interface, must be manually 
adjusted.</property>
+                            <property name="tooltip_text" translatable="yes">Display order of menus and 
actions, both in the Nautilus context menu and in the fma-config-tools user interface, must be manually 
adjusted.</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">OrderAlphaAscButton</property>
@@ -960,7 +960,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip_text" translatable="yes">You may define here any 
number of schemes. They will be proposed as default schemes when defining conditions for an action.
-If the list becomes empty, NACT will automatically refill in with this default list.
+If the list becomes empty, fma-config-tool will automatically re-fill in with this default list.
 You can add a new scheme by clicking on the '+' button.</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
diff --git a/src/ui/fma-schemes-list.c b/src/ui/fma-schemes-list.c
index a784bc4..9d1aa88 100644
--- a/src/ui/fma-schemes-list.c
+++ b/src/ui/fma-schemes-list.c
@@ -550,17 +550,17 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, BaseWindow *window
 
        stop = FALSE;
 
-       if( event->keyval == NACT_KEY_F2 ){
+       if( event->keyval == FMA_KEY_F2 ){
                edit_inline( window );
                stop = TRUE;
        }
 
-       if( event->keyval == NACT_KEY_Insert || event->keyval == NACT_KEY_KP_Insert ){
+       if( event->keyval == FMA_KEY_Insert || event->keyval == FMA_KEY_KP_Insert ){
                insert_new_row( window );
                stop = TRUE;
        }
 
-       if( event->keyval == NACT_KEY_Delete || event->keyval == NACT_KEY_KP_Delete ){
+       if( event->keyval == FMA_KEY_Delete || event->keyval == FMA_KEY_KP_Delete ){
                delete_row( window );
                stop = TRUE;
        }
diff --git a/src/ui/fma-tree-ieditable.c b/src/ui/fma-tree-ieditable.c
index 7e60003..c8a92f9 100644
--- a/src/ui/fma-tree-ieditable.c
+++ b/src/ui/fma-tree-ieditable.c
@@ -261,7 +261,7 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, FMATreeIEditable *i
 {
        gboolean stop = FALSE;
 
-       if( event->keyval == NACT_KEY_F2 ){
+       if( event->keyval == FMA_KEY_F2 ){
                inline_edition( instance );
                stop = TRUE;
        }
diff --git a/src/ui/fma-tree-ieditable.h b/src/ui/fma-tree-ieditable.h
index b7af053..755ddf6 100644
--- a/src/ui/fma-tree-ieditable.h
+++ b/src/ui/fma-tree-ieditable.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_TREE_TREE_IEDITABLE_H__
-#define __UI_NACT_TREE_TREE_IEDITABLE_H__
+#ifndef __UI_FMA_TREE_IEDITABLE_H__
+#define __UI_FMA_TREE_IEDITABLE_H__
 
 /**
  * SECTION: fma-tree_ieditable
@@ -113,4 +113,4 @@ gboolean fma_tree_ieditable_is_level_zero_modified( const FMATreeIEditable *inst
 
 G_END_DECLS
 
-#endif /* __UI_NACT_TREE_TREE_IEDITABLE_H__ */
+#endif /* __UI_FMA_TREE_IEDITABLE_H__ */
diff --git a/src/ui/fma-tree-model-dnd.c b/src/ui/fma-tree-model-dnd.c
index 73bc864..5fe1dd5 100644
--- a/src/ui/fma-tree-model-dnd.c
+++ b/src/ui/fma-tree-model-dnd.c
@@ -86,8 +86,6 @@
 #define XDS_ATOM                                               gdk_atom_intern( "XdndDirectSave0", FALSE )
 #define XDS_FILENAME                                   "xds.txt"
 
-#define NACT_ATOM                                              gdk_atom_intern( "XdndFileManagerActions", 
FALSE )
-
 /* as a dnd source, we provide
  * - a special XdndNautilusAction format for internal move/copy
  * - a XdndDirectSave, suitable for exporting to a file manager
@@ -570,7 +568,7 @@ drop_inside( FMATreeModel *model, GtkTreePath *dest, GtkSelectionData  *selectio
        items_view = fma_main_window_get_items_view( main_window );
 
        /*
-        * NACT format (may embed profiles, or not)
+        * fma-config-tool format (may embed profiles, or not)
         *      with profiles: only valid dest is inside an action
         *  without profile: only valid dest is outside (besides of) an action
         */
diff --git a/src/ui/fma-tree-view.c b/src/ui/fma-tree-view.c
index da59df5..641e2b1 100644
--- a/src/ui/fma-tree-view.c
+++ b/src/ui/fma-tree-view.c
@@ -651,15 +651,15 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, FMATreeView *view )
 {
        gboolean stop = FALSE;
 
-       if( event->keyval == NACT_KEY_Return || event->keyval == NACT_KEY_KP_Enter ){
+       if( event->keyval == FMA_KEY_Return || event->keyval == FMA_KEY_KP_Enter ){
                toggle_collapse( view );
                stop = TRUE;
        }
-       if( event->keyval == NACT_KEY_Right ){
+       if( event->keyval == FMA_KEY_Right ){
                navigate_to_child( view );
                stop = TRUE;
        }
-       if( event->keyval == NACT_KEY_Left ){
+       if( event->keyval == FMA_KEY_Left ){
                navigate_to_parent( view );
                stop = TRUE;
        }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]