Philipp Hörist pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/data/gui/change_status_message_dialog.ui
    1 1
     <?xml version="1.0" encoding="UTF-8"?>
    
    2
    -<!-- Generated with glade 3.18.3 -->
    
    2
    +<!-- Generated with glade 3.22.1 -->
    
    3 3
     <interface>
    
    4
    -  <requires lib="gtk+" version="3.12"/>
    
    4
    +  <requires lib="gtk+" version="3.18"/>
    
    5 5
       <object class="GtkDialog" id="change_status_message_dialog">
    
    6 6
         <property name="can_focus">False</property>
    
    7
    -    <property name="border_width">6</property>
    
    7
    +    <property name="border_width">18</property>
    
    8 8
         <property name="default_width">270</property>
    
    9 9
         <property name="default_height">330</property>
    
    10 10
         <property name="type_hint">dialog</property>
    
    11 11
         <signal name="key-press-event" handler="on_change_status_message_dialog_key_press_event" swapped="no"/>
    
    12
    +    <child>
    
    13
    +      <placeholder/>
    
    14
    +    </child>
    
    12 15
         <child internal-child="vbox">
    
    13
    -      <object class="GtkBox" id="dialog-vbox5">
    
    16
    +      <object class="GtkBox">
    
    14 17
             <property name="visible">True</property>
    
    15 18
             <property name="can_focus">False</property>
    
    16 19
             <property name="orientation">vertical</property>
    
    17
    -        <property name="spacing">6</property>
    
    20
    +        <property name="spacing">12</property>
    
    18 21
             <child internal-child="action_area">
    
    19 22
               <object class="GtkButtonBox" id="dialog-action_area">
    
    20 23
                 <property name="visible">True</property>
    
    21 24
                 <property name="can_focus">False</property>
    
    25
    +            <property name="margin_top">6</property>
    
    22 26
                 <property name="layout_style">end</property>
    
    23 27
                 <child>
    
    24 28
                   <object class="GtkButton" id="cancel_button">
    
    25 29
                     <property name="label">gtk-cancel</property>
    
    26
    -                <property name="use_action_appearance">False</property>
    
    27 30
                     <property name="visible">True</property>
    
    28 31
                     <property name="can_focus">True</property>
    
    29 32
                     <property name="can_default">True</property>
    
    ... ... @@ -39,13 +42,15 @@
    39 42
                 <child>
    
    40 43
                   <object class="GtkButton" id="ok_button">
    
    41 44
                     <property name="label">gtk-ok</property>
    
    42
    -                <property name="use_action_appearance">False</property>
    
    43 45
                     <property name="visible">True</property>
    
    44 46
                     <property name="can_focus">True</property>
    
    45 47
                     <property name="can_default">True</property>
    
    46 48
                     <property name="has_default">True</property>
    
    47 49
                     <property name="receives_default">False</property>
    
    48 50
                     <property name="use_stock">True</property>
    
    51
    +                <style>
    
    52
    +                  <class name="suggested-action"/>
    
    53
    +                </style>
    
    49 54
                   </object>
    
    50 55
                   <packing>
    
    51 56
                     <property name="expand">False</property>
    
    ... ... @@ -62,109 +67,94 @@
    62 67
               </packing>
    
    63 68
             </child>
    
    64 69
             <child>
    
    65
    -          <object class="GtkFrame" id="frame38">
    
    70
    +          <object class="GtkFrame">
    
    66 71
                 <property name="visible">True</property>
    
    67 72
                 <property name="can_focus">False</property>
    
    68 73
                 <property name="label_xalign">0</property>
    
    69 74
                 <property name="shadow_type">none</property>
    
    70 75
                 <child>
    
    71
    -              <object class="GtkBox" id="vbox112">
    
    76
    +              <object class="GtkBox">
    
    72 77
                     <property name="visible">True</property>
    
    73 78
                     <property name="can_focus">False</property>
    
    74
    -                <property name="border_width">6</property>
    
    79
    +                <property name="margin_top">6</property>
    
    75 80
                     <property name="orientation">vertical</property>
    
    76 81
                     <property name="spacing">6</property>
    
    77 82
                     <child>
    
    78
    -                  <object class="GtkScrolledWindow" id="scrolledwindow24">
    
    83
    +                  <object class="GtkBox">
    
    79 84
                         <property name="visible">True</property>
    
    80
    -                    <property name="can_focus">True</property>
    
    81
    -                    <property name="shadow_type">in</property>
    
    85
    +                    <property name="can_focus">False</property>
    
    82 86
                         <child>
    
    83
    -                      <object class="GtkTextView" id="message_textview">
    
    87
    +                      <object class="GtkScrolledWindow">
    
    84 88
                             <property name="visible">True</property>
    
    85 89
                             <property name="can_focus">True</property>
    
    86
    -                        <property name="wrap_mode">word</property>
    
    90
    +                        <property name="shadow_type">in</property>
    
    91
    +                        <child>
    
    92
    +                          <object class="GtkTextView" id="message_textview">
    
    93
    +                            <property name="visible">True</property>
    
    94
    +                            <property name="can_focus">True</property>
    
    95
    +                            <property name="wrap_mode">word</property>
    
    96
    +                            <property name="left_margin">6</property>
    
    97
    +                            <property name="right_margin">6</property>
    
    98
    +                            <property name="top_margin">6</property>
    
    99
    +                            <property name="bottom_margin">6</property>
    
    100
    +                          </object>
    
    101
    +                        </child>
    
    87 102
                           </object>
    
    103
    +                      <packing>
    
    104
    +                        <property name="expand">True</property>
    
    105
    +                        <property name="fill">True</property>
    
    106
    +                        <property name="position">0</property>
    
    107
    +                      </packing>
    
    88 108
                         </child>
    
    89
    -                  </object>
    
    90
    -                  <packing>
    
    91
    -                    <property name="expand">True</property>
    
    92
    -                    <property name="fill">True</property>
    
    93
    -                    <property name="position">0</property>
    
    94
    -                  </packing>
    
    95
    -                </child>
    
    96
    -                <child>
    
    97
    -                  <object class="GtkButtonBox" id="hbuttonbox33">
    
    98
    -                    <property name="visible">True</property>
    
    99
    -                    <property name="can_focus">False</property>
    
    100
    -                    <property name="layout_style">end</property>
    
    101 109
                         <child>
    
    102 110
                           <object class="GtkButton" id="save_as_preset_button">
    
    103
    -                        <property name="use_action_appearance">False</property>
    
    104 111
                             <property name="visible">True</property>
    
    105 112
                             <property name="sensitive">False</property>
    
    106 113
                             <property name="can_focus">True</property>
    
    107 114
                             <property name="can_default">True</property>
    
    108 115
                             <property name="receives_default">False</property>
    
    116
    +                        <property name="tooltip_text" translatable="yes">Save this message as a preset</property>
    
    109 117
                             <signal name="clicked" handler="on_save_as_preset_button_clicked" swapped="no"/>
    
    110 118
                             <child>
    
    111
    -                          <object class="GtkBox" id="hbox3021">
    
    119
    +                          <object class="GtkImage">
    
    112 120
                                 <property name="visible">True</property>
    
    113 121
                                 <property name="can_focus">False</property>
    
    114
    -                            <property name="spacing">2</property>
    
    115
    -                            <child>
    
    116
    -                              <object class="GtkImage" id="image1369">
    
    117
    -                                <property name="visible">True</property>
    
    118
    -                                <property name="can_focus">False</property>
    
    119
    -                                <property name="stock">gtk-save-as</property>
    
    120
    -                              </object>
    
    121
    -                              <packing>
    
    122
    -                                <property name="expand">False</property>
    
    123
    -                                <property name="fill">False</property>
    
    124
    -                                <property name="position">0</property>
    
    125
    -                              </packing>
    
    126
    -                            </child>
    
    127
    -                            <child>
    
    128
    -                              <object class="GtkLabel" id="label380">
    
    129
    -                                <property name="visible">True</property>
    
    130
    -                                <property name="can_focus">False</property>
    
    131
    -                                <property name="label" translatable="yes">Save as Preset...</property>
    
    132
    -                                <property name="use_underline">True</property>
    
    133
    -                              </object>
    
    134
    -                              <packing>
    
    135
    -                                <property name="expand">False</property>
    
    136
    -                                <property name="fill">False</property>
    
    137
    -                                <property name="position">1</property>
    
    138
    -                              </packing>
    
    139
    -                            </child>
    
    122
    +                            <property name="stock">gtk-save-as</property>
    
    140 123
                               </object>
    
    141 124
                             </child>
    
    142 125
                           </object>
    
    143 126
                           <packing>
    
    144 127
                             <property name="expand">False</property>
    
    145 128
                             <property name="fill">False</property>
    
    146
    -                        <property name="position">0</property>
    
    129
    +                        <property name="position">1</property>
    
    147 130
                           </packing>
    
    148 131
                         </child>
    
    149 132
                       </object>
    
    150 133
                       <packing>
    
    151
    -                    <property name="expand">False</property>
    
    134
    +                    <property name="expand">True</property>
    
    152 135
                         <property name="fill">True</property>
    
    153
    -                    <property name="position">1</property>
    
    136
    +                    <property name="position">0</property>
    
    154 137
                       </packing>
    
    155 138
                     </child>
    
    156 139
                     <child>
    
    157 140
                       <object class="GtkGrid" id="under_table">
    
    158 141
                         <property name="visible">True</property>
    
    159 142
                         <property name="can_focus">False</property>
    
    143
    +                    <property name="halign">center</property>
    
    144
    +                    <property name="margin_top">6</property>
    
    160 145
                         <property name="row_spacing">6</property>
    
    161
    -                    <property name="column_spacing">6</property>
    
    146
    +                    <property name="column_spacing">12</property>
    
    162 147
                         <child>
    
    163
    -                      <object class="GtkLabel" id="label165">
    
    148
    +                      <object class="GtkLabel">
    
    164 149
                             <property name="visible">True</property>
    
    165 150
                             <property name="can_focus">False</property>
    
    166
    -                        <property name="xalign">0</property>
    
    167
    -                        <property name="label" translatable="yes">Preset messages:</property>
    
    151
    +                        <property name="halign">end</property>
    
    152
    +                        <property name="label" translatable="yes">Preset _messages</property>
    
    153
    +                        <property name="use_underline">True</property>
    
    154
    +                        <property name="mnemonic_widget">message_combobox</property>
    
    155
    +                        <style>
    
    156
    +                          <class name="dim-label"/>
    
    157
    +                        </style>
    
    168 158
                           </object>
    
    169 159
                           <packing>
    
    170 160
                             <property name="left_attach">0</property>
    
    ... ... @@ -175,8 +165,14 @@
    175 165
                           <object class="GtkLabel" id="activity_label">
    
    176 166
                             <property name="visible">True</property>
    
    177 167
                             <property name="can_focus">False</property>
    
    178
    -                        <property name="xalign">0</property>
    
    179
    -                        <property name="label" translatable="yes">Activity:</property>
    
    168
    +                        <property name="halign">end</property>
    
    169
    +                        <property name="margin_top">6</property>
    
    170
    +                        <property name="label" translatable="yes">Ac_tivity</property>
    
    171
    +                        <property name="use_underline">True</property>
    
    172
    +                        <property name="mnemonic_widget">activity_button</property>
    
    173
    +                        <style>
    
    174
    +                          <class name="dim-label"/>
    
    175
    +                        </style>
    
    180 176
                           </object>
    
    181 177
                           <packing>
    
    182 178
                             <property name="left_attach">0</property>
    
    ... ... @@ -187,8 +183,13 @@
    187 183
                           <object class="GtkLabel" id="mood_label">
    
    188 184
                             <property name="visible">True</property>
    
    189 185
                             <property name="can_focus">False</property>
    
    190
    -                        <property name="xalign">0</property>
    
    191
    -                        <property name="label" translatable="yes">Mood:</property>
    
    186
    +                        <property name="halign">end</property>
    
    187
    +                        <property name="label" translatable="yes">M_ood</property>
    
    188
    +                        <property name="use_underline">True</property>
    
    189
    +                        <property name="mnemonic_widget">mood_button</property>
    
    190
    +                        <style>
    
    191
    +                          <class name="dim-label"/>
    
    192
    +                        </style>
    
    192 193
                           </object>
    
    193 194
                           <packing>
    
    194 195
                             <property name="left_attach">0</property>
    
    ... ... @@ -197,6 +198,7 @@
    197 198
                         </child>
    
    198 199
                         <child>
    
    199 200
                           <object class="GtkComboBox" id="message_combobox">
    
    201
    +                        <property name="width_request">200</property>
    
    200 202
                             <property name="visible">True</property>
    
    201 203
                             <property name="can_focus">False</property>
    
    202 204
                             <property name="hexpand">True</property>
    
    ... ... @@ -209,13 +211,13 @@
    209 211
                         </child>
    
    210 212
                         <child>
    
    211 213
                           <object class="GtkButton" id="activity_button">
    
    212
    -                        <property name="use_action_appearance">False</property>
    
    213 214
                             <property name="visible">True</property>
    
    214 215
                             <property name="can_focus">True</property>
    
    215 216
                             <property name="receives_default">True</property>
    
    217
    +                        <property name="margin_top">6</property>
    
    216 218
                             <signal name="clicked" handler="on_activity_button_clicked" swapped="no"/>
    
    217 219
                             <child>
    
    218
    -                          <object class="GtkBox" id="hbox1">
    
    220
    +                          <object class="GtkBox">
    
    219 221
                                 <property name="visible">True</property>
    
    220 222
                                 <property name="can_focus">False</property>
    
    221 223
                                 <property name="spacing">6</property>
    
    ... ... @@ -235,8 +237,8 @@
    235 237
                                   <object class="GtkLabel" id="activity_button_label">
    
    236 238
                                     <property name="visible">True</property>
    
    237 239
                                     <property name="can_focus">False</property>
    
    238
    -                                <property name="xalign">0</property>
    
    239 240
                                     <property name="wrap">True</property>
    
    241
    +                                <property name="xalign">0</property>
    
    240 242
                                   </object>
    
    241 243
                                   <packing>
    
    242 244
                                     <property name="expand">True</property>
    
    ... ... @@ -254,13 +256,12 @@
    254 256
                         </child>
    
    255 257
                         <child>
    
    256 258
                           <object class="GtkButton" id="mood_button">
    
    257
    -                        <property name="use_action_appearance">False</property>
    
    258 259
                             <property name="visible">True</property>
    
    259 260
                             <property name="can_focus">True</property>
    
    260 261
                             <property name="receives_default">True</property>
    
    261 262
                             <signal name="clicked" handler="on_mood_button_clicked" swapped="no"/>
    
    262 263
                             <child>
    
    263
    -                          <object class="GtkBox" id="hbox2">
    
    264
    +                          <object class="GtkBox">
    
    264 265
                                 <property name="visible">True</property>
    
    265 266
                                 <property name="can_focus">False</property>
    
    266 267
                                 <property name="spacing">6</property>
    
    ... ... @@ -280,8 +281,8 @@
    280 281
                                   <object class="GtkLabel" id="mood_button_label">
    
    281 282
                                     <property name="visible">True</property>
    
    282 283
                                     <property name="can_focus">False</property>
    
    283
    -                                <property name="xalign">0</property>
    
    284 284
                                     <property name="wrap">True</property>
    
    285
    +                                <property name="xalign">0</property>
    
    285 286
                                   </object>
    
    286 287
                                   <packing>
    
    287 288
                                     <property name="expand">True</property>
    
    ... ... @@ -301,17 +302,23 @@
    301 302
                       <packing>
    
    302 303
                         <property name="expand">False</property>
    
    303 304
                         <property name="fill">True</property>
    
    304
    -                    <property name="position">2</property>
    
    305
    +                    <property name="position">1</property>
    
    305 306
                       </packing>
    
    306 307
                     </child>
    
    307 308
                   </object>
    
    308 309
                 </child>
    
    309 310
                 <child type="label">
    
    310
    -              <object class="GtkLabel" id="label383">
    
    311
    +              <object class="GtkLabel">
    
    311 312
                     <property name="visible">True</property>
    
    312 313
                     <property name="can_focus">False</property>
    
    313
    -                <property name="label" translatable="yes">&lt;b&gt;Type your new status message&lt;/b&gt;</property>
    
    314
    -                <property name="use_markup">True</property>
    
    314
    +                <property name="label" translatable="yes">_Type your new status message</property>
    
    315
    +                <property name="use_underline">True</property>
    
    316
    +                <property name="justify">center</property>
    
    317
    +                <property name="mnemonic_widget">message_textview</property>
    
    318
    +                <style>
    
    319
    +                  <class name="dim-label"/>
    
    320
    +                  <class name="bold"/>
    
    321
    +                </style>
    
    315 322
                   </object>
    
    316 323
                 </child>
    
    317 324
               </object>