Merge lp://staging/~mutse-young/chinese-calendar/trunk into lp://staging/chinese-calendar/1.0
Proposed by
mutse
| Status: | Rejected |
|---|---|
| Rejected by: | Shine Huang |
| Proposed branch: | lp://staging/~mutse-young/chinese-calendar/trunk |
| Merge into: | lp://staging/chinese-calendar/1.0 |
| Diff against target: |
5026 lines (+4847/-0) (has conflicts) 27 files modified
calendar.ui (+1359/-0) ccbo.cpp (+490/-0) ccbo.h (+108/-0) chinese-calendar.desktop (+10/-0) chinese-calendar.pro (+65/-0) chinese-calendar.qrc (+10/-0) chinesecalendar.cpp (+1265/-0) chinesecalendar.h (+111/-0) cnote.cpp (+89/-0) cnote.h (+39/-0) dateitem.cpp (+195/-0) dateitem.h (+76/-0) dateitem.ui (+71/-0) datemaskwidget.cpp (+41/-0) datemaskwidget.h (+48/-0) debian/changelog (+57/-0) debian/compat (+1/-0) debian/control (+17/-0) debian/copyright (+19/-0) debian/rules (+5/-0) debian/source/format (+1/-0) img/chinesecalendar.svg (+214/-0) main.cpp (+61/-0) skin/README.md (+27/-0) skin/black-skin.qss (+189/-0) skin/default-skin.qss (+138/-0) translate/i18_zh_CN.ts (+141/-0) Conflict adding file KylinLunar.db. Moved existing file to KylinLunar.db.moved. Conflict adding file calendar.ui. Moved existing file to calendar.ui.moved. Conflict adding file dateitem.cpp. Moved existing file to dateitem.cpp.moved. Conflict adding file dateitem.h. Moved existing file to dateitem.h.moved. Conflict adding file dateitem.ui. Moved existing file to dateitem.ui.moved. Conflict adding file datemaskwidget.cpp. Moved existing file to datemaskwidget.cpp.moved. Conflict adding file datemaskwidget.h. Moved existing file to datemaskwidget.h.moved. Conflict adding file img. Moved existing file to img.moved. Conflict adding file main.cpp. Moved existing file to main.cpp.moved. Conflict adding file translate. Moved existing file to translate.moved. |
| To merge this branch: | bzr merge lp://staging/~mutse-young/chinese-calendar/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Kylin Members | Pending | ||
|
Review via email:
|
|||
Description of the change
* add skins changing functional code
* add default and black skin qss files
To post a comment you must log in.
Revision history for this message
| Abel Liu (guiltyritter) wrote | # |
Revision history for this message
| Shine Huang (shine) wrote | # |
Unmerged revisions
- 33. By mutse
-
delete ok.png note.png no.png chinesecalendar
BGyellow. png of img - 32. By mutse
-
delete .tmp
- 31. By mutse
-
add skin change function
- 30. By mutse
-
add skin files
- 29. By mutse
-
add chinese calendar source code
- 28. By Abel Liu
-
update changelog
- 27. By Abel Liu
-
update changelog
- 26. By Abel Liu
-
fix bug #1161756
- 25. By Abel Liu
-
fix bug #1161425
- 24. By Abel Liu
-
fix bug #1161425
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
部分控件颜色有些问题，
日期控件hover的颜色有些问