Merge lp:~jbicha/indicator-datetime/replace-deprecated-ui into lp:indicator-datetime/0.3
- replace-deprecated-ui
- Merge into trunk
Proposed by
Jeremy Bícha
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp:~jbicha/indicator-datetime/replace-deprecated-ui |
| Merge into: | lp:indicator-datetime/0.3 |
| Diff against target: |
328 lines (+50/-51) 2 files modified
data/datetime-dialog.ui (+39/-40) src/indicator-datetime.c (+11/-11) |
| To merge this branch: | bzr merge lp:~jbicha/indicator-datetime/replace-deprecated-ui |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Terry | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 125. By Jeremy Bícha
-
Use GNOME 3-style +/-
Replace GtkHBox & GtkVBox with GtkBox
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'data/datetime-dialog.ui' | |||
| 2 | --- data/datetime-dialog.ui 2011-08-17 19:30:53 +0000 | |||
| 3 | +++ data/datetime-dialog.ui 2011-08-26 06:11:23 +0000 | |||
| 4 | @@ -1,7 +1,6 @@ | |||
| 5 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 6 | 2 | <interface> | 2 | <interface> |
| 7 | 3 | <requires lib="gtk+" version="2.24"/> | 3 | <requires lib="gtk+" version="2.24"/> |
| 8 | 4 | <!-- interface-naming-policy project-wide --> | ||
| 9 | 5 | <object class="GtkAdjustment" id="dateAdjustment"> | 4 | <object class="GtkAdjustment" id="dateAdjustment"> |
| 10 | 6 | <property name="upper">1.8446744073709552e+19</property> | 5 | <property name="upper">1.8446744073709552e+19</property> |
| 11 | 7 | <property name="step_increment">86400</property> | 6 | <property name="step_increment">86400</property> |
| 12 | @@ -15,15 +14,14 @@ | |||
| 13 | 15 | <property name="destroy_with_parent">True</property> | 14 | <property name="destroy_with_parent">True</property> |
| 14 | 16 | <property name="icon_name">time-admin</property> | 15 | <property name="icon_name">time-admin</property> |
| 15 | 17 | <child> | 16 | <child> |
| 17 | 18 | <object class="GtkVBox" id="vbox1"> | 17 | <object class="GtkBox" id="box10"> |
| 18 | 19 | <property name="visible">True</property> | 18 | <property name="visible">True</property> |
| 19 | 20 | <property name="can_focus">False</property> | 19 | <property name="can_focus">False</property> |
| 20 | 20 | <property name="orientation">vertical</property> | ||
| 21 | 21 | <child> | 21 | <child> |
| 22 | 22 | <object class="GtkScrolledWindow" id="scrolledwindow1"> | 22 | <object class="GtkScrolledWindow" id="scrolledwindow1"> |
| 23 | 23 | <property name="visible">True</property> | 23 | <property name="visible">True</property> |
| 24 | 24 | <property name="can_focus">True</property> | 24 | <property name="can_focus">True</property> |
| 25 | 25 | <property name="hscrollbar_policy">automatic</property> | ||
| 26 | 26 | <property name="vscrollbar_policy">automatic</property> | ||
| 27 | 27 | <child> | 25 | <child> |
| 28 | 28 | <object class="GtkTreeView" id="locationsView"> | 26 | <object class="GtkTreeView" id="locationsView"> |
| 29 | 29 | <property name="visible">True</property> | 27 | <property name="visible">True</property> |
| 30 | @@ -31,6 +29,9 @@ | |||
| 31 | 31 | <property name="model">locationsStore</property> | 29 | <property name="model">locationsStore</property> |
| 32 | 32 | <property name="reorderable">True</property> | 30 | <property name="reorderable">True</property> |
| 33 | 33 | <property name="search_column">0</property> | 31 | <property name="search_column">0</property> |
| 34 | 32 | <child internal-child="selection"> | ||
| 35 | 33 | <object class="GtkTreeSelection" id="treeview-selection1"/> | ||
| 36 | 34 | </child> | ||
| 37 | 34 | </object> | 35 | </object> |
| 38 | 35 | </child> | 36 | </child> |
| 39 | 36 | </object> | 37 | </object> |
| 40 | @@ -52,57 +53,48 @@ | |||
| 41 | 52 | </packing> | 53 | </packing> |
| 42 | 53 | </child> | 54 | </child> |
| 43 | 54 | <child> | 55 | <child> |
| 45 | 55 | <object class="GtkHBox" id="hbox10"> | 56 | <object class="GtkToolbar" id="toolbar1"> |
| 46 | 56 | <property name="visible">True</property> | 57 | <property name="visible">True</property> |
| 47 | 57 | <property name="can_focus">False</property> | 58 | <property name="can_focus">False</property> |
| 48 | 59 | <property name="icon_size">1</property> | ||
| 49 | 58 | <child> | 60 | <child> |
| 51 | 59 | <object class="GtkButton" id="addButton"> | 61 | <object class="GtkToolButton" id="addButton"> |
| 52 | 60 | <property name="visible">True</property> | 62 | <property name="visible">True</property> |
| 53 | 61 | <property name="can_focus">True</property> | 63 | <property name="can_focus">True</property> |
| 54 | 62 | <property name="receives_default">True</property> | 64 | <property name="receives_default">True</property> |
| 55 | 63 | <property name="use_action_appearance">False</property> | 65 | <property name="use_action_appearance">False</property> |
| 56 | 66 | <property name="label" translatable="yes">Add</property> | ||
| 57 | 67 | <property name="use_underline">True</property> | ||
| 58 | 68 | <property name="icon_name">list-add-symbolic</property> | ||
| 59 | 64 | <child internal-child="accessible"> | 69 | <child internal-child="accessible"> |
| 60 | 65 | <object class="AtkObject" id="addButton-atkobject"> | 70 | <object class="AtkObject" id="addButton-atkobject"> |
| 61 | 66 | <property name="AtkObject::accessible-description" translatable="yes">Add a Location…</property> | 71 | <property name="AtkObject::accessible-description" translatable="yes">Add a Location…</property> |
| 62 | 67 | </object> | 72 | </object> |
| 63 | 68 | </child> | 73 | </child> |
| 64 | 69 | <child> | ||
| 65 | 70 | <object class="GtkImage" id="addImage"> | ||
| 66 | 71 | <property name="visible">True</property> | ||
| 67 | 72 | <property name="can_focus">False</property> | ||
| 68 | 73 | <property name="stock">gtk-add</property> | ||
| 69 | 74 | </object> | ||
| 70 | 75 | </child> | ||
| 71 | 76 | </object> | 74 | </object> |
| 72 | 77 | <packing> | 75 | <packing> |
| 73 | 78 | <property name="expand">False</property> | 76 | <property name="expand">False</property> |
| 76 | 79 | <property name="fill">True</property> | 77 | <property name="homogeneous">True</property> |
| 75 | 80 | <property name="position">0</property> | ||
| 77 | 81 | </packing> | 78 | </packing> |
| 78 | 82 | </child> | 79 | </child> |
| 79 | 83 | <child> | 80 | <child> |
| 81 | 84 | <object class="GtkButton" id="removeButton"> | 81 | <object class="GtkToolButton" id="removeButton"> |
| 82 | 85 | <property name="visible">True</property> | 82 | <property name="visible">True</property> |
| 83 | 86 | <property name="can_focus">True</property> | 83 | <property name="can_focus">True</property> |
| 84 | 87 | <property name="receives_default">True</property> | 84 | <property name="receives_default">True</property> |
| 85 | 88 | <property name="use_action_appearance">False</property> | 85 | <property name="use_action_appearance">False</property> |
| 86 | 86 | <property name="label" translatable="yes">Remove</property> | ||
| 87 | 87 | <property name="use_underline">True</property> | ||
| 88 | 88 | <property name="icon_name">list-remove-symbolic</property> | ||
| 89 | 89 | <child internal-child="accessible"> | 89 | <child internal-child="accessible"> |
| 90 | 90 | <object class="AtkObject" id="removeButton-atkobject"> | 90 | <object class="AtkObject" id="removeButton-atkobject"> |
| 91 | 91 | <property name="AtkObject::accessible-description" translatable="yes">Remove This Location</property> | 91 | <property name="AtkObject::accessible-description" translatable="yes">Remove This Location</property> |
| 92 | 92 | </object> | 92 | </object> |
| 93 | 93 | </child> | 93 | </child> |
| 94 | 94 | <child> | ||
| 95 | 95 | <object class="GtkImage" id="removeImage"> | ||
| 96 | 96 | <property name="visible">True</property> | ||
| 97 | 97 | <property name="can_focus">False</property> | ||
| 98 | 98 | <property name="stock">gtk-remove</property> | ||
| 99 | 99 | </object> | ||
| 100 | 100 | </child> | ||
| 101 | 101 | </object> | 94 | </object> |
| 102 | 102 | <packing> | 95 | <packing> |
| 103 | 103 | <property name="expand">False</property> | 96 | <property name="expand">False</property> |
| 106 | 104 | <property name="fill">True</property> | 97 | <property name="homogeneous">True</property> |
| 105 | 105 | <property name="position">1</property> | ||
| 107 | 106 | </packing> | 98 | </packing> |
| 108 | 107 | </child> | 99 | </child> |
| 109 | 108 | </object> | 100 | </object> |
| 110 | @@ -123,7 +115,7 @@ | |||
| 111 | 123 | <column type="gchararray"/> | 115 | <column type="gchararray"/> |
| 112 | 124 | <!-- column-name Zone --> | 116 | <!-- column-name Zone --> |
| 113 | 125 | <column type="gchararray"/> | 117 | <column type="gchararray"/> |
| 115 | 126 | <!-- column-name Visible Name --> | 118 | <!-- column-name Visible --> |
| 116 | 127 | <column type="gchararray"/> | 119 | <column type="gchararray"/> |
| 117 | 128 | <!-- column-name Icon --> | 120 | <!-- column-name Icon --> |
| 118 | 129 | <column type="gchararray"/> | 121 | <column type="gchararray"/> |
| 119 | @@ -142,20 +134,23 @@ | |||
| 120 | 142 | <property name="visible">True</property> | 134 | <property name="visible">True</property> |
| 121 | 143 | <property name="can_focus">True</property> | 135 | <property name="can_focus">True</property> |
| 122 | 144 | <child> | 136 | <child> |
| 124 | 145 | <object class="GtkVBox" id="timeDateBox"> | 137 | <object class="GtkBox" id="timeDateBox"> |
| 125 | 146 | <property name="visible">True</property> | 138 | <property name="visible">True</property> |
| 126 | 147 | <property name="can_focus">False</property> | 139 | <property name="can_focus">False</property> |
| 127 | 148 | <property name="border_width">12</property> | 140 | <property name="border_width">12</property> |
| 128 | 141 | <property name="orientation">vertical</property> | ||
| 129 | 149 | <property name="spacing">6</property> | 142 | <property name="spacing">6</property> |
| 130 | 150 | <child> | 143 | <child> |
| 132 | 151 | <object class="GtkVBox" id="timeDateOptions"> | 144 | <object class="GtkBox" id="timeDateOptions"> |
| 133 | 152 | <property name="visible">True</property> | 145 | <property name="visible">True</property> |
| 134 | 153 | <property name="can_focus">False</property> | 146 | <property name="can_focus">False</property> |
| 135 | 147 | <property name="orientation">vertical</property> | ||
| 136 | 154 | <property name="spacing">12</property> | 148 | <property name="spacing">12</property> |
| 137 | 155 | <child> | 149 | <child> |
| 139 | 156 | <object class="GtkVBox" id="vbox6"> | 150 | <object class="GtkBox" id="box1"> |
| 140 | 157 | <property name="visible">True</property> | 151 | <property name="visible">True</property> |
| 141 | 158 | <property name="can_focus">False</property> | 152 | <property name="can_focus">False</property> |
| 142 | 153 | <property name="orientation">vertical</property> | ||
| 143 | 159 | <property name="spacing">6</property> | 154 | <property name="spacing">6</property> |
| 144 | 160 | <child> | 155 | <child> |
| 145 | 161 | <object class="GtkAspectFrame" id="mapBox"> | 156 | <object class="GtkAspectFrame" id="mapBox"> |
| 146 | @@ -175,7 +170,7 @@ | |||
| 147 | 175 | </packing> | 170 | </packing> |
| 148 | 176 | </child> | 171 | </child> |
| 149 | 177 | <child> | 172 | <child> |
| 151 | 178 | <object class="GtkHBox" id="hbox1"> | 173 | <object class="GtkBox" id="box2"> |
| 152 | 179 | <property name="visible">True</property> | 174 | <property name="visible">True</property> |
| 153 | 180 | <property name="can_focus">False</property> | 175 | <property name="can_focus">False</property> |
| 154 | 181 | <property name="spacing">6</property> | 176 | <property name="spacing">6</property> |
| 155 | @@ -230,7 +225,7 @@ | |||
| 156 | 230 | <property name="column_spacing">6</property> | 225 | <property name="column_spacing">6</property> |
| 157 | 231 | <property name="row_spacing">6</property> | 226 | <property name="row_spacing">6</property> |
| 158 | 232 | <child> | 227 | <child> |
| 160 | 233 | <object class="GtkHBox" id="hbox2"> | 228 | <object class="GtkBox" id="box3"> |
| 161 | 234 | <property name="visible">True</property> | 229 | <property name="visible">True</property> |
| 162 | 235 | <property name="can_focus">False</property> | 230 | <property name="can_focus">False</property> |
| 163 | 236 | <property name="spacing">6</property> | 231 | <property name="spacing">6</property> |
| 164 | @@ -290,12 +285,12 @@ | |||
| 165 | 290 | </packing> | 285 | </packing> |
| 166 | 291 | </child> | 286 | </child> |
| 167 | 292 | <child> | 287 | <child> |
| 169 | 293 | <object class="GtkHBox" id="manualOptions"> | 288 | <object class="GtkBox" id="manualOptions"> |
| 170 | 294 | <property name="visible">True</property> | 289 | <property name="visible">True</property> |
| 171 | 295 | <property name="can_focus">False</property> | 290 | <property name="can_focus">False</property> |
| 172 | 296 | <property name="spacing">12</property> | 291 | <property name="spacing">12</property> |
| 173 | 297 | <child> | 292 | <child> |
| 175 | 298 | <object class="GtkHBox" id="hbox8"> | 293 | <object class="GtkBox" id="box4"> |
| 176 | 299 | <property name="visible">True</property> | 294 | <property name="visible">True</property> |
| 177 | 300 | <property name="can_focus">False</property> | 295 | <property name="can_focus">False</property> |
| 178 | 301 | <property name="spacing">6</property> | 296 | <property name="spacing">6</property> |
| 179 | @@ -323,7 +318,7 @@ | |||
| 180 | 323 | </packing> | 318 | </packing> |
| 181 | 324 | </child> | 319 | </child> |
| 182 | 325 | <child> | 320 | <child> |
| 184 | 326 | <object class="GtkHBox" id="hbox9"> | 321 | <object class="GtkBox" id="box5"> |
| 185 | 327 | <property name="visible">True</property> | 322 | <property name="visible">True</property> |
| 186 | 328 | <property name="can_focus">False</property> | 323 | <property name="can_focus">False</property> |
| 187 | 329 | <property name="spacing">6</property> | 324 | <property name="spacing">6</property> |
| 188 | @@ -428,10 +423,11 @@ | |||
| 189 | 428 | <property name="yalign">0</property> | 423 | <property name="yalign">0</property> |
| 190 | 429 | <property name="yscale">0</property> | 424 | <property name="yscale">0</property> |
| 191 | 430 | <child> | 425 | <child> |
| 193 | 431 | <object class="GtkVBox" id="clockBox"> | 426 | <object class="GtkBox" id="clockBox"> |
| 194 | 432 | <property name="visible">True</property> | 427 | <property name="visible">True</property> |
| 195 | 433 | <property name="can_focus">False</property> | 428 | <property name="can_focus">False</property> |
| 196 | 434 | <property name="border_width">12</property> | 429 | <property name="border_width">12</property> |
| 197 | 430 | <property name="orientation">vertical</property> | ||
| 198 | 435 | <property name="spacing">12</property> | 431 | <property name="spacing">12</property> |
| 199 | 436 | <child> | 432 | <child> |
| 200 | 437 | <object class="GtkCheckButton" id="showClockCheck"> | 433 | <object class="GtkCheckButton" id="showClockCheck"> |
| 201 | @@ -451,14 +447,15 @@ | |||
| 202 | 451 | </packing> | 447 | </packing> |
| 203 | 452 | </child> | 448 | </child> |
| 204 | 453 | <child> | 449 | <child> |
| 206 | 454 | <object class="GtkHBox" id="clockOptions"> | 450 | <object class="GtkBox" id="clockOptions"> |
| 207 | 455 | <property name="visible">True</property> | 451 | <property name="visible">True</property> |
| 208 | 456 | <property name="can_focus">False</property> | 452 | <property name="can_focus">False</property> |
| 209 | 457 | <property name="homogeneous">True</property> | 453 | <property name="homogeneous">True</property> |
| 210 | 458 | <child> | 454 | <child> |
| 212 | 459 | <object class="GtkVBox" id="vbox2"> | 455 | <object class="GtkBox" id="box6"> |
| 213 | 460 | <property name="visible">True</property> | 456 | <property name="visible">True</property> |
| 214 | 461 | <property name="can_focus">False</property> | 457 | <property name="can_focus">False</property> |
| 215 | 458 | <property name="orientation">vertical</property> | ||
| 216 | 462 | <property name="spacing">6</property> | 459 | <property name="spacing">6</property> |
| 217 | 463 | <child> | 460 | <child> |
| 218 | 464 | <object class="GtkLabel" id="label3"> | 461 | <object class="GtkLabel" id="label3"> |
| 219 | @@ -508,9 +505,10 @@ | |||
| 220 | 508 | </packing> | 505 | </packing> |
| 221 | 509 | </child> | 506 | </child> |
| 222 | 510 | <child> | 507 | <child> |
| 224 | 511 | <object class="GtkVBox" id="vbox5"> | 508 | <object class="GtkBox" id="box7"> |
| 225 | 512 | <property name="visible">True</property> | 509 | <property name="visible">True</property> |
| 226 | 513 | <property name="can_focus">False</property> | 510 | <property name="can_focus">False</property> |
| 227 | 511 | <property name="orientation">vertical</property> | ||
| 228 | 514 | <child> | 512 | <child> |
| 229 | 515 | <object class="GtkRadioButton" id="show12HourRadio"> | 513 | <object class="GtkRadioButton" id="show12HourRadio"> |
| 230 | 516 | <property name="label" translatable="yes">_12-hour time</property> | 514 | <property name="label" translatable="yes">_12-hour time</property> |
| 231 | @@ -579,9 +577,10 @@ | |||
| 232 | 579 | </packing> | 577 | </packing> |
| 233 | 580 | </child> | 578 | </child> |
| 234 | 581 | <child> | 579 | <child> |
| 236 | 582 | <object class="GtkVBox" id="vbox3"> | 580 | <object class="GtkBox" id="box8"> |
| 237 | 583 | <property name="visible">True</property> | 581 | <property name="visible">True</property> |
| 238 | 584 | <property name="can_focus">False</property> | 582 | <property name="can_focus">False</property> |
| 239 | 583 | <property name="orientation">vertical</property> | ||
| 240 | 585 | <property name="spacing">6</property> | 584 | <property name="spacing">6</property> |
| 241 | 586 | <child> | 585 | <child> |
| 242 | 587 | <object class="GtkLabel" id="label4"> | 586 | <object class="GtkLabel" id="label4"> |
| 243 | @@ -622,7 +621,7 @@ | |||
| 244 | 622 | <property name="yscale">0</property> | 621 | <property name="yscale">0</property> |
| 245 | 623 | <property name="left_padding">24</property> | 622 | <property name="left_padding">24</property> |
| 246 | 624 | <child> | 623 | <child> |
| 248 | 625 | <object class="GtkVBox" id="vbox4"> | 624 | <object class="GtkBox" id="box9"> |
| 249 | 626 | <property name="visible">True</property> | 625 | <property name="visible">True</property> |
| 250 | 627 | <property name="can_focus">False</property> | 626 | <property name="can_focus">False</property> |
| 251 | 628 | <property name="spacing">6</property> | 627 | <property name="spacing">6</property> |
| 252 | 629 | 628 | ||
| 253 | === modified file 'src/indicator-datetime.c' | |||
| 254 | --- src/indicator-datetime.c 2011-08-17 15:50:43 +0000 | |||
| 255 | +++ src/indicator-datetime.c 2011-08-26 06:11:23 +0000 | |||
| 256 | @@ -1260,7 +1260,7 @@ | |||
| 257 | 1260 | 1260 | ||
| 258 | 1261 | mi_data->gmi = gtk_menu_item_new(); | 1261 | mi_data->gmi = gtk_menu_item_new(); |
| 259 | 1262 | 1262 | ||
| 261 | 1263 | GtkWidget * hbox = gtk_hbox_new(FALSE, 4); | 1263 | GtkWidget * box = gtk_box_new(FALSE, 4); |
| 262 | 1264 | 1264 | ||
| 263 | 1265 | /* Icon, probably someone's face or avatar on an IM */ | 1265 | /* Icon, probably someone's face or avatar on an IM */ |
| 264 | 1266 | mi_data->icon = gtk_image_new(); | 1266 | mi_data->icon = gtk_image_new(); |
| 265 | @@ -1292,7 +1292,7 @@ | |||
| 266 | 1292 | } | 1292 | } |
| 267 | 1293 | } | 1293 | } |
| 268 | 1294 | gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); | 1294 | gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); |
| 270 | 1295 | gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0); | 1295 | gtk_box_pack_start(GTK_BOX(box), mi_data->icon, FALSE, FALSE, 0); |
| 271 | 1296 | gtk_widget_show(mi_data->icon); | 1296 | gtk_widget_show(mi_data->icon); |
| 272 | 1297 | 1297 | ||
| 273 | 1298 | /* Label, probably a username, chat room or mailbox name */ | 1298 | /* Label, probably a username, chat room or mailbox name */ |
| 274 | @@ -1305,7 +1305,7 @@ | |||
| 275 | 1305 | gtk_widget_set_size_request(GTK_WIDGET(mi_data->label), length, -1); // Set the min size in pixels | 1305 | gtk_widget_set_size_request(GTK_WIDGET(mi_data->label), length, -1); // Set the min size in pixels |
| 276 | 1306 | 1306 | ||
| 277 | 1307 | gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END); | 1307 | gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END); |
| 279 | 1308 | gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0); | 1308 | gtk_box_pack_start(GTK_BOX(box), mi_data->label, TRUE, TRUE, 0); |
| 280 | 1309 | gtk_widget_show(mi_data->label); | 1309 | gtk_widget_show(mi_data->label); |
| 281 | 1310 | 1310 | ||
| 282 | 1311 | /* Usually either the time or the count on the individual | 1311 | /* Usually either the time or the count on the individual |
| 283 | @@ -1313,11 +1313,11 @@ | |||
| 284 | 1313 | mi_data->right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_RIGHT)); | 1313 | mi_data->right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_RIGHT)); |
| 285 | 1314 | gtk_size_group_add_widget(self->priv->indicator_right_group, mi_data->right); | 1314 | gtk_size_group_add_widget(self->priv->indicator_right_group, mi_data->right); |
| 286 | 1315 | gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5); | 1315 | gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5); |
| 288 | 1316 | gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, 0); | 1316 | gtk_box_pack_start(GTK_BOX(box), mi_data->right, FALSE, FALSE, 0); |
| 289 | 1317 | gtk_widget_show(mi_data->right); | 1317 | gtk_widget_show(mi_data->right); |
| 290 | 1318 | 1318 | ||
| 293 | 1319 | gtk_container_add(GTK_CONTAINER(mi_data->gmi), hbox); | 1319 | gtk_container_add(GTK_CONTAINER(mi_data->gmi), box); |
| 294 | 1320 | gtk_widget_show(hbox); | 1320 | gtk_widget_show(box); |
| 295 | 1321 | 1321 | ||
| 296 | 1322 | dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(mi_data->gmi), parent); | 1322 | dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(mi_data->gmi), parent); |
| 297 | 1323 | 1323 | ||
| 298 | @@ -1470,12 +1470,12 @@ | |||
| 299 | 1470 | gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), | 1470 | gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), |
| 300 | 1471 | dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); | 1471 | dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); |
| 301 | 1472 | 1472 | ||
| 303 | 1473 | GtkWidget * hbox = gtk_hbox_new(FALSE, 4); | 1473 | GtkWidget * box = gtk_box_new(FALSE, 4); |
| 304 | 1474 | 1474 | ||
| 305 | 1475 | /* Label, probably a username, chat room or mailbox name */ | 1475 | /* Label, probably a username, chat room or mailbox name */ |
| 306 | 1476 | mi_data->label = gtk_label_new(""); | 1476 | mi_data->label = gtk_label_new(""); |
| 307 | 1477 | gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5); | 1477 | gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5); |
| 309 | 1478 | gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0); | 1478 | gtk_box_pack_start(GTK_BOX(box), mi_data->label, TRUE, TRUE, 0); |
| 310 | 1479 | gtk_widget_show(mi_data->label); | 1479 | gtk_widget_show(mi_data->label); |
| 311 | 1480 | 1480 | ||
| 312 | 1481 | /* Usually either the time or the count on the individual | 1481 | /* Usually either the time or the count on the individual |
| 313 | @@ -1483,13 +1483,13 @@ | |||
| 314 | 1483 | mi_data->right = gtk_label_new(""); | 1483 | mi_data->right = gtk_label_new(""); |
| 315 | 1484 | gtk_size_group_add_widget(self->priv->indicator_right_group, mi_data->right); | 1484 | gtk_size_group_add_widget(self->priv->indicator_right_group, mi_data->right); |
| 316 | 1485 | gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5); | 1485 | gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5); |
| 318 | 1486 | gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, 0); | 1486 | gtk_box_pack_start(GTK_BOX(box), mi_data->right, FALSE, FALSE, 0); |
| 319 | 1487 | gtk_widget_show(mi_data->right); | 1487 | gtk_widget_show(mi_data->right); |
| 320 | 1488 | 1488 | ||
| 321 | 1489 | timezone_update_labels(mi_data); | 1489 | timezone_update_labels(mi_data); |
| 322 | 1490 | 1490 | ||
| 325 | 1491 | gtk_container_add(GTK_CONTAINER(mi_data->gmi), hbox); | 1491 | gtk_container_add(GTK_CONTAINER(mi_data->gmi), box); |
| 326 | 1492 | gtk_widget_show(hbox); | 1492 | gtk_widget_show(box); |
| 327 | 1493 | 1493 | ||
| 328 | 1494 | dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(mi_data->gmi), parent); | 1494 | dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(mi_data->gmi), parent); |
| 329 | 1495 | 1495 | ||
To make the list button look right, you should also set the "inline-toolbar" style class for the toolbar. See gnome-control-
- <!-- column-name Visible Name -->
+ <!-- column-name Visible -->
Why this change?
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="box9">
This is missing its vertical orientation setting.
- GtkWidget * hbox = gtk_hbox_new(FALSE, 4);
+ GtkWidget * box = gtk_box_new(FALSE, 4);
FALSE here should be GTK_ORIENTATION