diff options
| author | Mavridis Philippe <[email protected]> | 2021-06-25 22:12:38 +0300 |
|---|---|---|
| committer | Mavridis Philippe <[email protected]> | 2021-06-25 22:12:38 +0300 |
| commit | e62af3a1aec27983c652f01d6d037b07d6e738bb (patch) | |
| tree | 1d3b3e9382abae5d25a4ddce9c876b96594edf72 | |
| parent | 1926f4197c5314bb14c5894c4ccf8dc92ec270dd (diff) | |
| download | twin-style-suse2-e62af3a1aec27983c652f01d6d037b07d6e738bb.tar.gz twin-style-suse2-e62af3a1aec27983c652f01d6d037b07d6e738bb.zip | |
Added rule for extra/ directory and set pics destination to separate subdirectory.
Signed-off-by: Mavridis Philippe <[email protected]>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extra/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/config/config.cpp | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7d781e..6e82a73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### directories add_subdirectory( src ) +add_subdirectory( extra ) ##### write configure files diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt new file mode 100644 index 0000000..0860b02 --- /dev/null +++ b/extra/CMakeLists.txt @@ -0,0 +1,6 @@ +file(GLOB PICS ${CMAKE_CURRENT_SOURCE_DIR}/*.png) + +install( + FILES ${PICS} + DESTINATION ${DATA_INSTALL_DIR}/twin/pics/SUSE2 +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50a6b1d..e214de2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ install( install( FILES titlebar_decor.png - DESTINATION ${DATA_INSTALL_DIR}/twin/pics + DESTINATION ${DATA_INSTALL_DIR}/twin/pics/SUSE2 ) install( diff --git a/src/config/config.cpp b/src/config/config.cpp index 6e47ff9..215c230 100644 --- a/src/config/config.cpp +++ b/src/config/config.cpp @@ -237,7 +237,7 @@ void SUSE2Config::defaults() m_dialog->titleBarLogo->setChecked(false); m_dialog->titleBarLogoOffset->setValue(3); - titlebarLogoURL = locate("data", "twin/pics/titlebar_decor.png"); + titlebarLogoURL = locate("data", "twin/pics/SUSE2/titlebar_decor.png"); TQImage tmpLogo(titlebarLogoURL); m_dialog->logoImage->setPixmap(TQPixmap(tmpLogo.smoothScale(120, 20, TQImage::ScaleMin))); } |