Merge pull request #5 from adnv3k/0.3.7

0.3.7

README.md

@@ -13,7 +13,7 @@ Open Files | Ctrl + F
 Clear Selection | Ctrl + C
 Toggle Randomization | Ctrl + R
 Remove Duplicates | Ctrl + 1 (only 1 of a kind)
-Add Entry | Enter
+Add Entry | Shift + Enter
 Save Preset | Ctrl + S
 Delete Preset | Ctrl + Shift + D
 Delete Entry | D
@@ -23,14 +23,15 @@ Clear Schedule | C
 Start Session | Ctrl + Enter
 Close Window | Escape
 
-### Navigation Bar: 
+### Session Window: 
 Button | Hotkey
 ------------ | -------------
 Grayscale | G
 Flip Horizontal | H
 Flip Vertical | V
-Toggle Resizing (dynamic/static) | R
+Toggle Window Resizing (dynamic/static) | R
 Toggle Always On Top | A
+Toggle Mute | M
 Previous Image | Left Arrow Key
 Stop | Esc 
 Pause | Spacebar
@@ -43,7 +44,7 @@ Reset timer | Ctrl + Shift + Up Arrow Key
 # Note
 Current supported file types: .bmp, .jpg, .jpeg, .png. Settings are stored using the shelve module, and are saved in the folders 'presets' and 'recent' as .bak, .dat, and .dir files. These folders are saved in the same directory as Image Queuer.exe. The most recent images, randomization setting, and schedule used will be automatically loaded when reopening Image Queuer.exe. 
 
-Updates are checked every 2 days (if the app was opened), and a notice of available update will be displayed if there is one.
+Updates are checked every other day (if the app was opened), and a notice of available update will be displayed if there is one.
 
 GUI created using PyQt5
 

check_update.py

@@ -45,18 +45,18 @@ def check_allowed(self):
             f'last_checked_date: {last_checked}\n'
             f'Now: {now}'
             )
-        # If more than 1 month or 2 days
+        # If more than 1 month or 1 days
         print(
             f'Month: {int(now[1])}\n'
             f'last_checked month: {int(last_checked[1])}\n'
             f'Day: {int(now[2])}\n'
-            f'last_checked day + 2: {int(last_checked[2])+2}'
+            f'last_checked day + 1: {int(last_checked[2])+1}'
             )
-        if int(now[1]) > int(last_checked[1]) or int(now[2]) > int(last_checked[2])+2:
+        if int(now[1]) > int(last_checked[1]) or int(now[2]) > int(last_checked[2])+1:
             return True
         print(
             f'Check not allowed',
-            f'{int(last_checked[2])+2 - int(now[2])} days until allowed'
+            f'{int(last_checked[2])+1 - int(now[2])} days until allowed'
             )
         return False
 

main_window.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '.\ui\main_window.ui'
+# Form implementation generated from reading ui file '.\resources\ui\main_window.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.4
 #
@@ -86,7 +86,7 @@ def setupUi(self, MainWindow):
         font.setBold(True)
         font.setWeight(75)
         MainWindow.setFont(font)
-        MainWindow.setFocusPolicy(QtCore.Qt.NoFocus)
+        MainWindow.setFocusPolicy(QtCore.Qt.ClickFocus)
         MainWindow.setAcceptDrops(True)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(":/icons/icons/Art1Paint Net.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -563,7 +563,10 @@ def setupUi(self, MainWindow):
         font.setBold(True)
         font.setWeight(75)
         self.set_minutes.setFont(font)
+        self.set_minutes.setFocusPolicy(QtCore.Qt.WheelFocus)
+        self.set_minutes.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
         self.set_minutes.setStyleSheet("background: rgb(30,56,78); color: \'white\';")
+        self.set_minutes.setWrapping(False)
         self.set_minutes.setFrame(False)
         self.set_minutes.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.set_minutes.setKeyboardTracking(True)
@@ -577,9 +580,11 @@ def setupUi(self, MainWindow):
         font.setWeight(75)
         self.set_seconds.setFont(font)
         self.set_seconds.setFocusPolicy(QtCore.Qt.WheelFocus)
+        self.set_seconds.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
         self.set_seconds.setStyleSheet("background: rgb(30,56,78); color: \'white\';")
         self.set_seconds.setFrame(False)
         self.set_seconds.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.set_seconds.setKeyboardTracking(True)
         self.set_seconds.setMaximum(59)
         self.set_seconds.setObjectName("set_seconds")
         self.gridLayout.addWidget(self.set_seconds, 1, 4, 1, 1)
@@ -773,7 +778,7 @@ def setupUi(self, MainWindow):
         brush = QtGui.QBrush(QtGui.QColor(30, 56, 78))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Window, brush)
-        brush = QtGui.QBrush(QtGui.QColor(97, 209, 189))
+        brush = QtGui.QBrush(QtGui.QColor(68, 201, 176))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Highlight, brush)
         brush = QtGui.QBrush(QtGui.QColor(45, 85, 117))
@@ -821,8 +826,10 @@ def setupUi(self, MainWindow):
         font.setBold(True)
         font.setWeight(75)
         self.entry_table.setFont(font)
+        self.entry_table.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
         self.entry_table.setAutoFillBackground(False)
         self.entry_table.setStyleSheet("background: rgb(30,56,78); color: \'white\';")
+        self.entry_table.setInputMethodHints(QtCore.Qt.ImhDigitsOnly)
         self.entry_table.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.entry_table.setFrameShadow(QtWidgets.QFrame.Sunken)
         self.entry_table.setLineWidth(1)
@@ -850,7 +857,6 @@ def setupUi(self, MainWindow):
         font.setBold(True)
         font.setWeight(75)
         item.setFont(font)
-        item.setBackground(QtGui.QColor(68, 201, 176))
         brush = QtGui.QBrush(QtGui.QColor(0, 0, 0))
         brush.setStyle(QtCore.Qt.SolidPattern)
         item.setForeground(brush)
@@ -1075,7 +1081,8 @@ def retranslateUi(self, MainWindow):
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:13pt; color:#000000;\">Add entry to the schedule below</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:13pt; color:#000000;\">Enter</span></p></body></html>"))
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:13pt; color:#000000;\">Ctrl + A</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
         self.add_entry.setText(_translate("MainWindow", "Add"))
         self.label_8.setToolTip(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"