[wiican: 1/16] [s][ui] Updated mapping programming help links



commit 7a2aa2adba02b642f06d9669e623a3bc0574e55a
Author: J. FÃlix OntaÃÃn <fontanon emergya es>
Date:   Mon Jan 2 23:39:37 2012 +0100

    [s][ui] Updated mapping programming help links

 data/mapping.ui        |  783 ++++++++++++++++++++++++++----------------------
 wiican/defs.py.in      |    3 +
 wiican/ui/editordlg.py |    5 +-
 3 files changed, 438 insertions(+), 353 deletions(-)
---
diff --git a/data/mapping.ui b/data/mapping.ui
index 6b95967..dc15c63 100644
--- a/data/mapping.ui
+++ b/data/mapping.ui
@@ -1,321 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkListStore" id="mapping_store">
-    <columns>
-      <!-- column-name icon -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name comment -->
-      <column type="gchararray"/>
-      <!-- column-name visible -->
-      <column type="gboolean"/>
-      <!-- column-name mapping_id -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAction" id="delete_action">
+    <property name="label" translatable="yes">Delete mapping</property>
+    <property name="short_label" translatable="yes">_Delete</property>
+    <property name="tooltip" translatable="yes">Removes the mapping from the catalog</property>
+    <property name="stock_id">gtk-delete</property>
+    <signal name="activate" handler="delete_action_activate_cb" swapped="no"/>
   </object>
-  <object class="GtkDialog" id="mapping_manager_dlg">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">Wiican mappings</property>
+  <object class="GtkAction" id="edit_action">
+    <property name="label" translatable="yes">Edit mapping</property>
+    <property name="short_label" translatable="yes">_Edit</property>
+    <property name="tooltip" translatable="yes">Edit mapping properties</property>
+    <property name="stock_id">gtk-edit</property>
+    <signal name="activate" handler="edit_action_activate_cb" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="export_action">
+    <property name="label" translatable="yes">_Export mapping</property>
+    <property name="short_label" translatable="yes">E_xport</property>
+    <property name="tooltip" translatable="yes">Export mapping as a .wii file</property>
+    <property name="icon_name">package-x-generic</property>
+    <signal name="activate" handler="export_action_activate_cb" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="import_action">
+    <property name="label" translatable="yes">Import mapping</property>
+    <property name="short_label" translatable="yes">_Import</property>
+    <property name="tooltip" translatable="yes">Import a mapping from a .wii file</property>
+    <property name="stock_id">gtk-add</property>
+    <signal name="activate" handler="import_action_activate_cb" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="new_action">
+    <property name="label" translatable="yes">New mapping</property>
+    <property name="short_label" translatable="yes">_New</property>
+    <property name="tooltip" translatable="yes">Creates a new mapping</property>
+    <property name="stock_id">gtk-new</property>
+    <signal name="activate" handler="new_action_activate_cb" swapped="no"/>
+  </object>
+  <object class="GtkDialog" id="mapping_editor_dlg">
+    <property name="width_request">400</property>
+    <property name="height_request">550</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="modal">True</property>
     <property name="window_position">mouse</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon_name">wiican</property>
+    <property name="icon_name">document-properties</property>
     <property name="type_hint">dialog</property>
-    <signal name="response" handler="close_btn_clicked_cb"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkToolbar" id="toolbar1">
-                <property name="visible">True</property>
-                <property name="toolbar_style">both</property>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton1">
-                    <property name="visible">True</property>
-                    <property name="related_action">new_action</property>
-                    <property name="use_action_appearance">True</property>
-                    <property name="label" translatable="yes">toolbutton1</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton2">
-                    <property name="visible">True</property>
-                    <property name="related_action">edit_action</property>
-                    <property name="use_action_appearance">True</property>
-                    <property name="label" translatable="yes">toolbutton2</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton3">
-                    <property name="visible">True</property>
-                    <property name="related_action">delete_action</property>
-                    <property name="use_action_appearance">True</property>
-                    <property name="label" translatable="yes">toolbutton3</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparatorToolItem" id="toolbutton6">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton4">
-                    <property name="visible">True</property>
-                    <property name="related_action">import_action</property>
-                    <property name="use_action_appearance">True</property>
-                    <property name="label" translatable="yes">toolbutton4</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton5">
-                    <property name="visible">True</property>
-                    <property name="related_action">export_action</property>
-                    <property name="use_action_appearance">True</property>
-                    <property name="label" translatable="yes">toolbutton5</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkButton" id="cancel_btn">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="border_width">5</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTreeView" id="mapping_list">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">mapping_store</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="search_column">1</property>
-                        <property name="tooltip_column">2</property>
-                        <signal name="row_activated" handler="mapping_list_row_activated_cb"/>
-                        <signal name="drag_data_received" handler="mapping_list_drag_data_received_cb"/>
-                        <signal name="key_release_event" handler="mapping_list_key_release_event_cb"/>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="treeviewcolumn3">
-                            <property name="title">Menu</property>
-                            <child>
-                              <object class="GtkCellRendererToggle" id="visible_cell">
-                                <signal name="toggled" handler="visible_cell_toggled_cb"/>
-                              </object>
-                              <attributes>
-                                <attribute name="active">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                            <property name="resizable">True</property>
-                            <property name="title">Name</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="icon_cell"/>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererText" id="mappingname_cell"/>
-                              <attributes>
-                                <attribute name="markup">1</attribute>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox3">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="up_btn">
-                        <property name="label">gtk-go-up</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="clicked" handler="up_btn_clicked_cb"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">3</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="down_btn">
-                        <property name="label">gtk-go-down</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="clicked" handler="down_btn_clicked_cb"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">3</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">10</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="close_btn">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="save_btn">
+                <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <property name="image_position">right</property>
-                <signal name="clicked" handler="close_btn_clicked_cb"/>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-7">close_btn</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="mapping_editor_dlg">
-    <property name="width_request">400</property>
-    <property name="height_request">550</property>
-    <property name="border_width">5</property>
-    <property name="modal">True</property>
-    <property name="window_position">mouse</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">document-properties</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox2">
+                      <object class="GtkVBox" id="vbox4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">12</property>
                         <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkVBox" id="vbox3">
+                              <object class="GtkVBox" id="vbox5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Name:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -323,45 +146,56 @@
                                 <child>
                                   <object class="GtkLabel" id="label4">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Co_mment:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label5">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">A_uthor/s:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Version:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox4">
+                              <object class="GtkVBox" id="vbox6">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkEntry" id="name_entry">
@@ -395,6 +229,8 @@
                                     <property name="invisible_char">â</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -406,27 +242,35 @@
                                     <property name="invisible_char">â</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="padding">6</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox2">
+                          <object class="GtkHBox" id="mapping_icon_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkImage" id="icon_image">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="stock">gtk-new</property>
                                 <property name="icon-size">6</property>
@@ -440,12 +284,14 @@
                             <child>
                               <object class="GtkLabel" id="label7">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Icon:</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -454,6 +300,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -464,6 +312,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
@@ -478,37 +327,88 @@
             <child>
               <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox5">
+                      <object class="GtkVBox" id="vbox7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <property name="shadow_type">in</property>
                             <child>
                               <placeholder/>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="padding">6</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox3">
+                          <object class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkButton" id="help_btn">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="help_btn_clicked_cb" swapped="no"/>
+                                <child>
+                                  <object class="GtkImage" id="help_image">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="tooltip_text" translatable="yes">Mapping programming help</property>
+                                    <property name="stock">gtk-help</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="execute_btn">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Execute mapping</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="relief">none</property>
+                                <child>
+                                  <object class="GtkImage" id="execute_image">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-execute</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkAspectFrame" id="warning_frame">
+                                <property name="can_focus">False</property>
                                 <property name="label_xalign">0</property>
                                 <property name="label_yalign">0</property>
                                 <property name="shadow_type">in</property>
@@ -517,13 +417,16 @@
                                 <property name="ratio">9.9999997473787516e-05</property>
                                 <child>
                                   <object class="GtkEventBox" id="warning_box">
+                                    <property name="can_focus">False</property>
                                     <property name="above_child">True</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox10">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkImage" id="image1">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="stock">gtk-dialog-warning</property>
                                           </object>
                                           <packing>
@@ -536,6 +439,7 @@
                                         <child>
                                           <object class="GtkLabel" id="label8">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">This is a system installed mapping. 
 Changes will be saved in a new mapping.</property>
@@ -545,6 +449,8 @@ Changes will be saved in a new mapping.</property>
                                             </attributes>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="padding">6</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -555,53 +461,11 @@ Changes will be saved in a new mapping.</property>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkToggleButton" id="execute_btn">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Execute mapping</property>
-                                <property name="relief">none</property>
-                                <child>
-                                  <object class="GtkImage" id="execute_image">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-execute</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLinkButton" id="help_btn">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Mapping programming help</property>
-                                <property name="xalign">1</property>
-                                <property name="uri">http://abstrakraft.org/cwiid/wiki/wminput</property>
-                                <signal name="clicked" handler="help_btn_clicked_cb"/>
-                                <child>
-                                  <object class="GtkImage" id="help_image">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-help</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -618,34 +482,68 @@ Changes will be saved in a new mapping.</property>
                 <child type="label">
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Mapping&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_btn</action-widget>
+      <action-widget response="-5">save_btn</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="mapping_manager_dlg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Wiican mappings</property>
+    <property name="window_position">mouse</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">wiican</property>
+    <property name="type_hint">dialog</property>
+    <signal name="response" handler="close_btn_clicked_cb" swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <placeholder/>
             </child>
             <child>
-              <object class="GtkButton" id="cancel_btn">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="close_btn">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <property name="image_position">right</property>
+                <signal name="clicked" handler="close_btn_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -653,67 +551,250 @@ Changes will be saved in a new mapping.</property>
                 <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkButton" id="save_btn">
-                <property name="label">gtk-save</property>
+              <object class="GtkToolbar" id="toolbar1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can_focus">False</property>
+                <property name="toolbar_style">both</property>
+                <child>
+                  <object class="GtkToolButton" id="toolbutton1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="related_action">new_action</property>
+                    <property name="label" translatable="yes">toolbutton1</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="toolbutton2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="related_action">edit_action</property>
+                    <property name="label" translatable="yes">toolbutton2</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="toolbutton3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="related_action">delete_action</property>
+                    <property name="label" translatable="yes">toolbutton3</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparatorToolItem" id="toolbutton6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="toolbutton4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="related_action">import_action</property>
+                    <property name="label" translatable="yes">toolbutton4</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="toolbutton5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="related_action">export_action</property>
+                    <property name="label" translatable="yes">toolbutton5</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">5</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="mapping_list">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">mapping_store</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="search_column">1</property>
+                        <property name="tooltip_column">2</property>
+                        <signal name="key-release-event" handler="mapping_list_key_release_event_cb" swapped="no"/>
+                        <signal name="drag-data-received" handler="mapping_list_drag_data_received_cb" swapped="no"/>
+                        <signal name="row-activated" handler="mapping_list_row_activated_cb" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                            <property name="title">Menu</property>
+                            <child>
+                              <object class="GtkCellRendererToggle" id="visible_cell">
+                                <signal name="toggled" handler="visible_cell_toggled_cb" swapped="no"/>
+                              </object>
+                              <attributes>
+                                <attribute name="active">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                            <property name="resizable">True</property>
+                            <property name="title">Name</property>
+                            <child>
+                              <object class="GtkCellRendererPixbuf" id="icon_cell"/>
+                              <attributes>
+                                <attribute name="pixbuf">0</attribute>
+                              </attributes>
+                            </child>
+                            <child>
+                              <object class="GtkCellRendererText" id="mappingname_cell"/>
+                              <attributes>
+                                <attribute name="markup">1</attribute>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkButton" id="up_btn">
+                        <property name="label">gtk-go-up</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                        <signal name="clicked" handler="up_btn_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="down_btn">
+                        <property name="label">gtk-go-down</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                        <signal name="clicked" handler="down_btn_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">10</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">cancel_btn</action-widget>
-      <action-widget response="-5">save_btn</action-widget>
+      <action-widget response="-7">close_btn</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAction" id="edit_action">
-    <property name="label" translatable="yes">Edit mapping</property>
-    <property name="short_label" translatable="yes">_Edit</property>
-    <property name="tooltip" translatable="yes">Edit mapping properties</property>
-    <property name="stock_id">gtk-edit</property>
-    <signal name="activate" handler="edit_action_activate_cb"/>
-  </object>
-  <object class="GtkAction" id="delete_action">
-    <property name="label" translatable="yes">Delete mapping</property>
-    <property name="short_label" translatable="yes">_Delete</property>
-    <property name="tooltip" translatable="yes">Removes the mapping from the catalog</property>
-    <property name="stock_id">gtk-delete</property>
-    <signal name="activate" handler="delete_action_activate_cb"/>
-  </object>
-  <object class="GtkAction" id="import_action">
-    <property name="label" translatable="yes">Import mapping</property>
-    <property name="short_label" translatable="yes">_Import</property>
-    <property name="tooltip" translatable="yes">Import a mapping from a .wii file</property>
-    <property name="stock_id">gtk-add</property>
-    <signal name="activate" handler="import_action_activate_cb"/>
-  </object>
-  <object class="GtkAction" id="export_action">
-    <property name="label" translatable="yes">_Export mapping</property>
-    <property name="short_label" translatable="yes">E_xport</property>
-    <property name="tooltip" translatable="yes">Export mapping as a .wii file</property>
-    <property name="icon_name">package-x-generic</property>
-    <signal name="activate" handler="export_action_activate_cb"/>
-  </object>
-  <object class="GtkAction" id="new_action">
-    <property name="label" translatable="yes">New mapping</property>
-    <property name="short_label" translatable="yes">_New</property>
-    <property name="tooltip" translatable="yes">Creates a new mapping</property>
-    <property name="stock_id">gtk-new</property>
-    <signal name="activate" handler="new_action_activate_cb"/>
+  <object class="GtkListStore" id="mapping_store">
+    <columns>
+      <!-- column-name icon -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name comment -->
+      <column type="gchararray"/>
+      <!-- column-name visible -->
+      <column type="gboolean"/>
+      <!-- column-name mapping_id -->
+      <column type="gchararray"/>
+    </columns>
   </object>
 </interface>
diff --git a/wiican/defs.py.in b/wiican/defs.py.in
index 80280b8..67c9a40 100644
--- a/wiican/defs.py.in
+++ b/wiican/defs.py.in
@@ -45,3 +45,6 @@ WIIMOTEMANAGER_UI = os.path.join(BASE_DATA_DIR, 'wiimotemanager.ui')
 MAPPING_UI = os.path.join(BASE_DATA_DIR, 'mapping.ui')
 
 ICON_DEFAULT = getIconPath('wiican')
+
+WMINPUT_HELP_URL = "http://abstrakraft.org/cwiid/browser/doc/wminput.list";
+ACTION_ENUM_HELP_URL = "http://abstrakraft.org/cwiid/browser/wminput/action_enum.txt";
diff --git a/wiican/ui/editordlg.py b/wiican/ui/editordlg.py
index 0332696..ddfeedc 100644
--- a/wiican/ui/editordlg.py
+++ b/wiican/ui/editordlg.py
@@ -133,7 +133,7 @@ class MappingEditorDialog(object):
         self.iconfilechooser_btn = gtk.FileChooserButton(self.icon_dlg)
         self.iconfilechooser_btn.show()
         self.iconfilechooser_btn.connect('file-set', self.iconfilechooser_btn_file_set_cb)
-        self.builder.get_object('hbox2').add(self.iconfilechooser_btn)
+        self.builder.get_object('mapping_icon_hbox').add(self.iconfilechooser_btn)
 
         # Populate dialog with mapping values
         pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(self.mapping.get_icon(),
@@ -238,7 +238,8 @@ class MappingEditorDialog(object):
         return self.mapping
 
     def help_btn_clicked_cb(self, widget):
-        webbrowser.open(widget.get_uri())
+        webbrowser.open(WMINPUT_HELP_URL)
+        webbrowser.open(ACTION_ENUM_HELP_URL)
 
     def execute_btn_clicked_cb(self, widget):
         if self.execute_btn.get_active():



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]