From c406cf7962a82f1ad93b3b0f044f12b4a628e126 Mon Sep 17 00:00:00 2001
From: petern <petern@6611ac79-6612-48ef-a1e9-b906f853523e>
Date: Sat, 28 Nov 2009 21:10:21 +0000
Subject: [PATCH] Gui progress

git-svn-id: file:///home/vcs/svn/jsweeper/trunk@14 6611ac79-6612-48ef-a1e9-b906f853523e
---
 src/gui.cpp        |  8 +++++++
 src/gui.h          |  1 +
 src/jsweeper.glade | 56 +++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/gui.cpp b/src/gui.cpp
index e6022db..17e5cbf 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -249,6 +249,8 @@ Preferences::Preferences(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builde
 	check_expand_clients->set_active(cfg.ExpandClients);
 	check_expand_groups->set_active(cfg.ExpandGroups);
 
+	Refresh();
+
 	{
 		check_activate_aliases->set_active(cfg.UseAliases);
 
@@ -301,9 +303,14 @@ Preferences *Preferences::Open()
 {
 	Preferences *window = NULL;
 	g_builder->get_widget_derived("dialog_preferences", window);
+	window->Refresh();
 	return window;
 }
 
+void Preferences::Refresh()
+{
+}
+
 void Preferences::on_preferences_close_click()
 {
 	hide();
@@ -331,6 +338,7 @@ void Preferences::on_check_activate_aliases_click()
 	cfg.UseAliases = check_activate_aliases->get_active();
 	pm.Refresh();
 	g->Refresh();
+	Refresh();
 }
 
 void Preferences::on_spin_cell_padding_click()
diff --git a/src/gui.h b/src/gui.h
index 21368eb..c1110de 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -93,6 +93,7 @@ private:
 public:
 	Preferences(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &builder);
 	static Preferences *Open();
+	void Refresh();
 
 protected:
 	void on_preferences_close_click();
diff --git a/src/jsweeper.glade b/src/jsweeper.glade
index f13588e..0df44b8 100644
--- a/src/jsweeper.glade
+++ b/src/jsweeper.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sat Nov 28 15:24:09 2009 -->
+<!--Generated with glade3 3.4.5 on Sat Nov 28 20:11:24 2009 -->
 <glade-interface>
   <widget class="GtkWindow" id="window1">
     <property name="title" translatable="yes">JACK Sweeper</property>
@@ -171,7 +171,9 @@
   </widget>
   <widget class="GtkDialog" id="dialog_preferences">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">JACK Sweeper Preferences</property>
+    <property name="title" translatable="yes">Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
@@ -1211,6 +1213,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About JACK Sweeper</property>
     <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
@@ -1245,6 +1248,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Add Connection Rule</property>
     <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
@@ -1256,10 +1260,44 @@
           <widget class="GtkTable" id="table4">
             <property name="visible">True</property>
             <property name="border_width">5</property>
-            <property name="n_rows">3</property>
+            <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
+            <child>
+              <widget class="GtkRadioButton" id="radiobutton2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Disconnect ports on match</property>
+                <property name="response_id">0</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radiobutton1</property>
+              </widget>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkRadioButton" id="radiobutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Connect ports on match</property>
+                <property name="response_id">0</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radiobutton2</property>
+              </widget>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkCheckButton" id="check_connections_stop">
                 <property name="visible">True</property>
@@ -1270,8 +1308,9 @@
               </widget>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -1368,6 +1407,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Add Alias Rule</property>
     <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
@@ -1489,8 +1529,9 @@
   </widget>
   <widget class="GtkDialog" id="dialog_session_open">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Open Session</property>
+    <property name="title" translatable="yes">Open session</property>
     <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
@@ -1587,6 +1628,9 @@
   </widget>
   <widget class="GtkDialog" id="dialog_session_save">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Save session</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>