[nautilus-actions] na_gtk_utils is renamed to fma_gtk_utils
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] na_gtk_utils is renamed to fma_gtk_utils
- Date: Wed, 15 Feb 2017 22:47:26 +0000 (UTC)
commit 8376f99a53cb896c05162a4b68b12d93052f76a5
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 23:49:16 2015 +0200
na_gtk_utils is renamed to fma_gtk_utils
src/core/Makefile.am | 4 +-
src/core/{na-gtk-utils.c => fma-gtk-utils.c} | 60 ++++++++++----------
src/core/{na-gtk-utils.h => fma-gtk-utils.h} | 32 +++++-----
src/core/na-importer-ask.c | 18 +++---
src/core/na-ioptions-list.c | 4 +-
src/nact/base-gtk-utils.c | 32 +++++-----
src/nact/base-window.c | 6 +-
src/nact/nact-assistant-export.c | 28 +++++-----
src/nact/nact-assistant-import.c | 6 +-
src/nact/nact-export-ask.c | 4 +-
src/nact/nact-iaction-tab.c | 52 ++++++++--------
src/nact/nact-ibasenames-tab.c | 12 ++--
src/nact/nact-icapabilities-tab.c | 8 +-
src/nact/nact-icommand-tab.c | 24 ++++----
src/nact/nact-icon-chooser.c | 4 +-
src/nact/nact-ienvironment-tab.c | 80 +++++++++++++-------------
src/nact/nact-iexecution-tab.c | 38 ++++++------
src/nact/nact-ifolders-tab.c | 16 +++---
src/nact/nact-imimetypes-tab.c | 8 +-
src/nact/nact-iproperties-tab.c | 24 ++++----
src/nact/nact-ischemes-tab.c | 12 ++--
src/nact/nact-main-tab.c | 8 +-
src/nact/nact-main-window.c | 20 +++---
src/nact/nact-menu-view.c | 6 +-
src/nact/nact-preferences-editor.c | 20 +++---
src/nact/nact-sort-buttons.c | 4 +-
src/nact/nact-statusbar.c | 2 +-
src/nact/nact-tree-view.c | 4 +-
28 files changed, 268 insertions(+), 268 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index c820f1b..9b4b06f 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -74,8 +74,8 @@ libna_core_la_SOURCES = \
fma-gconf-utils.c \
fma-gnome-vfs-uri.c \
fma-gnome-vfs-uri.h \
- na-gtk-utils.c \
- na-gtk-utils.h \
+ fma-gtk-utils.c \
+ fma-gtk-utils.h \
fma-icontext.c \
fma-icontext-factory.c \
fma-iduplicable.c \
diff --git a/src/core/na-gtk-utils.c b/src/core/fma-gtk-utils.c
similarity index 87%
rename from src/core/na-gtk-utils.c
rename to src/core/fma-gtk-utils.c
index e9c3855..95d7a61 100644
--- a/src/core/na-gtk-utils.c
+++ b/src/core/fma-gtk-utils.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <string.h>
-#include "na-gtk-utils.h"
+#include "fma-gtk-utils.h"
#include "na-settings.h"
static void int_list_to_position( GList *list, gint *x, gint *y, gint *width, gint *height );
@@ -42,14 +42,14 @@ static GList *position_to_int_list( gint x, gint y, gint width, gint height );
static void free_int_list( GList *list );
/*
- * na_gtk_utils_find_widget_by_name:
+ * fma_gtk_utils_find_widget_by_name:
* @container: a #GtkContainer, usually the #GtkWindow toplevel.
* @name: the name of the searched widget.
*
* Returns: the searched widget.
*/
GtkWidget *
-na_gtk_utils_find_widget_by_name( GtkContainer *container, const gchar *name )
+fma_gtk_utils_find_widget_by_name( GtkContainer *container, const gchar *name )
{
GList *children = gtk_container_get_children( container );
GList *ic;
@@ -67,7 +67,7 @@ na_gtk_utils_find_widget_by_name( GtkContainer *container, const gchar *name )
break;
}
if( GTK_IS_CONTAINER( child )){
- found = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( child ), name );
+ found = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( child ), name );
}
}
}
@@ -111,9 +111,9 @@ dump_children( const gchar *thisfn, GtkContainer *container, int level )
}
void
-na_gtk_utils_dump_children( GtkContainer *container )
+fma_gtk_utils_dump_children( GtkContainer *container )
{
- static const gchar *thisfn = "na_gtk_utils_dump_children";
+ static const gchar *thisfn = "fma_gtk_utils_dump_children";
g_debug( "%s: container=%p", thisfn, container );
@@ -122,7 +122,7 @@ na_gtk_utils_dump_children( GtkContainer *container )
#endif
/*
- * na_gtk_utils_connect_widget_by_name:
+ * fma_gtk_utils_connect_widget_by_name:
* @container: a #GtkContainer, usually the #GtkWindow toplevel.
* @name: the name of the searched widget.
* @signal: the name of the signal to connect the #callabck to.
@@ -132,19 +132,19 @@ na_gtk_utils_dump_children( GtkContainer *container )
* Connect the signal to the widget.
*/
void
-na_gtk_utils_connect_widget_by_name(
+fma_gtk_utils_connect_widget_by_name(
GtkContainer *container, const gchar *name,
const gchar *signal, GCallback cb, void *user_data )
{
GtkWidget *widget;
- widget = na_gtk_utils_find_widget_by_name( container, name );
+ widget = fma_gtk_utils_find_widget_by_name( container, name );
g_return_if_fail( widget && GTK_IS_WIDGET( widget ));
g_signal_connect( G_OBJECT( widget ), signal, cb, user_data );
}
/**
- * na_gtk_utils_restore_window_position:
+ * fma_gtk_utils_restore_window_position:
* @toplevel: the #GtkWindow window.
* @wsp_name: the string which handles the window size and position in user preferences.
*
@@ -153,9 +153,9 @@ na_gtk_utils_connect_widget_by_name(
* A window position is stored as a list of integers "x,y,width,height".
*/
void
-na_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_name )
+fma_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_name )
{
- static const gchar *thisfn = "na_gtk_utils_restore_window_position";
+ static const gchar *thisfn = "fma_gtk_utils_restore_window_position";
GList *list;
gint x=0, y=0, width=0, height=0;
GdkDisplay *display;
@@ -213,16 +213,16 @@ na_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_name
}
/**
- * na_gtk_utils_save_window_position:
+ * fma_gtk_utils_save_window_position:
* @toplevel: the #GtkWindow window.
* @wsp_name: the string which handles the window size and position in user preferences.
*
* Save the size and position of the specified window.
*/
void
-na_gtk_utils_save_window_position( GtkWindow *toplevel, const gchar *wsp_name )
+fma_gtk_utils_save_window_position( GtkWindow *toplevel, const gchar *wsp_name )
{
- static const gchar *thisfn = "na_gtk_utils_save_window_position";
+ static const gchar *thisfn = "fma_gtk_utils_save_window_position";
gint x, y, width, height;
GList *list;
@@ -293,7 +293,7 @@ free_int_list( GList *list )
}
/**
- * na_gtk_utils_set_editable:
+ * fma_gtk_utils_set_editable:
* @widget: the #GtkWdiget.
* @editable: whether the @widget is editable or not.
*
@@ -309,7 +309,7 @@ free_int_list( GList *list )
* - sensitive: whether the value is relevant (has a sense in this context)
*/
void
-na_gtk_utils_set_editable( GObject *widget, gboolean editable )
+fma_gtk_utils_set_editable( GObject *widget, gboolean editable )
{
GList *renderers, *irender;
@@ -366,7 +366,7 @@ na_gtk_utils_set_editable( GObject *widget, gboolean editable )
}
/**
- * na_gtk_utils_radio_set_initial_state:
+ * fma_gtk_utils_radio_set_initial_state:
* @button: the #GtkRadioButton button which is initially active.
* @handler: the corresponding "toggled" handler.
* @user_data: the user data associated to the handler.
@@ -389,7 +389,7 @@ na_gtk_utils_set_editable( GObject *widget, gboolean editable )
* initial state.
*/
void
-na_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
+fma_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
GCallback handler, void *user_data, gboolean editable, gboolean sensitive )
{
GSList *group, *ig;
@@ -399,11 +399,11 @@ na_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
for( ig = group ; ig ; ig = ig->next ){
other = GTK_RADIO_BUTTON( ig->data );
- g_object_set_data( G_OBJECT( other ), NA_TOGGLE_DATA_BUTTON, button );
- g_object_set_data( G_OBJECT( other ), NA_TOGGLE_DATA_HANDLER, handler );
- g_object_set_data( G_OBJECT( other ), NA_TOGGLE_DATA_USER_DATA, user_data );
- g_object_set_data( G_OBJECT( other ), NA_TOGGLE_DATA_EDITABLE, GUINT_TO_POINTER( editable ));
- na_gtk_utils_set_editable( G_OBJECT( other ), editable );
+ g_object_set_data( G_OBJECT( other ), FMA_TOGGLE_DATA_BUTTON, button );
+ g_object_set_data( G_OBJECT( other ), FMA_TOGGLE_DATA_HANDLER, handler );
+ g_object_set_data( G_OBJECT( other ), FMA_TOGGLE_DATA_USER_DATA, user_data );
+ g_object_set_data( G_OBJECT( other ), FMA_TOGGLE_DATA_EDITABLE, GUINT_TO_POINTER( editable ));
+ fma_gtk_utils_set_editable( G_OBJECT( other ), editable );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( other ), FALSE );
gtk_widget_set_sensitive( GTK_WIDGET( other ), sensitive );
}
@@ -412,7 +412,7 @@ na_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
}
/**
- * na_gtk_utils_radio_reset_initial_state:
+ * fma_gtk_utils_radio_reset_initial_state:
* @button: the #GtkRadioButton being toggled.
* @handler: the corresponding "toggled" handler.
* @data: data associated with the @handler callback.
@@ -423,7 +423,7 @@ na_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
* editable).
*/
void
-na_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handler )
+fma_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handler )
{
GtkToggleButton *initial_button;
GCallback initial_handler;
@@ -432,12 +432,12 @@ na_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handle
gpointer user_data;
active = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( button ));
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( active && !editable ){
- initial_button = GTK_TOGGLE_BUTTON( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_BUTTON ));
- initial_handler = G_CALLBACK( g_object_get_data( G_OBJECT( button ), NA_TOGGLE_DATA_HANDLER
));
- user_data = g_object_get_data( G_OBJECT( button ), NA_TOGGLE_DATA_USER_DATA );
+ initial_button = GTK_TOGGLE_BUTTON( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_BUTTON ));
+ initial_handler = G_CALLBACK( g_object_get_data( G_OBJECT( button ), FMA_TOGGLE_DATA_HANDLER
));
+ user_data = g_object_get_data( G_OBJECT( button ), FMA_TOGGLE_DATA_USER_DATA );
if( handler ){
g_signal_handlers_block_by_func(( gpointer ) button, handler, user_data );
diff --git a/src/core/na-gtk-utils.h b/src/core/fma-gtk-utils.h
similarity index 62%
rename from src/core/na-gtk-utils.h
rename to src/core/fma-gtk-utils.h
index 5858e60..7b64cc4 100644
--- a/src/core/na-gtk-utils.h
+++ b/src/core/fma-gtk-utils.h
@@ -27,12 +27,12 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __CORE_API_NA_GTK_UTILS_H__
-#define __CORE_API_NA_GTK_UTILS_H__
+#ifndef __CORE_FMA_GTK_UTILS_H__
+#define __CORE_FMA_GTK_UTILS_H__
/* @title: GTK+
* @short_description: The Gtk+ Library Utilities.
- * @include: core/na-gtk-utils.h
+ * @include: core/fma-gtk-utils.h
*/
#include <gtk/gtk.h>
@@ -41,42 +41,42 @@ G_BEGIN_DECLS
/* widget hierarchy
*/
-GtkWidget *na_gtk_utils_find_widget_by_name ( GtkContainer *container,
+GtkWidget *fma_gtk_utils_find_widget_by_name ( GtkContainer *container,
const
gchar *name );
-void na_gtk_utils_connect_widget_by_name( GtkContainer *container,
+void fma_gtk_utils_connect_widget_by_name( GtkContainer *container,
const
gchar *name,
const
gchar *signal,
GCallback cb,
void
*user_data );
#ifdef NA_MAINTAINER_MODE
-void na_gtk_utils_dump_children ( GtkContainer *container );
+void fma_gtk_utils_dump_children ( GtkContainer *container );
#endif
/* window size and position
*/
-void na_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_name );
-void na_gtk_utils_save_window_position ( GtkWindow *toplevel, const gchar *wsp_name );
+void fma_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_name );
+void fma_gtk_utils_save_window_position ( GtkWindow *toplevel, const gchar *wsp_name );
/* widget status
*/
-void na_gtk_utils_set_editable( GObject *widget, gboolean editable );
+void fma_gtk_utils_set_editable( GObject *widget, gboolean editable );
-void na_gtk_utils_radio_set_initial_state ( GtkRadioButton *button,
+void fma_gtk_utils_radio_set_initial_state ( GtkRadioButton *button,
GCallback toggled_handler, void *user_data,
gboolean editable, gboolean sensitive );
-void na_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback toggled_handler );
+void fma_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback toggled_handler );
/* default height of a panel bar (dirty hack!)
*/
#define DEFAULT_HEIGHT 22
-#define NA_TOGGLE_DATA_EDITABLE "na-toggle-data-editable"
-#define NA_TOGGLE_DATA_BUTTON "na-toggle-data-button"
-#define NA_TOGGLE_DATA_HANDLER "na-toggle-data-handler"
-#define NA_TOGGLE_DATA_USER_DATA "na-toggle-data-user-data"
+#define FMA_TOGGLE_DATA_EDITABLE "fma-toggle-data-editable"
+#define FMA_TOGGLE_DATA_BUTTON "fma-toggle-data-button"
+#define FMA_TOGGLE_DATA_HANDLER "fma-toggle-data-handler"
+#define FMA_TOGGLE_DATA_USER_DATA "fma-toggle-data-user-data"
G_END_DECLS
-#endif /* __CORE_API_NA_GTK_UTILS_H__ */
+#endif /* __CORE_FMA_GTK_UTILS_H__ */
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index b87576c..b74176d 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -36,7 +36,7 @@
#include <api/fma-iimporter.h>
#include <api/fma-object-api.h>
-#include "na-gtk-utils.h"
+#include "fma-gtk-utils.h"
#include "na-import-mode.h"
#include "na-importer.h"
#include "na-importer-ask.h"
@@ -352,7 +352,7 @@ na_importer_ask_user( const FMAObjectItem *importing, const FMAObjectItem *exist
} while ( !on_dialog_response( dialog, code ));
mode = dialog->private->mode;
- na_gtk_utils_save_window_position( dialog->private->toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP );
+ fma_gtk_utils_save_window_position( dialog->private->toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP
);
if( parms->parent ){
gtk_widget_hide( GTK_WIDGET( dialog->private->toplevel ));
@@ -374,7 +374,7 @@ initialize_gtk( NAImporterAsk *dialog, GtkWindow *toplevel )
g_debug( "%s: dialog=%p, toplevel=%p", thisfn, ( void * ) dialog, ( void * ) toplevel );
- container = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
+ container = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
na_ioptions_list_gtk_init( NA_IOPTIONS_LIST( dialog ), container, FALSE );
}
@@ -408,19 +408,19 @@ initialize_window( NAImporterAsk *editor, GtkWindow *toplevel )
imported_label, editor->private->parms->uri, existing_label );
}
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "ImporterAskLabel" );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "ImporterAskLabel" );
gtk_label_set_text( GTK_LABEL( widget ), label );
g_free( label );
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
mode_id = na_settings_get_string( NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
na_ioptions_list_set_default( NA_IOPTIONS_LIST( editor ), widget, mode_id );
g_free( mode_id );
- button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskKeepChoiceButton" );
+ button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskKeepChoiceButton" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( button ), editor->private->parms->keep_choice );
- na_gtk_utils_restore_window_position( toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP );
+ fma_gtk_utils_restore_window_position( toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP );
gtk_widget_show_all( GTK_WIDGET( toplevel ));
}
@@ -433,7 +433,7 @@ get_selected_mode( NAImporterAsk *editor )
GtkWidget *button;
gboolean keep;
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ), "AskModeVBox"
);
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ), "AskModeVBox"
);
mode = na_ioptions_list_get_selected( NA_IOPTIONS_LIST( editor ), widget );
mode_id = na_ioption_get_id( mode );
@@ -442,7 +442,7 @@ get_selected_mode( NAImporterAsk *editor )
editor->private->mode = na_import_mode_get_id( NA_IMPORT_MODE( mode ));
- button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ),
"AskKeepChoiceButton" );
+ button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ),
"AskKeepChoiceButton" );
keep = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( button ));
na_settings_set_boolean( NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, keep );
}
diff --git a/src/core/na-ioptions-list.c b/src/core/na-ioptions-list.c
index f6dfdfc..762d7c8 100644
--- a/src/core/na-ioptions-list.c
+++ b/src/core/na-ioptions-list.c
@@ -35,7 +35,7 @@
#include <api/fma-core-utils.h>
-#include "na-gtk-utils.h"
+#include "fma-gtk-utils.h"
#include "na-ioptions-list.h"
/* private interface data
@@ -779,7 +779,7 @@ radio_button_select_iter( GtkWidget *button, GtkWidget *container_parent )
if( !strcmp( default_id, option_id )){
editable = get_options_list_editable( container_parent );
sensitive = get_options_list_sensitive( container_parent );
- na_gtk_utils_radio_set_initial_state( GTK_RADIO_BUTTON( button ), NULL, NULL, editable,
sensitive );
+ fma_gtk_utils_radio_set_initial_state( GTK_RADIO_BUTTON( button ), NULL, NULL, editable,
sensitive );
g_debug( "na_ioptions_list_radio_button_select_iter: container_parent=%p, set active
button=%p",
( void * ) container_parent, ( void * ) button );
}
diff --git a/src/nact/base-gtk-utils.c b/src/nact/base-gtk-utils.c
index 750a1ba..b5cae56 100644
--- a/src/nact/base-gtk-utils.c
+++ b/src/nact/base-gtk-utils.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-updater.h"
#include "base-gtk-utils.h"
@@ -61,7 +61,7 @@ base_gtk_utils_restore_window_position( const BaseWindow *window, const gchar *w
toplevel = base_window_get_gtk_toplevel( window );
g_return_if_fail( GTK_IS_WINDOW( toplevel ));
- na_gtk_utils_restore_window_position( toplevel, wsp_name );
+ fma_gtk_utils_restore_window_position( toplevel, wsp_name );
}
/**
@@ -82,7 +82,7 @@ base_gtk_utils_save_window_position( const BaseWindow *window, const gchar *wsp_
toplevel = base_window_get_gtk_toplevel( window );
g_return_if_fail( GTK_IS_WINDOW( toplevel ));
- na_gtk_utils_save_window_position( toplevel, wsp_name );
+ fma_gtk_utils_save_window_position( toplevel, wsp_name );
}
/**
@@ -99,7 +99,7 @@ base_gtk_utils_save_window_position( const BaseWindow *window, const gchar *wsp_
void
base_gtk_utils_set_editable( GObject *widget, gboolean editable )
{
- na_gtk_utils_set_editable( widget, editable );
+ fma_gtk_utils_set_editable( widget, editable );
}
/**
@@ -129,7 +129,7 @@ void
base_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
GCallback handler, void *user_data, gboolean editable, gboolean sensitive )
{
- na_gtk_utils_radio_set_initial_state( button, handler, user_data, editable, sensitive );
+ fma_gtk_utils_radio_set_initial_state( button, handler, user_data, editable, sensitive );
}
/**
@@ -146,7 +146,7 @@ base_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
void
base_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handler )
{
- na_gtk_utils_radio_reset_initial_state( button, handler );
+ fma_gtk_utils_radio_reset_initial_state( button, handler );
}
/**
@@ -182,9 +182,9 @@ base_gtk_utils_toggle_set_initial_state( BaseWindow *window,
if( button ){
base_window_signal_connect( window, G_OBJECT( button ), "toggled", handler );
- g_object_set_data( G_OBJECT( button ), NA_TOGGLE_DATA_HANDLER, handler );
- g_object_set_data( G_OBJECT( button ), NA_TOGGLE_DATA_USER_DATA, window );
- g_object_set_data( G_OBJECT( button ), NA_TOGGLE_DATA_EDITABLE, GUINT_TO_POINTER( editable ));
+ g_object_set_data( G_OBJECT( button ), FMA_TOGGLE_DATA_HANDLER, handler );
+ g_object_set_data( G_OBJECT( button ), FMA_TOGGLE_DATA_USER_DATA, window );
+ g_object_set_data( G_OBJECT( button ), FMA_TOGGLE_DATA_EDITABLE, GUINT_TO_POINTER( editable
));
base_gtk_utils_set_editable( G_OBJECT( button ), editable );
gtk_widget_set_sensitive( GTK_WIDGET( button ), sensitive );
@@ -210,12 +210,12 @@ base_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button )
gpointer user_data;
gboolean active;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( !editable ){
active = gtk_toggle_button_get_active( button );
- handler = G_CALLBACK( g_object_get_data( G_OBJECT( button ), NA_TOGGLE_DATA_HANDLER ));
- user_data = g_object_get_data( G_OBJECT( button ), NA_TOGGLE_DATA_USER_DATA );
+ handler = G_CALLBACK( g_object_get_data( G_OBJECT( button ), FMA_TOGGLE_DATA_HANDLER ));
+ user_data = g_object_get_data( G_OBJECT( button ), FMA_TOGGLE_DATA_USER_DATA );
g_signal_handlers_block_by_func(( gpointer ) button, handler, user_data );
gtk_toggle_button_set_active( button, !active );
@@ -405,7 +405,7 @@ base_gtk_utils_select_file_with_preview( GtkApplicationWindow *window,
g_signal_connect( dialog, "update-preview", update_preview_cb, preview );
}
- na_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), wsp_name );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), wsp_name );
text = gtk_entry_get_text( GTK_ENTRY( entry ));
@@ -430,7 +430,7 @@ base_gtk_utils_select_file_with_preview( GtkApplicationWindow *window,
na_settings_set_string( entry_name, uri );
g_free( uri );
- na_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
+ fma_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
gtk_widget_destroy( dialog );
}
@@ -472,7 +472,7 @@ base_gtk_utils_select_dir( GtkApplicationWindow *window,
NULL
);
- na_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), wsp_name );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), wsp_name );
text = gtk_entry_get_text( GTK_ENTRY( entry ));
@@ -497,7 +497,7 @@ base_gtk_utils_select_dir( GtkApplicationWindow *window,
na_settings_set_string( entry_name, uri );
g_free( uri );
- na_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
+ fma_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
gtk_widget_destroy( dialog );
}
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index f1257ac..51c15f1 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <string.h>
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-builder.h"
#include "base-window.h"
@@ -962,7 +962,7 @@ base_window_dump_children( const BaseWindow *window )
if( !window->private->dispose_has_run ){
- na_gtk_utils_dump_children( GTK_CONTAINER( window->private->gtk_toplevel ));
+ fma_gtk_utils_dump_children( GTK_CONTAINER( window->private->gtk_toplevel ));
}
}
#endif
@@ -1108,7 +1108,7 @@ base_window_get_widget( const BaseWindow *window, const gchar *name )
if( !window->private->dispose_has_run ){
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( window->private->gtk_toplevel ),
name );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window->private->gtk_toplevel ),
name );
}
return( widget );
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 3d903d4..c5746a7 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -39,7 +39,7 @@
#include "core/fma-exporter.h"
#include "core/fma-export-format.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-ioptions-list.h"
#include "nact-application.h"
@@ -310,7 +310,7 @@ instance_dispose( GObject *window )
assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( window )));
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_ACTIONS_SELECTION );
- pane = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
+ pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
pos = gtk_paned_get_position( GTK_PANED( pane ));
na_settings_set_uint( NA_IPREFS_EXPORT_ASSISTANT_PANED, pos );
@@ -407,7 +407,7 @@ items_tree_view_initialize_gtk( NactAssistantExport *window, GtkAssistant *assis
priv->items_view = nact_tree_view_new(
NACT_MAIN_WINDOW( base_window_get_main_window( BASE_WINDOW( window ))));
- parent = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( assistant ), "ActionsList" );
+ parent = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( assistant ), "ActionsList" );
g_return_if_fail( parent && GTK_IS_CONTAINER( parent ));
gtk_container_add( GTK_CONTAINER( parent ), GTK_WIDGET( priv->items_view ));
@@ -427,7 +427,7 @@ folder_chooser_initialize_gtk( NactAssistantExport *window )
assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( window )));
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FOLDER_SELECTION );
- chooser = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p2-ExportFolderChooser" );
+ chooser = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p2-ExportFolderChooser" );
gtk_file_chooser_set_action( GTK_FILE_CHOOSER( chooser ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
gtk_file_chooser_set_create_folders( GTK_FILE_CHOOSER( chooser ), TRUE );
@@ -457,7 +457,7 @@ format_tree_view_initialize_gtk( NactAssistantExport *window )
assistant = GTK_ASSISTANT( base_window_get_gtk_toplevel( BASE_WINDOW( window )));
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FORMAT_SELECTION );
- tree_view = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p3-ExportFormatTreeView" );
+ tree_view = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p3-ExportFormatTreeView" );
na_ioptions_list_gtk_init( NA_IOPTIONS_LIST( window ), tree_view, TRUE );
@@ -493,14 +493,14 @@ on_base_initialize_base_window( NactAssistantExport *window, void *empty )
pos = na_settings_get_uint( NA_IPREFS_EXPORT_ASSISTANT_PANED, NULL, NULL );
if( pos ){
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_ACTIONS_SELECTION );
- pane = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
+ pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
gtk_paned_set_position( GTK_PANED( pane ), pos );
}
/* initialize the export format tree view
*/
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FORMAT_SELECTION );
- tree_view = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ),
"p3-ExportFormatTreeView" );
+ tree_view = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ),
"p3-ExportFormatTreeView" );
format = na_settings_get_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, NULL, &mandatory );
na_ioptions_list_set_editable(
NA_IOPTIONS_LIST( window ), tree_view,
@@ -679,7 +679,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
* not happen immediately - We have to wait until Gtk 3.0, most probably due
* to the new width-for-height and height-for-width features...
*/
- GtkWidget *vbox = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmVBox" );
+ GtkWidget *vbox = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmVBox" );
gtk_container_set_resize_mode( GTK_CONTAINER( vbox ), GTK_RESIZE_IMMEDIATE );
#endif
@@ -697,7 +697,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
}
g_free( label_item );
}
- label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmItemsList" );
+ label = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmItemsList" );
g_return_if_fail( GTK_IS_LABEL( label ));
gtk_label_set_text( GTK_LABEL( label ), text );
g_free( text );
@@ -705,14 +705,14 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
/* display the target folder
*/
g_return_if_fail( window->private->uri && strlen( window->private->uri ));
- label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmTargetFolder" );
+ label = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmTargetFolder" );
g_return_if_fail( GTK_IS_LABEL( label ));
gtk_label_set_text( GTK_LABEL( label ), window->private->uri );
/* display the export format and its description
*/
format_page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FORMAT_SELECTION );
- tree_view = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( format_page ), "p3-ExportFormatTreeView"
);
+ tree_view = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( format_page ),
"p3-ExportFormatTreeView" );
g_return_if_fail( GTK_IS_TREE_VIEW( tree_view ));
format = na_ioptions_list_get_selected( NA_IOPTIONS_LIST( window ), tree_view );
g_return_if_fail( FMA_IS_EXPORT_FORMAT( format ));
@@ -720,7 +720,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
format_label = na_ioption_get_label( format );
format_label2 = fma_core_utils_str_remove_char( format_label, "_" );
text = g_strdup_printf( "%s:", format_label2 );
- label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportFormat" );
+ label = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportFormat" );
g_return_if_fail( GTK_IS_LABEL( label ));
gtk_label_set_text( GTK_LABEL( label ), text );
g_free( format_label );
@@ -729,7 +729,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
format_description = na_ioption_get_description( format );
format_description2 = fma_core_utils_str_remove_char( format_description, "_" );
- label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportTooltip" );
+ label = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportTooltip" );
g_return_if_fail( GTK_IS_LABEL( label ));
gtk_label_set_text( GTK_LABEL( label ), format_description2 );
g_free( format_description );
@@ -818,7 +818,7 @@ assist_prepare_exportdone( NactAssistantExport *window, GtkAssistant *assistant,
errors = 0;
width = 15;
- vbox = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p5-SummaryVBox" );
+ vbox = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p5-SummaryVBox" );
g_return_if_fail( GTK_IS_BOX( vbox ));
/* for each item:
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 28d136c..c7a5087 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -41,7 +41,7 @@
#include <core/na-import-mode.h>
#include <core/na-importer.h>
#include <core/na-ioptions-list.h>
-#include <core/na-gtk-utils.h>
+#include <core/fma-gtk-utils.h>
#include <core/na-settings.h>
#include "nact-application.h"
@@ -431,7 +431,7 @@ runtime_init_file_selector( NactAssistantImport *window, GtkAssistant *assistant
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FILES_SELECTION );
g_return_if_fail( GTK_IS_CONTAINER( page ));
- chooser = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "ImportFileChooser" );
+ chooser = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "ImportFileChooser" );
g_return_if_fail( GTK_IS_FILE_CHOOSER( chooser ));
g_debug( "%s: window=%p, assistant=%p, page=%p, chooser=%p",
@@ -865,7 +865,7 @@ find_widget_from_page( GtkWidget *page, const gchar *name )
g_return_val_if_fail( GTK_IS_CONTAINER( page ), NULL );
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), name );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), name );
return( widget );
}
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index f1f37d3..0559285 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -37,7 +37,7 @@
#include "core/fma-exporter.h"
#include "core/fma-export-format.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-ioptions-list.h"
#include "base-gtk-utils.h"
@@ -427,7 +427,7 @@ keep_choice_on_toggled( GtkToggleButton *button, NactExportAsk *editor )
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->keep_last_choice = gtk_toggle_button_get_active( button );
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 73ff5ba..bbd23a5 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -37,7 +37,7 @@
#include "api/fma-core-utils.h"
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-io-provider.h"
#include "nact-application.h"
@@ -219,9 +219,9 @@ initialize_gtk( NactIActionTab *instance )
g_debug( "%s: instance=%p (%s)",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
- button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconBrowseButton" );
+ button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconBrowseButton" );
g_return_if_fail( button && GTK_IS_BUTTON( button ));
- frame = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconFrame" );
+ frame = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconFrame" );
g_return_if_fail( frame && GTK_IS_FRAME( frame ));
gtk_widget_get_preferred_size( GTK_WIDGET( button ), &minimal_size, &natural_size );
@@ -251,39 +251,39 @@ initialize_window( NactIActionTab *instance )
instance, MAIN_SIGNAL_ITEM_UPDATED,
G_CALLBACK( on_main_item_updated ), NULL );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionTargetSelectionButton",
"toggled", G_CALLBACK( on_target_selection_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionTargetLocationButton",
"toggled", G_CALLBACK( on_target_location_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionMenuLabelEntry",
"changed", G_CALLBACK( on_label_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionTargetToolbarButton",
"toggled", G_CALLBACK( on_target_toolbar_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ToolbarSameLabelButton",
"toggled", G_CALLBACK( on_toolbar_same_label_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionToolbarLabelEntry",
"changed", G_CALLBACK( on_toolbar_label_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionTooltipEntry",
"changed", G_CALLBACK( on_tooltip_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionIconEntry",
"changed", G_CALLBACK( on_icon_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionIconBrowseButton",
"clicked", G_CALLBACK( on_icon_browse ), instance );
}
@@ -305,7 +305,7 @@ nact_iaction_tab_has_label( NactIActionTab *instance )
g_return_val_if_fail( NACT_IS_IACTION_TAB( instance ), FALSE );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelEntry" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelEntry" );
label = gtk_entry_get_text( GTK_ENTRY( label_widget ));
has_label = ( g_utf8_strlen( label, -1 ) > 0 );
@@ -321,7 +321,7 @@ on_main_item_updated( NactIActionTab *instance, FMAIContext *context, guint data
g_return_if_fail( instance && NACT_IS_IACTION_TAB( instance ));
if( context && FMA_IS_OBJECT_ITEM( context )){
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionMenuLabelEntry" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionMenuLabelEntry" );
g_return_if_fail( label_widget && GTK_IS_ENTRY( label_widget ));
label = fma_object_get_label( context );
gtk_entry_set_text( GTK_ENTRY( label_widget ), label );
@@ -385,18 +385,18 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActi
FMA_IS_OBJECT_ACTION( item ) &&
fma_object_is_target_toolbar( item );
- toggle = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetSelectionButton" ));
+ toggle = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetSelectionButton" ));
gtk_toggle_button_set_active( toggle, target_selection || ( item && FMA_IS_OBJECT_MENU( item )));
gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && FMA_IS_OBJECT_ACTION( item ));
base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
- toggle = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetLocationButton" ));
+ toggle = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetLocationButton" ));
gtk_toggle_button_set_active( toggle, target_location || ( item && FMA_IS_OBJECT_MENU( item )));
gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && FMA_IS_OBJECT_ACTION( item ));
base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
enable_label = target_selection || target_location || ( item && FMA_IS_OBJECT_MENU( item ));
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelEntry" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelEntry" );
label = item ? fma_object_get_label( item ) : g_strdup( "" );
label = label ? label : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( label_widget ), label );
@@ -407,42 +407,42 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActi
gtk_widget_set_sensitive( label_widget, enable_label );
base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
- toggle = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetToolbarButton" ));
+ toggle = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionTargetToolbarButton" ));
gtk_toggle_button_set_active( toggle, target_toolbar );
gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && FMA_IS_OBJECT_ACTION( item ));
base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
- toggle = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ToolbarSameLabelButton" ));
+ toggle = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ToolbarSameLabelButton" ));
same_label = item && FMA_IS_OBJECT_ACTION( item ) ? fma_object_is_toolbar_same_label( item ) : FALSE;
gtk_toggle_button_set_active( toggle, same_label );
gtk_widget_set_sensitive( GTK_WIDGET( toggle ), target_toolbar );
base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionToolbarLabelEntry"
);
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionToolbarLabelEntry" );
label = item && FMA_IS_OBJECT_ACTION( item ) ? fma_object_get_toolbar_label( item ) : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( label_widget ), label );
g_free( label );
gtk_widget_set_sensitive( label_widget, target_toolbar && !same_label );
base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionToolbarLabelLabel"
);
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionToolbarLabelLabel" );
gtk_widget_set_sensitive( label_widget, target_toolbar && !same_label );
- tooltip_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionTooltipEntry" );
+ tooltip_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionTooltipEntry" );
tooltip = item ? fma_object_get_tooltip( item ) : g_strdup( "" );
tooltip = tooltip ? tooltip : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( tooltip_widget ), tooltip );
g_free( tooltip );
base_gtk_utils_set_editable( G_OBJECT( tooltip_widget ), editable );
- icon_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconEntry" );
+ icon_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconEntry" );
icon = item ? fma_object_get_icon( item ) : g_strdup( "" );
icon = icon ? icon : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( icon_widget ), icon );
g_free( icon );
base_gtk_utils_set_editable( G_OBJECT( icon_widget ), editable );
- icon_button = GTK_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionIconBrowseButton" ));
+ icon_button = GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionIconBrowseButton" ));
base_gtk_utils_set_editable( G_OBJECT( icon_button ), editable );
data->on_selection_change = FALSE;
@@ -608,7 +608,7 @@ set_label_label( NactIActionTab *instance, const gchar *color_str )
GtkWidget *label;
GdkRGBA color;
- label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelLabel" );
+ label = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelLabel" );
gdk_rgba_parse( &color, color_str );
base_gtk_utils_widget_set_color( label, &color );
@@ -893,7 +893,7 @@ on_icon_changed( GtkEntry *icon_entry, NactIActionTab *instance )
/* icon_name may be null if there is no current item
* in such a case, we blank the image
*/
- image = GTK_IMAGE( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconImage" ));
+ image = GTK_IMAGE( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionIconImage" ));
base_gtk_utils_render( icon_name, image, GTK_ICON_SIZE_SMALL_TOOLBAR );
g_free( icon_name );
}
diff --git a/src/nact/nact-ibasenames-tab.c b/src/nact/nact-ibasenames-tab.c
index c55ffe5..1807032 100644
--- a/src/nact/nact-ibasenames-tab.c
+++ b/src/nact/nact-ibasenames-tab.c
@@ -35,7 +35,7 @@
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-gtk-utils.h"
#include "nact-ibasenames-tab.h"
@@ -194,9 +194,9 @@ initialize_gtk( NactIBasenamesTab *instance )
NACT_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_BASENAMES,
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "BasenamesTreeView" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddBasenameButton" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveBasenameButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "BasenamesTreeView" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddBasenameButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveBasenameButton"
),
( pget_filters ) get_basenames,
( pset_filters ) set_basenames,
NULL,
@@ -229,7 +229,7 @@ initialize_window( NactIBasenamesTab *instance )
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "BasenamesMatchcaseButton",
"toggled", G_CALLBACK( on_matchcase_toggled ), instance );
}
@@ -254,7 +254,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIBase
data = get_ibasenames_data( NACT_IBASENAMES_TAB( instance ));
data->on_selection_change = TRUE;
- matchcase_button = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"BasenamesMatchcaseButton" ));
+ matchcase_button = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"BasenamesMatchcaseButton" ));
matchcase = context ? fma_object_get_matchcase( context ) : FALSE;
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( matchcase_button ), matchcase );
base_gtk_utils_set_editable( G_OBJECT( matchcase_button ), editable );
diff --git a/src/nact/nact-icapabilities-tab.c b/src/nact/nact-icapabilities-tab.c
index dd8823f..e6c4034 100644
--- a/src/nact/nact-icapabilities-tab.c
+++ b/src/nact/nact-icapabilities-tab.c
@@ -36,7 +36,7 @@
#include "api/fma-core-utils.h"
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "nact-main-tab.h"
#include "nact-main-window.h"
@@ -173,9 +173,9 @@ initialize_gtk( NactICapabilitiesTab *instance )
NACT_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_CAPABILITIES,
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CapabilitiesTreeView" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddCapabilityButton" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveCapabilityButton"
),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CapabilitiesTreeView"
),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddCapabilityButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"RemoveCapabilityButton" ),
( pget_filters ) get_capabilities,
( pset_filters ) set_capabilities,
( pon_add_cb ) on_add_clicked,
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 069d22f..293bc84 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -38,7 +38,7 @@
#include "api/fma-object-api.h"
#include "core/fma-factory-object.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-tokens.h"
#include "nact-application.h"
@@ -260,11 +260,11 @@ initialize_window( NactICommandTab *instance )
"delete-event", G_CALLBACK( on_legend_dialog_deleted ), instance );
#endif
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "WorkingDirectoryEntry",
"changed", G_CALLBACK( on_wdir_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "CommandWorkingDirectoryButton",
"clicked", G_CALLBACK( on_wdir_browse ), instance );
@@ -371,7 +371,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIComm
update_example_label( instance, profile );
- wdir_entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "WorkingDirectoryEntry" );
+ wdir_entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "WorkingDirectoryEntry" );
wdir = profile ? fma_object_get_working_dir( profile ) : g_strdup( "" );
wdir = wdir ? wdir : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( wdir_entry ), wdir );
@@ -379,7 +379,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIComm
gtk_widget_set_sensitive( wdir_entry, profile != NULL );
base_gtk_utils_set_editable( G_OBJECT( wdir_entry ), editable );
- wdir_button = GTK_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"CommandWorkingDirectoryButton" ));
+ wdir_button = GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"CommandWorkingDirectoryButton" ));
gtk_widget_set_sensitive( GTK_WIDGET( wdir_button ), profile != NULL );
base_gtk_utils_set_editable( G_OBJECT( wdir_button ), editable );
@@ -389,13 +389,13 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIComm
static GtkWidget *
get_label_entry( NactICommandTab *instance )
{
- return( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ProfileLabelEntry" ));
+ return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ProfileLabelEntry" ));
}
static GtkButton *
get_legend_button( NactICommandTab *instance )
{
- return( GTK_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"CommandLegendButton" )));
+ return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"CommandLegendButton" )));
}
static GtkWindow *
@@ -410,19 +410,19 @@ get_legend_dialog( NactICommandTab *instance )
static GtkWidget *
get_parameters_entry( NactICommandTab *instance )
{
- return( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandParametersEntry" ));
+ return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandParametersEntry" ));
}
static GtkButton *
get_path_button( NactICommandTab *instance )
{
- return( GTK_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathButton"
)));
+ return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathButton"
)));
}
static GtkWidget *
get_path_entry( NactICommandTab *instance )
{
- return( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathEntry" ));
+ return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathEntry" ));
}
static void
@@ -578,7 +578,7 @@ on_wdir_browse( GtkButton *button, NactICommandTab *instance )
NULL );
if( profile ){
- wdir_entry = na_gtk_utils_find_widget_by_name(
+ wdir_entry = fma_gtk_utils_find_widget_by_name(
GTK_CONTAINER( instance ), "WorkingDirectoryEntry" );
base_gtk_utils_select_dir(
GTK_APPLICATION_WINDOW( instance ),
@@ -641,7 +641,7 @@ update_example_label( NactICommandTab *instance, FMAObjectProfile *profile )
gchar *parameters;
GtkWidget *example_widget;
- example_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandExampleLabel" );
+ example_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandExampleLabel"
);
if( profile ){
parameters = parse_parameters( instance );
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index cc0f5b8..1fb553b 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <core/na-gtk-utils.h>
+#include <core/fma-gtk-utils.h>
#include "base-keysyms.h"
#include "nact-application.h"
@@ -662,7 +662,7 @@ on_destroy( GtkWidget *widget, GdkEvent *event, void *foo )
/* clear the various models
*/
- context_view = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( widget ),
"ThemedTreeView" ));
+ context_view = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( widget ),
"ThemedTreeView" ));
context_store = GTK_LIST_STORE( gtk_tree_view_get_model( context_view ));
if( gtk_tree_model_get_iter_first( GTK_TREE_MODEL( context_store ), &context_iter )){
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index fc4c9f7..66dbf92 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -39,7 +39,7 @@
#include "api/fma-core-utils.h"
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/fma-desktop-environment.h"
#include "core/na-settings.h"
@@ -275,28 +275,28 @@ initialize_window( NactIEnvironmentTab *instance )
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "SelectionCountSigneCombobox",
"changed", G_CALLBACK( on_selcount_ope_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "SelectionCountNumberEntry",
"changed", G_CALLBACK( on_selcount_int_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ShowAlwaysButton",
"toggled", G_CALLBACK( on_show_always_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "OnlyShowButton",
"toggled", G_CALLBACK( on_only_show_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "DoNotShowButton",
"toggled", G_CALLBACK( on_do_not_show_toggled ), instance );
listview = GTK_TREE_VIEW(
- na_gtk_utils_find_widget_by_name(
+ fma_gtk_utils_find_widget_by_name(
GTK_CONTAINER( instance ), "EnvironmentsDesktopTreeView" ));
model = gtk_tree_view_get_model( listview );
@@ -320,27 +320,27 @@ initialize_window( NactIEnvironmentTab *instance )
renderers->data,
"toggled", G_CALLBACK( on_desktop_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "TryExecEntry",
"changed", G_CALLBACK( on_try_exec_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "TryExecButton",
"clicked", G_CALLBACK( on_try_exec_browse ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ShowIfRegisteredEntry",
"changed", G_CALLBACK( on_show_if_registered_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ShowIfTrueEntry",
"changed", G_CALLBACK( on_show_if_true_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ShowIfRunningEntry",
"changed", G_CALLBACK( on_show_if_running_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ShowIfRunningButton",
"clicked", G_CALLBACK( on_show_if_running_browse ), instance );
}
@@ -389,22 +389,22 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvi
g_free( selcount_ope );
g_free( sel_count );
- combo = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountSigneCombobox" );
+ combo = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountSigneCombobox" );
base_gtk_utils_set_editable( G_OBJECT( combo ), editable );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountNumberEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountNumberEntry" );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
/* desktop environment
*/
raz_desktop_listview( instance );
- always_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowAlwaysButton" );
- show_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "OnlyShowButton" );
- notshow_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "DoNotShowButton" );
+ always_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowAlwaysButton" );
+ show_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "OnlyShowButton" );
+ notshow_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "DoNotShowButton" );
desktops = context ? fma_object_get_only_show_in( context ) : NULL;
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
gtk_toggle_button_set_inconsistent( GTK_TOGGLE_BUTTON( always_button ), context == NULL );
if( desktops && g_slist_length( desktops )){
@@ -435,38 +435,38 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvi
/* execution environment
*/
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecEntry" );
text = context ? fma_object_get_try_exec( context ) : g_strdup( "" );
text = text && strlen( text ) ? text : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( entry ), text );
g_free( text );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
- browse_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecButton" );
+ browse_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecButton" );
base_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRegisteredEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRegisteredEntry" );
text = context ? fma_object_get_show_if_registered( context ) : g_strdup( "" );
text = text && strlen( text ) ? text : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( entry ), text );
g_free( text );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfTrueEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfTrueEntry" );
text = context ? fma_object_get_show_if_true( context ) : g_strdup( "" );
text = text && strlen( text ) ? text : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( entry ), text );
g_free( text );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningEntry" );
text = context ? fma_object_get_show_if_running( context ) : g_strdup( "" );
text = text && strlen( text ) ? text : g_strdup( "" );
gtk_entry_set_text( GTK_ENTRY( entry ), text );
g_free( text );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
- browse_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningButton" );
+ browse_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningButton" );
base_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
data->on_selection_change = FALSE;
@@ -549,7 +549,7 @@ on_show_always_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *ins
active = gtk_toggle_button_get_active( toggle_button );
if( editable ){
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance
), "EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance
), "EnvironmentsDesktopTreeView" ));
gtk_widget_set_sensitive( GTK_WIDGET( listview ), !active );
if( active ){
@@ -675,7 +675,7 @@ on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, NactIEnvironme
if( context ){
if( editable ){
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER(
instance ), "EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER(
instance ), "EnvironmentsDesktopTreeView" ));
model = gtk_tree_view_get_model( listview );
tree_path = gtk_tree_path_new_from_string( path );
gtk_tree_model_get_iter( model, &iter, tree_path );
@@ -683,7 +683,7 @@ on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, NactIEnvironme
gtk_tree_model_get( model, &iter, ENV_BOOL_COLUMN, &state,
ENV_KEYWORD_COLUMN, &desktop, -1 );
gtk_list_store_set( GTK_LIST_STORE( model ), &iter, ENV_BOOL_COLUMN, !state,
-1 );
- show_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"OnlyShowButton" );
+ show_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"OnlyShowButton" );
if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( show_button ))){
fma_object_set_only_desktop( context, desktop, !state );
} else {
@@ -723,7 +723,7 @@ on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance )
{
GtkWidget *entry;
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "TryExecEntry" );
base_gtk_utils_select_file(
GTK_APPLICATION_WINDOW( instance ),
@@ -781,7 +781,7 @@ on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance )
{
GtkWidget *entry;
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ShowIfRunningEntry" );
base_gtk_utils_select_file(
GTK_APPLICATION_WINDOW( instance ),
@@ -807,7 +807,7 @@ init_selection_count_combobox( NactIEnvironmentTab *instance )
i += 1;
}
- combo = GTK_COMBO_BOX( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
+ combo = GTK_COMBO_BOX( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
gtk_combo_box_set_model( combo, model );
g_object_unref( model );
@@ -834,13 +834,13 @@ get_selection_count_selection( NactIEnvironmentTab *instance )
gchar *uints, *selcount;
guint uinti;
- combo = GTK_COMBO_BOX( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
+ combo = GTK_COMBO_BOX( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
index = gtk_combo_box_get_active( combo );
if( index == -1 ){
return( NULL );
}
- entry = GTK_ENTRY( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountNumberEntry" ));
+ entry = GTK_ENTRY( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountNumberEntry" ));
uinti = abs( atoi( gtk_entry_get_text( entry )));
uints = g_strdup_printf( "%d", uinti );
gtk_entry_set_text( entry, uints );
@@ -858,7 +858,7 @@ set_selection_count_selection( NactIEnvironmentTab *instance, const gchar *ope,
GtkEntry *entry;
gint i, index;
- combo = GTK_COMBO_BOX( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
+ combo = GTK_COMBO_BOX( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountSigneCombobox" ));
index = -1;
for( i=0 ; st_counts[i].sign && index==-1 ; ++i ){
@@ -868,7 +868,7 @@ set_selection_count_selection( NactIEnvironmentTab *instance, const gchar *ope,
}
gtk_combo_box_set_active( combo, index );
- entry = GTK_ENTRY( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountNumberEntry" ));
+ entry = GTK_ENTRY( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SelectionCountNumberEntry" ));
gtk_entry_set_text( entry, uint );
}
@@ -878,7 +878,7 @@ dispose_selection_count_combobox( NactIEnvironmentTab *instance )
GtkWidget *combo;
GtkTreeModel *model;
- combo = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountSigneCombobox" );
+ combo = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SelectionCountSigneCombobox" );
if( GTK_IS_COMBO_BOX( combo )){
model = gtk_combo_box_get_model( GTK_COMBO_BOX( combo ));
gtk_list_store_clear( GTK_LIST_STORE( model ));
@@ -894,7 +894,7 @@ init_desktop_listview( NactIEnvironmentTab *instance )
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
model = gtk_list_store_new( N_COLUMN, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING );
gtk_tree_view_set_model( listview, GTK_TREE_MODEL( model ));
g_object_unref( model );
@@ -929,7 +929,7 @@ raz_desktop_listview( NactIEnvironmentTab *instance )
GtkTreeIter iter;
gboolean next_ok;
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
model = gtk_tree_view_get_model( listview );
if( gtk_tree_model_get_iter_first( model, &iter )){
@@ -952,7 +952,7 @@ setup_desktop_listview( NactIEnvironmentTab *instance, GSList *show )
GSList *ic;
gchar *keyword;
- listview = GTK_TREE_VIEW( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
+ listview = GTK_TREE_VIEW( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" ));
model = gtk_tree_view_get_model( listview );
for( ic = show ; ic ; ic = ic->next ){
@@ -986,7 +986,7 @@ dispose_desktop_listview( NactIEnvironmentTab *instance )
GtkTreeModel *model;
GtkTreeSelection *selection;
- listview = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "EnvironmentsDesktopTreeView"
);
+ listview = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"EnvironmentsDesktopTreeView" );
if( GTK_IS_TREE_VIEW( listview )){
model = gtk_tree_view_get_model( GTK_TREE_VIEW( listview ));
selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( listview ));
diff --git a/src/nact/nact-iexecution-tab.c b/src/nact/nact-iexecution-tab.c
index 34627ca..280f7e1 100644
--- a/src/nact/nact-iexecution-tab.c
+++ b/src/nact/nact-iexecution-tab.c
@@ -35,7 +35,7 @@
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-gtk-utils.h"
#include "nact-main-tab.h"
@@ -196,31 +196,31 @@ initialize_window( NactIExecutionTab *instance )
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ExecutionModeNormal",
"toggled", G_CALLBACK( on_normal_mode_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ExecutionModeTerminal",
"toggled", G_CALLBACK( on_terminal_mode_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ExecutionModeEmbedded",
"toggled", G_CALLBACK( on_embedded_mode_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ExecutionModeDisplayOutput",
"toggled", G_CALLBACK( on_display_mode_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "StartupNotifyButton",
"toggled", G_CALLBACK( on_startup_notify_toggled ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "StartupWMClassEntry",
"changed", G_CALLBACK( on_startup_class_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ExecuteAsEntry",
"changed", G_CALLBACK( on_execute_as_changed ), instance );
}
@@ -259,10 +259,10 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIExec
data = get_iexecution_data( instance );
data->on_selection_change = TRUE;
- normal_toggle = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ExecutionModeNormal" );
- terminal_toggle = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeTerminal" );
- embedded_toggle = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeEmbedded" );
- display_toggle = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeDisplayOutput" );
+ normal_toggle = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ExecutionModeNormal" );
+ terminal_toggle = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeTerminal" );
+ embedded_toggle = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeEmbedded" );
+ display_toggle = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ExecutionModeDisplayOutput" );
mode = profile ? fma_object_get_execution_mode( profile ) : g_strdup( "Normal" );
gtk_toggle_button_set_inconsistent( GTK_TOGGLE_BUTTON( normal_toggle ), profile == NULL );
@@ -293,25 +293,25 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIExec
g_free( mode );
- frame = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupModeFrame" );
+ frame = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupModeFrame" );
gtk_widget_set_sensitive( frame, FALSE );
notify = profile ? fma_object_get_startup_notify( profile ) : FALSE;
- notify_check = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupNotifyButton" );
+ notify_check = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupNotifyButton" );
base_gtk_utils_set_editable( G_OBJECT( notify_check ), editable );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( notify_check ), notify );
class = profile ? fma_object_get_startup_class( profile ) : g_strdup( "" );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupWMClassEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "StartupWMClassEntry" );
gtk_entry_set_text( GTK_ENTRY( entry ), class );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
g_free( class );
- frame = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "UserFrame" );
+ frame = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "UserFrame" );
gtk_widget_set_sensitive( frame, FALSE );
user = profile ? fma_object_get_execute_as( profile ) : g_strdup( "" );
- entry = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ExecuteAsEntry" );
+ entry = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ExecuteAsEntry" );
gtk_entry_set_text( GTK_ENTRY( entry ), user );
base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
g_free( user );
@@ -366,9 +366,9 @@ execution_mode_toggle( NactIExecutionTab *instance, GtkToggleButton *toggle_butt
fma_object_set_execution_mode( profile, mode );
is_normal = ( strcmp( mode, "Normal" ) == 0 );
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"StartupNotifyButton" );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"StartupNotifyButton" );
gtk_widget_set_sensitive( widget, is_normal );
- widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"StartupWMClassEntry" );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"StartupWMClassEntry" );
gtk_widget_set_sensitive( widget, is_normal );
g_signal_emit_by_name( G_OBJECT( instance ), MAIN_SIGNAL_ITEM_UPDATED,
profile, 0 );
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index 58fd5e3..c95bbcc 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -37,7 +37,7 @@
#include "api/fma-core-utils.h"
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-gtk-utils.h"
#include "nact-application.h"
@@ -177,9 +177,9 @@ initialize_gtk( NactIFoldersTab *instance )
NACT_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_FOLDERS,
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FoldersTreeView" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddFolderButton" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveFolderButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FoldersTreeView" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddFolderButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveFolderButton" ),
( pget_filters ) get_folders,
( pset_filters ) set_folders,
NULL,
@@ -206,7 +206,7 @@ initialize_window( NactIFoldersTab *instance )
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "FolderBrowseButton",
"clicked", G_CALLBACK( on_browse_folder_clicked ), instance );
}
@@ -226,7 +226,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIFold
enable_tab = ( context != NULL );
nact_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_FOLDERS, enable_tab );
- button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FolderBrowseButton" );
+ button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "FolderBrowseButton" );
base_gtk_utils_set_editable( G_OBJECT( button ), editable );
}
@@ -248,7 +248,7 @@ on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance )
_( "_Open" ), GTK_RESPONSE_ACCEPT,
NULL );
- na_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
uri = na_settings_get_string( NA_IPREFS_FOLDER_CHOOSER_URI, NULL, NULL );
if( uri && g_utf8_strlen( uri, -1 )){
@@ -265,7 +265,7 @@ on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance )
g_free( uri );
}
- na_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
gtk_widget_destroy( dialog );
}
diff --git a/src/nact/nact-imimetypes-tab.c b/src/nact/nact-imimetypes-tab.c
index ceb2509..7415853 100644
--- a/src/nact/nact-imimetypes-tab.c
+++ b/src/nact/nact-imimetypes-tab.c
@@ -35,7 +35,7 @@
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "nact-main-tab.h"
#include "nact-main-window.h"
@@ -178,9 +178,9 @@ initialize_gtk( NactIMimetypesTab *instance )
NACT_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_MIMETYPES,
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "MimetypesTreeView" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddMimetypeButton" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveMimetypeButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "MimetypesTreeView" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddMimetypeButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveMimetypeButton"
),
( pget_filters ) get_mimetypes,
( pset_filters ) set_mimetypes,
NULL,
diff --git a/src/nact/nact-iproperties-tab.c b/src/nact/nact-iproperties-tab.c
index 6144148..02ef883 100644
--- a/src/nact/nact-iproperties-tab.c
+++ b/src/nact/nact-iproperties-tab.c
@@ -37,7 +37,7 @@
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-io-provider.h"
#include "base-gtk-utils.h"
@@ -205,16 +205,16 @@ initialize_window( NactIPropertiesTab *instance )
g_signal_connect(
enabled_button, "toggled", G_CALLBACK( on_enabled_toggled ), instance );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionDescriptionText" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionDescriptionText"
);
buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( label_widget ));
g_signal_connect(
buffer, "changed", G_CALLBACK( on_description_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "SuggestedShortcutButton",
"clicked", G_CALLBACK( on_shortcut_clicked ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "ActionReadonlyButton",
"toggled", G_CALLBACK( on_readonly_toggled ), instance );
}
@@ -257,9 +257,9 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIProp
data = get_iproperties_data( instance );
data->on_selection_change = TRUE;
- notebook = GTK_NOTEBOOK( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "main-notebook"
));
+ notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"main-notebook" ));
page = gtk_notebook_get_nth_page( notebook, TAB_ACTION );
- title_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionPropertiesTitle" );
+ title_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionPropertiesTitle"
);
label_widget = gtk_notebook_get_tab_label( notebook, page );
if( item && FMA_IS_OBJECT_MENU( item )){
@@ -275,14 +275,14 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIProp
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( enabled_button ), enabled_item );
base_gtk_utils_set_editable( G_OBJECT( enabled_button ), editable );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionDescriptionText" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionDescriptionText"
);
buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( label_widget ));
label = item ? fma_object_get_description( item ) : g_strdup( "" );
gtk_text_buffer_set_text( buffer, label, -1 );
g_free( label );
base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
- shortcut_button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SuggestedShortcutButton" );
+ shortcut_button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"SuggestedShortcutButton" );
shortcut = item ? fma_object_get_shortcut( item ) : g_strdup( "" );
if( !shortcut || !strlen( shortcut )){
g_free( shortcut );
@@ -298,11 +298,11 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIProp
/* read-only toggle only indicates the intrinsic writability status of this item
* _not_ the writability status of the provider
*/
- readonly_button = GTK_TOGGLE_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionReadonlyButton" ));
+ readonly_button = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionReadonlyButton" ));
gtk_toggle_button_set_active( readonly_button, item ? fma_object_is_readonly( item ) : FALSE );
base_gtk_utils_set_editable( G_OBJECT( readonly_button ), FALSE );
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionItemID" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionItemID" );
label = item ? fma_object_get_id( item ) : g_strdup( "" );
gtk_label_set_text( GTK_LABEL( label_widget ), label );
g_free( label );
@@ -330,7 +330,7 @@ on_main_item_updated( NactIPropertiesTab *instance, FMAIContext *context, guint
static GtkButton *
get_enabled_button( NactIPropertiesTab *instance )
{
- return( GTK_BUTTON( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionEnabledButton" )));
+ return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ),
"ActionEnabledButton" )));
}
static void
@@ -495,7 +495,7 @@ display_provider_name( NactIPropertiesTab *instance, FMAObjectItem *item )
gchar *label;
NAIOProvider *provider;
- label_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionItemProvider" );
+ label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionItemProvider" );
label = NULL;
if( item ){
provider = fma_object_get_provider( item );
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index d9d2269..94586f7 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -36,7 +36,7 @@
#include "api/fma-core-utils.h"
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-gtk-utils.h"
#include "nact-main-tab.h"
@@ -176,9 +176,9 @@ initialize_gtk( NactISchemesTab *instance )
NACT_MAIN_WINDOW( instance ),
ITAB_NAME,
TAB_SCHEMES,
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SchemesTreeView" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddSchemeButton" ),
- na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveSchemeButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "SchemesTreeView" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddSchemeButton" ),
+ fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "RemoveSchemeButton" ),
( pget_filters ) get_schemes,
( pset_filters ) set_schemes,
NULL,
@@ -205,7 +205,7 @@ initialize_window( NactISchemesTab *instance )
tview, TREE_SIGNAL_SELECTION_CHANGED,
G_CALLBACK( on_tree_selection_changed ), instance );
- na_gtk_utils_connect_widget_by_name(
+ fma_gtk_utils_connect_widget_by_name(
GTK_CONTAINER( instance ), "AddFromDefaultButton",
"clicked", G_CALLBACK( on_add_from_defaults ), instance );
}
@@ -225,7 +225,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactISche
enable_tab = ( context != NULL );
nact_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_SCHEMES, enable_tab );
- button = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddFromDefaultButton" );
+ button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "AddFromDefaultButton" );
base_gtk_utils_set_editable( G_OBJECT( button ), editable );
}
diff --git a/src/nact/nact-main-tab.c b/src/nact/nact-main-tab.c
index 44e6168..9925462 100644
--- a/src/nact/nact-main-tab.c
+++ b/src/nact/nact-main-tab.c
@@ -33,7 +33,7 @@
#include "api/fma-object-profile.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "nact-main-tab.h"
#include "nact-main-window.h"
@@ -57,7 +57,7 @@ nact_main_tab_init( NactMainWindow *main_window, gint num_page )
* but the displayed labels default to be those of the tab, i.e. embed
* an underscore as an accelerator - so get rid of this
*/
- notebook = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "main-notebook" );
+ notebook = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "main-notebook" );
g_return_if_fail( notebook && GTK_IS_NOTEBOOK( notebook ));
page = gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook ), num_page );
text = gtk_notebook_get_tab_label_text( GTK_NOTEBOOK( notebook ), page );
@@ -78,7 +78,7 @@ nact_main_tab_enable_page( NactMainWindow *window, gint num_page, gboolean enabl
GtkWidget *notebook;
GtkWidget *page, *label;
- notebook = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-notebook" );
+ notebook = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-notebook" );
g_return_if_fail( notebook && GTK_IS_NOTEBOOK( notebook ));
page = gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook ), num_page );
gtk_widget_set_sensitive( page, enabled );
@@ -100,7 +100,7 @@ nact_main_tab_is_page_enabled( NactMainWindow *window, gint num_page )
gboolean is_sensitive;
GtkWidget *notebook, *page;
- notebook = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-notebook" );
+ notebook = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-notebook" );
g_return_val_if_fail( notebook && GTK_IS_NOTEBOOK( notebook ), FALSE );
page = gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook ), num_page );
is_sensitive = gtk_widget_is_sensitive( page );
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 1d98aa9..07a09a7 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -38,7 +38,7 @@
#include "api/fma-timeout.h"
#include "core/fma-about.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-iprefs.h"
#include "core/na-pivot.h"
@@ -614,15 +614,15 @@ instance_dispose( GObject *window )
g_object_unref( self->private->clipboard );
- pane = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-paned" );
+ pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-paned" );
pos = gtk_paned_get_position( GTK_PANED( pane ));
na_settings_set_uint( NA_IPREFS_MAIN_PANED, pos );
- notebook = GTK_NOTEBOOK( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ),
"main-notebook" ));
+ notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ),
"main-notebook" ));
pos = gtk_notebook_get_tab_pos( notebook );
na_iprefs_set_tabs_pos( pos );
- na_gtk_utils_save_window_position( GTK_WINDOW( window ), st_wsp_name );
+ fma_gtk_utils_save_window_position( GTK_WINDOW( window ), st_wsp_name );
}
/* chain up to the parent class */
@@ -684,7 +684,7 @@ nact_main_window_new( NactApplication *application )
g_signal_connect( window, MAIN_SIGNAL_ITEM_UPDATED, G_CALLBACK( on_tab_item_updated ), NULL );
- na_gtk_utils_restore_window_position( GTK_WINDOW( window ), st_wsp_name );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( window ), st_wsp_name );
g_signal_connect( window, "delete-event", G_CALLBACK( on_delete_event ), NULL );
setup_monitor_pivot( window );
@@ -715,7 +715,7 @@ setup_main_ui( NactMainWindow *main_window )
top_window = gtk_builder_get_object( builder, st_toplevel_name );
g_return_if_fail( top_window && GTK_IS_WINDOW( top_window ));
- top_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_window ), "top" );
+ top_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_window ), "top" );
g_return_if_fail( top_widget && GTK_IS_CONTAINER( top_widget ));
/* reparent
@@ -729,7 +729,7 @@ setup_main_ui( NactMainWindow *main_window )
/* restore the notebook tabs position, and enable its popup menu
*/
- notebook = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-notebook" );
+ notebook = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-notebook" );
g_return_if_fail( notebook && GTK_IS_NOTEBOOK( notebook ));
pos = na_iprefs_get_tabs_pos( NULL );
gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), pos );
@@ -739,7 +739,7 @@ setup_main_ui( NactMainWindow *main_window )
*/
pos = na_settings_get_uint( NA_IPREFS_MAIN_PANED, NULL, NULL );
if( pos ){
- pane = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-paned" );
+ pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-paned" );
g_return_if_fail( pane && GTK_IS_PANED( pane ));
gtk_paned_set_position( GTK_PANED( pane ), pos );
}
@@ -747,7 +747,7 @@ setup_main_ui( NactMainWindow *main_window )
/* setup statusbar
*/
bar = nact_statusbar_new();
- alignment = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-statusbar" );
+ alignment = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-statusbar" );
g_return_if_fail( alignment && GTK_IS_CONTAINER( alignment ));
gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( bar ));
main_window->private->statusbar = bar;
@@ -769,7 +769,7 @@ setup_treeview( NactMainWindow *main_window )
priv = main_window->private;
priv->items_view = nact_tree_view_new( main_window );
- top_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "ActionsList" );
+ top_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "ActionsList" );
g_return_if_fail( top_widget && GTK_IS_CONTAINER( top_widget ));
gtk_container_add( GTK_CONTAINER( top_widget ), GTK_WIDGET( priv->items_view ));
diff --git a/src/nact/nact-menu-view.c b/src/nact/nact-menu-view.c
index 27e8085..6d28f8c 100644
--- a/src/nact/nact-menu-view.c
+++ b/src/nact/nact-menu-view.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-iprefs.h"
#include "nact-main-window.h"
@@ -195,7 +195,7 @@ nact_menu_view_toolbar_display( NactMainWindow *main_window, const gchar *action
props = get_toolbar_properties_by_name( action_name );
g_return_if_fail( props );
- parent = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "main-toolbar" );
+ parent = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "main-toolbar" );
g_return_if_fail( parent && GTK_IS_CONTAINER( parent ));
if( visible ){
@@ -377,7 +377,7 @@ set_notebook_tabs_position( NactMainWindow *main_window, guint pos )
{
GtkNotebook *notebook;
- notebook = GTK_NOTEBOOK( na_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ),
"main-notebook" ));
+ notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ),
"main-notebook" ));
gtk_notebook_set_tab_pos( notebook, pos );
na_iprefs_set_tabs_pos( pos );
}
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 2f3faee..fb8e589 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -39,7 +39,7 @@
#include <core/fma-desktop-environment.h>
#include <core/fma-exporter.h>
#include <core/fma-export-format.h>
-#include <core/na-gtk-utils.h>
+#include <core/fma-gtk-utils.h>
#include <core/na-import-mode.h>
#include <core/na-importer.h>
#include <core/na-ioptions-list.h>
@@ -682,7 +682,7 @@ order_mode_on_toggled( NactPreferencesEditor *editor, GtkToggleButton *toggle_bu
gboolean editable;
gboolean active;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( toggle_button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( toggle_button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
active = gtk_toggle_button_get_active( toggle_button );
@@ -715,7 +715,7 @@ root_menu_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->root_menu = gtk_toggle_button_get_active( button );
@@ -760,7 +760,7 @@ about_item_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->about_item = gtk_toggle_button_get_active( button );
@@ -963,7 +963,7 @@ relabel_menu_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->relabel_menu = gtk_toggle_button_get_active( button );
@@ -994,7 +994,7 @@ relabel_action_on_toggled( GtkToggleButton *button, NactPreferencesEditor *edito
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->relabel_action = gtk_toggle_button_get_active( button );
@@ -1025,7 +1025,7 @@ relabel_profile_on_toggled( GtkToggleButton *button, NactPreferencesEditor *edit
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->relabel_profile = gtk_toggle_button_get_active( button );
@@ -1057,7 +1057,7 @@ esc_quit_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
gboolean editable;
GtkWidget *confirm_button;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->esc_quit = gtk_toggle_button_get_active( button );
@@ -1091,7 +1091,7 @@ esc_confirm_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
{
gboolean editable;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->esc_confirm = gtk_toggle_button_get_active( button );
@@ -1138,7 +1138,7 @@ auto_save_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
GtkWidget *widget;
gboolean sensitive;
- editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
NA_TOGGLE_DATA_EDITABLE ));
+ editable = ( gboolean ) GPOINTER_TO_UINT( g_object_get_data( G_OBJECT( button ),
FMA_TOGGLE_DATA_EDITABLE ));
if( editable ){
editor->private->auto_save = gtk_toggle_button_get_active( button );
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index b4a5a48..1c53f02 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-iprefs.h"
#include "core/na-updater.h"
@@ -241,7 +241,7 @@ initialize_buttons( NactSortButtons *buttons, NactMainWindow *window )
for( i = 0 ; st_toggle_group[i].btn_name ; ++i ){
st_toggle_group[i].button =
GTK_TOGGLE_BUTTON(
- na_gtk_utils_find_widget_by_name(
+ fma_gtk_utils_find_widget_by_name(
GTK_CONTAINER( window ),
st_toggle_group[i].btn_name ));
g_signal_connect(
st_toggle_group[i].button, "toggled",
diff --git a/src/nact/nact-statusbar.c b/src/nact/nact-statusbar.c
index dfc96d9..a368e66 100644
--- a/src/nact/nact-statusbar.c
+++ b/src/nact/nact-statusbar.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "core/na-io-provider.h"
#include "base-gtk-utils.h"
diff --git a/src/nact/nact-tree-view.c b/src/nact/nact-tree-view.c
index 13ea32b..309b16b 100644
--- a/src/nact/nact-tree-view.c
+++ b/src/nact/nact-tree-view.c
@@ -35,7 +35,7 @@
#include "api/fma-object-api.h"
-#include "core/na-gtk-utils.h"
+#include "core/fma-gtk-utils.h"
#include "base-keysyms.h"
#include "nact-application.h"
@@ -550,7 +550,7 @@ nact_tree_view_set_mnemonic( NactTreeView *view, GtkContainer *parent, const gch
if( !priv->dispose_has_run ){
- label = na_gtk_utils_find_widget_by_name( parent, widget_name );
+ label = fma_gtk_utils_find_widget_by_name( parent, widget_name );
g_return_if_fail( label && GTK_IS_LABEL( label ));
gtk_label_set_mnemonic_widget( GTK_LABEL( label ), GTK_WIDGET( priv->tree_view ));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
