← Back to branch summary

~ubuntu-branches/ubuntu/vivid/youker-assistant/vivid

« back to all changes in this revision

Viewing changes to qml/func/settings/SoundEffects.qml

  • Committer: Package Import Robot
  • Author(s): Jack Yu
  • Date: 2013-09-02 23:17:45 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130902231745-psyl14qxslg1g3dp
Tags: 0.1.6-0ubuntu1
* Modify SystemDispatcher and SessionDispatcher Classes.
* Add watch file into debian folder.
* Resolve status of onekey button(LP #1216236 ).
* Add monitorball code into systemdbus daemon.
* Optimize the status button.
* Add fcitx configuration function.
* Fix bugs due to bad references to apt lib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/func/settings/SoundEffects.qml
156
156
            }
157
157
            Common.Button {
158
158
                width: 95;height: 30
159
 
                hoverimage: "ok.png"
 
159
                hoverimage: "green2.png"
 
160
                text: "确定"
160
161
                onClicked: {
161
162
                    if (soundeffectspage.default_sound != iconcombo.selectedText) {
162
163
                        soundeffectspage.default_sound = iconcombo.selectedText;
178
179
                }
179
180
            }
180
181
            Common.Button {
181
 
                hoverimage: "use.png"
 
182
                hoverimage: "blue2.png"
 
183
                text: "使用默认设置"
182
184
                width: 124
183
185
                height: 30
184
186
                onClicked: {
191
193
                        sessiondispatcher.send_warningdialog_msg("友情提示：","当前主题已经为默认主题!");
192
194
                }
193
195
            }
 
196
//            Common.Button {
 
197
//                width: 95;height: 30
 
198
////                hoverimage: "ok.png"
 
199
//                text:"确定"
 
200
//                onClicked: {
 
201
//                    if (soundeffectspage.default_sound != iconcombo.selectedText) {
 
202
//                        soundeffectspage.default_sound = iconcombo.selectedText;
 
203
//                        sessiondispatcher.set_sound_theme_qt(iconcombo.selectedText);
 
204
//                        statusImage.visible = true;
 
205
//                    }
 
206
 
 
207
//                    soundeffectspage.init_sound_flag = true;
 
208
//                    musicmodel.clear();
 
209
//                    var musiclist=systemdispatcher.get_sounds_qt();
 
210
//                    for(var l=0; l < musiclist.length; l++) {
 
211
//                        musicmodel.append({"musicname": musiclist[l], "musicimage": "../../img/icons/broadcast.png"});
 
212
//                    }
 
213
//                    if(30*musiclist.length<=chooseyy_height)
 
214
//                    {
 
215
//                        scrollbar_z=-1
 
216
//                    }
 
217
//                    else scrollbar_z=1
 
218
//                }
 
219
//            }
 
220
//            Common.Button {
 
221
////                hoverimage: "use.png"
 
222
//                text:"使用默认设置"
 
223
//                color1: "#57bffc"
 
224
//                color2: "#2384c8"
 
225
//                bordercolor: "#31a0ee"
 
226
//                width: 124
 
227
//                height: 30
 
228
//                onClicked: {
 
229
//                    if (soundeffectspage.init_sound_flag == true) {
 
230
//                        soundeffectspage.init_sound_flag = false;
 
231
//                        systemdispatcher.restore_all_sound_file_qt(soundeffectspage.init_sound);
 
232
//                        statusImage.visible = true;
 
233
//                    }
 
234
//                    else
 
235
//                        sessiondispatcher.send_warningdialog_msg("友情提示：","当前主题已经为默认主题!");
 
236
//                }
 
237
//            }
194
238
 
195
239
            Timer {
196
240
                     interval: 5000; running: true; repeat: true
281
325
 
282
326
//                        z:soundz
283
327
                        Rectangle{
284
 
                            width: play.width;height: play.height
 
328
                            width: play.width;height: play.height; color: "transparent"
285
329
                            Image {id:play;source: "../../img/icons/play.png"}
286
330
                            MouseArea{
287
331
                                anchors.fill:parent
302
346
                            }
303
347
                        }
304
348
                        Rectangle{
305
 
                            width: next.width;height: next.height
 
349
                            width: next.width;height: next.height; color: "transparent"
306
350
                            Image {id:next;source: "../../img/icons/folder.png"}
307
351
                            MouseArea{
308
352
                                anchors.fill:parent
316
360
                            }
317
361
                        }
318
362
                        Rectangle{
319
 
                            width: revoke.width;height: revoke.height
 
363
                            width: revoke.width;height: revoke.height; color: "transparent"
320
364
                            Image {id:revoke;source: "../../img/icons/revoke.png"}
321
365
                            MouseArea{
322
366
                                anchors.fill:parent