Yasumichi Akahoshi
yasum****@users*****
2005年 4月 22日 (金) 23:14:07 JST
Index: cxplorer/src/cxp-dir-view.c
diff -u cxplorer/src/cxp-dir-view.c:1.14 cxplorer/src/cxp-dir-view.c:1.15
--- cxplorer/src/cxp-dir-view.c:1.14 Fri Apr 22 22:29:37 2005
+++ cxplorer/src/cxp-dir-view.c Fri Apr 22 23:14:06 2005
@@ -109,7 +109,7 @@
static void cxp_dir_view_init (GTypeInstance * instance, gpointer g_class)
{
CxpDirView *self = (CxpDirView *) instance;
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(self);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (self);
gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (self), NULL);
gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (self), NULL);
@@ -147,7 +147,7 @@
directory_changed), NULL,
NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
+
g_type_class_add_private (klass, sizeof (CxpDirViewPrivate));
parent_class = g_type_class_peek_parent (klass);
@@ -161,7 +161,7 @@
**/
static void cxp_dir_view_dispose (GObject * obj)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(obj);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (obj);
if (priv->dispose_has_run)
{
@@ -209,10 +209,11 @@
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer, TRUE);
- gtk_tree_view_column_set_attributes (column, renderer, "text", COL_DISP_NAME, NULL);
+ gtk_tree_view_column_set_attributes (column, renderer, "text",
+ COL_DISP_NAME, NULL);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW(treeview), TRUE);
- gtk_tree_view_set_search_column (GTK_TREE_VIEW(treeview), 0);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview), TRUE);
+ gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 0);
return treeview;
}
@@ -228,13 +229,14 @@
GtkTreeIter root;
GtkTreeSortable *sortable;
- store = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ store = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_BOOLEAN);
sortable = GTK_TREE_SORTABLE (store);
gtk_tree_sortable_set_default_sort_func (sortable,
cxp_dir_view_compare_node,
NULL, NULL);
- gtk_tree_sortable_set_sort_column_id (sortable, COL_FULL_PATH,
+ gtk_tree_sortable_set_sort_column_id (sortable, COL_DISP_NAME,
GTK_SORT_ASCENDING);
gtk_tree_store_prepend (store, &root, NULL);
@@ -297,7 +299,8 @@
g_return_if_fail (store);
gtk_tree_store_prepend (store, &iter, parent_iter);
- gtk_tree_store_set (store, &iter, COL_DISP_NAME, "(null)", COL_IS_DUMMY, TRUE, -1);
+ gtk_tree_store_set (store, &iter, COL_DISP_NAME, "(null)", COL_IS_DUMMY,
+ TRUE, -1);
success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store),
&iter, parent_iter, 1);
@@ -340,8 +343,9 @@
{
dispname = cxp_path_get_basename_of_utf8 (fullpath);
gtk_tree_store_prepend (treestore, &child, parent);
- gtk_tree_store_set (treestore, &child, COL_DISP_NAME, dispname, COL_FULL_PATH,
- fullpath, COL_IS_DUMMY, FALSE,
+ gtk_tree_store_set (treestore, &child, COL_DISP_NAME,
+ dispname, COL_FULL_PATH, fullpath,
+ COL_IS_DUMMY, FALSE,
COL_TERMINATOR);
cxp_dir_view_prepend_dummy (treestore, &child);
}
@@ -357,7 +361,7 @@
GtkTreeModel * tree_model,
GtkTreeIter * iter, gpointer data)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(data);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (data);
if (priv->icon)
{
@@ -382,7 +386,7 @@
GtkTreePath * path,
gpointer user_data)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(user_data);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (user_data);
GtkTreeStore *store;
GtkTreeIter child;
gchar *fullpath;
@@ -459,7 +463,7 @@
object = CXP_DIR_VIEW (g_object_new (CXP_TYPE_DIR_VIEW, NULL));
- priv = CXP_DIR_VIEW_GET_PRIVATE(object);
+ priv = CXP_DIR_VIEW_GET_PRIVATE (object);
priv->showDotFile = showDotFile;
priv->icon = icon;
@@ -468,7 +472,7 @@
gchar *cxp_dir_view_get_current_directory (CxpDirView * instance)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(instance);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (instance);
gchar *fullpath = NULL;
GtkTreePath *path;
GtkTreeViewColumn *column;
@@ -480,8 +484,7 @@
if (path)
{
- model = gtk_tree_view_get_model (GTK_TREE_VIEW
- (priv->dirview));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->dirview));
if (gtk_tree_model_get_iter (model, &iter, path))
{
gtk_tree_model_get (model, &iter, COL_FULL_PATH,
@@ -497,7 +500,7 @@
gboolean cxp_dir_view_change_directory (CxpDirView * instance,
const gchar * fullpath)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(instance);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (instance);
gchar **elements;
gint index;
GtkWidget *treeview;
@@ -558,14 +561,14 @@
void cxp_dir_view_set_show_dot_file (CxpDirView * instance,
gboolean showDotFile)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(instance);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (instance);
priv->showDotFile = showDotFile;
}
void cxp_dir_view_refresh (CxpDirView * instance)
{
- CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE(instance);
+ CxpDirViewPrivate *priv = CXP_DIR_VIEW_GET_PRIVATE (instance);
gchar *currentDirectory;
GtkWidget *dirview;
GtkTreeIter root, current;
@@ -582,7 +585,7 @@
gtk_tree_store_clear (GTK_TREE_STORE (model));
gtk_tree_store_prepend (GTK_TREE_STORE (model), &root, NULL);
- gtk_tree_store_set (GTK_TREE_STORE (model), &root, COL_DISP_NAME, "/",
+ gtk_tree_store_set (GTK_TREE_STORE (model), &root, COL_DISP_NAME, "/",
COL_FULL_PATH, "/", COL_IS_DUMMY, FALSE, -1);
cxp_dir_view_set_child_dirctory (GTK_TREE_STORE (model), &root, "/",
priv->showDotFile);
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.33 cxplorer/src/cxp-right-pane.c:1.34
--- cxplorer/src/cxp-right-pane.c:1.33 Fri Apr 22 22:29:37 2005
+++ cxplorer/src/cxp-right-pane.c Fri Apr 22 23:14:06 2005
@@ -68,18 +68,6 @@
};
/**
- * This enumeration define sort id.
- */
-enum
-{
- SORT_BY_DEFAULT,
- SORT_BY_NAME,
- SORT_BY_SIZE,
- SORT_BY_TYPE,
- SORT_BY_DATE
-};
-
-/**
* This enumeration define signal.
*/
enum
@@ -103,7 +91,7 @@
static void cxp_right_pane_get_property (GObject * object,
guint property_id,
GValue * value, GParamSpec * pspec);
-static GtkWidget *cxp_right_pane_file_list_new (CxpRightPane *self);
+static GtkWidget *cxp_right_pane_file_list_new (CxpRightPane * self);
static void cxp_right_pane_on_cursor_changed (GtkTreeView * treeview,
gpointer user_data);
static void cxp_right_pane_on_row_activated (GtkTreeView * treeview,
@@ -208,7 +196,7 @@
static void cxp_right_pane_instance_init (CxpRightPane * self)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(self);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (self);
GtkWidget *scrolled_window;
PangoFontDescription *font_desc;
@@ -226,8 +214,7 @@
gtk_paned_pack1 (GTK_PANED (self), scrolled_window, TRUE, FALSE);
gtk_widget_show (scrolled_window);
priv->file_list = cxp_right_pane_file_list_new (self);
- gtk_container_add (GTK_CONTAINER (scrolled_window),
- priv->file_list);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->file_list);
gtk_widget_show (priv->file_list);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -239,8 +226,7 @@
gtk_widget_modify_font (GTK_WIDGET (priv->preview), font_desc);
pango_font_description_free (font_desc);
gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->preview), FALSE);
- gtk_container_add (GTK_CONTAINER (scrolled_window),
- priv->preview);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->preview);
gtk_widget_show (priv->preview);
priv->show_dot_file = FALSE;
@@ -248,7 +234,7 @@
priv->cur_dir = NULL;
priv->preview_text = NULL;
priv->preview_binary = NULL;
- priv->handler = cxp_handler_new();
+ priv->handler = cxp_handler_new ();
g_signal_connect (priv->file_list, "cursor_changed",
G_CALLBACK (cxp_right_pane_on_cursor_changed), self);
@@ -259,7 +245,7 @@
static void cxp_right_pane_dispose (GObject * obj)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(obj);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (obj);
if (priv->dispose_has_run)
{
@@ -295,7 +281,7 @@
const GValue * value,
GParamSpec * pspec)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(object);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (object);
switch (property_id)
{
@@ -322,7 +308,7 @@
guint property_id,
GValue * value, GParamSpec * pspec)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(object);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (object);
switch (property_id)
{
@@ -342,7 +328,7 @@
}
}
-static GtkWidget *cxp_right_pane_file_list_new (CxpRightPane *self)
+static GtkWidget *cxp_right_pane_file_list_new (CxpRightPane * self)
{
GtkWidget *file_list;
GtkListStore *store;
@@ -351,16 +337,17 @@
GtkTreeSortable *sortable;
file_list = gtk_tree_view_new ();
- store = gtk_list_store_new (COL_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
+ store = gtk_list_store_new (COL_COUNT, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
gtk_tree_view_set_model (GTK_TREE_VIEW (file_list),
GTK_TREE_MODEL (store));
/* Sort setting */
sortable = GTK_TREE_SORTABLE (store);
- gtk_tree_sortable_set_sort_func (sortable, SORT_BY_DEFAULT,
+ gtk_tree_sortable_set_sort_func (sortable, COL_DISP_NAME,
cxp_right_pane_compare_by_default,
NULL, NULL);
- gtk_tree_sortable_set_sort_column_id (sortable, SORT_BY_DEFAULT,
+ gtk_tree_sortable_set_sort_column_id (sortable, COL_DISP_NAME,
GTK_SORT_ASCENDING);
/* 1st column */
@@ -375,7 +362,8 @@
self, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
- gtk_tree_view_column_set_attributes (column, renderer, "text", COL_DISP_NAME, NULL);
+ gtk_tree_view_column_set_attributes (column, renderer, "text",
+ COL_DISP_NAME, NULL);
/* 2nd column */
renderer = gtk_cell_renderer_text_new ();
@@ -425,7 +413,7 @@
gpointer user_data)
{
CxpRightPane *self = CXP_RIGHT_PANE (user_data);
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(self);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (self);
GtkTextBuffer *text_buffer;
GtkTreePath *treepath;
GtkTreeViewColumn *column;
@@ -433,8 +421,7 @@
GtkTreeModel *model;
gchar *fullpath;
- text_buffer =
- gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->preview));
+ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->preview));
gtk_text_buffer_set_text (text_buffer, "", -1);
gtk_tree_view_get_cursor (treeview, &treepath, &column);
@@ -468,7 +455,7 @@
gpointer user_data)
{
CxpRightPane *right_pane = CXP_RIGHT_PANE (user_data);
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *fullpath;
GtkTreeModel *model;
GtkTreeIter iter;
@@ -510,7 +497,7 @@
GtkTreeModel * tree_model,
GtkTreeIter * iter, gpointer data)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(data);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (data);
gchar *filename;
gtk_tree_model_get (tree_model, iter, COL_FILE_PATH,
@@ -539,14 +526,15 @@
GtkTreeModel * tree_model,
GtkTreeIter * iter, gpointer data)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(data);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (data);
gchar *fullpath;
gchar **filetype;
gtk_tree_model_get (tree_model, iter, COL_FILE_PATH,
&fullpath, COL_TERMINATOR);
- filetype = g_strsplit (magic_file (priv->normal_cookie, fullpath), ",", 2);
+ filetype =
+ g_strsplit (magic_file (priv->normal_cookie, fullpath), ",", 2);
g_object_set (cell, "text", filetype[0], NULL);
g_strfreev (filetype);
}
@@ -649,7 +637,10 @@
dispname = cxp_path_get_basename_of_utf8 (fullpath);
stat (fullpath, &status);
gtk_list_store_prepend (store, &iter);
- gtk_list_store_set (store, &iter, COL_DISP_NAME, dispname, COL_FILE_PATH, fullpath, COL_FILE_SIZE, status.st_size, COL_FILE_MODE, status.st_mode, COL_UPDATE_TIME, status.st_mtime, COL_TERMINATOR);
+ gtk_list_store_set (store, &iter, COL_DISP_NAME, dispname,
+ COL_FILE_PATH, fullpath, COL_FILE_SIZE,
+ status.st_size, COL_FILE_MODE, status.st_mode,
+ COL_UPDATE_TIME, status.st_mtime, COL_TERMINATOR);
g_free (dispname);
return iter;
@@ -664,7 +655,7 @@
GtkTextBuffer * text_buffer,
const gchar * filename)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(self);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (self);
gchar *cmd;
const gchar *filetype;
gchar *standard_output;
@@ -673,8 +664,7 @@
if (g_file_test (filename, G_FILE_TEST_IS_DIR))
{
- cmd = g_strdup_printf ("%s '%s'", priv->preview_dir,
- filename);
+ cmd = g_strdup_printf ("%s '%s'", priv->preview_dir, filename);
}
else
{
@@ -682,8 +672,7 @@
if (g_strrstr (filetype, "text") != NULL)
{
cmd = g_strdup_printf ("%s '%s'",
- priv->preview_text,
- filename);
+ priv->preview_text, filename);
}
else if (strstr (filetype, "fifo") != NULL)
{
@@ -696,8 +685,7 @@
else
{
cmd = g_strdup_printf ("%s '%s'",
- priv->preview_binary,
- filename);
+ priv->preview_binary, filename);
}
}
g_spawn_command_line_sync (cmd, &standard_output, NULL,
@@ -733,7 +721,7 @@
void cxp_right_pane_change_directory (CxpRightPane * self,
const gchar * dirname)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(self);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (self);
const gchar *filename;
gchar *fullpath;
GDir *dir;
@@ -741,8 +729,7 @@
GtkTreeModel *model;
GtkTextBuffer *text_buffer;
- text_buffer =
- gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->preview));
+ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->preview));
gtk_text_buffer_set_text (text_buffer, "", -1);
file_list = GTK_TREE_VIEW (priv->file_list);
@@ -777,7 +764,7 @@
gchar *cxp_right_pane_get_active_file_name (CxpRightPane * right_pane)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *fullpath;
GtkTreePath *treepath;
GtkTreeView *treeview;
@@ -805,14 +792,15 @@
void cxp_right_pane_set_show_dot_file (CxpRightPane * right_pane,
gboolean show_dot_file)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
+
priv->show_dot_file = show_dot_file;
}
void cxp_right_pane_make_file (CxpRightPane * right_pane,
const gchar * base_name)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *fullpath;
gchar *basename_locale;
GtkTreeIter iter;
@@ -829,14 +817,12 @@
if (error == NULL)
{
fullpath =
- g_build_filename (priv->cur_dir,
- basename_locale, NULL);
+ g_build_filename (priv->cur_dir, basename_locale, NULL);
g_free (basename_locale);
if (mknod (fullpath, S_IFREG | 0666, 0) == 0)
{
model = gtk_tree_view_get_model (GTK_TREE_VIEW
- (priv->
- file_list));
+ (priv->file_list));
iter = cxp_right_pane_append_file (GTK_LIST_STORE
(model), fullpath);
treepath = gtk_tree_model_get_path (model, &iter);
@@ -863,7 +849,7 @@
void cxp_right_pane_delete_current_file (CxpRightPane * right_pane)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *fullpath;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -871,8 +857,7 @@
GtkWidget *dialog;
selection =
- gtk_tree_view_get_selection (GTK_TREE_VIEW
- (priv->file_list));
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->file_list));
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, COL_FILE_PATH, &fullpath,
@@ -905,7 +890,7 @@
void cxp_right_pane_paste_from_clipboard (CxpRightPane * right_pane)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *src;
gchar *cur_dir;
gchar *error_msg;
@@ -927,8 +912,9 @@
&exit_status, NULL);
if (exit_status == 0)
{
- cur_dir = g_strdup(priv->cur_dir);
- cxp_right_pane_change_directory (right_pane, cur_dir);
+ cur_dir = g_strdup (priv->cur_dir);
+ cxp_right_pane_change_directory (right_pane,
+ cur_dir);
g_free (cur_dir);
}
else
@@ -952,9 +938,9 @@
}
}
-void cxp_right_pane_rename_file_request (CxpRightPane *right_pane)
+void cxp_right_pane_rename_file_request (CxpRightPane * right_pane)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE(right_pane);
+ CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
gchar *dirname;
gchar *srcpath;
gchar *srcbase;
@@ -967,50 +953,68 @@
GtkTreeSelection *selection;
GtkWidget *dialog;
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->file_list));
+ selection =
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->file_list));
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
- gtk_tree_model_get (model, &iter, COL_FILE_PATH, &srcpath, COL_TERMINATOR);
+ gtk_tree_model_get (model, &iter, COL_FILE_PATH, &srcpath,
+ COL_TERMINATOR);
dirname = g_path_get_dirname (srcpath);
srcbase = cxp_path_get_basename_of_utf8 (srcpath);
- dialog = cxp_entry_dialog_new(_("Rename"), _("Please, input a new name."), srcbase);
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- {
- destbase = cxp_entry_dialog_get_entry_text(CXP_ENTRY_DIALOG(dialog));
- gtk_widget_destroy(dialog);
- destbase_locale = g_locale_from_utf8 (destbase, -1, NULL, NULL,NULL);
- destpath = g_build_filename (dirname, destbase_locale, NULL);
+ dialog = cxp_entry_dialog_new (_("Rename"),
+ _("Please, input a new name."),
+ srcbase);
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ {
+ destbase =
+ cxp_entry_dialog_get_entry_text
+ (CXP_ENTRY_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ destbase_locale =
+ g_locale_from_utf8 (destbase, -1, NULL, NULL,
+ NULL);
+ destpath =
+ g_build_filename (dirname, destbase_locale,
+ NULL);
- if(g_file_test(destpath,G_FILE_TEST_EXISTS) == FALSE)
+ if (g_file_test (destpath, G_FILE_TEST_EXISTS) == FALSE)
{
- if(rename(srcpath,destpath) == 0)
+ if (rename (srcpath, destpath) == 0)
{
- gtk_list_store_set (GTK_LIST_STORE(model), &iter, COL_FILE_PATH, destpath, COL_TERMINATOR);
+ gtk_list_store_set (GTK_LIST_STORE
+ (model), &iter,
+ COL_FILE_PATH,
+ destpath,
+ COL_TERMINATOR);
}
else
{
dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s",
- g_strerror (errno));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ g_strerror
+ (errno));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
}
else
{
- error_msg = g_strdup_printf(_("%s is already exists."), destbase);
+ error_msg =
+ g_strdup_printf (_
+ ("%s is already exists."),
+ destbase);
dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s",
- error_msg);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error_msg);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- g_free(error_msg);
+ g_free (error_msg);
}
g_free (destbase);
@@ -1018,7 +1022,7 @@
}
else
{
- gtk_widget_destroy(dialog);
+ gtk_widget_destroy (dialog);
}
g_free (dirname);
g_free (srcbase);
@@ -1026,29 +1030,28 @@
}
}
-void cxp_right_pane_send_file_to_command (CxpRightPane *right_pane, const gchar *cmd)
+void cxp_right_pane_send_file_to_command (CxpRightPane * right_pane,
+ const gchar * cmd)
{
gchar *fullpath;
gchar *fullcmd;
GError *gerror = NULL;
GtkWidget *dialog;
- g_return_if_fail(cmd != NULL);
+ g_return_if_fail (cmd != NULL);
fullpath = cxp_right_pane_get_active_file_name (right_pane);
- fullcmd = g_strdup_printf("%s '%s'", cmd, fullpath);
- if(g_spawn_command_line_async (fullcmd, &gerror) == FALSE)
+ fullcmd = g_strdup_printf ("%s '%s'", cmd, fullpath);
+ if (g_spawn_command_line_async (fullcmd, &gerror) == FALSE)
{
dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s",
- gerror->message);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s", gerror->message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
- g_free(fullcmd);
- g_free(fullpath);
+ g_free (fullcmd);
+ g_free (fullpath);
}
-