Diffusion Spacebar 05e10cf0b2bd

Merge branch 'app-template'
05e10cf0b2bd
Actions

Authored by jbbgameich on May 25 2019, 10:04 AM.

Description

Merge branch 'app-template'

Details

Committed

jbbgameich

May 25 2019, 10:04 AM

Parents

R164:f588d1b6d223: Add appstream metadata
R164:866bd83014de: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

jbbgameich committed R164:05e10cf0b2bd: Merge branch 'app-template' (authored by jbbgameich).May 25 2019, 10:04 AM

Merged Changes

Commit	Author	Details	Committed
f588d1b6d223	jbbgameich	Add appstream metadata	May 22 2019
a4578d9f9b29	jbbgameich	Fix categories in desktop file	May 5 2019
a6137a712f94	jbbgameich	Port Q_FOREACH	May 3 2019
45605e4bb323	jbbgameich	NewConversationPage: Fix background color of search field	May 3 2019
66e379e8af84	jbbgameich	Re-add some command line arguments handling	Apr 17 2019
f9a5c7c0e242	schmeisser	Fix the send button	Apr 9 2019
2391b358d0de	jbbgameich	Fix sending messages	Apr 8 2019
ce6709b7d9b1	jbbgameich	Port ConversationPage to QQC2	Apr 8 2019
0246350a2dae	jbbgameich	Fix toInputField id	Apr 7 2019
bb0bfdedb86f	jbbgameich	Re-add cmake instructions for installing the service file	Apr 7 2019
f843dd90913f	jbbgameich	Modernize: Use nullptr and override	Apr 7 2019
0df8a575fdb4	jbbgameich	Replace deprecated Kirigami usage	Apr 7 2019
fb89cacf9ab7	jbbgameich	NewConversationPage: Remove anchors confusing the layout	Apr 7 2019
82deb738a5b5	jbbgameich	Fix desktop file	Apr 7 2019
e5b55a47aabe	jbbgameich	Fix pageStack	Apr 7 2019
b16667563dd0	jbbgameich	Rebase on app template	Apr 7 2019

Changes (98)

		Path
P		CMakeLists.txt Copied to src/ktp-plugins/CMakeLists.txt
D		Messages.sh
D		app
V		{app/256-apps-spacebar.png → org.kde.spacebar.png}
D		app/CMakeLists.txt
D		app/package
D		app/package/contents
D		app/package/contents/ui
V		{app/package → src}/contents/ui/ActionDelegate.qml
V		{app/package → src}/contents/ui/ContactList.qml
V		{app/package → src}/contents/ui/ConversationPage.qml
V		{app/package → src}/contents/ui/EmojiTextArea.qml
V		{app/package → src}/contents/ui/MainPage.qml
V		{app/package → src}/contents/ui/NewConversationPage.qml
V		{app/package → src}/contents/ui/TextDelegate.qml
V		{app/package → src}/contents/ui/main.qml
D		app/package/metadata.desktop
D		app/src
D		app/src/CMakeLists.txt
V		{app → }/src/SpaceBar.client
V		{app → }/src/main.cpp
D		app/src/org.freedesktop.Telepathy.Client.SpaceBar.service.in
D		ktp-logger-plugin
V		{ → src/ktp-plugins}/ktp-logger-plugin/CMakeLists.txt
V		{ → src/ktp-plugins}/ktp-logger-plugin/ktploggerplugin_mobile.desktop.cmake
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-dates.cpp
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-dates.h
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-entities.cpp
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-entities.h
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-logs.cpp
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger-pending-logs.h
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger.cpp
V		{ → src/ktp-plugins}/ktp-logger-plugin/mobile-logger.h
D		mobile-logger
V		{ → src/ktp-plugins}/mobile-logger/CMakeLists.txt
V		{ → src/ktp-plugins}/mobile-logger/KTp.Mobile.Logger.client
V		{ → src/ktp-plugins}/mobile-logger/channel-watcher.cpp
V		{ → src/ktp-plugins}/mobile-logger/channel-watcher.h
V		{ → src/ktp-plugins}/mobile-logger/main.cpp
V		{ → src/ktp-plugins}/mobile-logger/org.freedesktop.Telepathy.Client.KTp.Mobile.Logger.service.in
V		{ → src/ktp-plugins}/mobile-logger/text-channel-observer.cpp
V		{ → src/ktp-plugins}/mobile-logger/text-channel-observer.h
V	(dir)	{org.kde.ktp-mobile.presence/ → src/ktp-plugins/org.kde.ktp-mobile.presence}
V	(dir)	{org.kde.ktp-mobile.presence/contents/ → src/ktp-plugins/org.kde.ktp-mobile.presence/contents}
V	(dir)	{org.kde.ktp-mobile.presence/contents/ui/ → src/ktp-plugins/org.kde.ktp-mobile.presence/contents/ui}
V		{ → src/ktp-plugins}/org.kde.ktp-mobile.presence/contents/ui/Presence.qml
V		{ → src/ktp-plugins}/org.kde.ktp-mobile.presence/contents/ui/PresenceList.qml
V		{ → src/ktp-plugins}/org.kde.ktp-mobile.presence/contents/ui/main.qml
V		{ → src/ktp-plugins}/org.kde.ktp-mobile.presence/metadata.desktop.cmake
A		org.kde.spacebar.appdata.xml
A		org.kde.spacebar.desktop
A		org.kde.spacebar.json
V		{org.kde.spacebar.png ← app/256-apps-spacebar.png}
A	(dir)	src/
A		src/CMakeLists.txt
V		{ ← app}/src/SpaceBar.client
A	(dir)	src/contents/
A	(dir)	src/contents/ui/
V		{src ← app/package}/contents/ui/ActionDelegate.qml
V		{src ← app/package}/contents/ui/ContactList.qml
V		{src ← app/package}/contents/ui/ConversationPage.qml
V		{src ← app/package}/contents/ui/EmojiTextArea.qml
V		{src ← app/package}/contents/ui/MainPage.qml
V		{src ← app/package}/contents/ui/NewConversationPage.qml
V		{src ← app/package}/contents/ui/TextDelegate.qml
V		{src ← app/package}/contents/ui/main.qml
A	(dir)	src/ktp-plugins/
P		src/ktp-plugins/CMakeLists.txt Copied from CMakeLists.txt
A	(dir)	src/ktp-plugins/ktp-logger-plugin/
V		{src/ktp-plugins ← }/ktp-logger-plugin/CMakeLists.txt
V		{src/ktp-plugins ← }/ktp-logger-plugin/ktploggerplugin_mobile.desktop.cmake
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-dates.cpp
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-dates.h
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-entities.cpp
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-entities.h
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-logs.cpp
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger-pending-logs.h
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger.cpp
V		{src/ktp-plugins ← }/ktp-logger-plugin/mobile-logger.h
A	(dir)	src/ktp-plugins/mobile-logger/
V		{src/ktp-plugins ← }/mobile-logger/CMakeLists.txt
V		{src/ktp-plugins ← }/mobile-logger/KTp.Mobile.Logger.client
V		{src/ktp-plugins ← }/mobile-logger/channel-watcher.cpp
V		{src/ktp-plugins ← }/mobile-logger/channel-watcher.h
V		{src/ktp-plugins ← }/mobile-logger/main.cpp
V		{src/ktp-plugins ← }/mobile-logger/org.freedesktop.Telepathy.Client.KTp.Mobile.Logger.service.in
V		{src/ktp-plugins ← }/mobile-logger/text-channel-observer.cpp
V		{src/ktp-plugins ← }/mobile-logger/text-channel-observer.h
V	(dir)	{src/ktp-plugins/org.kde.ktp-mobile.presence/ ← org.kde.ktp-mobile.presence}
V	(dir)	{src/ktp-plugins/org.kde.ktp-mobile.presence/contents/ ← org.kde.ktp-mobile.presence/contents}
V	(dir)	{src/ktp-plugins/org.kde.ktp-mobile.presence/contents/ui/ ← org.kde.ktp-mobile.presence/contents/ui}
V		{src/ktp-plugins ← }/org.kde.ktp-mobile.presence/contents/ui/Presence.qml
V		{src/ktp-plugins ← }/org.kde.ktp-mobile.presence/contents/ui/PresenceList.qml
V		{src/ktp-plugins ← }/org.kde.ktp-mobile.presence/contents/ui/main.qml
V		{src/ktp-plugins ← }/org.kde.ktp-mobile.presence/metadata.desktop.cmake
V		{ ← app}/src/main.cpp
A		src/org.freedesktop.Telepathy.Client.SpaceBar.service.in
A		src/resources.qrc