← Back to branch summary

~nick-dedekind/unity8/indicator-titles

~nick-dedekind/unity8/indicator-titles

Viewing all changes in revision 333.

Committer: Nick Dedekind
Date: 2013-10-02 16:07:39 UTC
mfrom: (325.1.47 trunk)
Revision ID: nicholas.dedekind@gmail.com-20131002160739-7wiwi87bqq5nqe26

merged with trunk

files added:
po/gd.po

files removed:
Panel/Indicators/DatetimeIndicatorPage.qml

Panel/Indicators/DatetimeIndicatorWidget.qml

Panel/Indicators/DefaultIndicatorPage.qml

Panel/Indicators/DefaultIndicatorWidget.qml

Panel/Indicators/MessagingIndicatorPage.qml

Panel/Indicators/MessagingIndicatorWidget.qml

Panel/Indicators/NetworkIndicatorPage.qml

Panel/Indicators/NetworkIndicatorWidget.qml

Panel/Indicators/SoundIndicatorWidget.qml

plugins/Unity/IndicatorsLegacy

plugins/Unity/IndicatorsLegacy/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network

plugins/Unity/IndicatorsLegacy/Network/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network/networkagent.cpp

plugins/Unity/IndicatorsLegacy/Network/networkagent.h

plugins/Unity/IndicatorsLegacy/Network/plugin.cpp

plugins/Unity/IndicatorsLegacy/Network/plugin.h

plugins/Unity/IndicatorsLegacy/Network/qml

plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qml

plugins/Unity/IndicatorsLegacy/Network/qml/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordPage.qml

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordTextField.qml

plugins/Unity/IndicatorsLegacy/Network/qml/WifiSection.qml

plugins/Unity/IndicatorsLegacy/Network/qml/qmldir

plugins/Unity/IndicatorsLegacy/Network/secret-agent.c

plugins/Unity/IndicatorsLegacy/Network/secret-agent.h

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.cpp

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.h

plugins/Unity/IndicatorsLegacy/modelprinter.cpp

plugins/Unity/IndicatorsLegacy/modelprinter.h

plugins/Unity/IndicatorsLegacy/plugin.cpp

plugins/Unity/IndicatorsLegacy/plugin.h

plugins/Unity/IndicatorsLegacy/qml

plugins/Unity/IndicatorsLegacy/qml/BasicMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/ButtonMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/qml/DivMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/HLine.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorBase.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorPage.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorWidget.qml

plugins/Unity/IndicatorsLegacy/qml/MenuAction.qml

plugins/Unity/IndicatorsLegacy/qml/MenuActionBinding.qml

plugins/Unity/IndicatorsLegacy/qml/MenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/MenuItemFactory.qml

plugins/Unity/IndicatorsLegacy/qml/ProgressMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/RemoveBackground.qml

plugins/Unity/IndicatorsLegacy/qml/SectionMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/SliderMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/SwitchMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/qmldir

plugins/Unity/IndicatorsLegacy/resources

plugins/Unity/IndicatorsLegacy/resources/artwork

plugins/Unity/IndicatorsLegacy/resources/indicators.qrc

files renamed:
Panel/Indicators/DefaultIndicatorPage2.qml => Panel/Indicators/DefaultIndicatorPage.qml

Panel/Indicators/DefaultIndicatorWidget2.qml => Panel/Indicators/DefaultIndicatorWidget.qml

Panel/Indicators/NetworkIndicatorPage2.qml => Panel/Indicators/NetworkIndicatorPage.qml

files modified:
Components/EdgeDemoOverlay.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/DashApps.qml

Dash/DashContent.qml

Dash/GenericScopeView.qml

Greeter/Gradient.js

Panel/Indicators/client/IndicatorsList.qml

Panel/Indicators/client/IndicatorsTree.qml

Panel/IndicatorsDataModel.qml

Shell.qml

main.cpp

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp

plugins/Unity/CMakeLists.txt

plugins/Unity/Indicators/Messaging/qml/QuickReply.qml

plugins/Unity/Indicators/indicatorsmodel.cpp

po/ar.po

po/az.po

po/bg.po

po/ca.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/fi.po

po/fo.po

po/fr.po

po/gl.po

po/he.po

po/hr.po

po/hu.po

po/hy.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/kn.po

po/ko.po

po/ky.po

po/lv.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ro.po

po/ru.po

po/si.po

po/sl.po

po/sr.po

po/sv.po

po/te.po

po/tr.po

po/ug.po

po/uk.po

po/unity8.pot

po/xh.po

po/zh_CN.po

po/zh_TW.po

tests/autopilot/unity8/indicators_client/emulators/main_window.py

tests/mocks/Unity/fake_applications_scope.cpp

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp

tests/qmltests/tst_Shell.qml

Show diffs side-by-side

added added

removed removed

Components/EdgeDemoOverlay.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/DashApps.qml

Dash/DashContent.qml

Dash/GenericScopeView.qml

Greeter/Gradient.js

Panel/Indicators/DatetimeIndicatorPage.qml

Panel/Indicators/DatetimeIndicatorWidget.qml

Panel/Indicators/DefaultIndicatorPage.qml

Panel/Indicators/DefaultIndicatorWidget.qml

Panel/Indicators/MessagingIndicatorPage.qml

Panel/Indicators/MessagingIndicatorWidget.qml

Panel/Indicators/NetworkIndicatorPage.qml

Panel/Indicators/NetworkIndicatorWidget.qml

Panel/Indicators/SoundIndicatorWidget.qml

Panel/Indicators/client/IndicatorsList.qml

Panel/Indicators/client/IndicatorsTree.qml

Panel/IndicatorsDataModel.qml

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp

plugins/Unity/CMakeLists.txt

plugins/Unity/Indicators/Messaging/qml/QuickReply.qml

plugins/Unity/Indicators/indicatorsmodel.cpp

plugins/Unity/IndicatorsLegacy/

plugins/Unity/IndicatorsLegacy/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network/

plugins/Unity/IndicatorsLegacy/Network/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network/networkagent.cpp

plugins/Unity/IndicatorsLegacy/Network/networkagent.h

plugins/Unity/IndicatorsLegacy/Network/plugin.cpp

plugins/Unity/IndicatorsLegacy/Network/plugin.h

plugins/Unity/IndicatorsLegacy/Network/qml/

plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qml

plugins/Unity/IndicatorsLegacy/Network/qml/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordPage.qml

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordTextField.qml

plugins/Unity/IndicatorsLegacy/Network/qml/WifiSection.qml

plugins/Unity/IndicatorsLegacy/Network/qml/qmldir

plugins/Unity/IndicatorsLegacy/Network/secret-agent.c

plugins/Unity/IndicatorsLegacy/Network/secret-agent.h

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.cpp

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.h

plugins/Unity/IndicatorsLegacy/modelprinter.cpp

plugins/Unity/IndicatorsLegacy/modelprinter.h

plugins/Unity/IndicatorsLegacy/plugin.cpp

plugins/Unity/IndicatorsLegacy/plugin.h

plugins/Unity/IndicatorsLegacy/qml/

plugins/Unity/IndicatorsLegacy/qml/BasicMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/ButtonMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/CMakeLists.txt

plugins/Unity/IndicatorsLegacy/qml/DivMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/HLine.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorBase.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorPage.qml

plugins/Unity/IndicatorsLegacy/qml/IndicatorWidget.qml

plugins/Unity/IndicatorsLegacy/qml/MenuAction.qml

plugins/Unity/IndicatorsLegacy/qml/MenuActionBinding.qml

plugins/Unity/IndicatorsLegacy/qml/MenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/MenuItemFactory.qml

plugins/Unity/IndicatorsLegacy/qml/ProgressMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/RemoveBackground.qml

plugins/Unity/IndicatorsLegacy/qml/SectionMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/SliderMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/SwitchMenuItem.qml

plugins/Unity/IndicatorsLegacy/qml/qmldir

plugins/Unity/IndicatorsLegacy/resources/

plugins/Unity/IndicatorsLegacy/resources/artwork/

plugins/Unity/IndicatorsLegacy/resources/indicators.qrc

tests/autopilot/unity8/indicators_client/emulators/main_window.py

tests/mocks/Unity/fake_applications_scope.cpp

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp

tests/qmltests/tst_Shell.qml

Older »