diff --git a/src/images/accept.png b/src/images/accept.png index 5612f26..5b0fba6 100755 Binary files a/src/images/accept.png and b/src/images/accept.png differ diff --git a/src/images/call.png b/src/images/call.png new file mode 100755 index 0000000..ca7b586 Binary files /dev/null and b/src/images/call.png differ diff --git a/src/list_items.py b/src/list_items.py index e96e49b..3132a4e 100644 --- a/src/list_items.py +++ b/src/list_items.py @@ -227,7 +227,7 @@ class FileTransferItem(QtGui.QListWidget): def cancel_transfer(self, friend_number, file_number): pr = profile.Profile.get_instance() pr.cancel_transfer(friend_number, file_number) - self.setStyleSheet('QListWidget { background-color: red; }') + self.setStyleSheet('QListWidget { background-color: #B40404; }') self.cancel.setVisible(False) self.accept.setVisible(False) self.pb.setVisible(False) @@ -243,7 +243,7 @@ class FileTransferItem(QtGui.QListWidget): def update(self, state, progress): self.pb.setValue(int(progress * 100)) if state == TOX_FILE_TRANSFER_STATE['CANCELED']: - self.setStyleSheet('QListWidget { background-color: red; }') + self.setStyleSheet('QListWidget { background-color: #B40404; }') self.cancel.setVisible(False) self.accept.setVisible(False) self.pb.setVisible(False) diff --git a/src/mainscreen.py b/src/mainscreen.py index 7b268ad..9f776ec 100644 --- a/src/mainscreen.py +++ b/src/mainscreen.py @@ -190,9 +190,12 @@ class MainWindow(QtGui.QMainWindow): self.account_status.setFont(font) self.account_status.setObjectName("account_status") self.callButton = QtGui.QPushButton(Form) - self.callButton.setGeometry(QtCore.QRect(550, 30, 75, 30)) + self.callButton.setGeometry(QtCore.QRect(550, 30, 50, 50)) self.callButton.setObjectName("callButton") - self.callButton.setText(QtGui.QApplication.translate("Form", "Start call", None, QtGui.QApplication.UnicodeUTF8)) + pixmap = QtGui.QPixmap(curr_directory() + '/images/call.png') + icon = QtGui.QIcon(pixmap) + self.callButton.setIcon(icon) + self.callButton.setIconSize(QtCore.QSize(50, 50)) QtCore.QMetaObject.connectSlotsByName(Form) def setup_left_center(self, widget): diff --git a/src/profile.py b/src/profile.py index 2e727ae..b80dbfd 100644 --- a/src/profile.py +++ b/src/profile.py @@ -733,8 +733,8 @@ class Profile(Contact, Singleton): friend = self.get_friend_by_number(friend_number) if settings['allow_auto_accept'] and friend.tox_id in settings['auto_accept_from_friends']: path = settings['auto_accept_path'] or curr_directory() - self.accept_transfer(path + '/' + file_name.decode('utf-8'), friend_number, file_number) - self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, False) + item = self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, False) + self.accept_transfer(item, path + '/' + file_name.decode('utf-8'), friend_number, file_number) else: self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, True) @@ -743,6 +743,8 @@ class Profile(Contact, Singleton): tr = self._file_transfers[(friend_number, file_number)] tr.cancel() del self._file_transfers[(friend_number, file_number)] + else: + self._tox.file_control(friend_number, file_number, TOX_FILE_CONTROL['CANCEL']) def accept_transfer(self, item, path, friend_number, file_number, size): rt = ReceiveTransfer(path, self._tox, friend_number, size, file_number) diff --git a/src/styles/style.qss b/src/styles/style.qss index 8f9a577..f40befb 100644 --- a/src/styles/style.qss +++ b/src/styles/style.qss @@ -1244,4 +1244,5 @@ MessageEdit:hover QListWidget QPushButton { background-color: transparent; + border: none; } \ No newline at end of file