summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/progs/gtk/App.cpp7
-rw-r--r--src/progs/gtk/App.h1
-rw-r--r--src/progs/gtk/ConnectWindow.cpp4
-rw-r--r--src/progs/gtk/ConnectWindow.h1
-rw-r--r--src/progs/gtk/PatchWindow.cpp81
-rw-r--r--src/progs/gtk/PatchWindow.h15
-rw-r--r--src/progs/gtk/om_gtk.glade236
-rw-r--r--src/progs/gtk/om_gtk.glade.bak244
8 files changed, 216 insertions, 373 deletions
diff --git a/src/progs/gtk/App.cpp b/src/progs/gtk/App.cpp
index 4c42ff90..262849d5 100644
--- a/src/progs/gtk/App.cpp
+++ b/src/progs/gtk/App.cpp
@@ -215,13 +215,6 @@ App::quit()
Gtk::Main::quit();
}
-void
-App::quit_and_kill()
-{
- Controller::instance().quit();
- Gtk::Main::quit();
-}
-
} // namespace OmGtk
diff --git a/src/progs/gtk/App.h b/src/progs/gtk/App.h
index dc5e3904..f86dc568 100644
--- a/src/progs/gtk/App.h
+++ b/src/progs/gtk/App.h
@@ -69,7 +69,6 @@ public:
void error_message(const string& msg);
void quit();
- void quit_and_kill();
void add_patch_window(PatchWindow* pw);
void remove_patch_window(PatchWindow* pw);
diff --git a/src/progs/gtk/ConnectWindow.cpp b/src/progs/gtk/ConnectWindow.cpp
index 0b753266..2f160782 100644
--- a/src/progs/gtk/ConnectWindow.cpp
+++ b/src/progs/gtk/ConnectWindow.cpp
@@ -159,6 +159,8 @@ ConnectWindow::gtk_callback()
++stage;
}
} else if (stage == 8) {
+ _label->set_text(string("Connected to engine at ").append(
+ Controller::instance().engine_url()));
stage = -1;
hide(); // FIXME: actually destroy window to save mem?
}
@@ -167,6 +169,8 @@ ConnectWindow::gtk_callback()
_progress_bar->pulse();
if (stage == -1) { // finished connecting
+ _progress_bar->set_fraction(1.0);
+ _launch_button->set_sensitive(false);
return false; // deregister this callback
} else {
return true;
diff --git a/src/progs/gtk/ConnectWindow.h b/src/progs/gtk/ConnectWindow.h
index 8c0c7390..7de15ba1 100644
--- a/src/progs/gtk/ConnectWindow.h
+++ b/src/progs/gtk/ConnectWindow.h
@@ -42,7 +42,6 @@ public:
ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml);
void start(CountedPtr<Om::Shared::ClientInterface> client);
-
private:
void launch_engine();
diff --git a/src/progs/gtk/PatchWindow.cpp b/src/progs/gtk/PatchWindow.cpp
index 8211e653..0814e1ac 100644
--- a/src/progs/gtk/PatchWindow.cpp
+++ b/src/progs/gtk/PatchWindow.cpp
@@ -35,6 +35,7 @@
#include "Controller.h"
#include "BreadCrumb.h"
#include "Store.h"
+#include "ConnectWindow.h"
namespace OmGtk {
@@ -55,16 +56,17 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
xml->get_widget("patch_win_viewport", m_viewport);
xml->get_widget("patch_win_breadcrumb_box", m_breadcrumb_box);
//xml->get_widget("patch_win_status_bar", m_status_bar);
- xml->get_widget("patch_open_menuitem", m_menu_open);
- xml->get_widget("patch_open_into_menuitem", m_menu_open_into);
+ //xml->get_widget("patch_open_menuitem", m_menu_open);
+ xml->get_widget("patch_import_menuitem", m_menu_import);
+ //xml->get_widget("patch_open_into_menuitem", m_menu_open_into);
xml->get_widget("patch_save_menuitem", m_menu_save);
xml->get_widget("patch_save_as_menuitem", m_menu_save_as);
xml->get_widget("patch_close_menuitem", m_menu_close);
xml->get_widget("patch_configuration_menuitem", m_menu_configuration);
xml->get_widget("patch_quit_menuitem", m_menu_quit);
- xml->get_widget("patch_quit_and_kill_menuitem", m_menu_quit_and_kill);
xml->get_widget("patch_view_control_window_menuitem", m_menu_view_control_window);
- xml->get_widget("patch_description_menuitem", m_menu_view_patch_description);
+ xml->get_widget("patch_view_engine_window_menuitem", m_menu_view_engine_window);
+ xml->get_widget("patch_properties_menuitem", m_menu_view_patch_properties);
xml->get_widget("patch_fullscreen_menuitem", m_menu_fullscreen);
xml->get_widget("patch_clear_menuitem", m_menu_clear);
xml->get_widget("patch_destroy_menuitem", m_menu_destroy_patch);
@@ -89,10 +91,10 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
//m_status_bar->push(Controller::instance().engine_url());
//m_status_bar->pack_start(*Gtk::manage(new Gtk::Image(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_MENU)), false, false);
- m_menu_open->signal_activate().connect(
- sigc::mem_fun(this, &PatchWindow::event_open));
- m_menu_open_into->signal_activate().connect(
- sigc::mem_fun(this, &PatchWindow::event_open_into));
+ /*m_menu_open->signal_activate().connect(
+ sigc::mem_fun(this, &PatchWindow::event_open));*/
+ m_menu_import->signal_activate().connect(
+ sigc::mem_fun(this, &PatchWindow::event_import));
m_menu_save->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_save));
m_menu_save_as->signal_activate().connect(
@@ -100,16 +102,16 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
m_menu_close->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_close));
m_menu_quit->signal_activate().connect(
- sigc::mem_fun(App::instance(), &App::quit));
- m_menu_quit_and_kill->signal_activate().connect(
- sigc::mem_fun(App::instance(), &App::quit_and_kill));
+ sigc::mem_fun(this, &PatchWindow::event_quit));
m_menu_configuration->signal_activate().connect(
sigc::mem_fun(App::instance().configuration_dialog(), &ConfigWindow::show));
m_menu_fullscreen->signal_toggled().connect(
sigc::mem_fun(this, &PatchWindow::event_fullscreen_toggled));
+ m_menu_view_engine_window->signal_activate().connect(
+ sigc::mem_fun(this, &PatchWindow::event_show_engine));
m_menu_view_control_window->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_show_controls));
- m_menu_view_patch_description->signal_activate().connect(
+ m_menu_view_patch_properties->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_show_properties));
m_menu_destroy_patch->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_destroy));
@@ -301,6 +303,14 @@ PatchWindow::breadcrumb_clicked(BreadCrumb* crumb)
void
+PatchWindow::event_show_engine()
+{
+ if (m_patch)
+ App::instance().connect_window()->show();
+}
+
+
+void
PatchWindow::event_show_controls()
{
if (m_patch)
@@ -362,16 +372,17 @@ PatchWindow::patch_renamed(const string& new_path)
}
}
-
+/*
void
PatchWindow::event_open()
{
m_load_patch_window->set_replace();
m_load_patch_window->present();
}
+*/
void
-PatchWindow::event_open_into()
+PatchWindow::event_import()
{
m_load_patch_window->set_merge();
m_load_patch_window->present();
@@ -497,14 +508,46 @@ PatchWindow::event_close()
if (App::instance().num_open_patch_windows() > 1) {
hide();
} else {
- Gtk::MessageDialog d(*this, "This is the last remaining open Om patch\
-window. Closing this window will exit OmGtk (the engine will remain running).\n\n\
-Are you sure you want to quit?",
- true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK_CANCEL, true);
+ Gtk::MessageDialog d(*this, "This is the last remaining open patch "
+ "window. Closing this window will exit OmGtk (the engine will "
+ "remain running).\n\nAre you sure you want to quit?",
+ true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true);
+ d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE);
int ret = d.run();
- if (ret == Gtk::RESPONSE_OK)
+ if (ret == Gtk::RESPONSE_CLOSE)
App::instance().quit();
+ else
+ d.hide();
+ }
+}
+
+
+void
+PatchWindow::event_quit()
+{
+ Gtk::MessageDialog d(*this, "Would you like to quit just OmGtk\nor kill the engine as well?",
+ true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+ d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+
+ Gtk::Button* b = d.add_button(Gtk::Stock::REMOVE, 2); // kill
+ b->set_label("_Kill Engine");
+ Gtk::Widget* kill_img = Gtk::manage(new Gtk::Image(Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON));
+ b->set_image(*kill_img);
+
+ b = d.add_button(Gtk::Stock::QUIT, 1); // just exit
+ b->set_label("_Quit");
+ Gtk::Widget* close_img = Gtk::manage(new Gtk::Image(Gtk::Stock::QUIT, Gtk::ICON_SIZE_BUTTON));
+ b->set_image(*close_img);
+
+ int ret = d.run();
+ if (ret == 1) {
+ App::instance().quit();
+ } else if (ret == 2) {
+ Controller::instance().quit();
+ App::instance().quit();
}
+ // Otherwise cancelled, do nothing
}
diff --git a/src/progs/gtk/PatchWindow.h b/src/progs/gtk/PatchWindow.h
index 42fba478..2821fa41 100644
--- a/src/progs/gtk/PatchWindow.h
+++ b/src/progs/gtk/PatchWindow.h
@@ -85,17 +85,18 @@ protected:
bool on_key_press_event(GdkEventKey* event);
private:
- void event_open();
- void event_open_into();
+ //void event_open();
+ void event_import();
void event_save();
void event_save_as();
void event_close();
+ void event_quit();
void event_destroy();
void event_clear();
void event_fullscreen_toggled();
void event_show_properties();
void event_show_controls();
-
+ void event_show_engine();
PatchController* m_patch;
LoadPluginWindow* m_load_plugin_window;
@@ -108,19 +109,19 @@ private:
int m_x;
int m_y;
- Gtk::MenuItem* m_menu_open;
- Gtk::MenuItem* m_menu_open_into;
+ //Gtk::MenuItem* m_menu_open;
+ Gtk::MenuItem* m_menu_import;
Gtk::MenuItem* m_menu_save;
Gtk::MenuItem* m_menu_save_as;
Gtk::MenuItem* m_menu_configuration;
Gtk::MenuItem* m_menu_close;
Gtk::MenuItem* m_menu_quit;
- Gtk::MenuItem* m_menu_quit_and_kill;
Gtk::CheckMenuItem* m_menu_fullscreen;
Gtk::MenuItem* m_menu_clear;
Gtk::MenuItem* m_menu_destroy_patch;
+ Gtk::MenuItem* m_menu_view_engine_window;
Gtk::MenuItem* m_menu_view_control_window;
- Gtk::MenuItem* m_menu_view_patch_description;
+ Gtk::MenuItem* m_menu_view_patch_properties;
Gtk::MenuItem* m_menu_add_plugin;
Gtk::MenuItem* m_menu_new_subpatch;
Gtk::MenuItem* m_menu_load_subpatch;
diff --git a/src/progs/gtk/om_gtk.glade b/src/progs/gtk/om_gtk.glade
index bbf98197..809451bf 100644
--- a/src/progs/gtk/om_gtk.glade
+++ b/src/progs/gtk/om_gtk.glade
@@ -44,37 +44,15 @@
<widget class="GtkMenu" id="patch_file_menu_menu">
<child>
- <widget class="GtkImageMenuItem" id="patch_open_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_import_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Open (Replace)...</property>
+ <property name="tooltip" translatable="yes">Load a patch into the current patch (merge with existing contents).</property>
+ <property name="label" translatable="yes">_Import</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_open_(replace)1_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
- <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_patch_import_menuitem_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1609">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="patch_open_into_menuitem">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open _Into (Import)...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_open_into_(merge)1_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
- <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1610">
+ <widget class="GtkImage" id="image1834">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -97,22 +75,9 @@
<widget class="GtkImageMenuItem" id="patch_save_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save this patch</property>
- <property name="label" translatable="yes">_Save</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-save</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_file_save_patch_menuitem_activate" last_modification_time="Thu, 20 Jan 2005 08:35:00 GMT"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1611">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -120,22 +85,9 @@
<widget class="GtkImageMenuItem" id="patch_save_as_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save this patch to a specific filename</property>
- <property name="label" translatable="yes">Save _As...</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-save-as</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_file_save_patch_menuitem_activate" last_modification_time="Sat, 23 Oct 2004 02:16:12 GMT"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1612">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -155,7 +107,7 @@
<accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1613">
+ <widget class="GtkImage" id="image1835">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -178,22 +130,9 @@
<widget class="GtkImageMenuItem" id="patch_close_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Close this window (patch will not be destroyed)</property>
- <property name="label" translatable="yes">Close _Window</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_file_close_menuitem_activate" last_modification_time="Sat, 11 Sep 2004 20:05:11 GMT"/>
- <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1614">
- <property name="visible">True</property>
- <property name="stock">gtk-close</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -207,45 +146,9 @@
<widget class="GtkImageMenuItem" id="patch_quit_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Quit OmGtk (Om engine will continue running)</property>
- <property name="label" translatable="yes">_Quit</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_file_quit_nokill_menuitem_activate" last_modification_time="Sun, 29 Jan 2006 21:18:07 GMT"/>
- <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1615">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="patch_quit_and_kill_menuitem">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Quit OmGtk and kill the Om engine</property>
- <property name="label" translatable="yes">Quit and _Kill Engine</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_patch_file_quit_and_kill_menuitem_activate" last_modification_time="Sun, 29 Jan 2006 21:18:19 GMT"/>
- <accelerator key="Q" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1616">
- <property name="visible">True</property>
- <property name="stock">gtk-stop</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -267,7 +170,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Fullscreen</property>
<property name="use_underline">True</property>
- <property name="active">False</property>
+ <property name="active">True</property>
<signal name="activate" handler="patch_fullscreen_menuitem" last_modification_time="Sat, 11 Mar 2006 05:24:13 GMT"/>
<accelerator key="F11" modifiers="0" signal="activate"/>
</widget>
@@ -289,7 +192,7 @@
<accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1617">
+ <widget class="GtkImage" id="image1836">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -303,24 +206,12 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_description_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_properties_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">View/Edit description for this patch</property>
- <property name="label" translatable="yes">Descr_iption</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_patch_description_menuitem_activate" last_modification_time="Mon, 08 Aug 2005 07:18:52 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1618">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <property name="tooltip" translatable="yes">View/Edit properties for this patch</property>
+ <property name="label">gtk-properties</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_patch_properties_menuitem_activate" last_modification_time="Mon, 08 Aug 2005 07:18:52 GMT"/>
</widget>
</child>
@@ -328,21 +219,9 @@
<widget class="GtkImageMenuItem" id="patch_clear_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Remove all objects from patch</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_clear_menuitem_activate" last_modification_time="Wed, 22 Feb 2006 21:29:43 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1619">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -355,7 +234,7 @@
<signal name="activate" handler="on_patch_destroy_menuitem_activate" last_modification_time="Wed, 25 May 2005 00:22:00 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1620">
+ <widget class="GtkImage" id="image1837">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -375,7 +254,7 @@
<child>
<widget class="GtkMenuItem" id="add_menu">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes">_Add</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_add_menu_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
@@ -385,13 +264,13 @@
<child>
<widget class="GtkImageMenuItem" id="patch_add_plugin_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Insert a plugin into this patch</property>
+ <property name="tooltip" translatable="yes">Load a plugin as a child of this patch</property>
<property name="label" translatable="yes">_Plugin...</property>
<property name="use_underline">True</property>
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1621">
+ <widget class="GtkImage" id="image1838">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -405,18 +284,18 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_add_new_subpatch_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_add_subpatch_from_file_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Insert a new, empty subpatch into this patchch</property>
- <property name="label" translatable="yes">_New Patch...</property>
+ <property name="tooltip" translatable="yes">Load a patch as a child of this patch</property>
+ <property name="label" translatable="yes">_Patch From File...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_add_new_subpatch_menuitem_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
- <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_subpatch_from_file1_activate" last_modification_time="Sun, 27 Feb 2005 00:37:03 GMT"/>
+ <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1622">
+ <widget class="GtkImage" id="image1839">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="stock">gtk-open</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -428,18 +307,18 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_add_subpatch_from_file_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_add_new_subpatch_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load a subpatch from a file and insert it into this patch</property>
- <property name="label" translatable="yes">_Load Patch...</property>
+ <property name="tooltip" translatable="yes">Create a new (empty) patch as a child of this patch</property>
+ <property name="label" translatable="yes">_New Patch...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_subpatch_from_file1_activate" last_modification_time="Sun, 27 Feb 2005 00:37:03 GMT"/>
- <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_add_new_subpatch_menuitem_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
+ <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1623">
+ <widget class="GtkImage" id="image1840">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
+ <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -466,7 +345,7 @@
<signal name="activate" handler="on_right_click_on_canvas_to_place_a_new_object1_activate" last_modification_time="Sun, 29 Jan 2006 21:22:13 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1624">
+ <widget class="GtkImage" id="image1841">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
@@ -494,6 +373,29 @@
<widget class="GtkMenu" id="view1_menu">
<child>
+ <widget class="GtkImageMenuItem" id="patch_view_engine_window_menuitem">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Connect to, Disconnect from, or Launch Engine</property>
+ <property name="label" translatable="yes">_Engine</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_patch_view_engine_window_menuitem_activate" last_modification_time="Fri, 16 Jun 2006 03:48:44 GMT"/>
+ <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1842">
+ <property name="visible">True</property>
+ <property name="stock">gtk-connect</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="patch_view_patch_tree_window_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">View all patches in the engine as a heirarchial list</property>
@@ -503,7 +405,7 @@
<accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1625">
+ <widget class="GtkImage" id="image1843">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
@@ -526,7 +428,7 @@
<accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1626">
+ <widget class="GtkImage" id="image1844">
<property name="visible">True</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">1</property>
@@ -3278,7 +3180,7 @@ Contributors:
<widget class="GtkDialog" id="connect_win">
<property name="border_width">6</property>
- <property name="title" translatable="yes">Connecting to Engine</property>
+ <property name="title" translatable="yes">Connect to Engine</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@@ -3385,7 +3287,7 @@ Contributors:
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-quit</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
diff --git a/src/progs/gtk/om_gtk.glade.bak b/src/progs/gtk/om_gtk.glade.bak
index 508ee6b1..809451bf 100644
--- a/src/progs/gtk/om_gtk.glade.bak
+++ b/src/progs/gtk/om_gtk.glade.bak
@@ -44,37 +44,15 @@
<widget class="GtkMenu" id="patch_file_menu_menu">
<child>
- <widget class="GtkImageMenuItem" id="patch_open_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_import_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Open (Replace)...</property>
+ <property name="tooltip" translatable="yes">Load a patch into the current patch (merge with existing contents).</property>
+ <property name="label" translatable="yes">_Import</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_open_(replace)1_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
- <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_patch_import_menuitem_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1609">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="patch_open_into_menuitem">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open _Into (Import)...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_open_into_(merge)1_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
- <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1610">
+ <widget class="GtkImage" id="image1834">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -97,22 +75,9 @@
<widget class="GtkImageMenuItem" id="patch_save_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save this patch</property>
- <property name="label" translatable="yes">_Save</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-save</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_file_save_patch_menuitem_activate" last_modification_time="Thu, 20 Jan 2005 08:35:00 GMT"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1611">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -120,22 +85,9 @@
<widget class="GtkImageMenuItem" id="patch_save_as_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save this patch to a specific filename</property>
- <property name="label" translatable="yes">Save _As...</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-save-as</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_file_save_patch_menuitem_activate" last_modification_time="Sat, 23 Oct 2004 02:16:12 GMT"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1612">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -155,7 +107,7 @@
<accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1613">
+ <widget class="GtkImage" id="image1835">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -178,22 +130,9 @@
<widget class="GtkImageMenuItem" id="patch_close_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Close this window (patch will not be destroyed)</property>
- <property name="label" translatable="yes">Close _Window</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_file_close_menuitem_activate" last_modification_time="Sat, 11 Sep 2004 20:05:11 GMT"/>
- <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1614">
- <property name="visible">True</property>
- <property name="stock">gtk-close</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -207,45 +146,9 @@
<widget class="GtkImageMenuItem" id="patch_quit_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Quit OmGtk (Om engine will continue running)</property>
- <property name="label" translatable="yes">_Quit</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_file_quit_nokill_menuitem_activate" last_modification_time="Sun, 29 Jan 2006 21:18:07 GMT"/>
- <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1615">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="patch_quit_and_kill_menuitem">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Quit OmGtk and kill the Om engine</property>
- <property name="label" translatable="yes">Quit and _Kill Engine</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_patch_file_quit_and_kill_menuitem_activate" last_modification_time="Sun, 29 Jan 2006 21:18:19 GMT"/>
- <accelerator key="Q" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1616">
- <property name="visible">True</property>
- <property name="stock">gtk-stop</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -267,7 +170,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Fullscreen</property>
<property name="use_underline">True</property>
- <property name="active">False</property>
+ <property name="active">True</property>
<signal name="activate" handler="patch_fullscreen_menuitem" last_modification_time="Sat, 11 Mar 2006 05:24:13 GMT"/>
<accelerator key="F11" modifiers="0" signal="activate"/>
</widget>
@@ -289,7 +192,7 @@
<accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1617">
+ <widget class="GtkImage" id="image1836">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -303,24 +206,12 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_description_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_properties_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">View/Edit description for this patch</property>
- <property name="label" translatable="yes">Descr_iption</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_patch_description_menuitem_activate" last_modification_time="Mon, 08 Aug 2005 07:18:52 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1618">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <property name="tooltip" translatable="yes">View/Edit properties for this patch</property>
+ <property name="label">gtk-properties</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_patch_properties_menuitem_activate" last_modification_time="Mon, 08 Aug 2005 07:18:52 GMT"/>
</widget>
</child>
@@ -328,21 +219,9 @@
<widget class="GtkImageMenuItem" id="patch_clear_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Remove all objects from patch</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_patch_clear_menuitem_activate" last_modification_time="Wed, 22 Feb 2006 21:29:43 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image1619">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
</widget>
</child>
@@ -355,7 +234,7 @@
<signal name="activate" handler="on_patch_destroy_menuitem_activate" last_modification_time="Wed, 25 May 2005 00:22:00 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1620">
+ <widget class="GtkImage" id="image1837">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -375,7 +254,7 @@
<child>
<widget class="GtkMenuItem" id="add_menu">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes">_Add</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_add_menu_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
@@ -385,13 +264,13 @@
<child>
<widget class="GtkImageMenuItem" id="patch_add_plugin_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Insert a plugin into this patch</property>
+ <property name="tooltip" translatable="yes">Load a plugin as a child of this patch</property>
<property name="label" translatable="yes">_Plugin...</property>
<property name="use_underline">True</property>
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1621">
+ <widget class="GtkImage" id="image1838">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -405,18 +284,18 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_add_new_subpatch_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_add_subpatch_from_file_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Insert a new, empty subpatch into this patchch</property>
- <property name="label" translatable="yes">_New Patch...</property>
+ <property name="tooltip" translatable="yes">Load a patch as a child of this patch</property>
+ <property name="label" translatable="yes">_Patch From File...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_add_new_subpatch_menuitem_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
- <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_subpatch_from_file1_activate" last_modification_time="Sun, 27 Feb 2005 00:37:03 GMT"/>
+ <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1622">
+ <widget class="GtkImage" id="image1839">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="stock">gtk-open</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -428,18 +307,18 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_add_subpatch_from_file_menuitem">
+ <widget class="GtkImageMenuItem" id="patch_add_new_subpatch_menuitem">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load a subpatch from a file and insert it into this patch</property>
- <property name="label" translatable="yes">_Load Patch...</property>
+ <property name="tooltip" translatable="yes">Create a new (empty) patch as a child of this patch</property>
+ <property name="label" translatable="yes">_New Patch...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_subpatch_from_file1_activate" last_modification_time="Sun, 27 Feb 2005 00:37:03 GMT"/>
- <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="on_add_new_subpatch_menuitem_activate" last_modification_time="Sun, 26 Dec 2004 04:33:10 GMT"/>
+ <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1623">
+ <widget class="GtkImage" id="image1840">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
+ <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -466,7 +345,7 @@
<signal name="activate" handler="on_right_click_on_canvas_to_place_a_new_object1_activate" last_modification_time="Sun, 29 Jan 2006 21:22:13 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1624">
+ <widget class="GtkImage" id="image1841">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
@@ -494,6 +373,29 @@
<widget class="GtkMenu" id="view1_menu">
<child>
+ <widget class="GtkImageMenuItem" id="patch_view_engine_window_menuitem">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Connect to, Disconnect from, or Launch Engine</property>
+ <property name="label" translatable="yes">_Engine</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_patch_view_engine_window_menuitem_activate" last_modification_time="Fri, 16 Jun 2006 03:48:44 GMT"/>
+ <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1842">
+ <property name="visible">True</property>
+ <property name="stock">gtk-connect</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="patch_view_patch_tree_window_menuitem">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">View all patches in the engine as a heirarchial list</property>
@@ -503,7 +405,7 @@
<accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1625">
+ <widget class="GtkImage" id="image1843">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
@@ -526,7 +428,7 @@
<accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1626">
+ <widget class="GtkImage" id="image1844">
<property name="visible">True</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">1</property>
@@ -2533,7 +2435,7 @@
</child>
<child>
- <widget class="GtkEntry" id="description_author_entry">
+ <widget class="GtkEntry" id="properties_author_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -2568,7 +2470,7 @@
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkTextView" id="description_description_textview">
+ <widget class="GtkTextView" id="properties_description_textview">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">A short description of the patch to be included in the patch file</property>
<property name="can_focus">True</property>
@@ -2602,7 +2504,7 @@
<property name="spacing">5</property>
<child>
- <widget class="GtkButton" id="description_cancel_button">
+ <widget class="GtkButton" id="properties_cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -2614,7 +2516,7 @@
</child>
<child>
- <widget class="GtkButton" id="description_ok_button">
+ <widget class="GtkButton" id="properties_ok_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Apply these changes to be saved the next time the patch is saved</property>
<property name="can_default">True</property>
@@ -3278,7 +3180,7 @@ Contributors:
<widget class="GtkDialog" id="connect_win">
<property name="border_width">6</property>
- <property name="title" translatable="yes">Connecting to Engine</property>
+ <property name="title" translatable="yes">Connect to Engine</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@@ -3385,7 +3287,7 @@ Contributors:
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-quit</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 16:45:36 +0000