IDE: package editor: multi remove

git-svn-id: trunk@45434 -

ide/lazarusidestrconsts.pas

@@ -4182,6 +4182,8 @@ resourcestring
   lisPckEditRemoveDependency2 = 'Remove Dependency?';
   lisPckEditRemoveDependencyFromPackage = 'Remove dependency %s%s%s%sfrom '
     +'package %s%s%s?';
+  lisRemoveDependenciesFromPackage =
+    'Remove %s dependencies from package "%s"?';
   lisPckEditInvalidMinimumVersion = 'Invalid minimum version';
   lisPckEditTheMinimumVersionIsNotAValidPackageVersion = 'The minimum '
     +'version %s%s%s is not a valid package version.%s(good example 1.2.3.4)';
@@ -5286,6 +5288,7 @@ resourcestring
   lisChangeBuildMode = 'Change build mode';
   lisWarningThisIsTheMainUnitTheNewMainUnitWillBePas = '%sWarning: This is '
     +'the main unit. The new main unit will be %s.pas.';
+  lisRemoveFilesFromPackage = 'Remove %s files from package "%s"?';
   lisDirectivesForNewUnit = 'Directives for new unit';
   lisRemoveFromInstallList = 'Remove from install list';
   lisKeepInInstallList = 'Keep in install list';

packager/packageeditor.pas

@@ -1041,7 +1041,15 @@ var
   CurDependency: TPkgDependency;
   s: String;
   mt: TMsgDlgType;
-  Removed: boolean;
+  i: Integer;
+  TVNode: TTreeNode;
+  NodeData: TPENodeData;
+  Item: TObject;
+  MainUnitSelected: Boolean;
+  FileWarning: String;
+  FileCount: Integer;
+  PkgCount: Integer;
+  PkgWarning: String;
 begin
   BeginUdate;
   try
@@ -1051,43 +1059,82 @@ begin
       exit;
     end;
 
-    // get current package file
+    // check selection
-    CurFile:=GetCurrentFile(Removed);
+    MainUnitSelected:=false;
-    if CurFile<>nil then begin
+    FileWarning:='';
-      if Removed then exit;
+    FileCount:=0;
-      // confirm deletion
+    PkgCount:=0;
-      s:='';
+    PkgWarning:='';
-      mt:=mtConfirmation;
+    for i:=0 to ItemsTreeView.SelectionCount-1 do begin
-      if CurFile.FileType=pftMainUnit then begin
+      TVNode:=ItemsTreeView.Selections[i];
-        s:=Format(lisWarningThisIsTheMainUnitTheNewMainUnitWillBePas,
+      if not GetNodeDataItem(TVNode,NodeData,Item) then continue;
-                  [LineEnding+LineEnding, lowercase(LazPackage.Name)]);
+      if NodeData.Removed then continue;
-        mt:=mtWarning;
+      if Item is TPkgFile then begin
+        CurFile:=TPkgFile(Item);
+        inc(FileCount);
+        if CurFile.FileType=pftMainUnit then
+          MainUnitSelected:=true;
+        if FileWarning='' then
+          FileWarning:=Format(lisPckEditRemoveFileFromPackage,
+            ['"', CurFile.Filename, '"', LineEnding, '"', LazPackage.IDAsString, '"']);
+      end else if Item is TPkgDependency then begin
+        CurDependency:=TPkgDependency(Item);
+        inc(PkgCount);
+        if PkgWarning='' then
+          PkgWarning:=Format(lisPckEditRemoveDependencyFromPackage, ['"',
+            CurDependency.AsString, '"', LineEnding, '"', LazPackage.IDAsString, '"']);
       end;
-      if MessageDlg(lisPckEditRemoveFile2,
+    end;
-        Format(lisPckEditRemoveFileFromPackage, ['"', CurFile.Filename, '"',
+    if (FileCount=0) and (PkgCount=0) then begin
-          LineEnding, '"', LazPackage.IDAsString, '"'])+s,
+      UpdateButtons;
-        mt,[mbYes,mbNo],0)=mrNo
-      then
-        exit;
-      LazPackage.RemoveFile(CurFile);
-      UpdateFiles;
       exit;
     end;
 
-    // get current dependency
-    CurDependency:=GetCurrentDependency(Removed);
-    if (CurDependency<>nil) then begin
-      if Removed then exit;
     // confirm deletion
-      if MessageDlg(lisPckEditRemoveDependency2,
+    if FileCount>0 then begin
-        Format(lisPckEditRemoveDependencyFromPackage, ['"',
+      s:='';
-          CurDependency.AsString, '"', LineEnding, '"', LazPackage.IDAsString, '"']),
+      mt:=mtConfirmation;
-        mtConfirmation,[mbYes,mbNo],0)=mrNo
+      if FileCount=1 then
-      then
+        s:=FileWarning
+      else
+        s:=Format(lisRemoveFilesFromPackage, [IntToStr(FileCount), LazPackage.
+          Name]);
+      if MainUnitSelected then begin
+        s+=Format(lisWarningThisIsTheMainUnitTheNewMainUnitWillBePas,
+                  [LineEnding+LineEnding, lowercase(LazPackage.Name)]);
+        mt:=mtWarning;
+      end;
+      if IDEMessageDialog(lisPckEditRemoveFile2,s,mt,[mbYes,mbNo])<>mrYes then
         exit;
+    end;
+    if PkgCount>0 then begin
+      s:='';
+      mt:=mtConfirmation;
+      if PkgCount=1 then
+        s:=PkgWarning
+      else
+        s:=Format(lisRemoveDependenciesFromPackage, [IntToStr(PkgCount),
+          LazPackage.Name]);
+      if IDEMessageDialog(lisPckEditRemoveDependencyFromPackage,s,mt,[mbYes,mbNo])<>mrYes then
+        exit;
+    end;
+
+    // remove
+    for i:=0 to ItemsTreeView.SelectionCount-1 do begin
+      TVNode:=ItemsTreeView.Selections[i];
+      if not GetNodeDataItem(TVNode,NodeData,Item) then continue;
+      if NodeData.Removed then continue;
+      if Item is TPkgFile then begin
+        CurFile:=TPkgFile(Item);
+        LazPackage.RemoveFile(CurFile);
+        UpdateFiles;
+      end else if Item is TPkgDependency then begin
+        CurDependency:=TPkgDependency(Item);
         PackageGraph.RemoveDependencyFromPackage(LazPackage,CurDependency,true);
         UpdateRequiredPkgs;
       end;
+    end;
+
   finally
     EndUpdate;
   end;
@@ -1985,7 +2032,7 @@ begin
       RemovedBranch.AddNodeData(CurFile.GetShortFilename(true), NodeData);
     end;
   end else begin
-    // No removed dependencies -> delete the root node
+    // No more removed files left -> delete the root node
     if FRemovedFilesNode<>nil then begin
       FilterEdit.DeleteBranch(FRemovedFilesNode);
       FreeAndNil(FRemovedFilesNode);