New part/ directory for okularpart sources from /, ui/, conf/

Source files are no longer separated by UI and non-UI and similar,
but only by their build target.

* ui/ -> part/
* Move all source files from conf/ to part/
* Keep config skeleton definitions in conf/, needed for the mobile target too
* Move editdrawingtooldialogtest.h from conf/autotests/ to autotests/
* ui/data/icons/ -> icons/
* Move /part.cpp, /part.rc and similar files to part/
* Adapt include paths in source files
* Adapt CMakeLists.txt files (in / and in subdirectories)
* Adapt /Messages.sh

CMakeLists.txt

@@ -163,14 +163,14 @@ if(BUILD_COVERAGE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
 endif()
 
-add_subdirectory( ui )
+add_subdirectory( icons ) # an own directory for multi-size icons retrieved by KIconThemeLoader
+add_subdirectory( part )
 if(BUILD_DESKTOP)
     add_subdirectory( shell )
 endif()
 add_subdirectory( generators )
 if(BUILD_TESTING)
    add_subdirectory( autotests )
-   add_subdirectory( conf/autotests )
 endif()
 
 if(KF5DocTools_FOUND)
@@ -230,7 +230,7 @@ qt5_add_resources(okularcore_SRCS
 )
 
 ki18n_wrap_ui(okularcore_SRCS
-   conf/textdocumentsettings.ui
+   part/textdocumentsettings.ui
 )
 
 install( FILES
@@ -351,90 +351,86 @@ install(FILES core/okularGenerator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYP
 
 if(BUILD_DESKTOP)
   # okularpart
-  set(okularpart_conf_SRCS
-    conf/preferencesdialog.cpp
-    conf/dlgaccessibility.cpp
-    conf/dlgdebug.cpp
-    conf/dlgeditor.cpp
-    conf/dlggeneral.cpp
-    conf/dlgannotations.cpp
-    conf/dlgperformance.cpp
-    conf/dlgpresentation.cpp
-    conf/editannottooldialog.cpp
-    conf/editdrawingtooldialog.cpp
-    conf/widgetannottools.cpp
-    conf/widgetconfigurationtoolsbase.cpp
-    conf/widgetdrawingtools.cpp
-  )
-
   set(okularpart_SRCS
-    ${okularpart_conf_SRCS}
+    part/preferencesdialog.cpp
-    part.cpp
+    part/dlgaccessibility.cpp
-    xmlgui_helper.cpp
+    part/dlgdebug.cpp
-    extensions.cpp
+    part/dlgeditor.cpp
-    ui/embeddedfilesdialog.cpp
+    part/dlggeneral.cpp
-    ui/annotationactionhandler.cpp
+    part/dlgannotations.cpp
-    ui/annotwindow.cpp
+    part/dlgperformance.cpp
-    ui/annotationmodel.cpp
+    part/dlgpresentation.cpp
-    ui/annotationpopup.cpp
+    part/editannottooldialog.cpp
-    ui/annotationpropertiesdialog.cpp
+    part/editdrawingtooldialog.cpp
-    ui/annotationproxymodels.cpp
+    part/widgetannottools.cpp
-    ui/annotationtools.cpp
+    part/widgetconfigurationtoolsbase.cpp
-    ui/annotationwidgets.cpp
+    part/widgetdrawingtools.cpp
-    ui/bookmarklist.cpp
+    part/part.cpp
-    ui/certificateviewer.cpp
+    part/xmlgui_helper.cpp
-    ui/debug_ui.cpp
+    part/extensions.cpp
-    ui/drawingtoolactions.cpp
+    part/embeddedfilesdialog.cpp
-    ui/fileprinterpreview.cpp
+    part/annotationactionhandler.cpp
-    ui/findbar.cpp
+    part/annotwindow.cpp
-    ui/formwidgets.cpp
+    part/annotationmodel.cpp
-    ui/guiutils.cpp
+    part/annotationpopup.cpp
-    ui/ktreeviewsearchline.cpp
+    part/annotationpropertiesdialog.cpp
-    ui/latexrenderer.cpp
+    part/annotationproxymodels.cpp
-    ui/minibar.cpp
+    part/annotationtools.cpp
-    ui/okmenutitle.cpp
+    part/annotationwidgets.cpp
-    ui/pageitemdelegate.cpp
+    part/bookmarklist.cpp
-    ui/pagepainter.cpp
+    part/certificateviewer.cpp
-    ui/pagesizelabel.cpp
+    part/debug_ui.cpp
-    ui/pageviewannotator.cpp
+    part/drawingtoolactions.cpp
-    ui/pageviewmouseannotation.cpp
+    part/fileprinterpreview.cpp
-    ui/pageview.cpp
+    part/findbar.cpp
-    ui/magnifierview.cpp
+    part/formwidgets.cpp
-    ui/pageviewutils.cpp
+    part/guiutils.cpp
-    ui/presentationsearchbar.cpp
+    part/ktreeviewsearchline.cpp
-    ui/presentationwidget.cpp
+    part/latexrenderer.cpp
-    ui/propertiesdialog.cpp
+    part/minibar.cpp
-    ui/revisionviewer.cpp
+    part/okmenutitle.cpp
-    ui/searchlineedit.cpp
+    part/pageitemdelegate.cpp
-    ui/searchwidget.cpp
+    part/pagepainter.cpp
-    ui/sidebar.cpp
+    part/pagesizelabel.cpp
-    ui/side_reviews.cpp
+    part/pageviewannotator.cpp
-    ui/snapshottaker.cpp
+    part/pageviewmouseannotation.cpp
-    ui/thumbnaillist.cpp
+    part/pageview.cpp
-    ui/toc.cpp
+    part/magnifierview.cpp
-    ui/tocmodel.cpp
+    part/pageviewutils.cpp
-    ui/toggleactionmenu.cpp
+    part/presentationsearchbar.cpp
-    ui/videowidget.cpp
+    part/presentationwidget.cpp
-    ui/layers.cpp
+    part/propertiesdialog.cpp
-    ui/signatureguiutils.cpp
+    part/revisionviewer.cpp
-    ui/signaturepropertiesdialog.cpp
+    part/searchlineedit.cpp
-    ui/signaturemodel.cpp
+    part/searchwidget.cpp
-    ui/signaturepanel.cpp
+    part/sidebar.cpp
+    part/side_reviews.cpp
+    part/snapshottaker.cpp
+    part/thumbnaillist.cpp
+    part/toc.cpp
+    part/tocmodel.cpp
+    part/toggleactionmenu.cpp
+    part/videowidget.cpp
+    part/layers.cpp
+    part/signatureguiutils.cpp
+    part/signaturepropertiesdialog.cpp
+    part/signaturemodel.cpp
+    part/signaturepanel.cpp
   )
 endif()
 
 if (Qt5TextToSpeech_FOUND)
    set(okularpart_SRCS ${okularpart_SRCS}
-      ui/tts.cpp)
+      part/tts.cpp)
 endif()
 
 ki18n_wrap_ui(okularpart_SRCS
-   conf/dlgaccessibilitybase.ui
+   part/dlgaccessibilitybase.ui
-   conf/dlgeditorbase.ui
+   part/dlgeditorbase.ui
-   conf/dlggeneralbase.ui
+   part/dlggeneralbase.ui
-   conf/dlgannotationsbase.ui
+   part/dlgannotationsbase.ui
-   conf/dlgperformancebase.ui
+   part/dlgperformancebase.ui
-   conf/dlgpresentationbase.ui
+   part/dlgpresentationbase.ui
 )
 
 kconfig_add_kcfg_files(okularpart_SRCS GENERATE_MOC conf/settings.kcfgc)
@@ -480,7 +476,7 @@ install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
 
 install( FILES okular_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-install( FILES part.rc part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
+install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
 
 if (${ECM_VERSION} STRGREATER "5.58.0")
     install(FILES okular.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})

Messages.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 $EXTRACTRC *.rc */*.rc >> rc.cpp || exit 11
-$EXTRACTRC $(find conf/ -name "*.ui") $(find core/ -name "*.ui") $(find ui/ -name "*.ui") $(ls . | grep -E '\.ui') >> rc.cpp || exit 12
+$EXTRACTRC $(find conf/ -name "*.ui") $(find core/ -name "*.ui") $(find part/ -name "*.ui") $(ls . | grep -E '\.ui') >> rc.cpp || exit 12
-$EXTRACTATTR --attr=tool,name ui/data/drawingtools.xml >> rc.cpp || exit 13
+$EXTRACTATTR --attr=tool,name part/data/drawingtools.xml >> rc.cpp || exit 13
-$XGETTEXT $(find conf/ -name "*.cpp" -o -name "*.h") $(find core/ -name "*.cpp" -o -name "*.h") $(find ui/ -name "*.cpp" -o -name "*.h") $(find shell/ -name "*.cpp" -o -name "*.h") $(ls . | grep -E '\.cpp$') $(ls . | grep -E '\.h$') -o $podir/okular.pot
+$XGETTEXT $(find conf/ -name "*.cpp" -o -name "*.h") $(find core/ -name "*.cpp" -o -name "*.h") $(find part/ -name "*.cpp" -o -name "*.h") $(find shell/ -name "*.cpp" -o -name "*.h") $(ls . | grep -E '\.cpp$') $(ls . | grep -E '\.h$') -o $podir/okular.pot

autotests/CMakeLists.txt

@@ -2,6 +2,24 @@ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
 
+macro(add_conf_unittest _source)
+  set(_test ${_source} ../part/editdrawingtooldialog.cpp)
+  get_filename_component(_name ${_source} NAME_WE)
+  add_executable( ${_name} ${_test} )
+  add_test( NAME ${_name} COMMAND ${_name} )
+  ecm_mark_as_test(${_name})
+  target_link_libraries( ${_name}
+    Qt5::Test
+    Qt5::Widgets
+    Qt5::Xml
+    KF5::I18n
+    KF5::Completion
+    KF5::WidgetsAddons
+  )
+endmacro ()
+
+add_conf_unittest(editdrawingtooldialogtest.cpp)
+
 ecm_add_test(shelltest.cpp ../shell/shellutils.cpp
     TEST_NAME "shelltest"
     LINK_LIBRARIES Qt5::Test okularcore

autotests/annotationtoolbartest.cpp

@@ -20,12 +20,12 @@
 #include <KSelectAction>
 
 #include "../core/page.h"
-#include "../part.h"
+#include "../part/pageview.h"
+#include "../part/part.h"
 #include "../settings.h"
 #include "../shell/okular_main.h"
 #include "../shell/shell.h"
 #include "../shell/shellutils.h"
-#include "../ui/pageview.h"
 #include "closedialoghelper.h"
 
 namespace Okular

autotests/closedialoghelper.h

@@ -1,10 +1,11 @@
 #ifndef CLOSEDIALOGHELPER_H
 #define CLOSEDIALOGHELPER_H
 
-#include <../part.h>
 #include <QDialogButtonBox>
 #include <QObject>
 
+#include "../part/part.h"
+
 namespace TestingUtils
 {
 /*

autotests/editdrawingtooldialogtest.cpp

@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include "editdrawingtooldialogtest.h"
-#include "../editdrawingtooldialog.h"
+#include "../part/editdrawingtooldialog.h"
 
 #include <KColorButton>
 #include <KLineEdit>

autotests/mainshelltest.cpp

@@ -21,13 +21,13 @@
 #include <qwidget.h>
 
 #include "../core/document_p.h"
-#include "../part.h"
+#include "../part/findbar.h"
+#include "../part/part.h"
+#include "../part/presentationwidget.h"
 #include "../settings.h"
 #include "../shell/okular_main.h"
 #include "../shell/shell.h"
 #include "../shell/shellutils.h"
-#include "../ui/findbar.h"
-#include "../ui/presentationwidget.h"
 #include "closedialoghelper.h"
 
 #include <sys/types.h>

autotests/parttest.cpp

@@ -17,13 +17,13 @@
 #include "../core/annotations.h"
 #include "../core/form.h"
 #include "../core/page.h"
-#include "../part.h"
+#include "../part/pageview.h"
+#include "../part/part.h"
+#include "../part/presentationwidget.h"
+#include "../part/sidebar.h"
+#include "../part/toc.h"
+#include "../part/toggleactionmenu.h"
 #include "../settings.h"
-#include "../ui/pageview.h"
-#include "../ui/presentationwidget.h"
-#include "../ui/sidebar.h"
-#include "../ui/toc.h"
-#include "../ui/toggleactionmenu.h"
 #include "closedialoghelper.h"
 
 #include "../generators/poppler/config-okular-poppler.h"

autotests/urldetecttest.cpp

@@ -9,7 +9,7 @@
 
 #include <QtTest>
 
-#include "../ui/url_utils.h"
+#include "../part/url_utils.h"
 
 namespace Okular
 {

conf/autotests/CMakeLists.txt

@@ -1,18 +0,0 @@
-macro(add_conf_unittest _source)
-  set(_test ${_source} ../editdrawingtooldialog.cpp)
-  get_filename_component(_name ${_source} NAME_WE)
-  add_executable( ${_name} ${_test} )
-  add_test( NAME ${_name} COMMAND ${_name} )
-  ecm_mark_as_test(${_name})
-  target_link_libraries( ${_name}
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::Xml
-    KF5::I18n
-    KF5::Completion
-    KF5::WidgetsAddons
-  )
-endmacro ()
-
-add_conf_unittest(editdrawingtooldialogtest.cpp)
-

generators/kimgio/CMakeLists.txt

@@ -14,7 +14,7 @@ target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
 
 if(BUILD_TESTING)
     add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp )
     ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
     target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
 endif()

generators/kimgio/tests/kimgiotest.cpp

@@ -12,7 +12,7 @@
 
 #include <core/observer.h>
 #include <core/page.h>
-#include <ui/pagepainter.h>
+#include <part/pagepainter.h>
 
 #include <QtTest>
 

metainfo.yaml

@@ -11,6 +11,6 @@ public_source_dirs:
         - core
         - interfaces
         - Mainpage.dox 
-logo: ui/data/icons/128-apps-okular.png
+logo: icons/128-apps-okular.png
 irc: okular
 mailinglist: okular-devel

mobile/components/CMakeLists.txt

@@ -10,10 +10,10 @@ include_directories(
 
 set(okular_SRCS
     okularplugin.cpp
-    ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp
+    ${CMAKE_SOURCE_DIR}/part/guiutils.cpp
-    ${CMAKE_SOURCE_DIR}/ui/tocmodel.cpp
+    ${CMAKE_SOURCE_DIR}/part/tocmodel.cpp
-    ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp
+    ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp
-    ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp
+    ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp
     pageitem.cpp
     documentitem.cpp
     thumbnailitem.cpp

mobile/components/documentitem.cpp

@@ -31,7 +31,7 @@
 #include <core/document_p.h>
 #include <core/page.h>
 
-#include "ui/tocmodel.h"
+#include "part/tocmodel.h"
 
 DocumentItem::DocumentItem(QObject *parent)
     : QObject(parent)

mobile/components/pageitem.cpp

@@ -30,9 +30,9 @@
 #include <core/generator.h>
 #include <core/page.h>
 
+#include "part/pagepainter.h"
+#include "part/priorities.h"
 #include "settings.h"
-#include "ui/pagepainter.h"
-#include "ui/priorities.h"
 
 #define REDRAW_TIMEOUT 250
 

part/annotationmodel.cpp

@@ -23,7 +23,7 @@
 #include "core/document.h"
 #include "core/observer.h"
 #include "core/page.h"
-#include "ui/guiutils.h"
+#include "guiutils.h"
 
 struct AnnItem {
     AnnItem();

part/data/CMakeLists.txt

@@ -1,6 +1,3 @@
-# an own directory for multi-size icons retrieved by KIconThemeLoader
-add_subdirectory(icons)
-
 # install annotator xml tools description
 install(FILES
    tools.xml