Download as
Browse Code »

Commit f0bbb4f6a03934f707ecefc69620f3c1e3a806e3

Authored by Perry Werneck
1 parent 02b4046a
Exists in master and in 2 other branches develop, script-support

Updating toolbar settings dialog.

Showing 3 changed files with 8 additions and 153 deletions   Show diff stats
src/objects/settings/actionview.c
  Diff comments   View file @f0bbb4f
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 // Create label. 94 // Create label.
95 GtkWidget * label = gtk_label_new(gettext(views[ix].label)); 95 GtkWidget * label = gtk_label_new(gettext(views[ix].label));
96 gtk_widget_set_tooltip_markup(label,gettext(views[ix].tooltip)); 96 gtk_widget_set_tooltip_markup(label,gettext(views[ix].tooltip));
97 - //gtk_label_set_xalign(GTK_LABEL(label),0); 97 + gtk_label_set_xalign(GTK_LABEL(label),0);
98 gtk_widget_set_hexpand(label,TRUE); 98 gtk_widget_set_hexpand(label,TRUE);
99 gtk_widget_set_vexpand(label,FALSE); 99 gtk_widget_set_vexpand(label,FALSE);
100 100
src/objects/toolbar/settings.c
  Diff comments   View file @f0bbb4f
@@ -66,20 +66,6 @@ @@ -66,20 +66,6 @@
66 66
67 /*--[ Implement ]------------------------------------------------------------------------------------*/ 67 /*--[ Implement ]------------------------------------------------------------------------------------*/
68 68
69 - static void selection_changed(GtkTreeSelection *selection, GtkWidget *button) {  
70 - gtk_widget_set_sensitive(button,gtk_tree_selection_count_selected_rows(selection) > 0);  
71 - }  
72 -  
73 - static void toolbar_insert(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {  
74 - debug("%s(%p)",__FUNCTION__,settings);  
75 - pw3270_action_view_move_selected(settings->views[1],settings->views[0]);  
76 - }  
77 -  
78 - static void toolbar_remove(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {  
79 - debug("%s(%p)",__FUNCTION__,settings);  
80 - pw3270_action_view_move_selected(settings->views[0],settings->views[1]);  
81 - }  
82 -  
83 GtkWidget * pw3270_toolbar_settings_new() { 69 GtkWidget * pw3270_toolbar_settings_new() {
84 70
85 size_t ix; 71 size_t ix;
@@ -132,6 +118,7 @@ @@ -132,6 +118,7 @@
132 118
133 GtkWidget * box = gtk_scrolled_window_new(NULL,NULL); 119 GtkWidget * box = gtk_scrolled_window_new(NULL,NULL);
134 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); 120 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
  121 + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(box),GTK_SHADOW_ETCHED_IN);
135 gtk_container_add(GTK_CONTAINER(box),page->views[ix]); 122 gtk_container_add(GTK_CONTAINER(box),page->views[ix]);
136 123
137 gtk_grid_attach( 124 gtk_grid_attach(
@@ -150,27 +137,13 @@ @@ -150,27 +137,13 @@
150 gtk_widget_set_hexpand(box,FALSE); 137 gtk_widget_set_hexpand(box,FALSE);
151 gtk_widget_set_vexpand(box,FALSE); 138 gtk_widget_set_vexpand(box,FALSE);
152 139
153 - /*  
154 - page->buttons[0] = pw3270_action_view_extract_button_new(page->views[0],"go-next"),  
155 - page->buttons[1] = pw3270_action_view_extract_button_new(page->views[1],"go-previous"),  
156 -  
157 - gtk_box_pack_start(GTK_BOX(box),page->buttons[0],FALSE,FALSE,0);  
158 - gtk_box_pack_end(GTK_BOX(box),page->buttons[1],FALSE,FALSE,0);  
159 -  
160 - g_signal_connect(  
161 - page->buttons[0],  
162 - "clicked",  
163 - G_CALLBACK(toolbar_remove),  
164 - page  
165 - ); 140 + GtkWidget * buttons[] = {
  141 + pw3270_action_view_move_button_new(page->views[0],page->views[1],"go-next"),
  142 + pw3270_action_view_move_button_new(page->views[1],page->views[0],"go-previous"),
  143 + };
166 144
167 - g_signal_connect(  
168 - page->buttons[1],  
169 - "clicked",  
170 - G_CALLBACK(toolbar_insert),  
171 - page  
172 - );  
173 - */ 145 + gtk_box_pack_start(GTK_BOX(box),buttons[0],FALSE,FALSE,0);
  146 + gtk_box_pack_end(GTK_BOX(box),buttons[1],FALSE,FALSE,0);
174 147
175 gtk_grid_attach( 148 gtk_grid_attach(
176 grid, 149 grid,
src/objects/window/header-settings.c
  Diff comments   View file @f0bbb4f
@@ -99,124 +99,6 @@ @@ -99,124 +99,6 @@
99 0,0,4,3 99 0,0,4,3
100 ); 100 );
101 101
102 - /*  
103 - // Create dialog grid  
104 - GtkGrid * grid = GTK_GRID(gtk_grid_new());  
105 - gtk_grid_set_row_homogeneous(grid,FALSE);  
106 - gtk_grid_set_row_spacing(GTK_GRID(grid),12);  
107 - gtk_grid_set_column_spacing(GTK_GRID(grid),6);  
108 -  
109 - gtk_grid_attach(  
110 - GTK_GRID(settings),  
111 - v3270_dialog_section_new(_("Itens"), _("Select the title bar itens"), GTK_WIDGET(grid)),  
112 - 0,0,4,3  
113 - );  
114 -  
115 - //  
116 - // Create views  
117 - //  
118 - {  
119 - GtkTreeSelection * selection;  
120 -  
121 - for(ix = 0; ix < G_N_ELEMENTS(page->views); ix++) {  
122 -  
123 - GtkWidget * label = gtk_label_new(gettext(views[ix].label));  
124 - gtk_label_set_xalign(GTK_LABEL(label),0);  
125 -  
126 - gtk_grid_attach(  
127 - grid,  
128 - label,  
129 - views[ix].left,  
130 - views[ix].top,  
131 - 1,1  
132 - );  
133 -  
134 - page->views[ix] = pw3270_action_view_new();  
135 -  
136 - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(page->views[ix]));  
137 - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);  
138 -  
139 - GtkWidget * box = gtk_scrolled_window_new(NULL,NULL);  
140 - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);  
141 - gtk_container_add(GTK_CONTAINER(box),page->views[ix]);  
142 -  
143 - gtk_grid_attach(  
144 - grid,  
145 - box,  
146 - views[ix].left,  
147 - views[ix].top+1,  
148 - 1,  
149 - views[ix].height  
150 - );  
151 -  
152 - }  
153 -  
154 - gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE);  
155 - gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[1]),TRUE);  
156 - pw3270_action_view_order_by_label(page->views[2]);  
157 -  
158 - }  
159 -  
160 - // Create buttons  
161 - {  
162 - GtkWidget *buttons[] = {  
163 - pw3270_action_view_extract_button_new(page->views[0],"go-next"),  
164 - pw3270_action_view_extract_button_new(page->views[2],"go-previous"),  
165 - pw3270_action_view_extract_button_new(page->views[1],"go-next"),  
166 - pw3270_action_view_extract_button_new(page->views[2],"go-previous")  
167 - };  
168 -  
169 - g_signal_connect(  
170 - buttons[0],  
171 - "clicked",  
172 - G_CALLBACK(remove_from_left),  
173 - page  
174 - );  
175 -  
176 - g_signal_connect(  
177 - buttons[1],  
178 - "clicked",  
179 - G_CALLBACK(add_to_left),  
180 - page  
181 - );  
182 -  
183 - g_signal_connect(  
184 - buttons[2],  
185 - "clicked",  
186 - G_CALLBACK(remove_from_right),  
187 - page  
188 - );  
189 -  
190 - g_signal_connect(  
191 - buttons[3],  
192 - "clicked",  
193 - G_CALLBACK(add_to_right),  
194 - page  
195 - );  
196 -  
197 -  
198 - for(ix = 0; ix < 2; ix++) {  
199 - GtkWidget * box = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);  
200 - gtk_widget_set_hexpand(box,FALSE);  
201 - gtk_widget_set_vexpand(box,FALSE);  
202 -  
203 - gtk_box_pack_start(GTK_BOX(box),buttons[ix*2],FALSE,FALSE,0);  
204 - gtk_box_pack_end(GTK_BOX(box),buttons[(ix*2)+1],FALSE,FALSE,0);  
205 -  
206 - gtk_grid_attach(  
207 - grid,  
208 - box,  
209 - views[ix].left+1,  
210 - views[ix].top+2,  
211 - 1,  
212 - 2  
213 - );  
214 -  
215 -  
216 - }  
217 -  
218 - }  
219 - */  
220 102
221 gtk_widget_show_all(GTK_WIDGET(settings)); 103 gtk_widget_show_all(GTK_WIDGET(settings));
222 return GTK_WIDGET(settings); 104 return GTK_WIDGET(settings);