Skip to content

Commit 367edf9

Browse files
mtwebstermtwebster
committed
Action layout editor: put direction buttons in a more traditional
location, make the editor launcher button more prominent in Nemo's preferences.
1 parent 31883c2 commit 367edf9

File tree

2 files changed

+63
-75
lines changed

2 files changed

+63
-75
lines changed

‎gresources/nemo-action-layout-editor.glade‎

Lines changed: 58 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
<property name="can-focus">False</property>
88
<property name="icon-name">list-remove-symbolic</property>
99
</object>
10-
<object class="GtkImage" id="image5">
11-
<property name="visible">True</property>
12-
<property name="can-focus">False</property>
13-
<property name="icon-name">go-up-symbolic</property>
14-
</object>
15-
<object class="GtkImage" id="image6">
16-
<property name="visible">True</property>
17-
<property name="can-focus">False</property>
18-
<property name="icon-name">go-down-symbolic</property>
19-
</object>
2010
<object class="GtkBox" id="layout_editor_box">
2111
<property name="visible">True</property>
2212
<property name="can-focus">False</property>
@@ -58,59 +48,64 @@
5848
<property name="visible">True</property>
5949
<property name="can-focus">False</property>
6050
<property name="orientation">vertical</property>
61-
<property name="spacing">10</property>
51+
<property name="spacing">4</property>
6252
<child>
63-
<object class="GtkBox">
53+
<object class="GtkScrolledWindow" id="treeview_holder">
6454
<property name="visible">True</property>
65-
<property name="can-focus">False</property>
66-
<property name="spacing">4</property>
55+
<property name="can-focus">True</property>
56+
<property name="vexpand">True</property>
57+
<property name="shadow-type">in</property>
6758
<child>
68-
<object class="GtkScrolledWindow" id="treeview_holder">
69-
<property name="visible">True</property>
70-
<property name="can-focus">True</property>
71-
<property name="vexpand">True</property>
72-
<property name="shadow-type">in</property>
73-
<child>
74-
<placeholder/>
75-
</child>
76-
</object>
77-
<packing>
78-
<property name="expand">True</property>
79-
<property name="fill">True</property>
80-
<property name="position">0</property>
81-
</packing>
59+
<placeholder/>
8260
</child>
61+
</object>
62+
<packing>
63+
<property name="expand">True</property>
64+
<property name="fill">True</property>
65+
<property name="position">0</property>
66+
</packing>
67+
</child>
68+
<child>
69+
<object class="GtkBox" id="row_controls_box">
70+
<property name="visible">True</property>
71+
<property name="can-focus">False</property>
8372
<child>
8473
<object class="GtkBox">
8574
<property name="visible">True</property>
8675
<property name="can-focus">False</property>
87-
<property name="orientation">vertical</property>
8876
<child>
89-
<object class="GtkButton" id="up_button">
77+
<object class="GtkMenuButton" id="new_row_button">
9078
<property name="visible">True</property>
9179
<property name="can-focus">True</property>
80+
<property name="focus-on-click">False</property>
9281
<property name="receives-default">True</property>
93-
<property name="tooltip-text" translatable="yes">Move up</property>
94-
<property name="image">image5</property>
82+
<property name="tooltip-text" translatable="yes">Add a submenu or a separator</property>
83+
<child>
84+
<object class="GtkImage" id="image1">
85+
<property name="visible">True</property>
86+
<property name="can-focus">False</property>
87+
<property name="icon-name">list-add-symbolic</property>
88+
</object>
89+
</child>
9590
</object>
9691
<packing>
97-
<property name="expand">True</property>
92+
<property name="expand">False</property>
9893
<property name="fill">True</property>
99-
<property name="position">1</property>
94+
<property name="position">0</property>
10095
</packing>
10196
</child>
10297
<child>
103-
<object class="GtkButton" id="down_button">
98+
<object class="GtkButton" id="remove_submenu_button">
10499
<property name="visible">True</property>
105100
<property name="can-focus">True</property>
106101
<property name="receives-default">True</property>
107-
<property name="tooltip-text" translatable="yes">Move down</property>
108-
<property name="image">image6</property>
102+
<property name="tooltip-text" translatable="yes">Remove</property>
103+
<property name="image">image2</property>
109104
</object>
110105
<packing>
111-
<property name="expand">True</property>
106+
<property name="expand">False</property>
112107
<property name="fill">True</property>
113-
<property name="position">2</property>
108+
<property name="position">1</property>
114109
</packing>
115110
</child>
116111
<style>
@@ -120,55 +115,37 @@
120115
<packing>
121116
<property name="expand">False</property>
122117
<property name="fill">True</property>
123-
<property name="position">1</property>
118+
<property name="position">0</property>
124119
</packing>
125120
</child>
126-
</object>
127-
<packing>
128-
<property name="expand">False</property>
129-
<property name="fill">True</property>
130-
<property name="position">1</property>
131-
</packing>
132-
</child>
133-
<child>
134-
<object class="GtkBox" id="row_controls_box">
135-
<property name="visible">True</property>
136-
<property name="can-focus">False</property>
137121
<child>
138122
<object class="GtkBox">
139123
<property name="visible">True</property>
140124
<property name="can-focus">False</property>
141125
<child>
142-
<object class="GtkMenuButton" id="new_row_button">
126+
<object class="GtkButton" id="up_button">
143127
<property name="visible">True</property>
144128
<property name="can-focus">True</property>
145-
<property name="focus-on-click">False</property>
146129
<property name="receives-default">True</property>
147-
<property name="tooltip-text" translatable="yes">Add a submenu or a separator</property>
148-
<child>
149-
<object class="GtkImage" id="image1">
150-
<property name="visible">True</property>
151-
<property name="can-focus">False</property>
152-
<property name="icon-name">list-add-symbolic</property>
153-
</object>
154-
</child>
130+
<property name="tooltip-text" translatable="yes">Move up</property>
131+
<property name="image">image5</property>
155132
</object>
156133
<packing>
157-
<property name="expand">False</property>
134+
<property name="expand">True</property>
158135
<property name="fill">True</property>
159136
<property name="position">0</property>
160137
</packing>
161138
</child>
162139
<child>
163-
<object class="GtkButton" id="remove_submenu_button">
140+
<object class="GtkButton" id="down_button">
164141
<property name="visible">True</property>
165142
<property name="can-focus">True</property>
166143
<property name="receives-default">True</property>
167-
<property name="tooltip-text" translatable="yes">Remove</property>
168-
<property name="image">image2</property>
144+
<property name="tooltip-text" translatable="yes">Move down</property>
145+
<property name="image">image6</property>
169146
</object>
170147
<packing>
171-
<property name="expand">False</property>
148+
<property name="expand">True</property>
172149
<property name="fill">True</property>
173150
<property name="position">1</property>
174151
</packing>
@@ -180,7 +157,8 @@
180157
<packing>
181158
<property name="expand">False</property>
182159
<property name="fill">True</property>
183-
<property name="position">0</property>
160+
<property name="padding">4</property>
161+
<property name="position">1</property>
184162
</packing>
185163
</child>
186164
<child>
@@ -275,7 +253,7 @@
275253
<packing>
276254
<property name="expand">True</property>
277255
<property name="fill">True</property>
278-
<property name="position">1</property>
256+
<property name="position">2</property>
279257
</packing>
280258
</child>
281259
</object>
@@ -310,7 +288,7 @@
310288
<object class="GtkBox">
311289
<property name="visible">True</property>
312290
<property name="can-focus">False</property>
313-
<property name="margin-top">10</property>
291+
<property name="margin-top">4</property>
314292
<property name="spacing">6</property>
315293
<child>
316294
<object class="GtkButton" id="save_button">
@@ -372,9 +350,19 @@
372350
<widget name="name_entry"/>
373351
</widgets>
374352
</object>
353+
<object class="GtkImage" id="image5">
354+
<property name="visible">True</property>
355+
<property name="can-focus">False</property>
356+
<property name="icon-name">go-up-symbolic</property>
357+
</object>
358+
<object class="GtkImage" id="image6">
359+
<property name="visible">True</property>
360+
<property name="can-focus">False</property>
361+
<property name="icon-name">go-down-symbolic</property>
362+
</object>
375363
<object class="GtkWindow" id="main_window">
376364
<property name="can-focus">False</property>
377-
<property name="border-width">10</property>
365+
<property name="border-width">4</property>
378366
<property name="window-position">center</property>
379367
<property name="default-width">600</property>
380368
<property name="default-height">400</property>

‎src/nemo-action-config-widget.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,12 @@ nemo_action_config_widget_init (NemoActionConfigWidget *self)
469469
gtk_widget_show (widget);
470470
g_signal_connect (widget, "clicked", G_CALLBACK (on_open_folder_clicked), self);
471471

472-
widget = gtk_button_new_from_icon_name ("view-list-symbolic", GTK_ICON_SIZE_BUTTON);
473-
gtk_widget_set_tooltip_text (widget, _("Edit layout"));
472+
widget = gtk_button_new_with_label (_("Edit layout"));
474473

475-
gtk_box_pack_end (GTK_BOX (bb),
476-
widget,
477-
FALSE, FALSE, 0);
474+
bb = NEMO_CONFIG_BASE_WIDGET (self)->lbuttonbox;
475+
gtk_box_pack_start (GTK_BOX (bb),
476+
widget,
477+
FALSE, FALSE, 0);
478478
gtk_widget_show (widget);
479479
g_signal_connect (widget, "clicked", G_CALLBACK (on_layout_editor_clicked), self);
480480

0 commit comments

Comments
 (0)