Git commit ad39a0aa4852b09318a1a0e557dd7eaed12c4e95 by Aaron Seigo. Committed on 31/12/2015 at 18:03. Pushed by aseigo into branch 'feature/kubification'. kmail-quick -> kube-mail M +1 -1 CMakeLists.txt M +2 -2 applications/CMakeLists.txt D +0 -8 applications/kmail-quick/package/metadata.desktop R +2 -2 applications/kube-mail/CMakeLists.txt [from: applications/km= ail-quick/CMakeLists.txt - 090% similarity] R +1 -1 applications/kube-mail/main.cpp [from: applications/kmail-qu= ick/main.cpp - 075% similarity] R +0 -0 applications/kube-mail/package/contents/ui/Avatar.qml [from:= applications/kmail-quick/package/contents/ui/Avatar.qml - 100% similarity] R +0 -0 applications/kube-mail/package/contents/ui/ColorPalette.qml = [from: applications/kmail-quick/package/contents/ui/ColorPalette.qml - 100%= similarity] R +0 -0 applications/kube-mail/package/contents/ui/FolderListView.qm= l [from: applications/kmail-quick/package/contents/ui/FolderListView.qml - = 100% similarity] R +0 -0 applications/kube-mail/package/contents/ui/FolderModel.qml [= from: applications/kmail-quick/package/contents/ui/FolderModel.qml - 100% s= imilarity] R +0 -0 applications/kube-mail/package/contents/ui/ListItem.qml [fro= m: applications/kmail-quick/package/contents/ui/ListItem.qml - 100% similar= ity] R +0 -0 applications/kube-mail/package/contents/ui/MailListModel.qml= [from: applications/kmail-quick/package/contents/ui/MailListModel.qml - 10= 0% similarity] R +0 -0 applications/kube-mail/package/contents/ui/MailListView.qml = [from: applications/kmail-quick/package/contents/ui/MailListView.qml - 100%= similarity] R +0 -0 applications/kube-mail/package/contents/ui/SingleMailView.qm= l [from: applications/kmail-quick/package/contents/ui/SingleMailView.qml - = 100% similarity] R +0 -0 applications/kube-mail/package/contents/ui/example.qml [from= : applications/kmail-quick/package/contents/ui/example.qml - 100% similarit= y] R +0 -0 applications/kube-mail/package/contents/ui/main.qml [from: a= pplications/kmail-quick/package/contents/ui/main.qml - 100% similarity] A +8 -0 applications/kube-mail/package/metadata.desktop http://commits.kde.org/kontact-quick/ad39a0aa4852b09318a1a0e557dd7eaed12c4e= 95 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a00a9d..5ebcaf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(kontact-quick) +project(kube) = cmake_minimum_required(VERSION 2.8.10.1) = diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 1db5ed2..dd65a3e 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(kmail-quick) -add_subdirectory(kube-accounts) \ No newline at end of file +add_subdirectory(kube-mail) +add_subdirectory(kube-accounts) diff --git a/applications/kmail-quick/package/metadata.desktop b/applicatio= ns/kmail-quick/package/metadata.desktop deleted file mode 100644 index d02fa46..0000000 --- a/applications/kmail-quick/package/metadata.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=3DKMail Quick -X-KDE-PluginInfo-Name=3Dorg.kde.pim.kmail-quick -Exec=3Dkpackagelauncherqml -a org.kde.pim.kmail-quick -X-Plasma-MainScript=3Dui/main.qml -X-KDE-ServiceTypes=3DKPackage/GenericQML -Icon=3Dkmail2 -Type=3DService \ No newline at end of file diff --git a/applications/kmail-quick/CMakeLists.txt b/applications/kube-ma= il/CMakeLists.txt similarity index 90% rename from applications/kmail-quick/CMakeLists.txt rename to applications/kube-mail/CMakeLists.txt index 9758e59..05c98d1 100644 --- a/applications/kmail-quick/CMakeLists.txt +++ b/applications/kube-mail/CMakeLists.txt @@ -1,4 +1,4 @@ -project(kmail-quick) +project(kube-mail) = cmake_minimum_required(VERSION 2.8.10.1) = @@ -23,7 +23,7 @@ set (QT_MIN_VERSION "5.4.0") find_package(KF5 REQUIRED COMPONENTS Package) = # install UI package -kpackage_install_package(package org.kde.pim.kmail-quick pim) +kpackage_install_package(package org.kde.kube.mail pim) = # install executable add_executable(${PROJECT_NAME} main.cpp) diff --git a/applications/kmail-quick/main.cpp b/applications/kube-mail/mai= n.cpp similarity index 75% rename from applications/kmail-quick/main.cpp rename to applications/kube-mail/main.cpp index 557ca64..400cba8 100644 --- a/applications/kmail-quick/main.cpp +++ b/applications/kube-mail/main.cpp @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - auto mainFile =3D QStandardPaths::locate(QStandardPaths::GenericDataLo= cation, "kpackage/pim/org.kde.pim.kmail-quick/contents/ui/main.qml", QStand= ardPaths::LocateFile); + auto mainFile =3D QStandardPaths::locate(QStandardPaths::GenericDataLo= cation, "kpackage/pim/org.kde.kube.mail/contents/ui/main.qml", QStandardPat= hs::LocateFile); QQmlApplicationEngine engine(QUrl::fromLocalFile(mainFile)); return app.exec(); } diff --git a/applications/kmail-quick/package/contents/ui/Avatar.qml b/appl= ications/kube-mail/package/contents/ui/Avatar.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/Avatar.qml rename to applications/kube-mail/package/contents/ui/Avatar.qml diff --git a/applications/kmail-quick/package/contents/ui/ColorPalette.qml = b/applications/kube-mail/package/contents/ui/ColorPalette.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/ColorPalette.qml rename to applications/kube-mail/package/contents/ui/ColorPalette.qml diff --git a/applications/kmail-quick/package/contents/ui/FolderListView.qm= l b/applications/kube-mail/package/contents/ui/FolderListView.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/FolderListView.qml rename to applications/kube-mail/package/contents/ui/FolderListView.qml diff --git a/applications/kmail-quick/package/contents/ui/FolderModel.qml b= /applications/kube-mail/package/contents/ui/FolderModel.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/FolderModel.qml rename to applications/kube-mail/package/contents/ui/FolderModel.qml diff --git a/applications/kmail-quick/package/contents/ui/ListItem.qml b/ap= plications/kube-mail/package/contents/ui/ListItem.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/ListItem.qml rename to applications/kube-mail/package/contents/ui/ListItem.qml diff --git a/applications/kmail-quick/package/contents/ui/MailListModel.qml= b/applications/kube-mail/package/contents/ui/MailListModel.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/MailListModel.qml rename to applications/kube-mail/package/contents/ui/MailListModel.qml diff --git a/applications/kmail-quick/package/contents/ui/MailListView.qml = b/applications/kube-mail/package/contents/ui/MailListView.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/MailListView.qml rename to applications/kube-mail/package/contents/ui/MailListView.qml diff --git a/applications/kmail-quick/package/contents/ui/SingleMailView.qm= l b/applications/kube-mail/package/contents/ui/SingleMailView.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/SingleMailView.qml rename to applications/kube-mail/package/contents/ui/SingleMailView.qml diff --git a/applications/kmail-quick/package/contents/ui/example.qml b/app= lications/kube-mail/package/contents/ui/example.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/example.qml rename to applications/kube-mail/package/contents/ui/example.qml diff --git a/applications/kmail-quick/package/contents/ui/main.qml b/applic= ations/kube-mail/package/contents/ui/main.qml similarity index 100% rename from applications/kmail-quick/package/contents/ui/main.qml rename to applications/kube-mail/package/contents/ui/main.qml diff --git a/applications/kube-mail/package/metadata.desktop b/applications= /kube-mail/package/metadata.desktop new file mode 100644 index 0000000..630cc13 --- /dev/null +++ b/applications/kube-mail/package/metadata.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=3DKube Mail +X-KDE-PluginInfo-Name=3Dorg.kde.kube.mail +Exec=3Dkpackagelauncherqml -a org.kde.kube.mail +X-Plasma-MainScript=3Dui/main.qml +X-KDE-ServiceTypes=3DKPackage/GenericQML +Icon=3Dkmail2 +Type=3DService