From db2c9c14ae499d8912a2af1d951814afcaf6ab9e Mon Sep 17 00:00:00 2001
From: dagenais <dagenais@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Mon, 19 Apr 2004 16:16:02 +0000
Subject: [PATCH] Cleanup almost finished

git-svn-id: http://ltt.polymtl.ca/svn@503 04897980-b3bd-0310-b5e0-8ef037075253
---
 .../lttv/modules/gui/controlflow/Makefile.am  |   4 +-
 .../lttv/modules/gui/controlflow/module.c     |   2 +-
 .../modules/gui/detailedevents/Makefile.am    |   4 +-
 .../lttv/modules/gui/detailedevents/events.c  |   2 +-
 .../poly/lttv/modules/gui/lttvgui/Makefile.am |   6 +-
 .../gui/{main => lttvwindow}/Makefile.am      |   0
 .../{main => lttvwindow}/glade/Makefile.am    |   0
 .../glade/lttvwindow.glade                    |   0
 .../glade/lttvwindow.gladep                   |   0
 .../lttv/modules/gui/lttvwindow/mainwin.glade | 760 ++++++++++++++++++
 .../modules/gui/lttvwindow/mainwin.gladep     |  11 +
 .../pixmaps/1downarrow.png                    | Bin
 .../{main => lttvwindow}/pixmaps/1uparrow.png | Bin
 .../{main => lttvwindow}/pixmaps/Makefile.am  |   0
 .../pixmaps/edit_add_22.png                   | Bin
 .../pixmaps/edit_remove_22.png                | Bin
 .../{main => lttvwindow}/pixmaps/filenew.png  | Bin
 .../{main => lttvwindow}/pixmaps/fileopen.png | Bin
 .../{main => lttvwindow}/pixmaps/filesave.png | Bin
 .../pixmaps/filesaveas.png                    | Bin
 .../{main => lttvwindow}/pixmaps/gtk-add.png  | Bin
 .../pixmaps/gtk-jump-to.png                   | Bin
 .../pixmaps/mini-display.xpm                  |   0
 .../pixmaps/move_message.xpm                  |   0
 .../{main => lttvwindow}/pixmaps/remove.png   | Bin
 .../{main => lttvwindow}/pixmaps/remove1.png  | Bin
 .../pixmaps/stock_zoom_fit_24.png             | Bin
 .../pixmaps/stock_zoom_in_24.png              | Bin
 .../pixmaps/stock_zoom_out_24.png             | Bin
 .../gui/{main => lttvwindow}/src/Makefile.am  |  12 +-
 .../gui/{main => lttvwindow}/src/callbacks.c  |   0
 .../gui/{main => lttvwindow}/src/callbacks.h  |   0
 .../gui/{main => lttvwindow}/src/gtkdirsel.c  |   0
 .../{main => lttvwindow}/src/gtkmultivpaned.c |   0
 .../{main => lttvwindow}/src/init_module.c    |   2 +-
 .../gui/{main => lttvwindow}/src/interface.c  |   0
 .../gui/{main => lttvwindow}/src/interface.h  |   0
 .../gui/{main => lttvwindow}/src/lttvfilter.c |   0
 .../gui/{main => lttvwindow}/src/main.c       |   0
 .../gui/{main => lttvwindow}/src/support.c    |   0
 .../gui/{main => lttvwindow}/src/support.h    |   0
 .../lttv/modules/gui/statistics/Makefile.am   |   4 +-
 .../lttv/modules/gui/statistics/statistics.c  |   2 +-
 43 files changed, 790 insertions(+), 19 deletions(-)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/Makefile.am (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/glade/Makefile.am (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/glade/lttvwindow.glade (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/glade/lttvwindow.gladep (100%)
 create mode 100644 ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.glade
 create mode 100644 ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.gladep
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/1downarrow.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/1uparrow.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/Makefile.am (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/edit_add_22.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/edit_remove_22.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/filenew.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/fileopen.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/filesave.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/filesaveas.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/gtk-add.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/gtk-jump-to.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/mini-display.xpm (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/move_message.xpm (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/remove.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/remove1.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/stock_zoom_fit_24.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/stock_zoom_in_24.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/pixmaps/stock_zoom_out_24.png (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/Makefile.am (66%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/callbacks.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/callbacks.h (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/gtkdirsel.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/gtkmultivpaned.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/init_module.c (98%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/interface.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/interface.h (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/lttvfilter.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/main.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/support.c (100%)
 rename ltt/branches/poly/lttv/modules/gui/{main => lttvwindow}/src/support.h (100%)

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index 6938e2ff..4a42f660 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
@@ -25,7 +25,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
 
 libdir = ${lttvplugindir}
 
@@ -38,4 +38,4 @@ noinst_HEADERS = 	eventhooks.h cfv.h cfv-private.h processlist.h\
 				drawing.h drawitem.h
 
 EXTRA_DIST = \
-		hGuiControlFlowInsert.xpm
\ No newline at end of file
+		hGuiControlFlowInsert.xpm
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
index 5b9751d5..72ebf0ca 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -111,4 +111,4 @@ static void destroy() {
 
 LTTV_MODULE("guicontrolflow", "Control flow viewer", \
     "Graphical module to view processes state and control flow", \
-    init, destroy, "mainwin")
+    init, destroy, "lttvwindow")
diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
index 527db859..e3523257 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
@@ -26,7 +26,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
 
 libdir = ${lttvplugindir}
 
@@ -36,4 +36,4 @@ libguievents_la_SOURCES = events.c
 noinst_HEADERS = gtkrbtree.h gtktreeprivate.h
 
 EXTRA_DIST = \
-		hGuiEventsInsert.xpm
\ No newline at end of file
+		hGuiEventsInsert.xpm
diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 2b2ceaad..7bb79fdc 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -1883,4 +1883,4 @@ static void destroy() {
 
 LTTV_MODULE("guievents", "Detailed events view", \
     "Graphical module to display a detailed event list", \
-	    init, destroy, "mainwin")
+	    init, destroy, "lttvwindow")
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
index 4562409b..9f283e5f 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
@@ -11,9 +11,9 @@ AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
 LIBS += $(GTK_LIBS)
 
-lib_LTLIBRARIES = libmainwinapi.la
-libmainwinapi_la_SOURCES = toolbar.c menu.c gtktraceset.c
-#libmainwinapi_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/API -lcustomBox
+lib_LTLIBRARIES = liblttvgui.la
+liblttvgui_la_SOURCES = toolbar.c menu.c gtktraceset.c
+#liblttvgui_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/lttvgui -lcustomBox
 
 lttvguiinclude_HEADERS = \
 	common.h\
diff --git a/ltt/branches/poly/lttv/modules/gui/main/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/Makefile.am
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
diff --git a/ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/Makefile.am
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/glade/Makefile.am
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/Makefile.am
diff --git a/ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.glade b/ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/lttvwindow.glade
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.glade
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/lttvwindow.glade
diff --git a/ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.gladep b/ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/lttvwindow.gladep
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/glade/lttvwindow.gladep
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/glade/lttvwindow.gladep
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.glade b/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.glade
new file mode 100644
index 00000000..0d4cd97d
--- /dev/null
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.glade
@@ -0,0 +1,760 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="MWindow">
+  <property name="width_request">100</property>
+  <property name="height_request">50</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Main window</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="default_width">600</property>
+  <property name="default_height">400</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <signal name="destroy" handler="on_MWindow_destroy" last_modification_time="Tue, 10 Jun 2003 16:31:35 GMT"/>
+
+  <child>
+    <widget class="GtkVBox" id="MVbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkHBox" id="MMenuBox">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkMenuBar" id="MenuMain">
+	      <property name="visible">True</property>
+
+	      <child>
+		<widget class="GtkMenuItem" id="FileMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_File</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="FileMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="FileMenuNewTitle">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">New</property>
+			  <property name="use_underline">True</property>
+
+			  <child>
+			    <widget class="GtkMenu" id="FileMenuNewTitle_menu">
+
+			      <child>
+				<widget class="GtkMenuItem" id="EmptyTraceset">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Empty trace set</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_empty_traceset_activate" last_modification_time="Tue, 10 Jun 2003 15:03:01 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="CloneTraceset">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Clone trace set</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_clone_traceset_activate" last_modification_time="Tue, 10 Jun 2003 15:03:22 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="FileMenuNewSep">
+				  <property name="visible">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="Tab">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Tab</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_tab_activate" last_modification_time="Tue, 10 Jun 2003 15:03:37 GMT"/>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="OpenTraceset">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Open</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_open_activate" last_modification_time="Tue, 10 Jun 2003 15:03:47 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="Close">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Close</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_close_activate" last_modification_time="Tue, 10 Jun 2003 15:03:56 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="CloseTab">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Close Tab</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_close_tab_activate" last_modification_time="Tue, 10 Jun 2003 15:04:06 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="FileMenuSeparator1">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="AddTrace">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Add Trace</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_add_trace_activate" last_modification_time="Tue, 10 Jun 2003 15:04:14 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="RemoveTrace">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Remove Trace</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_remove_trace_activate" last_modification_time="Tue, 10 Jun 2003 15:04:24 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="Save">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Save</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_save_activate" last_modification_time="Tue, 10 Jun 2003 15:04:36 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="SaveAs">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Save As</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_save_as_activate" last_modification_time="Tue, 10 Jun 2003 15:04:45 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="FileMenuSeparator2">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="Quit">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Quit</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_quit_activate" last_modification_time="Tue, 10 Jun 2003 15:04:53 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkMenuItem" id="EditMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_Edit</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="EditMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkImageMenuItem" id="Cut">
+			  <property name="visible">True</property>
+			  <property name="label">gtk-cut</property>
+			  <property name="use_stock">True</property>
+			  <signal name="activate" handler="on_cut_activate" last_modification_time="Tue, 10 Jun 2003 15:05:00 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkImageMenuItem" id="Copy">
+			  <property name="visible">True</property>
+			  <property name="label">gtk-copy</property>
+			  <property name="use_stock">True</property>
+			  <signal name="activate" handler="on_copy_activate" last_modification_time="Tue, 10 Jun 2003 15:05:06 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkImageMenuItem" id="Paste">
+			  <property name="visible">True</property>
+			  <property name="label">gtk-paste</property>
+			  <property name="use_stock">True</property>
+			  <signal name="activate" handler="on_paste_activate" last_modification_time="Tue, 10 Jun 2003 15:05:14 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkImageMenuItem" id="Delete">
+			  <property name="visible">True</property>
+			  <property name="label">gtk-delete</property>
+			  <property name="use_stock">True</property>
+			  <signal name="activate" handler="on_delete_activate" last_modification_time="Tue, 10 Jun 2003 15:05:22 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkMenuItem" id="ViewMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_View</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="ViewMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="ZoomIn">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Zoom in</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_zoom_in_activate" last_modification_time="Tue, 10 Jun 2003 15:05:30 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ZoomOut">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Zoom out</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_zoom_out_activate" last_modification_time="Tue, 10 Jun 2003 15:05:37 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ZoomExtended">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Zoom extended</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_zoom_extended_activate" last_modification_time="Tue, 10 Jun 2003 15:05:44 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ViewMenuSeparator">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="GoToTime">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Go to time</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_go_to_time_activate" last_modification_time="Tue, 10 Jun 2003 15:05:50 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ShowTimeFrame">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Show time frame</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_show_time_frame_activate" last_modification_time="Tue, 10 Jun 2003 15:06:00 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkMenuItem" id="ToolMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Tools</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="ToolMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="MoveViewerUp">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Move viewer up</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_move_viewer_up_activate" last_modification_time="Tue, 10 Jun 2003 15:06:05 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="MoveViewerDown">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Move viewer down</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_move_viewer_down_activate" last_modification_time="Tue, 10 Jun 2003 15:06:14 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="RemoveViewer">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Remove viewer</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_remove_viewer_activate" last_modification_time="Tue, 10 Jun 2003 15:06:21 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ToolMenuSeparator">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="insert_viewer_test">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Insert viewer test</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_insert_viewer_test_activate" last_modification_time="Mon, 16 Jun 2003 16:43:52 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkMenuItem" id="PluginMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Plugins</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="PluginMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="LoadModule">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Load module</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_load_module_activate" last_modification_time="Tue, 10 Jun 2003 15:06:30 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="UnloadModule">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Unload module</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_unload_module_activate" last_modification_time="Tue, 10 Jun 2003 15:06:39 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="AddModuleSearchPath">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Add module search path</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_add_module_search_path_activate" last_modification_time="Tue, 10 Jun 2003 15:06:50 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkMenuItem" id="OptionMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Options</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="OptionMenuTitle_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="Color">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Color</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_color_activate" last_modification_time="Tue, 10 Jun 2003 15:06:58 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="OptMenuSeparator">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="OpenFilter">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Filter</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_filter_activate" last_modification_time="Tue, 10 Jun 2003 15:07:04 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="SaveConfiguration">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Save configuration</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_save_configuration_activate" last_modification_time="Tue, 10 Jun 2003 15:07:12 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuBar" id="MenuHelp">
+	      <property name="visible">True</property>
+
+	      <child>
+		<widget class="GtkMenuItem" id="HelpMenuTitle">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_Help</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="HelpMenu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="Content">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Content</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_content_activate" last_modification_time="Tue, 10 Jun 2003 15:07:19 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="HelpmenuSeparator">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="About">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">About...</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_about_activate" last_modification_time="Tue, 10 Jun 2003 15:07:28 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	      <property name="pack_type">GTK_PACK_END</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkToolbar" id="MToolbar1">
+	  <property name="visible">True</property>
+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+	  <property name="tooltips">True</property>
+
+	  <child>
+	    <widget class="button" id="tlbEmptyTraceset">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">New window with empty trace set</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">filenew.png</property>
+	      <signal name="clicked" handler="on_button_new_clicked" last_modification_time="Thu, 05 Jun 2003 18:24:14 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbOpenTraceset">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">open a trace set</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">fileopen.png</property>
+	      <signal name="clicked" handler="on_button_open_clicked" last_modification_time="Thu, 05 Jun 2003 18:24:37 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbAddTrace">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Add a trace </property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">edit_add_22.png</property>
+	      <signal name="clicked" handler="on_button_add_trace_clicked" last_modification_time="Thu, 05 Jun 2003 18:30:00 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbRemoveTrace">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Remove a trace</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">edit_remove_22.png</property>
+	      <signal name="clicked" handler="on_button_remove_trace_clicked" last_modification_time="Thu, 05 Jun 2003 18:30:09 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbSave">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">save the current trace set</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">filesave.png</property>
+	      <signal name="clicked" handler="on_button_save_clicked" last_modification_time="Thu, 05 Jun 2003 18:25:30 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbSaveAs">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">save as </property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">filesaveas.png</property>
+	      <signal name="clicked" handler="on_button_save_as_clicked" last_modification_time="Thu, 05 Jun 2003 18:26:10 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbZoomIn">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Zoom in</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">stock_zoom_in_24.png</property>
+	      <property name="new_group">True</property>
+	      <signal name="clicked" handler="on_button_zoom_in_clicked" last_modification_time="Thu, 05 Jun 2003 18:26:01 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="new_group">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbZoomOut">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Zoom out</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">stock_zoom_out_24.png</property>
+	      <signal name="clicked" handler="on_button_zoom_out_clicked" last_modification_time="Thu, 05 Jun 2003 18:26:32 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbZoomExtended">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Zoom extended</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">stock_zoom_fit_24.png</property>
+	      <signal name="clicked" handler="on_button_zoom_extended_clicked" last_modification_time="Thu, 05 Jun 2003 18:26:48 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbGoToTime">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Go to time</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">gtk-jump-to.png</property>
+	      <signal name="clicked" handler="on_button_go_to_time_clicked" last_modification_time="Thu, 05 Jun 2003 18:28:07 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbShowTimeFrame">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Show time frame</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">mini-display.xpm</property>
+	      <signal name="clicked" handler="on_button_show_time_frame_clicked" last_modification_time="Thu, 05 Jun 2003 18:28:21 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbMoveViewerUp">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Move up current viewer</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">1uparrow.png</property>
+	      <property name="new_group">True</property>
+	      <signal name="clicked" handler="on_button_move_up_clicked" last_modification_time="Thu, 05 Jun 2003 18:28:41 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="new_group">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbMoveViewerDown">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Move down current viewer</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">1downarrow.png</property>
+	      <signal name="clicked" handler="on_button_move_down_clicked" last_modification_time="Thu, 05 Jun 2003 18:28:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="button" id="tlbRemoveViewer">
+	      <property name="border_width">1</property>
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Delete current viewer</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">remove.png</property>
+	      <signal name="clicked" handler="on_button_delete_viewer_clicked" last_modification_time="Thu, 05 Jun 2003 18:29:26 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkToolbar" id="MToolbar2">
+	  <property name="visible">True</property>
+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	  <property name="tooltips">True</property>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkNotebook" id="MNotebook">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+	  <signal name="switch_page" handler="on_MNotebook_switch_page" last_modification_time="Tue, 17 Jun 2003 17:00:29 GMT"/>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkStatusbar" id="MStatusbar">
+	  <property name="visible">True</property>
+	  <property name="has_resize_grip">True</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.gladep b/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.gladep
new file mode 100644
index 00000000..31586846
--- /dev/null
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/mainwin.gladep
@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
+
+<glade-project>
+  <name>MainWin</name>
+  <program_name>mainwin</program_name>
+  <gnome_support>FALSE</gnome_support>
+  <gettext_support>FALSE</gettext_support>
+  <output_build_files>FALSE</output_build_files>
+  <backup_source_files>FALSE</backup_source_files>
+</glade-project>
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/1downarrow.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/1downarrow.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/1downarrow.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/1downarrow.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/1uparrow.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/1uparrow.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/1uparrow.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/1uparrow.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/Makefile.am
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/edit_add_22.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/edit_add_22.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/edit_add_22.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/edit_add_22.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/edit_remove_22.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/edit_remove_22.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/edit_remove_22.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/edit_remove_22.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/filenew.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filenew.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/filenew.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filenew.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/fileopen.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/fileopen.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/fileopen.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/fileopen.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/filesave.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filesave.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/filesave.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filesave.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/filesaveas.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filesaveas.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/filesaveas.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/filesaveas.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/gtk-add.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/gtk-add.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/gtk-add.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/gtk-add.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/gtk-jump-to.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/gtk-jump-to.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/gtk-jump-to.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/gtk-jump-to.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/mini-display.xpm b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/mini-display.xpm
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/mini-display.xpm
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/mini-display.xpm
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/move_message.xpm b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/move_message.xpm
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/move_message.xpm
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/move_message.xpm
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/remove.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/remove.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/remove.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/remove.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/remove1.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/remove1.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/remove1.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/remove1.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_fit_24.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_fit_24.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_fit_24.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_fit_24.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_in_24.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_in_24.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_in_24.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_in_24.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_out_24.png b/ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_out_24.png
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/pixmaps/stock_zoom_out_24.png
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/pixmaps/stock_zoom_out_24.png
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
similarity index 66%
rename from ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
index b80e2e80..41874356 100644
--- a/ltt/branches/poly/lttv/modules/gui/main/src/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
@@ -3,7 +3,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L$(top_srcdir)/lttv/modules/gui/mainlib -lmainwinapi
+LIBS += $(GTK_LIBS) -L$(top_srcdir)/lttv/modules/gui/lttvgui -llttvgui
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -13,12 +13,12 @@ INCLUDES = \
 
 libdir = ${lttvplugindir}
 
-#bin_PROGRAMS = mainwin
-lib_LTLIBRARIES = libmainwin.la
+#bin_PROGRAMS = lttvwindow
+lib_LTLIBRARIES = liblttvwindow.la
 
 
-libmainwin_la_LDFLAGS = -module
-libmainwin_la_SOURCES = \
+liblttvwindow_la_LDFLAGS = -module
+liblttvwindow_la_SOURCES = \
 	init_module.c \
 	support.c \
 	interface.c \
@@ -33,5 +33,5 @@ noinst_HEADERS = \
 	callbacks.h
 
 
-libmainwin_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
+liblttvwindow_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/callbacks.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/callbacks.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/gtkdirsel.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/gtkmultivpaned.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
similarity index 98%
rename from ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
index 31fb5923..22a7ea4f 100644
--- a/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
@@ -185,6 +185,6 @@ static void destroy() {
 }
 
 
-LTTV_MODULE("mainwin", "Viewer main window", \
+LTTV_MODULE("lttvwindow", "Viewer main window", \
     "Viewer with multiple windows, tabs and panes for graphical modules", \
 	    init, destroy, "stats")
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/interface.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/interface.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/interface.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/interface.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/interface.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/interface.h
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/interface.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/interface.h
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/lttvfilter.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/main.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/main.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/support.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/support.c
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/support.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/support.c
diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/support.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/support.h
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/main/src/support.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/support.h
diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
index f15a5b9f..ae4c8141 100644
--- a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
@@ -7,7 +7,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/mainlib -lmainwinapi
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
 
 libdir = ${lttvplugindir}
 
@@ -16,4 +16,4 @@ libguistatistics_la_LDFLAGS = -module
 libguistatistics_la_SOURCES = statistics.c
 
 EXTRA_DIST = \
-		hGuiStatisticInsert.xpm
\ No newline at end of file
+		hGuiStatisticInsert.xpm
diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
index d1726c00..d596b859 100644
--- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
+++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
@@ -687,5 +687,5 @@ static void destroy() {
 
 LTTV_MODULE("guistatistics", "Statistics viewer", \
     "Graphical module to view statistics about processes, CPUs and systems", \
-    init, destroy, "mainwin")
+    init, destroy, "lttvwindow")
 
-- 
2.34.1