ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs and typos

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-07-30 13:32:46 -04:00
parent 9e5dcfcf78
commit 12fee35d78
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/lammps-gui/CMakeLists.txt
View File

@ -135,7 +135,7 @@ if(APPLE)
) )
# additional steps to populate the bundle tree and create the .dmg image file # additional steps to populate the bundle tree and create the .dmg image file
set(APP_CONTENTS ${CMAKE_BINARY_DIR}/lammps-gui.app/Contents) set(APP_CONTENTS ${CMAKE_BINARY_DIR}/lammps-gui.app/Contents)
set_custom_target(complete-bundle ALL add_custom_target(complete-bundle ALL
${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/bin ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/bin
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lmp ${APP_CONTENTS}/bin/ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lmp ${APP_CONTENTS}/bin/
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/msi2lmp ${APP_CONTENTS}/bin/ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/msi2lmp ${APP_CONTENTS}/bin/
@ -145,12 +145,13 @@ if(APPLE)
COMMAND ${CMAKE_COMMAND} -E create_symlink ../MacOS/lammps-gui ${APP_CONTENTS}/bin/lammps-gui COMMAND ${CMAKE_COMMAND} -E create_symlink ../MacOS/lammps-gui ${APP_CONTENTS}/bin/lammps-gui
COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/Resources COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/Resources
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/cmake/packaging/README.macos ${APP_CONTENTS}/Resources/README.txt COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/cmake/packaging/README.macos ${APP_CONTENTS}/Resources/README.txt
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/cmake/packaging/lammps.icns ${APP_CONTENTS}/Resources
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/cmake/packaging/LAMMPS_DMG_Background.png ${APP_CONTENTS}/Resources COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/cmake/packaging/LAMMPS_DMG_Background.png ${APP_CONTENTS}/Resources
COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/share/lammps COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/share/lammps
COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/share/lammps/man/man1 COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_CONTENTS}/share/lammps/man/man1
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${LAMMPS_DIR}/potentials ${APP_CONTENTS}/share/lammps/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LAMMPS_DIR}/potentials ${APP_CONTENTS}/share/lammps/potentials
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${LAMMPS_DIR}/bench ${APP_CONTENTS}/share/lammps/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LAMMPS_DIR}/bench ${APP_CONTENTS}/share/lammps/bench
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${LAMMPS_DIR}/tools/msi2lmp/frc_files ${APP_CONTENTS}/share/lammps/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LAMMPS_DIR}/tools/msi2lmp/frc_files ${APP_CONTENTS}/share/lammps/frc_files
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/doc/lammps.1 ${APP_CONTENTS}/share/lammps/man/man1/ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/doc/lammps.1 ${APP_CONTENTS}/share/lammps/man/man1/
COMMAND ${CMAKE_COMMAND} -E create_symlink lammps.1 ${APP_CONTENTS}/share/lammps/man/man1/lmp.1 COMMAND ${CMAKE_COMMAND} -E create_symlink lammps.1 ${APP_CONTENTS}/share/lammps/man/man1/lmp.1
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/doc/msi2lmp.1 ${APP_CONTENTS}/share/lammps/man/man1 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAMMPS_DIR}/doc/msi2lmp.1 ${APP_CONTENTS}/share/lammps/man/man1
@ -158,7 +159,7 @@ if(APPLE)
COMMENT "Copying additional files into macOS app bundle tree" COMMENT "Copying additional files into macOS app bundle tree"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
set_custom_target(build-dmg ALL add_custom_target(build-dmg ALL
COMMAND ${LAMMPS_DIR}/cmake/packaging/build-macos-dmg-with-gui.sh COMMAND ${LAMMPS_DIR}/cmake/packaging/build-macos-dmg-with-gui.sh
DEPENDS complete-bundle DEPENDS complete-bundle
COMMENT "Create Drag-n-Drop installer disk image from app bundle" COMMENT "Create Drag-n-Drop installer disk image from app bundle"

6
tools/lammps-gui/codeeditor.cpp
View File

@ -72,8 +72,8 @@ bool CodeEditor::canInsertFromMimeData(const QMimeData *source) const
void CodeEditor::dropEvent(QDropEvent *event) void CodeEditor::dropEvent(QDropEvent *event)
{ {
event->acceptProposedAction();
if (event->mimeData()->hasUrls()) { if (event->mimeData()->hasUrls()) {
event->accept();
auto file = event->mimeData()->urls()[0].url().remove("file://"); auto file = event->mimeData()->urls()[0].url().remove("file://");
auto gui = dynamic_cast<LammpsGui *>(parent()); auto gui = dynamic_cast<LammpsGui *>(parent());
if (gui) { if (gui) {
@ -81,10 +81,10 @@ void CodeEditor::dropEvent(QDropEvent *event)
gui->open_file(file); gui->open_file(file);
} }
} else if (event->mimeData()->hasText()) { } else if (event->mimeData()->hasText()) {
event->accept();
fprintf(stderr, "Drag - Drop for text block not yet implemented: text=%s\n", fprintf(stderr, "Drag - Drop for text block not yet implemented: text=%s\n",
event->mimeData()->text().toStdString().c_str()); event->mimeData()->text().toStdString().c_str());
} } else event->ignore();
QPlainTextEdit::dropEvent(event);
} }
void CodeEditor::resizeEvent(QResizeEvent *e) void CodeEditor::resizeEvent(QResizeEvent *e)