5314: Missing Tags environment on MediaRef Editor; do not need underline on Type, minor tooltip and mnemonic issues

svn: r18474
This commit is contained in:
Jérôme Rapinat 2011-11-21 12:16:41 +00:00
parent 280b4c7d99
commit d0730842cf
2 changed files with 79 additions and 12 deletions

View File

@ -307,7 +307,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">6</property>
<property name="n_rows">7</property>
<property name="n_columns">4</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
@ -414,8 +414,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@ -456,15 +456,14 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<object class="GtkLabel" id="label660">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Type:</property>
<property name="use_underline">True</property>
<property name="label" translatable="yes">Type:</property>
<property name="mnemonic_widget">type</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -478,8 +477,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -490,7 +489,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<property name="xalign">0</property>
<property name="label" translatable="yes">_Date:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">date_edit</property>
<property name="mnemonic_widget">date_entry</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -520,7 +519,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Invoke date editor</property>
<property name="relief">none</property>
<accessibility>
<relation type="labelled-by" target="label422"/>
</accessibility>
<child>
<object class="GtkImage" id="image2264">
<property name="visible">True</property>
@ -560,6 +564,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<object class="UndoableEntry" id="gid">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">A unique ID to identify the Media object.</property>
<property name="invisible_char">•</property>
</object>
<packing>
@ -572,7 +577,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select a file</property>
<property name="relief">none</property>
<accessibility>
<relation type="labelled-by" target="label129"/>
</accessibility>
<child>
<object class="GtkImage" id="image2673">
<property name="visible">True</property>
@ -601,6 +611,53 @@ You can use the mouse on the picture to select a region, or use these spinbutton
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Tags:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">tag_button</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="tag_label">
<property name="visible">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="tag_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<accessibility>
<relation type="labelled-by" target="label1"/>
</accessibility>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>

View File

@ -4,6 +4,7 @@
# Copyright (C) 2000-2006 Donald N. Allingham
# 2008-2009 Stephane Charette <stephanecharette@gmail.com>
# 2009 Gary Burton
# 2011 Robert Cheramy <robert@cheramy.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -52,7 +53,7 @@ from glade import Glade
from displaytabs import (SourceEmbedList, AttrEmbedList, MediaBackRefList,
NoteTab)
from gui.widgets import (MonitoredSpinButton, MonitoredEntry, PrivacyButton,
MonitoredDate)
MonitoredDate, MonitoredTagList)
from editreference import RefTab, EditReference
from addmedia import AddMediaObject
@ -148,7 +149,7 @@ class EditMediaRef(EditReference):
self.subpixmap.set_from_pixbuf(pb)
def _setup_fields(self):
ebox_shared = self.top.get_object('eventbox')
ebox_shared.connect('button-press-event', self.button_press_event)
@ -258,6 +259,15 @@ class EditMediaRef(EditReference):
self.source.get_date_object(),
self.uistate, self.track,
self.db.readonly)
self.tags = MonitoredTagList(
self.top.get_object("tag_label"),
self.top.get_object("tag_button"),
self.source.set_tag_list,
self.source.get_tag_list,
self.db,
self.uistate, self.track,
self.db.readonly)
def set_corner1_x(self, value):
"""