Changeset 679

Timestamp:

06/20/07 15:06:03 (18 months ago)

Author:

leo

Message:

Removed the copy keys command.

Location:

trunk

Files:

• common/keyboard.cpp (modified) (1 diff)
• common/project.cpp (modified) (1 diff)
• common/typedefs.h (modified) (1 diff)
• linux/menu.cpp (modified) (1 diff)
• linux/system.cpp (modified) (3 diffs)
• win/LeoCAD.rc (modified) (1 diff)
• win/Mainfrm.cpp (modified) (2 diffs)
• win/System.cpp (modified) (2 diffs)
• win/resource.h (modified) (1 diff)

trunk/common/keyboard.cpp

@@ -41 +41 @@
 //  { LC_PIECE_MINIFIG, "Minifig Wizard", 0, 0, 0 },
     { LC_PIECE_ARRAY, "Piece Array", 0, 0, 0 },
-//  { LC_PIECE_COPYKEYS, "", 0, 0, 0 },
     { LC_PIECE_GROUP, "Piece Group", LC_KEYMOD1_CONTROL, LC_KEY_G, 0 },
     { LC_PIECE_UNGROUP, "Piece Ungroup", LC_KEYMOD1_CONTROL, LC_KEY_U, 0 },

trunk/common/project.cpp

@@ -5072 +5072 @@
         } break;
 
-        case LC_PIECE_COPYKEYS:
-        {
-            /*
-            float move[3], rot[4];
-            Piece* pPiece;
-
-            for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsSelected())
-                {
-                    pPiece->CalculateSingleKey (m_ActiveModel->m_CurFrame, LC_PK_POSITION, move);
-                    pPiece->ChangeKey(m_ActiveModel->m_CurFrame, move, LC_PK_POSITION);
-                    pPiece->ChangeKey(m_ActiveModel->m_CurFrame, rot, LC_PK_ROTATION);
-                }
-
-            // TODO: cameras and lights
-
-            CalculateStep();
-            UpdateAllViews();
-            */
-        } break;
-
         case LC_PIECE_GROUP:
         {

trunk/common/typedefs.h

@@ -51 +51 @@
     LC_PIECE_MINIFIG,
     LC_PIECE_ARRAY,
-    LC_PIECE_COPYKEYS,
     LC_PIECE_GROUP,
     LC_PIECE_UNGROUP,

trunk/linux/menu.cpp

@@ -132 +132 @@
   create_menu_item (menu, "Ar_ray...", accel, GTK_SIGNAL_FUNC (OnCommandDirect),
             window, LC_PIECE_ARRAY, "menu_piece_array");
-  create_menu_item (menu, "_Copy Keys", accel, GTK_SIGNAL_FUNC (OnCommandDirect),
-            window, LC_PIECE_COPYKEYS, "menu_piece_copykeys");
   menu_separator (menu);
 

trunk/linux/system.cpp

@@ -471 +471 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(anim_toolbar.anim), bAnimation);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(anim_toolbar.keys), bAddKeys);
-  gpointer item = gtk_object_get_data (GTK_OBJECT (((GtkWidget*)(*main_window))), "menu_piece_copykeys");
-  gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), 
-      bAnimation ? "Copy Keys from Instructions" : "Copy Keys from Animation");
   ignore_commands = false;
 }
@@ -517 +514 @@
   gtk_widget_set_sensitive (main_toolbar.copy, (flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT)) != 0);
 
-  // delete, array, hide sel/unsel, unhideall, copykeys (menu)
+  // delete, array, hide sel/unsel, unhideall (menu)
   item = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (((GtkWidget*)(*main_window))), "menu_piece_delete"));
   gtk_widget_set_sensitive (item, (flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT)) != 0);
@@ -528 +525 @@
   item = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (((GtkWidget*)(*main_window))), "menu_piece_unhide_all"));
   gtk_widget_set_sensitive (item, (flags & LC_SEL_HIDDEN) != 0);
-  item = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (((GtkWidget*)(*main_window))), "menu_piece_copykeys"));
-  gtk_widget_set_sensitive (item, (flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT)) != 0);
 
   // groups (menu)

trunk/win/LeoCAD.rc

@@ -1873 +1873 @@
 STRINGTABLE 
 BEGIN
-    ID_PIECE_COPYKEYS       "Copy position and rotation"
-END
-
-STRINGTABLE 
-BEGIN
     ID_VIEW_CAMERAS_RESET   "Reset cameras to their original positions"
     ID_PREVIEW_ONEPAGE      "Show only one page\nOne Page"

trunk/win/Mainfrm.cpp

@@ -850 +850 @@
         } break;
 
-        case ID_PIECE_COPYKEYS: {
-            project->HandleCommand(LC_PIECE_COPYKEYS, 0);
-        } break;
-
         case ID_PIECE_GROUP: {
             project->HandleCommand(LC_PIECE_GROUP, 0);
@@ -1329 +1325 @@
         ID_PIECE_MINIFIGWIZARD,    // LC_PIECE_MINIFIG
         ID_PIECE_ARRAY,            // LC_PIECE_ARRAY
-        ID_PIECE_COPYKEYS,         // LC_PIECE_COPYKEYS
         ID_PIECE_GROUP,            // LC_PIECE_GROUP
         ID_PIECE_UNGROUP,          // LC_PIECE_UNGROUP

trunk/win/System.cpp

@@ -620 +620 @@
     pMenu->EnableMenuItem(ID_PIECE_DELETE, MF_BYCOMMAND | 
         (flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-    pMenu->EnableMenuItem(ID_PIECE_COPYKEYS, MF_BYCOMMAND | 
-        (flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
     pMenu->EnableMenuItem(ID_PIECE_ARRAY, MF_BYCOMMAND | 
         (flags & LC_SEL_PIECE ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
@@ -773 +771 @@
     pCtrl->EnableButton(ID_ANIMATOR_PLAY, bAnimation ? TRUE : FALSE);
     pCtrl->EnableButton(ID_ANIMATOR_STOP, FALSE);
-
-    // Menu
-    char* txt;
-    CMenu* pMenu = GetMainMenu(3);
-    UINT nState = pMenu->GetMenuState(ID_PIECE_COPYKEYS, MF_BYCOMMAND);
-    nState &= ~(MF_BITMAP|MF_OWNERDRAW|MF_SEPARATOR);
-
-    if (bAnimation)
-        txt = "Copy Keys from Instructions";
-    else
-        txt = "Copy Keys from Animation";
-    
-    pMenu->ModifyMenu(ID_PIECE_COPYKEYS, MF_BYCOMMAND |
-        MF_STRING | nState, ID_PIECE_COPYKEYS, txt);
 }
 

trunk/win/resource.h

@@ -618 +618 @@
 #define ID_EDITOR_ADD                   33036
 #define ID_EDITOR_FILE_NEW              33038
-#define ID_PIECE_COPYKEYS               33039
 #define ID_LIBDLG_GROUP_INSERT          33053
 #define ID_LIBDLG_GROUP_DELETE          33054