Stop showing color mode if startupscreen is disabled. Stop cropping left column in ansi export. Show theme as "default" if notheme is set.

Author: cmang

README.md

@@ -5,7 +5,7 @@ Durdraw
                 _|  |__ __ _____ __|  |_____ _____ __ __ __
                / _  |  |  |   __|  _  |   __|  _  |  |  |  |\
               /_____|_____|__|__|_____|__|___\____|________| | 
-              \_____________________________________________\|  v 0.21.0
+              \_____________________________________________\|  v 0.21.1
 
 
 ![Durdraw-0 20-demo](https://github.com/cmang/durdraw/assets/261501/ce539865-2e84-4423-92af-cd9ddeeb02ce)

durdraw/durdraw_appstate.py

@@ -13,6 +13,7 @@ class AppState():
     """ run-time app state, separate from movie options (Options()) """
     def __init__(self): # User friendly defeaults
         self.quickStart = False
+        self.showStartupScreen = True
         self.curOpenFileName = ""
         self.colorMode = "256"  # or 16, or possibly "none" or "true" or "rgb" (24 bit rgb "truecolor")
         self.totalFgColors = "128"
@@ -48,12 +49,11 @@ def __init__(self): # User friendly defeaults
         self.durhelp16_fullpath = None
         self.durhelp16_page2_fullpath = None
         self.showBgColorPicker = False  # until BG colors work in 256 color mode. (ncurses 5 color pair limits)
-
         # This doesn't work yet (color pairs past 256 colors. They set, but the background color doesn't get set.
         #if sys.version_info >= (3, 10):
         #    if curses.has_extended_color_support(): # Requires Ncures 6
         #        self.showBgColorPicker = True   # until BG colors work in 256 color mode. (ncurses 5 color pair limits)
-
+        self.topLine = 0    # the top line visible on the screen, used in refresh() for scrolling
         self.drawBorders = True
         self.durFileVer = 0     # gets set in main() from DUR_FILE_VER
         self.themesEnabled = True

durdraw/durdraw_ui_curses.py

@@ -83,7 +83,7 @@ def __init__(self, app):
             #time.sleep(2)
         if self.appState.colorMode == "16":
             self.ansi.initColorPairs_cga()
-        if not app.quickStart:
+        if not app.quickStart and app.showStartupScreen:
             print(f"Color mode: {self.appState.colorMode}")
             time.sleep(2)
         #if self.appState.colorMode == "16":
@@ -2513,7 +2513,8 @@ def saveAnsiFile(self, filename, lastLineNum=False, lastColNum=False, firstColNu
         if not lastColNum:
             lastColNum = self.findFrameLastCol(self.mov.currentFrame)
         if not firstColNum:
-            firstColNum = self.findFrameFirstCol(self.mov.currentFrame)
+            #firstColNum = self.findFrameFirstCol(self.mov.currentFrame)
+            firstColNum = 0 # Don't crop leftmost blank columns
         if not firstLineNum:
             firstLineNum = self.findFrameFirstLine(self.mov.currentFrame)
         #for lineNum in range(0, lastLineNum):  # y == lines
@@ -2797,7 +2798,8 @@ def hardRefresh(self):
 
     def refresh(self):          # rename to redraw()?
         """Refresh the screen"""
-        linenum = 0
+        #linenum = 0
+        linenum = self.appState.topLine
         if self.appState.playingHelpScreen_2:
             mov = self.appState.helpMov_2
         elif self.appState.playingHelpScreen:

durdraw/main.py

@@ -26,7 +26,7 @@ def undosize(size_s):
             raise argparse.ArgumentTypeError("Undo size must be between 1 and 1000.")
 
 def main():
-    DUR_VER = '0.21.0'
+    DUR_VER = '0.21.1'
     DUR_FILE_VER = 7
     DEBUG_MODE = False # debug = makes debug_write available, sends more notifications
     durlogo = '''
@@ -82,7 +82,7 @@ def main():
         app.setDebug(True)
     if args.undosize: 
         app.undoHistorySize = int(args.undosize[0])
-    showStartupScreen=True
+    app.showStartupScreen=True
 
 
     term_size = os.get_terminal_size()
@@ -102,9 +102,9 @@ def main():
         if term_size[1] > 24:
             app.height = term_size[1] - 2
     if args.play:
-        showStartupScreen=False
+        app.showStartupScreen=False
     elif args.quick:
-        showStartupScreen=False
+        app.showStartupScreen=False
         app.quickStart = True
     if args.nomouse:
         app.hasMouse = False
@@ -155,7 +155,7 @@ def main():
         durhelp_fullpath = 'durdraw/help/durhelp.dur'
         app.loadHelpFile(durhelp_fullpath)
 
-    if showStartupScreen:
+    if app.showStartupScreen:
         print(durlogo)
         if app.hasHelpFile:
             print(f"Help file: Found in {durhelp_fullpath}")
@@ -178,7 +178,10 @@ def main():
         else:
             print(f"Configuration file not found.")
 
-        print(f"Theme: {app.themeName}")
+        if app.themesEnabled:
+            print(f"Theme: {app.themeName}")
+        else:
+            print(f"Theme: Default (none)")
 
         print("Undo history size = %d" % app.undoHistorySize)
         if app.width == 80 and app.height == 24:

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='durdraw',
-    version='0.21.0',
+    version='0.21.1',
     author='Sam Foster',
     author_email='samfoster@gmail.com',
     description='Animated Color ASCII and Unicode Art Editor',