diff --git a/CMakeLists.txt b/CMakeLists.txt index 81dc2ca5..9b13def9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,50 +140,27 @@ endif() # Declare source and header files. # set(SRC_FILES - src/AvatarProvider.cc - src/Cache.cc - src/ChatPage.cc - src/Deserializable.cc - src/EmojiCategory.cc - src/EmojiItemDelegate.cc - src/EmojiPanel.cc - src/EmojiPickButton.cc - src/EmojiProvider.cc - src/FileItem.cc - src/ImageItem.cc - src/ImageOverlayDialog.cc - src/InputValidator.cc - src/JoinRoomDialog.cc - src/LeaveRoomDialog.cc - src/Login.cc - src/LoginPage.cc - src/LogoutDialog.cc - src/MainWindow.cc - src/MatrixClient.cc - src/Profile.cc - src/QuickSwitcher.cc - src/Register.cc - src/RegisterPage.cc - src/RoomInfoListItem.cc - src/RoomList.cc - src/RoomMessages.cc - src/RoomState.cc - src/SideBarActions.cc - src/UserSettingsPage.cc - src/Splitter.cc - src/Sync.cc - src/TextInputWidget.cc - src/TimelineItem.cc - src/TimelineView.cc - src/TimelineViewManager.cc - src/TopRoomBar.cc - src/TrayIcon.cc - src/TypingDisplay.cc - src/UserInfoWidget.cc - src/Versions.cc - src/WelcomePage.cc - src/main.cc + # Dialogs + src/dialogs/ImageOverlayDialog.cc + src/dialogs/JoinRoomDialog.cc + src/dialogs/LeaveRoomDialog.cc + src/dialogs/LogoutDialog.cc + # Emoji + src/emoji/EmojiCategory.cc + src/emoji/EmojiItemDelegate.cc + src/emoji/EmojiPanel.cc + src/emoji/EmojiPickButton.cc + src/emoji/EmojiProvider.cc + + # Timeline + src/timeline/TimelineViewManager.cc + src/timeline/TimelineItem.cc + src/timeline/TimelineView.cc + src/timeline/widgets/FileItem.cc + src/timeline/widgets/ImageItem.cc + + # UI components src/ui/Avatar.cc src/ui/Badge.cc src/ui/LoadingIndicator.cc @@ -201,6 +178,36 @@ set(SRC_FILES src/ui/ToggleButton.cc src/ui/Theme.cc src/ui/ThemeManager.cc + + src/AvatarProvider.cc + src/Cache.cc + src/ChatPage.cc + src/Deserializable.cc + src/InputValidator.cc + src/Login.cc + src/LoginPage.cc + src/MainWindow.cc + src/MatrixClient.cc + src/Profile.cc + src/QuickSwitcher.cc + src/Register.cc + src/RegisterPage.cc + src/RoomInfoListItem.cc + src/RoomList.cc + src/RoomMessages.cc + src/RoomState.cc + src/SideBarActions.cc + src/Splitter.cc + src/Sync.cc + src/TextInputWidget.cc + src/TopRoomBar.cc + src/TrayIcon.cc + src/TypingDisplay.cc + src/UserInfoWidget.cc + src/UserSettingsPage.cc + src/Versions.cc + src/WelcomePage.cc + src/main.cc ) set(MATRIX_EVENTS @@ -237,44 +244,33 @@ include_directories(libs/lmdbxx) include_directories(${LMDB_INCLUDE_DIR}) qt5_wrap_cpp(MOC_HEADERS - include/AvatarProvider.h - include/ChatPage.h - include/EmojiCategory.h - include/EmojiItemDelegate.h - include/EmojiPanel.h - include/EmojiPickButton.h - include/ui/FloatingButton.h - include/FileItem.h - include/ImageItem.h - include/ImageOverlayDialog.h - include/JoinRoomDialog.h - include/LeaveRoomDialog.h - include/LoginPage.h - include/LogoutDialog.h - include/MainWindow.h - include/MatrixClient.h - include/QuickSwitcher.h - include/RegisterPage.h - include/RoomInfoListItem.h - include/RoomList.h - include/SideBarActions.h - include/UserSettingsPage.h - include/Splitter.h - include/TextInputWidget.h - include/TimelineItem.h - include/TimelineView.h - include/TimelineViewManager.h - include/TopRoomBar.h - include/TrayIcon.h - include/TypingDisplay.h - include/UserInfoWidget.h - include/WelcomePage.h + # Dialogs + include/dialogs/ImageOverlayDialog.h + include/dialogs/JoinRoomDialog.h + include/dialogs/LeaveRoomDialog.h + include/dialogs/LogoutDialog.h + # Emoji + include/emoji/EmojiCategory.h + include/emoji/EmojiItemDelegate.h + include/emoji/EmojiPanel.h + include/emoji/EmojiPickButton.h + include/emoji/EmojiProvider.h + + # Timeline + include/timeline/TimelineItem.h + include/timeline/TimelineView.h + include/timeline/TimelineViewManager.h + include/timeline/widgets/FileItem.h + include/timeline/widgets/ImageItem.h + + # UI components include/ui/Avatar.h include/ui/Badge.h include/ui/LoadingIndicator.h include/ui/FlatButton.h include/ui/Label.h + include/ui/FloatingButton.h include/ui/OverlayWidget.h include/ui/ScrollBar.h include/ui/SnackBar.h @@ -285,6 +281,25 @@ qt5_wrap_cpp(MOC_HEADERS include/ui/ToggleButton.h include/ui/Theme.h include/ui/ThemeManager.h + + include/AvatarProvider.h + include/ChatPage.h + include/LoginPage.h + include/MainWindow.h + include/MatrixClient.h + include/QuickSwitcher.h + include/RegisterPage.h + include/RoomInfoListItem.h + include/RoomList.h + include/SideBarActions.h + include/Splitter.h + include/TextInputWidget.h + include/TopRoomBar.h + include/TrayIcon.h + include/TypingDisplay.h + include/UserInfoWidget.h + include/UserSettingsPage.h + include/WelcomePage.h ) # diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h index 80c16740..ede7b18a 100644 --- a/include/TextInputWidget.h +++ b/include/TextInputWidget.h @@ -24,11 +24,12 @@ #include #include -#include "EmojiPickButton.h" #include "FlatButton.h" #include "Image.h" #include "LoadingIndicator.h" +#include "emoji/EmojiPickButton.h" + namespace msgs = matrix::events::messages; class FilteredTextEdit : public QTextEdit diff --git a/include/ImageOverlayDialog.h b/include/dialogs/ImageOverlayDialog.h similarity index 100% rename from include/ImageOverlayDialog.h rename to include/dialogs/ImageOverlayDialog.h diff --git a/include/JoinRoomDialog.h b/include/dialogs/JoinRoomDialog.h similarity index 100% rename from include/JoinRoomDialog.h rename to include/dialogs/JoinRoomDialog.h diff --git a/include/LeaveRoomDialog.h b/include/dialogs/LeaveRoomDialog.h similarity index 100% rename from include/LeaveRoomDialog.h rename to include/dialogs/LeaveRoomDialog.h diff --git a/include/LogoutDialog.h b/include/dialogs/LogoutDialog.h similarity index 100% rename from include/LogoutDialog.h rename to include/dialogs/LogoutDialog.h diff --git a/include/EmojiCategory.h b/include/emoji/EmojiCategory.h similarity index 100% rename from include/EmojiCategory.h rename to include/emoji/EmojiCategory.h diff --git a/include/EmojiItemDelegate.h b/include/emoji/EmojiItemDelegate.h similarity index 100% rename from include/EmojiItemDelegate.h rename to include/emoji/EmojiItemDelegate.h diff --git a/include/EmojiPanel.h b/include/emoji/EmojiPanel.h similarity index 100% rename from include/EmojiPanel.h rename to include/emoji/EmojiPanel.h diff --git a/include/EmojiPickButton.h b/include/emoji/EmojiPickButton.h similarity index 100% rename from include/EmojiPickButton.h rename to include/emoji/EmojiPickButton.h diff --git a/include/EmojiProvider.h b/include/emoji/EmojiProvider.h similarity index 100% rename from include/EmojiProvider.h rename to include/emoji/EmojiProvider.h diff --git a/include/TimelineItem.h b/include/timeline/TimelineItem.h similarity index 100% rename from include/TimelineItem.h rename to include/timeline/TimelineItem.h diff --git a/include/TimelineView.h b/include/timeline/TimelineView.h similarity index 100% rename from include/TimelineView.h rename to include/timeline/TimelineView.h diff --git a/include/TimelineViewManager.h b/include/timeline/TimelineViewManager.h similarity index 100% rename from include/TimelineViewManager.h rename to include/timeline/TimelineViewManager.h diff --git a/include/FileItem.h b/include/timeline/widgets/FileItem.h similarity index 100% rename from include/FileItem.h rename to include/timeline/widgets/FileItem.h diff --git a/include/ImageItem.h b/include/timeline/widgets/ImageItem.h similarity index 100% rename from include/ImageItem.h rename to include/timeline/widgets/ImageItem.h diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cc index 7e8c9e49..334f72c3 100644 --- a/src/AvatarProvider.cc +++ b/src/AvatarProvider.cc @@ -17,7 +17,8 @@ #include "AvatarProvider.h" #include "MatrixClient.h" -#include "TimelineItem.h" + +#include "timeline/TimelineItem.h" QSharedPointer AvatarProvider::client_; diff --git a/src/ChatPage.cc b/src/ChatPage.cc index 5214d49a..340e75c3 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc @@ -35,11 +35,12 @@ #include "Sync.h" #include "TextInputWidget.h" #include "Theme.h" -#include "TimelineViewManager.h" #include "TopRoomBar.h" #include "TypingDisplay.h" #include "UserInfoWidget.h" +#include "timeline/TimelineViewManager.h" + constexpr int MAX_INITIAL_SYNC_FAILURES = 5; constexpr int SYNC_RETRY_TIMEOUT = 10000; diff --git a/src/RoomList.cc b/src/RoomList.cc index 7560a616..6b8867f3 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cc @@ -18,8 +18,9 @@ #include #include -#include "JoinRoomDialog.h" -#include "LeaveRoomDialog.h" +#include "dialogs/JoinRoomDialog.h" +#include "dialogs/LeaveRoomDialog.h" + #include "MainWindow.h" #include "MatrixClient.h" #include "OverlayModal.h" diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc index d852ae32..3418e6f1 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc @@ -21,13 +21,14 @@ #include "Config.h" #include "FlatButton.h" #include "Label.h" -#include "LeaveRoomDialog.h" #include "MainWindow.h" #include "Menu.h" #include "OverlayModal.h" #include "RoomSettings.h" #include "TopRoomBar.h" +#include "dialogs/LeaveRoomDialog.h" + TopRoomBar::TopRoomBar(QWidget *parent) : QWidget(parent) , buttonSize_{32} diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc index 3dc1bc89..98977bb3 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cc @@ -20,11 +20,12 @@ #include "Avatar.h" #include "Config.h" #include "FlatButton.h" -#include "LogoutDialog.h" #include "MainWindow.h" #include "OverlayModal.h" #include "UserInfoWidget.h" +#include "dialogs/LogoutDialog.h" + UserInfoWidget::UserInfoWidget(QWidget *parent) : QWidget(parent) , display_name_("User") diff --git a/src/ImageOverlayDialog.cc b/src/dialogs/ImageOverlayDialog.cc similarity index 99% rename from src/ImageOverlayDialog.cc rename to src/dialogs/ImageOverlayDialog.cc index 7dd4a226..ad87d144 100644 --- a/src/ImageOverlayDialog.cc +++ b/src/dialogs/ImageOverlayDialog.cc @@ -19,7 +19,7 @@ #include #include -#include "ImageOverlayDialog.h" +#include "dialogs/ImageOverlayDialog.h" ImageOverlayDialog::ImageOverlayDialog(QPixmap image, QWidget *parent) : QWidget{parent} diff --git a/src/JoinRoomDialog.cc b/src/dialogs/JoinRoomDialog.cc similarity index 97% rename from src/JoinRoomDialog.cc rename to src/dialogs/JoinRoomDialog.cc index a4d241c0..2cee7ef6 100644 --- a/src/JoinRoomDialog.cc +++ b/src/dialogs/JoinRoomDialog.cc @@ -3,9 +3,10 @@ #include "Config.h" #include "FlatButton.h" -#include "JoinRoomDialog.h" #include "Theme.h" +#include "dialogs/JoinRoomDialog.h" + JoinRoomDialog::JoinRoomDialog(QWidget *parent) : QFrame(parent) { diff --git a/src/LeaveRoomDialog.cc b/src/dialogs/LeaveRoomDialog.cc similarity index 97% rename from src/LeaveRoomDialog.cc rename to src/dialogs/LeaveRoomDialog.cc index e9877a24..b0d1679f 100644 --- a/src/LeaveRoomDialog.cc +++ b/src/dialogs/LeaveRoomDialog.cc @@ -4,9 +4,10 @@ #include "Config.h" #include "FlatButton.h" -#include "LeaveRoomDialog.h" #include "Theme.h" +#include "dialogs/LeaveRoomDialog.h" + LeaveRoomDialog::LeaveRoomDialog(QWidget *parent) : QFrame(parent) { diff --git a/src/LogoutDialog.cc b/src/dialogs/LogoutDialog.cc similarity index 98% rename from src/LogoutDialog.cc rename to src/dialogs/LogoutDialog.cc index cda52016..73e09745 100644 --- a/src/LogoutDialog.cc +++ b/src/dialogs/LogoutDialog.cc @@ -22,9 +22,10 @@ #include "Config.h" #include "FlatButton.h" -#include "LogoutDialog.h" #include "Theme.h" +#include "dialogs/LogoutDialog.h" + LogoutDialog::LogoutDialog(QWidget *parent) : QFrame(parent) { diff --git a/src/EmojiCategory.cc b/src/emoji/EmojiCategory.cc similarity index 98% rename from src/EmojiCategory.cc rename to src/emoji/EmojiCategory.cc index 98d79cc0..42f09409 100644 --- a/src/EmojiCategory.cc +++ b/src/emoji/EmojiCategory.cc @@ -20,7 +20,8 @@ #include #include "Config.h" -#include "EmojiCategory.h" + +#include "emoji/EmojiCategory.h" EmojiCategory::EmojiCategory(QString category, QList emoji, QWidget *parent) : QWidget(parent) diff --git a/src/EmojiItemDelegate.cc b/src/emoji/EmojiItemDelegate.cc similarity index 97% rename from src/EmojiItemDelegate.cc rename to src/emoji/EmojiItemDelegate.cc index 691bee17..547d3b4c 100644 --- a/src/EmojiItemDelegate.cc +++ b/src/emoji/EmojiItemDelegate.cc @@ -18,7 +18,7 @@ #include #include -#include "EmojiItemDelegate.h" +#include "emoji/EmojiItemDelegate.h" EmojiItemDelegate::EmojiItemDelegate(QObject *parent) : QStyledItemDelegate(parent) diff --git a/src/EmojiPanel.cc b/src/emoji/EmojiPanel.cc similarity index 99% rename from src/EmojiPanel.cc rename to src/emoji/EmojiPanel.cc index 0daaad68..9df6f193 100644 --- a/src/EmojiPanel.cc +++ b/src/emoji/EmojiPanel.cc @@ -20,10 +20,11 @@ #include #include "DropShadow.h" -#include "EmojiCategory.h" -#include "EmojiPanel.h" #include "FlatButton.h" +#include "emoji/EmojiCategory.h" +#include "emoji/EmojiPanel.h" + EmojiPanel::EmojiPanel(QWidget *parent) : QWidget(parent) , shadowMargin_{2} diff --git a/src/EmojiPickButton.cc b/src/emoji/EmojiPickButton.cc similarity index 96% rename from src/EmojiPickButton.cc rename to src/emoji/EmojiPickButton.cc index a4f83c46..44955a8c 100644 --- a/src/EmojiPickButton.cc +++ b/src/emoji/EmojiPickButton.cc @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "EmojiPickButton.h" -#include "EmojiPanel.h" +#include "emoji/EmojiPickButton.h" +#include "emoji/EmojiPanel.h" EmojiPickButton::EmojiPickButton(QWidget *parent) : FlatButton(parent) diff --git a/src/EmojiProvider.cc b/src/emoji/EmojiProvider.cc similarity index 99% rename from src/EmojiProvider.cc rename to src/emoji/EmojiProvider.cc index ec053046..838c0340 100644 --- a/src/EmojiProvider.cc +++ b/src/emoji/EmojiProvider.cc @@ -17,7 +17,7 @@ #include -#include "EmojiProvider.h" +#include "emoji/EmojiProvider.h" const QList EmojiProvider::people = { Emoji{QString::fromUtf8("\xf0\x9f\x98\x80"), ":grinning:"}, diff --git a/src/TimelineItem.cc b/src/timeline/TimelineItem.cc similarity index 99% rename from src/TimelineItem.cc rename to src/timeline/TimelineItem.cc index 7297abc3..f7dd0f6e 100644 --- a/src/TimelineItem.cc +++ b/src/timeline/TimelineItem.cc @@ -22,10 +22,11 @@ #include "Avatar.h" #include "Config.h" -#include "FileItem.h" -#include "ImageItem.h" #include "Sync.h" -#include "TimelineItem.h" + +#include "timeline/TimelineItem.h" +#include "timeline/widgets/FileItem.h" +#include "timeline/widgets/ImageItem.h" static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)"); static const QString URL_HTML = "\\1"; diff --git a/src/TimelineView.cc b/src/timeline/TimelineView.cc similarity index 99% rename from src/TimelineView.cc rename to src/timeline/TimelineView.cc index 7bbda051..8ccff85a 100644 --- a/src/TimelineView.cc +++ b/src/timeline/TimelineView.cc @@ -19,13 +19,14 @@ #include #include -#include "FileItem.h" #include "FloatingButton.h" -#include "ImageItem.h" #include "RoomMessages.h" #include "ScrollBar.h" #include "Sync.h" -#include "TimelineView.h" + +#include "timeline/TimelineView.h" +#include "timeline/widgets/FileItem.h" +#include "timeline/widgets/ImageItem.h" namespace events = matrix::events; namespace msgs = matrix::events::messages; diff --git a/src/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc similarity index 98% rename from src/TimelineViewManager.cc rename to src/timeline/TimelineViewManager.cc index daec481b..39f07639 100644 --- a/src/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cc @@ -22,12 +22,13 @@ #include #include -#include "FileItem.h" -#include "ImageItem.h" #include "MatrixClient.h" #include "Sync.h" -#include "TimelineView.h" -#include "TimelineViewManager.h" + +#include "timeline/TimelineView.h" +#include "timeline/TimelineViewManager.h" +#include "timeline/widgets/FileItem.h" +#include "timeline/widgets/ImageItem.h" TimelineViewManager::TimelineViewManager(QSharedPointer client, QWidget *parent) : QStackedWidget(parent) diff --git a/src/FileItem.cc b/src/timeline/widgets/FileItem.cc similarity index 99% rename from src/FileItem.cc rename to src/timeline/widgets/FileItem.cc index 96fd9c07..8d0100c7 100644 --- a/src/FileItem.cc +++ b/src/timeline/widgets/FileItem.cc @@ -24,8 +24,7 @@ #include #include -#include "FileItem.h" -#include "ImageOverlayDialog.h" +#include "timeline/widgets/FileItem.h" namespace events = matrix::events; namespace msgs = matrix::events::messages; diff --git a/src/ImageItem.cc b/src/timeline/widgets/ImageItem.cc similarity index 98% rename from src/ImageItem.cc rename to src/timeline/widgets/ImageItem.cc index 333fd296..106fc79b 100644 --- a/src/ImageItem.cc +++ b/src/timeline/widgets/ImageItem.cc @@ -22,8 +22,8 @@ #include #include -#include "ImageItem.h" -#include "ImageOverlayDialog.h" +#include "dialogs/ImageOverlayDialog.h" +#include "timeline/widgets/ImageItem.h" namespace events = matrix::events; namespace msgs = matrix::events::messages;