[gevice] clear script.
- From: Alejandro Valdes Jimenez <avaldes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gevice] clear script.
- Date: Mon, 4 Jan 2010 19:36:10 +0000 (UTC)
commit d0cb22d6a52a0a5ee1a4b48badd8fda3248719e0
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date: Mon Jan 4 16:36:00 2010 -0300
clear script.
ChangeLog | 7 +++++++
configure.ac | 2 +-
src/gevice.py | 40 +---------------------------------------
src/gevicevte.py | 3 +++
4 files changed, 12 insertions(+), 40 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b668d4..4b6fcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
2010-01-04 Alejandro Valdes Jimenez <avaldes gnome org>
+ TAG GEVICE_0_6_0
+
+ * configure.ac:
+ * src/gevice.py:
+ * src/gevicevte.py:
+
+2010-01-04 Alejandro Valdes Jimenez <avaldes gnome org>
* src/gevice.py:
* src/gevicevte.py: Use gtk.VScrollbar
diff --git a/configure.ac b/configure.ac
index a903994..48574cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([gevice], [0.5.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gevice],[gevice])
+AC_INIT([gevice], [0.6.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=gevice],[gevice])
AC_CONFIG_SRCDIR(src/gevice.py)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/src/gevice.py b/src/gevice.py
index ab85615..c74a1af 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -87,8 +87,6 @@ UI = '''<ui>
<menuitem action="Connect"/>
<menuitem action="Expand"/>
<menuitem action="Decrease"/>
- <separator/>
- <menuitem action="Monitoring"/>
</menu>
<menu action="HelpMenu">
<menuitem action="About"/>
@@ -132,8 +130,6 @@ class Gevice:
self.statusicon.set_tooltip("Esta es una advertencia")
self.statusicon.set_visible(False)
self.statusicon.set_blinking(True)
- self.statusicon.connect ("activate",self.on_statusicon_activate)
- self.msgmonitor = ""
# get model for devices
self.gmodel = gevicemodel.GeviceModel(self)
@@ -204,8 +200,7 @@ class Gevice:
self.actiongroup_window.add_toggle_actions([
('Tree', None, _('Tree'),None, _('Show tree'), self.on_toggle_tree, True),
- ('Terminal', None, _('Terminal'),None, _('Show terminal'), self.on_toggle_terminal, True),
- ('Monitoring', None, _('Monitoring'),None, _('Activate monitoring'), self.on_toggle_monitoring, False)
+ ('Terminal', None, _('Terminal'),None, _('Show terminal'), self.on_toggle_terminal, True)
])
self.actiongroup_window.add_radio_actions([
@@ -304,17 +299,6 @@ class Gevice:
self.window_main.show_all()
return
- def on_statusicon_activate(gevice, statusicon):
- statusicon.set_visible(False)
- dialog = gtk.Dialog(config.PACKAGE,None,gtk.DIALOG_DESTROY_WITH_PARENT,(gtk.STOCK_OK,gtk.RESPONSE_ACCEPT))
- dialog.vbox.set_spacing(15)
- dialog.vbox.pack_start(gtk.Label(gevice.msgmonitor))
- dialog.show_all()
- response = dialog.run ()
- dialog.destroy()
- print gevice.msgmonitor
-
-
def set_listusers_on_combobox (self):
self.modelusers.clear()
for user in self.gpref.listusers:
@@ -600,28 +584,6 @@ class Gevice:
else:
gevice.vboxterminal.hide ()
- def on_toggle_monitoring (gevice,action):
- if (action.get_active() == True):
- pinglist = []
- gevice.gmodel.treestore.foreach(gevice.get_ips,pinglist)
-
- report = ("No response","Partial Response","Alive")
-
- gevice.msgmonitor = ""
- for pingle in pinglist:
- pingle.join()
- gevice.msgmonitor = gevice.msgmonitor + _("Status from: ") + str(pingle.ip) + _(" is ") + report[pingle.status] + " \n"
-
- gevice.statusicon.set_visible(True)
- ###n = pynotify.Notification("EL2009",msg ,uri)
- ###n = pynotify.Notification(config.PACKAGE,msg)
- ###n.set_urgency(pynotify.URGENCY_CRITICAL)
- ###n.set_timeout(1000) #10000 -> 10 seg
- ###n.show()
- else:
- # disable monitoring
- pass
-
def get_ips(self,model,path,iter,pinglist):
data = model.get(iter,config.COLUMN_NAME_DEV,config.COLUMN_IP_DEV,config.COLUMN_SERIAL_DEV)
current = geviceping.GevicePing(data[1])
diff --git a/src/gevicevte.py b/src/gevicevte.py
index 17bc233..f97afd1 100644
--- a/src/gevicevte.py
+++ b/src/gevicevte.py
@@ -24,10 +24,13 @@ class GeviceVte:
terminal.set_size_request(10,10)
terminal.set_size (30,1)
terminal.set_mouse_autohide (True)
+
scroll = gtk.VScrollbar(terminal.get_adjustment())
hbox_term.pack_start(terminal,True,True,0)
hbox_term.pack_start(scroll,False,False,0)
+
+ terminal.grab_focus()
return hbox_term,terminal
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]