[Traverso-commit] traverso/src/traverso dialogs/project/NewProjec...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    08/05/21 20:07:20

Modified files:
        src/traverso/dialogs/project: NewProjectDialog.cpp 
        src/traverso/ui: NewProjectDialog.ui 

Log message:
        * removed option to "move" files to project dir. It's too difficult to 
implement and too dangerous to use.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewProjectDialog.ui?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dialogs/project/NewProjectDialog.cpp        21 May 2008 19:11:26 -0000      
1.7
+++ dialogs/project/NewProjectDialog.cpp        21 May 2008 20:07:19 -0000      
1.8
@@ -148,18 +148,7 @@
 
        if (loadFiles)
        {
-               int mode = 0;
-               if (radioButtonCopy->isChecked())
-               {
-                       mode = 1;
-               }
-
-               if (radioButtonMove->isChecked())
-               {
-                       mode = 2;
-               }
-
-               move_files(mode);
+               move_files(radioButtonCopy->isChecked() ? 1 : 0);
                load_files();
        }
 
@@ -241,7 +230,7 @@
 
                // TODO: check for free disk space
                // TODO: progress dialog for copying files
-               // TODO: find the proper way for moving files. copy/delete 
should not be necessare if the source and destination are on the same partition.
+               // TODO: offer file format conversion while copying
 
                QFile f(list.at(n).absoluteFilePath());
                if (f.copy(fn))
@@ -249,15 +238,6 @@
                        // copy was successful, thus update the file path
                        QTreeWidgetItem* item = 
treeWidgetFiles->topLevelItem(n);
                        item->setData(0, Qt::ToolTipRole, fn);
-
-                       // mode was "move", thus delete the source file
-                       if (mode == 2)
-                       {
-                               if (!f.remove())
-                               {
-                                       printf("could not delete file\n");
-                               }
-                       }
                }
        }
 }

Index: ui/NewProjectDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/NewProjectDialog.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ui/NewProjectDialog.ui      20 May 2008 20:51:05 -0000      1.5
+++ ui/NewProjectDialog.ui      21 May 2008 20:07:20 -0000      1.6
@@ -226,13 +226,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QRadioButton" name="radioButtonMove" >
-         <property name="text" >
-          <string>move files to project directory</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab" >