diff --git a/src/CHANGELOG b/CHANGELOG similarity index 100% rename from src/CHANGELOG rename to CHANGELOG diff --git a/CMakeLists.txt b/CMakeLists.txt index 00718bc..938bb69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,19 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### directories add_subdirectory( src ) +add_subdirectory( icons ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) ##### write configure files configure_file( config.h.cmake config.h @ONLY ) + + +##### other data + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) diff --git a/src/Doxyfile b/Doxyfile similarity index 100% rename from src/Doxyfile rename to Doxyfile diff --git a/Makefile.am b/Makefile.am index 2369f25..0aa05e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 include admin/deps.am include admin/Doxyfile.am + +xdg_apps_DATA = knetstats.desktop + SUBDIRS=$(TOPSUBDIRS) diff --git a/Makefile.am.in b/Makefile.am.in index e46b27c..628b551 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -2,3 +2,6 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 include admin/deps.am include admin/Doxyfile.am + +xdg_apps_DATA = knetstats.desktop + diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/src/doc/CMakeLists.txt b/doc/CMakeLists.txt similarity index 100% rename from src/doc/CMakeLists.txt rename to doc/CMakeLists.txt diff --git a/src/COPYING-DOCS b/doc/COPYING-DOCS similarity index 100% rename from src/COPYING-DOCS rename to doc/COPYING-DOCS diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..8bd0272 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = en man diff --git a/src/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt similarity index 100% rename from src/doc/en/CMakeLists.txt rename to doc/en/CMakeLists.txt diff --git a/src/doc/en/Makefile.am b/doc/en/Makefile.am similarity index 100% rename from src/doc/en/Makefile.am rename to doc/en/Makefile.am diff --git a/src/doc/en/index.docbook b/doc/en/index.docbook similarity index 100% rename from src/doc/en/index.docbook rename to doc/en/index.docbook diff --git a/src/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt similarity index 100% rename from src/doc/man/CMakeLists.txt rename to doc/man/CMakeLists.txt diff --git a/src/doc/man/Makefile.am b/doc/man/Makefile.am similarity index 50% rename from src/doc/man/Makefile.am rename to doc/man/Makefile.am index 514c585..5894f60 100644 --- a/src/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,4 +1,3 @@ -man_MANS = manpage.xml +man_MANS = knetstats.1 EXTRA_DIST = $(man_MANS) - diff --git a/src/doc/man/knetstats.1 b/doc/man/knetstats.1 similarity index 100% rename from src/doc/man/knetstats.1 rename to doc/man/knetstats.1 diff --git a/src/doc/man/manpage.xml b/doc/man/manpage.xml similarity index 100% rename from src/doc/man/manpage.xml rename to doc/man/manpage.xml diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt new file mode 100644 index 0000000..33ca26f --- /dev/null +++ b/icons/CMakeLists.txt @@ -0,0 +1,3 @@ +##### icons + +tde_install_icons( ${PROJECT_NAME} ) diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 0000000..9860d39 --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1 @@ +KDE_ICON = knetstats diff --git a/src/hi16-app-knetstats.png b/icons/hi16-app-knetstats.png similarity index 100% rename from src/hi16-app-knetstats.png rename to icons/hi16-app-knetstats.png diff --git a/src/hi32-app-knetstats.png b/icons/hi32-app-knetstats.png similarity index 100% rename from src/hi32-app-knetstats.png rename to icons/hi32-app-knetstats.png diff --git a/src/hi48-app-knetstats.png b/icons/hi48-app-knetstats.png similarity index 100% rename from src/hi48-app-knetstats.png rename to icons/hi48-app-knetstats.png diff --git a/src/knetstats.desktop b/knetstats.desktop similarity index 100% rename from src/knetstats.desktop rename to knetstats.desktop diff --git a/src/.svnignore b/src/.svnignore deleted file mode 100644 index 896d115..0000000 --- a/src/.svnignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -*Makefile.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 93766be..4b74eac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,38 @@ -add_subdirectory( src ) -tde_conditional_add_subdirectory( BUILD_DOC doc ) +add_subdirectory( pics ) +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) -##### icons +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) -tde_install_icons( ${PROJECT_NAME} ) +##### knetstats (executable) -##### other data +tde_add_executable( ${PROJECT_NAME} AUTOMOC -install( - FILES ${PROJECT_NAME}.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + SOURCES + configurebase.ui + configure.cpp + statisticsbase.ui + main.cpp + knetstats.cpp + knetstatsview.cpp + statistics.cpp + chart.cpp + interface.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeui-shared + + DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/src/Makefile.am b/src/Makefile.am index 66b3066..2875827 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,22 @@ -SUBDIRS = src doc +INCLUDES = $(all_includes) -xdg_apps_DATA = knetstats.desktop +SUBDIRS = pics + +bin_PROGRAMS = knetstats + +knetstats_SOURCES = configurebase.ui configure.cpp statisticsbase.ui main.cpp \ + knetstats.cpp knetstatsview.cpp statistics.cpp chart.cpp interface.cpp +knetstats_LDADD = $(LIB_TDEUI) +knetstats_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +METASOURCES = configure.moc knetstats.moc knetstatsview.moc statistics.moc + +# these are the headers for your project +noinst_HEADERS = chart.h configure.h knetstats.h knetstatsview.h statistics.h \ + interface.h + +messages: rc.cpp + $(EXTRACTRC) *.ui >> rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/knetstats.pot + +KDE_OPTIONS = nofinal -KDE_ICON = knetstats diff --git a/src/src/chart.cpp b/src/chart.cpp similarity index 100% rename from src/src/chart.cpp rename to src/chart.cpp diff --git a/src/src/chart.h b/src/chart.h similarity index 100% rename from src/src/chart.h rename to src/chart.h diff --git a/src/src/configure.cpp b/src/configure.cpp similarity index 100% rename from src/src/configure.cpp rename to src/configure.cpp diff --git a/src/src/configure.h b/src/configure.h similarity index 100% rename from src/src/configure.h rename to src/configure.h diff --git a/src/src/configurebase.ui b/src/configurebase.ui similarity index 100% rename from src/src/configurebase.ui rename to src/configurebase.ui diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am deleted file mode 100644 index 81fee21..0000000 --- a/src/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = en diff --git a/src/src/interface.cpp b/src/interface.cpp similarity index 100% rename from src/src/interface.cpp rename to src/interface.cpp diff --git a/src/src/interface.h b/src/interface.h similarity index 100% rename from src/src/interface.h rename to src/interface.h diff --git a/src/src/knetstats.cpp b/src/knetstats.cpp similarity index 100% rename from src/src/knetstats.cpp rename to src/knetstats.cpp diff --git a/src/src/knetstats.h b/src/knetstats.h similarity index 100% rename from src/src/knetstats.h rename to src/knetstats.h diff --git a/src/src/knetstatsview.cpp b/src/knetstatsview.cpp similarity index 100% rename from src/src/knetstatsview.cpp rename to src/knetstatsview.cpp diff --git a/src/src/knetstatsview.h b/src/knetstatsview.h similarity index 100% rename from src/src/knetstatsview.h rename to src/knetstatsview.h diff --git a/src/src/main.cpp b/src/main.cpp similarity index 100% rename from src/src/main.cpp rename to src/main.cpp diff --git a/src/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt similarity index 100% rename from src/src/pics/CMakeLists.txt rename to src/pics/CMakeLists.txt diff --git a/src/src/pics/Makefile.am b/src/pics/Makefile.am similarity index 100% rename from src/src/pics/Makefile.am rename to src/pics/Makefile.am diff --git a/src/src/pics/icon_pci.png b/src/pics/icon_pci.png similarity index 100% rename from src/src/pics/icon_pci.png rename to src/pics/icon_pci.png diff --git a/src/src/pics/theme0_both.png b/src/pics/theme0_both.png similarity index 100% rename from src/src/pics/theme0_both.png rename to src/pics/theme0_both.png diff --git a/src/src/pics/theme0_error.png b/src/pics/theme0_error.png similarity index 100% rename from src/src/pics/theme0_error.png rename to src/pics/theme0_error.png diff --git a/src/src/pics/theme0_none.png b/src/pics/theme0_none.png similarity index 100% rename from src/src/pics/theme0_none.png rename to src/pics/theme0_none.png diff --git a/src/src/pics/theme0_rx.png b/src/pics/theme0_rx.png similarity index 100% rename from src/src/pics/theme0_rx.png rename to src/pics/theme0_rx.png diff --git a/src/src/pics/theme0_tx.png b/src/pics/theme0_tx.png similarity index 100% rename from src/src/pics/theme0_tx.png rename to src/pics/theme0_tx.png diff --git a/src/src/pics/theme1_both.png b/src/pics/theme1_both.png similarity index 100% rename from src/src/pics/theme1_both.png rename to src/pics/theme1_both.png diff --git a/src/src/pics/theme1_error.png b/src/pics/theme1_error.png similarity index 100% rename from src/src/pics/theme1_error.png rename to src/pics/theme1_error.png diff --git a/src/src/pics/theme1_none.png b/src/pics/theme1_none.png similarity index 100% rename from src/src/pics/theme1_none.png rename to src/pics/theme1_none.png diff --git a/src/src/pics/theme1_rx.png b/src/pics/theme1_rx.png similarity index 100% rename from src/src/pics/theme1_rx.png rename to src/pics/theme1_rx.png diff --git a/src/src/pics/theme1_tx.png b/src/pics/theme1_tx.png similarity index 100% rename from src/src/pics/theme1_tx.png rename to src/pics/theme1_tx.png diff --git a/src/src/pics/theme2_both.png b/src/pics/theme2_both.png similarity index 100% rename from src/src/pics/theme2_both.png rename to src/pics/theme2_both.png diff --git a/src/src/pics/theme2_error.png b/src/pics/theme2_error.png similarity index 100% rename from src/src/pics/theme2_error.png rename to src/pics/theme2_error.png diff --git a/src/src/pics/theme2_none.png b/src/pics/theme2_none.png similarity index 100% rename from src/src/pics/theme2_none.png rename to src/pics/theme2_none.png diff --git a/src/src/pics/theme2_rx.png b/src/pics/theme2_rx.png similarity index 100% rename from src/src/pics/theme2_rx.png rename to src/pics/theme2_rx.png diff --git a/src/src/pics/theme2_tx.png b/src/pics/theme2_tx.png similarity index 100% rename from src/src/pics/theme2_tx.png rename to src/pics/theme2_tx.png diff --git a/src/src/pics/theme3_both.png b/src/pics/theme3_both.png similarity index 100% rename from src/src/pics/theme3_both.png rename to src/pics/theme3_both.png diff --git a/src/src/pics/theme3_error.png b/src/pics/theme3_error.png similarity index 100% rename from src/src/pics/theme3_error.png rename to src/pics/theme3_error.png diff --git a/src/src/pics/theme3_none.png b/src/pics/theme3_none.png similarity index 100% rename from src/src/pics/theme3_none.png rename to src/pics/theme3_none.png diff --git a/src/src/pics/theme3_rx.png b/src/pics/theme3_rx.png similarity index 100% rename from src/src/pics/theme3_rx.png rename to src/pics/theme3_rx.png diff --git a/src/src/pics/theme3_tx.png b/src/pics/theme3_tx.png similarity index 100% rename from src/src/pics/theme3_tx.png rename to src/pics/theme3_tx.png diff --git a/src/src/pics/theme4_both.png b/src/pics/theme4_both.png similarity index 100% rename from src/src/pics/theme4_both.png rename to src/pics/theme4_both.png diff --git a/src/src/pics/theme4_error.png b/src/pics/theme4_error.png similarity index 100% rename from src/src/pics/theme4_error.png rename to src/pics/theme4_error.png diff --git a/src/src/pics/theme4_none.png b/src/pics/theme4_none.png similarity index 100% rename from src/src/pics/theme4_none.png rename to src/pics/theme4_none.png diff --git a/src/src/pics/theme4_rx.png b/src/pics/theme4_rx.png similarity index 100% rename from src/src/pics/theme4_rx.png rename to src/pics/theme4_rx.png diff --git a/src/src/pics/theme4_tx.png b/src/pics/theme4_tx.png similarity index 100% rename from src/src/pics/theme4_tx.png rename to src/pics/theme4_tx.png diff --git a/src/src/CMakeLists.txt b/src/src/CMakeLists.txt deleted file mode 100644 index 4b74eac..0000000 --- a/src/src/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -add_subdirectory( pics ) - -include_directories( - ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} - ${TDE_LIB_DIR} -) - - -##### knetstats (executable) - -tde_add_executable( ${PROJECT_NAME} AUTOMOC - - SOURCES - configurebase.ui - configure.cpp - statisticsbase.ui - main.cpp - knetstats.cpp - knetstatsview.cpp - statistics.cpp - chart.cpp - interface.cpp - LINK - tdecore-shared - tdeui-shared - tdeio-shared - tdeui-shared - - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/src/src/Makefile.am b/src/src/Makefile.am deleted file mode 100644 index 2875827..0000000 --- a/src/src/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = $(all_includes) - -SUBDIRS = pics - -bin_PROGRAMS = knetstats - -knetstats_SOURCES = configurebase.ui configure.cpp statisticsbase.ui main.cpp \ - knetstats.cpp knetstatsview.cpp statistics.cpp chart.cpp interface.cpp -knetstats_LDADD = $(LIB_TDEUI) -knetstats_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -METASOURCES = configure.moc knetstats.moc knetstatsview.moc statistics.moc - -# these are the headers for your project -noinst_HEADERS = chart.h configure.h knetstats.h knetstatsview.h statistics.h \ - interface.h - -messages: rc.cpp - $(EXTRACTRC) *.ui >> rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/knetstats.pot - -KDE_OPTIONS = nofinal - diff --git a/src/src/statistics.cpp b/src/statistics.cpp similarity index 100% rename from src/src/statistics.cpp rename to src/statistics.cpp diff --git a/src/src/statistics.h b/src/statistics.h similarity index 100% rename from src/src/statistics.h rename to src/statistics.h diff --git a/src/src/statisticsbase.ui b/src/statisticsbase.ui similarity index 100% rename from src/src/statisticsbase.ui rename to src/statisticsbase.ui diff --git a/subdirs b/subdirs index 34efd98..7f26902 100644 --- a/subdirs +++ b/subdirs @@ -1,2 +1,4 @@ src +icons +doc translations