[rkward-cvs] SF.net SVN: rkward: [2071] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2071
          http://rkward.svn.sourceforge.net/rkward/?rev=2071&view=rev
Author:   tfry
Date:     2007-10-15 13:00:25 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
Ok, now it compiles, links, and crashes real fast

Modified Paths:
--------------
    branches/KDE4_port/CMakeLists.txt
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/rkward.cpp
    branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
    branches/KDE4_port/rkward/windows/rkworkplaceview.h

Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt	2007-10-15 19:52:18 UTC (rev 2070)
+++ branches/KDE4_port/CMakeLists.txt	2007-10-15 20:00:25 UTC (rev 2071)
@@ -3,7 +3,7 @@
 
 FIND_PACKAGE(KDE4 REQUIRED)
 
-SET(CMAKE_VERBOSE_MAKEFILE ON)
+SET(CMAKE_VERBOSE_MAKEFILE OFF)
 
 ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 19:52:18 UTC (rev 2070)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 20:00:25 UTC (rev 2071)
@@ -36,7 +36,7 @@
 
 KDE4_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
 
-TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} katepartinterfaces )
+TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
 
 # wrapper script
 GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-15 19:52:18 UTC (rev 2070)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-15 20:00:25 UTC (rev 2071)
@@ -81,7 +81,6 @@
 #include "debug.h"
 
 
-// KDE4: TODO: is all the stuff below still needed?
 #include "agents/showedittextfileagent.h"	// TODO: see below: needed purely for linking!
 #include "dialogs/rkreadlinedialog.h"	// TODO: see below: needed purely for linking!
 #include "windows/detachedwindowcontainer.h"	// TODO: see below: needed purely for linking!

Modified: branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplaceview.cpp	2007-10-15 19:52:18 UTC (rev 2070)
+++ branches/KDE4_port/rkward/windows/rkworkplaceview.cpp	2007-10-15 20:00:25 UTC (rev 2071)
@@ -178,4 +178,16 @@
 	emit (captionChanged (caption));
 }
 
+void RKWorkplaceView::currentPageChanged (int) {
+	RK_TRACE (APP);
+
+	RKMDIWindow *w = activePage ();
+	if (w) {
+		setCaption (w->shortCaption ());
+	} else {
+		setCaption (QString ());
+	}
+}
+
+
 #include "rkworkplaceview.moc"

Modified: branches/KDE4_port/rkward/windows/rkworkplaceview.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplaceview.h	2007-10-15 19:52:18 UTC (rev 2070)
+++ branches/KDE4_port/rkward/windows/rkworkplaceview.h	2007-10-15 20:00:25 UTC (rev 2071)
@@ -61,7 +61,6 @@
 @param new_caption the new caption */
 	void captionChanged (const QString &new_caption);
 public slots:
-/** like setActivePage (), but activates by internal id. Used internally */
 	void currentPageChanged (int page);
 /** called when the caption of a window changes. Updates the tab-label, and - if appropriate - the caption of this widget */
 	void childCaptionChanged (RKMDIWindow *widget);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.