callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file chooser: Drop the location label

Browse Source 
Bringing us close to the new design.
This commit is contained in:
Matthias Clasen
2015-01-18 17:56:07 -05:00
parent 4b47c5a649
commit dcd3d15380
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkfilechooserwidget.c
View File

@ -250,7 +250,6 @@ struct _GtkFileChooserWidgetPrivate {
GtkWidget *extra_widget; GtkWidget *extra_widget;
GtkWidget *location_entry_box; GtkWidget *location_entry_box;
GtkWidget *location_label;
GtkWidget *location_entry; GtkWidget *location_entry;
LocationMode location_mode; LocationMode location_mode;
@ -1971,6 +1970,9 @@ location_entry_create (GtkFileChooserWidget *impl)
if (!priv->location_entry) if (!priv->location_entry)
{ {
priv->location_entry = _gtk_file_chooser_entry_new (TRUE); priv->location_entry = _gtk_file_chooser_entry_new (TRUE);
if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
gtk_entry_set_placeholder_text (GTK_ENTRY (priv->location_entry), _("Location"));
g_signal_connect (priv->location_entry, "changed", g_signal_connect (priv->location_entry, "changed",
G_CALLBACK (location_entry_changed_cb), impl); G_CALLBACK (location_entry_changed_cb), impl);
} }
@ -2086,7 +2088,6 @@ location_switch_to_filename_entry (GtkFileChooserWidget *impl)
{ {
location_entry_create (impl); location_entry_create (impl);
gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->location_label), priv->location_entry);
} }
/* Configure the entry */ /* Configure the entry */
@ -7425,7 +7426,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_align); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_align);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_and_filters); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, extra_and_filters);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, location_entry_box); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, location_entry_box);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, location_label);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_bar); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_bar);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_entry); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, search_entry);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, list_name_column); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserWidget, list_name_column);

13
gtk/ui/gtkfilechooserwidget.ui
View File

@ -104,19 +104,6 @@
<property name="no-show-all">True</property> <property name="no-show-all">True</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<child>
<object class="GtkLabel" id="location_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Location:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>

1
gtk/ui/gtkfilechooserwidget.ui.h
View File

@ -1,5 +1,4 @@
N_("Create Fo_lder"); N_("Create Fo_lder");
N_("_Location:");
N_("Files"); N_("Files");
N_("Name"); N_("Name");
N_("Size"); N_("Size");