From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 10 May 2010 17:02:41 +0000 (+0200)
Subject: Convert syntax-editor from .glade to .ui
X-Git-Tag: v0.7.5~25^2~17
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=e0b455e1dd8b1bced47283aac4111cac225e45a3

Convert syntax-editor from .glade to .ui
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 48154d6d..11bf9bc7 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -24,7 +24,7 @@ UI_FILES = \
 	src/ui/gui/variable-info.ui \
 	src/ui/gui/data-editor.ui \
 	src/ui/gui/output-viewer.glade \
-	src/ui/gui/syntax-editor.glade
+	src/ui/gui/syntax-editor.ui
 
 EXTRA_DIST += \
 	src/ui/gui/OChangeLog \
@@ -85,9 +85,7 @@ uninstall-icons:
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
 nodist_src_ui_gui_psppire_DATA = \
-	$(top_builddir)/src/ui/gui/output-viewer.ui \
-	$(top_builddir)/src/ui/gui/syntax-editor.ui
-
+	$(top_builddir)/src/ui/gui/output-viewer.ui
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
diff --git a/src/ui/gui/syntax-editor.glade b/src/ui/gui/syntax-editor.glade
deleted file mode 100644
index ae43ea5b..00000000
--- a/src/ui/gui/syntax-editor.glade
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-	<widget class="GtkMenuBar" id="menubar">
-	  <property name="visible">True</property>
-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menu_syntax_file">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menu_syntax_file_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="new2">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-new</property>
-		      <property name="use_stock">True</property>
-
-		      <child>
-			<widget class="GtkMenu" id="new2_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="file_new_syntax">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Syntax</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="file_new_data">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="label" translatable="yes">_Data</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="open2">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-open</property>
-		      <property name="use_stock">True</property>
-
-		      <child>
-			<widget class="GtkMenu" id="open2_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="file_open_syntax">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Syntax</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="file_open_data">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="label" translatable="yes">_Data</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="file_save">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-save</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="file_save_as">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-save-as</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="file_quit">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-quit</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menuitem7">
-	      <property name="visible">False</property>
-	      <property name="sensitive">False</property>
-	      <property name="label" translatable="yes">_Edit</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem7_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="cut2">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-cut</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="copy2">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-copy</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="paste2">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-paste</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="delete1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-delete</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="run1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Run</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="run1_menu">
-
-		  <child>
-		    <widget class="GtkMenuItem" id="run_all">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">All</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="run_selection">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Selection</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="run_current_line">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Current Line</property>
-		      <property name="use_underline">True</property>
-                      <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="run_to_end">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">To End</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="windows">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Windows</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="windows_menu">
-
-		  <child>
-		    <widget class="GtkMenuItem" id="windows_minimise_all">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Minimize All Windows</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-
-
-	<widget class="GtkScrolledWindow" id="scrolledwindow8">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTextView" id="syntax_text_view">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="overwrite">False</property>
-	      <property name="accepts_tab">True</property>
-	      <property name="justification">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap_mode">GTK_WRAP_NONE</property>
-	      <property name="cursor_visible">True</property>
-	      <property name="pixels_above_lines">0</property>
-	      <property name="pixels_below_lines">0</property>
-	      <property name="pixels_inside_wrap">0</property>
-	      <property name="left_margin">0</property>
-	      <property name="right_margin">0</property>
-	      <property name="indent">0</property>
-	      <property name="text" translatable="yes"></property>
-	    </widget>
-	  </child>
-	</widget>
-
-	<widget class="GtkStatusbar" id="statusbar2">
-	  <property name="visible">True</property>
-	  <property name="has_resize_grip">True</property>
-	</widget>
-
-</glade-interface>