Image Editor: rotate and flip image (#385)

* Image Editor: rotate image * Image Editor: add rotate button with submenu * Image Editor: flip image Image Editor: fixed bug in Toolbar::AutoSize()
zenden2k · Nov 15, 2024 · 2ab24d5 · 2ab24d5
1 parent 1bb759f
commit 2ab24d5
Show file tree

Hide file tree

Showing 30 changed files with 516 additions and 235 deletions.
diff --git a/Lang/imageuploader.pot b/Lang/imageuploader.pot
diff --git a/Lang/locale/ru/LC_MESSAGES/imageuploader.po b/Lang/locale/ru/LC_MESSAGES/imageuploader.po
diff --git a/Source/Gui/CMakeLists.txt b/Source/Gui/CMakeLists.txt
@@ -341,7 +341,7 @@ if (IU_ENABLE_MEDIAINFO)
 endif()
 
 source_group(TREE "${CMAKE_SOURCE_DIR}" PREFIX "Sources" FILES ${SRC_LIST} ${HEADER_LIST})
-source_group("Resource Files" FILES ${RESOURCE_LIST})
+#source_group("Resource Files" FILES ${RESOURCE_LIST})
 
 add_executable(GUI WIN32  
     ${SRC_LIST} ${HEADER_LIST} ${RESOURCE_LIST}

diff --git a/Source/Gui/GuiTools.cpp b/Source/Gui/GuiTools.cpp
@@ -112,14 +112,14 @@ bool InsertMenu(HMENU hMenu, int pos, UINT id, LPCTSTR szTitle, HBITMAP bm){
     if(szTitle)
         MenuItem.fType = MFT_STRING;
     else MenuItem.fType = MFT_SEPARATOR;
-    MenuItem.fMask = MIIM_TYPE | MIIM_ID | MIIM_DATA;
+    MenuItem.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING;
     if(bm)
-        MenuItem.fMask |= MIIM_CHECKMARKS;
+        MenuItem.fMask |= MIIM_BITMAP;
     MenuItem.wID = id;
-    MenuItem.hbmpChecked = bm;
-    MenuItem.hbmpUnchecked = bm;
+    MenuItem.hbmpItem = bm;
     MenuItem.dwTypeData = const_cast<LPWSTR>(szTitle);
     MenuItem.cch = lstrlen(szTitle);
+
     return InsertMenuItem(hMenu, pos, TRUE, &MenuItem)!=0;
 }
 

diff --git a/Source/Image Uploader.rc b/Source/Image Uploader.rc
@@ -12,6 +12,30 @@
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
+/////////////////////////////////////////////////////////////////////////////
+// Neutral (Default) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
+#pragma code_page(1251)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// PNG
+//
+
+IDB_ICONROTATECW        PNG                     "res\\ImageEditor\\icon_rotate_cw.png"
+
+IDB_ICONROTATE          PNG                     "res\\ImageEditor\\icon_rotate.png"
+
+IDB_ICONROTATEFLIP      PNG                     "res\\ImageEditor\\icon_rotate_flip.png"
+
+IDB_ICONFLIPHORIZONTAL  PNG                     "res\\ImageEditor\\icon_flip_horizontal.png"
+
+#endif    // Neutral (Default) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
 /////////////////////////////////////////////////////////////////////////////
 // Russian (Russia) resources
 
@@ -1656,6 +1680,8 @@ IDB_ICONSEARCH          PNG                     "res\\ImageEditor\\icon_search.p
 
 IDB_ICONPRINT           PNG                     "res\\ImageEditor\\icon_print.png"
 
+IDB_ICONFLIPVERTICAL    PNG                     "res\\ImageEditor\\icon_flip_vertical.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //