Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 03:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode: Added "Show Image Preview" context menu option when editing an SVG file.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-03-13 12:43:45 -03:00
parent 51381a38db
commit e59269c858
5 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eepp/ui/uicodeeditor.cpp
View File

@@ -1001,11 +1001,11 @@ bool UICodeEditor::onCreateContextMenu( const Vector2i& position, const Uint32&
UIPopUpMenu* menu = UIPopUpMenu::New();
createDefaultContextMenuOptions( menu );
ContextMenuEvent event( this, menu, Event::OnCreateContextMenu, position, flags );
sendEvent( &event );
createDefaultContextMenuOptions( menu );
for ( auto& plugin : mPlugins )
if ( plugin->onCreateContextMenu( this, menu, position, flags ) )
return false;

4
src/eepp/ui/uitextinput.cpp
View File

@@ -869,11 +869,11 @@ bool UITextInput::onCreateContextMenu( const Vector2i& position, const Uint32& f
UIPopUpMenu* menu = UIPopUpMenu::New();
createDefaultContextMenuOptions( menu );
ContextMenuEvent event( this, menu, Event::OnCreateContextMenu, position, flags );
sendEvent( &event );
createDefaultContextMenuOptions( menu );
if ( menu->getCount() == 0 ) {
menu->close();
return false;

4
src/modules/eterm/src/eterm/ui/uiterminal.cpp
View File

@@ -543,11 +543,11 @@ bool UITerminal::onCreateContextMenu( const Vector2i& position, const Uint32& fl
UIPopUpMenu* menu = UIPopUpMenu::New();
createDefaultContextMenuOptions( menu );
ContextMenuEvent event( this, menu, Event::OnCreateContextMenu, position, flags );
sendEvent( &event );
createDefaultContextMenuOptions( menu );
if ( menu->getCount() == 0 ) {
menu->close();
return false;

95
src/tools/ecode/ecode.cpp
View File

@@ -1821,35 +1821,67 @@ void App::createDocAlert( UICodeEditor* editor ) {
} );
}
void App::loadImageFromMemory( const std::string& content ) {
UIImage* imageView = mImageLayout->findByType<UIImage>( UI_TYPE_IMAGE );
UILoader* loaderView = mImageLayout->findByType<UILoader>( UI_TYPE_LOADER );
if ( imageView ) {
mImageLayout->setEnabled( true )->setVisible( true );
loaderView->setVisible( true );
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
mThreadPool->run( [&, imageView, loaderView, content]() {
#endif
Texture* image =
TextureFactory::instance()->getTexture( TextureFactory::instance()->loadFromMemory(
reinterpret_cast<const unsigned char*>( content.c_str() ), content.size() ) );
if ( mImageLayout->isVisible() ) {
imageView->runOnMainThread( [imageView, loaderView, image]() {
imageView->setDrawable( image, true );
loaderView->setVisible( false );
} );
} else {
TextureFactory::instance()->remove( image );
imageView->setDrawable( nullptr );
loaderView->setVisible( false );
}
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
} );
#endif
}
}
void App::loadImageFromPath( const std::string& path ) {
UIImage* imageView = mImageLayout->findByType<UIImage>( UI_TYPE_IMAGE );
UILoader* loaderView = mImageLayout->findByType<UILoader>( UI_TYPE_LOADER );
if ( imageView ) {
mImageLayout->setEnabled( true )->setVisible( true );
loaderView->setVisible( true );
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
mThreadPool->run( [&, imageView, loaderView, path]() {
#endif
Texture* image = TextureFactory::instance()->getTexture(
TextureFactory::instance()->loadFromFile( path ) );
if ( mImageLayout->isVisible() ) {
imageView->runOnMainThread( [imageView, loaderView, image]() {
imageView->setDrawable( image, true );
loaderView->setVisible( false );
} );
} else {
TextureFactory::instance()->remove( image );
imageView->setDrawable( nullptr );
loaderView->setVisible( false );
}
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
} );
#endif
}
}
void App::loadFileFromPath(
const std::string& path, bool inNewTab, UICodeEditor* codeEditor,
std::function<void( UICodeEditor* codeEditor, const std::string& path )> onLoaded ) {
if ( Image::isImageExtension( path ) && Image::isImage( path ) &&
FileSystem::fileExtension( path ) != "svg" ) {
UIImage* imageView = mImageLayout->findByType<UIImage>( UI_TYPE_IMAGE );
UILoader* loaderView = mImageLayout->findByType<UILoader>( UI_TYPE_LOADER );
if ( imageView ) {
mImageLayout->setEnabled( true )->setVisible( true );
loaderView->setVisible( true );
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
mThreadPool->run( [&, imageView, loaderView, path]() {
#endif
Texture* image = TextureFactory::instance()->getTexture(
TextureFactory::instance()->loadFromFile( path ) );
if ( mImageLayout->isVisible() ) {
imageView->runOnMainThread( [imageView, loaderView, image]() {
imageView->setDrawable( image, true );
loaderView->setVisible( false );
} );
} else {
TextureFactory::instance()->remove( image );
imageView->setDrawable( nullptr );
loaderView->setVisible( false );
}
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
} );
#endif
}
loadImageFromPath( path );
} else {
UITab* tab = mSplitter->isDocumentOpen( path );
@@ -2060,7 +2092,7 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) {
editor->setSyntaxDefinition( editor->getDocument().getSyntaxDefinition() );
} );
auto docChanged = [&]( const Event* event ) {
auto docChanged = [this]( const Event* event ) {
const DocEvent* synEvent = static_cast<const DocEvent*>( event );
UICodeEditor* editor = event->getNode()->asType<UICodeEditor>();
UIIcon* icon = mUISceneNode->findIcon(
@@ -2073,6 +2105,19 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) {
UITab* tab = (UITab*)editor->getData();
tab->setIcon( icon->getSize( mMenuIconSize ) );
}
if ( editor->getDocument().getFileInfo().getExtension() == "svg" ) {
editor->getDocument().setCommand( "show-image-preview", [this, editor]() {
loadImageFromMemory( editor->getDocument().getText().toUtf8() );
} );
editor->addEventListener( Event::OnCreateContextMenu, [this]( const Event* event ) {
auto cevent = static_cast<const ContextMenuEvent*>( event );
cevent->getMenu()
->add( i18n( "show_image_preview", "Show Image Preview" ),
findIcon( "filetype-jpg" ) )
->setId( "show-image-preview" );
} );
}
};
editor->addEventListener( Event::OnDocumentLoaded, docChanged );

4
src/tools/ecode/ecode.hpp
View File

@@ -334,6 +334,10 @@ class App : public UICodeEditorSplitter::Client {
void setTheme( const std::string& path );
void loadImageFromPath( const std::string& path );
void loadImageFromMemory( const std::string& content );
protected:
std::vector<std::string> mArgs;
EE::Window::Window* mWindow{ nullptr };