diff --git a/.gitignore b/.gitignore index fab7372..9c58ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,73 +1,2 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - +bin/* +build/* diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..e02701d --- /dev/null +++ b/COPYING @@ -0,0 +1,8 @@ +MIT License +Copyright (c) 2018 Pierre HUBERT + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE diff --git a/README.md b/README.md new file mode 100644 index 0000000..76426ad --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +#ComunicMessages + +A desktop application for the Comunic Conversations system. + + diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..fab7372 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,73 @@ +# This file is used to ignore files which are generated +# ---------------------------------------------------------------------------- + +*~ +*.autosave +*.a +*.core +*.moc +*.o +*.obj +*.orig +*.rej +*.so +*.so.* +*_pch.h.cpp +*_resource.rc +*.qm +.#* +*.*# +core +!core/ +tags +.DS_Store +.directory +*.debug +Makefile* +*.prl +*.app +moc_*.cpp +ui_*.h +qrc_*.cpp +Thumbs.db +*.res +*.rc +/.qmake.cache +/.qmake.stash + +# qtcreator generated files +*.pro.user* + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.sdf +*.opensdf +*.vcxproj +*vcxproj.* + +# MinGW generated files +*.Debug +*.Release + +# Python byte code +*.pyc + +# Binaries +# -------- +*.dll +*.exe + diff --git a/ComunicMessages.pro b/src/ComunicMessages.pro similarity index 92% rename from ComunicMessages.pro rename to src/ComunicMessages.pro index 3df1fad..268dd3d 100644 --- a/ComunicMessages.pro +++ b/src/ComunicMessages.pro @@ -1,5 +1,13 @@ QT += widgets network +DESTDIR = ../bin +MOC_DIR = ../build/moc +RCC_DIR = ../build/rcc +UI_DIR = ../build/ui +unix:OBJECTS_DIR = ../build/o/unix +win32:OBJECTS_DIR = ../build/o/win32 +macx:OBJECTS_DIR = ../build/o/mac + SOURCES += \ main.cpp \ helpers/accounthelper.cpp \ diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/controllers/initcontroller.cpp b/src/controllers/initcontroller.cpp similarity index 100% rename from controllers/initcontroller.cpp rename to src/controllers/initcontroller.cpp diff --git a/controllers/initcontroller.h b/src/controllers/initcontroller.h similarity index 100% rename from controllers/initcontroller.h rename to src/controllers/initcontroller.h diff --git a/data/accountloginrequest.cpp b/src/data/accountloginrequest.cpp similarity index 100% rename from data/accountloginrequest.cpp rename to src/data/accountloginrequest.cpp diff --git a/data/accountloginrequest.h b/src/data/accountloginrequest.h similarity index 100% rename from data/accountloginrequest.h rename to src/data/accountloginrequest.h diff --git a/data/accountlogintokens.cpp b/src/data/accountlogintokens.cpp similarity index 100% rename from data/accountlogintokens.cpp rename to src/data/accountlogintokens.cpp diff --git a/data/accountlogintokens.h b/src/data/accountlogintokens.h similarity index 100% rename from data/accountlogintokens.h rename to src/data/accountlogintokens.h diff --git a/data/apirequest.cpp b/src/data/apirequest.cpp similarity index 100% rename from data/apirequest.cpp rename to src/data/apirequest.cpp diff --git a/data/apirequest.h b/src/data/apirequest.h similarity index 100% rename from data/apirequest.h rename to src/data/apirequest.h diff --git a/data/apirequestparameter.cpp b/src/data/apirequestparameter.cpp similarity index 100% rename from data/apirequestparameter.cpp rename to src/data/apirequestparameter.cpp diff --git a/data/apirequestparameter.h b/src/data/apirequestparameter.h similarity index 100% rename from data/apirequestparameter.h rename to src/data/apirequestparameter.h diff --git a/data/apirequestslist.cpp b/src/data/apirequestslist.cpp similarity index 100% rename from data/apirequestslist.cpp rename to src/data/apirequestslist.cpp diff --git a/data/apirequestslist.h b/src/data/apirequestslist.h similarity index 100% rename from data/apirequestslist.h rename to src/data/apirequestslist.h diff --git a/data/conversation.cpp b/src/data/conversation.cpp similarity index 100% rename from data/conversation.cpp rename to src/data/conversation.cpp diff --git a/data/conversation.h b/src/data/conversation.h similarity index 100% rename from data/conversation.h rename to src/data/conversation.h diff --git a/data/conversationmessage.cpp b/src/data/conversationmessage.cpp similarity index 100% rename from data/conversationmessage.cpp rename to src/data/conversationmessage.cpp diff --git a/data/conversationmessage.h b/src/data/conversationmessage.h similarity index 100% rename from data/conversationmessage.h rename to src/data/conversationmessage.h diff --git a/data/conversationmessageslist.cpp b/src/data/conversationmessageslist.cpp similarity index 100% rename from data/conversationmessageslist.cpp rename to src/data/conversationmessageslist.cpp diff --git a/data/conversationmessageslist.h b/src/data/conversationmessageslist.h similarity index 100% rename from data/conversationmessageslist.h rename to src/data/conversationmessageslist.h diff --git a/data/conversationslist.cpp b/src/data/conversationslist.cpp similarity index 100% rename from data/conversationslist.cpp rename to src/data/conversationslist.cpp diff --git a/data/conversationslist.h b/src/data/conversationslist.h similarity index 100% rename from data/conversationslist.h rename to src/data/conversationslist.h diff --git a/data/newconversationmessage.cpp b/src/data/newconversationmessage.cpp similarity index 100% rename from data/newconversationmessage.cpp rename to src/data/newconversationmessage.cpp diff --git a/data/newconversationmessage.h b/src/data/newconversationmessage.h similarity index 100% rename from data/newconversationmessage.h rename to src/data/newconversationmessage.h diff --git a/data/qlabelholder.h b/src/data/qlabelholder.h similarity index 100% rename from data/qlabelholder.h rename to src/data/qlabelholder.h diff --git a/data/user.cpp b/src/data/user.cpp similarity index 100% rename from data/user.cpp rename to src/data/user.cpp diff --git a/data/user.h b/src/data/user.h similarity index 100% rename from data/user.h rename to src/data/user.h diff --git a/data/userslist.cpp b/src/data/userslist.cpp similarity index 100% rename from data/userslist.cpp rename to src/data/userslist.cpp diff --git a/data/userslist.h b/src/data/userslist.h similarity index 100% rename from data/userslist.h rename to src/data/userslist.h diff --git a/helpers/accounthelper.cpp b/src/helpers/accounthelper.cpp similarity index 100% rename from helpers/accounthelper.cpp rename to src/helpers/accounthelper.cpp diff --git a/helpers/accounthelper.h b/src/helpers/accounthelper.h similarity index 100% rename from helpers/accounthelper.h rename to src/helpers/accounthelper.h diff --git a/helpers/apihelper.cpp b/src/helpers/apihelper.cpp similarity index 100% rename from helpers/apihelper.cpp rename to src/helpers/apihelper.cpp diff --git a/helpers/apihelper.h b/src/helpers/apihelper.h similarity index 100% rename from helpers/apihelper.h rename to src/helpers/apihelper.h diff --git a/helpers/configurationhelper.cpp b/src/helpers/configurationhelper.cpp similarity index 100% rename from helpers/configurationhelper.cpp rename to src/helpers/configurationhelper.cpp diff --git a/helpers/configurationhelper.h b/src/helpers/configurationhelper.h similarity index 100% rename from helpers/configurationhelper.h rename to src/helpers/configurationhelper.h diff --git a/helpers/conversationhelper.cpp b/src/helpers/conversationhelper.cpp similarity index 100% rename from helpers/conversationhelper.cpp rename to src/helpers/conversationhelper.cpp diff --git a/helpers/conversationhelper.h b/src/helpers/conversationhelper.h similarity index 100% rename from helpers/conversationhelper.h rename to src/helpers/conversationhelper.h diff --git a/helpers/conversationslisthelper.cpp b/src/helpers/conversationslisthelper.cpp similarity index 100% rename from helpers/conversationslisthelper.cpp rename to src/helpers/conversationslisthelper.cpp diff --git a/helpers/conversationslisthelper.h b/src/helpers/conversationslisthelper.h similarity index 100% rename from helpers/conversationslisthelper.h rename to src/helpers/conversationslisthelper.h diff --git a/helpers/imageloadhelper.cpp b/src/helpers/imageloadhelper.cpp similarity index 100% rename from helpers/imageloadhelper.cpp rename to src/helpers/imageloadhelper.cpp diff --git a/helpers/imageloadhelper.h b/src/helpers/imageloadhelper.h similarity index 100% rename from helpers/imageloadhelper.h rename to src/helpers/imageloadhelper.h diff --git a/helpers/usershelper.cpp b/src/helpers/usershelper.cpp similarity index 100% rename from helpers/usershelper.cpp rename to src/helpers/usershelper.cpp diff --git a/helpers/usershelper.h b/src/helpers/usershelper.h similarity index 100% rename from helpers/usershelper.h rename to src/helpers/usershelper.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/res/baseline_access_time_black_48dp.png b/src/res/baseline_access_time_black_48dp.png similarity index 100% rename from res/baseline_access_time_black_48dp.png rename to src/res/baseline_access_time_black_48dp.png diff --git a/res/baseline_insert_photo_black_48dp.png b/src/res/baseline_insert_photo_black_48dp.png similarity index 100% rename from res/baseline_insert_photo_black_48dp.png rename to src/res/baseline_insert_photo_black_48dp.png diff --git a/res/baseline_people_black_48dp.png b/src/res/baseline_people_black_48dp.png similarity index 100% rename from res/baseline_people_black_48dp.png rename to src/res/baseline_people_black_48dp.png diff --git a/res/baseline_person_black_48dp.png b/src/res/baseline_person_black_48dp.png similarity index 100% rename from res/baseline_person_black_48dp.png rename to src/res/baseline_person_black_48dp.png diff --git a/res/ressources.qrc b/src/res/ressources.qrc similarity index 100% rename from res/ressources.qrc rename to src/res/ressources.qrc diff --git a/utils/accountutils.cpp b/src/utils/accountutils.cpp similarity index 100% rename from utils/accountutils.cpp rename to src/utils/accountutils.cpp diff --git a/utils/accountutils.h b/src/utils/accountutils.h similarity index 100% rename from utils/accountutils.h rename to src/utils/accountutils.h diff --git a/utils/filesutils.cpp b/src/utils/filesutils.cpp similarity index 100% rename from utils/filesutils.cpp rename to src/utils/filesutils.cpp diff --git a/utils/filesutils.h b/src/utils/filesutils.h similarity index 100% rename from utils/filesutils.h rename to src/utils/filesutils.h diff --git a/utils/jsonutils.cpp b/src/utils/jsonutils.cpp similarity index 100% rename from utils/jsonutils.cpp rename to src/utils/jsonutils.cpp diff --git a/utils/jsonutils.h b/src/utils/jsonutils.h similarity index 100% rename from utils/jsonutils.h rename to src/utils/jsonutils.h diff --git a/utils/timeutils.cpp b/src/utils/timeutils.cpp similarity index 100% rename from utils/timeutils.cpp rename to src/utils/timeutils.cpp diff --git a/utils/timeutils.h b/src/utils/timeutils.h similarity index 100% rename from utils/timeutils.h rename to src/utils/timeutils.h diff --git a/utils/uiutils.cpp b/src/utils/uiutils.cpp similarity index 100% rename from utils/uiutils.cpp rename to src/utils/uiutils.cpp diff --git a/utils/uiutils.h b/src/utils/uiutils.h similarity index 100% rename from utils/uiutils.h rename to src/utils/uiutils.h diff --git a/widgets/aboutthisappdialog.cpp b/src/widgets/aboutthisappdialog.cpp similarity index 100% rename from widgets/aboutthisappdialog.cpp rename to src/widgets/aboutthisappdialog.cpp diff --git a/widgets/aboutthisappdialog.h b/src/widgets/aboutthisappdialog.h similarity index 100% rename from widgets/aboutthisappdialog.h rename to src/widgets/aboutthisappdialog.h diff --git a/widgets/aboutthisappdialog.ui b/src/widgets/aboutthisappdialog.ui similarity index 100% rename from widgets/aboutthisappdialog.ui rename to src/widgets/aboutthisappdialog.ui diff --git a/widgets/clickablelabel.cpp b/src/widgets/clickablelabel.cpp similarity index 100% rename from widgets/clickablelabel.cpp rename to src/widgets/clickablelabel.cpp diff --git a/widgets/clickablelabel.h b/src/widgets/clickablelabel.h similarity index 100% rename from widgets/clickablelabel.h rename to src/widgets/clickablelabel.h diff --git a/widgets/conversationitemwidget.cpp b/src/widgets/conversationitemwidget.cpp similarity index 100% rename from widgets/conversationitemwidget.cpp rename to src/widgets/conversationitemwidget.cpp diff --git a/widgets/conversationitemwidget.h b/src/widgets/conversationitemwidget.h similarity index 100% rename from widgets/conversationitemwidget.h rename to src/widgets/conversationitemwidget.h diff --git a/widgets/conversationitemwidget.ui b/src/widgets/conversationitemwidget.ui similarity index 100% rename from widgets/conversationitemwidget.ui rename to src/widgets/conversationitemwidget.ui diff --git a/widgets/conversationmessagewidget.cpp b/src/widgets/conversationmessagewidget.cpp similarity index 100% rename from widgets/conversationmessagewidget.cpp rename to src/widgets/conversationmessagewidget.cpp diff --git a/widgets/conversationmessagewidget.h b/src/widgets/conversationmessagewidget.h similarity index 100% rename from widgets/conversationmessagewidget.h rename to src/widgets/conversationmessagewidget.h diff --git a/widgets/conversationmessagewidget.ui b/src/widgets/conversationmessagewidget.ui similarity index 100% rename from widgets/conversationmessagewidget.ui rename to src/widgets/conversationmessagewidget.ui diff --git a/widgets/conversationslistwidget.cpp b/src/widgets/conversationslistwidget.cpp similarity index 100% rename from widgets/conversationslistwidget.cpp rename to src/widgets/conversationslistwidget.cpp diff --git a/widgets/conversationslistwidget.h b/src/widgets/conversationslistwidget.h similarity index 100% rename from widgets/conversationslistwidget.h rename to src/widgets/conversationslistwidget.h diff --git a/widgets/conversationwidget.cpp b/src/widgets/conversationwidget.cpp similarity index 100% rename from widgets/conversationwidget.cpp rename to src/widgets/conversationwidget.cpp diff --git a/widgets/conversationwidget.h b/src/widgets/conversationwidget.h similarity index 100% rename from widgets/conversationwidget.h rename to src/widgets/conversationwidget.h diff --git a/widgets/conversationwidget.ui b/src/widgets/conversationwidget.ui similarity index 100% rename from widgets/conversationwidget.ui rename to src/widgets/conversationwidget.ui diff --git a/widgets/loginwidget.cpp b/src/widgets/loginwidget.cpp similarity index 100% rename from widgets/loginwidget.cpp rename to src/widgets/loginwidget.cpp diff --git a/widgets/loginwidget.h b/src/widgets/loginwidget.h similarity index 100% rename from widgets/loginwidget.h rename to src/widgets/loginwidget.h diff --git a/widgets/loginwidget.ui b/src/widgets/loginwidget.ui similarity index 100% rename from widgets/loginwidget.ui rename to src/widgets/loginwidget.ui diff --git a/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp similarity index 100% rename from widgets/mainwindow.cpp rename to src/widgets/mainwindow.cpp diff --git a/widgets/mainwindow.h b/src/widgets/mainwindow.h similarity index 100% rename from widgets/mainwindow.h rename to src/widgets/mainwindow.h diff --git a/widgets/mainwindow.ui b/src/widgets/mainwindow.ui similarity index 100% rename from widgets/mainwindow.ui rename to src/widgets/mainwindow.ui diff --git a/widgets/remoteimagemanager.cpp b/src/widgets/remoteimagemanager.cpp similarity index 100% rename from widgets/remoteimagemanager.cpp rename to src/widgets/remoteimagemanager.cpp diff --git a/widgets/remoteimagemanager.h b/src/widgets/remoteimagemanager.h similarity index 100% rename from widgets/remoteimagemanager.h rename to src/widgets/remoteimagemanager.h