statuses fixed. events added.

toxygen/ui/items_factory.py

@@ -13,10 +13,6 @@ class ItemsFactory:
         self._friends_list = main_screen.friends_list
         self._message_edit = main_screen.messageEdit
 
-    def _create_message_browser(self, text, width, message_type, parent=None):
-        return MessageBrowser(self._settings, self._message_edit, self._smiley_loader, self._plugin_loader,
-                              text, width, message_type, parent)
-
     def friend_item(self):
         item = ContactItem(self._settings)
         elem = QtWidgets.QListWidgetItem(self._friends_list)
@@ -75,3 +71,7 @@ class ItemsFactory:
             self._messages.insertItem(0, elem)
         self._messages.setItemWidget(elem, item)
         return item
+
+    def _create_message_browser(self, text, width, message_type, parent=None):
+        return MessageBrowser(self._settings, self._message_edit, self._smiley_loader, self._plugin_loader,
+                              text, width, message_type, parent)

toxygen/ui/list_items.py

@@ -71,7 +71,7 @@ class StatusCircle(QtWidgets.QWidget):
             self.label.setGeometry(QtCore.QRect(0, 0, 32, 32))
         else:
             self.label.setGeometry(QtCore.QRect(2, 0, 32, 32))
-        pixmap = QtGui.QPixmap(curr_directory() + '/images/{}.png'.format(name))
+        pixmap = QtGui.QPixmap(join_path(get_images_directory(), '{}.png'.format(name)))
         self.label.setPixmap(pixmap)
 
 
@@ -121,6 +121,7 @@ class FileTransferItem(QtWidgets.QListWidget):
         self.name.setGeometry(QtCore.QRect(3, 7, 95, 25))
         self.name.setTextFormat(QtCore.Qt.PlainText)
         font = QtGui.QFont()
+        # FIXME
         font.setFamily(settings.Settings.get_instance()['font'])
         font.setPointSize(11)
         font.setBold(True)
@@ -281,7 +282,7 @@ class UnsentFileItem(FileTransferItem):
                                              TOX_FILE_TRANSFER_STATE['PAUSED_BY_FRIEND'], width, parent)
         self._time = time
         self.pb.setVisible(False)
-        movie = QtGui.QMovie(curr_directory() + '/images/spinner.gif')
+        movie = QtGui.QMovie(join_path(get_images_directory(), 'spinner.gif'))
         self.time.setMovie(movie)
         movie.start()
 
@@ -331,6 +332,7 @@ class InlineImageItem(QtWidgets.QScrollArea):
             self._full_size = not self._full_size
             self._elem.setSizeHint(QtCore.QSize(self.width(), self.height()))
         elif event.button() == QtCore.Qt.RightButton:  # save inline
+            # TODO: dialog
             directory = QtWidgets.QFileDialog.getExistingDirectory(self,
                                                                    QtWidgets.QApplication.translate("MainWindow",
                                                                                                     'Choose folder'),

toxygen/ui/main_screen.py

@@ -444,7 +444,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def create_gc(self):
         self.profile.create_group_chat()
 
-    def profile_settings(self):
+    def profile_settings(self, *args):
         self._modal_window = self._widget_factory.create_profile_settings_window()
         self._modal_window.show()
 

toxygen/ui/menu.py

@@ -84,9 +84,10 @@ class AddContact(CenteredWidget):
 
 class ProfileSettings(CenteredWidget):
     """Form with profile settings such as name, status, TOX ID"""
-    def __init__(self, profile, settings, toxes):
+    def __init__(self, profile, profile_manager, settings, toxes):
         super().__init__()
         self._profile = profile
+        self._profile_manager = profile_manager
         self._settings = settings
         self._toxes = toxes
         self.initUI()
@@ -166,7 +167,7 @@ class ProfileSettings(CenteredWidget):
         self.default = QtWidgets.QPushButton(self)
         self.default.setGeometry(QtCore.QRect(40, 550, 620, 30))
         auto_profile = Settings.get_auto_profile()
-        self.auto = path + name == ProfileManager.get_path() + Settings.get_instance().name
+        # self.auto = path + name == ProfileManager.get_path() + Settings.get_instance().name
         self.default.clicked.connect(self.auto_profile)
         self.retranslateUi()
         if self._profile.status is not None:
@@ -243,7 +244,7 @@ class ProfileSettings(CenteredWidget):
         self.copy_pk.setIconSize(QtCore.QSize(10, 10))
 
     def new_no_spam(self):
-        self.tox_id.setText(Profile.get_instance().new_nospam())
+        self.tox_id.setText(self._profile.new_nospam())
 
     def reset_avatar(self):
         self._profile.reset_avatar()

toxygen/ui/widgets_factory.py

@@ -4,10 +4,11 @@ from ui.menu import *
 
 class WidgetsFactory:
 
-    def __init__(self, settings, profile, contacts_manager, file_transfer_handler, smiley_loader, plugin_loader,
-                 toxes, version):
+    def __init__(self, settings, profile, profile_manager, contacts_manager, file_transfer_handler, smiley_loader,
+                 plugin_loader, toxes, version):
         self._settings = settings
         self._profile = profile
+        self._profile_manager = profile_manager
         self._contacts_manager = contacts_manager
         self._file_transfer_handler = file_transfer_handler
         self._smiley_loader = smiley_loader
@@ -25,7 +26,7 @@ class WidgetsFactory:
         return WelcomeScreen(self._settings)
 
     def create_profile_settings_window(self):
-        return ProfileSettings(self._profile, self._settings, self._toxes)
+        return ProfileSettings(self._profile, self._profile_manager,  self._settings, self._toxes)
 
     def create_network_settings_window(self):
         return NetworkSettings(self._settings, self._profile.reset)