move image widget to image/ dir.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1632 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am
index 08e927b..3f693c7 100644 (file)
--- a/kita/src/Makefile.am
+++ b/kita/src/Makefile.am
@@ -1,29 +1,29 @@
 ## Makefile.am for kita
 
-SUBDIRS = libkita kitaui part prefs
+SUBDIRS = libkita kitaui image part prefs
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
 bin_PROGRAMS = kita kita_client
 
 lib_LTLIBRARIES = kita.la
 # set the include path for X, qt and KDE
-INCLUDES         = $(all_includes) -Ipart
+INCLUDES = $(all_includes) -Ipart
 
 # the library search path. 
 kita_la_LDFLAGS = -avoid-version -module $(KDE_RPATH) $(all_libraries)
 kita_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
 # the libraries to link against.
-kita_la_LIBADD = ./prefs/libkitapref.la ./part/libkitapart.la ./libkita/libkita.la ./kitaui/libkitaui.la $(LIB_KFILE) $(LIB_KDEPRINT)
+kita_la_LIBADD = ./image/libkitaimage.la ./prefs/libkitapref.la ./part/libkitapart.la ./libkita/libkita.la ./kitaui/libkitaui.la $(LIB_KFILE) $(LIB_KDEPRINT)
 kita_LDADD = kita.la
 
 # which sources should be compiled for kita
-kita_la_SOURCES = main.cpp kita.cpp kitaiface.skel kitasubjectview.cpp kitaboardview.cpp threadlistview.cpp favoritelistview.cpp kitaboardtabwidget.cpp kitawritetabwidget.cpp kitaimgtabwidget.cpp kitathreadtabwidget.cpp kitasubjecttabwidget.cpp threadlistviewbase.ui kitaboardviewbase.ui threadproperty.ui favoriteswindowbase.ui listviewitem.cpp favoriteswindow.cpp
+kita_la_SOURCES = main.cpp kita.cpp kitaiface.skel kitasubjectview.cpp kitaboardview.cpp threadlistview.cpp favoritelistview.cpp kitaboardtabwidget.cpp kitawritetabwidget.cpp kitathreadtabwidget.cpp kitasubjecttabwidget.cpp threadlistviewbase.ui kitaboardviewbase.ui threadproperty.ui favoriteswindowbase.ui listviewitem.cpp favoriteswindow.cpp
 
 kita_SOURCES = dummy.cpp
 
 # these are the headers for your project
-noinst_HEADERS = kita.h kitasubjectview.h kitaboardview.h threadlistview.h favoritelistview.h kitaboardtabwidget.h kitawritetabwidget.h kitaimgtabwidget.h kitathreadtabwidget.h kitasubjecttabwidget.h listviewitem.h favoriteswindow.h
+noinst_HEADERS = kita.h kitasubjectview.h kitaboardview.h threadlistview.h favoritelistview.h kitaboardtabwidget.h kitawritetabwidget.h kitathreadtabwidget.h kitasubjecttabwidget.h listviewitem.h favoriteswindow.h
 
 # client stuff
 kita_client_LDFLAGS = $(KDE_RPATH) $(all_libraries)
@@ -48,8 +48,7 @@ kdelnk_DATA = kita.desktop
 
 # this is where the XML-GUI resource file goes
 rcdir = $(kde_datadir)/kita
-rc_DATA = kitaui.rc kitaimgtabwidgetui.rc kitawritetabwidgetui.rc \
-kitasubjecttabwidgetui.rc kitathreadtabwidgetui.rc
+rc_DATA = kitaui.rc kitawritetabwidgetui.rc kitasubjecttabwidgetui.rc kitathreadtabwidgetui.rc
 
 dummy.cpp:
        echo > dummy.cpp

diff --git a/kita/src/image/.cvsignore b/kita/src/image/.cvsignore
new file mode 100644 (file)
index 0000000..f7ccdb9
--- /dev/null
+++ b/kita/src/image/.cvsignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+*.moc
+*.moc.cpp
+*.all_cpp.cpp
+.deps
+.libs

diff --git a/kita/src/image/Makefile.am b/kita/src/image/Makefile.am
new file mode 100644 (file)
index 0000000..60f5692
--- /dev/null
+++ b/kita/src/image/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES = -I.. $(all_includes)
+METASOURCES = AUTO
+lib_LTLIBRARIES =  libkitaimage.la
+libkitaimage_la_LDFLAGS = $(all_libraries)
+libkitaimage_la_SOURCES = imagetabwidget.cpp imageview.cpp
+
+# this is where the XML-GUI resource file goes
+rcdir = $(kde_datadir)/kita
+rc_DATA =  imagetabwidgetui.rc
+noinst_HEADERS =  imagetabwidget.h imageview.h

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index b80ba14..361199b 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -13,15 +13,14 @@
 #include "kitathreadview.h"
 #include "kitasubjectview.h"
 #include "kitaboardview.h"
-#include "libkita/threadinfo.h"
-#include "libkita/favoriteboards.h"
 #include "kitaboardtabwidget.h"
 #include "kitathreadtabwidget.h"
 #include "kitasubjecttabwidget.h"
-#include "kitaimgtabwidget.h"
 #include "kitawritetabwidget.h"
 #include "favoriteswindow.h"
 
+#include "libkita/threadinfo.h"
+#include "libkita/favoriteboards.h"
 #include "libkita/favoritethreads.h"
 #include "libkita/kita_misc.h"
 #include "libkita/kitaconfig.h"
@@ -31,6 +30,8 @@
 #include "libkita/datmanager.h"
 #include "libkita/boardmanager.h"
 
+#include "image/imagetabwidget.h"
+
 #include <qdragobject.h>
 #include <qtextcodec.h>
 #include <qevent.h>

diff --git a/kita/src/part/Makefile.am b/kita/src/part/Makefile.am
index bddad75..1c27e57 100644 (file)
--- a/kita/src/part/Makefile.am
+++ b/kita/src/part/Makefile.am
@@ -5,13 +5,13 @@ kde_module_LTLIBRARIES = libkitapart.la
 
 INCLUDES = $(all_includes) -I..
 
-libkitapart_la_LDFLAGS = -L../libkita $(all_libraries) -module -avoid-version -no-undefined
+libkitapart_la_LDFLAGS = -avoid-version -module -no-undefined -L../libkita $(all_libraries)
 
-libkitapart_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) -lkita
+libkitapart_la_LIBADD = $(top_builddir)/kita/src/libkita/libkita.la $(top_builddir)/kita/src/kitaui/libkitaui.la $(top_builddir)/kita/src/image/libkitaimage.la $(LIB_KPARTS) $(LIB_KHTML)
 
-libkitapart_la_SOURCES = kitathreadview.cpp kitathreadviewbase.ui kitawritedialogbase.ui kitawriteview.cpp kitahtmlpart.cpp kitahtmlview.cpp kitadomtree.cpp kitaimgview.cpp
+libkitapart_la_SOURCES = kitathreadview.cpp kitathreadviewbase.ui kitawritedialogbase.ui kitawriteview.cpp kitahtmlpart.cpp kitahtmlview.cpp kitadomtree.cpp
 
-noinst_HEADERS = kitathreadview.h kitawriteview.h kitahtmlpart.h kitahtmlview.h kitadomtree.h kitaimgview.h
+noinst_HEADERS = kitathreadview.h kitawriteview.h kitahtmlpart.h kitahtmlview.h kitadomtree.h
 
 METASOURCES = AUTO
 

diff --git a/kita/src/part/kitahtmlpart.cpp b/kita/src/part/kitahtmlpart.cpp
index 2801b9c..44306e2 100644 (file)
--- a/kita/src/part/kitahtmlpart.cpp
+++ b/kita/src/part/kitahtmlpart.cpp
@@ -25,7 +25,8 @@
 #include "kitahtmlpart.h"
 #include "kitahtmlview.h"
 #include "kitadomtree.h"
-#include "kitaimgview.h"
+
+#include "image/imageview.h"
 
 #include "libkita/kitaconfig.h"
 #include "libkita/datmanager.h"