Rename xournal-thumbnailer to xournalpp-thumbnailer

"xournal-thumbnailer" breaks tab completion for xournalpp
presentation
Bryan Tan 6 years ago committed by Bryan Tan
parent caa3a94792
commit f5b6b31cb9
  1. 2
      desktop/com.github.xournalpp.xournalpp.thumbnailer
  2. 2
      rpm/fedora/xournalpp.spec
  3. 2
      src/CMakeLists.txt
  4. 2
      src/util/XojPreviewExtractor.h
  5. 26
      src/xoj-preview-extractor/CMakeLists.txt
  6. 2
      src/xoj-preview-extractor/desktop-install.sh
  7. 2
      src/xoj-preview-extractor/xournalpp-thumbnailer-xoj.schemas
  8. 0
      src/xoj-preview-extractor/xournalpp-thumbnailer.cpp

@ -1,4 +1,4 @@
[Thumbnailer Entry]
Exec=xournal-thumbnailer %i %o
Exec=xournalpp-thumbnailer %i %o
MimeType=application/x-xoj;application/x-xojpp;application/x-xopp;

@ -94,7 +94,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n
%files -f %{name}.lang
%license LICENSE
%doc README.md AUTHORS
%{_bindir}/xournal-thumbnailer
%{_bindir}/xournalpp-thumbnailer
%{_bindir}/%{name}
%{_datadir}/applications/com.github.%{name}.%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg

@ -10,7 +10,7 @@ include_directories (
${xournalpp_INCLUDE_DIRS}
)
# Build xournal-thumbnailer as it doesn't need CXX_FLAGS from below
# Build xournalpp-thumbnailer as it doesn't need CXX_FLAGS from below
add_subdirectory (xoj-preview-extractor)
# Used for both util and xournalpp targets

@ -1,7 +1,7 @@
/*
* Xournal++
*
* Extracts a preview of an .xoj file, used by xournal-thumbnailer and xournalpp
* Extracts a preview of an .xoj file, used by xournalpp-thumbnailer and xournalpp
* Because of this xournal type checks cannot be used
*
* @author Xournal++ Team

@ -1,4 +1,4 @@
## xournal-thumbnailer executable ##
## xournalpp-thumbnailer executable ##
if (WIN32)
# Windows does not support the thumbniler like this
@ -7,8 +7,8 @@ endif ()
add_definitions (-DBUILD_THUMBNAILER)
add_executable (xournal-thumbnailer
xournal-thumbnailer.cpp
add_executable (xournalpp-thumbnailer
xournalpp-thumbnailer.cpp
"${PROJECT_SOURCE_DIR}/src/util/GzUtil.cpp"
"${PROJECT_SOURCE_DIR}/src/util/Path.cpp"
"${PROJECT_SOURCE_DIR}/src/util/PlaceholderString.cpp"
@ -24,40 +24,40 @@ else()
set(thumbnailer_GTK_LDFLAGS "${GTK_LDFLAGS}")
endif()
target_link_libraries (xournal-thumbnailer
target_link_libraries (xournalpp-thumbnailer
${ZLIB_LIBRARIES}
${Glib_LDFLAGS}
${ZIP_LDFLAGS}
${thumbnailer_GTK_LDFLAGS}
)
set (THUMBNAILER_BIN "xournal-thumbnailer")
set (THUMBNAILER_BIN "xournalpp-thumbnailer")
add_custom_command (TARGET xournal-thumbnailer POST_BUILD
add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
)
## Install ##
install (TARGETS xournal-thumbnailer
install (TARGETS xournalpp-thumbnailer
RUNTIME DESTINATION bin
COMPONENT xournal-thumbnailer
COMPONENT xournalpp-thumbnailer
)
## Desktop install targets ##
configure_file (xournal-thumbnailer-xoj.schemas xournal-thumbnailer-xoj.schemas COPYONLY)
configure_file (xournalpp-thumbnailer-xoj.schemas xournalpp-thumbnailer-xoj.schemas COPYONLY)
add_custom_target (desktop-install-thumbnailer
COMMAND "${PROJECT_SOURCE_DIR}/src/xoj-preview-extractor/desktop-install.sh" install
COMMENT "Install xournal-thumbnailer as xoj file thumbnail generator"
SOURCES xournal-thumbnailer xournal-thumbnailer-xoj.schemas desktop-install.sh
COMMENT "Install xournalpp-thumbnailer as xoj file thumbnail generator"
SOURCES xournalpp-thumbnailer xournalpp-thumbnailer-xoj.schemas desktop-install.sh
)
add_custom_target (desktop-uninstall-thumbnailer
COMMAND "${PROJECT_SOURCE_DIR}/src/xoj-preview-extractor/desktop-install.sh" uninstall
COMMENT "Uninstall xournal-thumbnailer as xoj file thumbnail generator"
SOURCES xournal-thumbnailer xournal-thumbnailer-xoj.schemas desktop-install.sh
COMMENT "Uninstall xournalpp-thumbnailer as xoj file thumbnail generator"
SOURCES xournalpp-thumbnailer xournalpp-thumbnailer-xoj.schemas desktop-install.sh
)

@ -1,4 +1,4 @@
#!/bin/bash
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-$1-rule xournal-thumbnailer-xoj.schemas
gconftool-2 --makefile-$1-rule xournalpp-thumbnailer-xoj.schemas

@ -18,7 +18,7 @@
<applyto>/desktop/gnome/thumbnailers/application@x-xoj/command</applyto>
<owner>xournalpp</owner>
<type>string</type>
<default>xournal-thumbnailer %i %o</default>
<default>xournalpp-thumbnailer %i %o</default>
<locale name="C">
<short></short>
<long></long>
Loading…
Cancel
Save