From 0521515ee87033f2bcdce2cffcafbecc960a71a6 Mon Sep 17 00:00:00 2001
From: Ricardo Markiewicz <gazer.arg@gmail.com>
Date: Mon, 1 Dec 2003 21:46:26 +0000
Subject: [PATCH] * Se agrega el TIP de luca * Se agregan hot keys * Se agregan
 2 nuevos items al menu (no conectados aun)

---
 Client/dialogs/client.glade | 106 ++++++++++++++++++++++++++++++++----
 Client/src/principal.cpp    |  12 ++++
 2 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/Client/dialogs/client.glade b/Client/dialogs/client.glade
index 9fed003..82c2d9d 100644
--- a/Client/dialogs/client.glade
+++ b/Client/dialogs/client.glade
@@ -39,9 +39,10 @@
 		      <property name="label" translatable="yes">_Conectar</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_mnu_conectar_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
+		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image26">
+			<widget class="GtkImage" id="image36">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-yes</property>
 			  <property name="icon_size">1</property>
@@ -60,9 +61,10 @@
 		      <property name="label" translatable="yes">_Desconectar</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_mnu_file_disconnect_activate" last_modification_time="Sun, 16 Nov 2003 22:40:50 GMT"/>
+		      <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image27">
+			<widget class="GtkImage" id="image37">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-no</property>
 			  <property name="icon_size">1</property>
@@ -111,7 +113,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="image28">
+			<widget class="GtkImage" id="image38">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
@@ -137,6 +139,56 @@
 	      <child>
 		<widget class="GtkMenu" id="mnu_comandos_menu">
 
+		  <child>
+		    <widget class="GtkImageMenuItem" id="mnu_simular">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Simular</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_mnu_simular_activate" last_modification_time="Mon, 01 Dec 2003 21:39:11 GMT"/>
+		      <accelerator key="F3" modifiers="0" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image39">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-refresh</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="mnu_pausar">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Pausar</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_mnu_pausar_activate" last_modification_time="Mon, 01 Dec 2003 21:39:11 GMT"/>
+		      <accelerator key="F9" modifiers="0" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image40">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-cancel</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="GtkMenuItem" id="separador1">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkImageMenuItem" id="mnu_server_stop">
 		      <property name="visible">True</property>
@@ -145,7 +197,7 @@
 		      <signal name="activate" handler="on_mnu_detener_servidor_activate" last_modification_time="Mon, 01 Dec 2003 04:53:26 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image29">
+			<widget class="GtkImage" id="image41">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-stop</property>
 			  <property name="icon_size">1</property>
@@ -179,7 +231,7 @@
 		      <signal name="activate" handler="on_mnu_help_about_activate" last_modification_time="Thu, 16 Oct 2003 18:02:46 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image30">
+			<widget class="GtkImage" id="image42">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-dialog-info</property>
 			  <property name="icon_size">1</property>
@@ -1047,12 +1099,46 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkImage" id="plaqui_logo">
+	    <widget class="GtkVBox" id="vbox4">
 	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkImage" id="plaqui_logo">
+		  <property name="visible">True</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="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="lbl_plaqui_version">
+		  <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="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index cdba798..a94ec37 100644
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -23,6 +23,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 	Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;
 	Gtk::Button *bar_connect=0, *close_about=0;
 	Gtk::Image *plaqui_logo;
+	Gtk::Label *lbl_plaqui_version;
+
 	txt_view = 0;
 	work_place = 0;
 	lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
@@ -39,9 +41,19 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 	current_frame = 0;
 
 	plaqui_logo = anim = 0;
+	lbl_plaqui_version = 0;
+	rg->get_widget("lbl_plaqui_version", lbl_plaqui_version);
 	rg->get_widget("plaqui_logo", plaqui_logo);
 	plaqui_logo->set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/logo.png");
 
+	rg->get_widget("plaqui_logo", plaqui_logo);
+	// Calculo número de revisión.
+	std::string rev = "$Rev$";
+	rev = rev.substr(6, rev.length() - 8);
+	std::string s = "PlaQui Client versión " VERSION " (revisión ";
+	s += rev + ")";	
+	lbl_plaqui_version->set_text(s);
+
 	rg->get_widget("anim_frames", anim);
 	anim->set(anim_frames[current_frame]);
 
-- 
2.43.0