svnno****@sourc*****
svnno****@sourc*****
2009年 7月 24日 (金) 22:29:53 JST
ForkRevision: 2466
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2466
Author: nogu
Date: 2009-07-24 22:29:53 +0900 (Fri, 24 Jul 2009)
Log Message:
-----------
- update CMakeLists.txt
- change the size of ResPopup
Modified Paths:
--------------
kita/branches/KITA-KDE4/CMakeLists.txt
kita/branches/KITA-KDE4/kita/CMakeLists.txt
kita/branches/KITA-KDE4/kita/doc/CMakeLists.txt
kita/branches/KITA-KDE4/kita/doc/en/CMakeLists.txt
kita/branches/KITA-KDE4/kita/po/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/kitaui/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/respopup.cpp
Modified: kita/branches/KITA-KDE4/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,4 +1,3 @@
-
find_package(KDE4 REQUIRED)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
@@ -7,36 +6,4 @@
include(MacroLibrary)
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
add_subdirectory(kita)
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = $(TOPSUBDIRS)
-#
-#$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-# cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-#
-#$(top_srcdir)/subdirs:
-# cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-#
-#$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
-# @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-#
-#MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-#
-#package-messages:
-# $(MAKE) -f admin/Makefile.common package-messages
-# $(MAKE) -C kita/po merge
-#
-#EXTRA_DIST = admin COPYING configure.in.in
-#
-#dist-hook:
-# cd $(top_distdir) && perl admin/am_edit -padmin
-# cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
Modified: kita/branches/KITA-KDE4/kita/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,20 +1,3 @@
-
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
add_subdirectory(src)
add_subdirectory(po)
add_subdirectory(doc)
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = src po doc
-#
-#package-messages:
-# $(MAKE) -f ../admin/Makefile.common package-messages
-# $(MAKE) -C po merge
Modified: kita/branches/KITA-KDE4/kita/doc/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/doc/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/doc/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,16 +1 @@
add_subdirectory(en)
-########### install files ###############
-
-
-#kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-
-
-
-#original Makefile.am contents follow:
-
-## the SUBDIRS is filled automatically by am_edit. If files are
-## in this directory they are installed into the english dir
-#
-#KDE_LANG = en
-#KDE_DOCS = kita
-#SUBDIRS = $(AUTODIRS)
Modified: kita/branches/KITA-KDE4/kita/doc/en/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/doc/en/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/doc/en/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,11 +1,2 @@
########### install files ###############
-
-
kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kita)
-
-
-
-#original Makefile.am contents follow:
-
-#KDE_DOCS = kita
-#KDE_LANG = en
Modified: kita/branches/KITA-KDE4/kita/po/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/po/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/po/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,12 +0,0 @@
-
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#POFILES = AUTO
Modified: kita/branches/KITA-KDE4/kita/src/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/src/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/src/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,6 +1,5 @@
+include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/prefs)
-
add_subdirectory(kitaui)
add_subdirectory(libkita)
add_subdirectory(prefs)
@@ -32,7 +31,7 @@
kde4_add_executable(kita ${kita_SRCS})
-target_link_libraries(kita ${KDE4_KDECORE_LIBS} kitapref kitautil kitaui ${KDE4_KDEUI_LIBS})
+target_link_libraries(kita ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} kitapref kitautil kitaui)
install(TARGETS kita ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -44,60 +43,3 @@
install(FILES kita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
kde4_install_icons(${ICON_INSTALL_DIR})
-
-
-
-#original Makefile.am contents follow:
-
-### Makefile.am for kita
-#
-#SUBDIRS = libkita kitaui prefs
-## this is the program that gets installed. it's name is used for all
-## of the other Makefile.am variables
-#bin_PROGRAMS = kita
-#
-## set the include path for X, qt and KDE
-#INCLUDES = $(all_includes)
-#
-## the library search path.
-#kita_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-#
-## the libraries to link against.
-#kita_LDADD = ./prefs/libkitapref.la ./libkita/libkita.la ./kitaui/libkitaui.la $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KDEUI)
-#
-## which sources should be compiled for kita
-#kita_SOURCES = main.cpp mainwindow.cpp bbstabwidget.cpp bbsview.cpp \
-# writetabwidget.cpp writeview.cpp writedialogbase.ui boardtabwidget.cpp \
-# boardview.cpp favoritelistview.cpp threadlistviewitem.cpp threadlistview.cpp \
-# threadlistviewbase.ui threadproperty.ui domtree.cpp htmlpart.cpp threadtabwidget.cpp \
-# threadview.cpp respopup.cpp viewmediator.cpp
-#
-## these are the headers for your project
-#noinst_HEADERS = mainwindow.h bbstabwidget.h bbsview.h writedialogbase.ui.h \
-# writetabwidget.h writeview.h boardtabwidget.h boardview.h \
-# favoritelistview.h threadlistviewitem.h threadlistview.h domtree.h htmlpart.h \
-# threadtabwidget.h threadview.h respopup.h viewmediator.h
-#
-## let automoc handle all of the meta source files (moc)
-#METASOURCES = AUTO
-#
-#messages: rc.cpp
-# $(XGETTEXT) *.cpp */*.cpp -o ../po/kita.pot
-#
-#KDE_ICON = kita
-#
-## this is where the kdelnk file will go
-#if KITA_USE_XDG_MENU
-#kdelnkdir = $(xdg_appsdir)
-#else
-#kdelnkdir = $(kde_appsdir)/Internet
-#endif
-#kdelnk_DATA = kita.desktop
-#
-## this is where the XML-GUI resource file goes
-#rcdir = $(kde_datadir)/kita
-#rc_DATA = kitaui.rc writetabwidgetui.rc boardtabwidgetui.rc threadtabwidgetui.rc
-#
-#appicondir = $(kde_datadir)/kita/icons
-#appicon_ICON = newthread read unread open
-#
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,7 +1,5 @@
+include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ../libkita)
-include_directories(${CMAKE_SOURCE_DIR}/kita/src/libkita ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
########### next target ###############
set(kitaui_LIB_SRCS htmlview.cpp listviewitem.cpp tabwidgetbase.cpp)
@@ -12,19 +10,3 @@
set_target_properties(kitaui PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS kitaui ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(top_srcdir)/kita/src/libkita $(all_includes)
-#METASOURCES = AUTO
-#lib_LTLIBRARIES = libkitaui.la
-#libkitaui_la_LDFLAGS = $(all_libraries)
-#libkitaui_la_SOURCES = tabwidgetbase.cpp listviewitem.cpp htmlview.cpp
-#noinst_HEADERS = tabwidgetbase.h listviewitem.h htmlview.h
-#libkitaui_la_LIBADD = $(LIB_KHTML)
Modified: kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,4 +1,4 @@
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories(${KDE4_INCLUDES} ${QT_INCLUDES})
########### next target ###############
@@ -42,20 +42,4 @@
########### install files ###############
-install(FILES abone.kcfg asciiart.kcfg global.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#
-#lib_LTLIBRARIES = libkita.la
-#
-#libkita_la_SOURCES = thread.h thread.cpp qcp932codec.cpp qcp932codec.h favoritethreads.h favoritethreads.cpp kita_misc.cpp threadinfo.h threadinfo.cpp access.cpp cache.cpp favoriteboards.cpp datmanager.cpp datinfo.cpp account.cpp threadindex.cpp boardmanager.cpp downloadmanager.cpp config_xt.kcfgc asciiart.kcfgc k2ch.cpp machibbs.cpp jbbs.cpp flashcgi.cpp abone.kcfgc
-#
-#METASOURCES = AUTO
-#
-#noinst_HEADERS = kita_misc.h access.h cache.h favoriteboards.h parsemisc.h datmanager.h datinfo.h account.h threadindex.h boardmanager.h downloadmanager.h event.h k2ch.h machibbs.h jbbs.h flashcgi.h
-#
-#kde_kcfg_DATA = config_xt.kcfg asciiart.kcfg abone.kcfg
+install(FILES abone.kcfg asciiart.kcfg globalconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR})
Modified: kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
@@ -1,7 +1,7 @@
+include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}
+ .. ${CMAKE_CURRENT_BINARY_DIR}/..)
-include_directories(.. ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/..)
-
########### next target ###############
set(kitapref_LIB_SRCS
@@ -24,22 +24,7 @@
kde4_add_library(kitapref SHARED ${kitapref_LIB_SRCS})
-target_link_libraries(kitapref ${KDE4_KDECORE_LIBS} kitautil ${KDE4_KDEUI_LIBS})
+target_link_libraries(kitapref ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} kitautil)
set_target_properties(kitapref PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS kitapref ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes) -I..
-#METASOURCES = AUTO
-#lib_LTLIBRARIES = libkitapref.la
-#libkitapref_la_LDFLAGS = $(all_libraries)
-#libkitapref_la_SOURCES = aboneprefbase.ui aboneprefpage.cpp asciiartprefbase.ui login_page.ui uiprefbase.ui prefs.cpp faceprefbase.ui write_page.ui
-#noinst_HEADERS = aboneprefpage.h prefs.h write_page.ui.h
Modified: kita/branches/KITA-KDE4/kita/src/respopup.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-23 12:58:22 UTC (rev 2465)
+++ kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-24 13:29:53 UTC (rev 2466)
@@ -33,10 +33,12 @@
| Qt::X11BypassWindowManagerHint
)
{
+ setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_url = url;
m_htmlPart = 0;
m_htmlPart = new HTMLPart(this);
+ m_htmlPart->view()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_htmlPart->setup(HTMLPART_MODE_POPUP , url);
connect(m_htmlPart, SIGNAL(hideChildPopup()), SIGNAL(hideChildPopup()));
}
@@ -75,20 +77,20 @@
text += "</body></html>";
if (m_htmlPart) {
- m_htmlPart->view() ->resize(maxwd, maxht);
+ m_htmlPart->view()->setMinimumSize(maxwd, maxht);
m_htmlPart->setJScriptEnabled(false);
m_htmlPart->setJavaEnabled(false);
m_htmlPart->begin(KUrl("file:/dummy.htm"));
m_htmlPart->write(text);
m_htmlPart->end();
- m_htmlPart->view() ->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ //m_htmlPart->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); TODO
}
}
-
/* public */
void ResPopup::adjustSize()
{
+#if 0
if (!m_htmlPart) return ;
int width = 0, xx = 0, leftmrg = 0;
@@ -147,9 +149,9 @@
int wd = maxwidth + mrg;
int ht = maxheight + mrg;
-
- m_htmlPart->view() ->resize(wd, ht);
+#endif
QFrame::adjustSize();
+ m_htmlPart->view()->setMinimumSize(width(), height());
}