Added mockup-like buttons

ui/callButton/callButton.css

@@ -0,0 +1,68 @@
+QPushButton#green
+{
+    background-color: transparent;
+    background-image: url("ui/callButton/callButton.png");
+    background-repeat: none;    
+    border: none;
+    width: 50px;
+    height: 40px;
+}
+
+QPushButton#green:hover
+{
+   background-image: url("ui/callButton/callButtonHover.png");
+}
+
+QPushButton#green:pressed
+{
+   background-image: url("ui/callButton/callButtonPressed.png");
+}
+
+QPushButton#red
+{
+    background-color: transparent;
+    background-image: url("ui/callButton/callButtonRed.png");
+    background-repeat: none;    
+    border: none;
+    width: 50px;
+    height: 40px;
+}
+QPushButton#red:hover
+{
+   background-image: url("ui/callButton/callButtonRedHover.png");
+}
+
+QPushButton#red:pressed
+{
+   background-image: url("ui/callButton/callButtonRedPressed.png");
+}
+
+QPushButton#yellow
+{
+    background-color: transparent;
+    background-image: url("ui/callButton/callButtonYellow.png");
+    background-repeat: none;    
+    border: none;
+    width: 50px;
+    height: 40px;
+}
+QPushButton#yellow:hover
+{
+   background-image: url("ui/callButton/callButtonYellowHover.png");
+}
+
+QPushButton#yellow:pressed
+{
+   background-image: url("ui/callButton/callButtonYellowPressed.png");
+}
+
+QPushButton#grey
+{
+    background-color: transparent;
+    background-image: url("ui/callButton/callButtonDisabled.png");
+    background-repeat: none;    
+    border: none;
+    width: 50px;
+    height: 40px;
+}
+

ui/emoteButton/emoteButton.css

@@ -0,0 +1,18 @@
+QPushButton
+{
+    background-color: transparent;
+    background-image: url("ui/emoteButton/emoteButton.png");
+    background-repeat: none;    
+    border: none;
+    width: 24px;
+    height: 24px;
+}
+QPushButton:hover
+{
+   background-image: url("ui/emoteButton/emoteButtonHover.png");
+}
+
+QPushButton:pressed
+{
+   background-image: url("ui/emoteButton/emoteButtonPressed.png");
+}

ui/fileButton/fileButton.css

@@ -0,0 +1,18 @@
+QPushButton
+{
+    background-color: transparent;
+    background-image: url("ui/fileButton/fileButton.png");
+    background-repeat: none;    
+    border: none;
+    width: 24px;
+    height: 24px;
+}
+QPushButton:hover
+{
+   background-image: url("ui/fileButton/fileButtonHover.png");
+}
+
+QPushButton:pressed
+{
+   background-image: url("ui/fileButton/fileButtonPressed.png");
+}

ui/sendButton/sendButton.css

@@ -0,0 +1,18 @@
+QPushButton
+{
+    background-color: transparent;
+    background-image: url("ui/sendButton/sendButton.png");
+    background-repeat: none;    
+    border: none;
+    width: 50px;
+    height: 50px;
+}
+QPushButton:hover
+{
+   background-image: url("ui/sendButton/sendButtonHover.png");
+}
+
+QPushButton:pressed
+{
+   background-image: url("ui/sendButton/sendButtonPressed.png");
+}

widget/form/chatform.cpp

@@ -38,32 +38,58 @@ ChatForm::ChatForm(Friend* chatFriend)
     footButtonsSmall->setSpacing(2);
 
     msgEdit->setFixedHeight(50);
+
+    QString sendButtonStylesheet = "";
+    try
+    {
+        QFile f("ui/sendButton/sendButton.css");
+        f.open(QFile::ReadOnly | QFile::Text);
+        QTextStream sendButtonStylesheetStream(&f);
+        sendButtonStylesheet = sendButtonStylesheetStream.readAll();
+    }
+    catch (int e) {}
+    sendButton->setStyleSheet(sendButtonStylesheet);
+
     QPalette toxgreen;
     toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
-    sendButton->setIcon(QIcon("img/button icons/sendmessage_2x.png"));
+
-    sendButton->setFlat(true);
+
-    sendButton->setPalette(toxgreen);
+    QString fileButtonStylesheet = "";
-    sendButton->setAutoFillBackground(true);
+    try
-    sendButton->setFixedSize(50, 50);
+    {
-    sendButton->setIconSize(QSize(32,32));
+        QFile f("ui/fileButton/fileButton.css");
-    fileButton->setIcon(QIcon("img/button icons/attach_2x.png"));
+        f.open(QFile::ReadOnly | QFile::Text);
-    fileButton->setFlat(true);
+        QTextStream fileButtonStylesheetStream(&f);
-    fileButton->setPalette(toxgreen);
+        fileButtonStylesheet = fileButtonStylesheetStream.readAll();
-    fileButton->setAutoFillBackground(true);
+    }
-    fileButton->setIconSize(QSize(16,16));
+    catch (int e) {}
-    fileButton->setFixedSize(24,24);
+    fileButton->setStyleSheet(fileButtonStylesheet);
-    emoteButton->setIcon(QIcon("img/button icons/emoticon_2x.png"));
+
-    emoteButton->setFlat(true);
+
-    emoteButton->setPalette(toxgreen);
+    QString emoteButtonStylesheet = "";
-    emoteButton->setAutoFillBackground(true);
+    try
-    emoteButton->setIconSize(QSize(16,16));
+    {
-    emoteButton->setFixedSize(24,24);
+        QFile f("ui/emoteButton/emoteButton.css");
-    callButton->setIcon(QIcon("img/button icons/call_2x.png"));
+        f.open(QFile::ReadOnly | QFile::Text);
-    callButton->setFlat(true);
+        QTextStream emoteButtonStylesheetStream(&f);
-    callButton->setPalette(toxgreen);
+        emoteButtonStylesheet = emoteButtonStylesheetStream.readAll();
-    callButton->setAutoFillBackground(true);
+    }
-    callButton->setIconSize(QSize(25,25));
+    catch (int e) {}
-    callButton->setFixedSize(50,40);
+    emoteButton->setStyleSheet(emoteButtonStylesheet);
+
+    QString callButtonStylesheet = "";
+    try
+    {
+        QFile f("ui/callButton/callButton.css");
+        f.open(QFile::ReadOnly | QFile::Text);
+        QTextStream callButtonStylesheetStream(&f);
+        callButtonStylesheet = callButtonStylesheetStream.readAll();
+    }
+    catch (int e) {}
+    callButton->setObjectName("green");
+    callButton->setStyleSheet(callButtonStylesheet);
+
+
 
     main->setLayout(mainLayout);
     mainLayout->addWidget(chatArea);
@@ -290,9 +316,8 @@ void ChatForm::onAvInvite(int FriendId, int CallId)
     if (FriendId != f->friendId)
         return;
     callId = CallId;
-    QPalette callinvitePal;
+    callButton->setObjectName("yellow");
-    callinvitePal.setColor(QPalette::Button, QColor(206, 191, 69)); // Call invite orange
+    callButton->style()->polish(callButton);
-    callButton->setPalette(callinvitePal);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onAnswerCallTriggered()));
 }
@@ -302,9 +327,8 @@ void ChatForm::onAvStart(int FriendId, int CallId)
     if (FriendId != f->friendId)
         return;
     callId = CallId;
-    QPalette toxred;
+    callButton->setObjectName("red");
-    toxred.setColor(QPalette::Button, QColor(200,78,78)); // Tox Red
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxred);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onHangupCallTriggered()));
 }
@@ -313,9 +337,8 @@ void ChatForm::onAvCancel(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxgreen;
+    callButton->setObjectName("red");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
 }
@@ -324,9 +347,8 @@ void ChatForm::onAvEnd(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxgreen;
+    callButton->setObjectName("green");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
 }
@@ -336,9 +358,8 @@ void ChatForm::onAvRinging(int FriendId, int CallId)
     if (FriendId != f->friendId)
         return;
     callId = CallId;
-    QPalette pal;
+    callButton->setObjectName("grey");
-    pal.setColor(QPalette::Button, Qt::gray); // Call ringing grey
+    callButton->style()->polish(callButton);
-    callButton->setPalette(pal);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCancelCallTriggered()));
 }
@@ -347,9 +368,8 @@ void ChatForm::onAvStarting(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxred;
+    callButton->setObjectName("red");
-    toxred.setColor(QPalette::Button, QColor(200,78,78)); // Tox Red
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxred);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onHangupCallTriggered()));
 }
@@ -358,9 +378,8 @@ void ChatForm::onAvEnding(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxgreen;
+    callButton->setObjectName("green");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
 }
@@ -369,9 +388,8 @@ void ChatForm::onAvRequestTimeout(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxgreen;
+    callButton->setObjectName("green");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
 }
@@ -380,9 +398,8 @@ void ChatForm::onAvPeerTimeout(int FriendId, int)
 {
     if (FriendId != f->friendId)
         return;
-    QPalette toxgreen;
+    callButton->setObjectName("green");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
 }
@@ -405,9 +422,8 @@ void ChatForm::onCallTriggered()
 
 void ChatForm::onCancelCallTriggered()
 {
-    QPalette toxgreen;
+    callButton->setObjectName("green");
-    toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green
+    callButton->style()->polish(callButton);
-    callButton->setPalette(toxgreen);
     callButton->disconnect();
     connect(callButton, SIGNAL(clicked()), this, SLOT(onCallTriggered()));
     emit cancelCall(callId, f->friendId);