aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Sitter <sitter[email protected]>2017-03-29 14:08:18 +0200
committerHarald Sitter <[email protected]>2017-03-29 14:08:18 +0200
commit3cabf11e12038ae1aa65711ea51c4ff12b5a8e07 (patch)
treea6b2ba8329a2afb14165615b34645c7aa1af88cf
parent98943bcb196eb32ac920ee565da4d7d59752e49b (diff)
flatten the source tree now that everything links into one binary properly
-rw-r--r--src/CMakeLists.txt33
-rw-r--r--src/Config.cpp (renamed from src/part/Config.cpp)0
-rw-r--r--src/Config.h (renamed from src/part/Config.h)0
-rw-r--r--src/define.h2
-rw-r--r--src/dialog.ui (renamed from src/part/dialog.ui)0
-rw-r--r--src/fileTree.cpp (renamed from src/part/fileTree.cpp)0
-rw-r--r--src/fileTree.h (renamed from src/part/fileTree.h)0
-rw-r--r--src/historyAction.cpp (renamed from src/app/historyAction.cpp)0
-rw-r--r--src/historyAction.h (renamed from src/app/historyAction.h)0
-rw-r--r--src/localLister.cpp (renamed from src/part/localLister.cpp)0
-rw-r--r--src/localLister.h (renamed from src/part/localLister.h)0
-rw-r--r--src/main.cpp (renamed from src/app/main.cpp)0
-rw-r--r--src/mainWindow.cpp (renamed from src/app/mainWindow.cpp)2
-rw-r--r--src/mainWindow.h (renamed from src/app/mainWindow.h)0
-rw-r--r--src/part.cpp (renamed from src/part/part.cpp)0
-rw-r--r--src/part.h (renamed from src/part/part.h)0
-rw-r--r--src/part/CMakeLists.txt46
-rw-r--r--src/progressBox.cpp (renamed from src/part/progressBox.cpp)0
-rw-r--r--src/progressBox.h (renamed from src/part/progressBox.h)0
-rw-r--r--src/radialMap/labels.cpp (renamed from src/part/radialMap/labels.cpp)10
-rw-r--r--src/radialMap/map.cpp (renamed from src/part/radialMap/map.cpp)6
-rw-r--r--src/radialMap/map.h (renamed from src/part/radialMap/map.h)2
-rw-r--r--src/radialMap/radialMap.h (renamed from src/part/radialMap/radialMap.h)0
-rw-r--r--src/radialMap/sincos.h (renamed from src/part/radialMap/sincos.h)0
-rw-r--r--src/radialMap/widget.cpp (renamed from src/part/radialMap/widget.cpp)4
-rw-r--r--src/radialMap/widget.h (renamed from src/part/radialMap/widget.h)0
-rw-r--r--src/radialMap/widgetEvents.cpp (renamed from src/part/radialMap/widgetEvents.cpp)14
-rw-r--r--src/remoteLister.cpp (renamed from src/part/remoteLister.cpp)0
-rw-r--r--src/remoteLister.h (renamed from src/part/remoteLister.h)0
-rw-r--r--src/scan.cpp (renamed from src/part/scan.cpp)0
-rw-r--r--src/scan.h (renamed from src/part/scan.h)0
-rw-r--r--src/settingsDialog.cpp (renamed from src/part/settingsDialog.cpp)0
-rw-r--r--src/settingsDialog.h (renamed from src/part/settingsDialog.h)0
-rw-r--r--src/summaryWidget.cpp (renamed from src/part/summaryWidget.cpp)0
-rw-r--r--src/summaryWidget.h (renamed from src/part/summaryWidget.h)0
35 files changed, 50 insertions, 69 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e282e8..d78ac96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
#######################################################################
-# Copyright 2008-2014 Martin Sandsmark <[email protected]>
+# Copyright 2008-2009 Martin Sandsmark <[email protected]>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -18,5 +18,32 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#######################################################################
-add_subdirectory(app)
-add_subdirectory(part)
+set(filelight_SRCS
+ radialMap/widget.cpp
+ radialMap/map.cpp
+ radialMap/widgetEvents.cpp
+ radialMap/labels.cpp
+ part.cpp
+ scan.cpp
+ progressBox.cpp
+ Config.cpp
+ settingsDialog.cpp
+ fileTree.cpp
+ localLister.cpp
+ remoteLister.cpp
+ summaryWidget.cpp
+ historyAction.cpp
+ mainWindow.cpp
+ main.cpp)
+
+message(WARNING "sort srcs")
+ki18n_wrap_ui(filelight_SRCS dialog.ui)
+
+add_executable(filelight ${filelight_SRCS})
+
+target_link_libraries(filelight
+ KF5::Parts
+ KF5::XmlGui
+)
+
+install(TARGETS filelight ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/part/Config.cpp b/src/Config.cpp
index 7812886..7812886 100644
--- a/src/part/Config.cpp
+++ b/src/Config.cpp
diff --git a/src/part/Config.h b/src/Config.h
index cb057ee..cb057ee 100644
--- a/src/part/Config.h
+++ b/src/Config.h
diff --git a/src/define.h b/src/define.h
index 538c091..b8823ec 100644
--- a/src/define.h
+++ b/src/define.h
@@ -23,7 +23,7 @@
#ifndef DEFINE_H
#define DEFINE_H
-#include "part/Config.h"
+#include "Config.h"
#undef VERSION
#undef PACKAGE
diff --git a/src/part/dialog.ui b/src/dialog.ui
index 5f4e886..5f4e886 100644
--- a/src/part/dialog.ui
+++ b/src/dialog.ui
diff --git a/src/part/fileTree.cpp b/src/fileTree.cpp
index 3e394d0..3e394d0 100644
--- a/src/part/fileTree.cpp
+++ b/src/fileTree.cpp
diff --git a/src/part/fileTree.h b/src/fileTree.h
index da70a3a..da70a3a 100644
--- a/src/part/fileTree.h
+++ b/src/fileTree.h
diff --git a/src/app/historyAction.cpp b/src/historyAction.cpp
index cd49736..cd49736 100644
--- a/src/app/historyAction.cpp
+++ b/src/historyAction.cpp
diff --git a/src/app/historyAction.h b/src/historyAction.h
index be9cce3..be9cce3 100644
--- a/src/app/historyAction.h
+++ b/src/historyAction.h
diff --git a/src/part/localLister.cpp b/src/localLister.cpp
index 8105245..8105245 100644
--- a/src/part/localLister.cpp
+++ b/src/localLister.cpp
diff --git a/src/part/localLister.h b/src/localLister.h
index b73c14c..b73c14c 100644
--- a/src/part/localLister.h
+++ b/src/localLister.h
diff --git a/src/app/main.cpp b/src/main.cpp
index 3ffc036..3ffc036 100644
--- a/src/app/main.cpp
+++ b/src/main.cpp
diff --git a/src/app/mainWindow.cpp b/src/mainWindow.cpp
index 4ef4fd7..1e5cf9e 100644
--- a/src/app/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -20,7 +20,7 @@
***********************************************************************/
#include "mainWindow.h"
-#include "part/part.h"
+#include "part.h"
#include "historyAction.h"
#include <cstdlib> //std::exit()
diff --git a/src/app/mainWindow.h b/src/mainWindow.h
index eb8003f..eb8003f 100644
--- a/src/app/mainWindow.h
+++ b/src/mainWindow.h
diff --git a/src/part/part.cpp b/src/part.cpp
index 259fad1..259fad1 100644
--- a/src/part/part.cpp
+++ b/src/part.cpp
diff --git a/src/part/part.h b/src/part.h
index 37694a5..37694a5 100644
--- a/src/part/part.h
+++ b/src/part.h
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
deleted file mode 100644
index 0a49b9a..0000000
--- a/src/part/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-#######################################################################
-# Copyright 2008-2009 Martin Sandsmark <[email protected]>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License or (at your option) version 3 or any later version
-# accepted by the membership of KDE e.V. (or its successor approved
-# by the membership of KDE e.V.), which shall act as a proxy
-# defined in Section 14 of version 3 of the license.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#######################################################################
-
-set(filelight_PART_SRCS
- radialMap/widget.cpp
- radialMap/map.cpp
- radialMap/widgetEvents.cpp
- radialMap/labels.cpp
- part.cpp
- scan.cpp
- progressBox.cpp
- Config.cpp
- settingsDialog.cpp
- fileTree.cpp
- localLister.cpp
- remoteLister.cpp
- summaryWidget.cpp)
-
-ki18n_wrap_ui(filelight_PART_SRCS dialog.ui)
-
-add_library(filelightpart STATIC ${filelight_PART_SRCS})
-target_include_directories(filelightpart INTERFACE "$<INSTALL_INTERFACE:${CURRENT_SOURCE_DIR}>")
-
-target_link_libraries(filelightpart
- KF5::Parts
- KF5::KIOCore
-)
-
-install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/part/progressBox.cpp b/src/progressBox.cpp
index 344c36c..344c36c 100644
--- a/src/part/progressBox.cpp
+++ b/src/progressBox.cpp
diff --git a/src/part/progressBox.h b/src/progressBox.h
index c0aace3..c0aace3 100644
--- a/src/part/progressBox.h
+++ b/src/progressBox.h
diff --git a/src/part/radialMap/labels.cpp b/src/radialMap/labels.cpp
index cb980c0..1e56d7b 100644
--- a/src/part/radialMap/labels.cpp
+++ b/src/radialMap/labels.cpp
@@ -24,8 +24,8 @@
#include <QPainter>
#include <QVector>
-#include "part/Config.h"
-#include "part/fileTree.h"
+#include "Config.h"
+#include "fileTree.h"
#include "radialMap.h"
#include "sincos.h"
#include "widget.h"
@@ -98,7 +98,7 @@ void RadialMap::Widget::paintExplodedLabels(QPainter &paint) const
for (Segment *segment : *m_map.m_signature) {
if (segment->length() > 288) {
list.append(new Label(segment, 0));
-
+
}
}
}
@@ -121,7 +121,7 @@ void RadialMap::Widget::paintExplodedLabels(QPainter &paint) const
return (angle1 < angle2);
});
-
+
//2. Check to see if any adjacent labels are too close together
// if so, remove it (the least significant labels, since we sort by level too).
@@ -146,7 +146,7 @@ void RadialMap::Widget::paintExplodedLabels(QPainter &paint) const
font.setPointSize(Config::minFontPitch);
paint.setFont(font);
}
-
+
QVector<Label*>::iterator it;
do {
diff --git a/src/part/radialMap/map.cpp b/src/radialMap/map.cpp
index 56710f2..a40f55c 100644
--- a/src/part/radialMap/map.cpp
+++ b/src/radialMap/map.cpp
@@ -31,8 +31,8 @@
#include "radialMap.h" // defines
-#include "part/Config.h"
-#include "part/fileTree.h"
+#include "Config.h"
+#include "fileTree.h"
#define SINCOS_H_IMPLEMENTATION (1)
#include "sincos.h"
#include "widget.h"
@@ -102,7 +102,7 @@ void RadialMap::Map::make(const Folder *tree, bool refresh)
colorise();
m_centerText = tree->humanReadableSize();
-
+
//paint the pixmap
paint();
diff --git a/src/part/radialMap/map.h b/src/radialMap/map.h
index 708d90b..0e0b2bf 100644
--- a/src/part/radialMap/map.h
+++ b/src/radialMap/map.h
@@ -22,7 +22,7 @@
#ifndef MAP_H
#define MAP_H
-#include "part/fileTree.h"
+#include "fileTree.h"
#include <KColorScheme>
diff --git a/src/part/radialMap/radialMap.h b/src/radialMap/radialMap.h
index 5bbba10..5bbba10 100644
--- a/src/part/radialMap/radialMap.h
+++ b/src/radialMap/radialMap.h
diff --git a/src/part/radialMap/sincos.h b/src/radialMap/sincos.h
index 2fe716d..2fe716d 100644
--- a/src/part/radialMap/sincos.h
+++ b/src/radialMap/sincos.h
diff --git a/src/part/radialMap/widget.cpp b/src/radialMap/widget.cpp
index 450d08f..3feb94f 100644
--- a/src/part/radialMap/widget.cpp
+++ b/src/radialMap/widget.cpp
@@ -21,8 +21,8 @@
#include "widget.h"
-#include "part/Config.h"
-#include "part/fileTree.h"
+#include "Config.h"
+#include "fileTree.h"
#include "radialMap.h" //constants
#include "map.h"
diff --git a/src/part/radialMap/widget.h b/src/radialMap/widget.h
index c3fd780..c3fd780 100644
--- a/src/part/radialMap/widget.h
+++ b/src/radialMap/widget.h
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/radialMap/widgetEvents.cpp
index 8161de5..f9ddf42 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/radialMap/widgetEvents.cpp
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
***********************************************************************/
-#include "part/fileTree.h"
-#include "part/Config.h"
+#include "fileTree.h"
+#include "Config.h"
#include "radialMap.h" //class Segment
#include "widget.h"
@@ -153,22 +153,22 @@ void RadialMap::Widget::mouseMoveEvent(QMouseEvent *e)
QString string = m_focus->file()->fullPath(m_tree)
+ QLatin1Char('\n')
+ m_focus->file()->humanReadableSize();
-
+
if (m_focus->file()->isFolder()) {
int files = static_cast<const Folder*>(m_focus->file())->children();
const uint percent = uint((100 * files) / (double)m_tree->children());
string += QLatin1Char('\n');
string += i18np("File: %1", "Files: %1", files);
-
+
if (percent > 0) string += QString(QLatin1String(" (%1%)")).arg(percent);
}
-
+
const QUrl url = Widget::url(m_focus->file());
if (m_focus == m_rootSegment && url != KIO::upUrl(url)) {
string += i18n("\nClick to go up to parent directory");
}
-
+
// Calculate a semi-sane size for the tooltip
QFontMetrics fontMetrics(font());
int tooltipWidth = 0;
@@ -217,7 +217,7 @@ void RadialMap::Widget::mousePressEvent(QMouseEvent *e)
{
if (!isEnabled())
return;
-
+
//m_focus is set correctly (I've been strict, I assure you it is correct!)
if (!m_focus || m_focus->isFake()) {
diff --git a/src/part/remoteLister.cpp b/src/remoteLister.cpp
index d131504..d131504 100644
--- a/src/part/remoteLister.cpp
+++ b/src/remoteLister.cpp
diff --git a/src/part/remoteLister.h b/src/remoteLister.h
index 6f6cb71..6f6cb71 100644
--- a/src/part/remoteLister.h
+++ b/src/remoteLister.h
diff --git a/src/part/scan.cpp b/src/scan.cpp
index 4b8da2b..4b8da2b 100644
--- a/src/part/scan.cpp
+++ b/src/scan.cpp
diff --git a/src/part/scan.h b/src/scan.h
index 19cf26d..19cf26d 100644
--- a/src/part/scan.h
+++ b/src/scan.h
diff --git a/src/part/settingsDialog.cpp b/src/settingsDialog.cpp
index 7c8074c..7c8074c 100644
--- a/src/part/settingsDialog.cpp
+++ b/src/settingsDialog.cpp
diff --git a/src/part/settingsDialog.h b/src/settingsDialog.h
index d7c93eb..d7c93eb 100644
--- a/src/part/settingsDialog.h
+++ b/src/settingsDialog.h
diff --git a/src/part/summaryWidget.cpp b/src/summaryWidget.cpp
index dffed32..dffed32 100644
--- a/src/part/summaryWidget.cpp
+++ b/src/summaryWidget.cpp
diff --git a/src/part/summaryWidget.h b/src/summaryWidget.h
index 3af8926..3af8926 100644
--- a/src/part/summaryWidget.h
+++ b/src/summaryWidget.h