← Back to branch summary

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

« back to all changes in this revision

Viewing changes to qml/func/bars/ToolBar.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/bars/ToolBar.qml
32
32
     Rectangle{id: splitbar; x:2; width:parent.width - 4 ; height:1; color:"#b9c5cc"}
33
33
 
34
34
     Row {
35
 
         spacing: 30
 
35
         spacing: 19
36
36
         height: 32
37
37
         anchors {
38
38
             right: parent.right
39
 
             rightMargin: 5
 
39
             rightMargin: 37
40
40
             top: splitbar.bottom
41
41
             topMargin: 10
42
42
         }
43
43
 
44
44
//         anchors.right: parent.right; anchors.rightMargin: 5; y: 3; height: 32; spacing: 30
 
45
 
45
46
         Common.Button {
46
47
             id: okBtn
47
48
             visible: toolbar.showok
48
 
             hoverimage: "../../img/icons/ok.png"
 
49
             hoverimage: "green2.png"//../../img/icons/
 
50
             text: "确定"
49
51
             width: 94; height: 29
50
52
             onClicked: toolbar.okBtnClicked()
51
53
         }
52
54
         Common.Button {
53
55
             id: quitBtn
54
 
             hoverimage: "../../img/icons/back.png"
 
56
             hoverimage: "gray1.png"//../../img/icons/
 
57
             text: "返回"
55
58
             width: 94; height: 29
56
59
             onClicked: toolbar.quitBtnClicked()
57
60
         }
 
61
 
 
62
         //         Common.Button {
 
63
//             id: okBtn
 
64
//             visible: toolbar.showok
 
65
////             hoverimage: "../../img/icons/ok.png"
 
66
//             text:"确认"
 
67
//             width: 94; height: 29
 
68
//             onClicked: toolbar.okBtnClicked()
 
69
//         }
 
70
//         Common.Button {
 
71
//             id: quitBtn
 
72
////             hoverimage: "../../img/icons/back.png"
 
73
//             text:"返回"
 
74
//             color1: "#d4d4d4"
 
75
//             color2: "#b5b5b5"
 
76
//             bordercolor:"#bebebe"
 
77
//             width: 94; height: 29
 
78
//             onClicked: toolbar.quitBtnClicked()
 
79
//         }
58
80
     }
59
81
}