jfmartel/SystemGui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
J-F Martel 2017-04-13 10:21:29 -04:00
parent 9f5b83c776
commit fa592bc5ed
4 changed files with 140 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
SMSGui.ui
View File

@ -19,117 +19,106 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QTextBrowser" name="mConversationText"> <layout class="QGridLayout" name="gridLayout_2">
<property name="geometry"> <item row="0" column="0">
<rect> <widget class="QLabel" name="mContactPic">
<x>0</x> <property name="sizePolicy">
<y>160</y> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<width>481</width> <horstretch>0</horstretch>
<height>451</height> <verstretch>0</verstretch>
</rect> </sizepolicy>
</property> </property>
</widget> <property name="minimumSize">
<widget class="QFrame" name="mSMSEditFrame"> <size>
<property name="geometry"> <width>100</width>
<rect> <height>100</height>
<x>0</x> </size>
<y>620</y> </property>
<width>521</width> <property name="baseSize">
<height>121</height> <size>
</rect> <width>100</width>
</property> <height>100</height>
<property name="frameShape"> </size>
<enum>QFrame::StyledPanel</enum> </property>
</property> <property name="text">
<property name="frameShadow"> <string>TextLabel</string>
<enum>QFrame::Raised</enum> </property>
</property> </widget>
<layout class="QGridLayout" name="gridLayout"> </item>
<item row="3" column="2"> <item row="0" column="1" colspan="2">
<widget class="QPushButton" name="mSMSSendBtn"> <widget class="QLabel" name="mContactName">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QTextBrowser" name="mConversationText"/>
</item>
<item row="1" column="2" rowspan="2">
<widget class="QTreeWidget" name="mContactsTreeWidget">
<property name="indentation">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text"> <property name="text">
<string>Send</string> <string notr="true">1</string>
</property> </property>
</widget> </column>
</item> </widget>
<item row="2" column="0" rowspan="2"> </item>
<widget class="QTextEdit" name="mSMSEdit"/> <item row="2" column="0" colspan="2">
</item> <widget class="QFrame" name="mSMSEditFrame">
<item row="3" column="3"> <property name="frameShape">
<spacer name="horizontalSpacer"> <enum>QFrame::StyledPanel</enum>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> <property name="frameShadow">
</property> <enum>QFrame::Raised</enum>
<property name="sizeHint" stdset="0"> </property>
<size> <layout class="QGridLayout" name="gridLayout">
<width>40</width> <item row="3" column="2">
<height>20</height> <widget class="QPushButton" name="mSMSSendBtn">
</size> <property name="text">
</property> <string>Send</string>
</spacer> </property>
</item> </widget>
<item row="2" column="2" colspan="2"> </item>
<widget class="QLabel" name="mSMSMessageStatsLabel"> <item row="2" column="0" rowspan="2">
<property name="minimumSize"> <widget class="QTextEdit" name="mSMSEdit"/>
<size> </item>
<width>200</width> <item row="3" column="3">
<height>75</height> <spacer name="horizontalSpacer">
</size> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="text"> </property>
<string>TextLabel</string> <property name="sizeHint" stdset="0">
</property> <size>
</widget> <width>40</width>
</item> <height>20</height>
</layout> </size>
</widget> </property>
<widget class="QTreeWidget" name="mContactsTreeWidget"> </spacer>
<property name="geometry"> </item>
<rect> <item row="2" column="2" colspan="2">
<x>520</x> <widget class="QLabel" name="mSMSMessageStatsLabel">
<y>160</y> <property name="minimumSize">
<width>256</width> <size>
<height>471</height> <width>200</width>
</rect> <height>75</height>
</property> </size>
<property name="indentation"> </property>
<number>2</number> <property name="text">
</property> <string>TextLabel</string>
<attribute name="headerVisible"> </property>
<bool>false</bool> </widget>
</attribute> </item>
<column> </layout>
<property name="text"> </widget>
<string notr="true">1</string> </item>
</property> </layout>
</column>
</widget>
<widget class="QLabel" name="mContactPic">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>141</width>
<height>121</height>
</rect>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
<widget class="QLabel" name="mContactName">
<property name="geometry">
<rect>
<x>180</x>
<y>20</y>
<width>591</width>
<height>101</height>
</rect>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

88
Sources/SMSClient/SMSClient.cpp
View File

@ -45,8 +45,6 @@ int CSMSClient::SetAllMsgsDatabase(QString DID, QList<CSMSMessage> *MessagesList
if(mSMSDatabase.SetAllMessages(DID,MessagesList) == RET_OK) if(mSMSDatabase.SetAllMessages(DID,MessagesList) == RET_OK)
{ {
mGuiHandle->FullConversationsUpdate(); mGuiHandle->FullConversationsUpdate();
// mMainPanel->mConversationsWindow->FullConversationsUpdate();
// mMainPanel->mConversationWindow->hide();
} }
return RET_OK; return RET_OK;
} }
@ -70,60 +68,6 @@ int CSMSClient::SetContacts(QList<CContact> *ContactsList)
return RET_OK; return RET_OK;
} }
//unsigned int CSMSClient::QuitApplicationRequest()
//{
// QApplication::exit(69);
// return RET_OK;
//}
//unsigned int CSMSClient::ShowSettingsWindowRequest()
//{
// mSettingsWindow->show();
// return RET_OK;
//}
//unsigned int CSMSClient::SaveSettings(CSettings *Settings)
//{
// CSettings toto;
// toto = *Settings;
// mSMSClientSettings = toto;
// mSettingsManager.SaveSettings(&mSMSClientSettings);
// return RET_OK;
//}
//unsigned int CSMSClient::SettingsWindowClosed()
//{
// return RET_OK;
//}
//int CSMSClient::AppToggle()
//{
//// if(mMainPanel->mConversationWindow->isVisible())
//// {
//// mMainPanel->mConversationWindow->hide();
//// }
//// else if(mMainPanel->mConversationsWindow->isVisible())
//// {
//// mMainPanel->mConversationsWindow->hide();
//// }
//// else
//// {
//// mMainPanel->mConversationsWindow->show();
//// }
// return RET_OK;
//}
//int CSMSClient::AppPosChanged(int NewPosX, int NewPosY)
//{
//// mMainPanel->mConversationsWindow->setPos(50,50);
//// mMainPanel->mConversationWindow->setPos(50,50);
// return RET_OK;
//}
int CSMSClient::ShowConversation(QString Contact) int CSMSClient::ShowConversation(QString Contact)
{ {
CSMSConversation* Conversation; CSMSConversation* Conversation;
@ -134,30 +78,9 @@ int CSMSClient::ShowConversation(QString Contact)
return RET_ERROR; return RET_ERROR;
} }
// mMainPanel->mConversationWindow->SetConversation(Conversation);
// mMainPanel->mConversationsWindow->hide();
// mMainPanel->mConversationWindow->show();
return RET_OK; return RET_OK;
} }
//int CSMSClient::CloseConversationsWindow()
//{
//// mMainPanel->mConversationsWindow->hide();
// return RET_OK;
//}
//int CSMSClient::CloseConversationWindow(CConversationWindow *Window)
//{
// Q_UNUSED(Window)
//// mMainPanel->mConversationsWindow->FullConversationsUpdate();
//// mMainPanel->mConversationWindow->hide();
//// mMainPanel->mConversationsWindow->show();
// return RET_OK;
//}
int CSMSClient::SendSMSMessage(CSMSMessage Message) int CSMSClient::SendSMSMessage(CSMSMessage Message)
{ {
@ -167,11 +90,6 @@ int CSMSClient::SendSMSMessage(CSMSMessage Message)
int CSMSClient::NewMessageNotification(CSMSConversation *Conversation, int MessageIndex) int CSMSClient::NewMessageNotification(CSMSConversation *Conversation, int MessageIndex)
{ {
// if(mMainPanel->mConversationWindow->NewMessageNotification(Conversation,MessageIndex) == true)
// {
// mSMSDatabase.SetConversationAsRead(Conversation);
// }
// mMainPanel->mConversationsWindow->UpdateConversation(Conversation);
mGuiHandle->NewMessageNotification(Conversation,MessageIndex); mGuiHandle->NewMessageNotification(Conversation,MessageIndex);
MessageCountChangeNotification(mSMSDatabase.GetNbUnreadMsgs()); MessageCountChangeNotification(mSMSDatabase.GetNbUnreadMsgs());
@ -181,18 +99,12 @@ int CSMSClient::NewMessageNotification(CSMSConversation *Conversation, int Messa
int CSMSClient::SyncConversations() int CSMSClient::SyncConversations()
{ {
// mMainPanel->mConversationsWindow->FullConversationsUpdate();
return RET_OK; return RET_OK;
} }
int CSMSClient::MessageCountChangeNotification(int MsgCount) int CSMSClient::MessageCountChangeNotification(int MsgCount)
{ {
// mMainPanel->mAppIconWidget->SetNewMsgCount(MsgCount);
mTrayIconMgr->NewSMSMessagesPendingCount(MsgCount); mTrayIconMgr->NewSMSMessagesPendingCount(MsgCount);
return RET_OK; return RET_OK;
} }
//int CSMSClient::NewConversationAddedToDatabase(CSMSConversation *Conversation)
//{
//}

19
Sources/SMSClient/SMSClient.h
View File

@ -22,10 +22,7 @@ public:
~CSMSClient(); ~CSMSClient();
void Start(void); void Start(void);
// CSystemTrayManager *mSystemTrayManager;
// CSettingsWindow *mSettingsWindow;
// CProgramSettings mSettingsManager;
//Panel *mMainPanel;
CSMSMasterCtrlInterface *mMasterCtrlIF; CSMSMasterCtrlInterface *mMasterCtrlIF;
CSMSDatabase mSMSDatabase; CSMSDatabase mSMSDatabase;
CContactRepository mContactRepository; CContactRepository mContactRepository;
@ -36,17 +33,6 @@ public:
// unsigned int QuitApplicationRequest();
// unsigned int ShowSettingsWindowRequest();
// unsigned int SaveSettings(CSettings *Settings);
// unsigned int SettingsWindowClosed();
//AppIconWidget requests
// int AppToggle();
// int AppPosChanged(int NewPosX, int NewPosY);
//MasterCtrlIngerface Requests
int SetAllMsgsDatabase(QString DID, QList<CSMSMessage> *MessagesList); int SetAllMsgsDatabase(QString DID, QList<CSMSMessage> *MessagesList);
int SetDIDDatabase(QString DID); int SetDIDDatabase(QString DID);
int NewMessagesEvent(QList<CSMSMessage> *MessagesList); int NewMessagesEvent(QList<CSMSMessage> *MessagesList);
@ -55,16 +41,13 @@ public:
//ConversationsWindow requests //ConversationsWindow requests
int ShowConversation(QString Contact); int ShowConversation(QString Contact);
// int CloseConversationsWindow();
//ConversationWindow requests //ConversationWindow requests
//int CloseConversationWindow(CConversationWindow* Window);
int SendSMSMessage(CSMSMessage Message); int SendSMSMessage(CSMSMessage Message);
//SMSDatabase requests //SMSDatabase requests
int NewMessageNotification(CSMSConversation* Conversation, int MessageIndex); int NewMessageNotification(CSMSConversation* Conversation, int MessageIndex);
// void NewConversationAddedToDatabase(CSMSConversation *Conversation);
int SyncConversations(); int SyncConversations();
int MessageCountChangeNotification(int MsgCount); int MessageCountChangeNotification(int MsgCount);

62
ui_SMSGui.h
View File

@ -29,16 +29,17 @@ QT_BEGIN_NAMESPACE
class Ui_CSMSGui class Ui_CSMSGui
{ {
public: public:
QGridLayout *gridLayout_2;
QLabel *mContactPic;
QLabel *mContactName;
QTextBrowser *mConversationText; QTextBrowser *mConversationText;
QTreeWidget *mContactsTreeWidget;
QFrame *mSMSEditFrame; QFrame *mSMSEditFrame;
QGridLayout *gridLayout; QGridLayout *gridLayout;
QPushButton *mSMSSendBtn; QPushButton *mSMSSendBtn;
QTextEdit *mSMSEdit; QTextEdit *mSMSEdit;
QSpacerItem *horizontalSpacer; QSpacerItem *horizontalSpacer;
QLabel *mSMSMessageStatsLabel; QLabel *mSMSMessageStatsLabel;
QTreeWidget *mContactsTreeWidget;
QLabel *mContactPic;
QLabel *mContactName;
void setupUi(QWidget *CSMSGui) void setupUi(QWidget *CSMSGui)
{ {
@ -50,12 +51,42 @@ public:
sizePolicy.setVerticalStretch(0); sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(CSMSGui->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(CSMSGui->sizePolicy().hasHeightForWidth());
CSMSGui->setSizePolicy(sizePolicy); CSMSGui->setSizePolicy(sizePolicy);
gridLayout_2 = new QGridLayout(CSMSGui);
gridLayout_2->setObjectName(QStringLiteral("gridLayout_2"));
mContactPic = new QLabel(CSMSGui);
mContactPic->setObjectName(QStringLiteral("mContactPic"));
QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(mContactPic->sizePolicy().hasHeightForWidth());
mContactPic->setSizePolicy(sizePolicy1);
mContactPic->setMinimumSize(QSize(100, 100));
mContactPic->setBaseSize(QSize(100, 100));
gridLayout_2->addWidget(mContactPic, 0, 0, 1, 1);
mContactName = new QLabel(CSMSGui);
mContactName->setObjectName(QStringLiteral("mContactName"));
gridLayout_2->addWidget(mContactName, 0, 1, 1, 2);
mConversationText = new QTextBrowser(CSMSGui); mConversationText = new QTextBrowser(CSMSGui);
mConversationText->setObjectName(QStringLiteral("mConversationText")); mConversationText->setObjectName(QStringLiteral("mConversationText"));
mConversationText->setGeometry(QRect(0, 160, 481, 451));
gridLayout_2->addWidget(mConversationText, 1, 0, 1, 2);
mContactsTreeWidget = new QTreeWidget(CSMSGui);
QTreeWidgetItem *__qtreewidgetitem = new QTreeWidgetItem();
__qtreewidgetitem->setText(0, QStringLiteral("1"));
mContactsTreeWidget->setHeaderItem(__qtreewidgetitem);
mContactsTreeWidget->setObjectName(QStringLiteral("mContactsTreeWidget"));
mContactsTreeWidget->setIndentation(2);
mContactsTreeWidget->header()->setVisible(false);
gridLayout_2->addWidget(mContactsTreeWidget, 1, 2, 2, 1);
mSMSEditFrame = new QFrame(CSMSGui); mSMSEditFrame = new QFrame(CSMSGui);
mSMSEditFrame->setObjectName(QStringLiteral("mSMSEditFrame")); mSMSEditFrame->setObjectName(QStringLiteral("mSMSEditFrame"));
mSMSEditFrame->setGeometry(QRect(0, 620, 521, 121));
mSMSEditFrame->setFrameShape(QFrame::StyledPanel); mSMSEditFrame->setFrameShape(QFrame::StyledPanel);
mSMSEditFrame->setFrameShadow(QFrame::Raised); mSMSEditFrame->setFrameShadow(QFrame::Raised);
gridLayout = new QGridLayout(mSMSEditFrame); gridLayout = new QGridLayout(mSMSEditFrame);
@ -80,20 +111,9 @@ public:
gridLayout->addWidget(mSMSMessageStatsLabel, 2, 2, 1, 2); gridLayout->addWidget(mSMSMessageStatsLabel, 2, 2, 1, 2);
mContactsTreeWidget = new QTreeWidget(CSMSGui);
QTreeWidgetItem *__qtreewidgetitem = new QTreeWidgetItem(); gridLayout_2->addWidget(mSMSEditFrame, 2, 0, 1, 2);
__qtreewidgetitem->setText(0, QStringLiteral("1"));
mContactsTreeWidget->setHeaderItem(__qtreewidgetitem);
mContactsTreeWidget->setObjectName(QStringLiteral("mContactsTreeWidget"));
mContactsTreeWidget->setGeometry(QRect(520, 160, 256, 471));
mContactsTreeWidget->setIndentation(2);
mContactsTreeWidget->header()->setVisible(false);
mContactPic = new QLabel(CSMSGui);
mContactPic->setObjectName(QStringLiteral("mContactPic"));
mContactPic->setGeometry(QRect(10, 10, 141, 121));
mContactName = new QLabel(CSMSGui);
mContactName->setObjectName(QStringLiteral("mContactName"));
mContactName->setGeometry(QRect(180, 20, 591, 101));
retranslateUi(CSMSGui); retranslateUi(CSMSGui);
@ -103,10 +123,10 @@ public:
void retranslateUi(QWidget *CSMSGui) void retranslateUi(QWidget *CSMSGui)
{ {
CSMSGui->setWindowTitle(QApplication::translate("CSMSGui", "Form", 0)); CSMSGui->setWindowTitle(QApplication::translate("CSMSGui", "Form", 0));
mSMSSendBtn->setText(QApplication::translate("CSMSGui", "Send", 0));
mSMSMessageStatsLabel->setText(QApplication::translate("CSMSGui", "TextLabel", 0));
mContactPic->setText(QApplication::translate("CSMSGui", "TextLabel", 0)); mContactPic->setText(QApplication::translate("CSMSGui", "TextLabel", 0));
mContactName->setText(QApplication::translate("CSMSGui", "TextLabel", 0)); mContactName->setText(QApplication::translate("CSMSGui", "TextLabel", 0));
mSMSSendBtn->setText(QApplication::translate("CSMSGui", "Send", 0));
mSMSMessageStatsLabel->setText(QApplication::translate("CSMSGui", "TextLabel", 0));
} // retranslateUi } // retranslateUi
}; };