Download as
Browse Code »

Commit f210e328653daf7eeae4eac51a16a9d8698e1fcf

Authored by Perry Werneck
1 parent 44439af7
Exists in master and in 1 other branch develop

Adjustment in the selection and clipboard settings dialog.

Showing 1 changed file with 36 additions and 25 deletions   Show diff stats
src/dialogs/settings/clipboard.c
  Diff comments   View file @f210e32
... ... @@ -30,9 +30,10 @@
30 30 /*--[ Constants ]------------------------------------------------------------------------------------*/
31 31  
32 32 enum {
33   - COPY_SETTINGS,
34   - PASTE_SETTINGS,
35   - HTML_SETTINGS,
  33 + SELECT_OPTIONS,
  34 + COPY_OPTIONS,
  35 + PASTE_OPTIONS,
  36 + HTML_OPTIONS,
36 37  
37 38 GRID_COUNT
38 39 };
... ... @@ -42,15 +43,15 @@
42 43 .left = 1,
43 44 .top = 1,
44 45 .width = 1,
45   - .grid = COPY_SETTINGS,
  46 + .grid = SELECT_OPTIONS,
46 47 .id = LIB3270_TOGGLE_RECTANGLE_SELECT,
47 48 },
48 49  
49 50 {
50   - .left = 2,
51   - .top = 1,
  51 + .left = 1,
  52 + .top = 2,
52 53 .width = 1,
53   - .grid = COPY_SETTINGS,
  54 + .grid = SELECT_OPTIONS,
54 55 .id = LIB3270_TOGGLE_KEEP_SELECTED,
55 56 },
56 57  
... ... @@ -58,7 +59,7 @@
58 59 .left = 0,
59 60 .top = 0,
60 61 .width = 1,
61   - .grid = PASTE_SETTINGS,
  62 + .grid = PASTE_OPTIONS,
62 63 .id = LIB3270_TOGGLE_MARGINED_PASTE,
63 64 },
64 65  
... ... @@ -66,7 +67,7 @@
66 67 .left = 0,
67 68 .top = 1,
68 69 .width = 1,
69   - .grid = PASTE_SETTINGS,
  70 + .grid = PASTE_OPTIONS,
70 71 .id = LIB3270_TOGGLE_SMART_PASTE,
71 72 }
72 73  
... ... @@ -75,7 +76,7 @@
75 76 static const struct ComboBoxDefinition combos[] = {
76 77  
77 78 {
78   - .grid = HTML_SETTINGS,
  79 + .grid = HTML_OPTIONS,
79 80 .left = 0,
80 81 .top = 0,
81 82 .width = 1,
... ... @@ -92,7 +93,7 @@
92 93 },
93 94  
94 95 {
95   - .grid = HTML_SETTINGS,
  96 + .grid = HTML_OPTIONS,
96 97 .left = 0,
97 98 .top = 1,
98 99 .width = 1,
... ... @@ -109,7 +110,7 @@
109 110 },
110 111  
111 112 {
112   - .grid = COPY_SETTINGS,
  113 + .grid = COPY_OPTIONS,
113 114 .left = 0,
114 115 .top = 0,
115 116 .width = 2,
... ... @@ -136,7 +137,7 @@
136 137 .top = 2,
137 138 .width = 1,
138 139 .height = 1,
139   - .grid = HTML_SETTINGS
  140 + .grid = HTML_OPTIONS
140 141 },
141 142  
142 143 {
... ... @@ -146,37 +147,37 @@
146 147 .top = 2,
147 148 .width = 1,
148 149 .height = 1,
149   - .grid = PASTE_SETTINGS
  150 + .grid = PASTE_OPTIONS
150 151 },
151 152  
152 153 {
153 154 .label = N_("Smart copy"),
154 155 .tooltip = N_("When set the first copy operation after the selection will set the clipboard contents and the next ones will append"),
155   - .left = 2,
156   - .top = 3,
  156 + .left = 1,
  157 + .top = 1,
157 158 .width = 1,
158 159 .height = 1,
159   - .grid = COPY_SETTINGS
  160 + .grid = COPY_OPTIONS
160 161 },
161 162  
162 163 {
163 164 .label = N_("Image copy"),
164 165 .tooltip = N_("When set allow image formats on clipboard"),
165 166 .left = 1,
166   - .top = 3,
  167 + .top = 2,
167 168 .width = 1,
168 169 .height = 1,
169   - .grid = COPY_SETTINGS
  170 + .grid = COPY_OPTIONS
170 171 },
171 172  
172 173 {
173 174 .label = N_("Detect http:// or https://"),
174 175 .tooltip = N_("When set URLs selected with double click will be opened"),
175 176 .left = 1,
176   - .top = 4,
  177 + .top = 3,
177 178 .width = 1,
178 179 .height = 1,
179   - .grid = COPY_SETTINGS
  180 + .grid = SELECT_OPTIONS
180 181 }
181 182  
182 183 };
... ... @@ -247,8 +248,9 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
247 248 // Create grids
248 249 {
249 250 static const gchar * labels[GRID_COUNT] = {
250   - N_("Select and copy actions"),
251   - N_("Paste actions"),
  251 + N_("Select options"),
  252 + N_("Copy options"),
  253 + N_("Paste options"),
252 254 N_("HTML options")
253 255 };
254 256  
... ... @@ -258,23 +260,32 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
258 260 int width;
259 261 } positions[GRID_COUNT] = {
260 262 {
  263 + // SELECT_OPTIONS
261 264 .left = 0,
262 265 .top = 0,
263 266 .width = 1
264 267 },
265 268  
266 269 {
267   - .left = 1,
  270 + // COPY_OPTIONS
  271 + .left = 1,
268 272 .top = 0,
269 273 .width = 1
270 274 },
271 275  
272 276 {
  277 + // PASTE_OPTIONS
  278 + .left = 1,
  279 + .top = 1,
  280 + .width = 1
  281 + },
  282 +
  283 + {
  284 + // HTML_OPTIONS
273 285 .left = 0,
274 286 .top = 1,
275 287 .width = 1
276 288 }
277   -
278 289 };
279 290  
280 291 for(ix = 0; ix < G_N_ELEMENTS(labels); ix++) {
... ...