Yasumichi Akahoshi
yasum****@users*****
2005年 5月 11日 (水) 00:00:58 JST
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.40 cxplorer/src/cxp-right-pane.c:1.41
--- cxplorer/src/cxp-right-pane.c:1.40 Tue May 10 23:59:56 2005
+++ cxplorer/src/cxp-right-pane.c Wed May 11 00:00:58 2005
@@ -108,11 +108,13 @@
GtkTreeIter * iter_a,
GtkTreeIter * iter_b,
gpointer user_data);
-static GtkTreeIter cxp_right_pane_append_file (CxpRightPane *self, GtkListStore * store, const gchar * fullpath);
+static GtkTreeIter cxp_right_pane_append_file (CxpRightPane * self,
+ GtkListStore * store,
+ const gchar * fullpath);
static void cxp_right_pane_show_preview (CxpRightPane * self,
GtkTextBuffer * text_buffer,
const gchar * filename);
-static gint cxp_right_pane_popup_handler (GtkWidget *widget, GdkEvent *event);
+static gint cxp_right_pane_popup_handler (GtkWidget * widget, GdkEvent * event);
GType cxp_right_pane_get_type (void)
@@ -155,7 +157,8 @@
"GConfClient",
"Set GConfClient",
GCONF_TYPE_CLIENT,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
CXP_RIGHT_PANE_GCONF_CLIENT, pspec);
@@ -264,7 +267,7 @@
switch (property_id)
{
case CXP_RIGHT_PANE_GCONF_CLIENT:
- priv->client = GCONF_CLIENT(g_value_dup_object (value));
+ priv->client = GCONF_CLIENT (g_value_dup_object (value));
break;
default:
/* We don't have any other property... */
@@ -300,7 +303,9 @@
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_STRING, G_TYPE_UINT, G_TYPE_UINT);
+ store = gtk_list_store_new (COL_COUNT, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT,
+ G_TYPE_UINT);
gtk_tree_view_set_model (GTK_TREE_VIEW (file_list),
GTK_TREE_MODEL (store));
@@ -331,14 +336,18 @@
/* 2nd column */
renderer = gtk_cell_renderer_text_new ();
g_object_set (renderer, "xalign", 1.0, NULL);
- column = gtk_tree_view_column_new_with_attributes (_("Size"), renderer, "text", COL_FILE_SIZE, NULL);
+ column = gtk_tree_view_column_new_with_attributes (_("Size"), renderer,
+ "text",
+ COL_FILE_SIZE, NULL);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, COL_FILE_SIZE);
gtk_tree_view_append_column (GTK_TREE_VIEW (file_list), column);
/* 3rd column */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer, "text", COL_FILE_TYPE, NULL);
+ column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer,
+ "text",
+ COL_FILE_TYPE, NULL);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width (column, 100);
@@ -562,7 +571,9 @@
* @param gcLabel [in] UTF-8 string.
* @return GtkTreeIter of appendded row.
*/
-static GtkTreeIter cxp_right_pane_append_file (CxpRightPane *self, GtkListStore * store, const gchar * fullpath)
+static GtkTreeIter cxp_right_pane_append_file (CxpRightPane * self,
+ GtkListStore * store,
+ const gchar * fullpath)
{
CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (self);
GtkTreeIter iter;
@@ -571,10 +582,15 @@
gchar **filetype;
dispname = cxp_path_get_basename_of_utf8 (fullpath);
- filetype = g_strsplit (magic_file (priv->normal_cookie, fullpath), ",", 2);
+ filetype =
+ g_strsplit (magic_file (priv->normal_cookie, fullpath), ",", 2);
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_TYPE, filetype[0], 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_TYPE, filetype[0],
+ COL_FILE_MODE, status.st_mode, COL_UPDATE_TIME,
+ status.st_mtime, COL_TERMINATOR);
g_free (dispname);
g_strfreev (filetype);
@@ -600,14 +616,20 @@
if (g_file_test (filename, G_FILE_TEST_IS_DIR))
{
- preview_cmd = gconf_client_get_string (priv->client,"/apps/cxp/cxplorer/PreviewDir", NULL);
+ preview_cmd =
+ gconf_client_get_string (priv->client,
+ "/apps/cxp/cxplorer/PreviewDir",
+ NULL);
}
else
{
filetype = magic_file (priv->normal_cookie, filename);
if (g_strrstr (filetype, "text") != NULL)
{
- preview_cmd = gconf_client_get_string (priv->client,"/apps/cxp/cxplorer/PreviewText", NULL);
+ preview_cmd =
+ gconf_client_get_string (priv->client,
+ "/apps/cxp/cxplorer/PreviewText",
+ NULL);
}
else if (strstr (filetype, "fifo") != NULL)
{
@@ -619,7 +641,10 @@
}
else
{
- preview_cmd = gconf_client_get_string (priv->client,"/apps/cxp/cxplorer/PreviewBinary", NULL);
+ preview_cmd =
+ gconf_client_get_string (priv->client,
+ "/apps/cxp/cxplorer/PreviewBinary",
+ NULL);
}
}
cmd = g_strdup_printf ("%s '%s'", preview_cmd, filename);
@@ -642,7 +667,7 @@
}
}
-static gint cxp_right_pane_popup_handler (GtkWidget *widget, GdkEvent *event)
+static gint cxp_right_pane_popup_handler (GtkWidget * widget, GdkEvent * event)
{
GtkMenu *menu;
GdkEventButton *event_button;
@@ -661,8 +686,9 @@
event_button = (GdkEventButton *) event;
if (event_button->button == 3)
{
- gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
- event_button->button, event_button->time);
+ gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
+ event_button->button,
+ event_button->time);
return TRUE;
}
}
@@ -674,9 +700,10 @@
* API
*/
-GtkWidget *cxp_right_pane_new (GConfClient *client)
+GtkWidget *cxp_right_pane_new (GConfClient * client)
{
- return GTK_WIDGET (g_object_new (CXP_TYPE_RIGHT_PANE, "gconf-client", client, NULL));
+ return GTK_WIDGET (g_object_new
+ (CXP_TYPE_RIGHT_PANE, "gconf-client", client, NULL));
}
/**
@@ -695,7 +722,9 @@
GtkTextBuffer *text_buffer;
gboolean show_dot_file;
- show_dot_file = gconf_client_get_bool (priv->client, "/apps/cxp/cxplorer/ShowDotFile", NULL);
+ show_dot_file =
+ gconf_client_get_bool (priv->client,
+ "/apps/cxp/cxplorer/ShowDotFile", NULL);
text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->preview));
gtk_text_buffer_set_text (text_buffer, "", -1);
@@ -710,13 +739,14 @@
{
while ((filename = g_dir_read_name (dir)) != NULL)
{
- if ((filename[0] == '.')
- && (show_dot_file == FALSE))
+ if ((filename[0] == '.') && (show_dot_file == FALSE))
{
continue;
}
fullpath = g_build_filename (dirname, filename, NULL);
- cxp_right_pane_append_file (self, GTK_LIST_STORE (model), fullpath);
+ cxp_right_pane_append_file (self,
+ GTK_LIST_STORE (model),
+ fullpath);
g_free (fullpath);
}
g_dir_close (dir);
@@ -782,7 +812,9 @@
{
model = gtk_tree_view_get_model (GTK_TREE_VIEW
(priv->file_list));
- iter = cxp_right_pane_append_file (right_pane, GTK_LIST_STORE (model), fullpath);
+ iter = cxp_right_pane_append_file (right_pane,
+ GTK_LIST_STORE
+ (model), fullpath);
treepath = gtk_tree_model_get_path (model, &iter);
gtk_tree_view_set_cursor (GTK_TREE_VIEW
(priv->
@@ -1014,11 +1046,13 @@
g_free (fullpath);
}
-void cxp_right_pane_set_popup_menu (CxpRightPane *right_pane, GtkWidget *popup_menu)
+void cxp_right_pane_set_popup_menu (CxpRightPane * right_pane,
+ GtkWidget * popup_menu)
{
CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (right_pane);
priv->popup_menu = popup_menu;
g_signal_connect_swapped (priv->file_list, "button_press_event",
- G_CALLBACK (cxp_right_pane_popup_handler), priv->popup_menu);
+ G_CALLBACK (cxp_right_pane_popup_handler),
+ priv->popup_menu);
}