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

Commits:

2 changed files:

Changes:

  • gajim/data/gui/preferences_window.ui
    1 1
     <?xml version="1.0" encoding="UTF-8"?>
    
    2
    -<!-- Generated with glade 3.22.1 -->
    
    2
    +<!-- Generated with glade 3.22.2 -->
    
    3 3
     <interface>
    
    4 4
       <requires lib="gtk+" version="3.20"/>
    
    5 5
       <object class="GtkAdjustment" id="adjustment_status_auto_away">
    
    ... ... @@ -2092,305 +2092,393 @@ $T will be replaced by auto-not-available timeout.</property>
    2092 2092
               </packing>
    
    2093 2093
             </child>
    
    2094 2094
             <child>
    
    2095
    -          <object class="GtkBox" id="audio_video_tab">
    
    2095
    +          <object class="GtkBox">
    
    2096 2096
                 <property name="visible">True</property>
    
    2097 2097
                 <property name="can_focus">False</property>
    
    2098
    -            <property name="border_width">18</property>
    
    2099 2098
                 <property name="orientation">vertical</property>
    
    2100
    -            <property name="spacing">6</property>
    
    2101 2099
                 <child>
    
    2102
    -              <object class="GtkGrid">
    
    2100
    +              <object class="GtkInfoBar" id="av_dependencies_infobar">
    
    2103 2101
                     <property name="visible">True</property>
    
    2104 2102
                     <property name="can_focus">False</property>
    
    2105
    -                <property name="halign">start</property>
    
    2106
    -                <property name="row_spacing">6</property>
    
    2107
    -                <property name="column_spacing">12</property>
    
    2108
    -                <child>
    
    2109
    -                  <object class="GtkLabel">
    
    2110
    -                    <property name="width_request">-1</property>
    
    2111
    -                    <property name="visible">True</property>
    
    2112
    -                    <property name="can_focus">False</property>
    
    2113
    -                    <property name="halign">end</property>
    
    2114
    -                    <property name="label" translatable="yes">A_udio output device</property>
    
    2115
    -                    <property name="use_underline">True</property>
    
    2116
    -                    <property name="mnemonic_widget">audio_output_combobox</property>
    
    2117
    -                    <style>
    
    2118
    -                      <class name="dim-label"/>
    
    2119
    -                    </style>
    
    2120
    -                  </object>
    
    2121
    -                  <packing>
    
    2122
    -                    <property name="left_attach">0</property>
    
    2123
    -                    <property name="top_attach">2</property>
    
    2124
    -                  </packing>
    
    2125
    -                </child>
    
    2126
    -                <child>
    
    2127
    -                  <object class="GtkComboBox" id="audio_output_combobox">
    
    2128
    -                    <property name="visible">True</property>
    
    2129
    -                    <property name="can_focus">False</property>
    
    2130
    -                    <signal name="changed" handler="on_audio_output_combobox_changed" swapped="no"/>
    
    2131
    -                  </object>
    
    2132
    -                  <packing>
    
    2133
    -                    <property name="left_attach">1</property>
    
    2134
    -                    <property name="top_attach">2</property>
    
    2135
    -                  </packing>
    
    2136
    -                </child>
    
    2137
    -                <child>
    
    2138
    -                  <object class="GtkComboBox" id="audio_input_combobox">
    
    2139
    -                    <property name="width_request">200</property>
    
    2140
    -                    <property name="visible">True</property>
    
    2141
    -                    <property name="can_focus">False</property>
    
    2142
    -                    <signal name="changed" handler="on_audio_input_combobox_changed" swapped="no"/>
    
    2143
    -                  </object>
    
    2144
    -                  <packing>
    
    2145
    -                    <property name="left_attach">1</property>
    
    2146
    -                    <property name="top_attach">1</property>
    
    2147
    -                  </packing>
    
    2148
    -                </child>
    
    2149
    -                <child>
    
    2150
    -                  <object class="GtkLabel">
    
    2151
    -                    <property name="width_request">-1</property>
    
    2152
    -                    <property name="visible">True</property>
    
    2153
    -                    <property name="can_focus">False</property>
    
    2154
    -                    <property name="halign">end</property>
    
    2155
    -                    <property name="label" translatable="yes">_Audio input device</property>
    
    2156
    -                    <property name="use_underline">True</property>
    
    2157
    -                    <property name="mnemonic_widget">audio_input_combobox</property>
    
    2158
    -                    <style>
    
    2159
    -                      <class name="dim-label"/>
    
    2160
    -                    </style>
    
    2161
    -                  </object>
    
    2162
    -                  <packing>
    
    2163
    -                    <property name="left_attach">0</property>
    
    2164
    -                    <property name="top_attach">1</property>
    
    2165
    -                  </packing>
    
    2166
    -                </child>
    
    2167
    -                <child>
    
    2168
    -                  <object class="GtkLabel">
    
    2169
    -                    <property name="visible">True</property>
    
    2170
    -                    <property name="can_focus">False</property>
    
    2171
    -                    <property name="halign">start</property>
    
    2172
    -                    <property name="label" translatable="yes">Audio</property>
    
    2173
    -                    <property name="use_markup">True</property>
    
    2174
    -                    <style>
    
    2175
    -                      <class name="bold"/>
    
    2176
    -                      <class name="margin-top6"/>
    
    2177
    -                    </style>
    
    2178
    -                  </object>
    
    2179
    -                  <packing>
    
    2180
    -                    <property name="left_attach">0</property>
    
    2181
    -                    <property name="top_attach">0</property>
    
    2182
    -                  </packing>
    
    2183
    -                </child>
    
    2184
    -                <child>
    
    2185
    -                  <object class="GtkLabel">
    
    2186
    -                    <property name="visible">True</property>
    
    2187
    -                    <property name="can_focus">False</property>
    
    2188
    -                    <property name="halign">start</property>
    
    2189
    -                    <property name="label" translatable="yes">Video</property>
    
    2190
    -                    <property name="use_markup">True</property>
    
    2191
    -                    <style>
    
    2192
    -                      <class name="bold"/>
    
    2193
    -                      <class name="margin-top6"/>
    
    2194
    -                    </style>
    
    2195
    -                  </object>
    
    2196
    -                  <packing>
    
    2197
    -                    <property name="left_attach">0</property>
    
    2198
    -                    <property name="top_attach">3</property>
    
    2199
    -                  </packing>
    
    2200
    -                </child>
    
    2201
    -                <child>
    
    2202
    -                  <object class="GtkLabel">
    
    2203
    -                    <property name="visible">True</property>
    
    2204
    -                    <property name="can_focus">False</property>
    
    2205
    -                    <property name="halign">end</property>
    
    2206
    -                    <property name="label" translatable="yes">_Video input device</property>
    
    2207
    -                    <property name="use_underline">True</property>
    
    2208
    -                    <property name="mnemonic_widget">video_input_combobox</property>
    
    2209
    -                    <style>
    
    2210
    -                      <class name="dim-label"/>
    
    2211
    -                    </style>
    
    2212
    -                  </object>
    
    2213
    -                  <packing>
    
    2214
    -                    <property name="left_attach">0</property>
    
    2215
    -                    <property name="top_attach">4</property>
    
    2216
    -                  </packing>
    
    2217
    -                </child>
    
    2218
    -                <child>
    
    2219
    -                  <object class="GtkComboBox" id="video_input_combobox">
    
    2220
    -                    <property name="visible">True</property>
    
    2103
    +                <property name="message_type">warning</property>
    
    2104
    +                <child internal-child="action_area">
    
    2105
    +                  <object class="GtkButtonBox">
    
    2221 2106
                         <property name="can_focus">False</property>
    
    2222
    -                    <signal name="changed" handler="on_video_input_combobox_changed" swapped="no"/>
    
    2223
    -                  </object>
    
    2224
    -                  <packing>
    
    2225
    -                    <property name="left_attach">1</property>
    
    2226
    -                    <property name="top_attach">4</property>
    
    2227
    -                  </packing>
    
    2228
    -                </child>
    
    2229
    -                <child>
    
    2230
    -                  <object class="GtkLabel">
    
    2231
    -                    <property name="visible">True</property>
    
    2232
    -                    <property name="can_focus">False</property>
    
    2233
    -                    <property name="halign">end</property>
    
    2234
    -                    <property name="label" translatable="yes">Video output</property>
    
    2235
    -                    <property name="mnemonic_widget">selected_video_output</property>
    
    2236
    -                    <style>
    
    2237
    -                      <class name="dim-label"/>
    
    2238
    -                    </style>
    
    2239
    -                  </object>
    
    2240
    -                  <packing>
    
    2241
    -                    <property name="left_attach">0</property>
    
    2242
    -                    <property name="top_attach">5</property>
    
    2243
    -                  </packing>
    
    2244
    -                </child>
    
    2245
    -                <child>
    
    2246
    -                  <object class="GtkLabel" id="selected_video_output">
    
    2247
    -                    <property name="visible">True</property>
    
    2248
    -                    <property name="can_focus">False</property>
    
    2249
    -                    <property name="halign">start</property>
    
    2250
    -                  </object>
    
    2251
    -                  <packing>
    
    2252
    -                    <property name="left_attach">1</property>
    
    2253
    -                    <property name="top_attach">5</property>
    
    2254
    -                  </packing>
    
    2255
    -                </child>
    
    2256
    -                <child>
    
    2257
    -                  <object class="GtkLabel">
    
    2258
    -                    <property name="visible">True</property>
    
    2259
    -                    <property name="can_focus">False</property>
    
    2260
    -                    <property name="halign">end</property>
    
    2261
    -                    <property name="margin_top">12</property>
    
    2262
    -                    <property name="label" translatable="yes">Video _framerate</property>
    
    2263
    -                    <property name="use_underline">True</property>
    
    2264
    -                    <property name="mnemonic_widget">video_framerate_combobox</property>
    
    2265
    -                    <style>
    
    2266
    -                      <class name="dim-label"/>
    
    2267
    -                    </style>
    
    2268
    -                  </object>
    
    2269
    -                  <packing>
    
    2270
    -                    <property name="left_attach">0</property>
    
    2271
    -                    <property name="top_attach">6</property>
    
    2272
    -                  </packing>
    
    2273
    -                </child>
    
    2274
    -                <child>
    
    2275
    -                  <object class="GtkComboBox" id="video_framerate_combobox">
    
    2276
    -                    <property name="visible">True</property>
    
    2277
    -                    <property name="can_focus">False</property>
    
    2278
    -                    <property name="margin_top">12</property>
    
    2279
    -                    <signal name="changed" handler="on_video_framerate_combobox_changed" swapped="no"/>
    
    2280
    -                  </object>
    
    2281
    -                  <packing>
    
    2282
    -                    <property name="left_attach">1</property>
    
    2283
    -                    <property name="top_attach">6</property>
    
    2284
    -                  </packing>
    
    2285
    -                </child>
    
    2286
    -                <child>
    
    2287
    -                  <object class="GtkLabel">
    
    2288
    -                    <property name="visible">True</property>
    
    2289
    -                    <property name="can_focus">False</property>
    
    2290
    -                    <property name="halign">end</property>
    
    2291
    -                    <property name="label" translatable="yes">Video si_ze</property>
    
    2292
    -                    <property name="use_underline">True</property>
    
    2293
    -                    <property name="mnemonic_widget">video_size_combobox</property>
    
    2294
    -                    <style>
    
    2295
    -                      <class name="dim-label"/>
    
    2296
    -                    </style>
    
    2107
    +                    <property name="spacing">6</property>
    
    2108
    +                    <property name="layout_style">end</property>
    
    2109
    +                    <child>
    
    2110
    +                      <placeholder/>
    
    2111
    +                    </child>
    
    2112
    +                    <child>
    
    2113
    +                      <placeholder/>
    
    2114
    +                    </child>
    
    2115
    +                    <child>
    
    2116
    +                      <object class="GtkButton" id="features_button">
    
    2117
    +                        <property name="label" translatable="yes">Show _Features</property>
    
    2118
    +                        <property name="visible">True</property>
    
    2119
    +                        <property name="can_focus">True</property>
    
    2120
    +                        <property name="receives_default">True</property>
    
    2121
    +                        <property name="use_underline">True</property>
    
    2122
    +                        <signal name="clicked" handler="_on_features_button_clicked" swapped="no"/>
    
    2123
    +                      </object>
    
    2124
    +                      <packing>
    
    2125
    +                        <property name="expand">True</property>
    
    2126
    +                        <property name="fill">True</property>
    
    2127
    +                        <property name="position">2</property>
    
    2128
    +                      </packing>
    
    2129
    +                    </child>
    
    2297 2130
                       </object>
    
    2298 2131
                       <packing>
    
    2299
    -                    <property name="left_attach">0</property>
    
    2300
    -                    <property name="top_attach">7</property>
    
    2132
    +                    <property name="expand">False</property>
    
    2133
    +                    <property name="fill">False</property>
    
    2134
    +                    <property name="position">0</property>
    
    2301 2135
                       </packing>
    
    2302 2136
                     </child>
    
    2303
    -                <child>
    
    2304
    -                  <object class="GtkComboBox" id="video_size_combobox">
    
    2305
    -                    <property name="visible">True</property>
    
    2137
    +                <child internal-child="content_area">
    
    2138
    +                  <object class="GtkBox">
    
    2306 2139
                         <property name="can_focus">False</property>
    
    2307
    -                    <signal name="changed" handler="on_video_size_combobox_changed" swapped="no"/>
    
    2308
    -                  </object>
    
    2309
    -                  <packing>
    
    2310
    -                    <property name="left_attach">1</property>
    
    2311
    -                    <property name="top_attach">7</property>
    
    2312
    -                  </packing>
    
    2313
    -                </child>
    
    2314
    -                <child>
    
    2315
    -                  <object class="GtkCheckButton" id="video_see_self_checkbutton">
    
    2316
    -                    <property name="label" translatable="yes">Vi_ew own video source</property>
    
    2317
    -                    <property name="visible">True</property>
    
    2318
    -                    <property name="can_focus">True</property>
    
    2319
    -                    <property name="receives_default">False</property>
    
    2320
    -                    <property name="halign">start</property>
    
    2321
    -                    <property name="use_underline">True</property>
    
    2322
    -                    <property name="draw_indicator">True</property>
    
    2323
    -                    <signal name="toggled" handler="on_video_see_self_checkbutton_toggled" swapped="no"/>
    
    2140
    +                    <property name="spacing">16</property>
    
    2141
    +                    <child>
    
    2142
    +                      <object class="GtkLabel" id="av_dependencies_label">
    
    2143
    +                        <property name="visible">True</property>
    
    2144
    +                        <property name="can_focus">False</property>
    
    2145
    +                        <property name="ellipsize">end</property>
    
    2146
    +                        <property name="single_line_mode">True</property>
    
    2147
    +                        <property name="max_width_chars">50</property>
    
    2148
    +                      </object>
    
    2149
    +                      <packing>
    
    2150
    +                        <property name="expand">False</property>
    
    2151
    +                        <property name="fill">True</property>
    
    2152
    +                        <property name="position">0</property>
    
    2153
    +                      </packing>
    
    2154
    +                    </child>
    
    2155
    +                    <child>
    
    2156
    +                      <placeholder/>
    
    2157
    +                    </child>
    
    2158
    +                    <child>
    
    2159
    +                      <placeholder/>
    
    2160
    +                    </child>
    
    2324 2161
                       </object>
    
    2325 2162
                       <packing>
    
    2326
    -                    <property name="left_attach">1</property>
    
    2327
    -                    <property name="top_attach">8</property>
    
    2163
    +                    <property name="expand">False</property>
    
    2164
    +                    <property name="fill">False</property>
    
    2165
    +                    <property name="position">0</property>
    
    2328 2166
                       </packing>
    
    2329 2167
                     </child>
    
    2168
    +              </object>
    
    2169
    +              <packing>
    
    2170
    +                <property name="expand">False</property>
    
    2171
    +                <property name="fill">True</property>
    
    2172
    +                <property name="position">0</property>
    
    2173
    +              </packing>
    
    2174
    +            </child>
    
    2175
    +            <child>
    
    2176
    +              <object class="GtkBox" id="audio_video_tab">
    
    2177
    +                <property name="visible">True</property>
    
    2178
    +                <property name="can_focus">False</property>
    
    2179
    +                <property name="border_width">18</property>
    
    2180
    +                <property name="orientation">vertical</property>
    
    2181
    +                <property name="spacing">6</property>
    
    2330 2182
                     <child>
    
    2331
    -                  <object class="GtkLabel">
    
    2183
    +                  <object class="GtkGrid">
    
    2332 2184
                         <property name="visible">True</property>
    
    2333 2185
                         <property name="can_focus">False</property>
    
    2334 2186
                         <property name="halign">start</property>
    
    2335
    -                    <property name="label" translatable="yes">Connection</property>
    
    2336
    -                    <property name="use_markup">True</property>
    
    2337
    -                    <style>
    
    2338
    -                      <class name="bold"/>
    
    2339
    -                      <class name="margin-top6"/>
    
    2340
    -                    </style>
    
    2341
    -                  </object>
    
    2342
    -                  <packing>
    
    2343
    -                    <property name="left_attach">0</property>
    
    2344
    -                    <property name="top_attach">9</property>
    
    2345
    -                  </packing>
    
    2346
    -                </child>
    
    2347
    -                <child>
    
    2348
    -                  <object class="GtkCheckButton" id="stun_checkbutton">
    
    2349
    -                    <property name="label" translatable="yes">STU_N server</property>
    
    2350
    -                    <property name="visible">True</property>
    
    2351
    -                    <property name="can_focus">True</property>
    
    2352
    -                    <property name="receives_default">False</property>
    
    2353
    -                    <property name="halign">end</property>
    
    2354
    -                    <property name="use_underline">True</property>
    
    2355
    -                    <property name="draw_indicator">True</property>
    
    2356
    -                    <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/>
    
    2357
    -                  </object>
    
    2358
    -                  <packing>
    
    2359
    -                    <property name="left_attach">0</property>
    
    2360
    -                    <property name="top_attach">10</property>
    
    2361
    -                  </packing>
    
    2362
    -                </child>
    
    2363
    -                <child>
    
    2364
    -                  <object class="GtkEntry" id="stun_server_entry">
    
    2365
    -                    <property name="visible">True</property>
    
    2366
    -                    <property name="can_focus">True</property>
    
    2367
    -                    <property name="tooltip_text" translatable="yes">STUN server hostname. If no hostname was given, Gajim will try
    
    2187
    +                    <property name="row_spacing">6</property>
    
    2188
    +                    <property name="column_spacing">12</property>
    
    2189
    +                    <child>
    
    2190
    +                      <object class="GtkLabel">
    
    2191
    +                        <property name="width_request">-1</property>
    
    2192
    +                        <property name="visible">True</property>
    
    2193
    +                        <property name="can_focus">False</property>
    
    2194
    +                        <property name="halign">end</property>
    
    2195
    +                        <property name="label" translatable="yes">A_udio output device</property>
    
    2196
    +                        <property name="use_underline">True</property>
    
    2197
    +                        <property name="mnemonic_widget">audio_output_combobox</property>
    
    2198
    +                        <style>
    
    2199
    +                          <class name="dim-label"/>
    
    2200
    +                        </style>
    
    2201
    +                      </object>
    
    2202
    +                      <packing>
    
    2203
    +                        <property name="left_attach">0</property>
    
    2204
    +                        <property name="top_attach">2</property>
    
    2205
    +                      </packing>
    
    2206
    +                    </child>
    
    2207
    +                    <child>
    
    2208
    +                      <object class="GtkComboBox" id="audio_output_combobox">
    
    2209
    +                        <property name="visible">True</property>
    
    2210
    +                        <property name="can_focus">False</property>
    
    2211
    +                        <signal name="changed" handler="on_audio_output_combobox_changed" swapped="no"/>
    
    2212
    +                      </object>
    
    2213
    +                      <packing>
    
    2214
    +                        <property name="left_attach">1</property>
    
    2215
    +                        <property name="top_attach">2</property>
    
    2216
    +                      </packing>
    
    2217
    +                    </child>
    
    2218
    +                    <child>
    
    2219
    +                      <object class="GtkComboBox" id="audio_input_combobox">
    
    2220
    +                        <property name="width_request">200</property>
    
    2221
    +                        <property name="visible">True</property>
    
    2222
    +                        <property name="can_focus">False</property>
    
    2223
    +                        <signal name="changed" handler="on_audio_input_combobox_changed" swapped="no"/>
    
    2224
    +                      </object>
    
    2225
    +                      <packing>
    
    2226
    +                        <property name="left_attach">1</property>
    
    2227
    +                        <property name="top_attach">1</property>
    
    2228
    +                      </packing>
    
    2229
    +                    </child>
    
    2230
    +                    <child>
    
    2231
    +                      <object class="GtkLabel">
    
    2232
    +                        <property name="width_request">-1</property>
    
    2233
    +                        <property name="visible">True</property>
    
    2234
    +                        <property name="can_focus">False</property>
    
    2235
    +                        <property name="halign">end</property>
    
    2236
    +                        <property name="label" translatable="yes">_Audio input device</property>
    
    2237
    +                        <property name="use_underline">True</property>
    
    2238
    +                        <property name="mnemonic_widget">audio_input_combobox</property>
    
    2239
    +                        <style>
    
    2240
    +                          <class name="dim-label"/>
    
    2241
    +                        </style>
    
    2242
    +                      </object>
    
    2243
    +                      <packing>
    
    2244
    +                        <property name="left_attach">0</property>
    
    2245
    +                        <property name="top_attach">1</property>
    
    2246
    +                      </packing>
    
    2247
    +                    </child>
    
    2248
    +                    <child>
    
    2249
    +                      <object class="GtkLabel">
    
    2250
    +                        <property name="visible">True</property>
    
    2251
    +                        <property name="can_focus">False</property>
    
    2252
    +                        <property name="halign">start</property>
    
    2253
    +                        <property name="label" translatable="yes">Audio</property>
    
    2254
    +                        <property name="use_markup">True</property>
    
    2255
    +                        <style>
    
    2256
    +                          <class name="bold"/>
    
    2257
    +                          <class name="margin-top6"/>
    
    2258
    +                        </style>
    
    2259
    +                      </object>
    
    2260
    +                      <packing>
    
    2261
    +                        <property name="left_attach">0</property>
    
    2262
    +                        <property name="top_attach">0</property>
    
    2263
    +                      </packing>
    
    2264
    +                    </child>
    
    2265
    +                    <child>
    
    2266
    +                      <object class="GtkLabel">
    
    2267
    +                        <property name="visible">True</property>
    
    2268
    +                        <property name="can_focus">False</property>
    
    2269
    +                        <property name="halign">start</property>
    
    2270
    +                        <property name="label" translatable="yes">Video</property>
    
    2271
    +                        <property name="use_markup">True</property>
    
    2272
    +                        <style>
    
    2273
    +                          <class name="bold"/>
    
    2274
    +                          <class name="margin-top6"/>
    
    2275
    +                        </style>
    
    2276
    +                      </object>
    
    2277
    +                      <packing>
    
    2278
    +                        <property name="left_attach">0</property>
    
    2279
    +                        <property name="top_attach">3</property>
    
    2280
    +                      </packing>
    
    2281
    +                    </child>
    
    2282
    +                    <child>
    
    2283
    +                      <object class="GtkLabel">
    
    2284
    +                        <property name="visible">True</property>
    
    2285
    +                        <property name="can_focus">False</property>
    
    2286
    +                        <property name="halign">end</property>
    
    2287
    +                        <property name="label" translatable="yes">_Video input device</property>
    
    2288
    +                        <property name="use_underline">True</property>
    
    2289
    +                        <property name="mnemonic_widget">video_input_combobox</property>
    
    2290
    +                        <style>
    
    2291
    +                          <class name="dim-label"/>
    
    2292
    +                        </style>
    
    2293
    +                      </object>
    
    2294
    +                      <packing>
    
    2295
    +                        <property name="left_attach">0</property>
    
    2296
    +                        <property name="top_attach">4</property>
    
    2297
    +                      </packing>
    
    2298
    +                    </child>
    
    2299
    +                    <child>
    
    2300
    +                      <object class="GtkComboBox" id="video_input_combobox">
    
    2301
    +                        <property name="visible">True</property>
    
    2302
    +                        <property name="can_focus">False</property>
    
    2303
    +                        <signal name="changed" handler="on_video_input_combobox_changed" swapped="no"/>
    
    2304
    +                      </object>
    
    2305
    +                      <packing>
    
    2306
    +                        <property name="left_attach">1</property>
    
    2307
    +                        <property name="top_attach">4</property>
    
    2308
    +                      </packing>
    
    2309
    +                    </child>
    
    2310
    +                    <child>
    
    2311
    +                      <object class="GtkLabel">
    
    2312
    +                        <property name="visible">True</property>
    
    2313
    +                        <property name="can_focus">False</property>
    
    2314
    +                        <property name="halign">end</property>
    
    2315
    +                        <property name="label" translatable="yes">Video output</property>
    
    2316
    +                        <property name="mnemonic_widget">selected_video_output</property>
    
    2317
    +                        <style>
    
    2318
    +                          <class name="dim-label"/>
    
    2319
    +                        </style>
    
    2320
    +                      </object>
    
    2321
    +                      <packing>
    
    2322
    +                        <property name="left_attach">0</property>
    
    2323
    +                        <property name="top_attach">5</property>
    
    2324
    +                      </packing>
    
    2325
    +                    </child>
    
    2326
    +                    <child>
    
    2327
    +                      <object class="GtkLabel" id="selected_video_output">
    
    2328
    +                        <property name="visible">True</property>
    
    2329
    +                        <property name="can_focus">False</property>
    
    2330
    +                        <property name="halign">start</property>
    
    2331
    +                      </object>
    
    2332
    +                      <packing>
    
    2333
    +                        <property name="left_attach">1</property>
    
    2334
    +                        <property name="top_attach">5</property>
    
    2335
    +                      </packing>
    
    2336
    +                    </child>
    
    2337
    +                    <child>
    
    2338
    +                      <object class="GtkLabel">
    
    2339
    +                        <property name="visible">True</property>
    
    2340
    +                        <property name="can_focus">False</property>
    
    2341
    +                        <property name="halign">end</property>
    
    2342
    +                        <property name="margin_top">12</property>
    
    2343
    +                        <property name="label" translatable="yes">Video _framerate</property>
    
    2344
    +                        <property name="use_underline">True</property>
    
    2345
    +                        <property name="mnemonic_widget">video_framerate_combobox</property>
    
    2346
    +                        <style>
    
    2347
    +                          <class name="dim-label"/>
    
    2348
    +                        </style>
    
    2349
    +                      </object>
    
    2350
    +                      <packing>
    
    2351
    +                        <property name="left_attach">0</property>
    
    2352
    +                        <property name="top_attach">6</property>
    
    2353
    +                      </packing>
    
    2354
    +                    </child>
    
    2355
    +                    <child>
    
    2356
    +                      <object class="GtkComboBox" id="video_framerate_combobox">
    
    2357
    +                        <property name="visible">True</property>
    
    2358
    +                        <property name="can_focus">False</property>
    
    2359
    +                        <property name="margin_top">12</property>
    
    2360
    +                        <signal name="changed" handler="on_video_framerate_combobox_changed" swapped="no"/>
    
    2361
    +                      </object>
    
    2362
    +                      <packing>
    
    2363
    +                        <property name="left_attach">1</property>
    
    2364
    +                        <property name="top_attach">6</property>
    
    2365
    +                      </packing>
    
    2366
    +                    </child>
    
    2367
    +                    <child>
    
    2368
    +                      <object class="GtkLabel">
    
    2369
    +                        <property name="visible">True</property>
    
    2370
    +                        <property name="can_focus">False</property>
    
    2371
    +                        <property name="halign">end</property>
    
    2372
    +                        <property name="label" translatable="yes">Video si_ze</property>
    
    2373
    +                        <property name="use_underline">True</property>
    
    2374
    +                        <property name="mnemonic_widget">video_size_combobox</property>
    
    2375
    +                        <style>
    
    2376
    +                          <class name="dim-label"/>
    
    2377
    +                        </style>
    
    2378
    +                      </object>
    
    2379
    +                      <packing>
    
    2380
    +                        <property name="left_attach">0</property>
    
    2381
    +                        <property name="top_attach">7</property>
    
    2382
    +                      </packing>
    
    2383
    +                    </child>
    
    2384
    +                    <child>
    
    2385
    +                      <object class="GtkComboBox" id="video_size_combobox">
    
    2386
    +                        <property name="visible">True</property>
    
    2387
    +                        <property name="can_focus">False</property>
    
    2388
    +                        <signal name="changed" handler="on_video_size_combobox_changed" swapped="no"/>
    
    2389
    +                      </object>
    
    2390
    +                      <packing>
    
    2391
    +                        <property name="left_attach">1</property>
    
    2392
    +                        <property name="top_attach">7</property>
    
    2393
    +                      </packing>
    
    2394
    +                    </child>
    
    2395
    +                    <child>
    
    2396
    +                      <object class="GtkCheckButton" id="video_see_self_checkbutton">
    
    2397
    +                        <property name="label" translatable="yes">Vi_ew own video source</property>
    
    2398
    +                        <property name="visible">True</property>
    
    2399
    +                        <property name="can_focus">True</property>
    
    2400
    +                        <property name="receives_default">False</property>
    
    2401
    +                        <property name="halign">start</property>
    
    2402
    +                        <property name="use_underline">True</property>
    
    2403
    +                        <property name="draw_indicator">True</property>
    
    2404
    +                        <signal name="toggled" handler="on_video_see_self_checkbutton_toggled" swapped="no"/>
    
    2405
    +                      </object>
    
    2406
    +                      <packing>
    
    2407
    +                        <property name="left_attach">1</property>
    
    2408
    +                        <property name="top_attach">8</property>
    
    2409
    +                      </packing>
    
    2410
    +                    </child>
    
    2411
    +                    <child>
    
    2412
    +                      <object class="GtkLabel">
    
    2413
    +                        <property name="visible">True</property>
    
    2414
    +                        <property name="can_focus">False</property>
    
    2415
    +                        <property name="halign">start</property>
    
    2416
    +                        <property name="label" translatable="yes">Connection</property>
    
    2417
    +                        <property name="use_markup">True</property>
    
    2418
    +                        <style>
    
    2419
    +                          <class name="bold"/>
    
    2420
    +                          <class name="margin-top6"/>
    
    2421
    +                        </style>
    
    2422
    +                      </object>
    
    2423
    +                      <packing>
    
    2424
    +                        <property name="left_attach">0</property>
    
    2425
    +                        <property name="top_attach">9</property>
    
    2426
    +                      </packing>
    
    2427
    +                    </child>
    
    2428
    +                    <child>
    
    2429
    +                      <object class="GtkCheckButton" id="stun_checkbutton">
    
    2430
    +                        <property name="label" translatable="yes">STU_N server</property>
    
    2431
    +                        <property name="visible">True</property>
    
    2432
    +                        <property name="can_focus">True</property>
    
    2433
    +                        <property name="receives_default">False</property>
    
    2434
    +                        <property name="halign">end</property>
    
    2435
    +                        <property name="use_underline">True</property>
    
    2436
    +                        <property name="draw_indicator">True</property>
    
    2437
    +                        <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/>
    
    2438
    +                      </object>
    
    2439
    +                      <packing>
    
    2440
    +                        <property name="left_attach">0</property>
    
    2441
    +                        <property name="top_attach">10</property>
    
    2442
    +                      </packing>
    
    2443
    +                    </child>
    
    2444
    +                    <child>
    
    2445
    +                      <object class="GtkEntry" id="stun_server_entry">
    
    2446
    +                        <property name="visible">True</property>
    
    2447
    +                        <property name="can_focus">True</property>
    
    2448
    +                        <property name="tooltip_text" translatable="yes">STUN server hostname. If no hostname was given, Gajim will try
    
    2368 2449
     to discover one from the server. (Example: stun.iptel.org)</property>
    
    2369
    -                    <property name="invisible_char">●</property>
    
    2370
    -                    <signal name="changed" handler="stun_server_entry_changed" swapped="no"/>
    
    2450
    +                        <property name="invisible_char">●</property>
    
    2451
    +                        <signal name="changed" handler="stun_server_entry_changed" swapped="no"/>
    
    2452
    +                      </object>
    
    2453
    +                      <packing>
    
    2454
    +                        <property name="left_attach">1</property>
    
    2455
    +                        <property name="top_attach">10</property>
    
    2456
    +                      </packing>
    
    2457
    +                    </child>
    
    2458
    +                    <child>
    
    2459
    +                      <placeholder/>
    
    2460
    +                    </child>
    
    2461
    +                    <child>
    
    2462
    +                      <placeholder/>
    
    2463
    +                    </child>
    
    2464
    +                    <child>
    
    2465
    +                      <placeholder/>
    
    2466
    +                    </child>
    
    2467
    +                    <child>
    
    2468
    +                      <placeholder/>
    
    2469
    +                    </child>
    
    2371 2470
                       </object>
    
    2372 2471
                       <packing>
    
    2373
    -                    <property name="left_attach">1</property>
    
    2374
    -                    <property name="top_attach">10</property>
    
    2472
    +                    <property name="expand">False</property>
    
    2473
    +                    <property name="fill">True</property>
    
    2474
    +                    <property name="position">0</property>
    
    2375 2475
                       </packing>
    
    2376 2476
                     </child>
    
    2377
    -                <child>
    
    2378
    -                  <placeholder/>
    
    2379
    -                </child>
    
    2380
    -                <child>
    
    2381
    -                  <placeholder/>
    
    2382
    -                </child>
    
    2383
    -                <child>
    
    2384
    -                  <placeholder/>
    
    2385
    -                </child>
    
    2386
    -                <child>
    
    2387
    -                  <placeholder/>
    
    2388
    -                </child>
    
    2389 2477
                   </object>
    
    2390 2478
                   <packing>
    
    2391 2479
                     <property name="expand">False</property>
    
    2392 2480
                     <property name="fill">True</property>
    
    2393
    -                <property name="position">0</property>
    
    2481
    +                <property name="position">1</property>
    
    2394 2482
                   </packing>
    
    2395 2483
                 </child>
    
    2396 2484
               </object>
    

  • gajim/gtk/preferences.py
    ... ... @@ -13,6 +13,7 @@
    13 13
     # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
    
    14 14
     
    
    15 15
     import logging
    
    16
    +import os
    
    16 17
     
    
    17 18
     from gi.repository import GLib
    
    18 19
     from gi.repository import Gtk
    
    ... ... @@ -358,7 +359,17 @@ class Preferences(Gtk.ApplicationWindow):
    358 359
                     if config == value:
    
    359 360
                         combobox.set_active(index)
    
    360 361
     
    
    362
    +        if os.name == 'nt':
    
    363
    +            self._ui.av_dependencies_label.set_text(
    
    364
    +                _('Feature not available under Windows'))
    
    365
    +        else:
    
    366
    +            self._ui.av_dependencies_label.set_text(
    
    367
    +                _('Missing dependencies for Audio/Video'))
    
    368
    +
    
    361 369
             if app.is_installed('AV'):
    
    370
    +            self._ui.av_dependencies_infobar.set_no_show_all(True)
    
    371
    +            self._ui.av_dependencies_infobar.hide()
    
    372
    +
    
    362 373
                 create_av_combobox('audio_input', AudioInputManager().get_devices())
    
    363 374
                 create_av_combobox('audio_output', AudioOutputManager().get_devices())
    
    364 375
                 create_av_combobox('video_input', VideoInputManager().get_devices())
    
    ... ... @@ -961,6 +972,9 @@ class Preferences(Gtk.ApplicationWindow):
    961 972
             self.on_checkbutton_toggled(widget, 'use_transports_iconsets')
    
    962 973
     
    
    963 974
         ### Audio/Video tab ###
    
    975
    +    def _on_features_button_clicked(self, _button):
    
    976
    +        open_window('Features')
    
    977
    +
    
    964 978
         def on_av_combobox_changed(self, combobox, config_name):
    
    965 979
             model = combobox.get_model()
    
    966 980
             active = combobox.get_active()