Changeset 295

Timestamp:

07/05/08 03:37:22 (3 months ago)

Author:

mattn

Message:

* more translateable strings

Files:

• GtkRadiant/trunk/contrib/prtview/ConfigDialog.cpp (modified) (16 diffs)
• GtkRadiant/trunk/radiant/gtkdlgs.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/gtkfilesel-linux.c (modified) (158 diffs)

GtkRadiant/trunk/contrib/prtview/ConfigDialog.cpp

@@ -29 +29 @@
-//static char THIS_FILE[] = __FILE__;
-#endif
+#include <glib/gi18n.h>
-
-/////////////////////////////////////////////////////////////////////////////
@@ -291 +292 @@
-
-  dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-"Portal Viewer Configuration"
+_("Portal Viewer Configuration")
-  gtk_signal_connect (GTK_OBJECT (dlg), "delete_event",
-                      GTK_SIGNAL_FUNC (dialog_delete_callback), NULL);
@@ -304 +305 @@
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-"3D View"
+_("3D View")
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
@@ -334 +335 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Color"
+_("Color")
-  gtk_widget_show (button);
-  gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1,
@@ -341 +342 @@
-  gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnColor3d), NULL);
-
-"Depth Color"
+_("Depth Color")
-  gtk_widget_show (button);
-  gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2,
@@ -355 +356 @@
-  gtk_signal_connect (GTK_OBJECT (aa3check), "toggled", GTK_SIGNAL_FUNC (OnAntiAlias3d), NULL);
-
-"Depth Cue"
+_("Depth Cue")
-  gtk_widget_show (depthcheck);
-  gtk_table_attach (GTK_TABLE (table), depthcheck, 1, 2, 1, 2,
@@ -362 +363 @@
-  gtk_signal_connect (GTK_OBJECT (depthcheck), "toggled", GTK_SIGNAL_FUNC (OnFog), NULL);
-
-"Lines"
+_("Lines")
-  gtk_widget_show (linescheck);
-  gtk_table_attach (GTK_TABLE (table), linescheck, 2, 3, 1, 2,
@@ -369 +370 @@
-  gtk_signal_connect (GTK_OBJECT (linescheck), "toggled", GTK_SIGNAL_FUNC (OnLines), NULL);
-
-"Polygons"
+_("Polygons")
-  gtk_widget_show (polyscheck);
-  gtk_table_attach (GTK_TABLE (table), polyscheck, 3, 4, 1, 2,
@@ -384 +385 @@
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (zlist), menu);
-
-"Z-Buffer Test and Write (recommended for solid or no polygons)"
+_("Z-Buffer Test and Write (recommended for solid or no polygons)")
-  gtk_widget_show (item);
-  gtk_signal_connect (GTK_OBJECT (item), "activate",
@@ -390 +391 @@
-  gtk_menu_append (GTK_MENU (menu), item);
-
-"Z-Buffer Test Only (recommended for transparent polygons)"
+_("Z-Buffer Test Only (recommended for transparent polygons)")
-  gtk_widget_show (item);
-  gtk_signal_connect (GTK_OBJECT (item), "activate",
@@ -396 +397 @@
-  gtk_menu_append (GTK_MENU (menu), item);
-
-"Z-Buffer Off"
+_("Z-Buffer Off")
-  gtk_widget_show (item);
-  gtk_signal_connect (GTK_OBJECT (item), "activate",
@@ -444 +445 @@
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0);
-
-"Show"
+_("Show")
-  gtk_widget_show (show3check);
-  gtk_box_pack_start (GTK_BOX (hbox), show3check, TRUE, TRUE, 0);
-  gtk_signal_connect (GTK_OBJECT (show3check), "toggled", GTK_SIGNAL_FUNC (OnConfig3d), NULL);
-
-"Portal cubic clipper"
+_("Portal cubic clipper")
-  gtk_widget_show (portalcheck);
-  gtk_box_pack_start (GTK_BOX (hbox), portalcheck, TRUE, TRUE, 0);
-  gtk_signal_connect (GTK_OBJECT (portalcheck), "toggled", GTK_SIGNAL_FUNC (OnClip), NULL);
-
-"2D View"
+_("2D View")
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
@@ -482 +483 @@
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0);
-
-"Color"
+_("Color")
-  gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
@@ -488 +489 @@
-  gtk_widget_set_usize (button, 60, -2);
-
-"Anti-Alias (May not work on some video cards)"
+_("Anti-Alias (May not work on some video cards)")
-  gtk_widget_show (aa2check);
-  gtk_box_pack_start (GTK_BOX (hbox), aa2check, TRUE, TRUE, 0);
@@ -497 +498 @@
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0);
-
-"Show"
+_("Show")
-  gtk_widget_show (show2check);
-  gtk_box_pack_start (GTK_BOX (hbox), show2check, FALSE, FALSE, 0);
@@ -506 +507 @@
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-"OK"
+_("OK")
-  gtk_widget_show (button);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);

GtkRadiant/trunk/radiant/gtkdlgs.cpp

@@ -2645 +2645 @@
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, FALSE, 0);
-
-(char*)
+
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);

GtkRadiant/trunk/radiant/gtkfilesel-linux.c

@@ -22 +22 @@
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- 
+
- */
-#define LEO
@@ -310 +310 @@
-#define TIME_STRING_BUF 50
-
- 
+
- * file completion interface */
-typedef struct _HistoryCallbackArg HistoryCallbackArg;
@@ -455 +455 @@
-
-/* pixmap creation function */
- 
+
-                                                   const gchar *pixmap_char);
-
@@ -525 +525 @@
-                                            gchar** remaining_text,
-                                            CompletionState* cmpl_state);
- 
- 
+
+
-                                            gboolean *stat_subdirs);
-static CompletionDir* open_dir             (gchar* dir_name,
@@ -534 +534 @@
-static CompletionDir* open_relative_dir    (gchar* dir_name, CompletionDir* dir,
-                                            CompletionState *cmpl_state);
- 
+
-                                            struct stat* sbuf,
-                                            gboolean stat_subdirs);
@@ -573 +573 @@
-
-static void gtk_file_selection_file_button (GtkWidget *widget,
- 
- 
+
+
-                                            GdkEventButton *bevent,
-                                            gpointer user_data);
@@ -619 +619 @@
-
-//static void gtk_file_selection_home_button (GtkWidget *widget, gpointer data);
- 
+
-                                   GtkFileSelection *fs);
-
@@ -639 +639 @@
-static void gtk_file_selection_load_masks(GtkFileSelection *fs);
-
- 
- 
+
+
-                                                 GtkFileSelection *fs);
-
-
+
-static GtkWindowClass *parent_class = NULL;
-
@@ -695 +695 @@
-
-  /*
- 
+
-   * if necessary.
-   */
@@ -704 +704 @@
-        if (path[index] == '\\')
-          path[index] = '/';
-
+
-      updated = 1;
-    }
-
+
-  return updated;
-}
@@ -795 +795 @@
-
-  tc = 0; mc = 0;
-
+
-  if (mask[0] == 0 && text[0] == 0) return 1;
-
+
-  if (mask[0] == '*')
-    {
@@ -926 +926 @@
-          item->desc=g_strdup(bookmark_data+lp);
-          lp=++cp;
-
+
-          while (cp < file_info.st_size && bookmark_data[cp] != '>' )
-            cp++;
@@ -956 +956 @@
-}
-
- 
- 
+
+
-{
-  /* Add item to menu */
@@ -973 +973 @@
-}
-
- 
+
-gtk_file_selection_save_bookmarks (GtkFileSelection *fs)
-{
@@ -994 +994 @@
-      g_free(item_data);
-    }
-
+
-    close(file);
-  } else {
@@ -1171 +1171 @@
-  char *dir_title [2];
-  char *file_title [2];
-
+
-  filesel->cmpl_state = cmpl_init_state ();
-
@@ -1196 +1196 @@
-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
-  gtk_widget_show (pulldown_hbox);
-
+
-  /* The horizontal box containing create, rename etc. buttons */
-
@@ -1228 +1228 @@
-  gtk_container_set_border_width (GTK_CONTAINER (list_vbox),2);
-  gtk_widget_show (list_vbox);
-
+
-  /*  The horizontal box containing the directory and file listboxes  */
-//  list_hbox = gtk_hbox_new (FALSE, 3);
@@ -1260 +1260 @@
-
-  /* Here we add the bookmark menu button */
- 
+
-  #define   to keep it in the filesel structure
-  button=gtk_button_new_with_label(_("Bookmarks"));
@@ -1268 +1268 @@
-                      (GtkSignalFunc) gtk_file_selection_bookmark_button,
-                      (gpointer) filesel);
-
+
-  hbox2 = gtk_hbox_new (FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
@@ -1319 +1319 @@
-  /* menu for right click file operations */
-  filesel->fileop_menu = gtk_menu_new();
-
-"Rename..."
+
+_("Rename...")
-  gtk_widget_show(menu_item);
-  gtk_signal_connect_object (GTK_OBJECT (menu_item), "activate",
@@ -1327 +1327 @@
-  gtk_menu_append (GTK_MENU (filesel->fileop_menu), menu_item);
-
-"Delete"
+_("Delete")
-  gtk_widget_show(menu_item);
-  gtk_menu_append (GTK_MENU (filesel->fileop_menu), menu_item);
@@ -1338 +1338 @@
-  gtk_menu_append (GTK_MENU (filesel->fileop_menu), menu_item);
-
-"Create Directory..."
+_("Create Directory...")
-  gtk_signal_connect_object (GTK_OBJECT (menu_item), "activate",
- 
+
-                             (gpointer) filesel);
-  gtk_widget_show(menu_item);
@@ -1349 +1349 @@
-  gtk_widget_show(menu_item);
-
-"Properties..."
+_("Properties...")
-  gtk_signal_connect_object (GTK_OBJECT (menu_item), "activate",
-                             (GtkSignalFunc) gtk_file_selection_properties,
@@ -1368 +1368 @@
-                      (gpointer) filesel);
-  gtk_signal_connect (GTK_OBJECT (filesel->dir_list), "button_press_event",
- 
+
-                      (gpointer) filesel);
-
@@ -1379 +1379 @@
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE,TRUE, 0);
-  //gtk_container_add(GTK_CONTAINER(hpaned), scrolled_win);
-
+
-  gtk_widget_show (filesel->dir_list);
-  gtk_widget_show (scrolled_win);
@@ -1411 +1411 @@
-                     (GtkSignalFunc) gtk_file_selection_mask_entry_callback,
-                     (gpointer) filesel);
-                           
+
-                     (GtkSignalFunc) gtk_file_selection_mask_entry_key_callback,
-                     (gpointer) filesel);
@@ -1430 +1430 @@
-  gtk_widget_set_usize (filesel->file_list, FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
-  gtk_signal_connect (GTK_OBJECT (filesel->file_list), "select_row",
- 
+
-                      (gpointer) filesel);
-  gtk_signal_connect (GTK_OBJECT (filesel->file_list), "key-press-event",
-                      (GtkSignalFunc) gtk_file_selection_files_list_key_callback,
-                      (gpointer) filesel);
-
+
-  gtk_signal_connect (GTK_OBJECT (filesel->file_list), "button_press_event",
- 
+
-                      (gpointer) filesel);
-
@@ -1452 +1452 @@
-  /* action area for packing buttons into. */
-  filesel->action_area = gtk_hbox_new (TRUE, 0);
- 
+
-                      FALSE, FALSE, 2);
-  gtk_widget_show (filesel->action_area);
@@ -1463 +1463 @@
-
-  /*  The selection entry widget  */
-
+
-  entry_vbox = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_end (GTK_BOX (filesel->main_vbox), entry_vbox, FALSE, FALSE, 0);
@@ -1496 +1496 @@
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_show (label);
-
+
-
-  filesel->history_combo = gtk_combo_new();
@@ -1505 +1505 @@
-  gtk_widget_show(filesel->history_combo);
-
-                                    
+
-                     (GtkSignalFunc) gtk_file_selection_history_combo_callback,
-                     (gpointer) filesel);
@@ -1583 +1583 @@
-  gtk_window_set_title (GTK_WINDOW (filesel), title);
-  /* !!! put check here to figure out if screen > 640x480, if true
- 
+
-     or maybe we should keep it at a certan percentage of the screen
-     size? */
@@ -1598 +1598 @@
-
-  return;
-
+
-  /* delete, create directory, and rename */
-/*
- 
+
-    {
-      filesel->fileop_c_dir = gtk_button_new_with_label (_("MkDir"));
-      gtk_signal_connect (GTK_OBJECT (filesel->fileop_c_dir), "clicked",
- 
+
-                          (gpointer) filesel);
- 
+
-                          filesel->fileop_c_dir, TRUE,TRUE, 0);
-      gtk_widget_show (filesel->fileop_c_dir);
-    }
-
- 
+
+
-    {
-      filesel->fileop_del_file = gtk_button_new_with_label (_("Delete"));
-      gtk_signal_connect (GTK_OBJECT (filesel->fileop_del_file), "clicked",
- 
+
-                          (gpointer) filesel);
- 
+
-                          filesel->fileop_del_file, TRUE,TRUE, 0);
-      gtk_widget_show (filesel->fileop_del_file);
@@ -1627 +1627 @@
-      filesel->fileop_ren_file = gtk_button_new_with_label (_("Rename"));
-      gtk_signal_connect (GTK_OBJECT (filesel->fileop_ren_file), "clicked",
- 
+
-                          (gpointer) filesel);
- 
+
-                          filesel->fileop_ren_file, TRUE,TRUE, 0);
-      gtk_widget_show (filesel->fileop_ren_file);
@@ -1638 +1638 @@
-}
-
-       
+
-gtk_file_selection_hide_fileop_buttons (GtkFileSelection *filesel)
-{
-  g_return_if_fail (filesel != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
-
+
-  return;
-  /*
- 
+
-    {
-      gtk_widget_destroy (filesel->fileop_ren_file);
@@ -1728 +1728 @@
-  gchar *new_pattern;
-  gint x;
-
+
-  g_return_if_fail (filesel != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
@@ -1735 +1735 @@
-  if (filesel->selection_entry)
-    gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), pattern);
-
+
-  if(strchr(pattern,'*') || strchr(pattern,'?'))
-    {
@@ -1743 +1743 @@
-        }
-      gtk_entry_set_text(GTK_ENTRY(filesel->mask_entry),g_strdup(pattern+x+1));
-
+
-      if(filesel->mask) g_free(filesel->mask);
-
+
-      filesel->mask=g_strdup(pattern+x+1);
-      new_pattern=g_strdup(pattern);
@@ -1791 +1791 @@
-
-  filesel = GTK_FILE_SELECTION (object);
-
+
-  if (filesel->fileop_dialog)
-    gtk_widget_destroy (filesel->fileop_dialog);
-
+
-  if (filesel->next_history)
-    {
@@ -1824 +1824 @@
-      filesel->mask = NULL;
-    }
-
+
-  cmpl_free_state (filesel->cmpl_state);
-  filesel->cmpl_state = NULL;
@@ -1844 +1844 @@
-  g_return_val_if_fail (fs != NULL, FALSE);
-  g_return_val_if_fail (GTK_FILE_SELECTION (fs), FALSE);
-
+
-  if (event->type == GDK_BUTTON_PRESS)
-    {
@@ -1851 +1851 @@
-        {
-
- 
+
-                          event_button->button, event_button->time);
-          return TRUE;
-        }
-    }
-
+
-  return FALSE;
-}
@@ -1867 +1867 @@
-  GtkWidget *button;
-  GtkWidget *dialog;
-
+
-  g_return_if_fail (error_message != NULL);
-
+
-  /* main dialog */
-  dialog = gtk_dialog_new ();
-  /*
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
- 
+
-                      (gpointer) fs);
-  */
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Error"));
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-
+
-  /* If file dialog is grabbed, make this dialog modal too */
-  /* When error dialog is closed, file dialog will be grabbed again */
@@ -1898 +1898 @@
-  /* yes, we free it */
-  g_free (error_message);
-
+
-  /* close button */
-  button = gtk_button_new_with_label (_("Close"));
-  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- 
+
-                             (gpointer) dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -1920 +1920 @@
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
-
+
-  fs->fileop_dialog = NULL;
-  g_free (fs->fileop_data);
@@ -1936 +1936 @@
-  gchar *buf;
-  CompletionState *cmpl_state;
-
+
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
@@ -1943 +1943 @@
-  cmpl_state = (CompletionState*) fs->cmpl_state;
-  path = cmpl_reference_position (cmpl_state);
-
+
-  full_path = g_strconcat (path, "/", dirname, NULL);
- 
-
- 
+
+
+
-                         g_strerror(errno), NULL);
-      gtk_file_selection_fileop_error (fs, buf);
-    }
-  g_free (full_path);
-
+
-  gtk_widget_destroy (fs->fileop_dialog);
-  gtk_file_selection_populate (fs, "", FALSE);
-}
-
+
-static void
-gtk_file_selection_create_dir (gpointer data)
@@ -1971 +1971 @@
-  if (fs->fileop_dialog)
-          return;
-
+
-  /* main dialog */
-  fs->fileop_dialog = dialog = gtk_dialog_new ();
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
- 
+
-                      (gpointer) fs);
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Create Directory"));
@@ -1990 +1990 @@
-                     FALSE, FALSE, 0);
-  gtk_widget_show(vbox);
-
+
-  label = gtk_label_new(_("Directory name:"));
-  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
@@ -1998 +1998 @@
-  /*  The directory entry widget  */
-  fs->fileop_entry = gtk_entry_new ();
- 
+
-                      TRUE, TRUE, 5);
-  GTK_WIDGET_SET_FLAGS(fs->fileop_entry, GTK_CAN_DEFAULT);
-  gtk_widget_show (fs->fileop_entry);
-
+
-  /* buttons */
-  button = gtk_button_new_with_label (_("Create"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
- 
+
-                      (gpointer) fs);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2012 +2012 @@
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_widget_show(button);
-
+
-  button = gtk_button_new_with_label (_("Cancel"));
-  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- 
+
-                             (gpointer) dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2034 +2034 @@
-  gchar *full_path;
-  gchar *buf;
-
+
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
@@ -2040 +2040 @@
-  cmpl_state = (CompletionState*) fs->cmpl_state;
-  path = cmpl_reference_position (cmpl_state);
-
+
-  full_path = g_strconcat (path, "/", fs->fileop_file, NULL);
- 
-
- 
+
+
+
-                         g_strerror(errno), NULL);
-      gtk_file_selection_fileop_error (fs, buf);
-    }
-  g_free (full_path);
-
+
-  gtk_widget_destroy (fs->fileop_dialog);
-  gtk_file_selection_populate (fs, "", FALSE);
@@ -2064 +2064 @@
-  gchar *filename;
-  gchar *buf;
-
+
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
@@ -2076 +2076 @@
-
-  fs->fileop_file = filename;
-
+
-  /* main dialog */
-  fs->fileop_dialog = dialog = gtk_dialog_new ();
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
- 
+
-                      (gpointer) fs);
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Delete File"));
@@ -2089 +2089 @@
-  if (GTK_WINDOW(fs)->modal)
-      gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
-
+
-  vbox = gtk_vbox_new(FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
@@ -2102 +2102 @@
-  gtk_widget_show(label);
-  g_free(buf);
-
+
-  /* buttons */
-  button = gtk_button_new_with_label (_("Delete"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
- 
+
-                      (gpointer) fs);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2112 +2112 @@
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_widget_show(button);
-
+
-  button = gtk_button_new_with_label (_("Cancel"));
-  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- 
+
-                             (gpointer) dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2137 +2137 @@
-  gchar *old_filename;
-  CompletionState *cmpl_state;
-
+
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
@@ -2144 +2144 @@
-  cmpl_state = (CompletionState*) fs->cmpl_state;
-  path = cmpl_reference_position (cmpl_state);
-
+
-  new_filename = g_strconcat (path, "/", file, NULL);
-  old_filename = g_strconcat (path, "/", fs->fileop_file, NULL);
-
-  if (strcmp (new_filename, old_filename))
- 
+
-      {
- 
+
-                           g_strerror(errno), NULL);
-        gtk_file_selection_fileop_error (fs, buf);
@@ -2157 +2157 @@
-  g_free (new_filename);
-  g_free (old_filename);
-
+
-  gtk_widget_destroy (fs->fileop_dialog);
-  gtk_file_selection_populate (fs, "", FALSE);
-}
-
+
-static void
-gtk_file_selection_file_mode_confirmed (GtkWidget *widget, gpointer data)
@@ -2180 +2180 @@
-  if (chmod (filename, mode) == -1)
-    {
- 
+
-                                g_strerror (errno), NULL);
-      gtk_file_selection_fileop_error (fs, buf);
@@ -2201 +2201 @@
-  GtkWidget *button;
-  gchar *buf;
-
+
-  g_return_if_fail (fs != NULL);
-  g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
@@ -2211 +2211 @@
-  if (strlen(fs->fileop_file) < 1)
-          return;
-
+
-  /* main dialog */
-  fs->fileop_dialog = dialog = gtk_dialog_new ();
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
- 
+
-                      (gpointer) fs);
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Rename File"));
@@ -2224 +2224 @@
-  if (GTK_WINDOW(fs)->modal)
-    gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
-
+
-  vbox = gtk_vbox_new(FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
@@ -2230 +2230 @@
-                     FALSE, FALSE, 0);
-  gtk_widget_show(vbox);
-
+
-  buf = g_strconcat ("Rename file \"", fs->fileop_file, "\" to:", NULL);
-  label = gtk_label_new(buf);
@@ -2240 +2240 @@
-  /* New filename entry */
-  fs->fileop_entry = gtk_entry_new ();
- 
+
-                      TRUE, TRUE, 5);
-  GTK_WIDGET_SET_FLAGS(fs->fileop_entry, GTK_CAN_DEFAULT);
-  gtk_widget_show (fs->fileop_entry);
-
+
-  gtk_entry_set_text (GTK_ENTRY (fs->fileop_entry), fs->fileop_file);
-  gtk_editable_select_region (GTK_EDITABLE (fs->fileop_entry),
@@ -2252 +2252 @@
-  button = gtk_button_new_with_label (_("Rename"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
- 
+
-                      (gpointer) fs);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2258 +2258 @@
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_widget_show(button);
-
+
-  button = gtk_button_new_with_label (_("Cancel"));
-  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- 
+
-                             (gpointer) dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
@@ -2346 +2346 @@
-  if (fs->fileop_dialog)
-          return;
-
+
-  /* main dialog */
-  fs->fileop_dialog = dialog = gtk_dialog_new ();
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
- 
+
-                      (gpointer) fs);
-  priv = fs->fileop_data = g_malloc (sizeof (PropertiesPrivate));
@@ -2361 +2361 @@
-  if (GTK_WINDOW(fs)->modal)
-    gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
-
+
-  /* Dialog guts go here */
-  notebook = gtk_notebook_new ();
@@ -2371 +2371 @@
-  fs->fileop_file = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry));
-  filename = g_strconcat(path, "/", fs->fileop_file, NULL);
- 
+
-  {
-    /* stats page */
@@ -2380 +2380 @@
-    gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-
+
-    label = gtk_label_new (_("Statistics"));
-    gtk_widget_show (label);
@@ -2392 +2392 @@
-                      (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    label = gtk_label_new (_(path));
-    gtk_widget_show (label);
@@ -2400 +2400 @@
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    label = gtk_label_new (_("File Name:"));
-    gtk_widget_show (label);
@@ -2407 +2407 @@
-                      (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    fs->fileop_entry = entry = gtk_entry_new ();
-    gtk_widget_show (entry);
@@ -2416 +2416 @@
-    if (access (filename, W_OK))
-      gtk_widget_set_sensitive( GTK_WIDGET (entry), FALSE);
-
+
-    hseparator = gtk_hseparator_new ();
-    gtk_widget_show (hseparator);
@@ -2422 +2422 @@
-                      (GtkAttachOptions) (GTK_FILL),
-                      (GtkAttachOptions) (GTK_FILL), 0, 0);
-
+
-    /* file type and size */
-    label = gtk_label_new (_("Type:"));
@@ -2465 +2465 @@
-                      (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    label = gtk_label_new (_("Size:"));
-    gtk_widget_show (label);
@@ -2472 +2472 @@
-                      (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    label = gtk_label_new (_(g_strdup_printf ("%ld bytes", statbuf.st_size)));
-    gtk_widget_show (label);
@@ -2479 +2479 @@
-                      (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+
-    hseparator = gtk_hseparator_new ();
-    gtk_widget_show (hseparator);
@@ -2485 +2485 @@
-                      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                      (GtkAttachOptions) (GTK_FILL), 0, 0);
-
+
-    /* file dates */
-    label = gtk_label_new (_("Created:"));
@@ -2493 +2493 @@
-