From: Ricardo Markiewicz <gazer.arg@gmail.com>
Date: Thu, 16 Oct 2003 04:31:17 +0000 (+0000)
Subject: Agrego callback para salir del programa de 2 formas distinta : desde el menu creando... 
X-Git-Tag: svn_import~426
X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/c054bed95537d9af309db002e64bfec4bc72051f?ds=sidebyside

Agrego callback para salir del programa de 2 formas distinta : desde el menu creando un objeto derivado y desde la barra de herramientas pasando directamente la funcion a ejecutar
---

diff --git a/Client/include/mnu_file_exit.h b/Client/include/mnu_file_exit.h
new file mode 100644
index 0000000..448950d
--- /dev/null
+++ b/Client/include/mnu_file_exit.h
@@ -0,0 +1,18 @@
+
+/* Maneja el Archivo->Salir */
+
+#include <gtkmm.h>
+#include <iostream>
+
+class MnuFileExit:public Gtk::MenuItem {
+public:
+	MnuFileExit(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::MenuItem(cobject) {
+	}
+	virtual ~MnuFileExit() {}
+
+protected:
+	virtual void on_activate() {
+		Gtk::Main::quit();
+	}
+};
+
diff --git a/Client/src/Makefile.am b/Client/src/Makefile.am
index d4c08fe..25f41fd 100644
--- a/Client/src/Makefile.am
+++ b/Client/src/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
+	-I../include \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
diff --git a/Client/src/client.glade b/Client/src/client.glade
index 5575c48..41e22a0 100644
--- a/Client/src/client.glade
+++ b/Client/src/client.glade
@@ -47,60 +47,11 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="salir1">
+		    <widget class="GtkImageMenuItem" id="mnu_file_exit">
 		      <property name="visible">True</property>
 		      <property name="label">gtk-quit</property>
 		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_salir1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menuitem2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Editar</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem2_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="cortar1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-cut</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_cortar1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="copiar1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-copy</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_copiar1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="pegar1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-paste</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_pegar1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="borrar1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-delete</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_borrar1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
+		      <signal name="activate" handler="on_mnu_exit_activate" last_modification_time="Thu, 16 Oct 2003 03:36:32 GMT"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -125,7 +76,7 @@
 		      <signal name="activate" handler="on_propiedades1_activate" last_modification_time="Thu, 16 Oct 2003 01:17:27 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1">
+			<widget class="GtkImage" id="image3">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
@@ -212,7 +163,7 @@
 	      </child>
 
 	      <child>
-		<widget class="button" id="barr_exit">
+		<widget class="button" id="bar_exit">
 		  <property name="visible">True</property>
 		  <property name="label">gtk-quit</property>
 		  <property name="use_stock">True</property>
diff --git a/Client/src/main.cpp b/Client/src/main.cpp
index c1dfbf5..f7ca2a1 100644
--- a/Client/src/main.cpp
+++ b/Client/src/main.cpp
@@ -2,6 +2,7 @@
 #include <gtkmm.h>
 #include <libglademm.h>
 #include <iostream>
+#include "mnu_file_exit.h"
 
 int main (int argc, char **argv)
 {
@@ -18,10 +19,13 @@ int main (int argc, char **argv)
 	}
 
 	Gtk::Window* pWindow = 0;
+	MnuFileExit *mnu_file_exit = 0;
+	Gtk::Button *bar_exit;
 	refXml->get_widget("Principal", pWindow);
-  if (pWindow) {
-		client.run(*pWindow);
-	}
+	refXml->get_widget_derived("mnu_file_exit", mnu_file_exit);
+	refXml->get_widget("bar_exit", bar_exit);
+	bar_exit->signal_clicked().connect( SigC::slot(Gtk::Main::quit) );
+	client.run(*pWindow);
 
 	return 0;
 }