evidence-cvs Mailing List for evidence (Page 120)
Status: Alpha
Brought to you by:
azundris
Menu
▾
▴
evidence-cvs — Commit/Changelog messages from evidence's CVS.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(50) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(61) |
Feb
(30) |
Mar
(36) |
Apr
(96) |
May
(207) |
Jun
(178) |
Jul
(17) |
Aug
(103) |
Sep
(192) |
Oct
(95) |
Nov
(94) |
Dec
(35) |
| 2004 |
Jan
(33) |
Feb
(20) |
Mar
(65) |
Apr
(102) |
May
(276) |
Jun
(188) |
Jul
(129) |
Aug
(277) |
Sep
(142) |
Oct
(154) |
Nov
(104) |
Dec
(24) |
| 2005 |
Jan
(132) |
Feb
(46) |
Mar
(4) |
Apr
|
May
(8) |
Jun
(65) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(14) |
Feb
(1) |
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <azu...@us...> - 2002-12-25 18:05:54
|
Update of /cvsroot/evidence/evidence/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9681/src
Modified Files:
file.c
Log Message:
* file: opens rename-dial when trying to copy/move file on top of itself
Index: file.c
===================================================================
RCS file: /cvsroot/evidence/evidence/src/file.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** file.c 25 Dec 2002 16:20:41 -0000 1.21
--- file.c 25 Dec 2002 18:05:51 -0000 1.22
***************
*** 50,53 ****
--- 50,143 ----
+ /*****************************************************************************/
+
+
+
+ static void file_ask_cxl(GtkWindow *win,gpointer data) {
+ *((int *)data)=0; }
+
+ void file_ask_do(GtkWidget *ent,gpointer data) {
+ GtkWidget **wi=(GtkWidget **)data;
+ GtkWidget *to=wi[1];
+ GtkWindow *win=GTK_WINDOW(wi[2]);
+ gsize foo;
+ char *new_to,**old_to=g_object_get_data(G_OBJECT(to),"data");
+ const char *utf8;
+
+ utf8=gtk_entry_get_text(GTK_ENTRY(to));
+ new_to=g_locale_from_utf8(utf8,-1,&foo,&foo,NULL);
+ if(strcmp(new_to,*old_to)) {
+ free(*old_to);
+ *old_to=new_to; }
+ else
+ g_free(new_to);
+
+ gtk_widget_destroy(GTK_WIDGET(win)); }
+
+
+
+ /******************************************************************************/
+
+
+
+ static void file_ask(char *op,char **t) {
+ GtkWidget *win=gtk_window_new(GTK_WINDOW_TOPLEVEL),
+ *label=gtk_label_new("You are trying to copy or move a file\n"
+ "on top of itself. Unless you choose a\n"
+ "different name for the destination file,\n"
+ "this item will be skipped..."),
+ *label_fm=gtk_label_new(!strcmp(op,"copy")?"\nName of the original...":"\nOld name..."),
+ *label_to=gtk_label_new(!strcmp(op,"copy")?"\nName for the copy...":"\nNew name"),
+ *box=gtk_vbox_new(FALSE,0),
+ *fm=gtk_entry_new(),
+ *to=gtk_entry_new();
+ GtkWidget *wi[3];
+ gsize foo;
+ char *utf8;
+ int loop;
+
+ gtk_container_add(GTK_CONTAINER(win),box);
+
+ gtk_container_add(GTK_CONTAINER(box),label);
+
+ utf8=g_locale_to_utf8(*t,-1,&foo,&foo,NULL);
+
+ gtk_container_add(GTK_CONTAINER(box),label_fm);
+ gtk_widget_set_name(fm,"rename_src");
+ gtk_entry_set_text(GTK_ENTRY(fm),utf8);
+ gtk_container_add(GTK_CONTAINER(box),fm);
+ gtk_widget_set_sensitive(fm,FALSE);
+
+ gtk_container_add(GTK_CONTAINER(box),label_to);
+ gtk_widget_set_name(to,"rename_dst");
+ gtk_entry_set_text(GTK_ENTRY(to),utf8);
+ gtk_container_add(GTK_CONTAINER(box),to);
+ GTK_WIDGET_SET_FLAGS(to,GTK_CAN_DEFAULT);
+
+ g_free(utf8);
+
+ gtk_widget_set_name(win,"rename_window");
+ gtk_window_set_title(GTK_WINDOW(win),op);
+ gtk_entry_set_activates_default(GTK_ENTRY(to),TRUE);
+ gtk_window_set_default(GTK_WINDOW(win),to);
+
+ g_object_set_data(G_OBJECT(to), "data",t);
+ g_object_set_data(G_OBJECT(win),"data",op);
+
+ wi[0]=fm; wi[1]=to; wi[2]=win;
+ g_signal_connect(GTK_OBJECT(to), "activate",G_CALLBACK(file_ask_do),(gpointer)wi);
+ g_signal_connect(GTK_OBJECT(win),"destroy", G_CALLBACK(file_ask_cxl),(gpointer)&loop);
+
+ gtk_widget_show_all(GTK_WIDGET(win));
+
+ while(loop)
+ g_main_context_iteration(NULL,TRUE); }
+
+
+
+ /*****************************************************************************/
+
+
+
int file_get_meta(noir_sess *ns,char *file,meta **md) {
return ff.file_get_meta(ns,file,md); }
***************
*** 677,681 ****
fprintf(stderr,"mv \"%s\" \"%s\"\n",file,to);
if(file_is_same(file,to)) {
! puts("Move on top of itself!?"); }
else
file_partial(ff.file_mv(file,to),&ret); }
--- 767,791 ----
fprintf(stderr,"mv \"%s\" \"%s\"\n",file,to);
if(file_is_same(file,to)) {
! char *t=strdup(file);
! if(t) {
! int destroy=NOIR_SUCC;
! do {
! destroy=NOIR_SUCC;
! file_ask("move",&t);
! if(strcmp(t,file)) {
! if(file_exists(t))
! destroy=form_yes_no(NULL,"There already is a file of that name.\nReplace it with this one?");
! if(destroy==NOIR_SUCC)
! file_partial(ff.file_mv(file,t),&ret);
! else {
! free(t);
! t=strdup(file); }}
! else
! fprintf(stderr,"file name not changed, src (%s) still same as "
! "target (%s), skipping...\n",file,t);
! } while(destroy!=NOIR_SUCC);
! free(t); }
! else
! form_alert(NULL,"Out memory in file-API!"); }
else
file_partial(ff.file_mv(file,to),&ret); }
***************
*** 690,694 ****
fprintf(stderr,"cp \"%s\" \"%s\"\n",file,to);
if(file_is_same(file,to)) {
! puts("Copy on top of itself!?"); }
else
file_partial(ff.file_cp(file,to),&ret); }
--- 800,824 ----
fprintf(stderr,"cp \"%s\" \"%s\"\n",file,to);
if(file_is_same(file,to)) {
! char *t=strdup(file);
! if(t) {
! int destroy;
! do {
! destroy=NOIR_SUCC;
! file_ask("copy",&t);
! if(strcmp(t,file)) {
! if(file_exists(t))
! destroy=form_yes_no(NULL,"There already is a file of that name.\nReplace it with a copy of this one?");
! if(destroy==NOIR_SUCC)
! file_partial(ff.file_cp(file,t),&ret);
! else {
! free(t);
! t=strdup(file); }}
! else
! fprintf(stderr,"file name not changed, src (%s) still same as "
! "target (%s), skipping...\n",file,t);
! } while(destroy!=NOIR_SUCC);
! free(t); }
! else
! form_alert(NULL,"Out memory in file-API!"); }
else
file_partial(ff.file_cp(file,to),&ret); }
|
|
From: <azu...@us...> - 2002-12-25 18:05:54
|
Update of /cvsroot/evidence/evidence/src/actions/rename
In directory sc8-pr-cvs1:/tmp/cvs-serv9681/src/actions/rename
Modified Files:
rename.c
Log Message:
* file: opens rename-dial when trying to copy/move file on top of itself
Index: rename.c
===================================================================
RCS file: /cvsroot/evidence/evidence/src/actions/rename/rename.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rename.c 23 Dec 2002 22:07:41 -0000 1.1
--- rename.c 25 Dec 2002 18:05:51 -0000 1.2
***************
*** 11,22 ****
! /******************************************************************************/
! void rename_cxl(GtkWindow *win,gpointer data) {
*((GtkEntry **)data)=NULL; }
! void rename_do(GtkWidget *ent,gpointer data) {
noir_sess *ns=(noir_sess *)g_object_get_data(G_OBJECT(ent),"data");
GtkWindow *win=*((GtkWindow **)data);
--- 11,22 ----
! /*****************************************************************************/
! static void rename_cxl(GtkWindow *win,gpointer data) {
*((GtkEntry **)data)=NULL; }
! static void rename_do(GtkWidget *ent,gpointer data) {
noir_sess *ns=(noir_sess *)g_object_get_data(G_OBJECT(ent),"data");
GtkWindow *win=*((GtkWindow **)data);
***************
*** 49,53 ****
! /******************************************************************************/
--- 49,53 ----
! /*****************************************************************************/
***************
*** 94,96 ****
! /******************************************************************************/
--- 94,96 ----
! /*****************************************************************************/
|
|
From: <azu...@us...> - 2002-12-25 18:05:54
|
Update of /cvsroot/evidence/evidence In directory sc8-pr-cvs1:/tmp/cvs-serv9681 Modified Files: ChangeLog Log Message: * file: opens rename-dial when trying to copy/move file on top of itself Index: ChangeLog =================================================================== RCS file: /cvsroot/evidence/evidence/ChangeLog,v retrieving revision 1.161 retrieving revision 1.162 diff -C2 -d -r1.161 -r1.162 *** ChangeLog 25 Dec 2002 16:20:41 -0000 1.161 --- ChangeLog 25 Dec 2002 18:05:51 -0000 1.162 *************** *** 1,4 **** --- 1,5 ---- 2002/12/24 Azundris <evi...@az...> + * file: opens rename-dial when trying to copy/move file on top of itself * theme: idle-handlers are destalled when program ends (more useful for theme- switching, really) |
|
From: <azu...@us...> - 2002-12-25 18:05:54
|
Update of /cvsroot/evidence/evidence/src/actions/mkdir
In directory sc8-pr-cvs1:/tmp/cvs-serv9681/src/actions/mkdir
Modified Files:
mkdir.c
Log Message:
* file: opens rename-dial when trying to copy/move file on top of itself
Index: mkdir.c
===================================================================
RCS file: /cvsroot/evidence/evidence/src/actions/mkdir/mkdir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mkdir.c 23 Dec 2002 22:07:40 -0000 1.2
--- mkdir.c 25 Dec 2002 18:05:51 -0000 1.3
***************
*** 15,22 ****
! void mkdir_cxl(GtkWindow *win,gpointer data) {
*((GtkEntry **)data)=NULL; }
! void mkdir_do(GtkWidget *ent,gpointer data) {
noir_sess *ns=(noir_sess *)g_object_get_data(G_OBJECT(ent),"data");
GtkWindow *win=*((GtkWindow **)data);
--- 15,22 ----
! static void mkdir_cxl(GtkWindow *win,gpointer data) {
*((GtkEntry **)data)=NULL; }
! static void mkdir_do(GtkWidget *ent,gpointer data) {
noir_sess *ns=(noir_sess *)g_object_get_data(G_OBJECT(ent),"data");
GtkWindow *win=*((GtkWindow **)data);
|
|
From: <azu...@us...> - 2002-12-25 16:20:44
|
Update of /cvsroot/evidence/evidence
In directory sc8-pr-cvs1:/tmp/cvs-serv22288
Modified Files:
ChangeLog
Log Message:
catch "cp/mv file on top of itself" in file-interface (rather than in
the individual plug-ins) where possible
Index: ChangeLog
===================================================================
RCS file: /cvsroot/evidence/evidence/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** ChangeLog 25 Dec 2002 13:16:56 -0000 1.160
--- ChangeLog 25 Dec 2002 16:20:41 -0000 1.161
***************
*** 1,7 ****
2002/12/24 Azundris <evi...@az...>
! * theme: idle-handlers are destalled when program ends (more useful for theme-switching)
! * configure: new option --disable-x: "do not use Xlib directly, always go through
! GDK/Evas" (more compatibility for DirectFB and friends)
* bg_edb_trans (compose edb elements over pseudo-transparent background) fails
gracefully if no wallpaper is set (and if e16 does strange strange things)
--- 1,8 ----
2002/12/24 Azundris <evi...@az...>
! * theme: idle-handlers are destalled when program ends (more useful for theme-
! switching, really)
! * configure: new option --disable-x: "do not use Xlib directly, always go
! through GDK/Evas" (more compatibility for DirectFB and friends)
* bg_edb_trans (compose edb elements over pseudo-transparent background) fails
gracefully if no wallpaper is set (and if e16 does strange strange things)
|
|
From: <azu...@us...> - 2002-12-25 16:20:44
|
Update of /cvsroot/evidence/evidence/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22288/src
Modified Files:
file.c file.h
Log Message:
catch "cp/mv file on top of itself" in file-interface (rather than in
the individual plug-ins) where possible
Index: file.c
===================================================================
RCS file: /cvsroot/evidence/evidence/src/file.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** file.c 25 Dec 2002 13:16:58 -0000 1.20
--- file.c 25 Dec 2002 16:20:41 -0000 1.21
***************
*** 660,663 ****
--- 660,674 ----
+ int file_is_same(char *file,char *file_or_dir) {
+ char *p=strrchr(file_or_dir,'/');
+ if(!strcmp(file,file_or_dir))
+ return TRUE;
+ if(!strncmp(file,file_or_dir,(size_t)(p-file_or_dir))&&
+ S_ISDIR(file_exists(file_or_dir)))
+ return TRUE;
+ return FALSE; }
+
+
+
int file_mv(char *fm,char *to) {
char *file;
***************
*** 665,669 ****
while((file=file_get_from_drop(&fm))) {
fprintf(stderr,"mv \"%s\" \"%s\"\n",file,to);
! file_partial(ff.file_mv(file,to),&ret); }
return ret; }
--- 676,683 ----
while((file=file_get_from_drop(&fm))) {
fprintf(stderr,"mv \"%s\" \"%s\"\n",file,to);
! if(file_is_same(file,to)) {
! puts("Move on top of itself!?"); }
! else
! file_partial(ff.file_mv(file,to),&ret); }
return ret; }
***************
*** 675,681 ****
while((file=file_get_from_drop(&fm))) {
fprintf(stderr,"cp \"%s\" \"%s\"\n",file,to);
! if(!strcmp(file,to)) {
puts("Copy on top of itself!?"); }
! file_partial(ff.file_cp(file,to),&ret); }
return ret; }
--- 689,696 ----
while((file=file_get_from_drop(&fm))) {
fprintf(stderr,"cp \"%s\" \"%s\"\n",file,to);
! if(file_is_same(file,to)) {
puts("Copy on top of itself!?"); }
! else
! file_partial(ff.file_cp(file,to),&ret); }
return ret; }
Index: file.h
===================================================================
RCS file: /cvsroot/evidence/evidence/src/file.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** file.h 21 Dec 2002 17:08:03 -0000 1.7
--- file.h 25 Dec 2002 16:20:41 -0000 1.8
***************
*** 23,26 ****
--- 23,28 ----
time_t file_date_parse(char *);
+ int file_is_same(char *file,char *file_or_dir);
+
/* DND helpers */
void file_drop_remember(noir_sess *,GdkDragContext *,gchar *);
|
|
From: <azu...@us...> - 2002-12-25 16:20:44
|
Update of /cvsroot/evidence/evidence/src/actions/properties
In directory sc8-pr-cvs1:/tmp/cvs-serv22288/src/actions/properties
Modified Files:
info_dial.c
Log Message:
catch "cp/mv file on top of itself" in file-interface (rather than in
the individual plug-ins) where possible
Index: info_dial.c
===================================================================
RCS file: /cvsroot/evidence/evidence/src/actions/properties/info_dial.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** info_dial.c 23 Dec 2002 22:07:40 -0000 1.6
--- info_dial.c 25 Dec 2002 16:20:41 -0000 1.7
***************
*** 36,40 ****
static void check_entry(GtkEntry *w,gpointer data) {
const char *key=gtk_widget_get_name(GTK_WIDGET(w)),
! *utf8=gtk_entry_get_text(w),*val=NULL;
gsize foo;
meta *m,
--- 36,41 ----
static void check_entry(GtkEntry *w,gpointer data) {
const char *key=gtk_widget_get_name(GTK_WIDGET(w)),
! *utf8=gtk_entry_get_text(w);
! char *val=NULL;
gsize foo;
meta *m,
|