[nautilus/wip/gbsneto/other-locations] updates
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/gbsneto/other-locations] updates
- Date: Wed, 17 Jun 2015 01:24:08 +0000 (UTC)
commit 14a60181963a6961f590a887130216e94568eeda
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Jun 16 22:23:48 2015 -0300
updates
src/nautilus-properties-window.c | 10 ++++------
src/nautilus-window-slot.c | 10 ++++++++++
src/nautilus-window-slot.h | 3 +++
3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 4ad4d8b..ed32c52 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -1263,7 +1263,7 @@ attach_label (GtkGrid *grid,
gtk_label_set_selectable (GTK_LABEL (label_field), TRUE);
}
- gtk_misc_set_alignment (GTK_MISC (label_field), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label_field), 0);
gtk_widget_show (label_field);
if (ellipsize_text) {
@@ -4186,14 +4186,12 @@ on_change_permissions_clicked (GtkWidget *button,
TRUE, TRUE, 0);
label = gtk_label_new (_("Files"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_grid_attach (grid, label, 1, 0, 1, 1);
label = gtk_label_new (_("Folders"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_grid_attach (grid, label, 2, 0, 1, 1);
label = gtk_label_new (_("Owner:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_grid_attach (grid, label, 0, 1, 1, 1);
combo = create_permissions_combo_box (PERMISSION_USER, FALSE);
window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
@@ -4207,7 +4205,7 @@ on_change_permissions_clicked (GtkWidget *button,
gtk_grid_attach (grid, combo, 2, 1, 1, 1);
label = gtk_label_new (_("Group:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_grid_attach (grid, label, 0, 2, 1, 1);
combo = create_permissions_combo_box (PERMISSION_GROUP, FALSE);
window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
@@ -4221,7 +4219,7 @@ on_change_permissions_clicked (GtkWidget *button,
gtk_grid_attach (grid, combo, 2, 2, 1, 1);
label = gtk_label_new (_("Others:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_grid_attach (grid, label, 0, 3, 1, 1);
combo = create_permissions_combo_box (PERMISSION_OTHER, FALSE);
window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index acf571e..b347b44 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -878,6 +878,8 @@ begin_location_change (NautilusWindowSlot *slot,
nautilus_profile_start (NULL);
+ g_message ("changing location began");
+
/* If there is no new selection and the new location is
* a (grand)parent of the old location then we automatically
* select the folder the previous location was in */
@@ -1513,6 +1515,8 @@ end_location_change (NautilusWindowSlot *slot)
{
char *uri;
+ g_message ("changing location end");
+
uri = nautilus_window_slot_get_location_uri (slot);
if (uri) {
DEBUG ("Finished loading window for uri %s", uri);
@@ -2859,3 +2863,9 @@ nautilus_window_slot_new (NautilusWindow *window)
"window", window,
NULL);
}
+
+void
+nautilus_window_slot_set_other_locations (NautilusWindowSlot *slot)
+{
+ g_return_if_fail (NAUTILUS_IS_WINDOW_SLOT (slot));
+}
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index afc349c..afbaba1 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -123,6 +123,9 @@ void nautilus_window_slot_go_up (NautilusWindowSlot *
void nautilus_window_slot_set_status (NautilusWindowSlot *slot,
const char *primary_status,
const char *detail_status);
+
+void nautilus_window_slot_set_other_locations (NautilusWindowSlot *slot);
+
void nautilus_window_slot_sync_view_mode (NautilusWindowSlot *slot);
void nautilus_window_slot_display_view_selection_failure (NautilusWindow *window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]