Yasumichi Akahoshi
yasum****@users*****
2005年 4月 6日 (水) 01:02:00 JST
Index: cxplorer/src/Makefile.am diff -u cxplorer/src/Makefile.am:1.15 cxplorer/src/Makefile.am:1.16 --- cxplorer/src/Makefile.am:1.15 Mon Feb 14 00:35:09 2005 +++ cxplorer/src/Makefile.am Wed Apr 6 01:01:59 2005 @@ -25,8 +25,8 @@ actcalls.h\ cxplorer.h\ cxplorer.c\ - property.c\ - property.h\ + cxp-property-dialog.c\ + cxp-property-dialog.h\ cxp-dir-view.h\ cxp-dir-view.c \ cxp-right-pane.h \ Index: cxplorer/src/Makefile.in diff -u cxplorer/src/Makefile.in:1.19 cxplorer/src/Makefile.in:1.20 --- cxplorer/src/Makefile.in:1.19 Mon Mar 28 22:44:30 2005 +++ cxplorer/src/Makefile.in Wed Apr 6 01:01:59 2005 @@ -80,6 +80,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ @@ -102,8 +103,10 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIB = @LTLIB@ MAGIC_LIB = @MAGIC_LIB@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -140,7 +143,7 @@ bin_PROGRAMS = cxplorer -cxplorer_SOURCES = main.c interface.h interface.c menubar.c menubar.h toolbar.h toolbar.c actcalls.c actcalls.h cxplorer.h cxplorer.c property.c property.h cxp-dir-view.h cxp-dir-view.c cxp-right-pane.h cxp-right-pane.c +cxplorer_SOURCES = main.c interface.h interface.c menubar.c menubar.h toolbar.h toolbar.c actcalls.c actcalls.h cxplorer.h cxplorer.c cxp-property-dialog.c cxp-property-dialog.h cxp-dir-view.h cxp-dir-view.c cxp-right-pane.h cxp-right-pane.c cxplorer_LDFLAGS = @@ -160,7 +163,8 @@ LIBS = @LIBS@ cxplorer_OBJECTS = main.$(OBJEXT) interface.$(OBJEXT) menubar.$(OBJEXT) \ toolbar.$(OBJEXT) actcalls.$(OBJEXT) cxplorer.$(OBJEXT) \ -property.$(OBJEXT) cxp-dir-view.$(OBJEXT) cxp-right-pane.$(OBJEXT) +cxp-property-dialog.$(OBJEXT) cxp-dir-view.$(OBJEXT) \ +cxp-right-pane.$(OBJEXT) cxplorer_DEPENDENCIES = COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -174,8 +178,8 @@ TAR = tar GZIP_ENV = --best DEP_FILES = .deps/actcalls.P .deps/cxp-dir-view.P \ -.deps/cxp-right-pane.P .deps/cxplorer.P .deps/interface.P .deps/main.P \ -.deps/menubar.P .deps/property.P .deps/toolbar.P +.deps/cxp-property-dialog.P .deps/cxp-right-pane.P .deps/cxplorer.P \ +.deps/interface.P .deps/main.P .deps/menubar.P .deps/toolbar.P SOURCES = $(cxplorer_SOURCES) OBJECTS = $(cxplorer_OBJECTS) Index: cxplorer/src/actcalls.c diff -u cxplorer/src/actcalls.c:1.31 cxplorer/src/actcalls.c:1.32 --- cxplorer/src/actcalls.c:1.31 Thu Mar 31 23:12:18 2005 +++ cxplorer/src/actcalls.c Wed Apr 6 01:01:59 2005 @@ -22,7 +22,7 @@ * GtkButton on toolbar. * @author Yasumichi Akahoshi <yasum****@users*****> * @date Fri Jun 11 00:16:18 2004 - * $Revision: 1.31 $ + * $Revision: 1.32 $ */ #ifdef HAVE_CONFIG_H @@ -36,7 +36,7 @@ #include <fcntl.h> #include <unistd.h> #include "cxplorer.h" -#include "property.h" +#include "cxp-property-dialog.h" #include "cxp-right-pane.h" /** @@ -97,7 +97,7 @@ (cxplorer->right_pane))) != NULL) { - dialog = create_property_dialog (fullpath); + dialog = cxp_property_dialog_new (fullpath); gtk_dialog_run (GTK_DIALOG (dialog)); Index: cxplorer/src/property.c diff -u cxplorer/src/property.c:1.15 cxplorer/src/property.c:removed --- cxplorer/src/property.c:1.15 Fri Apr 1 22:20:05 2005 +++ cxplorer/src/property.c Wed Apr 6 01:01:59 2005 @@ -1,188 +0,0 @@ -/*************************************************************************** - * property.c - * - * Mon Sep 20 23:03:36 2004 - * Copyright 2004 Yasumichi Akahoshi - * yasum****@users***** - ****************************************************************************/ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include <cxp.h> -#include <glib/gi18n.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <grp.h> -#include <pwd.h> -#include "cxplorer.h" -#include "property.h" - -/** - * This function create dialog about file. - * @param gcFileName [in] file name which user request. - * @return Pointer of dialog. - */ -GtkWidget *create_property_dialog (gchar * gcFileName) -{ - GtkWidget *gwDialog; - GtkWidget *gwVBox; - GtkWidget *gwFrame; - struct stat sstat; - GtkWidget *gwCloseButton; - - gwDialog = gtk_dialog_new (); - gwVBox = GTK_DIALOG (gwDialog)->vbox; - - stat (gcFileName, &sstat); - - gwFrame = create_basic_frame (gcFileName, &sstat); - gtk_box_pack_start (GTK_BOX (gwVBox), gwFrame, FALSE, FALSE, 0); - - gwFrame = cxp_time_info_frame_new (gcFileName, &sstat); - gtk_box_pack_start (GTK_BOX (gwVBox), gwFrame, FALSE, FALSE, 0); - - gwCloseButton = gtk_button_new_from_stock ("gtk-close"); - gtk_dialog_add_action_widget (GTK_DIALOG (gwDialog), gwCloseButton, - GTK_RESPONSE_CLOSE); - gtk_widget_show (gwCloseButton); - - - return gwDialog; -} - -GtkWidget *create_basic_frame (gchar * gcFileName, struct stat * sstat) -{ - GtkWidget *gwFrame; - GSList *gsList = NULL; - Property *property; - struct passwd *spasswd; - struct group *sgroup; - - property = g_new (Property, 1); - property->gcName = g_strdup (_("File Name:")); - property->gcValue = cxp_path_get_basename_of_utf8 (gcFileName); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("Place :")); - property->gcValue = cxp_path_get_dirname_of_utf8 (gcFileName); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("Size :")); - property->gcValue = g_strdup_printf ("%10ld bytes", sstat->st_size); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("Owner :")); - spasswd = getpwuid (sstat->st_uid); - property->gcValue = g_strdup (spasswd->pw_name); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("Group :")); - sgroup = getgrgid (sstat->st_gid); - property->gcValue = g_strdup (sgroup->gr_name); - gsList = g_slist_append (gsList, property); - - gwFrame = cxp_property_frame_new (_("Basic information"), gsList); - - g_slist_free (gsList); - - return gwFrame; -} - -GtkWidget *cxp_time_info_frame_new (gchar * gcFileName, struct stat * sstat) -{ - GtkWidget *gwFrame; - GSList *gsList = NULL; - Property *property; - - property = g_new (Property, 1); - property->gcName = g_strdup (_("last status change:")); - property->gcValue = cxp_strftime (&sstat->st_ctime); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("last modification:")); - property->gcValue = cxp_strftime (&sstat->st_mtime); - gsList = g_slist_append (gsList, property); - - property = g_new (Property, 1); - property->gcName = g_strdup (_("last access:")); - property->gcValue = cxp_strftime (&sstat->st_atime); - gsList = g_slist_append (gsList, property); - - gwFrame = cxp_property_frame_new (_("Time information"), gsList); - - g_slist_free (gsList); - - return gwFrame; -} - -GtkWidget *create_name_value_set (gchar * gcName, gchar * gcValue) -{ - GtkWidget *gwHBox; - GtkWidget *gwNameLabel; - GtkWidget *gwValueLabel; - - gwHBox = gtk_hbox_new (FALSE, 0); - gtk_widget_show (gwHBox); - - gwNameLabel = gtk_label_new (gcName); - gtk_widget_show (gwNameLabel); - gtk_box_pack_start (GTK_BOX (gwHBox), gwNameLabel, FALSE, FALSE, 0); - - gwValueLabel = gtk_label_new (gcValue); - gtk_widget_show (gwValueLabel); - gtk_box_pack_start (GTK_BOX (gwHBox), gwValueLabel, FALSE, FALSE, 0); - - return gwHBox; -} - -GtkWidget *cxp_property_frame_new (const gchar * label, GSList * gslHead) -{ - GtkWidget *gwFrame; - GtkWidget *gwVBox; - GtkWidget *gwHBox; - GSList *gslCurrent; - Property *property; - - gwFrame = gtk_frame_new (label); - gtk_widget_show (gwFrame); - - gwVBox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (gwFrame), gwVBox); - gtk_widget_show (gwVBox); - - gslCurrent = gslHead; - while (gslCurrent != NULL) - { - property = (Property *) gslCurrent->data; - gwHBox = create_name_value_set (property->gcName, - property->gcValue); - gtk_box_pack_start (GTK_BOX (gwVBox), gwHBox, FALSE, FALSE, 0); - gslCurrent = g_slist_next (gslCurrent); - } - - return gwFrame; -} Index: cxplorer/src/property.h diff -u cxplorer/src/property.h:1.7 cxplorer/src/property.h:removed --- cxplorer/src/property.h:1.7 Sat Nov 6 00:39:43 2004 +++ cxplorer/src/property.h Wed Apr 6 01:01:59 2005 @@ -1,50 +0,0 @@ -/*************************************************************************** - * property.h - * - * Mon Sep 20 22:59:10 2004 - * Copyright 2004 Yasumichi Akahoshi - * yasum****@users***** - ****************************************************************************/ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef _PROPERTY_H -#define _PROPERTY_H - -#ifdef __cplusplus -extern "C" -{ -#endif - - typedef struct - { - gchar *gcName; - gchar *gcValue; - } Property; - GtkWidget *create_property_dialog (gchar * gcFileName); - GtkWidget *create_basic_frame (gchar * gcFileName, struct stat *sstat); - GtkWidget *cxp_time_info_frame_new (gchar * gcFileName, - struct stat *sstat); - GtkWidget *create_name_value_set (gchar * gcName, gchar * gcValue); - GtkWidget *cxp_property_frame_new (const gchar * label, - GSList * gslHead); - -#ifdef __cplusplus -} -#endif - -#endif /* _PROPERTY_H */
