Reloading in duplicated, Marked files are loaded, various bug fixes

- Made font more unified and smaller
- Files can now be marked in all windows
- Marked files are transferred from the search window to a save searched and to a compare or duplicated session
- Made buttons in save/compare/duplicate right-clickable and moved them to FF_Menubar.py
- Added a seconds need text to compare
- Fixed bug in duplicated where one singe duplicated file wouldn't show up
- Clicking on menu bar icon now shows file find on windows
- If left unchanged creation and modification time edits now update time at midnight
- Reloading is now possible in duplicated
- Fixed typo in README.md
- On Windows File Find now closes after last window was closed

Author: Pixel-Master

FF_About_UI.py

@@ -79,7 +79,7 @@ def setup(parent):
         version_label = QLabel(about_window)
         # Font and Text
         version_label.setText(f"v. {FF_Files.VERSION_SHORT} ({FF_Files.VERSION})")
-        version_label.setFont(QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE))
+        version_label.setFont(FF_Additional_UI.DEFAULT_QT_FONT)
         # The command and tooltip
         version_label.setToolTip(f"Version: {FF_Files.VERSION_SHORT} Extended Version: {FF_Files.VERSION}")
         # Display the Label
@@ -90,7 +90,7 @@ def setup(parent):
         # Font and Text
         author_label.setText(
             "Created by Pixel Master, Copyright © 2022–2025 Pixel Master.\nLicensed under the GNU GPLv3")
-        author_label.setFont(QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE))
+        author_label.setFont(FF_Additional_UI.DEFAULT_QT_FONT)
         # The command and tooltip
         author_label.setToolTip(f"Version: {FF_Files.VERSION_SHORT} Extended Version: {FF_Files.VERSION}")
         # Display the Label
@@ -102,7 +102,7 @@ def generate_link_button(displayed_text, domain):
             link = QPushButton(about_window)
             # Font and Text
             link.setText(displayed_text)
-            font = QFont(FF_Files.DEFAULT_FONT, FF_Files.NORMAL_FONT_SIZE)
+            font = QFont(FF_Files.DEFAULT_FONT, FF_Files.DEFAULT_FONT_SIZE)
             font.setUnderline(True)
             link.setFont(font)
             # The command and tooltip

FF_Additional_UI.py

@@ -30,7 +30,9 @@
 # keeping a list of all created icons
 icons = set()
 global app, global_color_scheme
-
+DEFAULT_QT_FONT = QFont(FF_Files.DEFAULT_FONT, FF_Files.DEFAULT_FONT_SIZE)
+BOLD_QT_FONT = QFont(FF_Files.DEFAULT_FONT, FF_Files.DEFAULT_FONT_SIZE)
+BOLD_QT_FONT.setBold(True)
 
 # Used for entering the directory
 class DirectoryEntry(QLineEdit):
@@ -341,11 +343,11 @@ def determine_text(self):
             return "none"
 
         # less than four items selected, display all checked items
-        elif len(all_checked_items) <= 3:
+        elif len(all_checked_items) < 4:
             return ", ".join(all_checked_items)
 
-        # less than two item unchecked, display all unchecked ones
-        elif (len(all_items) - len(all_checked_items)) <= 2:
+        # less than three item unchecked, display all unchecked ones
+        elif (len(all_items) - len(all_checked_items)) < 3:
             all_unchecked_items = []
             for item in all_items:
                 if item not in all_checked_items:
@@ -415,10 +417,7 @@ def show_info_messagebox(title, text, parent, large=False):
             # Title
             title_label = QLabel(msg_info)
             title_label.setText(title)
-            # Set font size
-            font = QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE)
-            font.setBold(True)
-            title_label.setFont(font)
+            title_label.setFont(BOLD_QT_FONT)
             # Display
             layout.addWidget(title_label)
 
@@ -433,7 +432,7 @@ def show_info_messagebox(title, text, parent, large=False):
             msg_info.setWindowTitle(title)
             msg_info.show()
 
-            FF_Menubar.MenuBar(parent=msg_info, window="info_box", listbox=None)
+            FF_Menubar.MenuBar(parent=msg_info, window="info_box")
 
             # Return the Value of the Message Box
             return msg_info
@@ -535,6 +534,12 @@ def welcome_popups(parent, force_popups=False):
                  f"{FF_Files.VERSION_SHORT} [{FF_Files.VERSION}]",
             parent=parent)
 
+        # Resetting time since last notice
+        popup_dict["last_update_notice"] = time()
+
+        # Debug
+        logging.debug(f"Reset time since last_update_notice to {ctime(popup_dict['last_update_notice'])}")
+
     # If last update notice is older than 40 weeks, inform about possibility of a new update
     # time() returns time since the epoch in seconds
     elif popup_dict["last_update_notice"] < (time() - (FF_Files.SECONDS_OF_A_WEEK * 40)):

FF_Compare.py

@@ -16,10 +16,10 @@
 import gc
 
 # PySide6 Gui Imports
-from PySide6.QtGui import QFont, Qt
-from PySide6.QtCore import QObject, Signal, QThreadPool, QSize
+from PySide6.QtGui import Qt
+from PySide6.QtCore import QObject, Signal, QThreadPool
 from PySide6.QtWidgets import (
-    QMainWindow, QFileDialog, QListWidget, QLabel, QPushButton, QWidget, QGridLayout, QHBoxLayout, QScrollArea,
+    QMainWindow, QFileDialog, QListWidget, QLabel, QWidget, QGridLayout, QHBoxLayout, QScrollArea,
     QSpacerItem, QSizePolicy)
 
 # Projects Libraries
@@ -32,7 +32,7 @@
 
 # The window
 class CompareUi:
-    def __init__(self, path_of_first_search, cache_file, parent):
+    def __init__(self, path_of_first_search, cache_file, to_be_marked_files, parent):
         # Debug
         logging.info("Setting up the Compare_Window")
         # Saving time
@@ -76,8 +76,9 @@ def __init__(self, path_of_first_search, cache_file, parent):
         self.Compare_Layout.addLayout(self.Bottom_Layout, 11, 0, 1, 2)
 
         # Setting up the menu bar...
-        menu_bar = FF_Menubar.MenuBar(parent=self.Compare_Window, window="compare",
-                                      listbox=None, cache_file_path=cache_file)
+        menu_bar = FF_Menubar.MenuBar(parent=self.Compare_Window, window="compare", search_path=path_of_first_search,
+                                      search_path2=compared_searches.path_of_second_search[0],
+                                      cache_file_path=cache_file, bottom_layout=self.Bottom_Layout)
         logging.debug("Done building MenuBar\n")
 
         # Set up both list-boxes
@@ -190,26 +191,10 @@ def __init__(self, path_of_first_search, cache_file, parent):
         self.Compare_Layout.addWidget(self.removed_files_label1, 1, 1)
         self.Compare_Layout.addWidget(self.removed_files_label2, 2, 1)
 
-        # Buttons
-        # Button to open the File in Finder
-        move_file = self.generate_button("Move / Rename", menu_bar.move_file,
-                                         icon=os.path.join(FF_Files.ASSETS_FOLDER, "Move_icon_small.png"))
-        self.Bottom_Layout.addWidget(move_file)
-
-        # Button to move the file to trash
-        delete_file = self.generate_button("Move to Trash", menu_bar.delete_file,
-                                           icon=os.path.join(FF_Files.ASSETS_FOLDER, "Trash_icon_small.png"))
-        self.Bottom_Layout.addWidget(delete_file)
-
-        # Button to open the file
-        open_file = self.generate_button("Open", menu_bar.open_file,
-                                         icon=os.path.join(FF_Files.ASSETS_FOLDER, "Open_icon_small.png"))
-        self.Bottom_Layout.addWidget(open_file)
-
-        # Button to show info about the file
-        file_info_button = self.generate_button("Info", menu_bar.file_info,
-                                                icon=os.path.join(FF_Files.ASSETS_FOLDER, "Info_button_img_small.png"))
-        self.Bottom_Layout.addWidget(file_info_button)
+        # Mark the files that need to be marked, reference the two listbox widgets to the menu bar
+        menu_bar.listbox = self.added_files_listbox
+        menu_bar.listbox2 = self.removed_files_listbox
+        menu_bar.mark_marked_files(to_be_marked_files)
 
         # Update search status label
         FF_Search.ACTIVE_SEARCH_THREADS -= 1
@@ -230,10 +215,6 @@ def __init__(self, path_of_first_search, cache_file, parent):
 
         time_stamp = time()
 
-        # Setting a Font
-        small_text_font = QFont(FF_Files.DEFAULT_FONT, FF_Files.NORMAL_FONT_SIZE)
-        small_text_font.setBold(True)
-
         # Top Layout
         self.Top_Layout = QHBoxLayout()
         self.Top_Layout.setContentsMargins(0, 0, 0, 0)
@@ -243,14 +224,14 @@ def __init__(self, path_of_first_search, cache_file, parent):
         time_text = QLabel(self.Compare_Window)
         total_time = compared_searches.time_dict["time_after_building_ui"] - compared_searches.time_dict["start_time"]
         time_text.setText(f"Time needed: {round(total_time, 3)}s")
-        time_text.setFont(small_text_font)
+        time_text.setFont(FF_Additional_UI.BOLD_QT_FONT)
         # Displaying
         self.Top_Layout.addWidget(time_text)
 
         # Saving time
         # Time stat Button
-        show_time = self.generate_button(None, lambda: show_time_stats(),
-                                         icon=os.path.join(FF_Files.ASSETS_FOLDER, "Time_button_img_small.png"))
+        show_time = menu_bar.generate_button(None, lambda: show_time_stats(),
+                                             icon=os.path.join(FF_Files.ASSETS_FOLDER, "Time_button_img_small.png"))
         # Resize
         show_time.setMaximumSize(50, 50)
         # Add to Layout
@@ -295,32 +276,12 @@ def show_time_stats():
         # Collect garbage
         gc.collect()
 
-    # Functions to automate Button
-    def generate_button(self, text, command, icon=None):
-        # Define the Button
-        button = QPushButton(self.Compare_Window)
-        # Change the Text
-        button.setText(text)
-        # Set the command
-        button.clicked.connect(command)
-        # Set the icon
-        if icon is not None:
-            FF_Additional_UI.UIIcon(icon, button.setIcon)
-            button.setIconSize(QSize(23, 22))
-        # Return the value of the Button, to move the Button
-        return button
-
     # Function for generating the added / removed files labels
     def generate_title_label(self, text, text2, light_color, dark_color, length_of_list) -> tuple[QLabel, QLabel]:
         # Label 1
         label1 = FF_Additional_UI.ColoredLabel(text, self.Compare_Window, light_color, dark_color)
-
-        # Defining the font
-        font1 = QFont(FF_Files.DEFAULT_FONT, FF_Files.NORMAL_FONT_SIZE)
-        font1.setBold(True)
-        label1.setFont(font1)
-
-        label1.setFixedHeight(FF_Files.NORMAL_FONT_SIZE + 2)
+        label1.setFont(FF_Additional_UI.BOLD_QT_FONT)
+        label1.setFixedHeight(FF_Files.DEFAULT_FONT_SIZE + 2)
         label1.adjustSize()
 
         # Label 2
@@ -334,19 +295,17 @@ def generate_title_label(self, text, text2, light_color, dark_color, length_of_l
         # Set the label to the shortened string
         label2.setText(text2_shortened)
 
-        # Defining the font
-        font2 = QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE)
         # Configure the font
-        label2.setFont(font2)
+        label2.setFont(FF_Additional_UI.DEFAULT_QT_FONT)
         # Times two because it is two lines and plus two for some extra space
-        label2.setFixedHeight(FF_Files.SMALLER_FONT_SIZE * 2 + 10)
+        label2.setFixedHeight(FF_Files.DEFAULT_FONT_SIZE * 2 + 10)
 
         return label1, label2
 
 
 # The engine
 class CompareSearches:
-    def __init__(self, files_of_first_search: list, path_of_first_search, cache_file, parent):
+    def __init__(self, files_of_first_search: list, path_of_first_search, cache_file, to_be_marked_files, parent):
         # Debug
         logging.debug("User pressed Compare Search")
 
@@ -357,7 +316,8 @@ class SignalsClass(QObject):
 
             self.signals = SignalsClass()
             # Connecting the signal to the user-interface class
-            self.signals.finished.connect(lambda: CompareUi(path_of_first_search, cache_file, parent))
+            self.signals.finished.connect(
+                lambda: CompareUi(path_of_first_search, cache_file, to_be_marked_files, parent))
 
             # Thread
             comparing_thread = QThreadPool(parent)