gEDA-cvs: pcb.git: branch: sdb-playpen updated (282f7216dec565223415f16d5dc7517917aed776)

[git@xxxxxxxxxx]

The branch, sdb-playpen has been updated
       via  282f7216dec565223415f16d5dc7517917aed776 (commit)
      from  df0e28d9f58bf5d3278fcddf0459fd93f7f08aa8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/action.c |   13 +++++++------
 src/copy.c   |   12 ------------
 src/create.c |    4 ----
 3 files changed, 7 insertions(+), 22 deletions(-)


=================
 Commit Messages
=================

commit 282f7216dec565223415f16d5dc7517917aed776
Author: Stuart Brorson <sdb@xxxxxxxxxx>
Commit: Stuart Brorson <sdb@xxxxxxxxxx>

    Fix some conflicts, add DJ's stub for sch file import.

:100644 100644 15f90e4... ccf6847... M	src/action.c
:100644 100644 9823cdc... c7d212c... M	src/copy.c
:100644 100644 84bdf1e... 459f1ae... M	src/create.c

=========
 Changes
=========

commit 282f7216dec565223415f16d5dc7517917aed776
Author: Stuart Brorson <sdb@xxxxxxxxxx>
Commit: Stuart Brorson <sdb@xxxxxxxxxx>

    Fix some conflicts, add DJ's stub for sch file import.

diff --git a/src/action.c b/src/action.c
index 15f90e4..ccf6847 100644
--- a/src/action.c
+++ b/src/action.c
@@ -7193,6 +7193,9 @@ overridden by the user via the @code{make-program} and @code{gnetlist}
 @code{pcb} settings (i.e. in @code{~/.pcb/settings} or on the command
 line).
 
+If @pcb{} cannot determine which schematic(s) to import from, the GUI
+is called to let user choose (see @code{ImportGUI()}).
+
 %end-doc */
 
 static int
@@ -7441,12 +7444,7 @@ ActionImport (int argc, char **argv, int x, int y)
       char *dot, *slash, *bslash;
 
       if (!pcbname)
-	{
-	  Message ("Please save your PCB first, so that it has a\n"
-		   "file name, or manually add an import::src0 attribute with\n"
-		   "the name of the schematic to import from.");
-	  return 1;
-	}
+        return hid_action("ImportGUI");
 
       schname = (char *) malloc (strlen(pcbname) + 5);
       strcpy (schname, pcbname);
@@ -7461,6 +7459,9 @@ ActionImport (int argc, char **argv, int x, int y)
 	*dot = 0;
       strcat (schname, ".sch");
 
+      if (access (schname, F_OK))
+        return hid_action("ImportGUI");
+
       sources = (char **) malloc (2 * sizeof (char *));
       sources[0] = schname;
       sources[1] = NULL;
diff --git a/src/copy.c b/src/copy.c
index 9823cdc..c7d212c 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -309,11 +309,7 @@ CopyElement (ElementTypePtr Element)
       didDraw = True;
     }
 #ifdef DEBUG
-<<<<<<< HEAD
 /*   printf(" ... Leaving CopyElement.\n"); */
-=======
-  printf(" ... Leaving CopyElement.\n");
->>>>>>> master
 #endif
   return (element);
 }
@@ -330,10 +326,6 @@ CopyPastebufferToLayout (LocationType X, LocationType Y)
 
 #ifdef DEBUG
   printf("Entering CopyPastebufferToLayout.....\n");
-<<<<<<< HEAD
-  printf("  BufferNumber = %d\n", Settings.BufferNumber);
-=======
->>>>>>> master
 #endif
 
   /* set movement vector */
@@ -386,11 +378,7 @@ CopyPastebufferToLayout (LocationType X, LocationType Y)
       ELEMENT_LOOP (PASTEBUFFER->Data);
       {
 #ifdef DEBUG
-<<<<<<< HEAD
 	printf("  .... In CopyPastebufferToLayout, pasting element %s ...\n",
-=======
-	printf("In CopyPastebufferToLayout, pasting element %s\n",
->>>>>>> master
 	      element->Name[1].TextString);
 #endif
 	if (FRONT (element) || PCB->InvisibleObjectsOn)
diff --git a/src/create.c b/src/create.c
index 84bdf1e..459f1ae 100644
--- a/src/create.c
+++ b/src/create.c
@@ -670,11 +670,7 @@ CreateNewElement (DataTypePtr Data, ElementTypePtr Element,
   Element->ID = ID++;
 
 #ifdef DEBUG
-<<<<<<< HEAD
   printf("<---  .... Leaving CreateNewElement.\n");
-=======
-  printf("  .... Leaving CreateNewElement.\n");
->>>>>>> master
 #endif
 
   return (Element);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs