Add files via upload

core/_init_config.py

@@ -1,9 +1,9 @@
 from PyQt5.QtCore import QByteArray
 
 def _init_config(self):        
-	if self.settings.value("app_theme") == "dark":
+	if self.settings.value("app_theme", "dark") == "dark":
 		self.actionDark_Theme.setChecked(True)
 	else:
 		self.actionDark_Theme.setChecked(False)
 
-	self.restoreState(self.settings.value('window_state', QByteArray()))
+	self.restoreState(self.settings.value('window_state', QByteArray()))

core/_init_connect.py

@@ -5,6 +5,7 @@
 def _init_connect(self):
     self.actionOpen_Image.triggered.connect(self.open_file_dialog)
     self.actionFull_Screen.triggered.connect(self.full_screen)
+    self.toolButton_3.clicked.connect(self.full_screen)
     self.actionDark_Theme.triggered.connect(self.toggle_dark_theme)
     self.actionPrevious.triggered.connect(self.previous)
     self.toolButton.clicked.connect(self.previous)

core/_init_icons.py

@@ -3,17 +3,23 @@
 def _init_icons(self):
     icons = {
         "toolButton": {
-            "normal": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme")}/arrow_back_ios.svg',
+            "normal": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme", "dark")}/arrow_back_ios.svg',
             "normal_off": None, 
             "disabled": f'{self.current_dir}/resources/icons/disabled/arrow_back_ios.svg', 
             "disabled_off": None,
         },
         "toolButton_2": {
-            "normal": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme")}/arrow_forward_ios.svg',
+            "normal": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme", "dark")}/arrow_forward_ios.svg',
             "normal_off": None, 
             "disabled": f'{self.current_dir}/resources/icons/disabled/arrow_forward_ios.svg', 
             "disabled_off": None,
         },
+        "toolButton_3": {
+            "normal": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme", "dark")}/open_in_full.svg',
+            "normal_off": f'{self.current_dir}/resources/icons/{self.settings.value("app_theme", "dark")}/close_fullscreen.svg',
+            "disabled": None, 
+            "disabled_off": None,
+        },
     }
 
     for action_name, icon_paths in icons.items():

core/main_window.py

@@ -6,8 +6,8 @@
 
 from PyQt5.QtWidgets import qApp, QMainWindow, QFileDialog, QMessageBox, \
     QListWidgetItem
-from PyQt5.QtGui import QIcon, QColor, QPixmap, QImage, QPalette
-from PyQt5.QtCore import Qt, QSize, QEvent
+from PyQt5.QtGui import QIcon, QPixmap, QImage
+from PyQt5.QtCore import Qt, QEvent
 from PyQt5 import uic
 
 from core._init_attributes import _init_attributes
@@ -129,7 +129,7 @@ def select_current_image(self):
         current_image = os.path.basename(self.image_path)
         items = self.listWidget.findItems(current_image, Qt.MatchExactly)
         for i in range(self.listWidget.count()):
-            self.listWidget.item(i).setForeground(Qt.white if self.settings.value("app_theme") == "dark" else Qt.black)
+            self.listWidget.item(i).setForeground(Qt.white if self.settings.value("app_theme", "dark") == "dark" else Qt.black)
 
         if items:
             item = items[0]
@@ -177,11 +177,13 @@ def full_screen(self):
             self.statusbar.show()
             self.showNormal()
             self.actionFull_Screen.setChecked(False)
+            self.toolButton_3.setChecked(False)
         else:
             self.menubar.hide()
             self.statusbar.hide()
             self.setWindowState(Qt.WindowFullScreen)
             self.actionFull_Screen.setChecked(True)
+            self.toolButton_3.setChecked(True)
 
     def check_for_updates(self):
         try:

core/ui/main_window.ui

@@ -136,7 +136,7 @@
     <set>QDockWidget::AllDockWidgetFeatures</set>
    </property>
    <property name="windowTitle">
-    <string>Folder Contents</string>
+    <string>Control Panel</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -215,6 +215,37 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <widget class="QToolButton" name="toolButton_3">
+         <property name="minimumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="cursor">
+          <cursorShape>PointingHandCursor</cursorShape>
+         </property>
+         <property name="toolTip">
+          <string>Full Screen</string>
+         </property>
+         <property name="statusTip">
+          <string>Switches the full screen mode.</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
     </layout>
@@ -225,7 +256,7 @@
     <string>Open Image...</string>
    </property>
    <property name="statusTip">
-    <string>After selecting the desired image, displays it in the app.</string>
+    <string>Opens the file (image) selection dialog box.</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O</string>
@@ -239,7 +270,7 @@
     <string>About...</string>
    </property>
    <property name="statusTip">
-    <string>Provides some information about this app.</string>
+    <string>Opens a dialog box with information about the app.</string>
    </property>
   </action>
   <action name="actionFull_Screen">
@@ -250,7 +281,7 @@
     <string>Full Screen</string>
    </property>
    <property name="statusTip">
-    <string>Opens the app in full screen mode.</string>
+    <string>Switches the full screen mode.</string>
    </property>
    <property name="shortcut">
     <string>F11</string>
@@ -331,7 +362,7 @@
     <string>About Qt</string>
    </property>
    <property name="statusTip">
-    <string>Provides some information about the framework used to create this app interface.</string>
+    <string>Opens a dialog box with information about the framework used to create this app's GUI.</string>
    </property>
   </action>
   <action name="actionExit">
@@ -347,7 +378,7 @@
     <string>Check for Updates</string>
    </property>
    <property name="statusTip">
-    <string>Checks if new versions of the app are publicly available.</string>
+    <string>Checks the Github repository for new versions of the app.</string>
    </property>
   </action>
   <action name="actionDark_Theme">
@@ -358,7 +389,7 @@
     <string>Dark Theme</string>
    </property>
    <property name="statusTip">
-    <string>Includes a dark app theme (requires a reboot to apply).</string>
+    <string>Switches the current app theme to dark (reboot required).</string>
    </property>
   </action>
  </widget>

main.py

@@ -7,7 +7,7 @@
 from core.main_window import MainWindow
 
 name = "DEEF Lite Image Viewer"
-version = "2.0.1"
+version = "2.0.2"
 current_dir = os.path.dirname(os.path.abspath(__file__))
 
 def set_app_palette():
@@ -39,7 +39,7 @@ def set_app_palette():
 
 if __name__ == '__main__':    
     settings = QSettings("deeffest", name)
-    app_theme = settings.value("app_theme")  
+    app_theme = settings.value("app_theme", "dark")  
 
     app = QApplication(sys.argv + (['-platform', 'windows:darkmode=1'] if app_theme == "dark" else []))
     app.setStyle("Fusion")

notes.txt

@@ -1,3 +1,3 @@
-Update 2.0.1!
-- Styles to components such as QToolTip, QMenuBar and QStatusBar have been added to the app.
+Update 2.0.2!
+- Fixed bugs related to app theme settings.
 - Other fixes and improvements.