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

[tfry at users.sourceforge.net]

Revision: 2072
          http://rkward.svn.sourceforge.net/rkward/?rev=2072&view=rev
Author:   tfry
Date:     2007-10-15 14:26:26 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
Crash slightly later, and more correct install

Modified Paths:
--------------
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/dataeditor/CMakeLists.txt
    branches/KDE4_port/rkward/windows/CMakeLists.txt
    branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
    branches/KDE4_port/rkward/windows/rkworkplace.cpp

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 20:00:25 UTC (rev 2071)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 21:26:26 UTC (rev 2072)
@@ -54,7 +54,7 @@
 
 ########### install files ###############
 
-INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}rkward
+INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}/rkward
 	PATTERN .svn EXCLUDE)
 
 INSTALL(FILES   rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )

Modified: branches/KDE4_port/rkward/dataeditor/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/dataeditor/CMakeLists.txt	2007-10-15 20:00:25 UTC (rev 2071)
+++ branches/KDE4_port/rkward/dataeditor/CMakeLists.txt	2007-10-15 21:26:26 UTC (rev 2072)
@@ -24,7 +24,7 @@
 
 ########### install files ###############
 
-INSTALL(FILES   rkeditordataframepart.rc DESTINATION /share/apps/rkward )
+INSTALL(FILES   rkeditordataframepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
 
 
 

Modified: branches/KDE4_port/rkward/windows/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/windows/CMakeLists.txt	2007-10-15 20:00:25 UTC (rev 2071)
+++ branches/KDE4_port/rkward/windows/CMakeLists.txt	2007-10-15 21:26:26 UTC (rev 2072)
@@ -35,4 +35,4 @@
 	rkcatchedx11windowpart.rc
 	rkcommandlogpart.rc
 	rktoplevelwindowgui.rc
-	DESTINATION /share/apps/rkward)
+	DESTINATION ${DATA_INSTALL_DIR}/rkward)

Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-15 20:00:25 UTC (rev 2071)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-15 21:26:26 UTC (rev 2072)
@@ -58,13 +58,15 @@
 	RK_TRACE (APP);
 	RK_ASSERT (window);
 	RK_ASSERT (container);
+	static int id_count = 0;
+	int id = ++id_count;
 
 	if (window->tool_window_bar) {
 		RK_ASSERT (window->tool_window_bar != this);	// no problem, but would be useless code
 		window->tool_window_bar->removeWidget (window);
 	}
 
-	int id = appendTab (window->windowIcon ().pixmap (QSize (16, 16)), -1, window->shortCaption ());
+	appendTab (window->windowIcon ().pixmap (QSize (16, 16)), id, window->shortCaption ());
 
 	window->tool_window_bar = this;
 	widget_to_id.insert (window, id);

Modified: branches/KDE4_port/rkward/windows/rkworkplace.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplace.cpp	2007-10-15 20:00:25 UTC (rev 2071)
+++ branches/KDE4_port/rkward/windows/rkworkplace.cpp	2007-10-15 21:26:26 UTC (rev 2072)
@@ -79,8 +79,6 @@
 
 	tool_window_bars[KMultiTabBar::Top]->setSplitter (vert_splitter);
 	wview = new RKWorkplaceView (vert_splitter);
-	wview->layout ()->setSpacing (0);
-	wview->layout ()->setMargin (0);
 
 	vert_splitter->setCollapsible (vert_splitter->indexOf (wview), false);
 	vert_splitter->setStretchFactor(vert_splitter->indexOf (wview), 1);


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