Merge pull request #21 from cmang/dev

Merging dev changes into minor release 0.24.1

Author: cmang

README.md

@@ -5,7 +5,7 @@ Durdraw
                 _|  |__ __ _____ __|  |_____ _____ __ __ __
                / _  |  |  |   __|  _  |   __|  _  |  |  |  |\
               /_____|_____|__|__|_____|__|___\____|________| | 
-              \_____________________________________________\|  v 0.24.0
+              \_____________________________________________\|  v 0.24.1
 
 
 ![durdraw-0 24 0-example](./assets/durdraw-0.24.0-example.gif)
@@ -353,6 +353,8 @@ Home page: http://durdraw.org
 
 Development: https://github.com/cmang/durdraw
 
+ANSI and ASCII artists: cmang, H7, LDA
+
 ### LEGAL
 
 Durdraw is Copyright (c) 2009-2023 Sam Foster <samfoster@gmail.com>. All rights reserved.

durdraw/durdraw_movie.py

@@ -203,25 +203,31 @@ def shrinkCanvasWidth(self, shrinkage):
         self.opts.sizeY = self.opts.sizeY - shrinkage 
         #self.width = self.width - shrinkage
 
+    def search_and_replace_color(self, old_color :int, new_color :int):
+        found = False
+        for frame in self.frames:
+            line_num = 0
+            for line in frame.newColorMap:
+                for pair in line:
+                    if pair[0] == old_color:
+                        frame.newColorMap[line_num][0] = new_color
+                        found = True
+                    if pair[1] == old_color:
+                        frame.newColorMap[line_num][1] = new_color
+                        found = True
+                line_num += 1
+
     def search_and_replace(self, caller, search_str: str, replace_str: str):
         #search_list = list(search)
         found = False
 
-        # pad the right side of replace_str with spaces, so it lines up
-        # if search_str is longer.
-        #caller.notify(f"search string: '{search_str}'")
-        #replace_str = replace_str.ljust(len(search_str), ' ')
-        #caller.notify(f"replace string: '{replace_str}'")
         frame_num = 0
         line_num = 0
         for frame in self.frames:
             line_num = 0
             for line in frame.content:
                 line_str = ''.join(line)
-                #caller.notify(f"line is a type: {type(line)}")
-                #caller.notify(f"line is: {line}")
                 if search_str in line_str:
-                    #caller.notify(f"len(search_str): {len(search_str)}, len(replace_str): {len(replace_str)}")
                     if len(search_str) < len(replace_str):
                         line_str = line_str.replace(search_str.ljust(len(replace_str)), replace_str)
                     else:
@@ -236,6 +242,26 @@ def search_and_replace(self, caller, search_str: str, replace_str: str):
             frame_num += 1
         return found
 
+
+    def search_for_string(self, search_str: str, caller=None):
+        #search_list = list(search)
+        found = False
+        frame_num = 0
+        line_num = 0
+        for frame in self.frames:
+            line_num = 0
+            for line in frame.content:
+                line_str = ''.join(line)
+                if search_str in line_str:
+                    column_num = line_str.index(search_str) + 1
+                    frame_num += 1
+                    found = True
+                    return {"line": line_num, "col": column_num, "frame": frame_num}
+                line_num += 1
+            frame_num += 1
+        return found    # should be false if execution reaches this point
+
+
     def change_palette_16_to_256(self):
         # Convert from blue to bright white by reducing their value by 1
         for frame in self.frames:
@@ -319,20 +345,6 @@ def change_palette_256_to_16(self):
                     col_num += 1
 
 
-    def search_and_replace_color(self, old_color :int, new_color :int):
-        found = False
-        for frame in self.frames:
-            line_num = 0
-            for line in frame.newColorMap:
-                for pair in line:
-                    if pair[0] == old_color:
-                        frame.newColorMap[line_num][0] = new_color
-                        found = True
-                    if pair[1] == old_color:
-                        frame.newColorMap[line_num][1] = new_color
-                        found = True
-                line_num += 1
-
     def contains_high_colors(self):
         """ Returns True if any color above 16 is used, False otherwise """
         for frame in self.frames:

durdraw/durdraw_ui_curses.py

@@ -101,7 +101,7 @@ def __init__(self, app):
         else:
             for button in self.statusBar.buttons:
                 self.gui.add_button(button)
-        self.setWindowTitle("Durdraw")
+        #self.setWindowTitle("Durdraw")
 
         # set a default drawing character
         self.appState.drawChar = chr(self.chMap['f4'])
@@ -187,6 +187,7 @@ def enableTransBackground(self):
     def setWindowTitle(self, title):
         title = f"Durdraw - {title}"
         sys.stdout.write(f"\x1b]2;{title}\x07")
+        sys.stdout.flush()
 
     def getPlaybackRange(self):
         """ ask for playback range presses cmd-r """
@@ -590,6 +591,27 @@ def clearCanvas(self, prompting = False):
             self.move_cursor_topleft()
             self.hardRefresh()
 
+    def searchForStringPrompt(self):
+        self.stdscr.nodelay(0) # wait for input when calling getch
+        self.promptPrint("Enter string to search: ")
+        curses.echo()
+        search_string = self.stdscr.getstr().decode('utf-8')
+        curses.noecho()
+
+        search_result = self.mov.search_for_string(search_string)
+        if search_result == False:
+            self.notify("No results found.")
+        else:
+            line = search_result["line"]
+            column = search_result["col"]
+            frame_num = search_result["frame"]
+            self.mov.gotoFrame(frame_num)
+            self.move_cursor_to_line_and_column(line, column)
+
+        if self.playing:
+            elf.stdscr.nodelay(1)
+
+
     def showCharInspector(self):
         line = self.xy[0]
         col = self.xy[1] - 1
@@ -920,6 +942,7 @@ def startPlaying(self):
             self.appState.sideBarShowing = False
             self.statusBar.hide()
             self.cursorOff()
+            self.setWindowTitle(self.appState.curOpenFileName)
         self.playing = True
         self.metaKey = 0
         if self.appState.playOnlyMode: 
@@ -1405,6 +1428,10 @@ def resizeHandler(self):
     def drawStatusBar(self):
         if self.statusBar.hidden:
             return False
+
+        
+        self.setWindowTitle(self.appState.curOpenFileName)
+
         mainColor = self.appState.theme['mainColor']
         clickColor = self.appState.theme['clickColor']
 
@@ -1794,6 +1821,8 @@ def mainLoop(self):
                     self.clickedUndo()
                 elif c == 114:  # alt-r = redo
                     self.clickedRedo()
+                elif c == ord('F'):   # alt-F, find/search
+                    self.searchForStringPrompt()
                 elif c == 118:  # alt-v      - paste
                     # Paste from the clipboard
                     if self.clipBoard:  # If there is something in the clipboard
@@ -2131,6 +2160,8 @@ def enterViewMode(self):
         oldDrawBorders = self.appState.drawBorders  # to turn back on when done
         self.appState.playOnlyMode = True
         self.startPlaying()
+
+        # Return to normal when done
         self.appState.playOnlyMode = False
         self.appState.topLine = old_top_line
         self.statusBar.show()
@@ -2213,6 +2244,10 @@ def move_cursor_home(self):
     def move_cursor_end(self):
         self.xy[1] = self.mov.sizeX
 
+    def move_cursor_to_line_and_column(self, line, col):
+        self.xy[0] = line
+        self.xy[1] = col
+
     def getDelayValue(self):
         """ Ask the user for the delay value to set for current frame, then
             set it """
@@ -3213,7 +3248,7 @@ def loadFromFile(self, shortfile, loadFormat):  # shortfile = non full path file
                 if self.appState.debug: self.notify(f"Finished loading JSON dur file")
                 self.appState.curOpenFileName = os.path.basename(filename)
                 self.appState.modified = False
-                self.setWindowTitle(shortfile)
+                #self.setWindowTitle(shortfile)
                 self.convertToCurrentFormat(fileColorMode = fileColorMode)
 
                 # Convert palettes as necessary
@@ -3272,7 +3307,7 @@ def loadFromFile(self, shortfile, loadFormat):  # shortfile = non full path file
             if loadFormat == 'ascii':  # loading as dur failed, so load as ascii instead.
                 self.loadFromFile(shortfile, loadFormat)
             self.appState.modified = False
-        self.setWindowTitle(shortfile)
+        #self.setWindowTitle(shortfile)
         self.mov.gotoFrame(1)
         self.hardRefresh()
 
@@ -3437,7 +3472,7 @@ def save(self):
             self.appState.curOpenFileName = os.path.basename(filename)
             self.appState.modified = False
             self.undo.modifications = 0
-            self.setWindowTitle(self.appState.curOpenFileName)
+            #self.setWindowTitle(self.appState.curOpenFileName)
         elif not saved:
             self.notify("Save failed.")
 

durdraw/durdraw_ui_widgets.py

@@ -419,6 +419,7 @@ def __init__(self, caller, x=0, y=0, appState=None):
         #mainMenu.add_item("Transform", caller.showTransformer, "t")
         mainMenu.add_item("Info/Sauce", caller.showFileInformation, "i", shortcut="esc-i")
         mainMenu.add_item("Viewer Mode", caller.enterViewMode, "v", shortcut="esc-V")
+        mainMenu.add_item("Find /", caller.searchForStringPrompt, "/", shortcut="esc-F")
         mainMenu.add_item("Settings", caller.openSettingsMenu, "t", has_submenu=True)
         mainMenu.add_item("Help", caller.showHelp, "h", shortcut="esc-h")
         mainMenu.add_item("Quit", caller.safeQuit, "q", shortcut="esc-q")

durdraw/help/durhelp-16-long.dur

@@ -26,7 +26,7 @@ def undosize(size_s):
             raise argparse.ArgumentTypeError("Undo size must be between 1 and 1000.")
 
 def main():
-    DUR_VER = '0.24.0'
+    DUR_VER = '0.24.1'
     DUR_FILE_VER = 7
     DEBUG_MODE = False # debug = makes debug_write available, sends verbose notifications
     durlogo = '''

durdraw/main.py

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