UI improvements. screenshots sending update

src/mainscreen.py

@@ -117,16 +117,28 @@ class MainWindow(QtGui.QMainWindow):
         self.messageEdit = MessageArea(Form, self)
         self.messageEdit.setGeometry(QtCore.QRect(0, 5, 450, 70))
         self.messageEdit.setObjectName("messageEdit")
-        self.screenshotButton = QtGui.QPushButton(Form)
+
+        class QRightClickButton(QtGui.QPushButton):
+            def __init__(self, parent):
+                super(QRightClickButton, self).__init__(parent)
+
+            def mousePressEvent(self, event):
+                if event.button() == QtCore.Qt.RightButton:
+                    self.emit(QtCore.SIGNAL("rightClicked()"))
+                else:
+                    super(QRightClickButton, self).mousePressEvent(event)
+
+        self.screenshotButton = QRightClickButton(Form)
         self.screenshotButton.setGeometry(QtCore.QRect(455, 5, 55, 70))
         self.screenshotButton.setObjectName("screenshotButton")
+
         self.fileTransferButton = QtGui.QPushButton(Form)
         self.fileTransferButton.setGeometry(QtCore.QRect(510, 5, 55, 70))
         self.fileTransferButton.setObjectName("fileTransferButton")
+
         self.sendMessageButton = QtGui.QPushButton(Form)
         self.sendMessageButton.setGeometry(QtCore.QRect(565, 5, 55, 70))
         self.sendMessageButton.setObjectName("sendMessageButton")
-        self.sendMessageButton.clicked.connect(self.send_message)
 
         pixmap = QtGui.QPixmap(curr_directory() + '/images/send.png')
         icon = QtGui.QIcon(pixmap)
@@ -135,7 +147,7 @@ class MainWindow(QtGui.QMainWindow):
         pixmap = QtGui.QPixmap(curr_directory() + '/images/file.png')
         icon = QtGui.QIcon(pixmap)
         self.fileTransferButton.setIcon(icon)
-        self.fileTransferButton.setIconSize(QtCore.QSize(55, 70))
+        self.fileTransferButton.setIconSize(QtCore.QSize(30, 45))
         pixmap = QtGui.QPixmap(curr_directory() + '/images/screenshot.png')
         icon = QtGui.QIcon(pixmap)
         self.screenshotButton.setIcon(icon)
@@ -143,6 +155,9 @@ class MainWindow(QtGui.QMainWindow):
 
         self.fileTransferButton.clicked.connect(self.send_file)
         self.screenshotButton.clicked.connect(self.send_screenshot)
+        self.sendMessageButton.clicked.connect(self.send_message)
+        self.connect(self.screenshotButton, QtCore.SIGNAL("rightClicked()"), lambda: self.send_screenshot(True))
+
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def setup_left_bottom(self, Form):
@@ -371,10 +386,12 @@ class MainWindow(QtGui.QMainWindow):
             if name[0]:
                 self.profile.send_file(name[0])
 
-    def send_screenshot(self):
+    def send_screenshot(self, hide=False):
         if self.profile.is_active_online():  # active friend exists and online
-            self.sw = ScreenShotWindow()
+            self.sw = ScreenShotWindow(self)
             self.sw.show()
+            if hide:
+                self.hide()
 
     def call(self):
         if self.profile.is_active_online():  # active friend exists and online
@@ -467,14 +484,19 @@ class MainWindow(QtGui.QMainWindow):
 
 class ScreenShotWindow(QtGui.QWidget):
 
-    def __init__(self):
+    def __init__(self, parent):
         super(ScreenShotWindow, self).__init__()
+        self.parent = parent
         self.setMouseTracking(True)
         self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint | QtCore.Qt.WindowStaysOnTopHint)
         self.showFullScreen()
         self.setWindowOpacity(0.5)
         self.rubberband = QtGui.QRubberBand(QtGui.QRubberBand.Rectangle, None)
 
+    def closeEvent(self, *args):
+        if self.parent.isHidden():
+            self.parent.show()
+
     def mousePressEvent(self, event):
         self.origin = event.pos()
         self.rubberband.setGeometry(QtCore.QRect(self.origin, QtCore.QSize()))
@@ -495,6 +517,7 @@ class ScreenShotWindow(QtGui.QWidget):
             self.rubberband.hide()
             rect = self.rubberband.geometry()
             print rect
+            if rect.width() and rect.height():
                 p = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop().winId(),
                                              rect.x() + 4,
                                              rect.y() + 4,

src/menu.py

@@ -2,7 +2,7 @@ from PySide import QtCore, QtGui
 from settings import *
 from profile import Profile
 from util import get_style, curr_directory
-from widgets import CenteredWidget
+from widgets import CenteredWidget, DataLabel
 import pyaudio
 
 
@@ -26,17 +26,12 @@ class AddContact(CenteredWidget):
         self.tox_id.setGeometry(QtCore.QRect(50, 40, 471, 27))
         self.tox_id.setObjectName("lineEdit")
         self.label = QtGui.QLabel(self)
-        self.label.setGeometry(QtCore.QRect(30, 10, 80, 20))
+        self.label.setGeometry(QtCore.QRect(50, 10, 80, 20))
-        self.error_label = QtGui.QLabel(self)
+        self.error_label = DataLabel(self)
-        self.error_label.setGeometry(QtCore.QRect(120, 10, 400, 20))
+        self.error_label.setGeometry(QtCore.QRect(120, 10, 420, 20))
         font = QtGui.QFont()
-        font.setPointSize(16)
+        font.setPointSize(10)
-        font.setWeight(75)
+        font.setWeight(30)
-        font.setBold(True)
-        self.label.setFont(font)
-        font.setPointSize(12)
-        font.setBold(False)
-        font.setWeight(40)
         self.error_label.setFont(font)
         self.error_label.setStyleSheet("QLabel { color: red; }")
         self.label.setObjectName("label")
@@ -48,6 +43,7 @@ class AddContact(CenteredWidget):
         self.label_2.setFont(font)
         self.label_2.setObjectName("label_2")
         self.retranslateUi()
+        self.message_edit.setText('Hello! Add me to your contact list please')
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def add_friend(self):
@@ -57,8 +53,6 @@ class AddContact(CenteredWidget):
             # request was successful
             self.close()
         else:  # print error data
-            if len(send) > 40:
-                send = send[:40] + '...'
             self.error_label.setText(send)
 
     def retranslateUi(self):

src/profile.py

@@ -796,7 +796,7 @@ class Profile(Contact, Singleton):
         :return: True on success else error string
         """
         try:
-            message = message or 'Add me to your contact list'
+            message = message or 'Hello! Add me to your contact list please'
             if '@' in tox_id:  # value like groupbot@toxme.io
                 tox_id = tox_dns(tox_id)
                 if tox_id is None: