move imageviewer sources to ui/imageviewer

13 files changed, 37 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6d081c..a6068ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,9 @@ set(FQTERM_LIBS
   fqterm_protocol
   fqterm_utilities
   fqterm_ui
-  fqterm_common
   fqterm_unite
+  fqterm_imageviewer
+  fqterm_common
   )
 
 IF(WIN32)
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e47ee73..f522b03 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,18 +1,8 @@
 set(CMAKE_AUTOMOC ON)
 
-if(IMAGE_USE_PICFLOW)
-  set(IMGVIEW_SRCS
-    imageviewer.h
-    imageviewer.cpp)
-else(IMAGE_USE_PICFLOW)
-  set(IMGVIEW_SRCS
-    imageviewer_origin.cpp
-    imageviewer_origin.h)
-endif(IMAGE_USE_PICFLOW)
+add_subdirectory(imageviewer)
 
 set(fqterm_ui_SRCS
-  fqtermimage.cpp
-  ${IMGVIEW_SRCS}
   aboutdialog.h
   addrdialog.h
   articledialog.h
@@ -39,8 +29,6 @@ set(fqterm_ui_SRCS
   osdmessage.cpp
   overlayWidget.h
   overlayWidget.cpp
-  pictureflow.h
-  pictureflow.cpp
   popupMessage.h
   popupMessage.cpp
   popwidget.h
@@ -55,8 +43,6 @@ set(fqterm_ui_SRCS
   shortcutdialog.cpp
   statusBar.h
   statusBar.cpp
-  fqterm_canvas.h
-  fqterm_canvas.cpp
   sitemanager.h
   sitemanager.cpp
   iplookup.h
diff --git a/src/ui/imageviewer/CMakeLists.txt b/src/ui/imageviewer/CMakeLists.txt
new file mode 100644
index 0000000..594493c
--- /dev/null
+++ b/src/ui/imageviewer/CMakeLists.txt
@@ -0,0 +1,32 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+if(IMAGE_USE_PICFLOW)
+  set(IMGVIEW_SRCS
+    imageviewer.h
+    imageviewer.cpp)
+else(IMAGE_USE_PICFLOW)
+  set(IMGVIEW_SRCS
+    imageviewer_origin.cpp
+    imageviewer_origin.h)
+endif(IMAGE_USE_PICFLOW)
+
+set(fqterm_imageviewer_SRCS
+  fqtermimage.cpp
+  fqtermimage.h
+  fqterm_canvas.cpp
+  fqterm_canvas.h
+  pictureflow.cpp
+  pictureflow.h
+  ${IMGVIEW_SRCS})
+
+include_directories(
+  ${QT_INCLUDE_DIR}
+  ${QT_QTCORE_INCLUDE_DIR}
+  ${QT_QTGUI_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../common
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_library(fqterm_imageviewer
+  ${fqterm_imageviewer_SRCS})
diff --git a/src/ui/fqterm_canvas.cpp b/src/ui/imageviewer/fqterm_canvas.cpp
index 82fc971..82fc971 100644
--- a/src/ui/fqterm_canvas.cpp
+++ b/src/ui/imageviewer/fqterm_canvas.cpp
diff --git a/src/ui/fqterm_canvas.h b/src/ui/imageviewer/fqterm_canvas.h
index 5941700..5941700 100644
--- a/src/ui/fqterm_canvas.h
+++ b/src/ui/imageviewer/fqterm_canvas.h
diff --git a/src/ui/fqtermimage.cpp b/src/ui/imageviewer/fqtermimage.cpp
index 49be3d7..49be3d7 100644
--- a/src/ui/fqtermimage.cpp
+++ b/src/ui/imageviewer/fqtermimage.cpp
diff --git a/src/ui/fqtermimage.h b/src/ui/imageviewer/fqtermimage.h
index 8c75ac3..8c75ac3 100644
--- a/src/ui/fqtermimage.h
+++ b/src/ui/imageviewer/fqtermimage.h
diff --git a/src/ui/imageviewer.cpp b/src/ui/imageviewer/imageviewer.cpp
index 3292dd6..3292dd6 100644
--- a/src/ui/imageviewer.cpp
+++ b/src/ui/imageviewer/imageviewer.cpp
diff --git a/src/ui/imageviewer.h b/src/ui/imageviewer/imageviewer.h
index 1948633..1948633 100644
--- a/src/ui/imageviewer.h
+++ b/src/ui/imageviewer/imageviewer.h
diff --git a/src/ui/imageviewer_origin.cpp b/src/ui/imageviewer/imageviewer_origin.cpp
index d097895..6e3ceae 100644
--- a/src/ui/imageviewer_origin.cpp
+++ b/src/ui/imageviewer/imageviewer_origin.cpp
@@ -4,7 +4,6 @@
 #include <QAction>
 #include <QBuffer>
 #include <QCursor>
-#include <QComboBox>
 #include <QDateTime>
 #include <QDataStream>
 #include <QDir>
diff --git a/src/ui/imageviewer_origin.h b/src/ui/imageviewer/imageviewer_origin.h
index c50f175..15d9c62 100644
--- a/src/ui/imageviewer_origin.h
+++ b/src/ui/imageviewer/imageviewer_origin.h
@@ -19,6 +19,7 @@
 #include <QItemSelection>
 #include <QTreeView>
 #include <QMenuBar>
+#include <QComboBox>
 
 #include "pictureflow.h"
 #include "fqtermimage.h"
@@ -32,13 +33,12 @@ namespace FQTerm
     class ItemDelegate : public QItemDelegate {
     public:
         static QSize size_;
-        
+
         ItemDelegate() {
             size_ = QSize(250,200);
         }
 
         QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index) const {
-//if (index.column() == 0) return QSize(1, 1);
             return size_;
         }
 
diff --git a/src/ui/pictureflow.cpp b/src/ui/imageviewer/pictureflow.cpp
index cd749f0..cd749f0 100644
--- a/src/ui/pictureflow.cpp
+++ b/src/ui/imageviewer/pictureflow.cpp
diff --git a/src/ui/pictureflow.h b/src/ui/imageviewer/pictureflow.h
index c9cf5aa..c9cf5aa 100644
--- a/src/ui/pictureflow.h
+++ b/src/ui/imageviewer/pictureflow.h