[wiican] Comment displayed in the mapping cell on Mapping Manager dialog
- From: J. Félix Ontañón <felixonta src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [wiican] Comment displayed in the mapping cell on Mapping Manager dialog
- Date: Fri, 5 Nov 2010 18:18:05 +0000 (UTC)
commit 133a3726e27bd79df38142348dda831f16a42f50
Author: J. Félix Ontañón <fontanon emergya es>
Date: Fri Nov 5 19:05:46 2010 +0100
Comment displayed in the mapping cell on Mapping Manager dialog
data/mapping.ui | 45 ++++++++++++++++-----------------------------
wiican/ui/managerdlg.py | 13 +++++++++----
2 files changed, 25 insertions(+), 33 deletions(-)
---
diff --git a/data/mapping.ui b/data/mapping.ui
index 1bbaddf..0aa888d 100644
--- a/data/mapping.ui
+++ b/data/mapping.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -29,7 +29,6 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
@@ -38,7 +37,6 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="new_btn">
@@ -156,11 +154,14 @@
<signal name="row_activated" handler="mapping_list_row_activated_cb"/>
<signal name="key_release_event" handler="mapping_list_key_release_event_cb"/>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+ <property name="title">Visible</property>
<child>
- <object class="GtkCellRendererPixbuf" id="icon_cell"/>
+ <object class="GtkCellRendererToggle" id="visible_cell">
+ <signal name="toggled" handler="visible_cell_toggled_cb"/>
+ </object>
<attributes>
- <attribute name="pixbuf">0</attribute>
+ <attribute name="active">3</attribute>
</attributes>
</child>
</object>
@@ -170,22 +171,16 @@
<property name="resizable">True</property>
<property name="title">Name</property>
<child>
- <object class="GtkCellRendererText" id="mappingname_cell"/>
+ <object class="GtkCellRendererPixbuf" id="icon_cell"/>
<attributes>
- <attribute name="text">1</attribute>
+ <attribute name="pixbuf">0</attribute>
</attributes>
</child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn3">
- <property name="title">Visible</property>
<child>
- <object class="GtkCellRendererToggle" id="visible_cell">
- <signal name="toggled" handler="visible_cell_toggled_cb"/>
- </object>
+ <object class="GtkCellRendererText" id="mappingname_cell"/>
<attributes>
- <attribute name="active">3</attribute>
+ <attribute name="markup">1</attribute>
+ <attribute name="text">1</attribute>
</attributes>
</child>
</object>
@@ -211,7 +206,6 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="up_btn">
@@ -313,16 +307,13 @@
<property name="destroy_with_parent">True</property>
<property name="icon_name">document-properties</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
@@ -336,7 +327,6 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox1">
@@ -345,7 +335,6 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
@@ -401,13 +390,12 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
<packing>
<property name="expand">False</property>
@@ -419,7 +407,7 @@
<object class="GtkEntry" id="comment_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
<packing>
<property name="expand">False</property>
@@ -432,7 +420,7 @@
<property name="width_request">8</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
<packing>
<property name="position">2</property>
@@ -443,7 +431,7 @@
<property name="width_request">8</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
<packing>
<property name="position">3</property>
@@ -528,7 +516,6 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
diff --git a/wiican/ui/managerdlg.py b/wiican/ui/managerdlg.py
index 12625ab..f416022 100644
--- a/wiican/ui/managerdlg.py
+++ b/wiican/ui/managerdlg.py
@@ -58,7 +58,8 @@ class MappingManagerDialog(object):
icon = gtk.gdk.pixbuf_new_from_file_at_size(icon_path, 24, 24)
visible = mapping_manager.is_visible(mapping_id)
- self.mapping_store.append([icon, mapping.get_name(),
+ mapping_name = '<b>%s</b>\n<i>%s</i>' % (mapping.get_name(), mapping.get_comment())
+ self.mapping_store.append([icon, mapping_name,
mapping.get_comment(), visible, mapping_id])
def catch_window_size(widget, allocate):
@@ -90,7 +91,9 @@ class MappingManagerDialog(object):
icon = gtk.gdk.pixbuf_new_from_file_at_size(mapping.get_icon(), 24,
24)
- self.mapping_store.append([icon, mapping.get_name(),
+
+ mapping_name = '<b>%s</b>\n<i>%s</i>' % (mapping.get_name(), mapping.get_comment())
+ self.mapping_store.append([icon, mapping_name,
mapping.get_comment(), True, mapping_id])
mapping_editor_dlg.destroy()
@@ -198,9 +201,11 @@ class MappingManagerDialog(object):
mapping = mapping_manager[mapping_id]
icon = gtk.gdk.pixbuf_new_from_file_at_size(mapping.get_icon(), 24, 24)
- self.mapping_store.append([icon, mapping.get_name(),
+
+ mapping_name = '<b>%s</b>\n<i>%s</i>' % (mapping.get_name(), mapping.get_comment())
+ self.mapping_store.append([icon, mapping_name,
mapping.get_comment(), True, mapping_id])
-
+
pref_store.options['import_dir'] = import_dlg.get_current_folder()
import_dlg.destroy()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
