Changeset 623 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp
- Timestamp:
- May 21, 2008, 11:02:07 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/ProjectControl.cpp
r621 r623 191 191 } 192 192 } 193 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){194 if(projectInfo.res .pIconResInfo[i].hTreeItem==hTreeItem){195 lstrcpy(temporary,projectInfo.res.pIconResInfo[i].path);196 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );197 NewIconEditWindow(temporary);193 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 194 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 195 NewIconEditWindow( 196 projectInfo.GetWorkDir().GetFullPath( projectInfo.resourceManager.iconResources[i].filepath ).c_str() 197 ); 198 198 break; 199 199 } … … 202 202 case IDM_MATERIALTREE_DELETE: 203 203 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 204 for(i=0;i<projectInfo.res .NumberOfCursorRes;i++){205 if(projectInfo.res .pCursorResInfo[i].hTreeItem==hTreeItem){204 for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){ 205 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 206 206 207 207 //"%s カーソルをプロジェクトから削除します。よろしいですか?" 208 sprintf(str,STRING_PJ_CHECK_DELETECURSOR,projectInfo.res .pCursorResInfo[i].IdName);208 sprintf(str,STRING_PJ_CHECK_DELETECURSOR,projectInfo.resourceManager.cursorResources[i].idName.c_str()); 209 209 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 210 210 … … 213 213 } 214 214 } 215 for(i=0;i<projectInfo.res .NumberOfBitmapRes;i++){216 if(projectInfo.res .pBitmapResInfo[i].hTreeItem==hTreeItem){215 for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){ 216 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 217 217 218 218 //"%s ビットマップをプロジェクトから削除します。よろしいですか?" 219 sprintf(str,STRING_PJ_CHECK_DELETEBITMAP,projectInfo.res .pBitmapResInfo[i].IdName);219 sprintf(str,STRING_PJ_CHECK_DELETEBITMAP,projectInfo.resourceManager.bitmapResources[i].idName.c_str()); 220 220 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 221 221 … … 224 224 } 225 225 } 226 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){227 if(projectInfo.res .pIconResInfo[i].hTreeItem==hTreeItem){226 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 227 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 228 228 229 229 //"%s アイコンをプロジェクトから削除します。よろしいですか?" 230 sprintf(str,STRING_PJ_CHECK_DELETEICON,projectInfo.res .pIconResInfo[i].IdName);230 sprintf(str,STRING_PJ_CHECK_DELETEICON,projectInfo.resourceManager.iconResources[i].idName.c_str()); 231 231 if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break; 232 232 … … 261 261 extern char NewIdName[MAX_PATH]; 262 262 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 263 for(i=0;i<projectInfo.res .NumberOfCursorRes;i++){264 if(projectInfo.res .pCursorResInfo[i].hTreeItem==hTreeItem){263 for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){ 264 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 265 265 Project_Cursor_RenameID(i); 266 266 break; 267 267 } 268 268 } 269 for(i=0;i<projectInfo.res .NumberOfBitmapRes;i++){270 if(projectInfo.res .pBitmapResInfo[i].hTreeItem==hTreeItem){269 for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){ 270 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 271 271 Project_Bitmap_RenameID(i); 272 272 break; 273 273 } 274 274 } 275 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){276 if(projectInfo.res .pIconResInfo[i].hTreeItem==hTreeItem){275 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 276 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 277 277 Project_Icon_RenameID(i); 278 278 } … … 313 313 break; 314 314 case IDM_MATERIALTREE_ICON_SETMAIN: 315 RESITEMINFO TempIconResInfo;316 315 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 317 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){318 if(projectInfo.res .pIconResInfo[i].hTreeItem==hTreeItem){316 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 317 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 319 318 if(i==0) break; 320 319 321 TempIconResInfo=projectInfo.res.pIconResInfo[i]; 322 for(;i>0;i--) 323 projectInfo.res.pIconResInfo[i]=projectInfo.res.pIconResInfo[i-1]; 324 projectInfo.res.pIconResInfo[0]=TempIconResInfo; 325 326 tvItem.hItem=projectInfo.res.pIconResInfo[1].hTreeItem; 320 ActiveBasic::Common::ResourceItem tempItem = projectInfo.resourceManager.iconResources[i]; 321 Jenga::Common::EraseVectorItem<ActiveBasic::Common::ResourceItems>( projectInfo.resourceManager.iconResources, i ); 322 projectInfo.resourceManager.iconResources.insert( projectInfo.resourceManager.iconResources.begin(), tempItem ); 323 324 tvItem.hItem=projectInfo.resourceManager.iconResources[1].hTreeItem; 327 325 tvItem.mask=TVIF_TEXT; 328 tvItem.pszText=projectInfo.res.pIconResInfo[1].IdName; 329 tvItem.cchTextMax=lstrlen(projectInfo.res.pIconResInfo[1].IdName)+1; 326 lstrcpy( temporary, projectInfo.resourceManager.iconResources[1].idName.c_str() ); 327 tvItem.pszText = temporary; 328 tvItem.cchTextMax=lstrlen(temporary)+1; 330 329 TreeView_SetItem(hMaterialTreeView,&tvItem); 331 330 332 tvItem.hItem=projectInfo.res .pIconResInfo[0].hTreeItem;331 tvItem.hItem=projectInfo.resourceManager.iconResources[0].hTreeItem; 333 332 tvItem.mask=TVIF_TEXT; 334 sprintf(temporary,"%s (Main)",projectInfo.res .pIconResInfo[0].IdName);333 sprintf(temporary,"%s (Main)",projectInfo.resourceManager.iconResources[0].idName.c_str()); 335 334 tvItem.pszText=temporary; 336 335 tvItem.cchTextMax=lstrlen(temporary)+1; … … 1142 1141 tv.item.pszText=temporary; 1143 1142 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1144 projectInfo.res.hCursorTreeItem=tv.hParent;1145 for(i=0;i<projectInfo.res .NumberOfCursorRes;i++){1143 hCursorTreeItemForProjectView = tv.hParent; 1144 for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){ 1146 1145 tv.item.iImage=6; 1147 1146 tv.item.iSelectedImage=6; 1148 tv.item.pszText=projectInfo.res.pCursorResInfo[i].IdName; 1149 projectInfo.res.pCursorResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1147 lstrcpy( temporary, projectInfo.resourceManager.cursorResources[i].idName.c_str() ); 1148 tv.item.pszText=temporary; 1149 projectInfo.resourceManager.cursorResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1150 1150 } 1151 1151 … … 1157 1157 tv.item.pszText=temporary; 1158 1158 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1159 projectInfo.res.hBitmapTreeItem=tv.hParent;1160 for(i=0;i<projectInfo.res .NumberOfBitmapRes;i++){1159 hBitmapTreeItemForProjectView = tv.hParent; 1160 for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){ 1161 1161 tv.item.iImage=5; 1162 1162 tv.item.iSelectedImage=5; 1163 tv.item.pszText=projectInfo.res.pBitmapResInfo[i].IdName; 1164 projectInfo.res.pBitmapResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1163 lstrcpy( temporary, projectInfo.resourceManager.bitmapResources[i].idName.c_str() ); 1164 tv.item.pszText=temporary; 1165 projectInfo.resourceManager.bitmapResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1165 1166 } 1166 1167 … … 1172 1173 tv.item.pszText=temporary; 1173 1174 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1174 projectInfo.res.hIconTreeItem=tv.hParent;1175 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){1175 hIconTreeItemForProjectView = tv.hParent; 1176 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1176 1177 tv.item.iImage=4; 1177 1178 tv.item.iSelectedImage=4; 1178 1179 if(i==0){ 1179 sprintf(temporary,"%s (Main)",projectInfo.res.pIconResInfo[i].IdName); 1180 tv.item.pszText=temporary; 1180 sprintf(temporary,"%s (Main)",projectInfo.resourceManager.iconResources[i].idName.c_str()); 1181 1181 } 1182 else tv.item.pszText=projectInfo.res.pIconResInfo[i].IdName; 1183 projectInfo.res.pIconResInfo[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1182 else 1183 { 1184 sprintf(temporary,"%s",projectInfo.resourceManager.iconResources[i].idName.c_str()); 1185 } 1186 tv.item.pszText=temporary; 1187 projectInfo.resourceManager.iconResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv); 1184 1188 } 1185 1189 … … 1353 1357 } 1354 1358 else if(lstrcmpi(temporary,"icon")==0){ 1355 for(i3=0;i3<projectInfo.res .NumberOfIconRes;i3++){1356 if(lstrcmpi(projectInfo.res .pIconResInfo[i3].path,temp2)==0){1359 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1360 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1357 1361 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1358 1362 break; … … 1474 1478 } 1475 1479 else if(lstrcmpi(temporary,"icon")==0){ 1476 for(i3=0;i3<projectInfo.res .NumberOfIconRes;i3++){1477 if(lstrcmpi(projectInfo.res .pIconResInfo[i3].path,temp2)==0){1480 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1481 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1478 1482 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1479 1483 break; … … 1593 1597 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1594 1598 if(MdiInfo[WndNum].MdiIconEditInfo->bModify){ 1595 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){1596 lstrcpy(temporary,projectInfo.res .pIconResInfo[i].path);1599 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1600 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1597 1601 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1598 1602 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1; … … 1686 1690 } 1687 1691 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1688 for(i=0;i<projectInfo.res .NumberOfIconRes;i++){1689 lstrcpy(temporary,projectInfo.res .pIconResInfo[i].path);1692 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1693 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1690 1694 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1691 1695 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 1692 sprintf(buffer+i2,"icon,%s\r\n",projectInfo.res .pIconResInfo[i].path);1696 sprintf(buffer+i2,"icon,%s\r\n",projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1693 1697 i2+=lstrlen(buffer+i2); 1694 1698 break;
Note:
See TracChangeset
for help on using the changeset viewer.