Decibel Audio Player

Merge lp:~turicas/decibel-audio-player/gstreamer-1.0 into lp:decibel-audio-player

  1. gstreamer-1.0
  2. Merge into trunk
Proposed by Álvaro Justen
Status: Needs review
Proposed branch: lp:~turicas/decibel-audio-player/gstreamer-1.0
Merge into: lp:decibel-audio-player
Diff against target: 11688 lines (+5303/-4444)
46 files modified
res/AudioCD.ui (+317/-260)
res/Authentication.ui (+265/-230)
res/AutoShuffle.ui (+207/-173)
res/Covers.ui (+295/-245)
res/DesktopNotification.ui (+272/-232)
res/Equalizer.ui (+780/-650)
res/FileExplorer.ui (+294/-252)
res/HelpDlg.ui (+63/-58)
res/IMStatus.ui (+333/-280)
res/Library.ui (+244/-213)
res/MainWindow.ui (+760/-650)
res/Preferences.ui (+134/-121)
res/Progress.ui (+142/-112)
res/SelectPath.ui (+207/-168)
res/StatusFile.ui (+198/-171)
res/StatusIconMenu.ui (+86/-73)
res/Twitter.ui (+182/-152)
src/decibel-audio-player.py (+29/-18)
src/gui/__init__.py (+9/-5)
src/gui/about.py (+8/-4)
src/gui/authentication.py (+7/-3)
src/gui/extListview.py (+48/-46)
src/gui/extTreeview.py (+23/-23)
src/gui/fileChooser.py (+18/-14)
src/gui/mainWindow.py (+5/-3)
src/gui/preferences.py (+23/-16)
src/gui/selectPath.py (+7/-3)
src/gui/window.py (+14/-10)
src/media/audioplayer.py (+26/-24)
src/modules/AudioCD.py (+24/-20)
src/modules/AutoShuffle.py (+10/-6)
src/modules/CtrlPanel.py (+9/-5)
src/modules/DBus.py (+19/-15)
src/modules/DesktopNotification.py (+9/-5)
src/modules/Equalizer.py (+9/-5)
src/modules/Explorer.py (+11/-7)
src/modules/FileExplorer.py (+34/-24)
src/modules/GSTPlayer.py (+11/-7)
src/modules/Library.py (+46/-43)
src/modules/StatusIcon.py (+18/-14)
src/modules/TrackPanel.py (+12/-8)
src/modules/Tracklist.py (+39/-34)
src/modules/__init__.py (+19/-15)
src/tools/__init__.py (+8/-4)
src/tools/consts.py (+7/-3)
src/tools/icons.py (+22/-20)
To merge this branch: bzr merge lp:~turicas/decibel-audio-player/gstreamer-1.0
Reviewer Review Type Date Requested Status
Anonym25712 Pending
Review via email: mp+272048@code.launchpad.net

Description of the change

WARNING: this works is not complete! Needs careful review and some changes (I can't make these changes right now). More details below.

This branch migrates GStreamer and Gtk to the new version. The old one won't be supported on Debian anymore and should be avoided.

This work is not complete! As I don't have a good experience on GUI programming and don't know in details the source code of decibel-audio-player and GObject internal API, I could not migrate some parts of the code without changing its behaviour.

Things to be changed:

1- Lines "if colormap:" and "gtk.widget_set_default_colormap(colormap)" were commented on src/decibel-audio-player.py (L103-L104) -- I don't know how to migrate this.

2- Line "gtk.about_dialog_set_url_hook(lambda dlg, url: webbrowser.open(url))" were commented on src/gui/about.py (L35) -- I don't know how to migrate this.

3- Line "self.iconview.select_path((0,))" commented on src/gui/preferences.py (L116) -- I don't know how to migrate this.

4- Should use "GdkPixbuf.Pixbuf.new" in replacement for "gdk.pixbuf" or "GdkPixBuf.Pixbuf" would be enough in some cases?

5- "gtk.widget_push_colormap" was replaced with "Gtk.ColorChooserWidget.push_composite_child" (and the correspondent "pop") but I don't know if this is the correct replacement.

6- "gdk.ACTION_DEFAULT" was replaced with "Gdk.ACTION_DEFAULT" but this constant does not exist (I didn't find a related constant on the new API).

7- Same for "Gdk.ACTION_COPY"

8- "gdk.BUTTON1_MASK" was replaced with "Gdk.EventMask.BUTTON1_MOTION_MASK" but I don't know if this is the correct replacement.

9- *.ui files were migrated but when I run the application I can see some warning of deprecated Gtk properties. They're:
  - GtkImage:stock
  - GtkImageMenuItem:use-stock
  - GtkSettings:gtk-menu-images
  - GtkImageMenuItem:accel-group
  - GtkImageMenuItem:image
  - GtkSettings:gtk-button-images

The software will work this way but the recommended is to replace with the new alternatives (I don't know how to do it).

With the following changes I can't play with decibel because I can't create the track list but the other GUI windows/actions appear to work properly, except for some exceptions I can see in the command line, such as:

-----
Exception 1:

Traceback (most recent call last):
  File "/home/turicas/projects/decibel-audio-player/src/modules/__init__.py", line 286, in __dispatch
    self.handlers[msg](**params)
  File "/home/turicas/projects/decibel-audio-player/src/modules/Tracklist.py", line 201, in set
    previousTracklist = [row[ROW_TRK] for row in self.list]
AttributeError: Tracklist instance has no attribute 'list'

-----
Exception 2:

Traceback (most recent call last):
  File "/home/turicas/projects/decibel-audio-player/src/gui/extTreeview.py", line 380, in onButtonPressed
    self.emit('exttreeview-button-pressed', event, path)
TypeError: could not convert type EventButton to GdkEvent required for parameter 0

-----
Exception 3:

Traceback (most recent call last):
  File "/home/turicas/projects/decibel-audio-player/src/gui/preferences.py", line 108, in __fmtColumnColor
    else: cll.set_property('foreground-gdk', style.text[Gtk.StateType.INSENSITIVE])
IndexError: list index out of range

To post a comment you must log in.

Unmerged revisions

186. By Álvaro Justen

Fix FileExplorer.__cmpRowsOnFilename string comparison

185. By Álvaro Justen

Migrate modules, media and tools

184. By Álvaro Justen

Migrate all needed src/gui modules

183. By Álvaro Justen

Migrate main file

182. By Álvaro Justen

Update *.ui files to the new format

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'res/AudioCD.ui'
--- res/AudioCD.ui 2011-08-18 09:01:47 +0000
+++ res/AudioCD.ui 2015-09-23 00:52:02 +0000
@@ -1,263 +1,320 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkWindow" id="win-main">
5<property name="window_position">center</property>6 <property name="can_focus">False</property>
6<child>7 <property name="window_position">center</property>
7<object class="GtkVBox" id="vbox1">8 <child>
8<property name="border_width">12</property>9 <object class="GtkVBox" id="vbox1">
9<property name="spacing">18</property>10 <property name="can_focus">False</property>
10<child>11 <property name="border_width">12</property>
11<object class="GtkVBox" id="vbox2">12 <property name="spacing">18</property>
12<property name="spacing">18</property>13 <child>
13<child>14 <object class="GtkVBox" id="vbox2">
14<object class="GtkFrame" id="frame1">15 <property name="can_focus">False</property>
15<property name="label_xalign">0</property>16 <property name="spacing">18</property>
16<property name="shadow_type">none</property>17 <child>
17<child>18 <object class="GtkFrame" id="frame1">
18<object class="GtkAlignment" id="alignment1">19 <property name="can_focus">False</property>
19<property name="top_padding">6</property>20 <property name="label_xalign">0</property>
20<property name="left_padding">12</property>21 <property name="shadow_type">none</property>
21<child>22 <child>
22<object class="GtkVBox" id="vbox4">23 <object class="GtkAlignment" id="alignment1">
23<property name="spacing">6</property>24 <property name="can_focus">False</property>
24<child>25 <property name="top_padding">6</property>
25<object class="GtkCheckButton" id="chk-useCDDB">26 <property name="left_padding">12</property>
26<property name="label" translatable="yes">Download disc information</property>27 <child>
27<property name="can_focus">True</property>28 <object class="GtkVBox" id="vbox4">
28<property name="receives_default">False</property>29 <property name="can_focus">False</property>
29<property name="tooltip_text" translatable="yes">Download disc information from an online database</property>30 <property name="spacing">6</property>
30<property name="draw_indicator">True</property>31 <child>
31</object>32 <object class="GtkCheckButton" id="chk-useCDDB">
32<packing>33 <property name="label" translatable="yes">Download disc information</property>
33<property name="position">0</property>34 <property name="can_focus">True</property>
34</packing>35 <property name="receives_default">False</property>
35</child>36 <property name="tooltip_text" translatable="yes">Download disc information from an online database</property>
36<child>37 <property name="xalign">0.5</property>
37<object class="GtkCheckButton" id="chk-useCache">38 <property name="draw_indicator">True</property>
38<property name="label" translatable="yes">Save information in a local cache</property>39 </object>
39<property name="can_focus">True</property>40 <packing>
40<property name="receives_default">False</property>41 <property name="expand">True</property>
41<property name="tooltip_text" translatable="yes">Save disc information on your hard drive</property>42 <property name="fill">True</property>
42<property name="draw_indicator">True</property>43 <property name="position">0</property>
43</object>44 </packing>
44<packing>45 </child>
45<property name="position">1</property>46 <child>
46</packing>47 <object class="GtkCheckButton" id="chk-useCache">
47</child>48 <property name="label" translatable="yes">Save information in a local cache</property>
48<child>49 <property name="can_focus">True</property>
49<object class="GtkHButtonBox" id="hbuttonbox3">50 <property name="receives_default">False</property>
50<child>51 <property name="tooltip_text" translatable="yes">Save disc information on your hard drive</property>
51<object class="GtkButton" id="btn-clearCache">52 <property name="xalign">0.5</property>
52<property name="can_focus">True</property>53 <property name="draw_indicator">True</property>
53<property name="receives_default">True</property>54 </object>
54<property name="tooltip_text" translatable="yes">Remove all disc information from your hard drive</property>55 <packing>
55<child>56 <property name="expand">True</property>
56<object class="GtkHBox" id="hbox3">57 <property name="fill">True</property>
57<child>58 <property name="position">1</property>
58<object class="GtkImage" id="image1">59 </packing>
59<property name="stock">gtk-clear</property>60 </child>
60</object>61 <child>
61<packing>62 <object class="GtkHButtonBox" id="hbuttonbox3">
62<property name="position">0</property>63 <property name="can_focus">False</property>
63</packing>64 <child>
64</child>65 <object class="GtkButton" id="btn-clearCache">
65<child>66 <property name="can_focus">True</property>
66<object class="GtkLabel" id="label2">67 <property name="receives_default">True</property>
67<property name="label" translatable="yes">Clear cache</property>68 <property name="tooltip_text" translatable="yes">Remove all disc information from your hard drive</property>
68</object>69 <child>
69<packing>70 <object class="GtkHBox" id="hbox3">
70<property name="position">1</property>71 <property name="can_focus">False</property>
71</packing>72 <child>
72</child>73 <object class="GtkImage" id="image1">
73</object>74 <property name="can_focus">False</property>
74</child>75 <property name="stock">gtk-clear</property>
75</object>76 </object>
76<packing>77 <packing>
77<property name="expand">False</property>78 <property name="expand">True</property>
78<property name="fill">False</property>79 <property name="fill">True</property>
79<property name="position">0</property>80 <property name="position">0</property>
80</packing>81 </packing>
81</child>82 </child>
82</object>83 <child>
83<packing>84 <object class="GtkLabel" id="label2">
84<property name="position">2</property>85 <property name="can_focus">False</property>
85</packing>86 <property name="label" translatable="yes">Clear cache</property>
86</child>87 </object>
87</object>88 <packing>
88</child>89 <property name="expand">True</property>
89</object>90 <property name="fill">True</property>
90</child>91 <property name="position">1</property>
91<child type="label">92 </packing>
92<object class="GtkLabel" id="label1">93 </child>
93<property name="label" translatable="yes">&lt;b&gt;CDDB&lt;/b&gt;</property>94 </object>
94<property name="use_markup">True</property>95 </child>
95</object>96 </object>
96</child>97 <packing>
97</object>98 <property name="expand">False</property>
98<packing>99 <property name="fill">False</property>
99<property name="expand">False</property>100 <property name="position">0</property>
100<property name="position">0</property>101 </packing>
101</packing>102 </child>
102</child>103 </object>
103<child>104 <packing>
104<object class="GtkFrame" id="frame3">105 <property name="expand">True</property>
105<property name="label_xalign">0</property>106 <property name="fill">True</property>
106<property name="shadow_type">none</property>107 <property name="position">2</property>
107<child>108 </packing>
108<object class="GtkAlignment" id="alignment3">109 </child>
109<property name="top_padding">6</property>110 </object>
110<property name="left_padding">12</property>111 </child>
111<child>112 </object>
112<object class="GtkVBox" id="vbox3">113 </child>
113<property name="spacing">6</property>114 <child type="label">
114<child>115 <object class="GtkLabel" id="label1">
115<object class="GtkHBox" id="hbox2">116 <property name="can_focus">False</property>
116<property name="spacing">6</property>117 <property name="label" translatable="yes">&lt;b&gt;CDDB&lt;/b&gt;</property>
117<child>118 <property name="use_markup">True</property>
118<object class="GtkLabel" id="label4">119 </object>
119<property name="label" translatable="yes">CD-ROM device:</property>120 </child>
120</object>121 </object>
121<packing>122 <packing>
122<property name="expand">False</property>123 <property name="expand">False</property>
123<property name="position">0</property>124 <property name="fill">True</property>
124</packing>125 <property name="position">0</property>
125</child>126 </packing>
126<child>127 </child>
127<object class="GtkEntry" id="txt-device">128 <child>
128<property name="can_focus">True</property>129 <object class="GtkFrame" id="frame3">
129<property name="tooltip_text" translatable="yes">Location of your CD-ROM device</property>130 <property name="can_focus">False</property>
130</object>131 <property name="label_xalign">0</property>
131<packing>132 <property name="shadow_type">none</property>
132<property name="position">1</property>133 <child>
133</packing>134 <object class="GtkAlignment" id="alignment3">
134</child>135 <property name="can_focus">False</property>
135</object>136 <property name="top_padding">6</property>
136<packing>137 <property name="left_padding">12</property>
137<property name="position">0</property>138 <child>
138</packing>139 <object class="GtkVBox" id="vbox3">
139</child>140 <property name="can_focus">False</property>
140<child>141 <property name="spacing">6</property>
141<object class="GtkHBox" id="hbox4">142 <child>
142<property name="visible">True</property>143 <object class="GtkHBox" id="hbox2">
143<property name="spacing">6</property>144 <property name="can_focus">False</property>
144<child>145 <property name="spacing">6</property>
145<object class="GtkLabel" id="label5">146 <child>
146<property name="visible">True</property>147 <object class="GtkLabel" id="label4">
147<property name="label" translatable="yes">CD-ROM read speed:</property>148 <property name="can_focus">False</property>
148</object>149 <property name="label" translatable="yes">CD-ROM device:</property>
149<packing>150 </object>
150<property name="expand">False</property>151 <packing>
151<property name="position">0</property>152 <property name="expand">False</property>
152</packing>153 <property name="fill">True</property>
153</child>154 <property name="position">0</property>
154<child>155 </packing>
155<object class="GtkComboBox" id="combo-read-speed">156 </child>
156<property name="visible">True</property>157 <child>
157</object>158 <object class="GtkEntry" id="txt-device">
158<packing>159 <property name="can_focus">True</property>
159<property name="position">1</property>160 <property name="tooltip_text" translatable="yes">Location of your CD-ROM device</property>
160</packing>161 </object>
161</child>162 <packing>
162</object>163 <property name="expand">True</property>
163<packing>164 <property name="fill">True</property>
164<property name="position">1</property>165 <property name="position">1</property>
165</packing>166 </packing>
166</child>167 </child>
167</object>168 </object>
168</child>169 <packing>
169</object>170 <property name="expand">True</property>
170</child>171 <property name="fill">True</property>
171<child type="label">172 <property name="position">0</property>
172<object class="GtkLabel" id="label3">173 </packing>
173<property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>174 </child>
174<property name="use_markup">True</property>175 <child>
175</object>176 <object class="GtkHBox" id="hbox4">
176</child>177 <property name="visible">True</property>
177</object>178 <property name="can_focus">False</property>
178<packing>179 <property name="spacing">6</property>
179<property name="expand">False</property>180 <child>
180<property name="position">1</property>181 <object class="GtkLabel" id="label5">
181</packing>182 <property name="visible">True</property>
182</child>183 <property name="can_focus">False</property>
183</object>184 <property name="label" translatable="yes">CD-ROM read speed:</property>
184<packing>185 </object>
185<property name="position">0</property>186 <packing>
186</packing>187 <property name="expand">False</property>
187</child>188 <property name="fill">True</property>
188<child>189 <property name="position">0</property>
189<object class="GtkHSeparator" id="hseparator1"/>190 </packing>
190<packing>191 </child>
191<property name="expand">False</property>192 <child>
192<property name="position">1</property>193 <object class="GtkComboBox" id="combo-read-speed">
193</packing>194 <property name="visible">True</property>
194</child>195 <property name="can_focus">False</property>
195<child>196 </object>
196<object class="GtkHBox" id="hbox1">197 <packing>
197<property name="spacing">6</property>198 <property name="expand">True</property>
198<child>199 <property name="fill">True</property>
199<object class="GtkHButtonBox" id="hbuttonbox1">200 <property name="position">1</property>
200<child>201 </packing>
201<object class="GtkButton" id="btn-help">202 </child>
202<property name="label">gtk-help</property>203 </object>
203<property name="can_focus">True</property>204 <packing>
204<property name="receives_default">True</property>205 <property name="expand">True</property>
205<property name="use_stock">True</property>206 <property name="fill">True</property>
206</object>207 <property name="position">1</property>
207<packing>208 </packing>
208<property name="expand">False</property>209 </child>
209<property name="fill">False</property>210 </object>
210<property name="position">0</property>211 </child>
211</packing>212 </object>
212</child>213 </child>
213</object>214 <child type="label">
214<packing>215 <object class="GtkLabel" id="label3">
215<property name="expand">False</property>216 <property name="can_focus">False</property>
216<property name="position">0</property>217 <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
217</packing>218 <property name="use_markup">True</property>
218</child>219 </object>
219<child>220 </child>
220<object class="GtkHButtonBox" id="hbuttonbox2">221 </object>
221<property name="spacing">12</property>222 <packing>
222<property name="layout_style">end</property>223 <property name="expand">False</property>
223<child>224 <property name="fill">True</property>
224<object class="GtkButton" id="btn-cancel">225 <property name="position">1</property>
225<property name="label">gtk-cancel</property>226 </packing>
226<property name="can_focus">True</property>227 </child>
227<property name="receives_default">True</property>228 </object>
228<property name="use_stock">True</property>229 <packing>
229</object>230 <property name="expand">True</property>
230<packing>231 <property name="fill">True</property>
231<property name="expand">False</property>232 <property name="position">0</property>
232<property name="fill">False</property>233 </packing>
233<property name="position">0</property>234 </child>
234</packing>235 <child>
235</child>236 <object class="GtkHSeparator" id="hseparator1">
236<child>237 <property name="can_focus">False</property>
237<object class="GtkButton" id="btn-ok">238 </object>
238<property name="label">gtk-ok</property>239 <packing>
239<property name="can_focus">True</property>240 <property name="expand">False</property>
240<property name="receives_default">True</property>241 <property name="fill">True</property>
241<property name="use_stock">True</property>242 <property name="position">1</property>
242</object>243 </packing>
243<packing>244 </child>
244<property name="expand">False</property>245 <child>
245<property name="fill">False</property>246 <object class="GtkHBox" id="hbox1">
246<property name="position">1</property>247 <property name="can_focus">False</property>
247</packing>248 <property name="spacing">6</property>
248</child>249 <child>
249</object>250 <object class="GtkHButtonBox" id="hbuttonbox1">
250<packing>251 <property name="can_focus">False</property>
251<property name="position">1</property>252 <child>
252</packing>253 <object class="GtkButton" id="btn-help">
253</child>254 <property name="label">gtk-help</property>
254</object>255 <property name="can_focus">True</property>
255<packing>256 <property name="receives_default">True</property>
256<property name="expand">False</property>257 <property name="use_stock">True</property>
257<property name="position">2</property>258 </object>
258</packing>259 <packing>
259</child>260 <property name="expand">False</property>
260</object>261 <property name="fill">False</property>
261</child>262 <property name="position">0</property>
262</object>263 </packing>
264 </child>
265 </object>
266 <packing>
267 <property name="expand">False</property>
268 <property name="fill">True</property>
269 <property name="position">0</property>
270 </packing>
271 </child>
272 <child>
273 <object class="GtkHButtonBox" id="hbuttonbox2">
274 <property name="can_focus">False</property>
275 <property name="spacing">12</property>
276 <property name="layout_style">end</property>
277 <child>
278 <object class="GtkButton" id="btn-cancel">
279 <property name="label">gtk-cancel</property>
280 <property name="can_focus">True</property>
281 <property name="receives_default">True</property>
282 <property name="use_stock">True</property>
283 </object>
284 <packing>
285 <property name="expand">False</property>
286 <property name="fill">False</property>
287 <property name="position">0</property>
288 </packing>
289 </child>
290 <child>
291 <object class="GtkButton" id="btn-ok">
292 <property name="label">gtk-ok</property>
293 <property name="can_focus">True</property>
294 <property name="receives_default">True</property>
295 <property name="use_stock">True</property>
296 </object>
297 <packing>
298 <property name="expand">False</property>
299 <property name="fill">False</property>
300 <property name="position">1</property>
301 </packing>
302 </child>
303 </object>
304 <packing>
305 <property name="expand">True</property>
306 <property name="fill">True</property>
307 <property name="position">1</property>
308 </packing>
309 </child>
310 </object>
311 <packing>
312 <property name="expand">False</property>
313 <property name="fill">True</property>
314 <property name="position">2</property>
315 </packing>
316 </child>
317 </object>
318 </child>
319 </object>
263</interface>320</interface>
264321
=== modified file 'res/Authentication.ui'
--- res/Authentication.ui 2011-08-18 09:01:47 +0000
+++ res/Authentication.ui 2015-09-23 00:52:02 +0000
@@ -1,233 +1,268 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkDialog" id="dlg-main">5 <object class="GtkDialog" id="dlg-main">
5<property name="border_width">5</property>6 <property name="can_focus">False</property>
6<property name="window_position">center-on-parent</property>7 <property name="border_width">5</property>
7<property name="type_hint">dialog</property>8 <property name="window_position">center-on-parent</property>
8<child internal-child="vbox">9 <property name="type_hint">dialog</property>
9<object class="GtkVBox" id="dialog-vbox1">10 <child internal-child="vbox">
10<property name="spacing">2</property>11 <object class="GtkBox" id="dialog-vbox1">
11<child>12 <property name="can_focus">False</property>
12<object class="GtkHBox" id="hbox1">13 <property name="spacing">2</property>
13<property name="spacing">12</property>14 <child internal-child="action_area">
14<child>15 <object class="GtkButtonBox" id="dlg-action_area">
15<object class="GtkVBox" id="vbox2">16 <property name="can_focus">False</property>
16<child>17 <property name="layout_style">end</property>
17<object class="GtkImage" id="image1">18 <child>
18<property name="xpad">18</property>19 <object class="GtkButton" id="btn-help">
19<property name="ypad">18</property>20 <property name="label">gtk-help</property>
20<property name="stock">gtk-dialog-authentication</property>21 <property name="can_focus">True</property>
21<property name="icon-size">6</property>22 <property name="receives_default">True</property>
22</object>23 <property name="use_stock">True</property>
23<packing>24 </object>
24<property name="expand">False</property>25 <packing>
25<property name="position">0</property>26 <property name="expand">False</property>
26</packing>27 <property name="fill">False</property>
27</child>28 <property name="position">0</property>
28</object>29 </packing>
29<packing>30 </child>
30<property name="expand">False</property>31 <child>
31<property name="position">0</property>32 <object class="GtkButton" id="button2">
32</packing>33 <property name="label">gtk-cancel</property>
33</child>34 <property name="can_focus">True</property>
34<child>35 <property name="receives_default">True</property>
35<object class="GtkVBox" id="vbox1">36 <property name="use_stock">True</property>
36<property name="spacing">12</property>37 </object>
37<child>38 <packing>
38<object class="GtkHBox" id="hbox2">39 <property name="expand">False</property>
39<child>40 <property name="fill">False</property>
40<object class="GtkAlignment" id="alignment1">41 <property name="position">1</property>
41<property name="bottom_padding">6</property>42 </packing>
42<child>43 </child>
43<object class="GtkLabel" id="lbl-title">44 <child>
44<property name="label" translatable="yes">Password required</property>45 <object class="GtkButton" id="btn-ok">
45<property name="use_markup">True</property>46 <property name="label">gtk-ok</property>
46</object>47 <property name="can_focus">True</property>
47</child>48 <property name="receives_default">True</property>
48</object>49 <property name="use_stock">True</property>
49<packing>50 </object>
50<property name="expand">False</property>51 <packing>
51<property name="position">0</property>52 <property name="expand">False</property>
52</packing>53 <property name="fill">False</property>
53</child>54 <property name="position">2</property>
54</object>55 </packing>
55<packing>56 </child>
56<property name="expand">False</property>57 </object>
57<property name="fill">False</property>58 <packing>
58<property name="position">0</property>59 <property name="expand">False</property>
59</packing>60 <property name="fill">False</property>
60</child>61 <property name="pack_type">end</property>
61<child>62 <property name="position">0</property>
62<object class="GtkHBox" id="hbox3">63 </packing>
63<child>64 </child>
64<object class="GtkLabel" id="lbl-reason">65 <child>
65<property name="label" translatable="yes">label</property>66 <object class="GtkHBox" id="hbox1">
66<property name="wrap">True</property>67 <property name="can_focus">False</property>
67</object>68 <property name="spacing">12</property>
68<packing>69 <child>
69<property name="expand">False</property>70 <object class="GtkVBox" id="vbox2">
70<property name="position">0</property>71 <property name="can_focus">False</property>
71</packing>72 <child>
72</child>73 <object class="GtkImage" id="image1">
73</object>74 <property name="can_focus">False</property>
74<packing>75 <property name="xpad">18</property>
75<property name="expand">False</property>76 <property name="ypad">18</property>
76<property name="position">1</property>77 <property name="stock">gtk-dialog-authentication</property>
77</packing>78 <property name="icon_size">6</property>
78</child>79 </object>
79<child>80 <packing>
80<object class="GtkTable" id="table1">81 <property name="expand">False</property>
81<property name="n_rows">2</property>82 <property name="fill">True</property>
82<property name="n_columns">2</property>83 <property name="position">0</property>
83<property name="column_spacing">12</property>84 </packing>
84<property name="row_spacing">6</property>85 </child>
85<child>86 </object>
86<object class="GtkEntry" id="txt-passwd">87 <packing>
87<property name="can_focus">True</property>88 <property name="expand">False</property>
88<property name="visibility">False</property>89 <property name="fill">True</property>
89</object>90 <property name="position">0</property>
90<packing>91 </packing>
91<property name="left_attach">1</property>92 </child>
92<property name="right_attach">2</property>93 <child>
93<property name="top_attach">1</property>94 <object class="GtkVBox" id="vbox1">
94<property name="bottom_attach">2</property>95 <property name="can_focus">False</property>
95</packing>96 <property name="spacing">12</property>
96</child>97 <child>
97<child>98 <object class="GtkHBox" id="hbox2">
98<object class="GtkEntry" id="txt-login">99 <property name="can_focus">False</property>
99<property name="can_focus">True</property>100 <child>
100</object>101 <object class="GtkAlignment" id="alignment1">
101<packing>102 <property name="can_focus">False</property>
102<property name="left_attach">1</property>103 <property name="bottom_padding">6</property>
103<property name="right_attach">2</property>104 <child>
104</packing>105 <object class="GtkLabel" id="lbl-title">
105</child>106 <property name="can_focus">False</property>
106<child>107 <property name="label" translatable="yes">Password required</property>
107<object class="GtkHBox" id="hbox5">108 <property name="use_markup">True</property>
108<child>109 </object>
109<object class="GtkLabel" id="label4">110 </child>
110<property name="label" translatable="yes">Password:</property>111 </object>
111</object>112 <packing>
112<packing>113 <property name="expand">False</property>
113<property name="expand">False</property>114 <property name="fill">True</property>
114<property name="position">0</property>115 <property name="position">0</property>
115</packing>116 </packing>
116</child>117 </child>
117</object>118 </object>
118<packing>119 <packing>
119<property name="top_attach">1</property>120 <property name="expand">False</property>
120<property name="bottom_attach">2</property>121 <property name="fill">False</property>
121<property name="x_options">GTK_FILL</property>122 <property name="position">0</property>
122</packing>123 </packing>
123</child>124 </child>
124<child>125 <child>
125<object class="GtkHBox" id="hbox4">126 <object class="GtkHBox" id="hbox3">
126<child>127 <property name="can_focus">False</property>
127<object class="GtkLabel" id="label3">128 <child>
128<property name="label" translatable="yes">Username:</property>129 <object class="GtkLabel" id="lbl-reason">
129</object>130 <property name="can_focus">False</property>
130<packing>131 <property name="label" translatable="yes">label</property>
131<property name="expand">False</property>132 <property name="wrap">True</property>
132<property name="position">0</property>133 </object>
133</packing>134 <packing>
134</child>135 <property name="expand">False</property>
135</object>136 <property name="fill">True</property>
136<packing>137 <property name="position">0</property>
137<property name="x_options">GTK_FILL</property>138 </packing>
138</packing>139 </child>
139</child>140 </object>
140</object>141 <packing>
141<packing>142 <property name="expand">False</property>
142<property name="expand">False</property>143 <property name="fill">True</property>
143<property name="position">2</property>144 <property name="position">1</property>
144</packing>145 </packing>
145</child>146 </child>
146<child>147 <child>
147<object class="GtkHBox" id="hbox6">148 <object class="GtkTable" id="table1">
148<child>149 <property name="can_focus">False</property>
149<object class="GtkCheckButton" id="chk-store">150 <property name="n_rows">2</property>
150<property name="label" translatable="yes">Remember this password</property>151 <property name="n_columns">2</property>
151<property name="can_focus">True</property>152 <property name="column_spacing">12</property>
152<property name="receives_default">False</property>153 <property name="row_spacing">6</property>
153<property name="draw_indicator">True</property>154 <child>
154</object>155 <object class="GtkEntry" id="txt-passwd">
155<packing>156 <property name="can_focus">True</property>
156<property name="position">0</property>157 <property name="visibility">False</property>
157</packing>158 </object>
158</child>159 <packing>
159</object>160 <property name="left_attach">1</property>
160<packing>161 <property name="right_attach">2</property>
161<property name="expand">False</property>162 <property name="top_attach">1</property>
162<property name="fill">False</property>163 <property name="bottom_attach">2</property>
163<property name="position">3</property>164 </packing>
164</packing>165 </child>
165</child>166 <child>
166</object>167 <object class="GtkEntry" id="txt-login">
167<packing>168 <property name="can_focus">True</property>
168<property name="position">1</property>169 </object>
169</packing>170 <packing>
170</child>171 <property name="left_attach">1</property>
171</object>172 <property name="right_attach">2</property>
172<packing>173 </packing>
173<property name="position">1</property>174 </child>
174</packing>175 <child>
175</child>176 <object class="GtkHBox" id="hbox5">
176<child internal-child="action_area">177 <property name="can_focus">False</property>
177<object class="GtkHButtonBox" id="dlg-action_area">178 <child>
178<property name="layout_style">end</property>179 <object class="GtkLabel" id="label4">
179<child>180 <property name="can_focus">False</property>
180<object class="GtkButton" id="btn-help">181 <property name="label" translatable="yes">Password:</property>
181<property name="label">gtk-help</property>182 </object>
182<property name="can_focus">True</property>183 <packing>
183<property name="receives_default">True</property>184 <property name="expand">False</property>
184<property name="use_stock">True</property>185 <property name="fill">True</property>
185</object>186 <property name="position">0</property>
186<packing>187 </packing>
187<property name="expand">False</property>188 </child>
188<property name="fill">False</property>189 </object>
189<property name="position">0</property>190 <packing>
190</packing>191 <property name="top_attach">1</property>
191</child>192 <property name="bottom_attach">2</property>
192<child>193 <property name="x_options">GTK_FILL</property>
193<object class="GtkButton" id="button2">194 </packing>
194<property name="label">gtk-cancel</property>195 </child>
195<property name="can_focus">True</property>196 <child>
196<property name="receives_default">True</property>197 <object class="GtkHBox" id="hbox4">
197<property name="use_stock">True</property>198 <property name="can_focus">False</property>
198</object>199 <child>
199<packing>200 <object class="GtkLabel" id="label3">
200<property name="expand">False</property>201 <property name="can_focus">False</property>
201<property name="fill">False</property>202 <property name="label" translatable="yes">Username:</property>
202<property name="position">1</property>203 </object>
203</packing>204 <packing>
204</child>205 <property name="expand">False</property>
205<child>206 <property name="fill">True</property>
206<object class="GtkButton" id="btn-ok">207 <property name="position">0</property>
207<property name="label">gtk-ok</property>208 </packing>
208<property name="can_focus">True</property>209 </child>
209<property name="receives_default">True</property>210 </object>
210<property name="use_stock">True</property>211 <packing>
211</object>212 <property name="x_options">GTK_FILL</property>
212<packing>213 </packing>
213<property name="expand">False</property>214 </child>
214<property name="fill">False</property>215 </object>
215<property name="position">2</property>216 <packing>
216</packing>217 <property name="expand">False</property>
217</child>218 <property name="fill">True</property>
218</object>219 <property name="position">2</property>
219<packing>220 </packing>
220<property name="expand">False</property>221 </child>
221<property name="pack_type">end</property>222 <child>
222<property name="position">0</property>223 <object class="GtkHBox" id="hbox6">
223</packing>224 <property name="can_focus">False</property>
224</child>225 <child>
225</object>226 <object class="GtkCheckButton" id="chk-store">
226</child>227 <property name="label" translatable="yes">Remember this password</property>
227<action-widgets>228 <property name="can_focus">True</property>
228<action-widget response="-11">btn-help</action-widget>229 <property name="receives_default">False</property>
229<action-widget response="-6">button2</action-widget>230 <property name="xalign">0.5</property>
230<action-widget response="-5">btn-ok</action-widget>231 <property name="draw_indicator">True</property>
231</action-widgets>232 </object>
232</object>233 <packing>
234 <property name="expand">True</property>
235 <property name="fill">True</property>
236 <property name="position">0</property>
237 </packing>
238 </child>
239 </object>
240 <packing>
241 <property name="expand">False</property>
242 <property name="fill">False</property>
243 <property name="position">3</property>
244 </packing>
245 </child>
246 </object>
247 <packing>
248 <property name="expand">True</property>
249 <property name="fill">True</property>
250 <property name="position">1</property>
251 </packing>
252 </child>
253 </object>
254 <packing>
255 <property name="expand">False</property>
256 <property name="fill">True</property>
257 <property name="position">1</property>
258 </packing>
259 </child>
260 </object>
261 </child>
262 <action-widgets>
263 <action-widget response="-11">btn-help</action-widget>
264 <action-widget response="-6">button2</action-widget>
265 <action-widget response="-5">btn-ok</action-widget>
266 </action-widgets>
267 </object>
233</interface>268</interface>
234269
=== modified file 'res/AutoShuffle.ui'
--- res/AutoShuffle.ui 2011-08-18 09:01:47 +0000
+++ res/AutoShuffle.ui 2015-09-23 00:52:02 +0000
@@ -1,176 +1,210 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkAdjustment" id="adjustment1">
5<property name="window_position">center</property>6 <property name="lower">1</property>
6<child>7 <property name="upper">61</property>
7<object class="GtkVBox" id="vbox1">8 <property name="value">2</property>
8<property name="border_width">12</property>9 <property name="step_increment">1</property>
9<property name="spacing">18</property>10 <property name="page_increment">1</property>
10<child>11 <property name="page_size">1</property>
11<object class="GtkVBox" id="vbox2">12 </object>
12<property name="spacing">18</property>13 <object class="GtkWindow" id="win-main">
13<child>14 <property name="can_focus">False</property>
14<object class="GtkFrame" id="frame1">15 <property name="window_position">center</property>
15<property name="label_xalign">0</property>16 <child>
16<property name="shadow_type">none</property>17 <object class="GtkVBox" id="vbox1">
17<child>18 <property name="can_focus">False</property>
18<object class="GtkAlignment" id="alignment1">19 <property name="border_width">12</property>
19<property name="top_padding">6</property>20 <property name="spacing">18</property>
20<property name="left_padding">12</property>21 <child>
21<child>22 <object class="GtkVBox" id="vbox2">
22<object class="GtkVBox" id="vbox4">23 <property name="can_focus">False</property>
23<property name="spacing">6</property>24 <property name="spacing">18</property>
24<child>25 <child>
25<object class="GtkVBox" id="vbox5">26 <object class="GtkFrame" id="frame1">
26<child>27 <property name="can_focus">False</property>
27<object class="GtkCheckButton" id="chk-enabled">28 <property name="label_xalign">0</property>
28<property name="label" translatable="yes">Automatically shuffle the playlist every X mn:</property>29 <property name="shadow_type">none</property>
29<property name="visible">True</property>30 <child>
30<property name="can_focus">True</property>31 <object class="GtkAlignment" id="alignment1">
31<property name="receives_default">False</property>32 <property name="can_focus">False</property>
32<property name="draw_indicator">True</property>33 <property name="top_padding">6</property>
33</object>34 <property name="left_padding">12</property>
34<packing>35 <child>
35<property name="position">0</property>36 <object class="GtkVBox" id="vbox4">
36</packing>37 <property name="can_focus">False</property>
37</child>38 <property name="spacing">6</property>
38<child>39 <child>
39<object class="GtkHBox" id="hbox2">40 <object class="GtkVBox" id="vbox5">
40<property name="visible">True</property>41 <property name="can_focus">False</property>
41<child>42 <child>
42<object class="GtkLabel" id="label2">43 <object class="GtkCheckButton" id="chk-enabled">
43<property name="visible">True</property>44 <property name="label" translatable="yes">Automatically shuffle the playlist every X mn:</property>
44<property name="label" translatable="yes"> </property>45 <property name="visible">True</property>
45</object>46 <property name="can_focus">True</property>
46<packing>47 <property name="receives_default">False</property>
47<property name="expand">False</property>48 <property name="xalign">0.5</property>
48<property name="position">0</property>49 <property name="draw_indicator">True</property>
49</packing>50 </object>
50</child>51 <packing>
51<child>52 <property name="expand">True</property>
52<object class="GtkHScale" id="slider-periodicity">53 <property name="fill">True</property>
53<property name="visible">True</property>54 <property name="position">0</property>
54<property name="can_focus">True</property>55 </packing>
55<property name="adjustment">adjustment1</property>56 </child>
56<property name="digits">0</property>57 <child>
57</object>58 <object class="GtkHBox" id="hbox2">
58<packing>59 <property name="visible">True</property>
59<property name="position">1</property>60 <property name="can_focus">False</property>
60</packing>61 <child>
61</child>62 <object class="GtkLabel" id="label2">
62</object>63 <property name="visible">True</property>
63<packing>64 <property name="can_focus">False</property>
64<property name="position">1</property>65 <property name="label" translatable="yes"> </property>
65</packing>66 </object>
66</child>67 <packing>
67</object>68 <property name="expand">False</property>
68<packing>69 <property name="fill">True</property>
69<property name="position">0</property>70 <property name="position">0</property>
70</packing>71 </packing>
71</child>72 </child>
72</object>73 <child>
73</child>74 <object class="GtkHScale" id="slider-periodicity">
74</object>75 <property name="visible">True</property>
75</child>76 <property name="can_focus">True</property>
76<child type="label">77 <property name="adjustment">adjustment1</property>
77<object class="GtkLabel" id="label1">78 <property name="digits">0</property>
78<property name="label" translatable="yes">&lt;b&gt;Automatic Shuffle&lt;/b&gt;</property>79 </object>
79<property name="use_markup">True</property>80 <packing>
80</object>81 <property name="expand">True</property>
81</child>82 <property name="fill">True</property>
82</object>83 <property name="position">1</property>
83<packing>84 </packing>
84<property name="expand">False</property>85 </child>
85<property name="position">0</property>86 </object>
86</packing>87 <packing>
87</child>88 <property name="expand">True</property>
88</object>89 <property name="fill">True</property>
89<packing>90 <property name="position">1</property>
90<property name="position">0</property>91 </packing>
91</packing>92 </child>
92</child>93 </object>
93<child>94 <packing>
94<object class="GtkHSeparator" id="hseparator1"/>95 <property name="expand">True</property>
95<packing>96 <property name="fill">True</property>
96<property name="expand">False</property>97 <property name="position">0</property>
97<property name="position">1</property>98 </packing>
98</packing>99 </child>
99</child>100 </object>
100<child>101 </child>
101<object class="GtkHBox" id="hbox1">102 </object>
102<property name="spacing">6</property>103 </child>
103<child>104 <child type="label">
104<object class="GtkHButtonBox" id="hbuttonbox1">105 <object class="GtkLabel" id="label1">
105<child>106 <property name="can_focus">False</property>
106<object class="GtkButton" id="btn-help">107 <property name="label" translatable="yes">&lt;b&gt;Automatic Shuffle&lt;/b&gt;</property>
107<property name="label">gtk-help</property>108 <property name="use_markup">True</property>
108<property name="can_focus">True</property>109 </object>
109<property name="receives_default">True</property>110 </child>
110<property name="use_stock">True</property>111 </object>
111</object>112 <packing>
112<packing>113 <property name="expand">False</property>
113<property name="expand">False</property>114 <property name="fill">True</property>
114<property name="fill">False</property>115 <property name="position">0</property>
115<property name="position">0</property>116 </packing>
116</packing>117 </child>
117</child>118 </object>
118</object>119 <packing>
119<packing>120 <property name="expand">True</property>
120<property name="expand">False</property>121 <property name="fill">True</property>
121<property name="position">0</property>122 <property name="position">0</property>
122</packing>123 </packing>
123</child>124 </child>
124<child>125 <child>
125<object class="GtkHButtonBox" id="hbuttonbox2">126 <object class="GtkHSeparator" id="hseparator1">
126<property name="spacing">12</property>127 <property name="can_focus">False</property>
127<property name="layout_style">end</property>128 </object>
128<child>129 <packing>
129<object class="GtkButton" id="btn-cancel">130 <property name="expand">False</property>
130<property name="label">gtk-cancel</property>131 <property name="fill">True</property>
131<property name="can_focus">True</property>132 <property name="position">1</property>
132<property name="receives_default">True</property>133 </packing>
133<property name="use_stock">True</property>134 </child>
134</object>135 <child>
135<packing>136 <object class="GtkHBox" id="hbox1">
136<property name="expand">False</property>137 <property name="can_focus">False</property>
137<property name="fill">False</property>138 <property name="spacing">6</property>
138<property name="position">0</property>139 <child>
139</packing>140 <object class="GtkHButtonBox" id="hbuttonbox1">
140</child>141 <property name="can_focus">False</property>
141<child>142 <child>
142<object class="GtkButton" id="btn-ok">143 <object class="GtkButton" id="btn-help">
143<property name="label">gtk-ok</property>144 <property name="label">gtk-help</property>
144<property name="can_focus">True</property>145 <property name="can_focus">True</property>
145<property name="receives_default">True</property>146 <property name="receives_default">True</property>
146<property name="use_stock">True</property>147 <property name="use_stock">True</property>
147</object>148 </object>
148<packing>149 <packing>
149<property name="expand">False</property>150 <property name="expand">False</property>
150<property name="fill">False</property>151 <property name="fill">False</property>
151<property name="position">1</property>152 <property name="position">0</property>
152</packing>153 </packing>
153</child>154 </child>
154</object>155 </object>
155<packing>156 <packing>
156<property name="position">1</property>157 <property name="expand">False</property>
157</packing>158 <property name="fill">True</property>
158</child>159 <property name="position">0</property>
159</object>160 </packing>
160<packing>161 </child>
161<property name="expand">False</property>162 <child>
162<property name="position">2</property>163 <object class="GtkHButtonBox" id="hbuttonbox2">
163</packing>164 <property name="can_focus">False</property>
164</child>165 <property name="spacing">12</property>
165</object>166 <property name="layout_style">end</property>
166</child>167 <child>
167</object>168 <object class="GtkButton" id="btn-cancel">
168<object class="GtkAdjustment" id="adjustment1">169 <property name="label">gtk-cancel</property>
169<property name="value">2</property>170 <property name="can_focus">True</property>
170<property name="lower">1</property>171 <property name="receives_default">True</property>
171<property name="upper">61</property>172 <property name="use_stock">True</property>
172<property name="step_increment">1</property>173 </object>
173<property name="page_increment">1</property>174 <packing>
174<property name="page_size">1</property>175 <property name="expand">False</property>
175</object>176 <property name="fill">False</property>
177 <property name="position">0</property>
178 </packing>
179 </child>
180 <child>
181 <object class="GtkButton" id="btn-ok">
182 <property name="label">gtk-ok</property>
183 <property name="can_focus">True</property>
184 <property name="receives_default">True</property>
185 <property name="use_stock">True</property>
186 </object>
187 <packing>
188 <property name="expand">False</property>
189 <property name="fill">False</property>
190 <property name="position">1</property>
191 </packing>
192 </child>
193 </object>
194 <packing>
195 <property name="expand">True</property>
196 <property name="fill">True</property>
197 <property name="position">1</property>
198 </packing>
199 </child>
200 </object>
201 <packing>
202 <property name="expand">False</property>
203 <property name="fill">True</property>
204 <property name="position">2</property>
205 </packing>
206 </child>
207 </object>
208 </child>
209 </object>
176</interface>210</interface>
177211
=== modified file 'res/Covers.ui'
--- res/Covers.ui 2011-08-18 09:01:47 +0000
+++ res/Covers.ui 2015-09-23 00:52:02 +0000
@@ -1,248 +1,298 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkWindow" id="win-main">
5<property name="window_position">center</property>6 <property name="can_focus">False</property>
6<child>7 <property name="window_position">center</property>
7<object class="GtkVBox" id="vbox1">8 <child>
8<property name="border_width">12</property>9 <object class="GtkVBox" id="vbox1">
9<property name="spacing">18</property>10 <property name="can_focus">False</property>
10<child>11 <property name="border_width">12</property>
11<object class="GtkVBox" id="vbox2">12 <property name="spacing">18</property>
12<property name="spacing">18</property>13 <child>
13<child>14 <object class="GtkVBox" id="vbox2">
14<object class="GtkFrame" id="frame1">15 <property name="can_focus">False</property>
15<property name="label_xalign">0</property>16 <property name="spacing">18</property>
16<property name="shadow_type">none</property>17 <child>
17<child>18 <object class="GtkFrame" id="frame1">
18<object class="GtkAlignment" id="alignment1">19 <property name="can_focus">False</property>
19<property name="top_padding">6</property>20 <property name="label_xalign">0</property>
20<property name="left_padding">12</property>21 <property name="shadow_type">none</property>
21<child>22 <child>
22<object class="GtkVBox" id="vbox4">23 <object class="GtkAlignment" id="alignment1">
23<property name="spacing">6</property>24 <property name="can_focus">False</property>
24<child>25 <property name="top_padding">6</property>
25<object class="GtkVBox" id="vbox5">26 <property name="left_padding">12</property>
26<property name="spacing">6</property>27 <child>
27<child>28 <object class="GtkVBox" id="vbox4">
28<object class="GtkHBox" id="hbox4">29 <property name="can_focus">False</property>
29<property name="spacing">6</property>30 <property name="spacing">6</property>
30<child>31 <child>
31<object class="GtkLabel" id="label5">32 <object class="GtkVBox" id="vbox5">
32<property name="label" translatable="yes">Filenames:</property>33 <property name="can_focus">False</property>
33</object>34 <property name="spacing">6</property>
34<packing>35 <child>
35<property name="expand">False</property>36 <object class="GtkHBox" id="hbox4">
36<property name="position">0</property>37 <property name="can_focus">False</property>
37</packing>38 <property name="spacing">6</property>
38</child>39 <child>
39<child>40 <object class="GtkLabel" id="label5">
40<object class="GtkEntry" id="txt-filenames">41 <property name="can_focus">False</property>
41<property name="can_focus">True</property>42 <property name="label" translatable="yes">Filenames:</property>
42<property name="tooltip_text" translatable="yes">Filenames to look for (e.g., folder, cover)</property>43 </object>
43</object>44 <packing>
44<packing>45 <property name="expand">False</property>
45<property name="position">1</property>46 <property name="fill">True</property>
46</packing>47 <property name="position">0</property>
47</child>48 </packing>
48</object>49 </child>
49<packing>50 <child>
50<property name="position">0</property>51 <object class="GtkEntry" id="txt-filenames">
51</packing>52 <property name="can_focus">True</property>
52</child>53 <property name="tooltip_text" translatable="yes">Filenames to look for (e.g., folder, cover)</property>
53<child>54 </object>
54<object class="GtkCheckButton" id="chk-searchInParentDirs">55 <packing>
55<property name="label" translatable="yes">Search in parent directories as well</property>56 <property name="expand">True</property>
56<property name="visible">True</property>57 <property name="fill">True</property>
57<property name="can_focus">True</property>58 <property name="position">1</property>
58<property name="receives_default">False</property>59 </packing>
59<property name="draw_indicator">True</property>60 </child>
60</object>61 </object>
61<packing>62 <packing>
62<property name="position">1</property>63 <property name="expand">True</property>
63</packing>64 <property name="fill">True</property>
64</child>65 <property name="position">0</property>
65</object>66 </packing>
66<packing>67 </child>
67<property name="position">0</property>68 <child>
68</packing>69 <object class="GtkCheckButton" id="chk-searchInParentDirs">
69</child>70 <property name="label" translatable="yes">Search in parent directories as well</property>
70</object>71 <property name="visible">True</property>
71</child>72 <property name="can_focus">True</property>
72</object>73 <property name="receives_default">False</property>
73</child>74 <property name="xalign">0.5</property>
74<child type="label">75 <property name="draw_indicator">True</property>
75<object class="GtkLabel" id="label1">76 </object>
76<property name="label" translatable="yes">&lt;b&gt;User Covers&lt;/b&gt;</property>77 <packing>
77<property name="use_markup">True</property>78 <property name="expand">True</property>
78</object>79 <property name="fill">True</property>
79</child>80 <property name="position">1</property>
80</object>81 </packing>
81<packing>82 </child>
82<property name="expand">False</property>83 </object>
83<property name="position">0</property>84 <packing>
84</packing>85 <property name="expand">True</property>
85</child>86 <property name="fill">True</property>
86<child>87 <property name="position">0</property>
87<object class="GtkFrame" id="frame3">88 </packing>
88<property name="label_xalign">0</property>89 </child>
89<property name="shadow_type">none</property>90 </object>
90<child>91 </child>
91<object class="GtkAlignment" id="alignment3">92 </object>
92<property name="top_padding">6</property>93 </child>
93<property name="left_padding">12</property>94 <child type="label">
94<child>95 <object class="GtkLabel" id="label1">
95<object class="GtkVBox" id="vbox3">96 <property name="can_focus">False</property>
96<child>97 <property name="label" translatable="yes">&lt;b&gt;User Covers&lt;/b&gt;</property>
97<object class="GtkCheckButton" id="chk-downloadCovers">98 <property name="use_markup">True</property>
98<property name="label" translatable="yes">Download covers</property>99 </object>
99<property name="can_focus">True</property>100 </child>
100<property name="receives_default">False</property>101 </object>
101<property name="tooltip_text" translatable="yes">Try to download covers from the Internet</property>102 <packing>
102<property name="draw_indicator">True</property>103 <property name="expand">False</property>
103</object>104 <property name="fill">True</property>
104<packing>105 <property name="position">0</property>
105<property name="position">0</property>106 </packing>
106</packing>107 </child>
107</child>108 <child>
108<child>109 <object class="GtkFrame" id="frame3">
109<object class="GtkVBox" id="vbox6">110 <property name="can_focus">False</property>
110<property name="visible">True</property>111 <property name="label_xalign">0</property>
111<property name="spacing">12</property>112 <property name="shadow_type">none</property>
112<child>113 <child>
113<object class="GtkCheckButton" id="chk-preferUserCovers">114 <object class="GtkAlignment" id="alignment3">
114<property name="label" translatable="yes">Always prefer user covers</property>115 <property name="can_focus">False</property>
115<property name="can_focus">True</property>116 <property name="top_padding">6</property>
116<property name="receives_default">False</property>117 <property name="left_padding">12</property>
117<property name="tooltip_text" translatable="yes">Don't download covers when there is a user one</property>118 <child>
118<property name="draw_indicator">True</property>119 <object class="GtkVBox" id="vbox3">
119</object>120 <property name="can_focus">False</property>
120<packing>121 <child>
121<property name="position">0</property>122 <object class="GtkCheckButton" id="chk-downloadCovers">
122</packing>123 <property name="label" translatable="yes">Download covers</property>
123</child>124 <property name="can_focus">True</property>
124<child>125 <property name="receives_default">False</property>
125<object class="GtkHButtonBox" id="hbuttonbox4">126 <property name="tooltip_text" translatable="yes">Try to download covers from the Internet</property>
126<property name="visible">True</property>127 <property name="xalign">0.5</property>
127<property name="layout_style">end</property>128 <property name="draw_indicator">True</property>
128<child>129 </object>
129<object class="GtkImage" id="img-lastfm">130 <packing>
130<property name="visible">True</property>131 <property name="expand">True</property>
131<property name="stock">gtk-missing-image</property>132 <property name="fill">True</property>
132</object>133 <property name="position">0</property>
133<packing>134 </packing>
134<property name="expand">False</property>135 </child>
135<property name="fill">False</property>136 <child>
136<property name="pack_type">end</property>137 <object class="GtkVBox" id="vbox6">
137<property name="position">0</property>138 <property name="visible">True</property>
138</packing>139 <property name="can_focus">False</property>
139</child>140 <property name="spacing">12</property>
140</object>141 <child>
141<packing>142 <object class="GtkCheckButton" id="chk-preferUserCovers">
142<property name="expand">False</property>143 <property name="label" translatable="yes">Always prefer user covers</property>
143<property name="fill">False</property>144 <property name="can_focus">True</property>
144<property name="position">1</property>145 <property name="receives_default">False</property>
145</packing>146 <property name="tooltip_text" translatable="yes">Don't download covers when there is a user one</property>
146</child>147 <property name="xalign">0.5</property>
147</object>148 <property name="draw_indicator">True</property>
148<packing>149 </object>
149<property name="position">1</property>150 <packing>
150</packing>151 <property name="expand">True</property>
151</child>152 <property name="fill">True</property>
152</object>153 <property name="position">0</property>
153</child>154 </packing>
154</object>155 </child>
155</child>156 <child>
156<child type="label">157 <object class="GtkHButtonBox" id="hbuttonbox4">
157<object class="GtkLabel" id="label3">158 <property name="visible">True</property>
158<property name="label" translatable="yes">&lt;b&gt;Internet Covers&lt;/b&gt;</property>159 <property name="can_focus">False</property>
159<property name="use_markup">True</property>160 <property name="layout_style">end</property>
160</object>161 <child>
161</child>162 <object class="GtkImage" id="img-lastfm">
162</object>163 <property name="visible">True</property>
163<packing>164 <property name="can_focus">False</property>
164<property name="expand">False</property>165 <property name="stock">gtk-missing-image</property>
165<property name="position">1</property>166 </object>
166</packing>167 <packing>
167</child>168 <property name="expand">False</property>
168</object>169 <property name="fill">False</property>
169<packing>170 <property name="pack_type">end</property>
170<property name="position">0</property>171 <property name="position">0</property>
171</packing>172 </packing>
172</child>173 </child>
173<child>174 </object>
174<object class="GtkHSeparator" id="hseparator1"/>175 <packing>
175<packing>176 <property name="expand">False</property>
176<property name="expand">False</property>177 <property name="fill">False</property>
177<property name="position">1</property>178 <property name="position">1</property>
178</packing>179 </packing>
179</child>180 </child>
180<child>181 </object>
181<object class="GtkHBox" id="hbox1">182 <packing>
182<property name="spacing">6</property>183 <property name="expand">True</property>
183<child>184 <property name="fill">True</property>
184<object class="GtkHButtonBox" id="hbuttonbox1">185 <property name="position">1</property>
185<child>186 </packing>
186<object class="GtkButton" id="btn-help">187 </child>
187<property name="label">gtk-help</property>188 </object>
188<property name="can_focus">True</property>189 </child>
189<property name="receives_default">True</property>190 </object>
190<property name="use_stock">True</property>191 </child>
191</object>192 <child type="label">
192<packing>193 <object class="GtkLabel" id="label3">
193<property name="expand">False</property>194 <property name="can_focus">False</property>
194<property name="fill">False</property>195 <property name="label" translatable="yes">&lt;b&gt;Internet Covers&lt;/b&gt;</property>
195<property name="position">0</property>196 <property name="use_markup">True</property>
196</packing>197 </object>
197</child>198 </child>
198</object>199 </object>
199<packing>200 <packing>
200<property name="expand">False</property>201 <property name="expand">False</property>
201<property name="position">0</property>202 <property name="fill">True</property>
202</packing>203 <property name="position">1</property>
203</child>204 </packing>
204<child>205 </child>
205<object class="GtkHButtonBox" id="hbuttonbox2">206 </object>
206<property name="spacing">12</property>207 <packing>
207<property name="layout_style">end</property>208 <property name="expand">True</property>
208<child>209 <property name="fill">True</property>
209<object class="GtkButton" id="btn-cancel">210 <property name="position">0</property>
210<property name="label">gtk-cancel</property>211 </packing>
211<property name="can_focus">True</property>212 </child>
212<property name="receives_default">True</property>213 <child>
213<property name="use_stock">True</property>214 <object class="GtkHSeparator" id="hseparator1">
214</object>215 <property name="can_focus">False</property>
215<packing>216 </object>
216<property name="expand">False</property>217 <packing>
217<property name="fill">False</property>218 <property name="expand">False</property>
218<property name="position">0</property>219 <property name="fill">True</property>
219</packing>220 <property name="position">1</property>
220</child>221 </packing>
221<child>222 </child>
222<object class="GtkButton" id="btn-ok">223 <child>
223<property name="label">gtk-ok</property>224 <object class="GtkHBox" id="hbox1">
224<property name="can_focus">True</property>225 <property name="can_focus">False</property>
225<property name="receives_default">True</property>226 <property name="spacing">6</property>
226<property name="use_stock">True</property>227 <child>
227</object>228 <object class="GtkHButtonBox" id="hbuttonbox1">
228<packing>229 <property name="can_focus">False</property>
229<property name="expand">False</property>230 <child>
230<property name="fill">False</property>231 <object class="GtkButton" id="btn-help">
231<property name="position">1</property>232 <property name="label">gtk-help</property>
232</packing>233 <property name="can_focus">True</property>
233</child>234 <property name="receives_default">True</property>
234</object>235 <property name="use_stock">True</property>
235<packing>236 </object>
236<property name="position">1</property>237 <packing>
237</packing>238 <property name="expand">False</property>
238</child>239 <property name="fill">False</property>
239</object>240 <property name="position">0</property>
240<packing>241 </packing>
241<property name="expand">False</property>242 </child>
242<property name="position">2</property>243 </object>
243</packing>244 <packing>
244</child>245 <property name="expand">False</property>
245</object>246 <property name="fill">True</property>
246</child>247 <property name="position">0</property>
247</object>248 </packing>
249 </child>
250 <child>
251 <object class="GtkHButtonBox" id="hbuttonbox2">
252 <property name="can_focus">False</property>
253 <property name="spacing">12</property>
254 <property name="layout_style">end</property>
255 <child>
256 <object class="GtkButton" id="btn-cancel">
257 <property name="label">gtk-cancel</property>
258 <property name="can_focus">True</property>
259 <property name="receives_default">True</property>
260 <property name="use_stock">True</property>
261 </object>
262 <packing>
263 <property name="expand">False</property>
264 <property name="fill">False</property>
265 <property name="position">0</property>
266 </packing>
267 </child>
268 <child>
269 <object class="GtkButton" id="btn-ok">
270 <property name="label">gtk-ok</property>
271 <property name="can_focus">True</property>
272 <property name="receives_default">True</property>
273 <property name="use_stock">True</property>
274 </object>
275 <packing>
276 <property name="expand">False</property>
277 <property name="fill">False</property>
278 <property name="position">1</property>
279 </packing>
280 </child>
281 </object>
282 <packing>
283 <property name="expand">True</property>
284 <property name="fill">True</property>
285 <property name="position">1</property>
286 </packing>
287 </child>
288 </object>
289 <packing>
290 <property name="expand">False</property>
291 <property name="fill">True</property>
292 <property name="position">2</property>
293 </packing>
294 </child>
295 </object>
296 </child>
297 </object>
248</interface>298</interface>
249299
=== modified file 'res/DesktopNotification.ui'
--- res/DesktopNotification.ui 2011-08-18 09:01:47 +0000
+++ res/DesktopNotification.ui 2015-09-23 00:52:02 +0000
@@ -1,235 +1,275 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkAdjustment" id="adjustment1">
5<property name="window_position">center</property>6 <property name="lower">1</property>
6<child>7 <property name="upper">60</property>
7<object class="GtkVBox" id="vbox1">8 <property name="value">1</property>
8<property name="border_width">12</property>9 <property name="step_increment">1</property>
9<property name="spacing">18</property>10 </object>
10<child>11 <object class="GtkWindow" id="win-main">
11<object class="GtkVBox" id="vbox2">12 <property name="can_focus">False</property>
12<property name="spacing">18</property>13 <property name="window_position">center</property>
13<child>14 <child>
14<object class="GtkFrame" id="frame1">15 <object class="GtkVBox" id="vbox1">
15<property name="label_xalign">0</property>16 <property name="can_focus">False</property>
16<property name="shadow_type">none</property>17 <property name="border_width">12</property>
17<child>18 <property name="spacing">18</property>
18<object class="GtkAlignment" id="alignment1">19 <child>
19<property name="top_padding">6</property>20 <object class="GtkVBox" id="vbox2">
20<property name="left_padding">12</property>21 <property name="can_focus">False</property>
21<child>22 <property name="spacing">18</property>
22<object class="GtkEntry" id="txt-title">23 <child>
23<property name="can_focus">True</property>24 <object class="GtkFrame" id="frame1">
24</object>25 <property name="can_focus">False</property>
25</child>26 <property name="label_xalign">0</property>
26</object>27 <property name="shadow_type">none</property>
27</child>28 <child>
28<child type="label">29 <object class="GtkAlignment" id="alignment1">
29<object class="GtkLabel" id="label1">30 <property name="can_focus">False</property>
30<property name="label" translatable="yes">&lt;b&gt;Title&lt;/b&gt;</property>31 <property name="top_padding">6</property>
31<property name="use_markup">True</property>32 <property name="left_padding">12</property>
32</object>33 <child>
33</child>34 <object class="GtkEntry" id="txt-title">
34</object>35 <property name="can_focus">True</property>
35<packing>36 </object>
36<property name="expand">False</property>37 </child>
37<property name="position">0</property>38 </object>
38</packing>39 </child>
39</child>40 <child type="label">
40<child>41 <object class="GtkLabel" id="label1">
41<object class="GtkFrame" id="frame2">42 <property name="can_focus">False</property>
42<property name="label_xalign">0</property>43 <property name="label" translatable="yes">&lt;b&gt;Title&lt;/b&gt;</property>
43<property name="shadow_type">none</property>44 <property name="use_markup">True</property>
44<child>45 </object>
45<object class="GtkAlignment" id="alignment2">46 </child>
46<property name="top_padding">6</property>47 </object>
47<property name="left_padding">12</property>48 <packing>
48<child>49 <property name="expand">False</property>
49<object class="GtkScrolledWindow" id="scrolledwindow1">50 <property name="fill">True</property>
50<property name="can_focus">True</property>51 <property name="position">0</property>
51<property name="hscrollbar_policy">automatic</property>52 </packing>
52<property name="vscrollbar_policy">automatic</property>53 </child>
53<property name="shadow_type">in</property>54 <child>
54<child>55 <object class="GtkFrame" id="frame2">
55<object class="GtkTextView" id="txt-body">56 <property name="can_focus">False</property>
56<property name="can_focus">True</property>57 <property name="label_xalign">0</property>
57</object>58 <property name="shadow_type">none</property>
58</child>59 <child>
59</object>60 <object class="GtkAlignment" id="alignment2">
60</child>61 <property name="can_focus">False</property>
61</object>62 <property name="top_padding">6</property>
62</child>63 <property name="left_padding">12</property>
63<child type="label">64 <child>
64<object class="GtkLabel" id="label2">65 <object class="GtkScrolledWindow" id="scrolledwindow1">
65<property name="label" translatable="yes">&lt;b&gt;Body&lt;/b&gt;</property>66 <property name="can_focus">True</property>
66<property name="use_markup">True</property>67 <property name="shadow_type">in</property>
67</object>68 <child>
68</child>69 <object class="GtkTextView" id="txt-body">
69</object>70 <property name="can_focus">True</property>
70<packing>71 </object>
71<property name="position">1</property>72 </child>
72</packing>73 </object>
73</child>74 </child>
74<child>75 </object>
75<object class="GtkFrame" id="frame3">76 </child>
76<property name="label_xalign">0</property>77 <child type="label">
77<property name="shadow_type">none</property>78 <object class="GtkLabel" id="label2">
78<child>79 <property name="can_focus">False</property>
79<object class="GtkAlignment" id="alignment3">80 <property name="label" translatable="yes">&lt;b&gt;Body&lt;/b&gt;</property>
80<property name="top_padding">6</property>81 <property name="use_markup">True</property>
81<property name="left_padding">12</property>82 </object>
82<child>83 </child>
83<object class="GtkVBox" id="vbox3">84 </object>
84<property name="spacing">6</property>85 <packing>
85<child>86 <property name="expand">True</property>
86<object class="GtkCheckButton" id="chk-skipTrack">87 <property name="fill">True</property>
87<property name="label" translatable="yes">Show a "skip track" button</property>88 <property name="position">1</property>
88<property name="can_focus">True</property>89 </packing>
89<property name="receives_default">False</property>90 </child>
90<property name="draw_indicator">True</property>91 <child>
91</object>92 <object class="GtkFrame" id="frame3">
92<packing>93 <property name="can_focus">False</property>
93<property name="position">0</property>94 <property name="label_xalign">0</property>
94</packing>95 <property name="shadow_type">none</property>
95</child>96 <child>
96<child>97 <object class="GtkAlignment" id="alignment3">
97<object class="GtkHBox" id="hbox2">98 <property name="can_focus">False</property>
98<property name="spacing">6</property>99 <property name="top_padding">6</property>
99<child>100 <property name="left_padding">12</property>
100<object class="GtkLabel" id="label4">101 <child>
101<property name="label" translatable="yes">Notification timeout:</property>102 <object class="GtkVBox" id="vbox3">
102</object>103 <property name="can_focus">False</property>
103<packing>104 <property name="spacing">6</property>
104<property name="expand">False</property>105 <child>
105<property name="position">0</property>106 <object class="GtkCheckButton" id="chk-skipTrack">
106</packing>107 <property name="label" translatable="yes">Show a "skip track" button</property>
107</child>108 <property name="can_focus">True</property>
108<child>109 <property name="receives_default">False</property>
109<object class="GtkSpinButton" id="spn-duration">110 <property name="xalign">0.5</property>
110<property name="can_focus">True</property>111 <property name="draw_indicator">True</property>
111<property name="tooltip_text" translatable="yes">Time during which the notification is displayed</property>112 </object>
112<property name="adjustment">adjustment1</property>113 <packing>
113<property name="numeric">True</property>114 <property name="expand">True</property>
114</object>115 <property name="fill">True</property>
115<packing>116 <property name="position">0</property>
116<property name="position">1</property>117 </packing>
117</packing>118 </child>
118</child>119 <child>
119<child>120 <object class="GtkHBox" id="hbox2">
120<object class="GtkLabel" id="label5">121 <property name="can_focus">False</property>
121<property name="label" translatable="yes">seconds</property>122 <property name="spacing">6</property>
122</object>123 <child>
123<packing>124 <object class="GtkLabel" id="label4">
124<property name="expand">False</property>125 <property name="can_focus">False</property>
125<property name="position">2</property>126 <property name="label" translatable="yes">Notification timeout:</property>
126</packing>127 </object>
127</child>128 <packing>
128</object>129 <property name="expand">False</property>
129<packing>130 <property name="fill">True</property>
130<property name="position">1</property>131 <property name="position">0</property>
131</packing>132 </packing>
132</child>133 </child>
133</object>134 <child>
134</child>135 <object class="GtkSpinButton" id="spn-duration">
135</object>136 <property name="can_focus">True</property>
136</child>137 <property name="tooltip_text" translatable="yes">Time during which the notification is displayed</property>
137<child type="label">138 <property name="adjustment">adjustment1</property>
138<object class="GtkLabel" id="label3">139 <property name="numeric">True</property>
139<property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>140 </object>
140<property name="use_markup">True</property>141 <packing>
141</object>142 <property name="expand">True</property>
142</child>143 <property name="fill">True</property>
143</object>144 <property name="position">1</property>
144<packing>145 </packing>
145<property name="expand">False</property>146 </child>
146<property name="position">2</property>147 <child>
147</packing>148 <object class="GtkLabel" id="label5">
148</child>149 <property name="can_focus">False</property>
149</object>150 <property name="label" translatable="yes">seconds</property>
150<packing>151 </object>
151<property name="position">0</property>152 <packing>
152</packing>153 <property name="expand">False</property>
153</child>154 <property name="fill">True</property>
154<child>155 <property name="position">2</property>
155<object class="GtkHSeparator" id="hseparator1"/>156 </packing>
156<packing>157 </child>
157<property name="expand">False</property>158 </object>
158<property name="position">1</property>159 <packing>
159</packing>160 <property name="expand">True</property>
160</child>161 <property name="fill">True</property>
161<child>162 <property name="position">1</property>
162<object class="GtkHBox" id="hbox1">163 </packing>
163<property name="spacing">6</property>164 </child>
164<child>165 </object>
165<object class="GtkHButtonBox" id="hbuttonbox1">166 </child>
166<child>167 </object>
167<object class="GtkButton" id="btn-help">168 </child>
168<property name="label">gtk-help</property>169 <child type="label">
169<property name="can_focus">True</property>170 <object class="GtkLabel" id="label3">
170<property name="receives_default">True</property>171 <property name="can_focus">False</property>
171<property name="use_stock">True</property>172 <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
172</object>173 <property name="use_markup">True</property>
173<packing>174 </object>
174<property name="expand">False</property>175 </child>
175<property name="fill">False</property>176 </object>
176<property name="position">0</property>177 <packing>
177</packing>178 <property name="expand">False</property>
178</child>179 <property name="fill">True</property>
179</object>180 <property name="position">2</property>
180<packing>181 </packing>
181<property name="expand">False</property>182 </child>
182<property name="position">0</property>183 </object>
183</packing>184 <packing>
184</child>185 <property name="expand">True</property>
185<child>186 <property name="fill">True</property>
186<object class="GtkHButtonBox" id="hbuttonbox2">187 <property name="position">0</property>
187<property name="spacing">12</property>188 </packing>
188<property name="layout_style">end</property>189 </child>
189<child>190 <child>
190<object class="GtkButton" id="btn-cancel">191 <object class="GtkHSeparator" id="hseparator1">
191<property name="label">gtk-cancel</property>192 <property name="can_focus">False</property>
192<property name="can_focus">True</property>193 </object>
193<property name="receives_default">True</property>194 <packing>
194<property name="use_stock">True</property>195 <property name="expand">False</property>
195</object>196 <property name="fill">True</property>
196<packing>197 <property name="position">1</property>
197<property name="expand">False</property>198 </packing>
198<property name="fill">False</property>199 </child>
199<property name="position">0</property>200 <child>
200</packing>201 <object class="GtkHBox" id="hbox1">
201</child>202 <property name="can_focus">False</property>
202<child>203 <property name="spacing">6</property>
203<object class="GtkButton" id="btn-ok">204 <child>
204<property name="label">gtk-ok</property>205 <object class="GtkHButtonBox" id="hbuttonbox1">
205<property name="can_focus">True</property>206 <property name="can_focus">False</property>
206<property name="receives_default">True</property>207 <child>
207<property name="use_stock">True</property>208 <object class="GtkButton" id="btn-help">
208</object>209 <property name="label">gtk-help</property>
209<packing>210 <property name="can_focus">True</property>
210<property name="expand">False</property>211 <property name="receives_default">True</property>
211<property name="fill">False</property>212 <property name="use_stock">True</property>
212<property name="position">1</property>213 </object>
213</packing>214 <packing>
214</child>215 <property name="expand">False</property>
215</object>216 <property name="fill">False</property>
216<packing>217 <property name="position">0</property>
217<property name="position">1</property>218 </packing>
218</packing>219 </child>
219</child>220 </object>
220</object>221 <packing>
221<packing>222 <property name="expand">False</property>
222<property name="expand">False</property>223 <property name="fill">True</property>
223<property name="position">2</property>224 <property name="position">0</property>
224</packing>225 </packing>
225</child>226 </child>
226</object>227 <child>
227</child>228 <object class="GtkHButtonBox" id="hbuttonbox2">
228</object>229 <property name="can_focus">False</property>
229<object class="GtkAdjustment" id="adjustment1">230 <property name="spacing">12</property>
230<property name="value">1</property>231 <property name="layout_style">end</property>
231<property name="lower">1</property>232 <child>
232<property name="upper">60</property>233 <object class="GtkButton" id="btn-cancel">
233<property name="step_increment">1</property>234 <property name="label">gtk-cancel</property>
234</object>235 <property name="can_focus">True</property>
236 <property name="receives_default">True</property>
237 <property name="use_stock">True</property>
238 </object>
239 <packing>
240 <property name="expand">False</property>
241 <property name="fill">False</property>
242 <property name="position">0</property>
243 </packing>
244 </child>
245 <child>
246 <object class="GtkButton" id="btn-ok">
247 <property name="label">gtk-ok</property>
248 <property name="can_focus">True</property>
249 <property name="receives_default">True</property>
250 <property name="use_stock">True</property>
251 </object>
252 <packing>
253 <property name="expand">False</property>
254 <property name="fill">False</property>
255 <property name="position">1</property>
256 </packing>
257 </child>
258 </object>
259 <packing>
260 <property name="expand">True</property>
261 <property name="fill">True</property>
262 <property name="position">1</property>
263 </packing>
264 </child>
265 </object>
266 <packing>
267 <property name="expand">False</property>
268 <property name="fill">True</property>
269 <property name="position">2</property>
270 </packing>
271 </child>
272 </object>
273 </child>
274 </object>
235</interface>275</interface>
236276
=== modified file 'res/Equalizer.ui'
--- res/Equalizer.ui 2011-08-18 09:01:47 +0000
+++ res/Equalizer.ui 2015-09-23 00:52:02 +0000
@@ -1,653 +1,783 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkAdjustment" id="adjustment1">
5<property name="window_position">center</property>6 <property name="lower">-24</property>
6<child>7 <property name="upper">22</property>
7<object class="GtkVBox" id="vbox1">8 <property name="step_increment">1</property>
8<property name="border_width">12</property>9 <property name="page_increment">10</property>
9<property name="spacing">18</property>10 <property name="page_size">10</property>
10<child>11 </object>
11<object class="GtkVBox" id="vbox2">12 <object class="GtkAdjustment" id="adjustment10">
12<property name="visible">True</property>13 <property name="lower">-24</property>
13<property name="spacing">18</property>14 <property name="upper">22</property>
14<child>15 <property name="step_increment">1</property>
15<object class="GtkHBox" id="hbox3">16 <property name="page_increment">10</property>
16<property name="visible">True</property>17 <property name="page_size">10</property>
17<child>18 </object>
18<object class="GtkHBox" id="hbox2">19 <object class="GtkAdjustment" id="adjustment2">
19<property name="visible">True</property>20 <property name="lower">-24</property>
20<property name="spacing">12</property>21 <property name="upper">22</property>
21<property name="homogeneous">True</property>22 <property name="step_increment">1</property>
22<child>23 <property name="page_increment">10</property>
23<object class="GtkVBox" id="vbox3">24 <property name="page_size">10</property>
24<property name="visible">True</property>25 </object>
25<property name="spacing">6</property>26 <object class="GtkAdjustment" id="adjustment3">
26<child>27 <property name="lower">-24</property>
27<object class="GtkVScale" id="vscale0">28 <property name="upper">22</property>
28<property name="visible">True</property>29 <property name="step_increment">1</property>
29<property name="can_focus">True</property>30 <property name="page_increment">10</property>
30<property name="adjustment">adjustment10</property>31 <property name="page_size">10</property>
31<property name="inverted">True</property>32 </object>
32</object>33 <object class="GtkAdjustment" id="adjustment4">
33<packing>34 <property name="lower">-24</property>
34<property name="position">0</property>35 <property name="upper">22</property>
35</packing>36 <property name="step_increment">1</property>
36</child>37 <property name="page_increment">10</property>
37<child>38 <property name="page_size">10</property>
38<object class="GtkLabel" id="label1">39 </object>
39<property name="visible">True</property>40 <object class="GtkAdjustment" id="adjustment5">
40<property name="label">&lt;b&gt;29 Hz&lt;/b&gt;</property>41 <property name="lower">-24</property>
41<property name="use_markup">True</property>42 <property name="upper">22</property>
42</object>43 <property name="step_increment">1</property>
43<packing>44 <property name="page_increment">10</property>
44<property name="expand">False</property>45 <property name="page_size">10</property>
45<property name="position">1</property>46 </object>
46</packing>47 <object class="GtkAdjustment" id="adjustment6">
47</child>48 <property name="lower">-24</property>
48</object>49 <property name="upper">22</property>
49<packing>50 <property name="step_increment">1</property>
50<property name="position">0</property>51 <property name="page_increment">10</property>
51</packing>52 <property name="page_size">10</property>
52</child>53 </object>
53<child>54 <object class="GtkAdjustment" id="adjustment7">
54<object class="GtkVBox" id="vbox4">55 <property name="lower">-24</property>
55<property name="visible">True</property>56 <property name="upper">22</property>
56<property name="spacing">6</property>57 <property name="step_increment">1</property>
57<child>58 <property name="page_increment">10</property>
58<object class="GtkVScale" id="vscale1">59 <property name="page_size">10</property>
59<property name="visible">True</property>60 </object>
60<property name="can_focus">True</property>61 <object class="GtkAdjustment" id="adjustment8">
61<property name="adjustment">adjustment9</property>62 <property name="lower">-24</property>
62<property name="inverted">True</property>63 <property name="upper">22</property>
63</object>64 <property name="step_increment">1</property>
64<packing>65 <property name="page_increment">10</property>
65<property name="position">0</property>66 <property name="page_size">10</property>
66</packing>67 </object>
67</child>68 <object class="GtkAdjustment" id="adjustment9">
68<child>69 <property name="lower">-24</property>
69<object class="GtkLabel" id="label2">70 <property name="upper">22</property>
70<property name="visible">True</property>71 <property name="step_increment">1</property>
71<property name="label">&lt;b&gt;59 Hz&lt;/b&gt;</property>72 <property name="page_increment">10</property>
72<property name="use_markup">True</property>73 <property name="page_size">10</property>
73</object>74 </object>
74<packing>75 <object class="GtkWindow" id="win-main">
75<property name="expand">False</property>76 <property name="can_focus">False</property>
76<property name="position">1</property>77 <property name="window_position">center</property>
77</packing>78 <child>
78</child>79 <object class="GtkVBox" id="vbox1">
79</object>80 <property name="can_focus">False</property>
80<packing>81 <property name="border_width">12</property>
81<property name="position">1</property>82 <property name="spacing">18</property>
82</packing>83 <child>
83</child>84 <object class="GtkVBox" id="vbox2">
84<child>85 <property name="visible">True</property>
85<object class="GtkVBox" id="vbox5">86 <property name="can_focus">False</property>
86<property name="visible">True</property>87 <property name="spacing">18</property>
87<property name="spacing">6</property>88 <child>
88<child>89 <object class="GtkHBox" id="hbox3">
89<object class="GtkVScale" id="vscale2">90 <property name="visible">True</property>
90<property name="visible">True</property>91 <property name="can_focus">False</property>
91<property name="can_focus">True</property>92 <child>
92<property name="adjustment">adjustment8</property>93 <object class="GtkHBox" id="hbox2">
93<property name="inverted">True</property>94 <property name="visible">True</property>
94</object>95 <property name="can_focus">False</property>
95<packing>96 <property name="spacing">12</property>
96<property name="position">0</property>97 <property name="homogeneous">True</property>
97</packing>98 <child>
98</child>99 <object class="GtkVBox" id="vbox3">
99<child>100 <property name="visible">True</property>
100<object class="GtkLabel" id="label3">101 <property name="can_focus">False</property>
101<property name="visible">True</property>102 <property name="spacing">6</property>
102<property name="label">&lt;b&gt;119 Hz&lt;/b&gt;</property>103 <child>
103<property name="use_markup">True</property>104 <object class="GtkVScale" id="vscale0">
104</object>105 <property name="visible">True</property>
105<packing>106 <property name="can_focus">True</property>
106<property name="expand">False</property>107 <property name="adjustment">adjustment10</property>
107<property name="position">1</property>108 <property name="inverted">True</property>
108</packing>109 </object>
109</child>110 <packing>
110</object>111 <property name="expand">True</property>
111<packing>112 <property name="fill">True</property>
112<property name="position">2</property>113 <property name="position">0</property>
113</packing>114 </packing>
114</child>115 </child>
115<child>116 <child>
116<object class="GtkVBox" id="vbox6">117 <object class="GtkLabel" id="label1">
117<property name="visible">True</property>118 <property name="visible">True</property>
118<property name="spacing">6</property>119 <property name="can_focus">False</property>
119<child>120 <property name="label">&lt;b&gt;29 Hz&lt;/b&gt;</property>
120<object class="GtkVScale" id="vscale3">121 <property name="use_markup">True</property>
121<property name="visible">True</property>122 </object>
122<property name="can_focus">True</property>123 <packing>
123<property name="adjustment">adjustment7</property>124 <property name="expand">False</property>
124<property name="inverted">True</property>125 <property name="fill">True</property>
125</object>126 <property name="position">1</property>
126<packing>127 </packing>
127<property name="position">0</property>128 </child>
128</packing>129 </object>
129</child>130 <packing>
130<child>131 <property name="expand">True</property>
131<object class="GtkLabel" id="label4">132 <property name="fill">True</property>
132<property name="visible">True</property>133 <property name="position">0</property>
133<property name="label">&lt;b&gt;227 Hz&lt;/b&gt;</property>134 </packing>
134<property name="use_markup">True</property>135 </child>
135</object>136 <child>
136<packing>137 <object class="GtkVBox" id="vbox4">
137<property name="expand">False</property>138 <property name="visible">True</property>
138<property name="position">1</property>139 <property name="can_focus">False</property>
139</packing>140 <property name="spacing">6</property>
140</child>141 <child>
141</object>142 <object class="GtkVScale" id="vscale1">
142<packing>143 <property name="visible">True</property>
143<property name="position">3</property>144 <property name="can_focus">True</property>
144</packing>145 <property name="adjustment">adjustment9</property>
145</child>146 <property name="inverted">True</property>
146<child>147 </object>
147<object class="GtkVBox" id="vbox7">148 <packing>
148<property name="visible">True</property>149 <property name="expand">True</property>
149<property name="spacing">6</property>150 <property name="fill">True</property>
150<child>151 <property name="position">0</property>
151<object class="GtkVScale" id="vscale4">152 </packing>
152<property name="visible">True</property>153 </child>
153<property name="can_focus">True</property>154 <child>
154<property name="adjustment">adjustment6</property>155 <object class="GtkLabel" id="label2">
155<property name="inverted">True</property>156 <property name="visible">True</property>
156</object>157 <property name="can_focus">False</property>
157<packing>158 <property name="label">&lt;b&gt;59 Hz&lt;/b&gt;</property>
158<property name="position">0</property>159 <property name="use_markup">True</property>
159</packing>160 </object>
160</child>161 <packing>
161<child>162 <property name="expand">False</property>
162<object class="GtkLabel" id="label5">163 <property name="fill">True</property>
163<property name="visible">True</property>164 <property name="position">1</property>
164<property name="label">&lt;b&gt;474 Hz&lt;/b&gt;</property>165 </packing>
165<property name="use_markup">True</property>166 </child>
166</object>167 </object>
167<packing>168 <packing>
168<property name="expand">False</property>169 <property name="expand">True</property>
169<property name="position">1</property>170 <property name="fill">True</property>
170</packing>171 <property name="position">1</property>
171</child>172 </packing>
172</object>173 </child>
173<packing>174 <child>
174<property name="position">4</property>175 <object class="GtkVBox" id="vbox5">
175</packing>176 <property name="visible">True</property>
176</child>177 <property name="can_focus">False</property>
177<child>178 <property name="spacing">6</property>
178<object class="GtkVBox" id="vbox8">179 <child>
179<property name="visible">True</property>180 <object class="GtkVScale" id="vscale2">
180<property name="spacing">6</property>181 <property name="visible">True</property>
181<child>182 <property name="can_focus">True</property>
182<object class="GtkVScale" id="vscale5">183 <property name="adjustment">adjustment8</property>
183<property name="visible">True</property>184 <property name="inverted">True</property>
184<property name="can_focus">True</property>185 </object>
185<property name="adjustment">adjustment5</property>186 <packing>
186<property name="inverted">True</property>187 <property name="expand">True</property>
187</object>188 <property name="fill">True</property>
188<packing>189 <property name="position">0</property>
189<property name="position">0</property>190 </packing>
190</packing>191 </child>
191</child>192 <child>
192<child>193 <object class="GtkLabel" id="label3">
193<object class="GtkLabel" id="label6">194 <property name="visible">True</property>
194<property name="visible">True</property>195 <property name="can_focus">False</property>
195<property name="label">&lt;b&gt;947 Hz&lt;/b&gt;</property>196 <property name="label">&lt;b&gt;119 Hz&lt;/b&gt;</property>
196<property name="use_markup">True</property>197 <property name="use_markup">True</property>
197</object>198 </object>
198<packing>199 <packing>
199<property name="expand">False</property>200 <property name="expand">False</property>
200<property name="position">1</property>201 <property name="fill">True</property>
201</packing>202 <property name="position">1</property>
202</child>203 </packing>
203</object>204 </child>
204<packing>205 </object>
205<property name="position">5</property>206 <packing>
206</packing>207 <property name="expand">True</property>
207</child>208 <property name="fill">True</property>
208<child>209 <property name="position">2</property>
209<object class="GtkVBox" id="vbox9">210 </packing>
210<property name="visible">True</property>211 </child>
211<property name="spacing">6</property>212 <child>
212<child>213 <object class="GtkVBox" id="vbox6">
213<object class="GtkVScale" id="vscale6">214 <property name="visible">True</property>
214<property name="visible">True</property>215 <property name="can_focus">False</property>
215<property name="can_focus">True</property>216 <property name="spacing">6</property>
216<property name="adjustment">adjustment4</property>217 <child>
217<property name="inverted">True</property>218 <object class="GtkVScale" id="vscale3">
218</object>219 <property name="visible">True</property>
219<packing>220 <property name="can_focus">True</property>
220<property name="position">0</property>221 <property name="adjustment">adjustment7</property>
221</packing>222 <property name="inverted">True</property>
222</child>223 </object>
223<child>224 <packing>
224<object class="GtkLabel" id="label7">225 <property name="expand">True</property>
225<property name="visible">True</property>226 <property name="fill">True</property>
226<property name="label">&lt;b&gt;1.9 kHz&lt;/b&gt;</property>227 <property name="position">0</property>
227<property name="use_markup">True</property>228 </packing>
228</object>229 </child>
229<packing>230 <child>
230<property name="expand">False</property>231 <object class="GtkLabel" id="label4">
231<property name="position">1</property>232 <property name="visible">True</property>
232</packing>233 <property name="can_focus">False</property>
233</child>234 <property name="label">&lt;b&gt;227 Hz&lt;/b&gt;</property>
234</object>235 <property name="use_markup">True</property>
235<packing>236 </object>
236<property name="position">6</property>237 <packing>
237</packing>238 <property name="expand">False</property>
238</child>239 <property name="fill">True</property>
239<child>240 <property name="position">1</property>
240<object class="GtkVBox" id="vbox10">241 </packing>
241<property name="visible">True</property>242 </child>
242<property name="spacing">6</property>243 </object>
243<child>244 <packing>
244<object class="GtkVScale" id="vscale7">245 <property name="expand">True</property>
245<property name="visible">True</property>246 <property name="fill">True</property>
246<property name="can_focus">True</property>247 <property name="position">3</property>
247<property name="adjustment">adjustment3</property>248 </packing>
248<property name="inverted">True</property>249 </child>
249</object>250 <child>
250<packing>251 <object class="GtkVBox" id="vbox7">
251<property name="position">0</property>252 <property name="visible">True</property>
252</packing>253 <property name="can_focus">False</property>
253</child>254 <property name="spacing">6</property>
254<child>255 <child>
255<object class="GtkLabel" id="label8">256 <object class="GtkVScale" id="vscale4">
256<property name="visible">True</property>257 <property name="visible">True</property>
257<property name="label">&lt;b&gt;3.8 kHz&lt;/b&gt;</property>258 <property name="can_focus">True</property>
258<property name="use_markup">True</property>259 <property name="adjustment">adjustment6</property>
259</object>260 <property name="inverted">True</property>
260<packing>261 </object>
261<property name="expand">False</property>262 <packing>
262<property name="position">1</property>263 <property name="expand">True</property>
263</packing>264 <property name="fill">True</property>
264</child>265 <property name="position">0</property>
265</object>266 </packing>
266<packing>267 </child>
267<property name="position">7</property>268 <child>
268</packing>269 <object class="GtkLabel" id="label5">
269</child>270 <property name="visible">True</property>
270<child>271 <property name="can_focus">False</property>
271<object class="GtkVBox" id="vbox11">272 <property name="label">&lt;b&gt;474 Hz&lt;/b&gt;</property>
272<property name="visible">True</property>273 <property name="use_markup">True</property>
273<property name="spacing">6</property>274 </object>
274<child>275 <packing>
275<object class="GtkVScale" id="vscale8">276 <property name="expand">False</property>
276<property name="visible">True</property>277 <property name="fill">True</property>
277<property name="can_focus">True</property>278 <property name="position">1</property>
278<property name="adjustment">adjustment2</property>279 </packing>
279<property name="inverted">True</property>280 </child>
280</object>281 </object>
281<packing>282 <packing>
282<property name="position">0</property>283 <property name="expand">True</property>
283</packing>284 <property name="fill">True</property>
284</child>285 <property name="position">4</property>
285<child>286 </packing>
286<object class="GtkLabel" id="label9">287 </child>
287<property name="visible">True</property>288 <child>
288<property name="label">&lt;b&gt;7.5 kHz&lt;/b&gt;</property>289 <object class="GtkVBox" id="vbox8">
289<property name="use_markup">True</property>290 <property name="visible">True</property>
290</object>291 <property name="can_focus">False</property>
291<packing>292 <property name="spacing">6</property>
292<property name="expand">False</property>293 <child>
293<property name="position">1</property>294 <object class="GtkVScale" id="vscale5">
294</packing>295 <property name="visible">True</property>
295</child>296 <property name="can_focus">True</property>
296</object>297 <property name="adjustment">adjustment5</property>
297<packing>298 <property name="inverted">True</property>
298<property name="position">8</property>299 </object>
299</packing>300 <packing>
300</child>301 <property name="expand">True</property>
301<child>302 <property name="fill">True</property>
302<object class="GtkVBox" id="vbox12">303 <property name="position">0</property>
303<property name="visible">True</property>304 </packing>
304<property name="spacing">6</property>305 </child>
305<child>306 <child>
306<object class="GtkVScale" id="vscale9">307 <object class="GtkLabel" id="label6">
307<property name="visible">True</property>308 <property name="visible">True</property>
308<property name="can_focus">True</property>309 <property name="can_focus">False</property>
309<property name="adjustment">adjustment1</property>310 <property name="label">&lt;b&gt;947 Hz&lt;/b&gt;</property>
310<property name="inverted">True</property>311 <property name="use_markup">True</property>
311</object>312 </object>
312<packing>313 <packing>
313<property name="position">0</property>314 <property name="expand">False</property>
314</packing>315 <property name="fill">True</property>
315</child>316 <property name="position">1</property>
316<child>317 </packing>
317<object class="GtkLabel" id="label10">318 </child>
318<property name="visible">True</property>319 </object>
319<property name="label">&lt;b&gt;15 kHz&lt;/b&gt;</property>320 <packing>
320<property name="use_markup">True</property>321 <property name="expand">True</property>
321</object>322 <property name="fill">True</property>
322<packing>323 <property name="position">5</property>
323<property name="expand">False</property>324 </packing>
324<property name="position">1</property>325 </child>
325</packing>326 <child>
326</child>327 <object class="GtkVBox" id="vbox9">
327</object>328 <property name="visible">True</property>
328<packing>329 <property name="can_focus">False</property>
329<property name="position">9</property>330 <property name="spacing">6</property>
330</packing>331 <child>
331</child>332 <object class="GtkVScale" id="vscale6">
332</object>333 <property name="visible">True</property>
333<packing>334 <property name="can_focus">True</property>
334<property name="position">0</property>335 <property name="adjustment">adjustment4</property>
335</packing>336 <property name="inverted">True</property>
336</child>337 </object>
337<child>338 <packing>
338<object class="GtkVBox" id="vbox14">339 <property name="expand">True</property>
339<property name="visible">True</property>340 <property name="fill">True</property>
340<child>341 <property name="position">0</property>
341<object class="GtkLabel" id="label14">342 </packing>
342<property name="visible">True</property>343 </child>
343<property name="label"> </property>344 <child>
344</object>345 <object class="GtkLabel" id="label7">
345<packing>346 <property name="visible">True</property>
346<property name="expand">False</property>347 <property name="can_focus">False</property>
347<property name="position">0</property>348 <property name="label">&lt;b&gt;1.9 kHz&lt;/b&gt;</property>
348</packing>349 <property name="use_markup">True</property>
349</child>350 </object>
350<child>351 <packing>
351<object class="GtkHBox" id="hbox6">352 <property name="expand">False</property>
352<property name="visible">True</property>353 <property name="fill">True</property>
353<child>354 <property name="position">1</property>
354<object class="GtkLabel" id="label13">355 </packing>
355<property name="visible">True</property>356 </child>
356<property name="label">&lt;b&gt;+12 dB&lt;/b&gt;</property>357 </object>
357<property name="use_markup">True</property>358 <packing>
358</object>359 <property name="expand">True</property>
359<packing>360 <property name="fill">True</property>
360<property name="expand">False</property>361 <property name="position">6</property>
361<property name="pack_type">end</property>362 </packing>
362<property name="position">0</property>363 </child>
363</packing>364 <child>
364</child>365 <object class="GtkVBox" id="vbox10">
365</object>366 <property name="visible">True</property>
366<packing>367 <property name="can_focus">False</property>
367<property name="expand">False</property>368 <property name="spacing">6</property>
368<property name="position">1</property>369 <child>
369</packing>370 <object class="GtkVScale" id="vscale7">
370</child>371 <property name="visible">True</property>
371<child>372 <property name="can_focus">True</property>
372<object class="GtkVBox" id="vbox15">373 <property name="adjustment">adjustment3</property>
373<property name="visible">True</property>374 <property name="inverted">True</property>
374<child>375 </object>
375<object class="GtkLabel" id="label17">376 <packing>
376<property name="visible">True</property>377 <property name="expand">True</property>
377<property name="label"> </property>378 <property name="fill">True</property>
378</object>379 <property name="position">0</property>
379<packing>380 </packing>
380<property name="position">0</property>381 </child>
381</packing>382 <child>
382</child>383 <object class="GtkLabel" id="label8">
383<child>384 <property name="visible">True</property>
384<object class="GtkHBox" id="hbox5">385 <property name="can_focus">False</property>
385<property name="visible">True</property>386 <property name="label">&lt;b&gt;3.8 kHz&lt;/b&gt;</property>
386<child>387 <property name="use_markup">True</property>
387<object class="GtkLabel" id="label18">388 </object>
388<property name="visible">True</property>389 <packing>
389<property name="label">&lt;b&gt;0 dB&lt;/b&gt;</property>390 <property name="expand">False</property>
390<property name="use_markup">True</property>391 <property name="fill">True</property>
391</object>392 <property name="position">1</property>
392<packing>393 </packing>
393<property name="expand">False</property>394 </child>
394<property name="pack_type">end</property>395 </object>
395<property name="position">0</property>396 <packing>
396</packing>397 <property name="expand">True</property>
397</child>398 <property name="fill">True</property>
398</object>399 <property name="position">7</property>
399<packing>400 </packing>
400<property name="expand">False</property>401 </child>
401<property name="position">1</property>402 <child>
402</packing>403 <object class="GtkVBox" id="vbox11">
403</child>404 <property name="visible">True</property>
404<child>405 <property name="can_focus">False</property>
405<object class="GtkLabel" id="label16">406 <property name="spacing">6</property>
406<property name="visible">True</property>407 <child>
407<property name="label"> </property>408 <object class="GtkVScale" id="vscale8">
408</object>409 <property name="visible">True</property>
409<packing>410 <property name="can_focus">True</property>
410<property name="position">2</property>411 <property name="adjustment">adjustment2</property>
411</packing>412 <property name="inverted">True</property>
412</child>413 </object>
413<child>414 <packing>
414<object class="GtkLabel" id="label15">415 <property name="expand">True</property>
415<property name="visible">True</property>416 <property name="fill">True</property>
416<property name="label"> </property>417 <property name="position">0</property>
417</object>418 </packing>
418<packing>419 </child>
419<property name="position">3</property>420 <child>
420</packing>421 <object class="GtkLabel" id="label9">
421</child>422 <property name="visible">True</property>
422</object>423 <property name="can_focus">False</property>
423<packing>424 <property name="label">&lt;b&gt;7.5 kHz&lt;/b&gt;</property>
424<property name="position">2</property>425 <property name="use_markup">True</property>
425</packing>426 </object>
426</child>427 <packing>
427<child>428 <property name="expand">False</property>
428<object class="GtkHBox" id="hbox4">429 <property name="fill">True</property>
429<property name="visible">True</property>430 <property name="position">1</property>
430<child>431 </packing>
431<object class="GtkLabel" id="label12">432 </child>
432<property name="visible">True</property>433 </object>
433<property name="label">&lt;b&gt;-24 dB&lt;/b&gt;</property>434 <packing>
434<property name="use_markup">True</property>435 <property name="expand">True</property>
435</object>436 <property name="fill">True</property>
436<packing>437 <property name="position">8</property>
437<property name="expand">False</property>438 </packing>
438<property name="fill">False</property>439 </child>
439<property name="pack_type">end</property>440 <child>
440<property name="position">0</property>441 <object class="GtkVBox" id="vbox12">
441</packing>442 <property name="visible">True</property>
442</child>443 <property name="can_focus">False</property>
443</object>444 <property name="spacing">6</property>
444<packing>445 <child>
445<property name="expand">False</property>446 <object class="GtkVScale" id="vscale9">
446<property name="position">3</property>447 <property name="visible">True</property>
447</packing>448 <property name="can_focus">True</property>
448</child>449 <property name="adjustment">adjustment1</property>
449<child>450 <property name="inverted">True</property>
450<object class="GtkLabel" id="label11">451 </object>
451<property name="visible">True</property>452 <packing>
452<property name="label"> </property>453 <property name="expand">True</property>
453</object>454 <property name="fill">True</property>
454<packing>455 <property name="position">0</property>
455<property name="expand">False</property>456 </packing>
456<property name="padding">3</property>457 </child>
457<property name="position">4</property>458 <child>
458</packing>459 <object class="GtkLabel" id="label10">
459</child>460 <property name="visible">True</property>
460</object>461 <property name="can_focus">False</property>
461<packing>462 <property name="label">&lt;b&gt;15 kHz&lt;/b&gt;</property>
462<property name="expand">False</property>463 <property name="use_markup">True</property>
463<property name="position">1</property>464 </object>
464</packing>465 <packing>
465</child>466 <property name="expand">False</property>
466</object>467 <property name="fill">True</property>
467<packing>468 <property name="position">1</property>
468<property name="position">0</property>469 </packing>
469</packing>470 </child>
470</child>471 </object>
471</object>472 <packing>
472<packing>473 <property name="expand">True</property>
473<property name="position">0</property>474 <property name="fill">True</property>
474</packing>475 <property name="position">9</property>
475</child>476 </packing>
476<child>477 </child>
477<object class="GtkHSeparator" id="hseparator1"/>478 </object>
478<packing>479 <packing>
479<property name="expand">False</property>480 <property name="expand">True</property>
480<property name="position">1</property>481 <property name="fill">True</property>
481</packing>482 <property name="position">0</property>
482</child>483 </packing>
483<child>484 </child>
484<object class="GtkHBox" id="hbox1">485 <child>
485<property name="spacing">6</property>486 <object class="GtkVBox" id="vbox14">
486<child>487 <property name="visible">True</property>
487<object class="GtkHButtonBox" id="hbuttonbox1">488 <property name="can_focus">False</property>
488<property name="visible">True</property>489 <child>
489<property name="spacing">12</property>490 <object class="GtkLabel" id="label14">
490<property name="layout_style">start</property>491 <property name="visible">True</property>
491<child>492 <property name="can_focus">False</property>
492<object class="GtkButton" id="btn-save">493 <property name="label"> </property>
493<property name="label">gtk-save</property>494 </object>
494<property name="visible">True</property>495 <packing>
495<property name="can_focus">True</property>496 <property name="expand">False</property>
496<property name="receives_default">True</property>497 <property name="fill">True</property>
497<property name="use_stock">True</property>498 <property name="position">0</property>
498</object>499 </packing>
499<packing>500 </child>
500<property name="expand">False</property>501 <child>
501<property name="fill">False</property>502 <object class="GtkHBox" id="hbox6">
502<property name="position">0</property>503 <property name="visible">True</property>
503</packing>504 <property name="can_focus">False</property>
504</child>505 <child>
505<child>506 <object class="GtkLabel" id="label13">
506<object class="GtkButton" id="btn-open">507 <property name="visible">True</property>
507<property name="label">gtk-open</property>508 <property name="can_focus">False</property>
508<property name="visible">True</property>509 <property name="label">&lt;b&gt;+12 dB&lt;/b&gt;</property>
509<property name="can_focus">True</property>510 <property name="use_markup">True</property>
510<property name="receives_default">True</property>511 </object>
511<property name="use_stock">True</property>512 <packing>
512</object>513 <property name="expand">False</property>
513<packing>514 <property name="fill">True</property>
514<property name="expand">False</property>515 <property name="pack_type">end</property>
515<property name="fill">False</property>516 <property name="position">0</property>
516<property name="position">1</property>517 </packing>
517</packing>518 </child>
518</child>519 </object>
519</object>520 <packing>
520<packing>521 <property name="expand">False</property>
521<property name="position">0</property>522 <property name="fill">True</property>
522</packing>523 <property name="position">1</property>
523</child>524 </packing>
524<child>525 </child>
525<object class="GtkHBox" id="hbox7">526 <child>
526<property name="visible">True</property>527 <object class="GtkVBox" id="vbox15">
527<property name="spacing">6</property>528 <property name="visible">True</property>
528<child>529 <property name="can_focus">False</property>
529<object class="GtkLabel" id="label19">530 <child>
530<property name="visible">True</property>531 <object class="GtkLabel" id="label17">
531<property name="label" translatable="yes">Preset:</property>532 <property name="visible">True</property>
532</object>533 <property name="can_focus">False</property>
533<packing>534 <property name="label"> </property>
534<property name="expand">False</property>535 </object>
535<property name="position">0</property>536 <packing>
536</packing>537 <property name="expand">True</property>
537</child>538 <property name="fill">True</property>
538<child>539 <property name="position">0</property>
539<object class="GtkComboBox" id="combo-presets">540 </packing>
540<property name="visible">True</property>541 </child>
541</object>542 <child>
542<packing>543 <object class="GtkHBox" id="hbox5">
543<property name="position">1</property>544 <property name="visible">True</property>
544</packing>545 <property name="can_focus">False</property>
545</child>546 <child>
546</object>547 <object class="GtkLabel" id="label18">
547<packing>548 <property name="visible">True</property>
548<property name="position">1</property>549 <property name="can_focus">False</property>
549</packing>550 <property name="label">&lt;b&gt;0 dB&lt;/b&gt;</property>
550</child>551 <property name="use_markup">True</property>
551<child>552 </object>
552<object class="GtkHButtonBox" id="hbuttonbox2">553 <packing>
553<property name="visible">True</property>554 <property name="expand">False</property>
554<property name="layout_style">end</property>555 <property name="fill">True</property>
555<child>556 <property name="pack_type">end</property>
556<object class="GtkButton" id="btn-close">557 <property name="position">0</property>
557<property name="label">gtk-close</property>558 </packing>
558<property name="visible">True</property>559 </child>
559<property name="can_focus">True</property>560 </object>
560<property name="receives_default">True</property>561 <packing>
561<property name="use_stock">True</property>562 <property name="expand">False</property>
562</object>563 <property name="fill">True</property>
563<packing>564 <property name="position">1</property>
564<property name="expand">False</property>565 </packing>
565<property name="fill">False</property>566 </child>
566<property name="position">0</property>567 <child>
567</packing>568 <object class="GtkLabel" id="label16">
568</child>569 <property name="visible">True</property>
569</object>570 <property name="can_focus">False</property>
570<packing>571 <property name="label"> </property>
571<property name="position">2</property>572 </object>
572</packing>573 <packing>
573</child>574 <property name="expand">True</property>
574</object>575 <property name="fill">True</property>
575<packing>576 <property name="position">2</property>
576<property name="expand">False</property>577 </packing>
577<property name="position">2</property>578 </child>
578</packing>579 <child>
579</child>580 <object class="GtkLabel" id="label15">
580</object>581 <property name="visible">True</property>
581</child>582 <property name="can_focus">False</property>
582</object>583 <property name="label"> </property>
583<object class="GtkAdjustment" id="adjustment1">584 </object>
584<property name="lower">-24</property>585 <packing>
585<property name="upper">22</property>586 <property name="expand">True</property>
586<property name="step_increment">1</property>587 <property name="fill">True</property>
587<property name="page_increment">10</property>588 <property name="position">3</property>
588<property name="page_size">10</property>589 </packing>
589</object>590 </child>
590<object class="GtkAdjustment" id="adjustment2">591 </object>
591<property name="lower">-24</property>592 <packing>
592<property name="upper">22</property>593 <property name="expand">True</property>
593<property name="step_increment">1</property>594 <property name="fill">True</property>
594<property name="page_increment">10</property>595 <property name="position">2</property>
595<property name="page_size">10</property>596 </packing>
596</object>597 </child>
597<object class="GtkAdjustment" id="adjustment3">598 <child>
598<property name="lower">-24</property>599 <object class="GtkHBox" id="hbox4">
599<property name="upper">22</property>600 <property name="visible">True</property>
600<property name="step_increment">1</property>601 <property name="can_focus">False</property>
601<property name="page_increment">10</property>602 <child>
602<property name="page_size">10</property>603 <object class="GtkLabel" id="label12">
603</object>604 <property name="visible">True</property>
604<object class="GtkAdjustment" id="adjustment4">605 <property name="can_focus">False</property>
605<property name="lower">-24</property>606 <property name="label">&lt;b&gt;-24 dB&lt;/b&gt;</property>
606<property name="upper">22</property>607 <property name="use_markup">True</property>
607<property name="step_increment">1</property>608 </object>
608<property name="page_increment">10</property>609 <packing>
609<property name="page_size">10</property>610 <property name="expand">False</property>
610</object>611 <property name="fill">False</property>
611<object class="GtkAdjustment" id="adjustment5">612 <property name="pack_type">end</property>
612<property name="lower">-24</property>613 <property name="position">0</property>
613<property name="upper">22</property>614 </packing>
614<property name="step_increment">1</property>615 </child>
615<property name="page_increment">10</property>616 </object>
616<property name="page_size">10</property>617 <packing>
617</object>618 <property name="expand">False</property>
618<object class="GtkAdjustment" id="adjustment6">619 <property name="fill">True</property>
619<property name="lower">-24</property>620 <property name="position">3</property>
620<property name="upper">22</property>621 </packing>
621<property name="step_increment">1</property>622 </child>
622<property name="page_increment">10</property>623 <child>
623<property name="page_size">10</property>624 <object class="GtkLabel" id="label11">
624</object>625 <property name="visible">True</property>
625<object class="GtkAdjustment" id="adjustment7">626 <property name="can_focus">False</property>
626<property name="lower">-24</property>627 <property name="label"> </property>
627<property name="upper">22</property>628 </object>
628<property name="step_increment">1</property>629 <packing>
629<property name="page_increment">10</property>630 <property name="expand">False</property>
630<property name="page_size">10</property>631 <property name="fill">True</property>
631</object>632 <property name="padding">3</property>
632<object class="GtkAdjustment" id="adjustment8">633 <property name="position">4</property>
633<property name="lower">-24</property>634 </packing>
634<property name="upper">22</property>635 </child>
635<property name="step_increment">1</property>636 </object>
636<property name="page_increment">10</property>637 <packing>
637<property name="page_size">10</property>638 <property name="expand">False</property>
638</object>639 <property name="fill">True</property>
639<object class="GtkAdjustment" id="adjustment9">640 <property name="position">1</property>
640<property name="lower">-24</property>641 </packing>
641<property name="upper">22</property>642 </child>
642<property name="step_increment">1</property>643 </object>
643<property name="page_increment">10</property>644 <packing>
644<property name="page_size">10</property>645 <property name="expand">True</property>
645</object>646 <property name="fill">True</property>
646<object class="GtkAdjustment" id="adjustment10">647 <property name="position">0</property>
647<property name="lower">-24</property>648 </packing>
648<property name="upper">22</property>649 </child>
649<property name="step_increment">1</property>650 </object>
650<property name="page_increment">10</property>651 <packing>
651<property name="page_size">10</property>652 <property name="expand">True</property>
652</object>653 <property name="fill">True</property>
654 <property name="position">0</property>
655 </packing>
656 </child>
657 <child>
658 <object class="GtkHSeparator" id="hseparator1">
659 <property name="can_focus">False</property>
660 </object>
661 <packing>
662 <property name="expand">False</property>
663 <property name="fill">True</property>
664 <property name="position">1</property>
665 </packing>
666 </child>
667 <child>
668 <object class="GtkHBox" id="hbox1">
669 <property name="can_focus">False</property>
670 <property name="spacing">6</property>
671 <child>
672 <object class="GtkHButtonBox" id="hbuttonbox1">
673 <property name="visible">True</property>
674 <property name="can_focus">False</property>
675 <property name="spacing">12</property>
676 <property name="layout_style">start</property>
677 <child>
678 <object class="GtkButton" id="btn-save">
679 <property name="label">gtk-save</property>
680 <property name="visible">True</property>
681 <property name="can_focus">True</property>
682 <property name="receives_default">True</property>
683 <property name="use_stock">True</property>
684 </object>
685 <packing>
686 <property name="expand">False</property>
687 <property name="fill">False</property>
688 <property name="position">0</property>
689 </packing>
690 </child>
691 <child>
692 <object class="GtkButton" id="btn-open">
693 <property name="label">gtk-open</property>
694 <property name="visible">True</property>
695 <property name="can_focus">True</property>
696 <property name="receives_default">True</property>
697 <property name="use_stock">True</property>
698 </object>
699 <packing>
700 <property name="expand">False</property>
701 <property name="fill">False</property>
702 <property name="position">1</property>
703 </packing>
704 </child>
705 </object>
706 <packing>
707 <property name="expand">True</property>
708 <property name="fill">True</property>
709 <property name="position">0</property>
710 </packing>
711 </child>
712 <child>
713 <object class="GtkHBox" id="hbox7">
714 <property name="visible">True</property>
715 <property name="can_focus">False</property>
716 <property name="spacing">6</property>
717 <child>
718 <object class="GtkLabel" id="label19">
719 <property name="visible">True</property>
720 <property name="can_focus">False</property>
721 <property name="label" translatable="yes">Preset:</property>
722 </object>
723 <packing>
724 <property name="expand">False</property>
725 <property name="fill">True</property>
726 <property name="position">0</property>
727 </packing>
728 </child>
729 <child>
730 <object class="GtkComboBox" id="combo-presets">
731 <property name="visible">True</property>
732 <property name="can_focus">False</property>
733 </object>
734 <packing>
735 <property name="expand">True</property>
736 <property name="fill">True</property>
737 <property name="position">1</property>
738 </packing>
739 </child>
740 </object>
741 <packing>
742 <property name="expand">True</property>
743 <property name="fill">True</property>
744 <property name="position">1</property>
745 </packing>
746 </child>
747 <child>
748 <object class="GtkHButtonBox" id="hbuttonbox2">
749 <property name="visible">True</property>
750 <property name="can_focus">False</property>
751 <property name="layout_style">end</property>
752 <child>
753 <object class="GtkButton" id="btn-close">
754 <property name="label">gtk-close</property>
755 <property name="visible">True</property>
756 <property name="can_focus">True</property>
757 <property name="receives_default">True</property>
758 <property name="use_stock">True</property>
759 </object>
760 <packing>
761 <property name="expand">False</property>
762 <property name="fill">False</property>
763 <property name="position">0</property>
764 </packing>
765 </child>
766 </object>
767 <packing>
768 <property name="expand">True</property>
769 <property name="fill">True</property>
770 <property name="position">2</property>
771 </packing>
772 </child>
773 </object>
774 <packing>
775 <property name="expand">False</property>
776 <property name="fill">True</property>
777 <property name="position">2</property>
778 </packing>
779 </child>
780 </object>
781 </child>
782 </object>
653</interface>783</interface>
654784
=== modified file 'res/FileExplorer.ui'
--- res/FileExplorer.ui 2011-08-18 09:01:47 +0000
+++ res/FileExplorer.ui 2015-09-23 00:52:02 +0000
@@ -1,255 +1,297 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkWindow" id="win-main">
5<property name="window_position">center</property>6 <property name="can_focus">False</property>
6<child>7 <property name="window_position">center</property>
7<object class="GtkVBox" id="vbox1">8 <child>
8<property name="border_width">12</property>9 <object class="GtkVBox" id="vbox1">
9<property name="spacing">18</property>10 <property name="can_focus">False</property>
10<child>11 <property name="border_width">12</property>
11<object class="GtkVBox" id="vbox2">12 <property name="spacing">18</property>
12<property name="spacing">18</property>13 <child>
13<child>14 <object class="GtkVBox" id="vbox2">
14<object class="GtkFrame" id="frame1">15 <property name="can_focus">False</property>
15<property name="label_xalign">0</property>16 <property name="spacing">18</property>
16<property name="shadow_type">none</property>17 <child>
17<child>18 <object class="GtkFrame" id="frame1">
18<object class="GtkAlignment" id="alignment1">19 <property name="can_focus">False</property>
19<property name="top_padding">6</property>20 <property name="label_xalign">0</property>
20<property name="left_padding">12</property>21 <property name="shadow_type">none</property>
21<child>22 <child>
22<object class="GtkVBox" id="vbox3">23 <object class="GtkAlignment" id="alignment1">
23<property name="spacing">12</property>24 <property name="can_focus">False</property>
24<child>25 <property name="top_padding">6</property>
25<object class="GtkScrolledWindow" id="scrolledwindow1">26 <property name="left_padding">12</property>
26<property name="can_focus">True</property>27 <child>
27<property name="hscrollbar_policy">automatic</property>28 <object class="GtkVBox" id="vbox3">
28<property name="vscrollbar_policy">automatic</property>29 <property name="can_focus">False</property>
29<property name="shadow_type">in</property>30 <property name="spacing">12</property>
30<child>31 <child>
31<placeholder/>32 <object class="GtkScrolledWindow" id="scrolledwindow1">
32</child>33 <property name="can_focus">True</property>
33</object>34 <property name="shadow_type">in</property>
34<packing>35 <child>
35<property name="position">0</property>36 <placeholder/>
36</packing>37 </child>
37</child>38 </object>
38<child>39 <packing>
39<object class="GtkHButtonBox" id="hbuttonbox3">40 <property name="expand">True</property>
40<property name="layout_style">spread</property>41 <property name="fill">True</property>
41<child>42 <property name="position">0</property>
42<object class="GtkButton" id="btn-add">43 </packing>
43<property name="label">gtk-add</property>44 </child>
44<property name="can_focus">True</property>45 <child>
45<property name="receives_default">True</property>46 <object class="GtkHButtonBox" id="hbuttonbox3">
46<property name="tooltip_text" translatable="yes">Add a new root folder to the file explorer</property>47 <property name="can_focus">False</property>
47<property name="use_stock">True</property>48 <property name="layout_style">spread</property>
48</object>49 <child>
49<packing>50 <object class="GtkButton" id="btn-add">
50<property name="expand">False</property>51 <property name="label">gtk-add</property>
51<property name="fill">False</property>52 <property name="can_focus">True</property>
52<property name="position">0</property>53 <property name="receives_default">True</property>
53</packing>54 <property name="tooltip_text" translatable="yes">Add a new root folder to the file explorer</property>
54</child>55 <property name="use_stock">True</property>
55<child>56 </object>
56<object class="GtkButton" id="btn-rename">57 <packing>
57<property name="can_focus">True</property>58 <property name="expand">False</property>
58<property name="receives_default">True</property>59 <property name="fill">False</property>
59<property name="tooltip_text" translatable="yes">Rename the selected root folder</property>60 <property name="position">0</property>
60<child>61 </packing>
61<object class="GtkHBox" id="hbox4">62 </child>
62<child>63 <child>
63<object class="GtkImage" id="image3">64 <object class="GtkButton" id="btn-rename">
64<property name="stock">gtk-edit</property>65 <property name="can_focus">True</property>
65</object>66 <property name="receives_default">True</property>
66<packing>67 <property name="tooltip_text" translatable="yes">Rename the selected root folder</property>
67<property name="position">0</property>68 <child>
68</packing>69 <object class="GtkHBox" id="hbox4">
69</child>70 <property name="can_focus">False</property>
70<child>71 <child>
71<object class="GtkLabel" id="label4">72 <object class="GtkImage" id="image3">
72<property name="label" translatable="yes">Rename</property>73 <property name="can_focus">False</property>
73</object>74 <property name="stock">gtk-edit</property>
74<packing>75 </object>
75<property name="position">1</property>76 <packing>
76</packing>77 <property name="expand">True</property>
77</child>78 <property name="fill">True</property>
78</object>79 <property name="position">0</property>
79</child>80 </packing>
80</object>81 </child>
81<packing>82 <child>
82<property name="expand">False</property>83 <object class="GtkLabel" id="label4">
83<property name="fill">False</property>84 <property name="can_focus">False</property>
84<property name="position">1</property>85 <property name="label" translatable="yes">Rename</property>
85</packing>86 </object>
86</child>87 <packing>
87<child>88 <property name="expand">True</property>
88<object class="GtkButton" id="btn-remove">89 <property name="fill">True</property>
89<property name="label">gtk-remove</property>90 <property name="position">1</property>
90<property name="can_focus">True</property>91 </packing>
91<property name="receives_default">True</property>92 </child>
92<property name="tooltip_text" translatable="yes">Remove the selected root folders</property>93 </object>
93<property name="use_stock">True</property>94 </child>
94</object>95 </object>
95<packing>96 <packing>
96<property name="expand">False</property>97 <property name="expand">False</property>
97<property name="fill">False</property>98 <property name="fill">False</property>
98<property name="position">2</property>99 <property name="position">1</property>
99</packing>100 </packing>
100</child>101 </child>
101</object>102 <child>
102<packing>103 <object class="GtkButton" id="btn-remove">
103<property name="expand">False</property>104 <property name="label">gtk-remove</property>
104<property name="position">1</property>105 <property name="can_focus">True</property>
105</packing>106 <property name="receives_default">True</property>
106</child>107 <property name="tooltip_text" translatable="yes">Remove the selected root folders</property>
107</object>108 <property name="use_stock">True</property>
108</child>109 </object>
109</object>110 <packing>
110</child>111 <property name="expand">False</property>
111<child type="label">112 <property name="fill">False</property>
112<object class="GtkLabel" id="label1">113 <property name="position">2</property>
113<property name="label" translatable="yes">&lt;b&gt;Root Folders&lt;/b&gt;</property>114 </packing>
114<property name="use_markup">True</property>115 </child>
115</object>116 </object>
116</child>117 <packing>
117</object>118 <property name="expand">False</property>
118<packing>119 <property name="fill">True</property>
119<property name="position">0</property>120 <property name="position">1</property>
120</packing>121 </packing>
121</child>122 </child>
122<child>123 </object>
123<object class="GtkFrame" id="frame2">124 </child>
124<property name="label_xalign">0</property>125 </object>
125<property name="shadow_type">none</property>126 </child>
126<child>127 <child type="label">
127<object class="GtkAlignment" id="alignment2">128 <object class="GtkLabel" id="label1">
128<property name="top_padding">6</property>129 <property name="can_focus">False</property>
129<property name="left_padding">12</property>130 <property name="label" translatable="yes">&lt;b&gt;Root Folders&lt;/b&gt;</property>
130<child>131 <property name="use_markup">True</property>
131<object class="GtkVBox" id="vbox4">132 </object>
132<property name="visible">True</property>133 </child>
133<child>134 </object>
134<object class="GtkCheckButton" id="chk-hidden">135 <packing>
135<property name="label" translatable="yes">Show hidden files</property>136 <property name="expand">True</property>
136<property name="can_focus">True</property>137 <property name="fill">True</property>
137<property name="receives_default">False</property>138 <property name="position">0</property>
138<property name="has_tooltip">True</property>139 </packing>
139<property name="tooltip_text" translatable="yes">Whether hidden files should be shown in the file explorer</property>140 </child>
140<property name="draw_indicator">True</property>141 <child>
141</object>142 <object class="GtkFrame" id="frame2">
142<packing>143 <property name="can_focus">False</property>
143<property name="position">0</property>144 <property name="label_xalign">0</property>
144</packing>145 <property name="shadow_type">none</property>
145</child>146 <child>
146<child>147 <object class="GtkAlignment" id="alignment2">
147<object class="GtkCheckButton" id="chk-add-by-filename">148 <property name="can_focus">False</property>
148<property name="label" translatable="yes">Add files to playlist by filename</property>149 <property name="top_padding">6</property>
149<property name="can_focus">True</property>150 <property name="left_padding">12</property>
150<property name="receives_default">False</property>151 <child>
151<property name="has_tooltip">True</property>152 <object class="GtkVBox" id="vbox4">
152<property name="tooltip_text" translatable="yes">Whether files should be added to the playlist by their name rather than by their tags</property>153 <property name="visible">True</property>
153<property name="draw_indicator">True</property>154 <property name="can_focus">False</property>
154</object>155 <child>
155<packing>156 <object class="GtkCheckButton" id="chk-hidden">
156<property name="position">1</property>157 <property name="label" translatable="yes">Show hidden files</property>
157</packing>158 <property name="can_focus">True</property>
158</child>159 <property name="receives_default">False</property>
159</object>160 <property name="has_tooltip">True</property>
160</child>161 <property name="tooltip_text" translatable="yes">Whether hidden files should be shown in the file explorer</property>
161</object>162 <property name="xalign">0.5</property>
162</child>163 <property name="draw_indicator">True</property>
163<child type="label">164 </object>
164<object class="GtkLabel" id="label2">165 <packing>
165<property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>166 <property name="expand">True</property>
166<property name="use_markup">True</property>167 <property name="fill">True</property>
167</object>168 <property name="position">0</property>
168</child>169 </packing>
169</object>170 </child>
170<packing>171 <child>
171<property name="expand">False</property>172 <object class="GtkCheckButton" id="chk-add-by-filename">
172<property name="position">1</property>173 <property name="label" translatable="yes">Add files to playlist by filename</property>
173</packing>174 <property name="can_focus">True</property>
174</child>175 <property name="receives_default">False</property>
175</object>176 <property name="has_tooltip">True</property>
176<packing>177 <property name="tooltip_text" translatable="yes">Whether files should be added to the playlist by their name rather than by their tags</property>
177<property name="position">0</property>178 <property name="xalign">0.5</property>
178</packing>179 <property name="draw_indicator">True</property>
179</child>180 </object>
180<child>181 <packing>
181<object class="GtkHSeparator" id="hseparator1"/>182 <property name="expand">True</property>
182<packing>183 <property name="fill">True</property>
183<property name="expand">False</property>184 <property name="position">1</property>
184<property name="position">1</property>185 </packing>
185</packing>186 </child>
186</child>187 </object>
187<child>188 </child>
188<object class="GtkHBox" id="hbox1">189 </object>
189<property name="spacing">6</property>190 </child>
190<child>191 <child type="label">
191<object class="GtkHButtonBox" id="hbuttonbox1">192 <object class="GtkLabel" id="label2">
192<child>193 <property name="can_focus">False</property>
193<object class="GtkButton" id="btn-help">194 <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
194<property name="label">gtk-help</property>195 <property name="use_markup">True</property>
195<property name="can_focus">True</property>196 </object>
196<property name="receives_default">True</property>197 </child>
197<property name="use_stock">True</property>198 </object>
198</object>199 <packing>
199<packing>200 <property name="expand">False</property>
200<property name="expand">False</property>201 <property name="fill">True</property>
201<property name="fill">False</property>202 <property name="position">1</property>
202<property name="position">0</property>203 </packing>
203</packing>204 </child>
204</child>205 </object>
205</object>206 <packing>
206<packing>207 <property name="expand">True</property>
207<property name="expand">False</property>208 <property name="fill">True</property>
208<property name="position">0</property>209 <property name="position">0</property>
209</packing>210 </packing>
210</child>211 </child>
211<child>212 <child>
212<object class="GtkHButtonBox" id="hbuttonbox2">213 <object class="GtkHSeparator" id="hseparator1">
213<property name="spacing">12</property>214 <property name="can_focus">False</property>
214<property name="layout_style">end</property>215 </object>
215<child>216 <packing>
216<object class="GtkButton" id="btn-cancel">217 <property name="expand">False</property>
217<property name="label">gtk-cancel</property>218 <property name="fill">True</property>
218<property name="can_focus">True</property>219 <property name="position">1</property>
219<property name="receives_default">True</property>220 </packing>
220<property name="use_stock">True</property>221 </child>
221</object>222 <child>
222<packing>223 <object class="GtkHBox" id="hbox1">
223<property name="expand">False</property>224 <property name="can_focus">False</property>
224<property name="fill">False</property>225 <property name="spacing">6</property>
225<property name="position">0</property>226 <child>
226</packing>227 <object class="GtkHButtonBox" id="hbuttonbox1">
227</child>228 <property name="can_focus">False</property>
228<child>229 <child>
229<object class="GtkButton" id="btn-ok">230 <object class="GtkButton" id="btn-help">
230<property name="label">gtk-ok</property>231 <property name="label">gtk-help</property>
231<property name="can_focus">True</property>232 <property name="can_focus">True</property>
232<property name="receives_default">True</property>233 <property name="receives_default">True</property>
233<property name="use_stock">True</property>234 <property name="use_stock">True</property>
234</object>235 </object>
235<packing>236 <packing>
236<property name="expand">False</property>237 <property name="expand">False</property>
237<property name="fill">False</property>238 <property name="fill">False</property>
238<property name="position">1</property>239 <property name="position">0</property>
239</packing>240 </packing>
240</child>241 </child>
241</object>242 </object>
242<packing>243 <packing>
243<property name="position">1</property>244 <property name="expand">False</property>
244</packing>245 <property name="fill">True</property>
245</child>246 <property name="position">0</property>
246</object>247 </packing>
247<packing>248 </child>
248<property name="expand">False</property>249 <child>
249<property name="position">2</property>250 <object class="GtkHButtonBox" id="hbuttonbox2">
250</packing>251 <property name="can_focus">False</property>
251</child>252 <property name="spacing">12</property>
252</object>253 <property name="layout_style">end</property>
253</child>254 <child>
254</object>255 <object class="GtkButton" id="btn-cancel">
256 <property name="label">gtk-cancel</property>
257 <property name="can_focus">True</property>
258 <property name="receives_default">True</property>
259 <property name="use_stock">True</property>
260 </object>
261 <packing>
262 <property name="expand">False</property>
263 <property name="fill">False</property>
264 <property name="position">0</property>
265 </packing>
266 </child>
267 <child>
268 <object class="GtkButton" id="btn-ok">
269 <property name="label">gtk-ok</property>
270 <property name="can_focus">True</property>
271 <property name="receives_default">True</property>
272 <property name="use_stock">True</property>
273 </object>
274 <packing>
275 <property name="expand">False</property>
276 <property name="fill">False</property>
277 <property name="position">1</property>
278 </packing>
279 </child>
280 </object>
281 <packing>
282 <property name="expand">True</property>
283 <property name="fill">True</property>
284 <property name="position">1</property>
285 </packing>
286 </child>
287 </object>
288 <packing>
289 <property name="expand">False</property>
290 <property name="fill">True</property>
291 <property name="position">2</property>
292 </packing>
293 </child>
294 </object>
295 </child>
296 </object>
255</interface>297</interface>
256298
=== modified file 'res/HelpDlg.ui'
--- res/HelpDlg.ui 2011-08-18 09:01:47 +0000
+++ res/HelpDlg.ui 2015-09-23 00:52:02 +0000
@@ -1,61 +1,66 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkDialog" id="dlg-main">5 <object class="GtkDialog" id="dlg-main">
5<property name="width_request">425</property>6 <property name="width_request">425</property>
6<property name="height_request">350</property>7 <property name="height_request">350</property>
7<property name="border_width">5</property>8 <property name="can_focus">False</property>
8<property name="window_position">center-on-parent</property>9 <property name="border_width">5</property>
9<property name="type_hint">dialog</property>10 <property name="window_position">center-on-parent</property>
10<child internal-child="vbox">11 <property name="type_hint">dialog</property>
11<object class="GtkVBox" id="dialog-vbox1">12 <child internal-child="vbox">
12<property name="spacing">2</property>13 <object class="GtkBox" id="dialog-vbox1">
13<child>14 <property name="can_focus">False</property>
14<object class="GtkScrolledWindow" id="scrolledwindow1">15 <property name="spacing">2</property>
15<property name="can_focus">True</property>16 <child internal-child="action_area">
16<property name="hscrollbar_policy">automatic</property>17 <object class="GtkButtonBox" id="dlg-action_area">
17<property name="vscrollbar_policy">automatic</property>18 <property name="can_focus">False</property>
18<property name="shadow_type">in</property>19 <property name="layout_style">end</property>
19<child>20 <child>
20<object class="GtkTextView" id="txt-help">21 <object class="GtkButton" id="btn-ok">
21<property name="can_focus">True</property>22 <property name="label">gtk-ok</property>
22<property name="editable">False</property>23 <property name="can_focus">True</property>
23<property name="wrap_mode">word</property>24 <property name="receives_default">True</property>
24<property name="cursor_visible">False</property>25 <property name="use_stock">True</property>
25</object>26 </object>
26</child>27 <packing>
27</object>28 <property name="expand">False</property>
28<packing>29 <property name="fill">False</property>
29<property name="position">1</property>30 <property name="position">0</property>
30</packing>31 </packing>
31</child>32 </child>
32<child internal-child="action_area">33 </object>
33<object class="GtkHButtonBox" id="dlg-action_area">34 <packing>
34<property name="layout_style">end</property>35 <property name="expand">False</property>
35<child>36 <property name="fill">False</property>
36<object class="GtkButton" id="btn-ok">37 <property name="pack_type">end</property>
37<property name="label">gtk-ok</property>38 <property name="position">0</property>
38<property name="can_focus">True</property>39 </packing>
39<property name="receives_default">True</property>40 </child>
40<property name="use_stock">True</property>41 <child>
41</object>42 <object class="GtkScrolledWindow" id="scrolledwindow1">
42<packing>43 <property name="can_focus">True</property>
43<property name="expand">False</property>44 <property name="shadow_type">in</property>
44<property name="fill">False</property>45 <child>
45<property name="position">0</property>46 <object class="GtkTextView" id="txt-help">
46</packing>47 <property name="can_focus">True</property>
47</child>48 <property name="editable">False</property>
48</object>49 <property name="wrap_mode">word</property>
49<packing>50 <property name="cursor_visible">False</property>
50<property name="expand">False</property>51 </object>
51<property name="pack_type">end</property>52 </child>
52<property name="position">0</property>53 </object>
53</packing>54 <packing>
54</child>55 <property name="expand">False</property>
55</object>56 <property name="fill">True</property>
56</child>57 <property name="position">1</property>
57<action-widgets>58 </packing>
58<action-widget response="-5">btn-ok</action-widget>59 </child>
59</action-widgets>60 </object>
60</object>61 </child>
62 <action-widgets>
63 <action-widget response="-5">btn-ok</action-widget>
64 </action-widgets>
65 </object>
61</interface>66</interface>
6267
=== modified file 'res/IMStatus.ui'
--- res/IMStatus.ui 2011-08-18 09:01:47 +0000
+++ res/IMStatus.ui 2015-09-23 00:52:02 +0000
@@ -1,283 +1,336 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface>3<interface>
3<requires lib="gtk+" version="2.16"/>4 <requires lib="gtk+" version="3.0"/>
4<object class="GtkWindow" id="win-main">5 <object class="GtkWindow" id="win-main">
5<property name="window_position">center</property>6 <property name="can_focus">False</property>
6<child>7 <property name="window_position">center</property>
7<object class="GtkVBox" id="vbox1">8 <child>
8<property name="border_width">12</property>9 <object class="GtkVBox" id="vbox1">
9<property name="spacing">18</property>10 <property name="can_focus">False</property>
10<child>11 <property name="border_width">12</property>
11<object class="GtkHBox" id="hbox2">12 <property name="spacing">18</property>
12<property name="spacing">12</property>13 <child>
13<child>14 <object class="GtkHBox" id="hbox2">
14<object class="GtkVBox" id="vbox2">15 <property name="can_focus">False</property>
15<property name="width_request">235</property>16 <property name="spacing">12</property>
16<property name="spacing">18</property>17 <child>
17<child>18 <object class="GtkVBox" id="vbox2">
18<object class="GtkFrame" id="frame1">19 <property name="width_request">235</property>
19<property name="label_xalign">0</property>20 <property name="can_focus">False</property>
20<property name="shadow_type">none</property>21 <property name="spacing">18</property>
21<child>22 <child>
22<object class="GtkAlignment" id="alignment1">23 <object class="GtkFrame" id="frame1">
23<property name="top_padding">6</property>24 <property name="can_focus">False</property>
24<property name="left_padding">12</property>25 <property name="label_xalign">0</property>
25<child>26 <property name="shadow_type">none</property>
26<object class="GtkVBox" id="vbox4">27 <child>
27<property name="spacing">6</property>28 <object class="GtkAlignment" id="alignment1">
28<child>29 <property name="can_focus">False</property>
29<object class="GtkHBox" id="hbox4">30 <property name="top_padding">6</property>
30<property name="spacing">6</property>31 <property name="left_padding">12</property>
31<child>32 <child>
32<object class="GtkLabel" id="label3">33 <object class="GtkVBox" id="vbox4">
33<property name="label" translatable="yes">Message:</property>34 <property name="can_focus">False</property>
34</object>35 <property name="spacing">6</property>
35<packing>36 <child>
36<property name="expand">False</property>37 <object class="GtkHBox" id="hbox4">
37<property name="position">0</property>38 <property name="can_focus">False</property>
38</packing>39 <property name="spacing">6</property>
39</child>40 <child>
40<child>41 <object class="GtkLabel" id="label3">
41<object class="GtkEntry" id="txt-status">42 <property name="can_focus">False</property>
42<property name="can_focus">True</property>43 <property name="label" translatable="yes">Message:</property>
43</object>44 </object>
44<packing>45 <packing>
45<property name="position">1</property>46 <property name="expand">False</property>
46</packing>47 <property name="fill">True</property>
47</child>48 <property name="position">0</property>
48</object>49 </packing>
49<packing>50 </child>
50<property name="position">0</property>51 <child>
51</packing>52 <object class="GtkEntry" id="txt-status">
52</child>53 <property name="can_focus">True</property>
53<child>54 </object>
54<object class="GtkCheckButton" id="chk-updateOnPaused">55 <packing>
55<property name="label" translatable="yes">Update when paused</property>56 <property name="expand">True</property>
56<property name="can_focus">True</property>57 <property name="fill">True</property>
57<property name="receives_default">False</property>58 <property name="position">1</property>
58<property name="tooltip_text" translatable="yes">Update your status on pause/unpause events</property>59 </packing>
59<property name="draw_indicator">True</property>
60</object>
61<packing>
62<property name="position">1</property>
63</packing>
64</child>
65<child>
66<object class="GtkCheckButton" id="chk-updateWhenAway">
67<property name="label" translatable="yes">Update even if not available</property>
68<property name="can_focus">True</property>
69<property name="receives_default">False</property>
70<property name="tooltip_text" translatable="yes">Update your status even if you are marked as unavailable</property>
71<property name="draw_indicator">True</property>
72</object>
73<packing>
74<property name="position">2</property>
75</packing>
76</child>
77</object>
78</child>
79</object>
80</child>
81<child type="label">
82<object class="GtkLabel" id="label1">
83<property name="label" translatable="yes">&lt;b&gt;Status&lt;/b&gt;</property>
84<property name="use_markup">True</property>
85</object>
86</child>
87</object>
88<packing>
89<property name="expand">False</property>
90<property name="fill">False</property>
91<property name="position">0</property>
92</packing>
93</child>
94<child>
95<object class="GtkFrame" id="frame2">
96<property name="label_xalign">0</property>
97<property name="shadow_type">none</property>
98<child>
99<object class="GtkAlignment" id="alignment2">
100<property name="top_padding">6</property>
101<property name="left_padding">12</property>
102<child>
103<object class="GtkVBox" id="vbox3">
104<property name="spacing">6</property>
105<child>
106<object class="GtkRadioButton" id="rad-stopDoNothing">
107<property name="label" translatable="yes">Do nothing</property>
108<property name="can_focus">True</property>
109<property name="receives_default">False</property>
110<property name="active">True</property>
111<property name="draw_indicator">True</property>
112</object>
113<packing>
114<property name="position">0</property>
115</packing>
116</child>
117<child>
118<object class="GtkHBox" id="hbox3">
119<property name="spacing">6</property>
120<child>
121<object class="GtkRadioButton" id="rad-stopSetStatus">
122<property name="label" translatable="yes">Set status to:</property>
123<property name="can_focus">True</property>
124<property name="receives_default">False</property>
125<property name="active">True</property>
126<property name="draw_indicator">True</property>
127<property name="group">rad-stopDoNothing</property>
128</object>
129<packing>
130<property name="expand">False</property>
131<property name="position">0</property>
132</packing>
133</child>
134<child>
135<object class="GtkEntry" id="txt-stopStatus">
136<property name="can_focus">True</property>
137</object>
138<packing>
139<property name="position">1</property>
140</packing>
141</child>
142</object>
143<packing>
144<property name="position">1</property>
145</packing>
146</child>
147</object>
148</child>
149</object>
150</child>
151<child type="label">
152<object class="GtkLabel" id="label2">
153<property name="label" translatable="yes">&lt;b&gt;When Stopping or Quitting&lt;/b&gt;</property>
154<property name="use_markup">True</property>
155</object>
156</child>
157</object>
158<packing>
159<property name="expand">False</property>
160<property name="position">1</property>
161</packing>
162</child>
163</object>
164<packing>
165<property name="expand">False</property>
166<property name="position">0</property>
167</packing>
168</child>
169<child>
170<object class="GtkFrame" id="frame3">
171<property name="label_xalign">0</property>
172<property name="shadow_type">none</property>
173<child>
174<object class="GtkAlignment" id="alignment3">
175<property name="top_padding">6</property>
176<property name="left_padding">12</property>
177<child>
178<object class="GtkScrolledWindow" id="scrolledwindow1">
179<property name="can_focus">True</property>
180<property name="hscrollbar_policy">automatic</property>
181<property name="vscrollbar_policy">automatic</property>
182<property name="shadow_type">in</property>
183<child>
184<object class="GtkTextView" id="txt-sanitizedWords">
185<property name="can_focus">True</property>
186</object>
187</child>
188</object>
189</child>
190</object>
191</child>
192<child type="label">
193<object class="GtkLabel" id="label4">
194<property name="label" translatable="yes">&lt;b&gt;Sanitized Words&lt;/b&gt;</property>
195<property name="use_markup">True</property>
196</object>
197</child>
198</object>
199<packing>
200<property name="position">1</property>
201</packing>
202</child>
203</object>
204<packing>
205<property name="position">0</property>
206</packing>
207</child>
208<child>
209<object class="GtkHSeparator" id="hseparator1"/>
210<packing>
211<property name="expand">False</property>
212<property name="position">1</property>
213</packing>
214</child>
215<child>
216<object class="GtkHBox" id="hbox1">
217<property name="spacing">6</property>
218<child>
219<object class="GtkHButtonBox" id="hbuttonbox1">
220<child>
221<object class="GtkButton" id="btn-help">
222<property name="label">gtk-help</property>
223<property name="can_focus">True</property>
224<property name="receives_default">True</property>
225<property name="use_stock">True</property>
226</object>
227<packing>
228<property name="expand">False</property>
229<property name="fill">False</property>
230<property name="position">0</property>
231</packing>
232</child>
233</object>
234<packing>
235<property name="expand">False</property>
236<property name="position">0</property>
237</packing>
238</child>
239<child>
240<object class="GtkHButtonBox" id="hbuttonbox2">
241<property name="spacing">12</property>
242<property name="layout_style">end</property>
243<child>
244<object class="GtkButton" id="btn-cancel">
245<property name="label">gtk-cancel</property>
246<property name="can_focus">True</property>
247<property name="receives_default">True</property>
248<property name="use_stock">True</property>
249</object>
250<packing>
251<property name="expand">False</property>
252<property name="fill">False</property>
253<property name="position">0</property>
254</packing>
255</child>
256<child>
257<object class="GtkButton" id="btn-ok">
258<property name="label">gtk-ok</property>
259<property name="can_focus">True</property>
260<property name="receives_default">True</property>
261<property name="use_stock">True</property>
262</object>
263<packing>
264<property name="expand">False</property>
265<property name="fill">False</property>
266<property name="position">1</property>
267</packing>
268</child>
269</object>
270<packing>
271<property name="position">1</property>
272</packing>
273</child>
274</object>
275<packing>
276<property name="expand">False</property>
277<property name="position">2</property>
278</packing>
279</child>
280</object>
281</child>
282</object>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: