f-spot-delete.patch

   1 Index: src/f-spot.glade
   2 ===================================================================
   3 --- src/f-spot.glade    (wersja 2906)
   4 +++ src/f-spot.glade    (kopia robocza)
   5 @@ -1031,7 +1031,7 @@
   6           <child>
   7             <widget class="GtkTable" id="options_table">
   8               <property name="visible">True</property>
   9 -             <property name="n_rows">3</property>
  10 +             <property name="n_rows">4</property>
  11               <property name="n_columns">3</property>
  12               <property name="homogeneous">False</property>
  13               <property name="row_spacing">5</property>
  14 @@ -1259,6 +1259,30 @@
  15                   <property name="y_options"></property>
  16                 </packing>
  17               </child>
  18 +
  19 +             <child>
  20 +               <widget class="GtkCheckButton" id="delete_files_checkbox">
  21 +                 <property name="visible">True</property>
  22 +                 <property name="tooltip" translatable="yes">Delete imported file from camera</property>
  23 +                 <property name="can_focus">True</property>
  24 +                 <property name="label" translatable="yes">_Delete from camera</property>
  25 +                 <property name="use_underline">True</property>
  26 +                 <property name="relief">GTK_RELIEF_NORMAL</property>
  27 +                 <property name="focus_on_click">True</property>
  28 +                 <property name="active">False</property>
  29 +                 <property name="inconsistent">False</property>
  30 +                 <property name="draw_indicator">True</property>
  31 +                 <signal name="toggled" handler="HandleImportToggled" last_modification_time="Thu, 01 Feb 2007 20:41:45 GMT"/>
  32 +               </widget>
  33 +               <packing>
  34 +                 <property name="left_attach">0</property>
  35 +                 <property name="right_attach">1</property>
  36 +                 <property name="top_attach">3</property>
  37 +                 <property name="bottom_attach">4</property>
  38 +                 <property name="x_options">fill</property>
  39 +                 <property name="y_options"></property>
  40 +               </packing>
  41 +             </child>
  42             </widget>
  43             <packing>
  44               <property name="padding">0</property>
  45 Index: src/GPhotoCamera.cs
  46 ===================================================================
  47 --- src/GPhotoCamera.cs (wersja 2906)
  48 +++ src/GPhotoCamera.cs (kopia robocza)
  49 @@ -208,7 +208,18 @@
  50
  51                 camfile.Save (filename);
  52         }
  53 -
  54 +
  55 +       public void DeleteFile (int index)
  56 +       {
  57 +               if (camera_fs == null || files == null || index < 0 || index >= files.Count)
  58 +                       return;
  59 +
  60 +               GPhotoCameraFile selected_file = (GPhotoCameraFile)files [index];
  61 +               camera_fs.DeleteFile (selected_file.Directory,
  62 +                                     selected_file.FileName,
  63 +                                     context);
  64 +       }
  65 +
  66         public void SaveAllFiles (string prefix, int start_number)
  67         {
  68                 for(int index = 0; index < files.Count; index++) {
  69 Index: src/CameraFileSelectionDialog.cs
  70 ===================================================================
  71 --- src/CameraFileSelectionDialog.cs    (wersja 2906)
  72 +++ src/CameraFileSelectionDialog.cs    (kopia robocza)
  73 @@ -22,6 +22,7 @@
  74                 [Widget] Gtk.Button save_directory_selection_button;
  75                 [Widget] Gtk.Entry prefix_entry;
  76                 [Widget] Gtk.CheckButton import_files_checkbox;
  77 +               [Widget] Gtk.CheckButton delete_files_checkbox;
  78                 [Widget] Gtk.Button select_tag_button;
  79
  80                 GPhotoCamera camera;
  81 @@ -257,6 +258,9 @@
  82
  83                         camera.SaveFile (index, path);
  84
  85 +                       if (delete_files_checkbox.Active)
  86 +                               camera.DeleteFile (index);
  87 +
  88                         string dest = FileImportBackend.ChooseLocation (path);
  89                         System.IO.File.Move (path, dest);
  90                         path = dest;